From bda581585185b167192d10148caea21448514204 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 22 Jul 2017 21:14:52 +0100
Subject: [PATCH 0001/2266] hyper-haskell: init at 0.1.0.2

---
 .../tools/haskell/hyper-haskell/default.nix   | 50 +++++++++++++++++++
 .../tools/haskell/hyper-haskell/server.nix    | 21 ++++++++
 pkgs/top-level/all-packages.nix               | 14 ++++++
 3 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/hyper-haskell/default.nix
 create mode 100644 pkgs/development/tools/haskell/hyper-haskell/server.nix

diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
new file mode 100644
index 00000000000..31697750a70
--- /dev/null
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }:
+
+let
+  binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
+
+in stdenv.mkDerivation rec {
+  name = "hyper-haskell-${version}";
+  version = "0.1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "HeinrichApfelmus";
+    repo = "hyper-haskell";
+    rev = "v${version}";
+    sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb";
+  };
+
+  propagatedBuildInputs = extra-packages;
+
+  buildCommand = ''
+    mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages
+
+    # Electron app
+    cp -R $src/app $out
+
+    # Desktop Launcher
+    cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop
+    cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg
+    cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml
+
+    # install example worksheets with backend set to nix
+    for worksheet in "$src/worksheets/"*.hhs; do
+      ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet`
+    done
+
+    # install electron wrapper script
+    cat > $out/bin/hyper-haskell <<EOF
+    #!${stdenv.shell}
+    export PATH="${binPath}:\$PATH"
+    exec ${electron}/bin/electron $out/app "\$@"
+    EOF
+    chmod 755 $out/bin/hyper-haskell
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The strongly hyped graphical interpreter for the Haskell programming language";
+    homepage = "https://github.com/HeinrichApfelmus/hyper-haskell";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.rvl ];
+  };
+}
diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix
new file mode 100644
index 00000000000..ff82127f0c4
--- /dev/null
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@@ -0,0 +1,21 @@
+{ stdenv, ghcWithPackages, makeWrapper, packages }:
+
+let
+hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
+in stdenv.mkDerivation {
+  name = "hyper-haskell-server-with-packages";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    makeWrapper ${hyperHaskellEnv}/bin/hyper-haskell-server $out/bin/hyper-haskell-server \
+      --set NIX_GHC ${hyperHaskellEnv}/bin/ghc \
+      --set NIX_GHCPKG ${hyperHaskellEnv}/bin/ghc-pkg \
+      --set NIX_GHC_LIBDIR ${hyperHaskellEnv}/lib/ghc-*
+  '';
+
+  # trivial derivation
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..50939db072c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14624,6 +14624,20 @@ with pkgs;
   hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; };
   hyperterm = self.hyper;
 
+  hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
+    inherit (haskellPackages) ghcWithPackages;
+    packages = self: with self; [];
+  };
+
+  hyper-haskell = callPackage ../development/tools/haskell/hyper-haskell {
+    hyper-haskell-server = hyper-haskell-server-with-packages.override {
+      packages = self: with self; [
+        hyper-extra diagrams csound-catalog
+      ];
+    };
+    extra-packages = [ csound ];
+  };
+
   jackline = callPackage ../applications/networking/instant-messengers/jackline {
     ocamlPackages = ocaml-ng.ocamlPackages_4_02;
   };

From 66fd7d2baad83ab0737cca6e1498f7660e631808 Mon Sep 17 00:00:00 2001
From: Tom Saeger <tom.saeger@gmail.com>
Date: Mon, 9 Oct 2017 21:23:05 -0500
Subject: [PATCH 0002/2266] pythonPackages.ofxhome: 0.3.1 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix
new file mode 100644
index 00000000000..3d412e1409c
--- /dev/null
+++ b/pkgs/development/python-modules/ofxhome/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.3.3";
+  pname = "ofxhome";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1rpyfqr2q9pnin47rjd4qapl8ngk1m9jx36iqckhdhr8s8gla445";
+  };
+
+  buildInputs = [ nose ];
+
+  # ImportError: No module named tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/captin411/ofxhome";
+    description = "ofxhome.com financial institution lookup REST client";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a34b22482e..a433265b4a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24793,24 +24793,7 @@ EOF
     propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring ];
   };
 
-  ofxhome = buildPythonPackage rec {
-    name = "ofxhome-0.3.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/ofxhome/${name}.tar.gz";
-      sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    # ImportError: No module named tests
-    doCheck = false;
-
-    meta = {
-      homepage = "https://github.com/captin411/ofxhome";
-      description = "ofxhome.com financial institution lookup REST client";
-      license = licenses.mit;
-    };
-  };
+  ofxhome = callPackage ../development/python-modules/ofxhome { };
 
   ofxparse = buildPythonPackage rec {
     name = "ofxparse-0.14";

From b00a3fc6fd82834114771f2115a2b032f0ebfe29 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 14 Oct 2017 21:19:07 +0200
Subject: [PATCH 0003/2266] nixos: inline set-environment for bash and zsh

---
 nixos/modules/programs/bash/bash.nix | 2 +-
 nixos/modules/programs/zsh/zsh.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index e23849d350b..26b00fb389e 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -123,7 +123,7 @@ in
     programs.bash = {
 
       shellInit = ''
-        . ${config.system.build.setEnvironment}
+        ${config.system.build.setEnvironment.text}
 
         ${cfge.shellInit}
       '';
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 615e54c326b..97c2d14a2fd 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -107,7 +107,7 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
-        . ${config.system.build.setEnvironment}
+        ${config.system.build.setEnvironment.text}
 
         ${cfge.shellInit}
 

From a558da3f7eccde7162dbfd6561e43c30c6d802f1 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Sat, 18 Nov 2017 13:34:15 -0500
Subject: [PATCH 0004/2266] melpaStablePackages.caml: don't run configure

---
 .../editors/emacs-modes/melpa-stable-packages.nix            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 03121edada0..97148e928e6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -45,6 +45,11 @@ self:
       # upstream issue: missing file header
       bufshow = markBroken super.bufshow;
 
+      # upstream issue: comes with a broken configure file
+      caml = super.caml.overrideAttrs (oldAttrs: rec {
+        configureScript = "true";
+      });
+
       # part of a larger package
       # upstream issue: missing package version
       cmake-mode = markBroken (dontConfigure super.cmake-mode);

From 41991e09adc7dfe8d3524002f035ed2b94fec841 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Mon, 20 Nov 2017 17:29:37 -0500
Subject: [PATCH 0005/2266] Add texmacsDarwin

---
 pkgs/applications/editors/texmacs/common.nix  | 68 +++++++++++++++
 pkgs/applications/editors/texmacs/darwin.nix  | 59 +++++++++++++
 .../applications/editors/texmacs/darwin.patch | 29 +++++++
 pkgs/applications/editors/texmacs/default.nix | 87 ++++---------------
 pkgs/top-level/all-packages.nix               | 14 ++-
 5 files changed, 182 insertions(+), 75 deletions(-)
 create mode 100644 pkgs/applications/editors/texmacs/common.nix
 create mode 100644 pkgs/applications/editors/texmacs/darwin.nix
 create mode 100644 pkgs/applications/editors/texmacs/darwin.patch

diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix
new file mode 100644
index 00000000000..ec2498aa69b
--- /dev/null
+++ b/pkgs/applications/editors/texmacs/common.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }:
+rec {
+  extraFontsSrc = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
+    sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
+  };
+
+  fullFontsSrc = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz";
+    sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f";
+  };
+
+  chineseFontsSrc = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz";
+    sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp";
+  };
+
+  japaneseFontsSrc = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz";
+    sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn";
+  };
+
+  koreanFontsSrc = fetchurl {
+    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz";
+    sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh";
+  };
+
+  postPatch = (if tex == null then ''
+    gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else if extraFonts then ''
+    gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "") +
+   (if chineseFonts then ''
+    gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "") +
+   (if japaneseFonts then ''
+    gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "") +
+   (if koreanFonts then ''
+    gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)
+   '' else "");
+
+
+  meta = {
+    description = "WYSIWYW editing platform with special features for scientists";
+    longDescription =
+    '' GNU TeXmacs is a free wysiwyw (what you see is what you want)
+    editing platform with special features for scientists.  The software
+    aims to provide a unified and user friendly framework for editing
+    structured documents with different types of content (text,
+    graphics, mathematics, interactive content, etc.).  The rendering
+    engine uses high-quality typesetting algorithms so as to produce
+    professionally looking documents, which can either be printed out or
+    presented from a laptop.
+
+    The software includes a text editor with support for mathematical
+    formulas, a small technical picture editor and a tool for making
+    presentations from a laptop.  Moreover, TeXmacs can be used as an
+    interface for many external systems for computer algebra, numerical
+    analysis, statistics, etc.  New presentation styles can be written
+    by the user and new features can be added to the editor using the
+    Scheme extension language.  A native spreadsheet and tools for
+    collaborative authoring are planned for later.
+  '';
+    homepage = http://texmacs.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
new file mode 100644
index 00000000000..e319ccf39b1
--- /dev/null
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -0,0 +1,59 @@
+{ stdenv, callPackage, fetchurl, makeWrapper,
+  guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript,
+  tex ? null,
+  aspell ? null,
+  netpbm ? null,
+  imagemagick ? null,
+  extraFonts ? false,
+  chineseFonts ? false,
+  japaneseFonts ? false,
+  koreanFonts ? false }:
+let
+  version = "1.99.4";
+  common = callPackage ./common.nix {
+    inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
+  };
+in
+stdenv.mkDerivation {
+  name = "TeXmacs-${version}";
+
+  src= fetchurl {
+    url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
+    sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a";
+  };
+
+  patches = [ ./darwin.patch ];
+
+  buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ];
+
+  GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile ";
+
+  NIX_LDFLAGS="${zlib}/lib/libz.dylib";
+
+  buildPhase = ''
+    substituteInPlace Makefile \
+      --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \
+      --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true'
+    make MACOS_BUNDLE
+  '';
+
+  installPhase = ''
+    mkdir -p $out/Applications
+    cp -R ../distr/TeXmacs-${version}.app $out/Applications
+  '';
+
+  inherit (common) postPatch;
+
+  postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " +
+    "${ghostscript}/bin:" +
+    (if aspell == null then "" else "${aspell}/bin:") +
+    (if tex == null then "" else "${tex}/bin:") +
+    (if netpbm == null then "" else "${netpbm}/bin:") +
+    (if imagemagick == null then "" else "${imagemagick}/bin:");
+
+  enableParallelBuilding = true;
+
+  meta = common.meta // {
+    platforms = stdenv.lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/applications/editors/texmacs/darwin.patch b/pkgs/applications/editors/texmacs/darwin.patch
new file mode 100644
index 00000000000..2cb33fbbef3
--- /dev/null
+++ b/pkgs/applications/editors/texmacs/darwin.patch
@@ -0,0 +1,29 @@
+--- a/configure
++++ b/configure
+@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; }
+     CONFIG_QTPIPES="yes"
+     CONFIG_CXXFLAGS="-I${prefix}/include"
+     CONFIG_BSHARED=""
+-    CONFIG_BFLAGS="-framework Cocoa -framework IOKit"
++    CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation"
+     CONFIG_BPATH=""
+     CONFIG_SO="dylib"
+     CONFIG_LIB_PATH="DYLD_LIBRARY_PATH"
+@@ -8281,6 +8281,7 @@ _ASEOF
+   if $QMAKE ${additional_qmake_flags} ; then :; else
+     as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5
+   fi
++  echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file
+   # Try to compile a simple Qt app.
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5
+ $as_echo_n "checking whether we can build a simple Qt app... " >&6; }
+--- a/src/Plugins/Unix/unix_sys_utils.cpp
++++ b/src/Plugins/Unix/unix_sys_utils.cpp
+@@ -17,6 +17,7 @@
+ #include <spawn.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
++#include <pthread.h>
+ 
+ // for thread safe strings
+ #include <string>
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index e51813459c6..447e729d4f9 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -1,41 +1,21 @@
-{stdenv, fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype,
- tex ? null,
- aspell ? null,
- ghostscriptX ? null,
- extraFonts ? false,
- chineseFonts ? false,
- japaneseFonts ? false,
- koreanFonts ? false }:
+{ stdenv, callPackage,
+  fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype,
+  tex ? null,
+  aspell ? null,
+  ghostscriptX ? null,
+  extraFonts ? false,
+  chineseFonts ? false,
+  japaneseFonts ? false,
+  koreanFonts ? false }:
 
-let 
+let
   pname = "TeXmacs";
   version = "1.99.2";
-  extraFontsSrc = fetchurl {
-    url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
-    sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
-  };
-
-  fullFontsSrc = fetchurl {
-   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz";
-   sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f";
-  };
-
-  chineseFontsSrc = fetchurl {
-   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz";
-   sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp";
-  };
-
-  japaneseFontsSrc = fetchurl {
-   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz";
-   sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn";
-  };
-
-  koreanFontsSrc = fetchurl {
-   url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz";
-   sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh";
+  common = callPackage ./common.nix {
+    inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -45,56 +25,21 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ];
 
-  patchPhase = (if tex == null then ''
-    gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
-   '' else if extraFonts then ''
-    gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)
-   '' else "") +
-   (if chineseFonts then ''
-    gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)
-   '' else "") +
-   (if japaneseFonts then ''
-    gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)
-   '' else "") +
-   (if koreanFonts then ''
-    gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)
-   '' else "");
-
   postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
         (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
         (if aspell == null then "" else "${aspell}/bin:") +
         (if tex == null then "" else "${tex}/bin:") +
         "${xmodmap}/bin:${which}/bin";
 
+  inherit (common) postPatch;
+
   postFixup = ''
     bin="$out/libexec/TeXmacs/bin/texmacs.bin"
     rpath=$(patchelf --print-rpath "$bin")
     patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin"
   '';
 
-  meta = {
-    description = "WYSIWYW editing platform with special features for scientists";
-    longDescription =
-      '' GNU TeXmacs is a free wysiwyw (what you see is what you want)
-         editing platform with special features for scientists.  The software
-         aims to provide a unified and user friendly framework for editing
-         structured documents with different types of content (text,
-         graphics, mathematics, interactive content, etc.).  The rendering
-         engine uses high-quality typesetting algorithms so as to produce
-         professionally looking documents, which can either be printed out or
-         presented from a laptop.
-
-         The software includes a text editor with support for mathematical
-         formulas, a small technical picture editor and a tool for making
-         presentations from a laptop.  Moreover, TeXmacs can be used as an
-         interface for many external systems for computer algebra, numerical
-         analysis, statistics, etc.  New presentation styles can be written
-         by the user and new features can be added to the editor using the
-         Scheme extension language.  A native spreadsheet and tools for
-         collaborative authoring are planned for later.
-      '';
-    homepage = http://texmacs.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
+  meta = common.meta // {
     maintainers = [ stdenv.lib.maintainers.roconnor ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23a9bb27fe0..2dfed3f4885 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4656,10 +4656,16 @@ with pkgs;
 
   telepresence = callPackage ../tools/networking/telepresence { };
 
-  texmacs = callPackage ../applications/editors/texmacs {
-    tex = texlive.combined.scheme-small;
-    extraFonts = true;
-  };
+  texmacs = if stdenv.isDarwin
+    then callPackage ../applications/editors/texmacs/darwin.nix {
+      inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa;
+      tex = texlive.combined.scheme-small;
+      extraFonts = true;
+    } else callPackage ../applications/editors/texmacs/default.nix {
+      tex = texlive.combined.scheme-small;
+      extraFonts = true;
+    };
+
 
   texmaker = callPackage ../applications/editors/texmaker { };
 

From 21159d8f1738ba288024f99e6c2fe8fc7c58d8bf Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sun, 17 Dec 2017 15:02:52 +0000
Subject: [PATCH 0006/2266] xfce4-13: init

---
 pkgs/desktops/xfce4-13/automakeAddFlags.sh    |  7 ++
 pkgs/desktops/xfce4-13/default.nix            | 80 +++++++++++++++++++
 pkgs/desktops/xfce4-13/exo/default.nix        | 23 ++++++
 pkgs/desktops/xfce4-13/exo/gtk3-only.patch    | 28 +++++++
 pkgs/desktops/xfce4-13/garcon/12700.patch     | 37 +++++++++
 pkgs/desktops/xfce4-13/garcon/13785.patch     | 75 +++++++++++++++++
 pkgs/desktops/xfce4-13/garcon/default.nix     | 12 +++
 pkgs/desktops/xfce4-13/gigolo/default.nix     | 11 +++
 pkgs/desktops/xfce4-13/libxfce4ui/default.nix | 18 +++++
 .../xfce4-13/libxfce4util/default.nix         | 16 ++++
 pkgs/desktops/xfce4-13/mkXfceDerivation.nix   | 40 ++++++++++
 pkgs/desktops/xfce4-13/mousepad/default.nix   | 12 +++
 pkgs/desktops/xfce4-13/orage/default.nix      | 18 +++++
 pkgs/desktops/xfce4-13/parole/default.nix     | 36 +++++++++
 pkgs/desktops/xfce4-13/ristretto/default.nix  | 18 +++++
 .../xfce4-13/thunar-volman/default.nix        | 11 +++
 pkgs/desktops/xfce4-13/thunar/default.nix     | 30 +++++++
 pkgs/desktops/xfce4-13/tumbler/default.nix    | 14 ++++
 pkgs/desktops/xfce4-13/xfburn/default.nix     | 18 +++++
 .../xfce4-13/xfce4-appfinder/default.nix      | 12 +++
 .../xfce4-13/xfce4-dev-tools/default.nix      | 31 +++++++
 .../xfce4-13/xfce4-dev-tools/setup-hook.sh    | 12 +++
 .../xfce4-13/xfce4-dict/configure-gio.patch   | 11 +++
 pkgs/desktops/xfce4-13/xfce4-dict/default.nix | 19 +++++
 .../desktops/xfce4-13/xfce4-mixer/default.nix | 30 +++++++
 .../xfce4-13/xfce4-notifyd/default.nix        | 13 +++
 .../desktops/xfce4-13/xfce4-panel/default.nix | 15 ++++
 .../xfce4-13/xfce4-power-manager/default.nix  | 19 +++++
 .../xfce4-13/xfce4-screenshooter/default.nix  | 11 +++
 .../xfce4-13/xfce4-settings/default.nix       | 39 +++++++++
 .../xfce4-13/xfce4-taskmanager/default.nix    | 18 +++++
 .../xfce4-13/xfce4-terminal/default.nix       | 15 ++++
 .../xfce4-13/xfce4-volumed-pulse/default.nix  | 15 ++++
 pkgs/desktops/xfce4-13/xfconf/default.nix     | 11 +++
 pkgs/desktops/xfce4-13/xfdesktop/default.nix  | 22 +++++
 pkgs/desktops/xfce4-13/xfwm4/default.nix      | 27 +++++++
 pkgs/top-level/all-packages.nix               |  3 +
 37 files changed, 827 insertions(+)
 create mode 100644 pkgs/desktops/xfce4-13/automakeAddFlags.sh
 create mode 100644 pkgs/desktops/xfce4-13/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/exo/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/exo/gtk3-only.patch
 create mode 100644 pkgs/desktops/xfce4-13/garcon/12700.patch
 create mode 100644 pkgs/desktops/xfce4-13/garcon/13785.patch
 create mode 100644 pkgs/desktops/xfce4-13/garcon/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/gigolo/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/libxfce4ui/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/libxfce4util/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/mkXfceDerivation.nix
 create mode 100644 pkgs/desktops/xfce4-13/mousepad/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/orage/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/parole/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/ristretto/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/thunar-volman/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/thunar/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/tumbler/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfburn/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dict/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-panel/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-settings/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfconf/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfdesktop/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfwm4/default.nix

diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-13/automakeAddFlags.sh
new file mode 100644
index 00000000000..92d5659d05c
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/automakeAddFlags.sh
@@ -0,0 +1,7 @@
+automakeAddFlags() {
+    local file="$1"
+    local target="$2"
+    local source="$3"
+
+    sed "/$target/a\$($source) \\\\" -i $file
+}
diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix
new file mode 100644
index 00000000000..451322bcaf9
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/default.nix
@@ -0,0 +1,80 @@
+{ lib, makeSetupHook, newScope, gnome3, gst_all_1 }:
+
+let
+  inherit (lib) makeScope;
+in
+
+makeScope newScope (self: with self; {
+  mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
+
+  automakeAddFlags = makeSetupHook { } ./automakeAddFlags.sh;
+
+  exo = callPackage ./exo { };
+
+  garcon = callPackage ./garcon { };
+
+  gigolo = callPackage ./gigolo { };
+
+  libxfce4util = callPackage ./libxfce4util { };
+
+  libxfce4ui = callPackage ./libxfce4ui { };
+
+  mousepad = callPackage ./mousepad {
+    inherit (gnome3) gtksourceview;
+  };
+
+  orage = callPackage ./orage { };
+
+  parole = callPackage ./parole {
+    inherit (gst_all_1) gst-plugins-bad gst-plugins-base gst-plugins-good;
+    gst-plugins-ugly = null;
+  };
+
+  ristretto = callPackage ./ristretto { };
+
+  thunar = callPackage ./thunar { };
+
+  thunar-volman = callPackage ./thunar-volman { };
+
+  tumbler = callPackage ./tumbler { };
+
+  xfburn = callPackage ./xfburn { };
+
+  xfconf = callPackage ./xfconf { };
+
+  xfdesktop = callPackage ./xfdesktop { };
+
+  xfce4-appfinder = callPackage ./xfce4-appfinder { };
+
+  xfce4-dev-tools = callPackage ./xfce4-dev-tools {
+    mkXfceDerivation = mkXfceDerivation.override {
+      xfce4-dev-tools = null;
+    };
+  };
+
+  xfce4-dict = callPackage ./xfce4-dict { };
+
+  xfce4-mixer = callPackage ./xfce4-mixer { };
+
+  xfce4-notifyd = callPackage ./xfce4-notifyd { };
+
+  xfce4-panel = callPackage ./xfce4-panel { };
+
+  xfce4-power-manager = callPackage ./xfce4-power-manager { };
+
+  xfce4-screenshooter = callPackage ./xfce4-screenshooter {
+    inherit (gnome3) libsoup;
+  };
+
+  xfce4-taskmanager = callPackage ./xfce4-taskmanager { };
+
+  xfce4-settings = callPackage ./xfce4-settings { };
+
+  xfce4-terminal = callPackage ./xfce4-terminal {
+    inherit (gnome3) vte;
+  };
+
+  xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { };
+
+  xfwm4 = callPackage ./xfwm4 { };
+})
diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix
new file mode 100644
index 00000000000..e11309135dd
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/exo/default.nix
@@ -0,0 +1,23 @@
+{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3
+, libxfce4ui, libxfce4util }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "exo";
+  version = "0.11.5";
+
+  sha256 = "0zxv7cx1xbjls7q2blv8ir9zwzyq7r189n6q35jwasns7rxj256v";
+
+  nativeBuildInputs = [ libxslt perlPackages.URI ];
+  buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+
+  postPatch = ''
+    substituteInPlace docs/reference/Makefile.am \
+      --replace http://docbook.sourceforge.net/release/xsl/current \
+                ${docbook_xml_xslt}/share/xml/docbook-xsl
+  '';
+
+  meta = {
+    description = "Application library for Xfce";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
new file mode 100644
index 00000000000..74e6f812e3c
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
@@ -0,0 +1,28 @@
+diff -urNZ a/configure.ac.in b/configure.ac.in
+--- a/configure.ac.in	2017-11-20 02:57:40.476664918 +0000
++++ b/configure.ac.in	2017-11-20 03:07:18.999128370 +0000
+@@ -165,11 +165,9 @@
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
+ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
+-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
+ XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
+ 
+diff -urNZ a/exo/Makefile.am b/exo/Makefile.am
+--- a/exo/Makefile.am	2017-11-20 02:57:34.444785202 +0000
++++ b/exo/Makefile.am	2017-11-20 03:00:49.402897465 +0000
+@@ -117,7 +117,7 @@
+ 
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ 
+-lib_LTLIBRARIES += libexo-2.la
++lib_LTLIBRARIES = libexo-2.la
+ 
+ libexo_2_include_HEADERS =						\
+ 	exo.h								\
+Binary files a/.git/index and b/.git/index differ
diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch
new file mode 100644
index 00000000000..fda36d69651
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/garcon/12700.patch
@@ -0,0 +1,37 @@
+From: Yegor Timoshenko <yegortimoshenko@gmail.com>
+Date: Thu, 14 Dec 2017 21:13:02 +0000
+Subject: [PATCH] Decrement allocation counter on item unref (#12700)
+
+diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
+index 2017180..355e520 100644
+--- a/garcon/garcon-menu-item-pool.c
++++ b/garcon/garcon-menu-item-pool.c
+@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar    *desktop_id,
+   g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
+   g_return_val_if_fail (node != NULL, FALSE);
+
+-  return garcon_menu_node_tree_rule_matches (node, item);
++  gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
++
++  if (matches)
++    garcon_menu_item_increment_allocated (item);
++
++  return matches;
+ }
+
+
+diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
+index ca8cb63..b44acfe 100644
+--- a/garcon/garcon-menu-item.c
++++ b/garcon/garcon-menu-item.c
+@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
+ {
+   g_return_if_fail (GARCON_IS_MENU_ITEM (item));
+
++  garcon_menu_item_decrement_allocated (item);
++
+   /* Decrement the reference counter */
+   g_object_unref (G_OBJECT (item));
+ }
+--
+2.15.1
diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch
new file mode 100644
index 00000000000..1b723d21d60
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/garcon/13785.patch
@@ -0,0 +1,75 @@
+From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001
+From: Stefan Berzl <stefanberzl@gmail.com>
+Date: Mon, 21 Aug 2017 18:39:07 +0300
+Subject: [PATCH] fix: some menu icons are too big (Bug #13785)
+
+Some packages only provide icons in sizes much bigger than the standard
+GTK menu size of 16px.
+
+The clipboard manager qlipper for example provides the following icon:
+/usr/share/icons/hicolor/128x128/apps/qlipper.png
+
+In GTK 3.22.18 the function gtk_image_new_from_icon_name when given
+GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128.
+
+The patch I have supplied uses existing code to scale such an image.
+
+Signed-off-by: Eric Koegel <eric.koegel@gmail.com>
+---
+ garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
+index 41990f2..f31a1ed 100644
+--- a/garcon-gtk/garcon-gtk-menu.c
++++ b/garcon-gtk/garcon-gtk-menu.c
+@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
+   gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
+   size = MIN (w, h);
+ 
+-  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
++  if (gtk_icon_theme_has_icon (icon_theme, icon_name))
++    {
++	  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);;
++    }
++  else
+     {
+       if (g_path_is_absolute (icon_name))
+         {
+@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
+               g_free (name);
+             }
+         }
++    }
+ 
+-      /* Turn the pixbuf into a gtk_image */
+-      if (G_LIKELY (pixbuf))
+-        {
+-          /* scale the pixbuf down if it needs it */
+-          GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
+-          g_object_unref (pixbuf);
+-          pixbuf = tmp;
++  /* Turn the pixbuf into a gtk_image */
++  if (G_LIKELY (pixbuf))
++    {
++      /* scale the pixbuf down if it needs it */
++      GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
++      g_object_unref (G_OBJECT (pixbuf));
+ 
+-          image = gtk_image_new_from_pixbuf (pixbuf);
+-          g_object_unref (G_OBJECT (pixbuf));
+-        }
++      image = gtk_image_new_from_pixbuf (pixbuf_scaled);
++      g_object_unref (G_OBJECT (pixbuf_scaled));
++    }
++  else
++    {
++	  /* display the placeholder at least */
++	  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+     }
+-
+-  if (image == NULL)
+-    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+ 
+   return image;
+ }
diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix
new file mode 100644
index 00000000000..a88d64702a1
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/garcon/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "garcon";
+  version = "0.6.1";
+
+  sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8";
+
+  patches = [ ./12700.patch ./13785.patch ];
+  buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+}
diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix
new file mode 100644
index 00000000000..0d7b2210b12
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/gigolo/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, gtk2, libX11 }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "gigolo";
+  version = "0.4.2";
+
+  sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1";
+
+  buildInputs = [ gtk2 libX11 ];
+}
diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
new file mode 100644
index 00000000000..63df0b7cc9a
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3
+, libstartup_notification ? null, libxfce4util, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "libxfce4ui";
+  version = "4.13.4";
+
+  sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
+
+  buildInputs =  [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ];
+  propagatedBuildInputs = [ libxfce4util ];
+
+  meta = with lib; {
+    description = "Widgets library for Xfce";
+    license = licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
new file mode 100644
index 00000000000..091d73bf72a
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
@@ -0,0 +1,16 @@
+{ lib, mkXfceDerivation, gobjectIntrospection }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "libxfce4util";
+  version = "4.13.1";
+
+  sha256 = "001ls90an2pi9l04g3r6syfa4lhyvjymp0r9djxrkc2q493mcv3d";
+
+  buildInputs = [ gobjectIntrospection ];
+
+  meta = with lib; {
+    description = "Extension library for Xfce";
+    license = licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
new file mode 100644
index 00000000000..f08272e9db0
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools ? null }:
+
+{ category, pname, sha256 ? null, version, ... } @ args:
+
+let
+  inherit (builtins) filter getAttr head isList;
+  inherit (stdenv.lib) attrNames concatLists recursiveUpdate zipAttrsWithNames;
+
+  filterAttrNames = f: attrs:
+    filter (n: f (getAttr n attrs)) (attrNames attrs);
+
+  concatAttrLists = attrsets:
+    zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets;
+
+  template = rec {
+    name = "${pname}-${version}";
+
+    nativeBuildInputs = [ pkgconfig xfce4-dev-tools ];
+    configureFlags = [ "--enable-maintainer-mode" ];
+
+    src = fetchgit {
+      url = "git://git.xfce.org/${category}/${pname}";
+      rev = name;
+      inherit sha256;
+    };
+
+    enableParallelBuilding = true;
+    outputs = [ "out" "dev" ];
+
+    meta = with stdenv.lib; {
+      homepage = "https://git.xfce.org/${category}/${pname}/about";
+      license = licenses.gpl2; # some libraries are under LGPLv2+
+      platforms = platforms.linux;
+    };
+  };
+
+  publicArgs = removeAttrs args [ "category" "pname" "sha256" ];
+in
+
+stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ])
diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix
new file mode 100644
index 00000000000..84206f763f3
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/mousepad/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "mousepad";
+  version = "0.4.0";
+
+  sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw";
+
+  nativeBuildInputs = [ exo wrapGAppsHook ];
+  buildInputs = [ dbus_glib gtk3 gtksourceview ];
+}
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix
new file mode 100644
index 00000000000..6a2f37cbef6
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/orage/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null
+, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
+
+assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
+
+let
+  inherit (lib) optionals;
+in
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "orage";
+  version = "4.12.1";
+
+  sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
+  buildInputs = [ dbus_glib gtk2 libical libnotify popt ]
+    ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
+}
diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix
new file mode 100644
index 00000000000..c1976727c04
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/parole/default.nix
@@ -0,0 +1,36 @@
+{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus_glib
+, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good
+, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util
+, taglib ? null, xfconf }:
+
+# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "parole";
+  version = "0.9.2";
+
+  sha256 = "07i9d7xn2ys3z71sxvr53idq4ivy94pqgxvr0k78crva39ls08s5";
+
+  postPatch = ''
+    substituteInPlace src/plugins/mpris2/Makefile.am \
+      --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
+  '';
+
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+
+  buildInputs = [
+    dbus
+    dbus_glib
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gtk3
+    libnotify
+    libxfce4ui
+    libxfce4util
+    taglib
+    xfconf
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix
new file mode 100644
index 00000000000..5296723eb40
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/ristretto/default.nix
@@ -0,0 +1,18 @@
+{ mkXfceDerivation, automakeAddFlags, exo, dbus_glib, gtk2, libexif
+, libxfce4ui, libxfce4util, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "ristretto";
+  version = "0.8.2";
+
+  postPatch = ''
+    automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
+    automakeAddFlags src/Makefile.am ristretto_LDADD DBUS_GLIB_LIBS
+  '';
+
+  nativeBuildInputs = [ automakeAddFlags exo ];
+  buildInputs = [ dbus_glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
+
+  sha256 = "0ra50452ldk91pvhcpl3f3rhdssw3djfr6cm0hc29v8r58am0wni";
+}
diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix
new file mode 100644
index 00000000000..0055d0d8217
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "thunar-volman";
+  version = "0.9.0";
+
+  buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
+
+  sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7";
+}
diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix
new file mode 100644
index 00000000000..7503e67e4a5
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/thunar/default.nix
@@ -0,0 +1,30 @@
+{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null
+, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "thunar";
+  version = "1.7.0";
+
+  sha256 = "1s262hii524a5hb15pb8xbrrrhyi5fj3837zgbscg3rdnsm52igw";
+
+  postPatch = ''
+    substituteInPlace docs/Makefile.am \
+      --replace http://docbook.sourceforge.net/release/xsl/current \
+                ${docbook_xml_xslt}/share/xml/docbook-xsl
+  '';
+
+  nativeBuildInputs = [ libxslt ];
+
+  buildInputs = [
+    exo
+    gdk_pixbuf
+    gtk3
+    libgudev
+    libnotify
+    libX11
+    libxfce4ui
+    libxfce4util
+    xfconf
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix
new file mode 100644
index 00000000000..6bcdbfbc41e
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/tumbler/default.nix
@@ -0,0 +1,14 @@
+{ mkXfceDerivation, gdk_pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
+, poppler ? null }:
+
+# TODO: add libopenraw
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "tumbler";
+  version = "0.2.0";
+
+  sha256 = "0jr6rhgc57yqb3iwp7y49yf5ig541liaz6xpvjl45ki34j091iaj";
+
+  buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix
new file mode 100644
index 00000000000..266722c9b05
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfburn/default.nix
@@ -0,0 +1,18 @@
+{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfburn";
+  version = "0.5.5";
+
+  postPatch = ''
+    substituteInPlace docs/Makefile.am \
+      --replace http://docbook.sourceforge.net/release/xsl/current \
+                ${docbook_xml_xslt}/share/xml/docbook-xsl
+  '';
+
+  sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";
+
+  nativeBuildInputs = [ libxslt ];
+  buildInputs = [ exo gtk2 libburn libICE libisofs libSM libxfce4ui ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
new file mode 100644
index 00000000000..65941fee4c4
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-appfinder";
+  version = "4.13.0";
+
+  sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy";
+
+  nativeBuildInputs = [ exo ];
+  buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
new file mode 100644
index 00000000000..88ed804191a
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
@@ -0,0 +1,31 @@
+{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-dev-tools";
+  version = "4.12.0";
+
+  sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2";
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  propagatedNativeBuildInputs = [
+    autoconf
+    automake
+    glib
+    gtk_doc
+    intltool
+    libtool
+  ];
+
+  preAutoreconf = ''
+    substitute configure.ac.in configure.ac \
+      --subst-var-by REVISION UNKNOWN
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = "Autoconf macros and scripts to augment app build systems";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
new file mode 100644
index 00000000000..600bf47fd87
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
@@ -0,0 +1,12 @@
+xdtEnvHook() {
+    addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros
+}
+
+envHooks+=(xdtEnvHook)
+
+xdtAutogenPhase() {
+    mkdir -p m4
+    NOCONFIGURE=1 xdt-autogen
+}
+
+preConfigurePhases+=(xdtAutogenPhase)
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
new file mode 100644
index 00000000000..787b63511a2
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
@@ -0,0 +1,11 @@
+diff -urNZ a/configure.ac.in b/configure.ac.in
+--- a/configure.ac.in	2017-12-16 19:46:13.784914017 +0000
++++ b/configure.ac.in	2017-12-16 19:46:38.612477052 +0000
+@@ -53,6 +53,7 @@
+ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
++XDT_CHECK_PACKAGE([GIO], [gio-unix-2.0], [2.32.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
new file mode 100644
index 00000000000..a5357ebd590
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
@@ -0,0 +1,19 @@
+{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-dict";
+  version = "0.8.0";
+
+  sha256 = "1r1k9cgl7zkn3q4mjf7qjql6vlxkb2m0spgj9p646mw7bnhbf9wr";
+
+  patches = [ ./configure-gio.patch ];
+
+  nativeBuildInputs = [ automakeAddFlags ];
+
+  postPatch = ''
+    automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS
+  '';
+
+  buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
new file mode 100644
index 00000000000..96deb96e7f7
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
@@ -0,0 +1,30 @@
+{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2
+, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-mixer";
+  version = "4.11.0";
+
+  sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys";
+
+  nativeBuildInputs = [ automakeAddFlags ];
+
+  postPatch = ''
+    automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS
+    automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS
+  '';
+
+  buildInputs = [
+    dbus_glib
+    gst-plugins-base
+    gtk2
+    libICE
+    libSM
+    libunique
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
new file mode 100644
index 00000000000..b4be0a35a13
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
@@ -0,0 +1,13 @@
+{ mkXfceDerivation, dbus_glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
+, xfce4-panel, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-notifyd";
+  version = "0.4.1";
+
+  sha256 = "12mqi0q1hcjm16f4pndq7l58h2n0nq160r5fqx8ns320i83nh94k";
+
+  nativeBuildInputs = [ dbus_glib exo ];
+  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
new file mode 100644
index 00000000000..88ba2de49be
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -0,0 +1,15 @@
+{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-panel";
+  version = "4.13.2";
+
+  sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn";
+
+  buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
+
+  meta =  {
+    description = "Xfce's panel";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
new file mode 100644
index 00000000000..bf998d2e819
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
@@ -0,0 +1,19 @@
+{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify
+, libxfce4ui, libxfce4util, upower, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-power-manager";
+  version = "1.6.0";
+
+  sha256 = "1sh6ydn44j1yki8f020ljayp1fjcigkywcvjp38fsk7j25ni2wrp";
+
+  nativeBuildInputs = [ automakeAddFlags exo ];
+  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
+
+  postPatch = ''
+    substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
+    automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
+    automakeAddFlags src/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
+  '';
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
new file mode 100644
index 00000000000..5e2c296f056
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-screenshooter";
+  version = "1.9.1";
+
+  sha256 = "1q13hvaz3ykrbgbbqb1186mhri8r9hkmpaayjwhnkvjm7jfyhbin";
+
+  buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
new file mode 100644
index 00000000000..235c5cd15e4
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
@@ -0,0 +1,39 @@
+{ mkXfceDerivation, automakeAddFlags, dbus_glib, exo, garcon, gtk3
+, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
+, upower ? null, xfconf, xf86inputlibinput ? null }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-settings";
+  version = "4.13.1";
+
+  sha256 = "010vcgy3qiqykk174jhf50a8q3x4a5qq2lf6b0wcbyzv7aikydrw";
+
+  postPatch = ''
+    automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
+    for f in $(find . -name \*.c); do
+      substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
+    done
+  '';
+
+  nativeBuildInputs = [ automakeAddFlags ];
+
+  buildInputs = [
+    dbus_glib
+    exo
+    garcon
+    gtk3
+    libnotify
+    libxfce4ui
+    libxfce4util
+    libxklavier
+    upower
+    xfconf
+    xf86inputlibinput
+  ];
+
+  configureFlags = [
+    "--enable-pluggable-dialogs"
+    "--enable-sound-settings"
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
new file mode 100644
index 00000000000..c2d80e31f15
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }:
+
+let
+  inherit (lib) enableFeature;
+in
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-taskmanager";
+  version = "1.2.0";
+
+  sha256 = "1lx66lhzfzhysymcbzfq9nrafyfmwdb79lli9kvhz6m12dhz6j18";
+
+  nativeBuildInputs = [ exo ];
+  buildInputs = [ gtk2 gtk3 libwnck3 libXmu ];
+
+  configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
new file mode 100644
index 00000000000..de37e4071fe
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
@@ -0,0 +1,15 @@
+{ mkXfceDerivation, gtk3, libxfce4ui, vte }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-terminal";
+  version = "0.8.6";
+
+  sha256 = "1a0b2ih552zhbbx1fc5ad80nafvkc5my3gw89as4mvycnhyd5inj";
+
+  buildInputs = [ gtk3 libxfce4ui vte ];
+
+  meta = {
+    description = "A modern terminal emulator";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
new file mode 100644
index 00000000000..e7f13e104c8
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
@@ -0,0 +1,15 @@
+{ lib, mkXfceDerivation, gtk2, libnotify ? null, libpulseaudio, keybinder, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-volumed-pulse";
+  version = "0.2.2";
+
+  sha256 = "0ccb98b433lx5fgdqd3nqqppg4sldr5p1is6pnx85h9wyxx5svhp";
+
+  buildInputs = [ gtk2 libnotify libpulseaudio keybinder xfconf ];
+
+  meta = with lib; {
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix
new file mode 100644
index 00000000000..8280922d1c7
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfconf/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, libxfce4util }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfconf";
+  version = "4.13.4";
+
+  sha256 = "1bm4q06rwlmkmcy6qnwm6l70w6749iqfrmsrgj3y1jb2sacc3pd4";
+
+  buildInputs = [ libxfce4util ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
new file mode 100644
index 00000000000..7ce32424b9b
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
@@ -0,0 +1,22 @@
+{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfdesktop";
+  version = "4.13.1";
+
+  sha256 = "0idc8j44apflvdasnvj7ld0fa8mxlwpndfqzbh97w54s8972gf6g";
+
+  buildInputs = [
+    exo
+    gtk3
+    libxfce4ui
+    libxfce4util
+    libwnck3
+    xfconf
+  ];
+
+  meta = {
+    description = "Xfce's desktop manager";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix
new file mode 100644
index 00000000000..d5de6817300
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix
@@ -0,0 +1,27 @@
+{ mkXfceDerivation, exo, dbus_glib, epoxy ? null, gtk2, libICE, libSM
+, libstartup_notification ? null, libxfce4ui, libxfce4util, libwnck
+, libXpresent ? null, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfwm4";
+  version = "4.13.0";
+
+  sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9";
+
+  nativeBuildInputs = [ exo ];
+
+  buildInputs = [
+    dbus_glib
+    epoxy
+    gtk2
+    libICE
+    libSM
+    libstartup_notification
+    libxfce4ui
+    libxfce4util
+    libwnck
+    libXpresent
+    xfconf
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 230ee580522..500b398dc62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18643,7 +18643,10 @@ with pkgs;
   };
 
   xfce = xfce4-12;
+  xfceUnstable = xfce4-13;
+
   xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
+  xfce4-13 = recurseIntoAttrs (callPackage ../desktops/xfce4-13 { });
 
   xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
 

From 5d83988c1e4a666086c0ba96cae7ab6cbb41c3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Mon, 11 Dec 2017 04:05:15 +0100
Subject: [PATCH 0007/2266] nixos-container: Fix `destroy` terminating before
 it's done. Fixes #32545.

This also fixes the race condition found in #32551.

And it fixes nixops's repeated destroy/deploy being broken
(https://github.com/NixOS/nixops/issues/809).
---
 .../nixos-container/nixos-container.pl        | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index fefdcd614a5..2cb723a7b71 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -7,6 +7,7 @@ use File::Slurp;
 use Fcntl ':flock';
 use Getopt::Long qw(:config gnu_getopt);
 use Cwd 'abs_path';
+use Time::HiRes;
 
 my $nsenter = "@utillinux@/bin/nsenter";
 my $su = "@su@";
@@ -214,21 +215,6 @@ if (!-e $confFile) {
     die "$0: container ‘$containerName’ does not exist\n" ;
 }
 
-sub isContainerRunning {
-    my $status = `systemctl show 'container\@$containerName'`;
-    return $status =~ /ActiveState=active/;
-}
-
-sub terminateContainer {
-    system("machinectl", "terminate", $containerName) == 0
-        or die "$0: failed to terminate container\n";
-}
-
-sub stopContainer {
-    system("systemctl", "stop", "container\@$containerName") == 0
-        or die "$0: failed to stop container\n";
-}
-
 # Return the PID of the init process of the container.
 sub getLeader {
     my $s = `machinectl show "$containerName" -p Leader`;
@@ -237,6 +223,30 @@ sub getLeader {
     return int($1);
 }
 
+sub isContainerRunning {
+    my $status = `systemctl show 'container\@$containerName'`;
+    return $status =~ /ActiveState=active/;
+}
+
+sub terminateContainer {
+    my $leader = getLeader;
+    system("machinectl", "terminate", $containerName) == 0
+        or die "$0: failed to terminate container\n";
+    # Wait for the leader process to exit
+    # TODO: As for any use of PIDs for process control where the process is
+    #       not a direct child of ours, this can go wrong when the pid gets
+    #       recycled after a PID overflow.
+    #       Relying entirely on some form of UUID provided by machinectl
+    #       instead of PIDs would remove this risk.
+    #       See https://github.com/NixOS/nixpkgs/pull/32992#discussion_r158586048
+    while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) }
+}
+
+sub stopContainer {
+    system("systemctl", "stop", "container\@$containerName") == 0
+        or die "$0: failed to stop container\n";
+}
+
 # Run a command in the container.
 sub runInContainer {
     my @args = @_;

From bbeecc708efc080acab7d10b912bd881d78673fa Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 31 Dec 2017 11:12:41 +0200
Subject: [PATCH 0008/2266] lvmsync: init at 3.3.2

---
 pkgs/tools/backup/lvmsync/Gemfile      |  2 ++
 pkgs/tools/backup/lvmsync/Gemfile.lock | 19 +++++++++++++
 pkgs/tools/backup/lvmsync/default.nix  | 37 ++++++++++++++++++++++++++
 pkgs/tools/backup/lvmsync/gemset.nix   | 36 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 5 files changed, 96 insertions(+)
 create mode 100644 pkgs/tools/backup/lvmsync/Gemfile
 create mode 100644 pkgs/tools/backup/lvmsync/Gemfile.lock
 create mode 100644 pkgs/tools/backup/lvmsync/default.nix
 create mode 100644 pkgs/tools/backup/lvmsync/gemset.nix

diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/tools/backup/lvmsync/Gemfile
new file mode 100644
index 00000000000..a87462e2b8a
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org/'
+gem 'lvmsync'
diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock
new file mode 100644
index 00000000000..1fe903f1508
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    git-version-bump (0.15.1)
+    lvmsync (3.3.2)
+      git-version-bump (~> 0.10)
+      treetop
+    polyglot (0.3.5)
+    treetop (1.6.9)
+      polyglot (~> 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  lvmsync
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix
new file mode 100644
index 00000000000..dc589316a58
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, bundlerEnv, ruby, makeWrapper }:
+
+let
+
+  pname = "lvmsync";
+  version = (import ./gemset.nix)."${pname}".version;
+
+in stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  env = bundlerEnv {
+    name = "${pname}-${version}-gems";
+    ruby = ruby;
+    gemfile  = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset   = ./gemset.nix;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Optimised synchronisation of LVM snapshots over a network";
+    homepage = http://theshed.hezmatt.org/lvmsync/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix
new file mode 100644
index 00000000000..7f80e928660
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/gemset.nix
@@ -0,0 +1,36 @@
+{
+  git-version-bump = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xcj20gmbpqn2gcpid4pxpnimfdg2ip9jnl1572naz0magcrwl2s";
+      type = "gem";
+    };
+    version = "0.15.1";
+  };
+  lvmsync = {
+    dependencies = ["git-version-bump" "treetop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02mdrvfibvab4p4yrdzxvndhy8drss3ri7izybcwgpbyc7isk8mv";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
+      type = "gem";
+    };
+    version = "1.6.9";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57c15125d2a..bd27a82d721 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3008,6 +3008,8 @@ with pkgs;
 
   ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
 
+  lvmsync = callPackage ../tools/backup/lvmsync { };
+
   kippo = callPackage ../servers/kippo { };
 
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };

From a0d91e1dc9167c7e06ad058c5070eeac6cbef2c8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 10 Jan 2018 07:35:23 -0600
Subject: [PATCH 0009/2266] texlive: don't remove luatex from packages that
 require it.

Fixes #31482.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index a6b1ac6c9f4..df9a9b4d648 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -55,15 +55,9 @@ let
 
       # remove dependency-heavy packages from the basic collections
       collection-basic = orig.collection-basic // {
-        deps = removeAttrs orig.collection-basic.deps [ "luatex" "metafont" "xdvi" ];
-      };
-      latex = orig.latex // {
-        deps = removeAttrs orig.latex.deps [ "luatex" ];
+        deps = removeAttrs orig.collection-basic.deps [ "metafont" "xdvi" ];
       };
       # add them elsewhere so that collections cover all packages
-      collection-luatex = orig.collection-luatex // {
-        deps = orig.collection-luatex.deps // { inherit (tl) luatex; };
-      };
       collection-metapost = orig.collection-metapost // {
         deps = orig.collection-metapost.deps // { inherit (tl) metafont; };
       };

From 68dda232d2ca09a6609f8dfd5d24d8c195617d24 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 9 Jan 2018 20:49:55 -0400
Subject: [PATCH 0010/2266] amdgpu-pro: 17.10 -> 17.40

---
 nixos/modules/hardware/video/amdgpu-pro.nix   | 16 ++++-
 pkgs/os-specific/linux/amdgpu-pro/default.nix | 47 +++++++-----
 .../patches/0001-disable-firmware-copy.patch  | 25 -------
 .../0001-fix-warnings-for-Werror.patch        | 71 +++++++++++++++++++
 .../0002-fix-sketchy-int-ptr-warning.patch    | 25 +++++++
 .../patches/0002-linux-4.9-fixes.patch        | 50 -------------
 ...seq_printf-format-for-64-bit-context.patch | 25 -------
 .../patches/0003-disable-firmware-copy.patch  | 25 +++++++
 .../0004-fix-warnings-for-Werror.patch        | 46 ------------
 .../linux/amdgpu-pro/xreallocarray.c          |  5 ++
 10 files changed, 171 insertions(+), 164 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c

diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 5cc96d8bd07..50af022b93c 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -15,13 +15,19 @@ let
 
   opengl = config.hardware.opengl;
 
+  kernel = pkgs.linux_4_9.override {
+    extraConfig = ''
+      KALLSYMS_ALL y
+    '';
+  };
+
 in
 
 {
 
   config = mkIf enabled {
 
-    nixpkgs.config.xorg.abiCompat = "1.18";
+    nixpkgs.config.xorg.abiCompat = "1.19";
 
     services.xserver.drivers = singleton
       { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
@@ -31,6 +37,9 @@ in
 
     boot.extraModulePackages = [ package ];
 
+    boot.kernelPackages =
+      pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel);
+
     boot.blacklistedKernelModules = [ "radeon" ];
 
     hardware.firmware = [ package ];
@@ -38,10 +47,15 @@ in
     system.activationScripts.setup-amdgpu-pro = ''
       mkdir -p /run/lib
       ln -sfn ${package}/lib ${package.libCompatDir}
+      ln -sfn ${package} /run/amdgpu-pro
     '' + optionalString opengl.driSupport32Bit ''
       ln -sfn ${package32}/lib ${package32.libCompatDir}
     '';
 
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "KALLSYMS_ALL")
+    ];
+
     environment.etc = {
       "amd/amdrc".source = package + "/etc/amd/amdrc";
       "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index e7825a0ebd6..ccf13656fff 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "17.10";
+  version = "17.40";
   pname = "amdgpu-pro";
-  build = "${version}-401251";
+  build = "${version}-492261";
 
   libCompatDir = "/run/lib/${libArch}";
 
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
-    sha256 = "004n0df8acjpjz72z3bjxb2a0b7qwln13jlknfn7xxqvhhwwy40a";
+    sha256 = "1c073lp9cq1rc2mddky2r0j2dv9dd167qj02visz37vwaxbm2r5h";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
@@ -57,15 +57,14 @@ in stdenv.mkDerivation rec {
     sourceRoot=.
   '';
 
-  modulePatches = [
-    ./patches/0001-disable-firmware-copy.patch
-    ./patches/0002-linux-4.9-fixes.patch
-    ./patches/0003-Change-seq_printf-format-for-64-bit-context.patch
-    ./patches/0004-fix-warnings-for-Werror.patch
-  ];
+  modulePatches = optionals (!libsOnly) ([
+    ./patches/0001-fix-warnings-for-Werror.patch
+    ./patches/0002-fix-sketchy-int-ptr-warning.patch
+    ./patches/0003-disable-firmware-copy.patch
+  ]);
 
   patchPhase = optionalString (!libsOnly) ''
-    pushd usr/src/amdgpu-pro-${build}
+    pushd usr/src/amdgpu-${build}
     for patch in $modulePatches
     do
       echo $patch
@@ -74,12 +73,18 @@ in stdenv.mkDerivation rec {
     popd
   '';
 
+  xreallocarray = ./xreallocarray.c;
+
   preBuild = optionalString (!libsOnly) ''
-    pushd usr/src/amdgpu-pro-${build}
+    pushd usr/src/amdgpu-${build}
     makeFlags="$makeFlags M=$(pwd)"
     patchShebangs pre-build.sh
     ./pre-build.sh ${kernel.version}
     popd
+    pushd lib
+    $CC -fPIC -shared -o libhack-xreallocarray.so $xreallocarray
+    strip libhack-xreallocarray.so
+    popd
   '';
 
   modules = [
@@ -89,7 +94,7 @@ in stdenv.mkDerivation rec {
   ];
 
   postBuild = optionalString (!libsOnly)
-    (concatMapStrings (m: "xz usr/src/amdgpu-pro-${build}/${m}\n") modules);
+    (concatMapStrings (m: "xz usr/src/amdgpu-${build}/${m}\n") modules);
 
   NIX_CFLAGS_COMPILE = "-Werror";
 
@@ -110,16 +115,17 @@ in stdenv.mkDerivation rec {
     pushd usr
     cp -r lib/${libArch}/* $out/lib
   '' + optionalString (!libsOnly) ''
-    cp -r src/amdgpu-pro-${build}/firmware $out/lib/firmware
+    cp -r src/amdgpu-${build}/firmware $out/lib/firmware
   '' + ''
     cp -r share $out/share
     popd
 
     pushd opt/amdgpu-pro
-  '' + optionalString (!stdenv.is64bit) ''
+  '' + optionalString (!libsOnly && stdenv.is64bit) ''
     cp -r bin $out/bin
   '' + ''
     cp -r include $out/include
+    cp -r share/* $out/share
     cp -r lib/${libArch}/* $out/lib
   '' + optionalString (!libsOnly) ''
     mv lib/xorg $out/lib/xorg
@@ -128,12 +134,12 @@ in stdenv.mkDerivation rec {
 
   '' + optionalString (!libsOnly)
     (concatMapStrings (m:
-      "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
+      "install -Dm444 usr/src/amdgpu-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
   + ''
     mv $out/etc/vulkan $out/share
     interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
     libPath="$out/lib:$out/lib/gbm:$depLibPath"
-  '' + optionalString (!stdenv.is64bit) ''
+  '' + optionalString (!libsOnly && stdenv.is64bit) ''
     for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do
       patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog"
     done
@@ -147,10 +153,17 @@ in stdenv.mkDerivation rec {
     for lib in `find "$out/lib/" -name '*.so*' -type f`; do
       patchelf --set-rpath "$libPath" "$lib"
     done
-    for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do
+    for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so libamdocl${bitness}.so; do
       perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
     done
+    for lib in dri/amdgpu_dri.so libdrm_amdgpu.so.1.0.0 libgbm_amdgpu.so.1.0.0 libkms_amdgpu.so.1.0.0 libamdocl${bitness}.so; do
+      perl -pi -e 's:/opt/amdgpu-pro/:/run/amdgpu-pro/:g' "$out/lib/$lib"
+    done
     substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/opt/amdgpu-pro/lib/${libArch}" "$out/lib"
+  '' + optionalString (!libsOnly) ''
+    for lib in drivers/modesetting_drv.so libglamoregl.so; do
+      patchelf --add-needed $out/lib/libhack-xreallocarray.so $out/lib/xorg/modules/$lib
+    done
   '';
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
deleted file mode 100644
index 4733e0580af..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 704cef8638ffbdd8de9e57f28b43ea42c685ea87 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sat, 28 Jan 2017 16:57:26 -0400
-Subject: [PATCH 1/4] disable firmware copy
-
----
- pre-build.sh | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/pre-build.sh b/pre-build.sh
-index 622ff13..e3cd009 100755
---- a/pre-build.sh
-+++ b/pre-build.sh
-@@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
-     | sort -u \
-     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
-     > include/rename_symbol.h
--
--FW_DIR="/lib/firmware/$KERNELVER"
--mkdir -p $FW_DIR
--cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/radeon $FW_DIR
--cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/amdgpu $FW_DIR
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
new file mode 100644
index 00000000000..ecde6401ac1
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
@@ -0,0 +1,71 @@
+From 9167d76c435a7c1df7954f0fbe5cc6d083f8ed2f Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Mon, 6 Feb 2017 22:13:49 -0400
+Subject: [PATCH 1/3] fix warnings for Werror
+
+---
+ amd/amdgpu/amdgpu_device.c         | 4 ++--
+ amd/amdgpu/amdgpu_sa.c             | 2 +-
+ amd/display/dc/bios/bios_parser2.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/amd/amdgpu/amdgpu_device.c b/amd/amdgpu/amdgpu_device.c
+index fc1c543..186e06d 100644
+--- a/amd/amdgpu/amdgpu_device.c
++++ b/amd/amdgpu/amdgpu_device.c
+@@ -3164,7 +3164,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ 	struct drm_info_node *node, *tmp;
+ 
+ 	if (!&minor->debugfs_root)
+-		return 0;
++		return;
+ 
+ 	mutex_lock(&minor->debugfs_lock);
+ 	list_for_each_entry_safe(node, tmp,
+@@ -3175,7 +3175,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ 	}
+ 	mutex_unlock(&minor->debugfs_lock);
+ 
+-	return 0;
++	return;
+ }
+ #endif
+ 
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 7206b34..8b7123c 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -430,7 +430,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ 		if (i->fence)
+ #if defined(BUILD_AS_DKMS)
+ 			seq_printf(m, " protected by 0x%08x on context %d",
+-					i->fence->seqno, i->fence->context);
++					i->fence->seqno, (int)i->fence->context);
+ #else
+ 			seq_printf(m, " protected by 0x%08x on context %llu",
+ 				   i->fence->seqno, i->fence->context);
+diff --git a/amd/display/dc/bios/bios_parser2.c b/amd/display/dc/bios/bios_parser2.c
+index 86fce5a..99681c5 100644
+--- a/amd/display/dc/bios/bios_parser2.c
++++ b/amd/display/dc/bios/bios_parser2.c
+@@ -1326,13 +1326,13 @@ static enum bp_result get_embedded_panel_info_v2_1(
+ 	info->lcd_timing.misc_info.VERTICAL_CUT_OFF = 0;
+ 
+ 	info->lcd_timing.misc_info.H_REPLICATION_BY2 =
+-		lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2;
++		(lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2) != 0;
+ 	info->lcd_timing.misc_info.V_REPLICATION_BY2 =
+-		lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2;
++		(lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2) != 0;
+ 	info->lcd_timing.misc_info.COMPOSITE_SYNC =
+-		lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC;
++		(lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC) != 0;
+ 	info->lcd_timing.misc_info.INTERLACE =
+-		lvds->lcd_timing.miscinfo & ATOM_INTERLACE;
++		(lvds->lcd_timing.miscinfo & ATOM_INTERLACE) != 0;
+ 
+ 	/* not provided by VBIOS*/
+ 	info->lcd_timing.misc_info.DOUBLE_CLOCK = 0;
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
new file mode 100644
index 00000000000..20f429757a5
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
@@ -0,0 +1,25 @@
+From a07ee5dec35ca24a013a6638543ef5030b2bab40 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Tue, 9 Jan 2018 21:45:33 -0400
+Subject: [PATCH 2/3] fix sketchy int->ptr warning
+
+---
+ amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+index d0f091b..707815a 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+@@ -236,7 +236,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
+ 		pbn = drm_dp_calc_pbn_mode(clock, bpp);
+ 
+ 		slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+-		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
++		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, &slots);
+ 
+ 		if (!ret)
+ 			return false;
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
deleted file mode 100644
index aa6cbcc118d..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0ead7017e1db18be971c24c891d4bdcc507deea7 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 29 Jan 2017 18:23:47 -0400
-Subject: [PATCH 2/4] linux-4.9 fixes
-
----
- amd/amdkcl/kcl_io.c                     | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/amd/amdkcl/kcl_io.c b/amd/amdkcl/kcl_io.c
-index d8f843f..9a1bd9b 100644
---- a/amd/amdkcl/kcl_io.c
-+++ b/amd/amdkcl/kcl_io.c
-@@ -31,4 +31,6 @@ void amdkcl_io_init(void)
- 	_kcl_io_free_memtype = amdkcl_fp_setup("io_free_memtype", NULL);
- }
- #endif
-+#else
-+void amdkcl_io_init(void) {}
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 34313a9..44a4a71 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
- static int dm_plane_helper_prepare_fb(
- 	struct drm_plane *plane,
- 	const struct drm_plane_state *new_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static int dm_plane_helper_prepare_fb(
-+	struct drm_plane *plane,
-+	struct drm_plane_state *new_state)
- #else
- static int dm_plane_helper_prepare_fb(
- 	struct drm_plane *plane,
-@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
- static void dm_plane_helper_cleanup_fb(
- 	struct drm_plane *plane,
- 	const struct drm_plane_state *old_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static void dm_plane_helper_cleanup_fb(
-+	struct drm_plane *plane,
-+	struct drm_plane_state *old_state)
- #else
- static void dm_plane_helper_cleanup_fb(
- 	struct drm_plane *plane,
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
deleted file mode 100644
index 7a11c9bd4ef..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b6dd36dd90c5d88ae10b9dbc763d3bacb95ccddb Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 16:46:39 +0100
-Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
-
----
- amd/amdgpu/amdgpu_sa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index 74932bf..db4119a 100644
---- a/amd/amdgpu/amdgpu_sa.c
-+++ b/amd/amdgpu/amdgpu_sa.c
-@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
- 			   soffset, eoffset, eoffset - soffset);
- 
- 		if (i->fence)
--#if defined(BUILD_AS_DKMS)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
- 			seq_printf(m, " protected by 0x%08x on context %d",
- 					i->fence->seqno, i->fence->context);
- #else
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
new file mode 100644
index 00000000000..0091c471680
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
@@ -0,0 +1,25 @@
+From 7a3062acbbabdb29239bbc8c984e62589a88576e Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Tue, 9 Jan 2018 21:49:55 -0400
+Subject: [PATCH 3/3] disable firmware copy
+
+---
+ pre-build.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/pre-build.sh b/pre-build.sh
+index e7b8a32..bad8f25 100755
+--- a/pre-build.sh
++++ b/pre-build.sh
+@@ -38,8 +38,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
+     | sort -u \
+     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
+     >> include/rename_symbol.h
+-
+-FW_DIR="/lib/firmware/$KERNELVER"
+-mkdir -p $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/radeon $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/amdgpu $FW_DIR
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
deleted file mode 100644
index cd360e18faa..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dbf01d3934c52acaaa37f008859f69c5edf19ad5 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Mon, 6 Feb 2017 22:13:49 -0400
-Subject: [PATCH 4/4] fix warnings for Werror
-
----
- amd/amdgpu/amdgpu_ttm.c                 | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 0e30389..890aafa 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
- 	return flags;
- }
- 
-+#if 0
- static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
- {
- 	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
-@@ -1132,6 +1133,7 @@ static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo)
- 
- 	return res;
- }
-+#endif
- 
- static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
- 					    const struct ttm_place *place)
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 44a4a71..ae7e707 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode(
- }
- 
- static struct dc_target *create_target_for_sink(
--		const struct amdgpu_connector *aconnector,
-+		struct amdgpu_connector *aconnector,
- 		const struct drm_display_mode *drm_mode,
- 		const struct dm_connector_state *dm_state)
- {
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
new file mode 100644
index 00000000000..ab47bacb822
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
@@ -0,0 +1,5 @@
+#include <malloc.h>
+
+void *xreallocarray(void *ptr, size_t nmemb, size_t size) {
+  return reallocarray(ptr, nmemb, size);
+}

From ebf1dade82911ad4e0d88cf09ad4feb5819549d5 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 9 Jan 2018 21:20:33 -0400
Subject: [PATCH 0011/2266] xorg: allow and check abiCompat on current version

---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ca1a773c4a2..5de1dadc969 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -429,8 +429,9 @@ in
   xorgserver = with xorg; attrs_passed:
     # exchange attrs if abiCompat is set
     let
+      version = (builtins.parseDrvName attrs_passed.name).version;
       attrs = with args;
-        if (args.abiCompat == null) then attrs_passed
+        if (args.abiCompat == null || lib.hasPrefix args.abiCompat version) then attrs_passed
         else if (args.abiCompat == "1.17") then {
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;
@@ -452,7 +453,7 @@ in
             buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
             postPatch = "sed '1i#include <malloc.h>' -i include/os.h";
             meta.platforms = stdenv.lib.platforms.unix;
-        } else throw "unsupported xorg abiCompat: ${args.abiCompat}";
+        } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}";
 
     in attrs //
     (let

From c14fbcc4fcfbebc624a914ffbf57e5f4527a416c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 28 Jan 2018 13:57:48 +0000
Subject: [PATCH 0012/2266] xnbd: init at 0.3.0

---
 pkgs/tools/networking/xnbd/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/networking/xnbd/default.nix

diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix
new file mode 100644
index 00000000000..f70a5dc905c
--- /dev/null
+++ b/pkgs/tools/networking/xnbd/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "xnbd-0.3.0";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tar.bz2";
+    sha256 = "0jlv6cx85sjn8vjhgzmcs5mz2b6xf18mp0h61v1gl7xkbalw1flb";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ glib ];
+
+  meta = {
+    homepage = https://bitbucket.org/hirofuchi/xnbd;
+    description = "Yet another NBD (Network Block Device) server program";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.volth ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89ea6807abd..dbe7c8a0706 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3614,6 +3614,7 @@ with pkgs;
   nawk = callPackage ../tools/text/nawk { };
 
   nbd = callPackage ../tools/networking/nbd { };
+  xnbd = callPackage ../tools/networking/xnbd { };
 
   nccl = callPackage ../development/libraries/science/math/nccl {
     cudatoolkit = cudatoolkit8;

From 174fe14be2325725e1a76fce1ce83c813dff0d65 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 28 Jan 2018 13:58:22 +0000
Subject: [PATCH 0013/2266] xnbd: 0.3.0 -> 0.4.0

---
 pkgs/tools/networking/xnbd/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix
index f70a5dc905c..40351fbd130 100644
--- a/pkgs/tools/networking/xnbd/default.nix
+++ b/pkgs/tools/networking/xnbd/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson, asciidoc, libxml2, libxslt, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name = "xnbd-0.3.0";
+  name = "xnbd-0.4.0";
 
   src = fetchurl {
-    url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tar.bz2";
-    sha256 = "0jlv6cx85sjn8vjhgzmcs5mz2b6xf18mp0h61v1gl7xkbalw1flb";
+    url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz";
+    sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  sourceRoot = "${name}/trunk";
 
-  buildInputs = [ glib ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ glib jansson asciidoc libxml2 libxslt docbook_xml_dtd_45 ];
 
   meta = {
     homepage = https://bitbucket.org/hirofuchi/xnbd;

From b45f47453b8d399cb1d9c7ec93ca2bda55021380 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@univ-grenoble-alpes.fr>
Date: Wed, 31 Jan 2018 18:16:30 +0100
Subject: [PATCH 0014/2266] irods: 4.2.1 -> 4.2.2 + server bugfixes

---
 pkgs/tools/filesystems/irods/default.nix      | 13 ++--
 .../filesystems/irods/irods_root_path.patch   | 64 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 0714f290104..20e5607a959 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
+{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
 
 with stdenv;
 
+let
+  avro-cpp=avro-cpp_llvm;
+in
 let
   common = import ./common.nix {
     inherit stdenv bzip2 zlib autoconf automake cmake gnumake
@@ -13,13 +16,13 @@ in rec {
 
   # irods: libs and server package
   irods = stdenv.mkDerivation (common // rec {
-    version = "4.2.1";
+    version = "4.2.2";
     prefix = "irods";
     name = "${prefix}-${version}";
 
     src = fetchurl {
       url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz";
-      sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq";
+      sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7";
     };
 
     # Patches:
@@ -53,11 +56,11 @@ in rec {
 
   # icommands (CLI) package, depends on the irods package
   irods-icommands = stdenv.mkDerivation (common // rec {
-     version = "4.2.1";
+     version = "4.2.2";
      name = "irods-icommands-${version}";
      src = fetchurl {
        url = "http://github.com/irods/irods_client_icommands/archive/${version}.tar.gz";
-       sha256 = "1kg07frv2rf32nf53a1nxscwzgr0rpgxvp5fkmh5439knby10fqw";
+       sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h";
      };
 
      buildInputs = common.buildInputs ++ [ irods ];
diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch
index c88169ac023..16b6ba08cbb 100644
--- a/pkgs/tools/filesystems/irods/irods_root_path.patch
+++ b/pkgs/tools/filesystems/irods/irods_root_path.patch
@@ -1,5 +1,6 @@
---- a/lib/core/src/irods_default_paths.cpp	2016-10-24 17:09:02.955889536 +0200
-+++ b/lib/core/src/irods_default_paths.cpp	2016-10-24 17:09:43.178722157 +0200
+diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp
+--- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp	2016-11-15 06:23:55.000000000 +0000
++++ irods-4.2.0/lib/core/src/irods_default_paths.cpp	2016-12-20 18:03:17.156883399 +0000
 @@ -18,7 +18,7 @@
          try {
              boost::filesystem::path path{dl_info.dli_fname};
@@ -9,3 +10,62 @@
              return path;
          } catch(const boost::filesystem::filesystem_error& e) {
              THROW(-1, e.what());
+@@ -27,8 +27,7 @@
+ 
+     boost::filesystem::path
+     get_irods_config_directory() {
+-        boost::filesystem::path path{get_irods_root_directory()};
+-        path.append("etc").append("irods");
++        boost::filesystem::path path("/etc/irods");
+         return path;
+     }
+ 
+diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
+--- irods-4.2.0.orig/scripts/irods/paths.py	2016-11-15 06:23:55.000000000 +0000
++++ irods-4.2.0/scripts/irods/paths.py	2016-12-21 15:17:07.437864606 +0000
+@@ -10,7 +10,7 @@
+     return os.path.join(root_directory(), 'var', 'lib', 'irods')
+ 
+ def config_directory():
+-    return os.path.join(root_directory(), 'etc', 'irods')
++    return os.path.join(os.path.abspath('/'), 'etc', 'irods')
+ 
+ def plugins_directory():
+     return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
+@@ -37,7 +37,7 @@
+ 
+ def version_path():
+     return os.path.join(
+-        irods_directory(),
++        home_directory(),
+         'VERSION.json')
+ 
+ def hosts_config_path():
+@@ -64,7 +64,7 @@
+ 
+ def log_directory():
+     return os.path.join(
+-        irods_directory(),
++        home_directory(),
+         'log')
+ 
+ def control_log_path():
+@@ -110,8 +110,7 @@
+ def server_bin_directory():
+     return os.path.join(
+         root_directory(),
+-        'usr',
+-        'sbin')
++        'bin')
+ 
+ def server_executable():
+     return os.path.join(
+@@ -132,7 +131,7 @@
+     return os.path.join(config_directory(), 'service_account.config')
+ 
+ def genosauth_path():
+-    return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
++    return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
+ 
+ def irods_user_and_group_entries():
+     try:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4324e76b668..6ec9bab4bb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2597,6 +2597,7 @@ with pkgs;
             stdenv = llvmPackages_38.libcxxStdenv;
             libcxx = llvmPackages_38.libcxx;
             boost = boost160.override { inherit stdenv; };
+            avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
           })
       irods
       irods-icommands;

From f0bafef6a129ed8ab0d2566ae18b10ee9c4bc161 Mon Sep 17 00:00:00 2001
From: Thomas Pham <thomas.pham@ithings.ch>
Date: Fri, 19 Jan 2018 13:44:14 +0100
Subject: [PATCH 0015/2266] add Serviio Media server package and service

---
 nixos/modules/module-list.nix           |  1 +
 nixos/modules/services/misc/serviio.nix | 92 +++++++++++++++++++++++++
 pkgs/servers/serviio/default.nix        | 30 ++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 4 files changed, 125 insertions(+)
 create mode 100644 nixos/modules/services/misc/serviio.nix
 create mode 100644 pkgs/servers/serviio/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 91dd0529d3c..5c092d69abf 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -348,6 +348,7 @@
   ./services/misc/rippled.nix
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
+  ./services/misc/serviio.nix
   ./services/misc/siproxd.nix
   ./services/misc/snapper.nix
   ./services/misc/sonarr.nix
diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix
new file mode 100644
index 00000000000..a6612e9c6ad
--- /dev/null
+++ b/nixos/modules/services/misc/serviio.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.serviio;
+
+  serviioStart = pkgs.writeScript "serviio.sh" ''
+    #!${pkgs.bash}/bin/sh
+
+    SERVIIO_HOME=${pkgs.serviio}
+    
+    # Setup the classpath
+    SERVIIO_CLASS_PATH="$SERVIIO_HOME/lib/*:$SERVIIO_HOME/config"
+
+    # Setup Serviio specific properties
+    JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dorg.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade
+               -Dderby.system.home=${cfg.dataDir}/library -Dserviio.home=${cfg.dataDir} -Dffmpeg.location=${pkgs.ffmpeg}/bin/ffmpeg -Ddcraw.location=${pkgs.dcraw}/bin/dcraw"
+
+    # Execute the JVM in the foreground
+    exec ${pkgs.jre}/bin/java -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@"
+  '';
+  
+in {
+
+  ###### interface
+  options = {
+    services.serviio = {
+      
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the Serviio Media Server.
+        '';
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/serviio";
+        description = ''
+          The directory where serviio stores its state, data, etc.
+        '';
+      };
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    systemd.services.serviio = {
+      description = "Serviio Media Server";
+      after = [ "local-fs.target" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.serviio ];
+      serviceConfig = {
+        User = "serviio";
+        Group = "serviio";
+        ExecStart = "${serviioStart}";
+        ExecStop = "${serviioStart} -stop";
+      };
+    };
+
+    users.extraUsers = [
+      { 
+        name = "serviio";
+        group = "serviio";
+        home = cfg.dataDir;
+        description = "Serviio Media Server User";
+        createHome = true;
+        isSystemUser = true;
+      }
+    ];
+
+    users.extraGroups = [
+      { name = "serviio";} 
+    ];
+
+    networking.firewall = {
+      allowedTCPPorts = [ 
+        8895  # serve UPnP responses
+        23423 # console
+        23424 # mediabrowser
+      ];
+      allowedUDPPorts = [ 
+        1900 # UPnP service discovey
+      ];
+    };
+  };
+}
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
new file mode 100644
index 00000000000..0c956a6c757
--- /dev/null
+++ b/pkgs/servers/serviio/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "serviio-${version}";
+  version = "1.9";
+
+  src = fetchurl {
+    url = "http://download.serviio.org/releases/${name}-linux.tar.gz";
+    sha256 = "0vi9dwpdrk087gpi0xib0hwpvdmaf9g99nfdfx2r3wmmdzw7wysl";
+  };
+
+  phases = ["unpackPhase" "installPhase"];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://serviio.org;
+    description = "UPnP Media Streaming Server";
+    longDescription = ''
+      Serviio is a free media server. It allows you to stream your media files (music, video or images)
+      to any DLNA-certified renderer device (e.g. a TV set, Bluray player, games console) on your home network.
+    '';
+    license = licenses.free;
+    maintainers = [ maintainers.thpham ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22ce05089f8..aa5f67316ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20066,6 +20066,8 @@ with pkgs;
 
   seafile-shared = callPackage ../misc/seafile-shared { };
 
+  serviio = callPackage ../servers/serviio {};
+
   slock = callPackage ../misc/screensavers/slock {
     conf = config.slock.conf or null;
   };

From 53682b90943e2b5387fcc92c1b7545ea52dbd527 Mon Sep 17 00:00:00 2001
From: Thomas Pham <thomas.pham@ithings.ch>
Date: Fri, 19 Jan 2018 19:11:03 +0100
Subject: [PATCH 0016/2266] Update license to unfree

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

diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
index 0c956a6c757..876cc01592e 100644
--- a/pkgs/servers/serviio/default.nix
+++ b/pkgs/servers/serviio/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       Serviio is a free media server. It allows you to stream your media files (music, video or images)
       to any DLNA-certified renderer device (e.g. a TV set, Bluray player, games console) on your home network.
     '';
-    license = licenses.free;
+    license = licenses.unfree;
     maintainers = [ maintainers.thpham ];
     platforms = platforms.linux;
   };

From 6ad745209fd03543d59f5ef60487e3afbdcf49f6 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon, 12 Feb 2018 21:10:20 +1300
Subject: [PATCH 0017/2266] fontconfig: Fix for HFS+ 1s date resolution issue

HFS+ (still common on macOS machines) only has a
date resolution of 1 second.  This change makes sure that
`fcobjshash.h` gets a newer timestamp than `fcobjshash.gperf`.
---
 pkgs/development/libraries/fontconfig/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 9c4116c8f0b..1109582ad64 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
   # additionally required for the glibc-2.25 patch; avoid requiring gperf
   postPatch = ''
     sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
-    touch src/*
+    sleep 2
+    touch src/fcobjshash.h
   '';
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

From 2c59b40de4cd85a8a837f4f8a68f9bd04bc12101 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 30 Jan 2018 21:09:46 +0100
Subject: [PATCH 0018/2266] =?UTF-8?q?libxkbcommon:=200.7.2=20=E2=86=92=200?=
 =?UTF-8?q?.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated, converted to meson and removed flex (not needed since 0.3.1).
---
 .../libraries/libxkbcommon/default.nix        | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index e730cc6eaab..faeed680f3d 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,30 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
+{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.7.2";
+  name = "libxkbcommon-0.8.0";
 
   src = fetchurl {
-    url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918";
+    url = "https://xkbcommon.org/download/${name}.tar.xz";
+    sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ yacc flex xkeyboard_config libxcb ];
+  nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];
+  buildInputs = [ xkeyboard_config libxcb ];
 
-  configureFlags = [
-    "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb"
-    "--with-x-locale-root=${libX11.out}/share/X11/locale"
+  patches = [
+    # darwin compatibility
+    (fetchpatch {
+      url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch;
+      sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5";
+    })
   ];
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's/,--version-script=.*$//' Makefile
-  '';
+  mesonFlags = [
+    "-Denable-wayland=false"
+    "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
+    "-Dx-locale-root=${libX11.out}/share/X11/locale"
+  ];
 
   meta = with stdenv.lib; {
     description = "A library to handle keyboard descriptions";
-    homepage = http://xkbcommon.org;
+    homepage = https://xkbcommon.org;
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ttuegel ];
     platforms = with platforms; unix;

From a5e28a554e6b1fde424af8b7834bcfccf49a9abd Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 15 Feb 2018 17:30:59 -0600
Subject: [PATCH 0019/2266] nix-buffer: make eshell-path-env be inherited

---
 pkgs/build-support/emacs/buffer.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix
index 550163ddd69..8f824f4e1a5 100644
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/pkgs/build-support/emacs/buffer.nix
@@ -45,6 +45,8 @@ rec {
       (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
       (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
 
+      (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" eshell-path-env))
+
       (setq nixpkgs--is-nixpkgs-buffer t)
       (inherit-local 'nixpkgs--is-nixpkgs-buffer)
 

From c2b8d14b56f70b220b4c7c253036a3b3778a6780 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 17 Feb 2018 15:50:48 +0100
Subject: [PATCH 0020/2266] nixos/znapzend: fix when no previous zetup

When the znapzend module was enabled for the first time with pure =
true; then the list of previous entries is empty, but xargs still tried
to execute a znapzendzetup delete command with no arguments, which made
it fail
---
 nixos/modules/services/backup/znapzend.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 762bb4b3867..3d133f82d20 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -386,7 +386,7 @@ in
           echo Resetting znapzend zetups
           ${pkgs.znapzend}/bin/znapzendzetup list \
             | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \
-            | xargs ${pkgs.znapzend}/bin/znapzendzetup delete
+            | xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}"
         '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
           echo Importing znapzend zetup ${config} for dataset ${dataset}
           ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}

From 56c88781ee7484a725699d140d8ff0edbc36e697 Mon Sep 17 00:00:00 2001
From: Stijn DW <stijndw@users.noreply.github.com>
Date: Sat, 17 Feb 2018 20:10:17 +0100
Subject: [PATCH 0021/2266] brlaser: init from latest git

---
 pkgs/misc/cups/drivers/brlaser/default.nix | 42 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/brlaser/default.nix

diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
new file mode 100644
index 00000000000..7a6d6c3861d
--- /dev/null
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }:
+
+stdenv.mkDerivation rec {
+
+  name = "brlaser";
+
+  src = fetchFromGitHub {
+    owner = "pdewacht";
+    repo = "brlaser";
+    rev = "a52149823373e11f918d9e6a56eda7242935c99b";
+    sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6";
+  };
+
+  buildInputs = [ cmake zlib cups ];
+
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DCUPS_SERVER_BIN=$out/lib/cups/ -DCUPS_DATA_DIR=$out/share/cups/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A CUPS driver for Brother laser printers";
+    longDescription =
+      ''
+       Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help.
+
+       This driver is known to work with these printers:
+
+           Brother DCP-1510
+           Brother DCP-7030
+           Brother DCP-7040
+           Brother DCP-7055
+           Brother DCP-7055W
+           Brother DCP-7065DN
+           Brother HL-L2300D
+           Brother MFC-7360N
+      '';
+    homepage = https://github.com/pdewacht/brlaser;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ StijnDW ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a10ba606cd..d8139e9f718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20185,6 +20185,8 @@ with pkgs;
     snapscanFirmware = config.sane.snapscanFirmware or null;
   };
 
+  brlaser = callPackage ../misc/cups/drivers/brlaser { };
+
   brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { };
 
   mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };

From 965ddac92fe59b4ed3d39d214732c239b8186019 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 18 Feb 2018 14:42:04 +0100
Subject: [PATCH 0022/2266] cups: Add patch for bug where CUPS fails to save
 files to disk

Upstream report: https://github.com/apple/cups/issues/5118

In addition to not saving files, this results in spam messages in the log once per second (Expiring subscriptions...)
which is what led me to discover this bug. The patch was made by hand because the patch from the commit does not apply.
---
 pkgs/misc/cups/cups-clean-dirty.patch | 13 +++++++++++++
 pkgs/misc/cups/default.nix            |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/misc/cups/cups-clean-dirty.patch

diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch
new file mode 100644
index 00000000000..0bdc8198e8f
--- /dev/null
+++ b/pkgs/misc/cups/cups-clean-dirty.patch
@@ -0,0 +1,13 @@
+diff --git a/scheduler/main.c b/scheduler/main.c
+index 8925c8373..acf031684 100644
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -893,7 +893,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * Write dirty config/state files...
+     */
+ 
+-    if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0)
++    if (DirtyCleanTime && current_time >= DirtyCleanTime)
+       cupsdCleanDirty();
+ 
+ #ifdef __APPLE__
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index db344b32d21..39d3a53a048 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups";
       sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
     })
+    ./cups-clean-dirty.patch
   ];
 
   nativeBuildInputs = [ pkgconfig removeReferencesTo ];

From a88a712f7f15ff16df55b309225c947bae3f7bc9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 18 Feb 2018 22:06:12 +0800
Subject: [PATCH 0023/2266] nodejs: Set correct meta.position attribute

---
 pkgs/development/web/nodejs/nodejs.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index eafaf956ee0..8d8a253f01d 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -5,7 +5,7 @@
 
 with stdenv.lib;
 
-{ enableNpm ? true, version, sha256, patches }:
+{ enableNpm ? true, version, sha256, patches } @args:
 
 let
 
@@ -54,6 +54,8 @@ in
 
     setupHook = ./setup-hook.sh;
 
+    pos = builtins.unsafeGetAttrPos "version" args;
+
     inherit patches;
 
     preBuild = optionalString stdenv.isDarwin ''

From e1bd5b33b66d95d4dac3800e283ecabff28dae86 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 18 Feb 2018 22:17:43 +0800
Subject: [PATCH 0024/2266] nodejs: Add release keys update script

---
 .../web/nodejs/nodejs-release-keys.asc        | 776 ++++++++++++++++++
 pkgs/development/web/nodejs/update-keyring    |  18 +
 2 files changed, 794 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/nodejs-release-keys.asc
 create mode 100755 pkgs/development/web/nodejs/update-keyring

diff --git a/pkgs/development/web/nodejs/nodejs-release-keys.asc b/pkgs/development/web/nodejs/nodejs-release-keys.asc
new file mode 100644
index 00000000000..c89b3b37f87
--- /dev/null
+++ b/pkgs/development/web/nodejs/nodejs-release-keys.asc
@@ -0,0 +1,776 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFKKodABCADiE7Ex8GXnQNgipqbTADO5+BfufYFeq9YLEKkuOUfnjAZ8Wzle
+4eLL4rdfFSuwuUO0rkSFOpNjkjKqxfRo0RkmlMxdHwT2auf/yrfX4EyhyKDn1Vh8
+MP2JecXQN3FVa1yR8AMGfT0zOP138MNp21tNp3Dy9r/ds6ZhttrnR+mrKnhKMmTj
+1J+MX/LKw3o9ERIz0O8dxw75pA27npX1EcSCM1Vcq1bam7xD6d3cfQtfQsidXkQ/
+nFpD7BQFU+nemYaa6Vkuy4VJ11AMLNvzoWc2iHofD0kO60am3z6x8t63m+BUSU5I
+r7B5GNbatekJqu/Qn1qrCjyuXcExEsGnCJl/ABEBAAG0ElJvZCBWYWdnIDxyQHZh
+LmdnPokBOAQTAQIAIgUCUoqh0AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQwnN5L32DVF2cywf/Vws0J68vxn+ngUzq/wcWlQANfwMFUcD/8eM0N1B3OMXQ
+9+GSlsuEUvh6/oxYxn4EPIgdqsV25SB/fAUz4uN50qvc0ft+wTgh20pnMP0qLf7/
+adb/dBf/NTV4TWzHaUDAkwPXqPd4He7AI5/PZeaMGmJPJmeR8ZM0ZrvLsNTmYV6N
+byWcqYvbbRSNSn4ypb/QbYjFQZB2QKrC1LAW9jpdNnfQViYeZDmoSRaCTOv7SeSy
+TkzOhMFRZDP9NmUvnl3chWNdmBoLls3/lO1Kpuc8h+nXkgU1hUyvsPjs8zBaqUDI
+oMudExnECyEUHlZvVLlfpocznOPqlBhxjR0Q9VRYYokCHAQQAQIABgUCWL7qpAAK
+CRCVUaCxpuKXzorJEACb96lsYyavUJOsFd6w8pgOENJjxZF64JR0Dx1rSsC4VgUa
+m5zVVasJ29oAnzpeCQzt0sazTgLYrzxA4RY/guI7FBmI3p1nwhUCprG5QMuE1iZ+
+PXVvkTNnNWDlpGGSkDyiC0ER3kWVlECaJhDmSDHxVNl+IwXgd6Jmx47RHYv64rON
+FERHfMjzCUi5uLs+zoIU2V8sy3j7Hv10+/zUGBSy3wSaUlmNK+7wkI9WS3BkcQ/1
+6Afet+De5XSVdDJu2TwhESEyXHFgXv9UQAbj5e8/fG8S/kPalQKnzQxp4eYtgC7a
+cq1LGOX5BS0eFdwCnyNkZUhuHkjSYqg6GjEhmgEhUmow9FzaAD2JO8lXMYXtiXTX
+U3VeY92b7gEt76HdefuAhPFRo2DppSQB2Qh1d6+WRWjxfIcVZcMjby3cDzBYZvfj
+Jhzxv+3qSlzeYeDSLZUkyARRshLcd1LvlZiHntveiMuvehemVLcQ2XtCJh6mCfFJ
+HwkRloAswSW1XiDEaybcc/Cok5aPjk/sozVCH1g9lyeQTIQ7QCYQzA2TrfCLOvL0
+9pguTGRFC22ikZzgPD9dC5vo1MvjRczT2g3gDxqrjvt35v3+ZlQ4ZJ+U2G9Ew+XF
+Jn9bo4ZXxffj6jPnFiELZfSwIGP9EUaPXMXh/lov8IMfr37cQsE360A82RRAd4kC
+IgQTAQgADAUCVw1LygWDB4YfgAAKCRDnO8ZBzBH0yHMND/46YV031EzwZL67h+ZC
+SWka9SR+o1XHVWvjLGOcSOeBnD+8C170Q30NYVMEgSwtF8kY0M5k6GlEpIKNuOYq
+NphXkNfn00ysqJ1G8WIGmGnsA/g/4LYSGt4ttL8roW582Ps3ITAYR/OVgHBccssL
+6QdylghWW6wKYs5yoOn51pr0Ff0WyARfQxiaFNtwrZseSRrFlgCgX0+Hrfin1iHz
+l8m/I8BIywM+fW+kk6ixitkFPszvT+9sgLj5viUl7+pJzLIs3GwODkLVCWCetLfO
+XP7XDrcBQpU6OExpaC4ua4tVhfiaTJkYFB43Za0rP8egx8u7tBs9WC6rU3wygsLJ
+uD9sdahFHY4c52eBRdIvAQow1oEj3WW3JIN72TiSOFbCMiFNR1t1nezaokef89pN
+LMlJnzJ6BeKWmiSMsmOcT3Uq8cmmQpmbF3N0cZyOy2MMrnBtm0iIwY4NJ/YlLbAj
+1f4urrAWkFInzWCdE/L6VO93WwD7sHLOcq8fKWv/2/QY7kGP8Cbut59ie6wUr53S
+IEM7B21/zdcrI2ND7R9Bdo0h867NgIuve6EN/W08QbCsTAu8ukdtKOISprqBXQ7y
+7CEUGRFlHbiLfhyaNs1IHtSDVpt6Rq/U5X35Zk3MSsL44ZuTqS7HE/QMjQy8oQ2U
+tJyhZrnOkqHjT+g/kz1bKZ+JPbQXUm9kIFZhZ2cgPHJvZEB2YWdnLm9yZz6JATgE
+EwECACIFAlKKo5ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEMJzeS99
+g1RdocEIAJCkX71Kddk6B1HD9V80dpTVvm+YMup2qca6LqLtsiYE/O/XZHRZZ1WJ
+RdxTGqGLKLkHgea0PUaxrcUxSzibDFJqEcRBz90ojaVu2jXb8Wbr9PkNcV0ABivy
+PCpx0IFUxKj3+94akK9DOzwLpAf2QMSm0JlQhdql8K0JCRyk9ehkBCxcssVKocgZ
+TCRur475lYNDU4SiQoJJ7iFirf1SvNAoeXwXiqDAR2q/k5VrANmfzKvmQ4UMciEx
+vQaxc+q7LsBI0/EzFtWCnhPabEzhY8lzqsxlfdEbFXWFO1V6206FBYuymTE6IDxg
+trhVg6FZgmWSrxnWWasJSZxv2iWhwgKJAhwEEAECAAYFAli+6qQACgkQlVGgsabi
+l843ZRAAsPXN0qd5njBzcSMOTSwYVOX5/1NNWI4ac0kbtdgh9bvcWxL1OtR0nkiA
+6evmTtC7HuMSKtviMtpHwIHp1TVu4nuosFUJaLRkxv43U7ReQSk8nxFWBcucLIaL
+8/V89YmLH6LAWEr6zaP2KoRwDLJr5mfpU8GLaBVittGzxN9llkmPRA12uS7HHgRq
+i1D8bcZVj4EHoB4Lj5U0L/GpqgU/UitUR32fmmfvzQFMWVRMfJHP389Y2lRbcqC/
+rZXa2USH5WC+oDejhRq50S3B/v1jB8jtYtWZXmYQCk98KCUB+4ck8uSLYZGtZpt4
+lb2ZSFb3IhGAzJR5DBgZI6YrfwnBfOxdt0VWv/pU0PzNGbl/iLRWFI1aIOcIsWkV
+0+XDegde8kTdhvrlbE+Dst8sBdIKN+4BJxkGVlugKFnlLcTPiMAsz1W3b0wT3PgA
+zSYgf32KUCtxSgJO7rkKOf1vzcuH8L/MYH6X3CV9Zm4ZXXbTSyMp04LCJZMO3K/L
+4lc+sYs/KFJCl5mt7zCXs56ta522TFgg+4JV7ZyI+74ZPA+MJB647cdHiNYMIh3r
+FUiz4PJRQCu3NdeyCktChASFKag2AMIKEKeow5z+e3EE6zRy7ErBBLb9T/14BBPn
+5FRSv0A3iiQVw77i30Ds1YuROX7sWsN74sgJfytLiy9vdT3Jiz+JAiIEEwEIAAwF
+AlcNS7sFgweGH4AACgkQ5zvGQcwR9MiizBAA5IaFWe3L1TckdaIu+z/OlxEsL8jF
+NJVCXdjUoOUk4PKf2BpMbWXM9N+JrZw3kjyWX//S6Dl5Do/tO9JTMX0btwIfhZUk
+uvx7H4Oh38UKwkDl207DF9JMDeU6/h/rsWjAmzVLxMhdbEGIDQlhjYgsZbJjC5be
+ZDuYfDKOye65HUa++O6h5EOBd2qLRl/pGJHLlAiGPLtwY3jewEZlCrlO958aTkPl
+AHxh+ltRWLd2zYF0xnBaWvpFOVArjDNkTSuyYYNtBa6OmKPZ4BkPQb5Av9b9GCwJ
+2dxdlUf7GexBHlANRbAcw0kXmCJOYLxxOx8jQRnQ8TLiL9Rds4c+XlloJfYsD/Rx
+vIvUAKMqFEXmMlBnO9VJeiw4r0F7pNH6VYp7bnz1NiW3Mimk0Kjz2TTOVpfR+kht
+hMFO+oCpJShsfqq9WWX2+MM/dC11oIGfr/kGqK6DSkIbflkqFnBEVuM+uUe0OeDV
+IWrEF5O22+pGeC0Yezrzp4x+3lL8ObsFKGWwxTdmbpIcR4zT+Er3dPAdLBFcm/Le
+0Odjv1sj/LLOC6FKg7qKG7raglkQSMEF8DAtWkE2H1P2ywvky8HArk5OM0LXcxub
+Mo849kZrLhGblt8+zp32fafsQEIsNAzoqCR50XSHJhMb0zmPmvXCAfsk1wWKlgFg
+M7vo0zXSYLg8ifa5AQ0EUoqh0AEIANGUbt///24seQv1o9hgAWJ6i7sjC79jCH1m
+tPlLjAsUcGg+16fTwAlII1Z2ffXYKs9MvcGBNVdxkR8S1g+aYM/ds3hY2CglHe7z
+N+/pkYr5I1jchmCE6LQDbGA/yIfiufMkUFB1Pry34P+G3mcnENfeETns/26yCSJ9
+plysIggJiPKS3ihrPnp8qjCEByzBn70HRkliS4nnjws1aSG67aWUn0RdELrK7Mgm
+EWRacrMu308pgdn7XQ/hUUPcsOAqiI9tc0xeG2FXEg2WS7aklqAw7yjEpJK7qid0
+ntEbKy3Erlu29ZxzH/kphNJH5eQFgXJ0guhG/Sm4ljt45nn7H+8AEQEAAYkBHwQY
+AQIACQUCUoqh0AIbDAAKCRDCc3kvfYNUXVfxCAC1ajXnKPFswIU2RgJETuY1GgUH
+NL8oU3bp5oGhocKPcDPQL8rLZkAhTfKYkRoc6hLS5wcgz8FSEEz5oMesBWCXSZBS
+8xTW0vgncbrTUVnVmCAz88qeQ7SA9RVmgnpgKnVAv46azZQkB+x1FR2scSEf7uoo
+Go5zxB7LvSwRX+bgyct5TRcs37lLLaaGlgsy7yrcZYqqUXjEOGrZ78KMNDifK+X0
+XYoGY+p4sCfl4Uf46qANa4shQMZjKaWGZpiqs673aIg0MoZPCyTTO6Atfsv2Li8E
+ossDZpvJuroJFZw5zvIEy7AiDAcCZjMj8FLoLzom0A1FNxCvgzOraMITOobsmQIN
+BFM7JpoBEACmf7uB5P5QJ8X38ARQn+dr+/O+6/wzkKzUcoFvRArwZTcpdEO/0C12
+kNSpK2UkVMh4sorYwA8W0yv3spZJWU3TiIfCVryxqZaAWEIU+dwsQ0P6EAUythjd
+QEs81bG6aN0dUqE26fWjGL/mU7BPtAwfzg6lty2cwZJP5zaNCl/PjRUeTKC2oNas
+3M5dWoOqWq6HLPqnTEPHPlZ/mhkOfLOnJA6r669sQcml5R+Lhwd8wdJp+ANiDLW6
+61MmaiA4VqjEXwsXKK0KISWftEgd9WGBsHH8rn4KdKj9u6EtnDlA3vaPmADZmf7R
+VSMRoMkdiswFqEIMQuhTVbqS69vyhtByQs1fhriYrPy3OMeSMjJ/zNDCnHTBuKxo
+NHgMcznVu1tjz+ggso7Whd0IiXEaHXhF5ASWnJJa+xLxXQRQV2X1RXEK0bAySX5B
++NmxJRVY+ixpO5TVhQhzzzL9Ivz4z0odlvt5VJJIHHFIAWkgXRNAo0wgDzfe+jHO
+E7nz9uzYsqDBV25Zo22oMZURTBN87WZ1TFpDiORvvjR8QXJIBIUvMHAhG/ZlEkVo
+poNaznUOplnr/ToDpA1RDrdxeUAQ1i99EeBtXRREFgByFvETnVCkX/pvQA1yFrhG
+FgqCYBpN4IK0UcUx1MuwPBrfZxbL/cy+FhmJqutB6ufaJzatMQHu5QARAQABtClr
+ZXliYXNlLmlvL2Zpc2hyb2NrIDxmaXNocm9ja0BrZXliYXNlLmlvPokBHAQQAQIA
+BgUCVu4HLwAKCRDCc3kvfYNUXW4MB/9dLmaZaaPUPrEaUQfN6UngTKRNLOJj22FW
+2S+e7ALUcA808o80BaK/9dk6mmQCD8L8INRzsNOyBGfN3KL/hV0Zg7BtX2R5ed5p
+0S1CmJzsutV6AAsXJvu73bOCy0QosnpsJDRx51k/4+1jUt6PkTMy4YxbVDDBRQTG
+DApi2EeX5kwaw1jNiubsfOPtBbyuZbXS0IBKQREFwXtbwUmEc9amw2QopNj8N8Oh
+eXbmc6AjiZUdDjOj3tZ9oflc3t6lDVH5EypuKZbcR6fOf4AlrXnuE3uHYMW57D/h
+QL5/BMIe1fmK0HYEwg4BaLqCu9lgsYTYJtcTHHfisRDMs7F9Wxw7iQIcBBABAgAG
+BQJYvupKAAoJEJVRoLGm4pfOzKsQAMVG0EblgGmcLA+VKZkuHtOgasrBBJXkxDnG
+B5Xepg+1hOduxkO1rR5tGvejlWhcX8S17o1hdnl2LFdyzHwBU+i3BYYDkUFOWkO/
+mkUvB3SPyHuNMRxZtNne3aZ08Sl/3yxIJFiEvg9ZPS3NDS9G/jxcGzP4b9FHE170
+34BxSorHQxER7upkow1eO7dhjTCRVeDggMqWPYUjPGLDypiZHfkeItHvjTYaueQ9
+oUzFzRPLOBaGVl+aIlojkIWWv010Dk54/uisEBbFuVoX9b76dBx1INEVLEb66MvC
+BLhqsDH16fyj0tQEaTjSSdkJNul6n9DH2idjEkIf/+sZ11B7rW3FxuodtCB+se3Z
+c4xWWtuvahTV+UwNiPC10pOUZbEnqeo69VpETSVK5h3jQ7HsLiTIgAVgwEUjPpLD
+GsFbJ9VB9m/OYNmN8gtk67OVTu5IjHY06eifrHzBNXNf7A+udJgs+PSxfFd3jOuP
+uaR80cU3gbhbzu5LzDWo37Zj9o1MPmSENKEGnW576RKZ6lJYWkpD7XJlwYs9mPse
+LScqT2z09G4N0R/cgxGo1UCSuzWxc7eTFG8Q4kEBul7KjA2t3jxyzALbbcGDbnqS
+Ufvsr5jQQdwh0LU/xDL2sAm8Z+4yrU4mqQFicWHDCOQPUF/C0GCMbKfbqqCC56Vs
+sToI7UaTiQIiBBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTIBaUP/jguidAV
+f1iW4N/Hk059nISZM0RbjxXJh6PbEgroTzyEEJljV4c8Yv21/wMXiCklNmVhVgcc
+OoEqZMwDAz2vu4uDwDk/z41rM6lkFNVdMvBx92de+WjYYsdIBQYfklRY3LeImrkV
+vHW9YW/yyqjh/wqVKpfMTuUUufaXgr+hbB9u5UMGY2dgq+3bTj/MqgDHa6sazam2
+uU0C95CCW/rY0GzX6azVEJkEacSlue5sX2/y2UCpCI2oCc5w1NUASSYpiBrTajnE
+loDYpgt00deEonGrhTZ4zCRdHSBaaAZbzZ5KQ7AYfRnk6C8Iawlhhm4TirQb2bXq
+Oj20E2ly7tpzeo1F0ZdOQQXuolfp7Gf5UQOitMqdUeTQQ0HelWqfOoGPBkbXcOwJ
+Kz7ptfESnBD1JjNVXtBIxyG9rCeqwJxNcTt+bWrXaqfybJFUldYwKmdITnsbjlj4
+3ArxOUm/wfxgg3uVcshZ1g6etU3t+57rTQHT32VdPSKKW2AfzZS7um6+LypnIch2
+ve16PzM22HUWpounMmKc43BNa729+3R64EJ1/0qftiFuYoF+IAIkePcLc8qxJxJ/
+TJbsmSpThLz65645wbGD/b7Bnbb80ewBFMwivtwc58WSi+0oWhbuGUSAzCZfN/7I
+hcPbWtQjN0W4Fc6KCmAiIyTML8Z1CJs83k+LiQI9BBMBCgAnAhsvBQkSzAMABQsJ
+CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCGnAAoJEAn+RHNOt5kOLQEP+QHDbHiZ
+FTkJNwmx+3+WV9VeJanGXSjccM/yA/lS14PcD5ic3rm0ttI3xa8FmzePZyH17hQB
+R7eawYSrWNErJr3ODd+P8rgXy2PVr3nUdQP+jIgCcbLiGgcFaTtYnAiBXNVzZHrS
+xVKyzxECHQAtnkarIzMmVTpm985nwcSEUdj87cqFRwS4LIBDme8q+0lI+WMR0QaG
+18wO/70/7jnw1vP8J4Qn6W9dt1GTTBpTnIw+PF552YRQy4V+WSPVcijOp5/8+sdI
+DD+g11TtJLpoMsJtqNJS8XCal0LONqN7noXGc15BU9Y8LnhEvs7aG/7R1CEOeR75
+ifWnuUIrKj75xg96TPHhwzKKyuhoc2UYf4hhMgDaZhY6YrZ2LAie7CQneh9uWZn9
+Ku93UMWB01f/LyVnDrr0scvZG5g0T70h6woYuf3hIoUokma/cck4svcrv19gQ+UA
+gw7PbxbL32oaX5TShLh6j13O6UNqwYZbDslnuyp2TJy72TM0m1ESCZqF5BKZXvrB
+vvRwIkD5Oi+Y7EJBuT9ZCu3rPyTNoRfxKKAcNV3lSkQx32tucu3IYwYS3twi9y7/
+uC0fU8UQw4wDATi91vq6t8+nFMBfuZC4ZklG8ztSbF/G259WpsSuQsprFge3KKBU
+oIEde3zdEC5i7U/Tv84ON1iEoTyalDnfPDjoiQI9BBMBCgAnBQJTOyaaAhsvBQkS
+zAMABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOgmwP/i9jLD0h
+yEyusmJaIo26TW7wlN4gc1rk43AU4WXrlar2nCbW3wd5Mq5sqZPCqmOhGxXdCVP0
+Y1bXSunSQnmGWaWRxo/H+rhWYOSwICGnc3JAjSnSHndgHPBkqyw1qGivI92xghT7
+WPAn/aBDH/VgQ0LuDPeJReDFc0KFCpnxBql/eBVS5/D25LYyNhFaZcCZJItNzieP
+dJfhGdml9NoC92AP2qHTO6UgrmPJKlxDOWIEs8ITwClZp9Y5jWnSY1xhQYPfoa2M
+87WbDJRZ9XMrhUyGuqdoADdsnSIKIr+So2QOM3dPsQ/Fq6tkK9tTBlT2n9wHgmuc
+uTuT3n27GkFIF5Npz1/TnsGM8WzIsBmfOaUh8DVcurhW0ovmq+drLV15FillcV4r
+hAMBLKYquj35BjoxXaX39NKjKe7+Ngh4gUZVeQPeQtQq0jZ4rEd26x5Pj0DH3Jkz
+OaphQjS4K1Im9fZ5EL+mJ89AMKGSmMNAGnivIt84CUd6i4sT2a1YxUkq8HKQJpgr
+nPMkWpsXpq0+xnr/43CC6vnalEUjrKsT63ToHOQGRxK7RLBbUioBVy0tWKKr3ujp
+W9iPefELT8Refw5PIXHXedb8cpr0jmblQ77DM0mXXljQuTjxE9VaakHA+RwBYy0Z
+zdMMKKTcUXcHOJJgZ22RTA+07RO5c7NLkC2ziQJABBMBCgAqAhsvBQkSzAMABQsJ
+CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCF2AhkBAAoJEAn+RHNOt5kOABMP/2Df
+9RUECEKAoxnUQvDpdki0UTEJvgjdQVDonztdpGw7kaquH7KLQBxacIU0J3KDr5Da
+60RyKL1InGugbLRIt/iMbLn+ENPsIGOHAJNmIBXvChwUGFzGmSRKxZG921DJmI89
+qjtFbK0nSy3m5AUpPAmj3UD+JXGGc5QIxmhOZLcPcY9YGv0oQA51ukiycgy8s4uZ
+7SuT+VYk9wMA3EoDlMbh6nwJjaiz9eunlqMF2aB25Ri6SxtXLNJDhuTzEJSVZQTO
+k068wBR6271Y5gC6K9+DPqBQeVXoKrFzCFfGmaMAkiK25WFfwqJJKvejkWNi0FwE
+tlBKOc3KzCG3rV+0FYu/4rzNL5j9EQuMZIsu+drCz76/hA4j/sWOz1wqwRMf0197
+/EqnRVXHPnDIa9h5WbCGTKFbVaXth0bP0EXgCZ1IxFsZh7JjtVSUHYDSfZc61npe
+zXshg1JKEk9f4XIW4PoVpjrIKWFMJ0ILsE7GQA/MlW2gK4CpEMAxH8EuXQPXEHA0
+yJ1pKdpVfO35ChqYdVBIp/oNkAbYp+hwUe44/TJsWN7ARVioH9JK+EHef+QskZl0
+796cQLNW9I5txkOpSQ7cSbEF4SEaCGS/gHVtFo8xCEhVBt2ElBHeQ4Y7B4Zbv62e
+yM44mcJTTxP2SoZ/dwyFMUEbJ6PA8HScDLbFZL74tC5KZXJlbWlhaCBTZW5rcGll
+bCA8ZmlzaHJvY2sxMjNAcm9ja2V0bWFpbC5jb20+iQIcBBABAgAGBQJYvupKAAoJ
+EJVRoLGm4pfOpIQP/36ItdPwRczrB8eH3ifzqXCJXoeOZ8a1Ys/XWtzGp2j7+wwO
+PwL/t5YY8oxbZarQr3QX2RRCIiz2Ftjfea3/AN0J+AgFs+0t4zEuBkVX17SUrp5T
+Gc8EeyH39KHX2B42VgFmZyQPQMxbg/yTnhH6qUeUuteiZ+mFBhap/od+ORHfZzk4
+19ybLpOYPZPjSYw+XKgv+mLt+59h2Tt8fCy1mZUYuQOGb+YJ64Hi4IQAtLdL3x8d
+dhhG6pAsXDU5ezb8obHpySQkBqVUOcUWSYPU6p92nM0klXA5QvYuynxl8LRUy1Mx
+FL74o7aisQ3CKzIxXFkoAeorYWAAzBVDOIOiI3aEFMxHu0FQIebfI3ln0mCwSCKE
+IlrTWdeBFfJ1m9gTmbrA9ljnkMXaTcDWNszCjB9btcxV0nRqQGyEZ9wBFMwrLVy9
+cNiJ2qophrha5OmAN2lwVlKUTwTM7zisgpAPs60Z4OPsKUQ0wTjqLp6Xmv2xiTdX
+ezBEQPIBGRRcUSwO8dvKt0zRZqYBChIsgWxyTK2a5eeiTpqD4g0W8rSwf7i1GZUl
+ZR4PqgeEAuRw8ERz0o9lMuYYLBqnyMnoar+MPF/tewiKgQsiaVwBGsy/UFLP6fEA
+BE0cjueF3AtZscR5WU7oT1Qn8DzoVC54GG5QfGmV9bgRmeyon4ksMFl/6SDciQIi
+BBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTI5dYQALdHmZ+NlBsDOrGCY/kn
+qdsDreLnmHWjoK3cMrU5jkO7PgpZybjlyx7fI0A/q5HP20ZSg6BuqEn2wmLPHW34
+Xpdcr14XXjU2fZkRDFV2X4XM30to+MViQLDxcy32qguuC6HhoZBbGGgUHZ9kJQOY
+bBb6BerpEsF+5/1kUeLuHDy5BBLHWmU+qt78Qqrp1mOWE06abKpkrdkIR91FVgmQ
+a7ILIPjXWfLq/AukgZgv/Pqxq7b8wbSAKn15t7v4NjCtMHYVSfNPyRotO08H7cME
+6KxdnIbyVBwoCx0K8CAl3vq2654Z5hy+Y7Cj+ecxXxld8RHpZqzIUaqGaG6bf2gW
+uuRpFcOqDUKT7DhHK6Pg+TkyaVoh+K0ORk1B49EPY2v29WGe2TlrUJhgmecVLdi0
+ylvHF9FkBsyqxMFFm7Ph4xqa1O6Okyng3KLX/A/Il5qlI90dRCiVUMY8zZd9B1Qm
+q2Es15bDdI13YG/9K61eoO94kD6af8w+PAPmTWok7nxr/YlZ8hgo5o8cApyDHOnI
+iKF+Kk1NUeZqLjI5Ht0dzcCyE1+Kjqh8EGQFAN4AijT2ERApj1ipRqs/KxDpoUkJ
+jkJ5V3gfIKfsTZDYLVh5aqm46A2pg8jd8rhF1dZCl8XjUYylSZCrl0bLZkV2/sFS
+Y1w5mrUJlwzd5Fp7PhWWbKR4iQI9BBMBCgAnBQJXBCFqAhsvBQkSzAMABQsJCAcD
+BRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOMjkP+gL22iXwbP4B4WVRScj5
+FFjT0lm3/5nP8Mg+RYL63E66ZLcVH76B63s8le0u7IGtUpj8U4DX6EJx0ihJqROp
+o3cZrBKj0OYUz8yUDFk4BnvhqpTmACiBaVBNSlQHdTMT4PR+j3BuWpzOiwthPjYg
+tDd7Dm51hsJYg7kuFJWDYPdnP+BqwWksHx75TSLiFWzUXmFRaAvLFUIxu+9/fptd
+ITHKAOBkJRAInAd/NcAiJBjDFTYjqqztST6xv5cJgtDSpR1Nd+dw5A+y+cfcN1vm
+3prZgpKbj5F40q9kDqE5GHJB3gEMh9PF+SPdPeudkafLPU7tQ5x6yo/82NyH1Vvz
+mPJ9S5fBK5NWvhs2WIvtnU+3DiCbDX+m1lVDJzusuBAJKvR4Qku+CT2OcjONpNpv
+09MwOro075fgKmFrtssOexDPp82k28qrA14HjuRH3I0Af4KfGhU3cL4DE1GB0nib
+QSjPGp516eiQtU2YTZUDrONNfquNIbKAVmHsW8+JCXS3Mxn4ShWv4+rG3bcVMKAC
+hi0bm+/U8lFiIEmB3d+Oa5CFV483pAofbyPbC665t9rS9ihLJDI6684qnK+FmLYO
+xuhPT1U4WL9E/+09VpnafrL+vrHXNNhLf/V+uJ+DvqI744j6d3zBlxl7Re5nOGV7
+j3jsizc0PAyTfQy1SOvc+1r/iQJABBMBCgAqAhsvBQkSzAMABQsJCAcDBRUKCQgL
+BRYCAwEAAh4BAheABQJXBCGnAhkBAAoJEAn+RHNOt5kON3AP/2RfLbVPFTNaNktN
+RRBzO3AdX9F5WvvyTuISP1yPXTyirrdTyzr/mYzc9/hj3Cl0aXGmhtTMqyw2RkG4
+Xvy/Sz8XlDxDb7+6H+DnNrJvAPaspCL0Nt8xQNKqnfJaQzpWOH9BMuO2DbBSYcdH
+gbWtrj7WRVJHMrvkMb+ZxFQBoXGGK1qYRy/APqYLWEA7iwahlkfF9hLsqKxq0QQF
+kn/j3C4vir5GX2D5sE6DMTOwbk/WjbR5B7ClsLrcsJOjRQS/VR7bAfmSz5SbQaLG
+ODshpWmm02cVBSYFrFy3rI5c1XWsRPUyVMgeV4Xet3IqPIeF2V+fUAa4pAZ/Kum1
+D+2+ww04s5ClLxIDDDzQtNMs51Rysp4e+512i3PlFHThpzOdyecTUuJ4rzdlkFab
++xF+GgWb3e2RbWO7cuqsreMNKJZb1B6qLBgpzKkgdhUyh3oWvm5VCGwxyrmI/fgt
+PCfhV6W5MrZon9KJ4Bjac6YqurfEJNJNY977N7pe6+bDpCMIVTAzI5Ts0ghcticQ
+vMONTPqtEkQ8tBpGglJ5AxdyeRqC1SFinLwcRt+BjB1rgMA0/Jq2/E7ztMdKcWDH
+vdX334gTEaNZnlWcHcVh0vEoQAQCKrslnfvHktxbFvkDTC2LpSasjWkelObbVfxz
+qpGa21qQV9ZfDn1tpdG/vfz6FTxDuQINBFM7JpoBEAC8b4+YhGkK7yqWzWXMk3oJ
+HWN8wYU8GkbURn52jg1yuYS4cJOH9C3T/iKAMsUYGIjIJD384FQX+V/vOJEWo32b
+O0L44LHhQtZSxO27Zpm4dp4jGVK0vQTN7w0ov8Eve708nRK+9uHO0S8Y6/6Ex1iB
+EfU+4s8vOLMg6jW+D5rfU/y/O6iFbZDJWXDrVLmEM5yViQNR8/EpD67T9+8wBRcE
+Bxwa6zeezh3Y9p4GOqK5JLwx8LDrr/mPfgOpLlq8l+yJHSHVz5ZoJLwY8TE4+K+I
+7WqtNcuEnDqSHrOocihIwFycY5Rp9Ta+PkjQPssymMfAIQhaBx45SZGwTybp4GB7
+j2oQ11dUYQtCBV+8eB8UQQoo5EocZfuSEvFU9kvdmFCt4Q8tebveGm+MHu4FQEox
+pplg4ei2F891R38ldG3VlDbjMJJ2oaknvHWsglZZWj0QztCrTC2+7eDq28s9/zKg
+4FxDsG+LcFhg4qkABkQZp3s33vWkxWN5Vgm8tvXn3mcibBt07jZhRPjBXSjHJRO3
+HYxJGvWm2++Jc1CuQKjvhDR0IzTD+XBHYg4ajmYcpIsGXGQGNOHTWfoi/0AJYYCq
+nAm+1kqUHsub2DNccUzZY88n3LSelEMZLYiO1S+yGtbte2LCO0zmIQF4JOyWFkfO
+mAEO/Q9QYdTL344e3H0uVQARAQABiQREBBgBCgAPBQJTOyaaAhsuBQkSzAMAAikJ
+EAn+RHNOt5kOwV0gBBkBCgAGBQJTOyaaAAoJEEX17r2BPa6OgjMP/1lduIq+zHYM
+EWBfdBeOsxZPVc9zt2/XHghbblvsJarQ4blasMiAkJu5R+nnu2DsL5gUvPmOekrk
+e3y6/Ioe2SBtLS0i41pKsObpfmoLF5GG3JAoqOgpKcr4WPgZ5Kj+FZDeMnQIIPFA
+0XXcDrpiD/IPbtqlrTV/0YtoRQiISNtcvpeAudADAJwROTEcFY+WbVdPs/U4SMui
+ixZFZSLvbatrHnm71Hi5zLeZPtjcMMhuGcnl8GBSD/jFz0XaJfImqtiZHnH1nPjk
+KcXV7afBZJRJ0dCVyM9uJZmsIqE4OCXDcyTTCZY/V+A0mDxNcfHZl200grdIAmhU
+Z74McRpPAvyj0fLdmt3XJ74NaF4rooRibOf/5kwWNoSSThKbpxfdmFrzfPvBS1P6
+MtGKfJ/bCq7BUZ1wnDwxSQ2G/X1U9sW2b5XOJX59uI6KZy4qyrp4XWNSJdKiw4qH
+qy1z/6H4nk/TQLQ5LL4q7vD0FndpN7eK6DIZYoekC1AC3iXTsKFTIqh09uhpIxeI
+j5c/lyjQpm3sWCEoLsGfW20kOPvQiBuo266IPCFoeEZgHHD3RGmB1c7f7Bu2DsHY
+5SYGYvNMlU1Yju+ozMi9onLRkLBKE1IJhPUVmTST8Cw6LF7kZuGGLujwMKgBkLWc
+z7EdivTjrXc2U+znZupWTxzlM76i02APtQ0QAJB3IZr6yWl0cwtWt25tq0FUlqsf
+dZ3S9QfcFrkiv02NISmKKNGhB59sfXBJRXT8C1BjYvA7OG58UYrnE2s5U+g9Nspc
+3V9TAKS2xoQYOu/ZGmv9OJi6o6wATbpR58rvK8ppv2cRVsE+rohBGXylISqbFsoP
+3MFukjr7ZYsxb4+ck9bPl/aDc/F20Wl95V6rSjbb4vqx0YcfxC5Cr/qh3t9IHW28
+fHM9ey7Dsy9QtGgaeqHZ/ffoPMyiEFt+zauIj4iTrru44XhGss1F8NVFvk+INxMC
+4cZoO0mNSkGWsb1Y1mXCOj2TdaFRYU+FrhkqJEga9OH4LjAmYl5HnW7jU6VCMQXg
+wlOBmIZZlKdMpu/3jYW9dCkrPkOC3o1oYNzERc6PmiE/xVaUtl6XwfydyiWM0RxP
+bL5JTcLyjerTHO/qNOVlH+mLXkTGRniZ/tVB0+QvBSvCnXQcxG3ynEIGNOe8QHAx
+UvKrV+jnPdzO/cuJZbxEFi1MFn+wW/bFFxqt91V4ZjmvtkpGGWQmPovzH3peKTsP
+lv0blKIgSLpdfdk4hqJXiYN8NpUW4gic92tTQGDWOoFZBkOqMS99EdggNCl3cCHF
+u/nonTa2Xqzb2AxPl1hEUTs6FonQIKmGwfrqpw+9YiazJDc51UnsBTd+4VEVUiBD
+CiiFOkooIgZMny7WmQINBFZypZgBEADeIdm42LaylSWw5CosOAte2m6S9DgAGEBr
+g/yHSFTZWz341EZrlq1fghIC9nHh09wVlJNOOo3orB9tYoJ3LArB0MQb7Ha7dcnf
+n98O1od0T4QTlEroEeJaOfuElLD+5b9HVYqhdRtMIFiUTfSTbEXbQcvZhaLf3M8a
+I1G+poPRYNVRx30pX9PM5N8DDmW8Q/xYg3T1uHuYUmd6HlzBiESNE2WWcJoxoKuQ
+R2Lk4Wkt+qYnxdHH0vYIsk9mN0yDySpPEv+kzrAU/UuZ9Ve0GhlLsVLL3yHFUjLQ
+Ox1gV/ofrV/v0vcWM3+rRovU1cFPUUv75mzA/TJ8aseAbboAY84RyF0b4jQLOmiT
+HWdDMSZwDVR05r82JqynI0GGfXRgztNpnnebiYk5QLAqvUzzdfRMyrU0SSl6VDCX
+UQAEz3CyODwJ8GGk6PaTQ9/9vmt3OY4leEEf3SrSwH+l4E8Z59gCvAUx/ao1pIac
+PdCd/kdx1mPVcwxTjiPDMp8sIeBSdLt9Lo8jt5m/92nKoH9SnE6L4snJVvB21mfw
+RxRj1cWmeZ1+BAC7+5WfcJRM6xhr7XXeEmZO+QQYjLzKS1t+zIsv1modQMl/f2ci
+Si1RTO82mIEaCfRBXVEpewsRV+nikjsAJ9FOV+kr4NAUIg6zg9QRiHtTulm3P/c7
+iRKFnbdehQARAQABtB1FdmFuIEx1Y2FzIDxldmFubHVjYXNAbWUuY29tPokBHAQQ
+AQIABgUCVu4HGAAKCRDCc3kvfYNUXfVmB/9pxeCKnQlj56TKRyKwp1vg1UyWnse+
+OF546ILttRf7/6GE5BfmOQZ6S6SnvEr3l7+2QGlV3mPEydKpxwpn4hCWgjwosDNJ
+tBxbNLwypMkAGNxkb554Fuj7jU9qg90oX/EqEQpj2nrM1/pjsaDHOF1wH7M7k2fX
+sWMCjoC7o6EzS9OzuNlyAlb50t9eUB1ZoaqS3LHaMwoGb/Ou1emZbd2k5Z5zzp+j
+cZXHlxPCJ2OCLOtlrnQMW6QrAMF1Me5c3hOy34GhlzkIWJUv7dQk+GGM7/YRIDmY
+sSSpyllMU/oSGN8uAwVxfqWi9RAoNqHP68uRKhAJDtsARh1wS91kg65RiQEcBBAB
+CAAGBQJXyhfIAAoJEImmV2CeyUCYHYoIAImOHk6YWRJYvC1mq1qnctJuhXoZOt3j
+aeF9gIzc9qyPAxf0tChn1g4pmhmBbgZmoIjxHuB1BqgcV1Y2P/1tW8mHJdJNbhy/
+ndQl36EgMYzVEt2mbuj01BE/eW12h10KYC1Ul3rXLrhUy/Ig5KUT5aGIrDawx3kx
+xDXafsjS7R9hBhwz6M3LujgBvvsyGgN2Crh/h/hERYZ5ckXNlixbjez2cB2DZQFB
+vE4eKqBGRAj/Ij2JQljHKt/FczBBhXDCVTW7SSeGi9wPlpgj6w6NsTSiKRCi85s3
+BtVAH7zIy0YxxmECUEeqRQ91gQTcg9YqFdhIJY9/ze7xMQKTRWqR2JeJAhwEEAEC
+AAYFAli+6tAACgkQlVGgsabil87JwQ/+JT/RooAGS4d5Bg3TyZQOSfw3v4iHyV+V
+P1U2lyf4s9/xUiAMw1d6JH1Evu2K5EcS9biC7JcnRNWOGlnxTzShBm9dP+itpeLx
+hAEoWjRBYATgWn48PpiUIejWzlkp8ulNR8s3cf7Pj9osXHx4ml8I+bOfESKffilB
+a05iaJusPraZvdxkGzI3oPmFY0wMKWq0YPWDosik499ceBZvLku8a49GFPDB0yoe
+0QJnYpx7J+Gp84tXO9YiOB2hAZUiLBlEJ7DAxxiFCrzWxhKNVuh5kz9/aJnL2slY
+AuifQ3fwIBJvV0fgzwuAgQf0nX14zhlRXnKS04nKfJVcDaZ8FsMliYndvNBImQFY
+Xey7HNEZyutEnS1p1BZJRDEc/vp9jBfKyQNU8EO6WZ5gy36CRf1cd8zf3QB/7FlR
+WlDxvqrrfrjSwEm/cyA8IEoBbAhUssMMloV1pxtb9mGZZk/QXt6eZTcNTBVZjNQY
+VNwnuKPfNfgX3JQ92pwqg+pb23BPi4NRxXBAzupLpcwG1lTC5cG4PLdJtut1LJSu
+p+0Fbm0/AesHCXDSpHz/vgmlcAX8feaEzq3TDsj0ZOD/Fn9EN9127WebR41XYQk+
+Xj4V70VWy6esS5ECLioir9rIba0KhJlGBKh+AFnMM1nKiv7mzjNfssOuwKC7kSka
++VY9/qqUvFiJAiIEEwEIAAwFAlcNTBIFgweGH4AACgkQ5zvGQcwR9MitRRAAyWkY
+hvT5ctDMhxj6KgQVn2Vf+j5d49Zqu5e0piNMDtjoeudTeFFDhEHZPiP04vRre3+d
+rPdgUbm7UpFOSh82cIODf/1NhLiSjKL4BKS7UF+boD9vcRbnb9VDzsMnaxyfZ68n
+0lAm1hu2GD/At+bfOKFbdvTkDlk6byikMEKAeLROC1+07aQbtscnpJTDqEyi39gN
+65SXheghpmDZUrjt3LGlSgeEPncKhL6Dqb5CitEnX02Bs9LG/f9yk4PaiqSkkGsP
+3AXLrCRAEloq3+8JhlZI643uz2SYsQPv4PTrCuYhPua3+/nL5ONxJ04vhDwckVb/
+hupEdg0hpbWmen0149YcdkGdqnNrL8W2lDFETO1zN0vKO09L0wJ8aSshts6/sU1g
+vqDjogPhyL99XMdeaZn1b2czq3J6jTRaKV4fSub54Msm9UbggHhxZrO2LByTPzEk
+bCbK4tAwpQm/sZa0/V3ORHGZd1KuwtAn3fkQwNDsrFZl8YdgZk/TAgGR7Iq6DkYp
+UG5mtFjOrjRNEmgXDFESJsMmOMlhL/uZJfE0g5qlRkOFfqci5sc9ovy5F2OmrtSG
+g7ZTFsG8eF9Cdlem+6iwLVeccHHOjCPRiVfJEIe3VrhZVpMV/MUWjnc3ikzrw+T9
+ryio7Y3Zv7VTM9D75nHDD9CBtBjWw9EParmqWS6JAj0EEwEKACcFAlZypZgCGwMF
+CQeGH4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQtjtTWkwgbKmCbg//VXdM
+k2GkmI9QVg7rAfBqMIVbIj4hxTvm+yz3DTutJjzlPHpiQsiA0ezGU8xrohz2s8Ve
+M2ICtSBGdWtuDOPN4vudwarno+56nIdwBlZSgPaJDxTU7CTrdEJG7j0xs7VPvmUn
+4lJzaWO4TANH+a2VaB4NQSDkr/Y87fxI+Dz0SqIjAe39MEnkJGMl6I6tYpXGQ2CL
+pPYpencQ/Ji4HOR6CXAiyIbgVIag5RDB/9cjg6qKJwyTFEoSajmRPtV6esyesAXj
+AviBhnn6fFMiL7prU/PZdia0uY/ugyz0QuyCqKPWXHSsHV/3q1+L33ntrqKwy/7u
+uKDdaLWBHmXc+e9a6vmIqU5cqgPuJL5s8ZelbM9IW1TrJLbSzk640JGfsLuuHeFa
+XM6Jnr7KmXBE6yMMvtJZ4JDsbEHYdPOZDv14If2m0Yw5Fne28VpHTGr5n2NKHmh4
+tfzVlogWZ/DzNxBYTSDVYAoy3X8A/oByeEhWQl1plXMSHpaPZGdGcIeui1Yg4RwH
+xNnv6a/rUN+4VuUo9y4GFJUypBS+IkpXIm+hCi+wTZpkbZgw6XZ+kJOQmV490yKo
+xp6cFMoHDcZrNb79mbR6q9nT5p1SU/JM60IUB2hN8ky8nk468D5xQN9OATmhJpHQ
+mwFVfUJOlHxlex39qydECOk86S6LVTdkHJWButiJAkAEEwEKACoCGwMFCQeGH4AF
+CwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlZyph4CGQEACgkQtjtTWkwgbKnJPRAA
+qjncEbZ3/19r6nbDsYrD48b7X2+IxQtY9Pa7FnF5jqFURcaYa4l+2PhGtfqcAEnj
+B0elD9YC6WyEjFSqAcQ6dJ/derE8R+Sj3quaPcXInkQKDbm88UHRAK8ApHeeOS7+
+CtUpWEzVlGcRAhwpBxHKVANyQTmM3db5CU0u9waMdNszqw19hU19DWn9qXbjRxbE
+Nm+6dVo91yBDdGA7x0plginapUEX8WC/u6mpHdde9CC6pj2aYyLVPoy5C+3e1lzY
+CPBI/99DgcoDZ7XYFGYngeNDoM7r8nttJQh4wExdtm2w+4MnNXrQCGQoLQhYiwqK
+ayUztMApMt8HrI0UxJ8+Z/FZc/11i5ZQhDrum94liVSoB1FD+wD9xFCE0+eLAbgx
+JxxO/Ns4W2mBo3DyUAloNISkxHR580GotAmoEhJcK5vns9pCvztUekA3aPT/8ca6
+YZej6Ce5x44L4FfJLqB/zpZTdxOEmeEzhFNGvdPUASpqIpMkk7ZS/7q+ePuL+6S5
+yhaE9tSQ+UqPiVHoeolyRwyHdsns+AoGRoekrbEmbGwyencabrfkkzMqAzmblrjo
+wR8d2Yt7UjJDsz2khn71Y90j6IJ7hneLT1PaxggfX7TFv9fc7OE8/BtI+/JaJj18
+oFIiimequgSNJ/aTeOQ59pdVBhfUTfhWXQDZAsMNdkC0IUV2YW4gTHVjYXMgPGV2
+YW5sdWNhc0BrZXliYXNlLmlvPokBHAQQAQIABgUCVu4HGAAKCRDCc3kvfYNUXeF0
+CACDdJ1DfgFZGy0j6krl7GF78r6RKjixOOZHBVaVKl+K3sWqbFQxCfVGWJDaxRBO
+ACngV8pPdp7Kj3vbWE3lENaaPushB2++8PdkHSAvJohwRLNbhuRmDck/dUy/nw3r
+9lFKp2eRr4fkHRdnWelsfxqD5Eye7Id9bOaeIF7XfIcKbK9HRmfs2ZJVWX6tQGVK
+LcC6mYk2iIRTnzKBGJ1Jf9fGj+JnBhH31ct4SpNHTq0+85Bo7biG9l6jIrbl14V9
+cfIV0ZHGnIrKC4E7r/l0cYX4UPgl92A6J6DqtGi8AWXodtPnQTdZm6kq7zMCX7iN
+qkednlohGP5JhwKFvlzhn+OZiQEcBBABCAAGBQJXyhfOAAoJEImmV2CeyUCYd3QH
+/AtbL+UtD9Tqcay9nHTeM1aXP/edzjjui2+5nE8+fIWxrFRL4X7Qs9Xps0KQnrY3
+n0b7OMxk2cJgI6Bl5gVu83Oz7Pljpp1+W22BXS5a0pU1VNjjsXqW08ICRDnqBzIH
+hsoPsUcLPD5v1+cW9O/SO3ucg28sonE7fuVraLc5T3hgxe3AQFYOBsGwypNjO1VV
+fWl+PTuyZlHW5+IH1Hv0omIaauEnr81ONu3KGf+ckQW3Qt6D/Nu/DeplA/NANhT6
+tlRybWNxFDn3pLfMM0Xn/EoNZAnyd8GArE9j6aRAvVN7pWqr5AbSlhC9Um3/64nc
+gTomS+iy4H06o7qODEXlBT2JAhwEEAECAAYFAli+6tAACgkQlVGgsabil87mdQ/+
+NPKWzfFwdQVHmQVcm1jFvnQA5VNLGs0pYXwhNYXF0V78FODZi1N7P5Eag4+VvBzE
+tMuBfYUwq6ZLxsqlyGXMaHsPdtdJ2S5UBByP7UQzJmEjraUUgpaO210mekrCGSUl
+I3quCEiC0+ytaM9bvBh2EeNfupSIknXZ/0aTs+jYMTmttNU9QuFdgEVR21Vx9WC3
+0qLdiDnuBBENddGCfDWXGw+n7JulWNQhsxxqbsynRQV4rK9fCGfgLIIf5Mb0VI9p
++hDlKqNtVRQt1S6npE5SU7Ilqgj5SGE6j9ClCh3FOGxxqGhpF6fwk4tl67wmdC7/
+JR7zPAb+JtTY/ayRl0QsuqvOMFuAUEG+LE23IhLGpD8VwWdx9hYFn60C2Q/bC2WU
+pdS/ZWhkCuA1Gdi+DvLMmSIv5V+o0N2bM7Wv6JwrXIbjg//+aYN1hlTvlj2rOmp+
+5iICTLkVUvFgnJeVhES4sVchUnOpLQkTn4JsMGpqX1++UDsUb1cdLW3Br6E1jFm+
+EO8yOJJ7Xu10qvVOdhk+H1AhWFTKngsPxp+M92NPFp+ZtkXkZJX+pLzW1YYHL2OJ
+JJYxjvo0RhGNuZAzsNGOo6MP0guy0SCf9Z8vLyQxz7GcUlJb0I9xe5oclcw8KiGp
+zq5iziLImz8PBQ72FvYTft5GVm6NcEZ9c7o2KudBzkeJAiIEEwEIAAwFAlcNTBIF
+gweGH4AACgkQ5zvGQcwR9MiKAxAAlcAV4pEvw0Sj2fBJLEVblqwE+ACLR/reTP+e
+sFOCv08zr1EDNPKM3PVqP4jZrPhANa02GmzZEdslgn/PasCmgqxmnHCquyf2gkkT
+uPPgdbweYQ6wiR9PWvedNMQhgHySYSO7n4Rxd83isfoUAiwe66FH7r8+T4Z6pOS6
+XJocE88eIvh3zghBcaeg70ME0goq6TDhrpGfKhExvMXotyx3iOiqx/vUbmDTvp0g
+kQtWcBfX07cyGzgIR0NSqeKFK7F6USUc257uKRCGiaXMwIwFyN7eb+KsdA7+emNG
+ChwdIQHOjfEiq7c8LyUGY5Z1ZMMbi2F0WuWQlhpBmKCK29HXCOffkH/NIyMf8VAb
+bi56b73y2kwH5KKFb48XpIxMcV0abPCJCsbcgAUmDytTHbLBuPM8VbHWP5uIhto8
+Ff68zb75iv6F2nYHDZUJ1EGLWb8tZWacoxd/+Wx9TEAc0S/o25gOG4c1ZwF94b8M
+2jsOT2Df1JMcrrQsoIf+mN9wLS1kGbj6tyfKF+k1oWpDmaBQEVgF2vrxMJ/w7wPO
+JuHV5CRDRxQPZNbCwo6B8PXyY8oL6vLg0bDP7OLSZL9rF3u7wGShezgz42yCWeii
+ErOwBKprp+9zxA2Oahrimgi7Cl9Lhvm4Mti0zHKAXV6O/EIpZX63QAqjJkiNj1FM
+uYWsBNuJAj0EEwEKACcFAlZyphUCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQAC
+HgECF4AACgkQtjtTWkwgbKkB0g/9GcjCZXIIdEMWfqImVGQif5UN+fo2JWWiu7ZU
+URomUadJm5dpiT74u9AtvbVIkIk9TUJT88OYA4FJUparbEKiD1ZUN1Rks3fiCCoY
+ElZAUxgWaVMWtiYMetI7sU/GLj9SX/xSa88g5X6CQswkunj7hoReHZ0PWU69Y9fa
+1XFpR4ynby2kvoXVEcQdTMXuG/4STWhN9Y8gMiXrlbyne9VQ4b5UmLeIVLL9Xf9H
+/Fsj7rHiqstA+IGXFBDyddpdqpHPsLNjTG5GH1ertcbm2mJUeC8uvp+tkUFCIKfH
+ZQsMukULwX7mYRlBSmlrr27Q78RtJ/alV0jopeoU2dA24d8/655fBCQBk6NA0gfU
+eLgIcmEbiIfVMD0UuOCC/86uIyZ6JjPdo6FT28NcS928yplJWIbTcsHMRLPYsZ9E
+GO7JTs+MUwp5E3wGLJescTzBdWnSfhnqWF8JUCjVxUaJ5Tlr6FKcL1dZDXZSV+QT
+AT/tzYUNAGnDZQK6LvQ9BNi6ZY7Z0/Trv4cfuiMLJSL3i0ZBbMks5vP5/bLRMhZh
+gaDIGJ7ZdpiuQ7vWuX+/LGBdBXzMy9aSpI6m6DNb91bJE9AYTppLjrY2AiRZ526O
+uXRVmoAba9+4RuIJZf5I4RYD31FmAa8haMiQqx4ESyVC9EIsw46L0r8fQGp4yOct
+/ke7vgG5Ag0EVnKlmAEQALpPU/Kd58YIaCOGMh59cGBLH13dflRycXj4m4wbru0R
+q7VtcEC5y9sP8VkA5ziwJfUr/If4Ky+9NqbcKJXwiQkYGAiPhWRaU1uL/NC+DDX5
+vM5hFW2HnvGHnxIdQ0cimXtxwUsw6GYKNR8BqTrEL89V/Re0rXfZmP64RPwST320
+Jl+nFpm5GZGRy0h1KeXfkCOZXhZv6XhGztJV/EfwmwOm7w8gXyuwZTUk1NVy6MZq
+JPcYHm8mPM7ZCesLazc8TZMOCf2MMKz+L9Tg2BysDgEmHxB0fggi6X9TyUZ5Bxkl
+vn+K7zKAGqP5nKWku0eiULrVesUm1NvZfaYgs7A6qvIcu6LO5KRk6lMbbWGB1DgW
+eymcXrIW85e4cPVFY2BTuN6wBJgEbGkdHL+jDPB69LGq9zGe/f0/hHUEyaD1HqHH
+qd9ArrSLAibVcHVTpcVuX2akiCuJ+jit5uwZqJeDUNGFuU57uogKq84zPsN2QUKk
+LM1JsGf/ctmcOU/h/K7v/7LrRJTnmUvCnk+YLa4mSUH0tgdEq9QsrcrHlWRd+1jH
+LsOS0clOkmlT8zV2tAUNghKSJBQ4cqExid2vh/A0CBITW5DvKbd9QXgRfcWi7CHV
+bXwYvrY+RxXaLlWQT4F6/Tt0Gie6ee3OkdGpm6Wyn03Q+L/efqzu0zHyhHz2h7x7
+ABEBAAGJAiUEGAEKAA8FAlZypZgCGwwFCQeGH4AACgkQtjtTWkwgbKmagA//YZXg
+hn9XaW39IRjnhDnViFFpAcZP75y96aR8IhAsn6dY5IMUllRpmLA0XuwLdTRytcwn
+zsCKzkvETkQgWqqMqf9xtNlfhr0l3u42ihlC8bNPzbnOv3wwfwaj09l2h1xLDC0t
+/oL+A9rZVgjpfvCl18FLVFpQH1Jb49fRH+tBHq5ZXJSdPXvGT228fMXJq7EECbRR
+Z33oLcjjO8e6Osfch/tCiX59YEMxlnuUyMh35/cjH57Lf2WxpJVleJE/YabKOk+K
+Una0417UGP3ox8R6/SjCXdTPksmuFPL33NB19Q1UuBeW6+yUr9bOmk2Y5df67dfD
+hzendAv2q3JdrL22/auyLX0dQuk8TkWRm6WxxsOttQgRzIBzUJOrRLTAm9W+c821
+QiI6SIsY2VMhmlWnp7e+LXrkGbgrHsrDEQvK4TTukkm/o9seN9sPhRMYY8HEZrf3
+L+HvaeHSG/vcS/gcMNEDCBCEAuEewvV5fJzqQwzEteE1Hdb8B0GrYEMgPWqPiDXk
+WoGdWZw4snv0ABuzND7ZKHTw+Y8bDTwPSIAayq86yZZb7j5LbToQh8qXjd4t388w
+TWi34UA56lP0JeRDFoCz5kfusqaXHyaajC6PBfQJvWOmRq0eElkCypjwpSNJeoV9
+WM8eCXEvI//zLCCL8wGXBKdNO1sfIqaoPK2zU8+ZAg0EVpWOlAEQAO39kLgWyyQ8
+2QCAurbjQr4KM8nOr/Ry4TIAEl4BV5hYkVQlFxvM0cFXOvzm9bSkQolQbJPJXEZX
+U/1XOSpovlFGK6lWLALmV/jw/vx8IyARrbPgsi2eUiJacnVSUN5O8tzUOIsLFaCx
+hNFGP7HvT+wvoSYfuVoTUL/lGWeQae7EzhWCu5xPVQwexkkT+R58973k2HMm276K
+L+/fjlmoeGwY/J94lhXYKJLaJMirG/K+uWJ2tXCGqKt3UIou6/T778VjnQ7xOrjF
+vsrP20hA4O0JIGx7HbiwHZrAe3dF0LCZbt30XpkGZbJwqWUW25eM1/RsM0Ikty1U
+DLBQrbyXCOtDDzrLdU72S2ZUINKxIEl3RNuEPthSe+RqdMnNaEX68KhDBqsK4Phl
+1pYG+UtMgW/ReMntUDb5GXBG5i9M3Y+UhHMu/Gvj4mIiKi6cacEflbIBXF27p6da
+x0goIia6ObQlSq9Jcsm1j+ZTktQjJoZ73AGc4PFF5K2808JZp6GALzc0cyQ7u34C
+f3MO6aYNkXebPBRlE7w1c8CjCbD5f5i37juNQ4C6UddquOJG6ibQidbfr0kn1lSZ
+3Wb2kKahD5X9g9pDnrLmuIjPhbgcmoBqqSyHi87QkzIivdUmMEPFVHpAD1QwdXY9
+NVQAUD29hO6/3FNdXfIckV7BfjjYfrtbABEBAAG0IU15bGVzIEJvcmlucyA8bWJv
+cmluc0Bnb29nbGUuY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXztn0D/9k
+JpQL0eqVj7xr3vPFsBRugEuQB/sbhjVK+E9ZOq+Ssvs9QRSkJAiQrLVVDQZEIx7z
+56U67lAOIRyxNeT9eL+9MTNaWop8F9bFyAoD7s/eH6LGA+h5BLK5DfAORJbUwzBm
+fqleTgIToU7ckr/83wOyH14KItOz2JGvuo5P209pFNYZ114TCJgtg8aVZRZQCx9y
+fOI4kXHy+wHmiPHv2/shnDEISUlfgrmWJgg4fkauQbgD6G9U9Kf0rpJodidWG/dy
+TX+j5KsTKmV5XiY/5+0dkN+hjx98QZE6RAmtq58aerirYAntZYMrkknM+1bgJnEG
+yKUredZbSIVaYgc9tAUk793aCCD7Ew9JVLl1prP8a1HA+ZeRbzSw6lGmuK+YKSyt
+/01Tz6i05Bi7wdDVjiU70r8gR5ZnP/OduOSmvMoFXCq91YzePt+bJioPPIIPX6Z/
+1dTpOvBK8AlJwp79Vb/+iyuxATKk6RwRSETSDRcqA8p3yoRSMv+2/OtlyIFU5GxQ
+VimdJVHMnwnxJ0OgrqNq+Bsk70qWeqDyJKBBRDm5HkyW59XIZ9B0QEdnFTGsNS89
+hfCGyUuNJt7U+uL2cQdf5UWX4FAo8B6UIiqzul2dw8umXCHA+DxuolEoK8JsvSb1
+UKnt5qtKUtckbRzkffcQyKNClwqNuZOqahLLjZKvJIkCOQQTAQgAIwUCWJCxOAIb
+AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTImAMQAJvksYVm
+iDOXoqK6eTTDiGM2DsK57v8z5UajvYhw+Dnc//fobtC13uQxGlMiLYIIWmvmMuFv
+rnl+8xiytCOmosNeuoSUcD5CC/vUObwJM7QJlvx6y00onjsdLuHAyM57dmZgFWuj
+aI//iyXkkRTCEs7X2JrgkJzE7zCn9P1qLqZ6sGuHfDKSbQs75UV9wOE33cr5O4/r
+rE1QvJtHE8kjuqLcDoRPM9to/2j3IelTQHtwKRgNevpzxLpfrdp5O2g06+VETEOB
+vriPuaSo88254NWBNEslGjABPrdnLEzRS2UNjAC3A7LKzptsb56znkGj2/I1ZNPc
+a0cmUvxao95/roP7JD6w11Oa+V3iYSV+EGYRq9UD+T5nfQPK76/PW9T/GjcFUPON
+kr2ItrEZ5vURhz1ChHUkkP9FIfDzZthwsVV8aR3ktM9YzAT6tNhanBWzMDQc/MMm
+4Zo4Idh8U1lf/rLrEIDR0RzH8d4uW8T/K0GF7XA6JUO5bFk6+E6MwV3pUtMn/pcm
+jJoNuWOJsE8LoGjkaTjIID+DA4tbmVVhegPQjiRayVkIflAFjO1bczoyxU/6J3QN
+ePLiLqp3SJSePCa9dCnm7rtRCZ3GwQOKbKMLjBcpCtQAiaMXrxCtE4580JsCZDif
+PqQRMqA+pGQgchifOfRdtxYoCJudmNyfiMkutCFNeWxlcyBCb3JpbnMgPG1ib3Jp
+bnNAdXMuaWJtLmNvbT6JARwEEAECAAYFAlbuBzsACgkQwnN5L32DVF2YRgf/Y45C
+QErahooYrXghHqN0q3Tt7iGuJr/GyLCEcQFkEeUj8G25Q6PdnAWSb5/qm1De7LY8
+UcOFDo/seVj5ANNxrVnWXXLlpEZwrtN2CWDVbWEUHxxpDESH+0FrAN1F589bT8DI
+L7Vq5z2dh+ulXnymqiGSwQkFzMlZYbrS05/O5+Ljpxv1ZYKQ3N1ulJJi+Z68GTpr
+rtkMEns4S+la0cj9Aw/S/94uGvXA82k5mvhKbsqz1nFvnde8QhPyVDTwMCJ0f++J
+n1KzPNXnHjzMes+fBuCNVV97jOoPZZF1TMJvJeAOgRqQkxNAEzb7E4W41WMsPRMB
+SsoyDiFkFXeoHbp3SYkCHAQQAQgABgUCV+ReKgAKCRAUXU4NeXB5mqlZD/sGvm6o
+pVbHlshEu3hmsEzBzWgaa94VFJ21mO5h7joDX+lSM6ozTKjCovklLGybGUj9caUw
+3DuZx472HBsATcJH70koSNJcrD5ePzK35YLtkuZq0rWr/o1GxelEzoeJgjmsZqEj
+6vGVkyZc6+NW5dBhMcKkITHMrFprq5R9do6v7dYlNbnBySMT1FOTTay1yhoHw3Az
+/afTE6DsH0s9MUJExmok1hSn5cpcWQjnY1GeL17UikO7BGaHQD9n3/4+KOX/Ga40
+dLUUtBL4sL6l31HlyTbcPO1AQPvHzUdvsBIbZKk7MilzBPz13GLcoMQEQb/UMIqB
+dc5M18oHMzckVbOoAMjKujPgP68m7+wYnaj7Xl9uYtfTgj9RtzVsh7JRoWxmPPx1
+Rx6VaHO50QkALtrgr0BXuFqjzkVqmb4nEi1OaI4Mv1grBXkoYl48P98MMVNfmtJk
+LE45NrHEsZAqOaU4eTeOmcedivTFilku6lKKdkBwLuLr+UHeVDEFCLKPY5jVdEbr
+vYnfitDFsY+x/QUKkaLrqEEFgeHCAMUp7mtDXhGgE8j3UY+U6ftrtOgbt3SUF5nB
+nFD6aPplWZW8FDlGecVjxuG3NHPCyg92GMa5pIBlnlDnZuS0u4Mc1CpzFgcrg2u4
+8kQnpHGHJ7Xo2R7F6r0CLUGayK5lAtxhX43W64kCHAQQAQgABgUCV+VoygAKCRDU
+L1Awh3AmJ1dYD/wNSDzkUZpH+5rubJROIdVnR8DNDQkqVZln/ZVWXc8bghK3OlR1
+35NmjiFrtvEEudHMxkLdoJBFuDBNR1yf4Y0nJU25El/WehqYzQe/rMNPyJ/uPOmT
+P1AQrNUBc1x4nrMJbZq/1yiTst8mJu7ZRnEvM0F1JOy+rDwySNM8918aOuX+ZqNf
+vL4oAALkLvLL0x0pj5gdgVu666X29z+wZJ3b4sJKZAuZfYWS9WS+Y7AELu5oiH97
+DJo04vgyqcJOpcrNp17B+3yoAxjTHv0jW3xPg3MLfHRx2ZSfnSV7QNc0DWj0KU1i
+MaQYRM593BFOXLwJrEw3xiCONnArgrUC7L7DsaveJtuVN8BLKZDT709Bi6p4DpQn
+IvsSztiAPapgg+e7Lt/V1f6kWcXub5ga5wTMubZYAlkk61vh5nPAwQymcKyAIMEp
+4Q7vrQhqv8/COYRnYhwIrvdPRay4lgLQ0OJz0A3X1RtRlaH7ODOapsrZn0LT5Syc
+MDIk76fnhg857jxhfnpWjc3Xp0JB/twaBdvUWWDjpIb5t3d4l4nO5DkXNKfSQEmw
+PWKUetQlMjEzPD7B1nPZrmbZNK0RXe21ZfVjHvXXvXiHXp+HT3RxAMNCH4mVX3LR
+SQzz8OOEieLFO50vNc4mxDN+AknM0Q7aC1FiEcJtEXdiFkPbtL460R62R4kCHAQQ
+AQgABgUCV/Ok/gAKCRCYZCyGIK9H1tkUD/0TnHwIF8sGbrPQWvKNrNSpuTEx8i5P
+w/To8yyrI+59abcJSHWh8uYJ/bm7Z9HQsguKF7Fdi2pwWxsjC4ND80x+a9f0DGS6
+AoIJDtYXdVInsbaAkBqLp7JMWI0gmCgnTdHRPSmJXM/l0BX0zFAGQbWGC7XBYc8M
+cBpjiVMJXyDqYFm9QEBLW9zShB3Pb8y0lEiAPmsCfsnwiOIAFJw7eBtimdYo/e9O
+5VAxFFImZ5Yk14nvyUdL80e4RX7O+lZ9JJq0wIz98fmR1aaPcKTQirTuJRLft43g
+nFdxeH43REzkqyj+9PB99ewjF16+0RGNWm+vpk5TyM80UGj7Ok/pzkxr82qzQwJi
+XDl5XmvgTAuagVeglKqh4onQHtvXTh9sVKg4zJqm/+eesjh0YrNn5qWOWOjtyfCX
+3/WlcKBbvZ1X7S0l4mkG7iKAfOB+sgs66Nq2a+sf1EUou4iz40wLfxpz1fB3SLgN
+oQQxkB4k7PDntjM6y8FiXRUvELKF46QJ8OIbEjsdDOpY8fA2M1Mwd8WgpcJpFxDj
+DYUPW8e6m1KvIwwpkcpYSSVna7KzBGtTCy+3+R/RB6c7MpJgl+sSIt3yL+S22M36
+LSW5Yh+gtm7BZS22bEB2NL0kQEDY1S+j4y6qDQmTxR/X904ofsQLj9gJ0gxsQ3w4
+cXwFJWEnG2vmZYkCHwQwAQgACQUCWJCxHgIdAAAKCRDnO8ZBzBH0yCq/EADbu9TZ
+i8AlVAgk9D1uxMuLGYrSheOlX/NJKVQmyMBLzp4oLNiSSmScUlzXQjRxHOf12pF4
+GLrvQZo2VxxoGt+WQlL64n/IT+imVM8qesHuKODtPlHRiltFtK8J+w/WnMXyAq6Y
+4WyOYly4ilTPAtkKPW4x12fItB2xB/JEKRW8oeWFe4KXJaq1hImOuSSAObfkkC9+
+9wdF39Lu6U8KECOEvCfgaQ2yxCvT6b1tDQjUP8/O3CCFz0/66QJFSNq+/Gmzvkpx
+cxpHflqS7vVZuR4lLAhlg9pSH2QEganBDcg4Pm5cZhJiOcAYfjxDtZrXmAYfbF5B
+oZZICVmv2K7eXzVdvTv7mkTjynaUehv0W7OTWWsdUHI1qiAtbK/IXfzd6fcNqtyA
+CtWIxtWocHrdkZdMS+9Hd/0FGV3aPn3ApyYDsdOmhFgSUF/bmpY0jcW88b0QJtz2
+CXl5IIrmqTfmgWWA7NmLj/F0zw3TU5M/NKBtL/wDVHEzfiFEj2uNXFrI5waxbtjk
+iwvGLsAb3TIDVBdBhKQWPflHy/kvxaRrQX5Z5HhNJKtFFbk9CfP7p/dFB0VN7FDH
+1ANbfLUOhdA5zgI2+zoLcIf54Yx5MD9NlSXMruo4x7+GkqdeDV4JxjeCpeCbjXGE
+ZJxwzBcMjR+Q9nJtwlU/FAKyDWgm8b6z5pB8G4kCIgQTAQoADAUCV9/YSAWDB4Yf
+gAAKCRCBhnRIn7wSfqyDD/48iOpq+Rm1+oHRdmz0iYdVsyt8E435PtlkW7l6NE0k
+1BgGnubLkNbDgbJBbdr3AgTAzotBqAQmAnRLdirlWeCYaTIM0Ng2lYRfWmlmHkcb
+1P/f4aBzVjsCz68IzYIrRlsSxg2Imm0klSNN8IGL9Xl7unBS8Gk+1o1/d8HY8y6x
+eWkpqcLJ4wVCwuCBbRlxOmp0n0Wk2cPi9KWzKWonb+KwYrfDLKzoxvlcs6B3PPSs
+FDyIIdLfwFAHlbJBACWVZHKCNZXG6GsqT/pW+xdcXAhG8a/Is1GCGHBURxtZeLbi
+qrcsrtIx0fEQjINKA0v00vPU7OoJF8BGrKntVqHzP6BHaqo4nZzgyOZqIBwH/YIU
+X3RJOQNAMKqK10ywYauL6YnOL1rr8DrYrXBHCCmBl6QsQPlmAhHgdPl9ZKiYDpLh
+VPSDW+4eXYm4i+IEUJ/GuNZhxjI1V7gjJ/bsKD64qAiGYjPBxfnqM5xNF0p7JiU7
+/D4FXUOllNFM8yx5vRzBwo7Q1l5yVlZ80fpcKk99QUrHBuBZ6Hd6tlNRCYiyARwe
+Ezzw0tybVpYDQ0Hhp47Mp1tMyuSo4eJwQDExDz9lFlO2uBnmC2OnUrRnpe2D2ZM7
+FJUFq+xFIVnPpDC186gDSN3w4h5+pAzokfy1xtGDFm7EUbwLlNwphNG/GE+AJw+R
+dIkCMQQTAQoAGwUCVpWOlAIbAwMLCQcDFQoIAh4BAheAAxYCAQAKCRDnO8ZBzBH0
+yHnBEACIuAutkvqNa3eWm3WjH50Mkxgvcp1ox9UT6YoUctnBvR7lbZJQIsrtBbV+
+DMwN/Z76surTP10Tj6QKDfVz4nL2zka+tlatWDDUujWuC/wSjqSJ4DZnAA9l6m+x
+8v3/s/HFB9f+iDRBGjOWXMfcdoePdyVFW0ZbPMceernITA9g5trNfeaXUI1YPVPE
++e7LDawNjB2OEUccOyUVeT3rbZoNJOk4mmlaPgYwG3u65HvlnRyTXn7bQrCBvD+P
+61/K4ZxViWVqQYwYFRXi9okhocckGynHxoa4bFnook4P8L8N3qYh/3B0s/XvHF8A
+gbTimbo7+kk655eYtG7kxziks+YGQKe0AlBqF0ztaLVjMswQXkYgy9yh5ot5sxmS
+Rle1ZJk/A+0vJghVeaE/o+886BzT4YogfYWvZX1vq90vDMqX6RhZzb459jt2L158
+APQVbnWk0pNzUAMUudj4zWBGs7LzXjo07nsicKARDO/ratkwV58u9gfYf20ZevCh
+pFbrh4WuMCh0zGtFa4Wiwksxauk05iZgYOdwWoIlyjkR4oU1fPOuulKI9qBCMwzd
+S+wvcIzdhvoEQoxck6W+DezYEfxWUG4SRcd9a49hgJixb/bZL/DsOwTFGq2arwG/
+FCRIvpcBDlazeJUbxQ61WTxGP4btqla5IClHHer9oF+XEkNWv7QlTXlsZXMgQm9y
+aW5zIDxteWxlcy5ib3JpbnNAZ21haWwuY29tPokBHAQQAQIABgUCVu4HOwAKCRDC
+c3kvfYNUXeyIB/0b87yed4qZ+YYYBGvrm68OP6zanl1XlNfJS9sUMZLlFzvP6RX7
+3LzvZTRqMsXCjiimbgU2E069xiSfpozFb/fQl5l4V2981D+rI5MGkxMK9UV8nPTK
+wXd6S12CY5Pr+k4452vHEt2lcoEBGlTxEzuvN2OKSKbgThDBVKXH4IXdWa1Bh8I4
+U5JwfQykdLeiCXUwURdfyE7Ky+4/aBPvTTIv8nbdOuj+ivrBN2V1+CBKMx4UC71x
+RyyiUUnZSOsVnrzgKYZ2ukmljJ/tbknYepZd2CY0pX3f8b1bVUXj6vOjnetPj2fH
+6ITbOwEwneHKDA0P7/+gB0Cunbet1xa2d/4FiQIcBBABAgAGBQJYvuq/AAoJEJVR
+oLGm4pfOs0MP/3IZxRCUfuwRHrO0tViAz3OH4G0BNOU3qdzKZ2/sDEaZKUbMRgyO
+XF+GhHkhAJdB+JrepdlugTKdvgZ8iGwse3ojmxgAGXPtKbi6nP1DrZ6p5vBluCdc
+z/MC+LFA2iQUKMbLcj9NUwQW+9/Hw6D/WHs2JALIi6B76sGOtQHrYCpwCtNzCoGE
+UsNd/K20FIRkmt2zEOnuDrF59U1Y6439nv+WCtYVg8T41hyKs0H4aNZOGC9CaAbN
+mxeNLbTGthsnXsNKVyw3Hvm0wIOOIo5qG7W434a2bULuZVQEHW/LRV4kXuWbg1SL
+n2gt+QZrI/eJ+qHnWMzxBFuwqYCGus0zciOmDbKnCwsZxq2kPXFyXz4rZzZoOcpN
+jFZ07hpooGzulL6oVz+1QDc1fnatbgeKMQEoRw+4Va1aiYbGQDTsww4knpejEJyS
+MlbIy71R5ZOtRKEfu01BIn0MiX+RDQTpV4oY013lkVSHYe+4JcEM4yZy++lVLfea
+rRkQi2mdT6aSeIWeb822ptt2REt5QS7MFresD30JLQRAuaJVlQ3NEWntQq+LAwcc
+uvubDGwqVLAMK6tmQ43bLEwasZ+AYawc8Q/5SjTylASdyxSJUUK63JyCYfnqdw9s
+uCLcSVS4by0NUqS8Gr3++GLlyfZ5Wt5JdjsQfbcTHLdnYJ85g/r6371/iQIcBBAB
+CAAGBQJX5F4pAAoJEBRdTg15cHmaWzQP/3TDwyDrjOaXZZrp16rvBcRoXgBmE2l1
+idK77k7dyrZ0IdzCdmAeALC0S7b5hnOJCyHj9Si7/qPwBOIdlT2E8+0WkUktsFtr
+ZqVgQFYvAWdyxiYMh6s1jvmbPQvq/u1BxZlwlLiPUo+V3NKz+hl890hc3duhIzmJ
+7X3SkW4pMFMLI/9H5ulqvvQyAbhXlQ5j50RcgGVpduAJGy37Cc6QxdxUkGXF6FPx
+Ne7lhVGmDn6cU8jpZZ05p79cDh3Qh4HsR7SHC2YzxKLIwsdgn41bGbqQOuh/ZXfz
+aGC6EsxZWo2QMkeCz9ayNNz3E2QxH7o5TajFCFAwb5HW+ufxGd3O6IY79r1R667g
+sTF+W1yo6vMMFpoP/MDEvf2cOzaiJ1JiQ7iq+XkPVDGw72+FzsyzQ+m0ajb31fIQ
+zSiW7BdnMjn7IvHOO/2/KvKCLRZMK1H4sUUsERnPOAT6gkL+WIvAboLb6sx/l35S
+aHHKIyNSjc8jTR9FxtmTZATjcz6Wj3+MR/4VRr/LZpCc4TG585emJnjoTp5JmQz4
+mnU+M1urKh8lNcoJV6oKAEJZmejWs6C1s/UF+7MqfUXh925FE3HDkLfm6R7CWUHc
+XrB9FGRwRd1kK2+f9TtQlQOC0tJH9ntufPFkfDpV/oMD5x6UIW9qEWIUlFbPYtMa
+DwNrvtY5gwg5iQIcBBABCAAGBQJX5WjFAAoJENQvUDCHcCYnJYIQALbnxsnzyh8L
+MXRH0LSM7xuCh1U+xKupAKMC19Yy9sc0HRzYwjdcqY3QbaaxOjexHRHii6hXCUjs
+woefVtg6/Xw+NiGaK3VEwK7VGMq4ZBObSJHGmZOzv/NOTOtW07xtsJ5Cta1njbHq
+znsklgFW5u/PJ1Id9EsROzm80CDK9ZAhqhT5s7bzBPV4ThDxGyaiDIVXX7TxGkp8
++BQfAzvj6QZgwXfl8pr6ReES/4qL+SyFrQkmz7ZEirhWFnN6dEa4WjHkH0NMasgM
+bB5uRuOP5BP2DKYSUpx4J3LHHW0kqhwoJ7y/k2agcMtu2VvorehsmTJYCJroCg/5
+drtyHKVu6NCDAir58c5ZLpgSyKCAa/xTUtd7+Yce0HHixwt1LW23iqC3BSKMT9OZ
+ZGTDv+khWzM0vTuIobm+KmuCJq3MOXk0OTYkRV4O1JsytQRWhw8w0zw3Ziq0eepw
+h+emUey/ammePNuaHBx0MTnV0rgnlqRgTIFK3fC1YJQQ4vi0OqiSDMnCfAO1u6ht
+GS6TDULOb3grSQnZBl1IFB1594VsZ6KaMxpA4Ko7Vc1ZlPsvfJdonDEhjZFNa3Ue
+z19ZPIKhj8vuxWFwakUVM4g3724F3bjI8H+cbF851n92LM591nR5uYddr/DVK8d6
+yW5qYmpUBsLw7CRLTQjNzI0o0iZn6dIKiQIcBBABCAAGBQJX86T5AAoJEJhkLIYg
+r0fW1fgQALygE1VC6TN3afQ+UkALedXqZ07b2ypYeL6wE5aSFI3qhTOwcrRFkwll
+iZ0Ou0xhKOUkvfMoCfujrpK1VNQQ5LK4OYu64ga5K8WU4AzePgYzPY7Nn5LoSWl7
+tXSoxFMuk8AWpIt7XJ9hQqa9PsbDLwvKgQ0ZPkp26dSzx0Epic5lqzy9/u13H6IE
+hQDhdHbQlPNSr/JxivIzhvg93k+zFbmreryVp8VN33rWnPdkv7NJs868hNztaBIa
+Wm4ZtIoQBEtSsVTJ8llSLJEfwMN0fRNM76skmK1jzmtrnngsHvvZIdU6HwAwisg4
+ZLcpsrv0M/MLXH/tjHfdMudnj6HZenkDG07mRvRuNKxFBgoPC5KWrJ63+JqhR35S
+D5HfVhl7WWeDS/bsQEWK+hu82Jl0W5uoG7TgIO1S8viKN7Zdcv8NhDjSV9VRaGgC
+Nt4KS1lhWIRQZo7hww4Ex/dh0QVbHthnvcwEdn3DbJ7NdjR3hu9howgXzhEZfTgf
+c4PyN7h9jgdtbcaL+dQzA1lkSxe0DtVNLurOlTJnUBVHOb0evz9QcqkT0abh3Itr
+vpcz8aOoI2r1Jjgtm6toDpELa/9WTHiECW3oxAUrZFrzYigVShWym1FGrz8lk3w2
+sDO+A6YqGgN7ar0PdmeaRFUYwNzQmhrKfW4a82gd70s2BEdFAR8CiQIiBBMBCgAM
+BQJX39hIBYMHhh+AAAoJEIGGdEifvBJ+SBsQAKgXFN+vYHwj+tRSLYOLU9mzM5Jl
+JUeCV1RVxb/hbTh4RdcRJ3Do7WmXt0qTQ+1yMgfvTad84y9w7QA7xI64s3uv3kD4
+vWBgw1pLqxix+FIXZTIHNe3OaNkEfcTdMoJyvuWVpOXUz8xbWFZIJke41aA3QJXK
+KLy132/NGiieKoYlGgJ4kaXzM4/17qfS1gnfiOw/sAMKna6FlV9qZwxtS3PqeYbV
+iZZ5yPIuXb2CD+nG8Fnj98KrZWOI4/YAZiIe16ccCNxcdXjROXHzBdOY1OG/6Np5
+c+BtCaG0D+Oa7U5K6ZHfu6TTCo7c+L25ekZp8YGn5Whb2HNzfRjn1NkKmDKxa5ar
+hTIHGgB3Zizcf22PwNnrUx3godC20ELTWA4MV/JB596MKp+p6j5hxhoJrZnJl33Y
+P1jALLSmO3CukOmRUgw5MPSgaloInO4yyJgL9vmZ71ikPJ4D1sEFeKAia/hvTU+Y
+dOb8jg7wtuBrwF+2vgbjbfCzIMvi/7hLJjmDF6qVs6hRjCSQVPPsBXaM4gtrhNOh
+ZwNPL70bkg0icsal1Hdua2MXoPmY3eX9g4CatuWcnVu9oL0mtAmAzP1I/gP8OPYd
+R5YA7mXSdCp2smutC1hvW/kWyv9SrU7oIu0/e1nkx4O3Xv5LbK1TRXMk4YDrVLrg
+nIuFf+gUxkeck51AiQI0BBMBCgAeBQJWlY6UAhsDAwsJBwMVCggCHgECF4ADFgIB
+AhkBAAoJEOc7xkHMEfTIB1IP/jd39peJKGZkKeK7X4fUB6CmnxWAWX7aTe4cZA9/
+Rpbts7O6LRYaErlabEqYW3RUXIiuqr34Z/2sw9JGaPCmXWBP2d6mwSaCyJW4d8+m
+rv+BzAcoWjdf6XdohLCNp/9XwAsE9Pe/i4I1oxLWYRsnlJBEK8ANpseDImiwR4D5
+HLnelCEt73Jhl0stDtlALz+4Ex5nq0PL+QYDKE6Ol6Blut3Zr0InL77PLBHcfl6C
+TKPs3jbHZVS2zve8Zz2iI73mpqzSkSqB5ZZmdPCof5a1d5Tm+hcfu9VG4xPASuAI
+GuB/wLQX9BK7t18LFH7oPej6pn97WmkchnO+SQzhVxG1OKdNNCA8/qikUAxHi+TN
+z990hQU8AaUR0LPcmoreY+QZX7EJjn1rpa4KKmxigNGFwiTLqScBekwpIv9VDOoV
+EnPJ2MjFfHTXpFED2btey4bKWneisqAgiUxLcBv8h7ibBG/TdgBxmKzofeuDSLRZ
+H206wfMhff+YAqADF/Rg8CafZBMErNM1BUNg3IBgwH/GKqsX5Qt2IyVQf3NYAkRX
+ZUHWMqB+/TEON3gAkd7ZvYDP1KEINUnVA3xDwztA+bP2tlBnJdLkBis/nOYFZtsi
+8AkityhOzVC+7dnKw1QoqwuGBxwJgX9hmqgtETJw0HabXEPosyAngh57iDVFPSaK
+4+sntCVNeWxlcyBCb3JpbnMgPG15bGVzYm9yaW5zQGdvb2dsZS5jb20+iQIcBBAB
+AgAGBQJYvuq/AAoJEJVRoLGm4pfO3mIQAIIR/5JwKuwuu1H4NYG58A3TXB8Izy2Y
+GGrwmF0YfrwLDvHsXMeMkl46PmSWz6qJcs1fnyNwTurP/3qknPEH5spdjyLECXdG
+ps1MyeYyEjVFu7cxA5qpvil+TU7tn89mwf4CaHDKi5Li/RsgQT0kcSAX0EQ690rO
+m1xOkWjpDas5tfJPXX35e6lPvlzhlRDzVuxRgRzi6CDhMy+KtYyzABpG0xt+ak++
+aonL7yWiHoKZGNUmstGR3ZfcvgYa7A/jA3/EPKxovqj5k7KzC0MkUU2OyrhmUK3m
+HnY7/hqtc7LLE2HfmBctprZ06fGkgmY+tn8E3sRCT/nncGn4Ur2ovdNtFcwSWvfK
+9uGR3N6Sa5OFCVt6Uxgt7yL3PEryDsq7x+ycbtUYr1n0GxMxPQYee0kah1RHqIKk
+JaNJuUL4pkgzAEXHZUXoEE09UjoJQRPcebFV42ssONz3ENLFMKUEd6xbzkVWa9RV
+h+CPTRLagYkfnpvJd4qSbqeo9bjtFQyqhhfeBekVxzj1bixG6tKQ/mMpqSkLHXFU
+WzbNJWBx0yG1LvW/0IfjpkNoTETGii+JeVUD4Z3N0tCXR8tgyatiptZGjp87jfxD
+KTF5A5aIZPMQzlNqZdJ6y2MAFvNLtBwqi2Rn1HFP3p5vaEe4XyuVI2QiaR4jFhnD
+lYnp2NFwjxz6iQI3BBMBCgAhBQJYkWsOAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B
+AheAAAoJEOc7xkHMEfTI8s8QAK1qXN5jxhzPYDLiz4NvjchC5wTNZYD+g74bxyYg
+jJOA7u6HIBLwCs3xaptzlYseci9nDsPVZ1fzCDHQemjWHMlFfVeZlK9nc3qyj9BY
+woUI1eQgZMGOFYf56gnbDSHOHPzSmQfw1CzDmXHdv4h/5HMT00Q/wJXjN/F1MpjR
+fm4vIigHRcZ8cJCHjJOtr9qppRdMQqxYg2KLA/Ly6UO04chkqj643Zmv0UGwlCzA
+/yfrZd9LeKDw7WXt2S2M0AslB8J6I8LYXDx4n3ri32G3bQ/ifCIvsTuTsHpqIdAU
+CiqQErMSuw5kFQley3YkJEYDuFsNfFrizCq+1JyNlUARGKANUbjLiLgb3pDe1LCk
+dCxQTlHhLpd5H2xy6/0SVy9XYzYHR3gRVX0TId14MRspgC/TKE6GvOcu4lP0qd0x
+WxbIdO0YW3qjmkCoyAGN0S/842x1RyEbzlSguBIetGh0dpoVc9teSOaotoRO9hv1
+LkY1bUroaJLIcJE5M9eihvZIVfzCW5rMAmJ5hT+i83x+3IforsdbCRKatd/T//uQ
+8QXv4/Qu9JfhGL9fbN9r4aCR+YgrrqfxWX/5hdJnGvzdh/TqTXo2XSWhhmphiSFC
+93EojKtcrHjMuIhTdA4pYVTLkS8AXCD76Lmzxi9K/Fvvanm2WFnsLYjn/PNkbr5U
+8URriQI5BBMBCAAjBQJYngOvAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AA
+CgkQ5zvGQcwR9MjdFRAApqCfPXRkjRZRdhtCVnT15QbMPPEDyCmwwCgRvfX6+jdv
+AUnyGUStKRZ79awehoXvLQGKpaVRiJt2kqt2Y2eK9uyPlNNvkwSd0/+Qpix8pBm1
+s1nA/khNTeUpUQ8cIFlsNhBYo91AFKr/qq9DUPX+VKvpUSEwvSn9dsXL2y3baMyp
+NaJIS7rEfI5/u3r6eItwu4Gj951H/6M4QXyqLMZhlpRHt4W1GRYPkjzLyw9a2OOJ
+GZudX/Vhwk19koM27hF5XNeH2IkG3eILwdjWdQWjaJzZtnfWh3CkYut95se0vreP
+K7sFbUauVArs3CtBuAWDZ4+k0K/rY/PP4tSReXhQfZAoVEGEn4wyar1PHgggBStw
+7H/Bzb3ZLz5U6gfjThJynzLXd2xbi/Via9s7vOhuiYV5MDVNnfvWrs6q6bG0KXYH
+yCcAXHME8ftbo7dgdKzbMSnC13evbRVL9ZnajCXz4cvWEaDUBj4sJUGxfgGIEX/h
+7iqv/oGCG9JzGKYtshOFL2MskImzSOmGE8q51Lt0wBC94ZKVYlQnWy0uqhaSZC6j
+Sd0Csu2cdAX6kVG01xoiqafZk5Az4YP3U/EiUyZH+HB0rNV/pvmdzC99LZ2LTJKX
+y/nRKAG9lNsub8LZCHlVwH02iXNUeogK2hU798Pgjc+BLnYCx3HoN56rXzzKhdS0
+P015bGVzIEJvcmlucyAoTm90IHVzZWQgYWZ0ZXIgSmFudWFyeSAyMDE3KSA8bWJv
+cmluc0B1cy5pYm0uY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXziHaEACN
+U6bIrEP229xDXRmhcx0xQ6nJ30wBbX0uNS7WJXxmyo2AuSfxx2dIjrF3O9UDDHpl
+u3hsL6rdaIzYO0tg/Vgy1KJVYhbwpFuOWz/NRW24KbY7mnyq7rx31jmTPCMptM4P
+yYv6mC/9j0ZOH+xzOjzmXuE6fuZIB4GCqqlWPBzJiqxh++sRxMejYGe5HVfe0t17
+TJNTHk0RKViM8c3bBnQi6RLASUn9wGFI/yPbEE7R0+dPgqLe/10Hrc74vv5RDJhL
+UimiyL4hTodhsV9bcaOBio9DiB8gAC9hfYBNw4ps7HaVBnqrJNSPuIMk6boXjtTz
+XENBU15BWsyKMUQ2gpBqDcspnHZqRTzNDjplMB6d6pMoKZpLljnflBu+F/kq3TSE
+u9JthqxeevAGa+IS8ZGJ/P7HO3b5SDyh/wdIMstTgGrfB3fA0fGfGUUQIqLOZWqW
+S+Ud7k4XdydaUeGlfK+1x7/41WYDULad0UlIM/G1Z7FaEJAouBfGM0TAkQnGsA1+
+QhUOaIJqUjP2szzfzn/gswr6eYBGwvojVVClbPCvBn3RUB+Y+NgOMKhF/xJiYA38
+nYv27TW8MQASoh1prLQsci9gtwoR+MUlA8eCKcf+TyOgVz/f/N271vWSEWesqLj3
+wtx37edD10AWgzTFMsNSJMtbBpy1csDgWT7aNwclzIkCOQQTAQgAIwUCWKFlowIb
+AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTIvsIQANvVntac
+LCksR8dYkAV9syIn8uHzbVTYJPPZ4kq6UW6nR3k+9dbGRL6kBk/YOn0/ib3mVz/q
+MPZLFqmoWTkRh3qCGeBLfZtOd4HjLQ5vvpFsnkWmN4BW3Ji/lSeYHyXU5Zv9Z9YO
+xbo1y9tOHvhrsre3kh31E9AN5rb9x2KVS3dwfmN4PIx+m0aC6JqfNlf78hDUbGdu
+Pm6TkHcmEVfbJT/XqqzUTcJsNVk7047rGxZGo+TxbW8Ri3CPoe7QR/LhQ/IxIPp1
+eNu6oMWycY6m7EYhNiagf76j/Jv9T7R5XmRtxZq21z4985cRNC5auooD+apdOiVj
+ft3gAbey/DZPhpY6P2Dtzq1MFXdHRfoW5an40Bg5IgnbRhqcg9EY1+182WNB2iaz
+ntR43IeNNZXXlkLIVxW4oAG3vq6DV37lwNuOYLTsdGUvbkMd/u1zmecfX9C8wU4/
+Exefk676SE1v5shA54UDUvUhaGnDbLZZ66MfiXfitE/RuG3/uFfkxeKc3/CsUKk3
+RYbtKA3Ou/0O9C6pKIVCiQhUe/HVSidkk0GAZ3Fq64Cqajd2Byz0QFDHwKv16BSY
++E4mmAWXYw2aV7pO+tivib6XXbLHU/WgJ1qbm/Qr3uo+ZYv4k7f4IwYi0kbSb9nx
+tbft90fuq3xmJk/BzY6NZ2f6FIO8aaJzTIGbuQENBFaVjpQBCAC3wjTlC5/jdi2j
+nIophctvA8XaqmrQeD6GaLugfCfy1zzU/7LbzGbb0mzPdnF1OT8htQFu+CWNrInU
+DqM2sHE0tqx2EQ82KoK9uQduFjyX33GK0FFkQh+cDHkTDSIQkoqx67FHP+jgehv8
+rAzpwc/G4QgoWppj+q1GwcPe34WMCazsfUMYyr/+iyw6PY0WZyQNMUgOItwGlvq7
+QsYqW2rF8bl6qO8KPlXxXK7f7ERm1ScLvec6W7DbaQcO3KlK+tUgsFVAkHEYwz7M
+Gy2ybNN/fHTjS0uB9ODkyRFFGsEXcg1BhJsgHNy+mWTs6dOmtKEZW41BeXL6pgpp
++xQcCfCVABEBAAGJA0QEGAEKAA8FAlaVjpQFCQ8JnAACGwwBKQkQ5zvGQcwR9MjA
+XSAEGQEKAAYFAlaVjpQACgkQ3qFjcZdAMaXgNAgAkmmQPq02lPA7cjdkWtbYF0tx
+YnnjPcIhj8metii3YseDkfJcsVc5IVDMqg3Ns6W2cudSR9cgfw+Jc5MeVtEgBerR
+w6UXAfvGK7khVXe9TFe46Fx1TEJ1rW/hc0lNKNNcJfQhYPIlsjFRiYQEvOi7A9VK
+cpatFXqHDRGSvjWnZfavJEpQL7f5eFd/GXzFTNOzKYwTRqOn3ESQEzY65lbORQwb
+wTT4V704i6x3aBhwjmqnOMFaPlU69QQgrmPZkaSk+R7NkUS/AcpDFJ5t1L/z2HiK
+F/XeG5U6lmDy/Pna0et6jnTFEkDOkMPQSpuV5kVrmYychbWiSbX2xLSnHOWh3un+
+D/9zafSr+LbYbKsp8lmSrcucZZeuD7OLJCk5MnGboNzdGuwMmxKmtRSuL+lk9L/k
+gNLRIvy4XlgnVycVUDFoKcUCNxgIwN/P7vkEbvfdYVeqcS4QWGyPYh0XdBvDWl3E
+Wt5iCyHItkRu4gYwphMuqH0HT1ukilwxwyVi7grJr+b6BAWmfLyWEuN1ewaxNoII
+q302TraoPGlbrQb3klqtkiL1i1y6zIbkwsycxkSZ6TX02hKLBB0bvAPBA6wJpL6y
+mUrKAJSynTvg0YFmT1A8qdKvpGaIjNx23d8Ak/wxOW0aBjsOXowJbWxAzsjzYWgz
+UjHxqjlu5M0L1eAgAjB7uHWM/CQvUKevn3NB/QvvSTxBKF3idebMrGBjeIIbpefM
+v4q84+6msPeNpZOAjL86uHi6+Afd/R/eZU36mAuLepEO27M+5Y1dZbtbSsSy85Xb
+DPJwdnPnZm9iASoxLdUqKYPTn3P6grmlFR6PaxSlvH4VOwOJZ/00ZocUkwev8xQF
+babOCpb8+LhtqHx+4fU36HzPl/DnFclgXwld4yxw8ui7HQahjfvkIM+wdpp/G+2+
+iGggWWZZ3aJ8AGx9NgbZg6Tt5VvS8o/B1BQR4li0Lq3qyzINz5tCrlaUXFpAJB/j
+l3Gu785wMDCEQb/ea29LIKzfYiqK6KOG9K+VaYi6STifNbkBDQRWlY6UAQgAveYL
+9Vh+G8jdNcPxr7oneutYclTxbLDAXcF1cPygn4h71dGrE3tNpbsLxG8K3C8nxQdc
+L0NwBnRp5LAF/QNLhxWLbFRnxXlULU9McWc9oUC6VFKSBGOmtdbuyzKneBIri0BT
+Xqrjmc4lI3dwvHxRRX1Bf4krbk8UTeM2P5tt6NciJ1yQliXvPk6iHVeP+LWv+k6A
+kG6KLn5TVwZjHbEflGcPrwX/1vWQPySp/36kx91t9+xbw/LW+Sa8bxyNvovH8oXQ
+aEFmHlk0BhgN1nyftutFpT7FcJfglf6ljXPx5WJynib1baAnu70VsPsL6SVlXxQn
+mfNyeS+ts2y7hqJdQwARAQABiQNEBBgBCgAPBQJWlY6UBQkPCZwAAhsiASkJEOc7
+xkHMEfTIwF0gBBkBCgAGBQJWlY6UAAoJEJM7AfQLXKlG4xgH/2rkUtqEPcpZHPHT
+6Yd6qvyQVLA4YDad7VwIHHI+XtOReq6GbEOlHUJaaQthwobO9HfZ07winb9DeMnM
+mx+QY3yrdMidS57vSp0Z1sJsA69UaOCcMO4HEZEoMC4W45YRZhMHJ5V/uL47uCHj
+be+Ss7RwGn9+1DrmFApNPQqJ/KYZC4uXJxbS8qStZtcjbEdcKYsoegAdtzXOMaI1
+G1YACZgzrPmATp5jQ7xpo4l5YCyCbqH4dDMnUiXDjl4Av2dczX0Jbd9DKpw2U9rL
+AsGTbRtEv36hWKDPW9Cb0FcqO9e8w4Mxv6teOip4+WQMgITkoVZ3BOaLi3BYi1NJ
+RajTpN60AQ/+O0ElgIoCFsHcVYI4NSWDzmmFXqeE1jllVw2wnA2rO8gp3q0fcjEd
+57LjowC3GVFBZfrwKX94G0Jtl4WHtzNUymUxnuz6z35jT6C5ijNNDgd/+uAszaGg
+Shp61pl0hFTibIx4rUT4fXYuQhwu+JsYgiE7kLjGG4wNaOP1EqtoBrhR+vud+Obi
+2K/iz2wlfbhF45Lrh/om8B795uA2kn42X+FhgYwrf2x++2jkO2McJ3VvZdv5AoVx
+zQYkkUb3pJrCPhK/l7Awgf7qpRvrrQcOX+tpnlhJ2keWUSjd1Kk1QcbFPKWQG4kU
+nMUcMWp8VG+WCLBu1MleYF5DFAwkGrGQV6pQNdMOs14Qy5xZJoVYrNuL349BYeKr
+AxPbkNhNPYxXhdNi35jmXvXIExnoe0scJgcjhcHC9rgX3NOVmD9HEY4MzAZnNLzi
+5EUsbtWV1/Sui/tjnojbnCxq7uncPvBZNiMS8voKsFIXXjewhctO+VNLRBbvM18M
+JOaK/QJVeR8lwvvsDzly9QcvA8YPpyOZVr83MXl3nk0fkGT0rjZzHzvNhvL0zWSo
+LbGK3K95XCBzNHuOUqJCMlRDcdgW43WYMzzpLvMOGSxlm36n4EyncCo4bDMl9OMP
+mp78cAZSaannJqbKrGZp4bNzIgnoupPeo3DurGIiTvr0weuQZHymNlqZAg0EV/eG
+ZgEQALphDJCKCF/WZ5TWAbw7KOV9GnsowkkebG0GO0fl9a0zwhYJ2ZmcKhSA1skc
+hgPYWfeH+KNfj9L/j3aZvKZp2ZbbgPuZh1784G4BAKZ9+PKkEJRLkaFmZkXS270O
+DhyflnH6ZyGe3ffSbtPpxSt5ZHX8KIFcg0lZDohK7A7wwNb85Iok3KtF2t/gervc
+8MGRKQcrdrBdUfId/Kl4k/jh+oFZsb6PjfvFYkUSqdVIiEyWTnL6pLtOhlOaPJur
+QDzy18xnO1K5S/oICkZVtL/PFKnJisVtJbW9kr2CWtnaomxZlgIGW3rXtbU/mdZg
+ik/pPY0s6bHoeT2iRAv5NWt84awGR0wEj8oGVX1KXFAWXAg9KPbhrt9SOmM/zYHH
+yx0StQz8NESevt6ktTzyN0vFrNbLAj7KH6sR8TgD72jGlybHAm2nM/vaxWWhaFpU
+uNYNtpIn4Au+QWv0+Y5rbufGdFi3vsPkAxa22ePKha9Lx8nkFyb43u1utUE5GqTr
+VYIkOa4r2CEKBD9icLV7s8YSHFRVh8kRT6b40gA9w4TSW/ecdJMC6d+kjMfAj1NO
+R30qPisfPG1Bb62ZOh4Y7SCGcGPqnvjWvMxh1UcRHmKy8PfpWKPdtbR/6oki0htw
+OnCI8wFQ4g8HmxpnOfu2hc0yj5+ZgA3jileTfwiadkzkXSWNABEBAAG0JUdpYnNv
+biBGYWhuZXN0b2NrIDxnaWJmYWhuQGdtYWlsLmNvbT6JAjkEEwEIACMFAlf3hmYC
+GwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRCwH7uSghxYerFZD/4yuqSl
+Hdrm+1PPnen6mBT/VcBGvz88hJMgsD3r0Vlnidpc/JSlggJWdUyCziwW7tfwPkjS
+1JSZUMPXNAffn53xKDF3nYCCseDWBdrwPJzc09qYbXIPmtUH/5B2ETzfiSW+z+Ub
+9hmsBJDVWtEfrFWZ0ECcYQ/X2MnbFJAYqJ3OzejRKPc5nyAyVZFgnGbL6eeG64oZ
+lZvpT5xBc/xsxPN/hHGGCaLrqyeYvd9999rxgaD+EyJbabRtfL3+f2MBleOKHMYO
+KeA9i/pWHas7yU9b7ChVZf9L/n2ejVDuYJbskQzH68PyS55P85i+EOBcLKWpKSIP
+ORpNDO70dFMi3Q4NIhzSBXWvqsWkqgGW6gkXg9Fdu3BiIz72EdP+UWaHhFesvgq9
+u3WQ7BOEJZASJHagN3w7e/hGD+Y10eNdpJSceZMNqBkTDtAu4gCVAIBAr88g3urQ
+JWnNr8DfmuVZy6T3lHHlNhy09+BPdXMNe2rCy23HNKx54M3FJRfrNHYyoAyDw8tI
+g3izFJDkPAOgWMZ7MO3RIXP5/Wxks5fVlDq+pJ4YrhLczS2bzoxo0PcXwh7WjWD9
+PGtkdVpJh0teGmQTE4TRNbam97QSEEMuMNzqe0T+S9Kcymii7rEYDVCn8Gu2og0E
+6rXrq5muYKO67P6e6WSiv9PdFvN2TFMNluxwUrkCDQRX94ZmARAAp8o5b/A2nI5E
+BaXq1fGWWEUV8IQdlDLwZnmWCj56Bocs1c2swcsbmw4HlHDRMhIS3tHFYnpvXMwk
+hvZbKG8bkCpADRnwT6gvqmwoSiCQRaSuHrs2PbcGeYNCVjmuPMvH8yP2VWJaGxye
+rtEkNRcrradu0OdkYhtay2ppZ1EUDGG/ensm8MCuNMR01Btk/DJOpyamJTsGdfFs
+DG0mNTfYOD1EVZ2YrjO5GohWIBOy08XwxYPwPP/EF02jSgBbJ3hXA2wsc2OozLz/
+iPZA1Ok0PKpwGvfZoJq9TckzGUGHVuEBjqMoQm7MMVYC0vo1X26He8RsqU1Jby/X
+OBJS0LLmYP7+RTpEBhJcicUNrl/1Np/8NVR8U0A4LwHCDT/yctSMMZm+zQ+T6T1x
+pXtyQx/oNNGScc5rX48766q/6LNYfXTktSVEr1kPpuA8brHenT0zX1C5nTn9DTx/
+XWVvn0jVAnriR07PVLjlW2UR8L7puwKsQJZ/oWTpy8gVvfnMRuUDLdmxktIyT8yR
+ltGUAWHrkA+b7Phj3RGP5mWq0FgadOBaHsE+lyhZ8sdx4cdFXja9tDeVg3NQ9iCi
+kq0DcA3WQRyT8Y48Wpc4eF4MKiROnEudIKNotwdQS9yQwyILgGMLsoyf1ZCCercW
+OWM0pGV3xWGRcu8If3DFmPEL+e1FQl8AEQEAAYkCHwQYAQgACQUCV/eGZgIbDAAK
+CRCwH7uSghxYerY9EACRtMAzk3Ax3oFTvZi6HLemr6/ptsgppqq9XcsN9F0AEDrs
+BaYQK7kHMteX4V4oIQOxrQnZZf1/p+14CFrvhzYq35QxfoaMdV4wX1yG+wF/uhtu
+mCBHABhMMnWAZmfT6SbiAxny8FcmgW3Sf+OQeKLcTAP59tEOiUFTE39OYSPnVDxR
+dWQHAMJupxrtsdrzho5hZjlLN+asj3YU5twztHr7pk2iZzPKNw4ZBLjrj1NKi4Ly
+66KWiJyOFn5PS5texF9sCYw59kedG/kaBbxz4O/5xSYwvW7zGFAOX/cLehpoDwhh
+mwmIRJm85brDfjvXldO8ZQZi8GWdKD4WdnRXVUQyRntux2bRseiXkTfN/NTrFYPr
+gZvYmNflMdSQKqP1P0rjQpHabfWR6aSqzjtDSKdfj09HXWs3NbvpVnLBOIvInggt
+PCU7lWaeIyM0rqvCgl8pRVWWJ0/CCsuTQ71FigPd9ifvu4DIdgj+QAIOGpkEre+u
+4RAaaXzvzIRhDtELzsVp7UYGOzZ6TD1M35fmnqu8/jy4I/jOQ0H/6CKBr0tfyzjy
+luh/yZ6zHR8uYECpweWWG4T1PhbGUvq5GwB+nODHR1Ag9qk4efHq187DNJTNkGkp
+XD/6E+tsVumhHOmMNIB7Rd4+6JNxVsZkhC2OwCAmwrq36YYemlZOuL8qhmYVIpkC
+DQRYhpLWARAA6AT3VJMFQPXTVYs9sMW/nt14mkGnrEh70UXg6TqVkO8rsNsi3cXl
+Hq+iHsXKI3v4tfMfng+xRdYIvi6NidS1SEXIUwsdrxrPT9omFtYsqQkZfPQu9rKt
+Gh8+koltDgHLZORTibZTsnLmKRq2vGyqsk5PHp9e7OhMoxHL0OeBVmnK4i8+n5NW
+Z1d5gSIstNyFhDmlVMSL5rgTPDEEVF2J/wcVF9VaaNKqan/arV0e0G4lMo0zf3R1
+M978WE9uumnxLDphToHVNi8LGbDSgElJx7EczTHjKkyKKRA9zC1R9SL8bABMpZQN
+HxB1daQhCPLnuhm7359qNK/hslwGRQe6ScHkiSpxeJJry34+muaP1ARtSVkAQWRZ
+Z46QmReYS/FupXXDI9HghA9jxGxRohIq5Dc48lNbFHrEpbi7LznOH869D2BQTRgJ
+/UjU5RKuRaQrm8KbJirGQ6v1FmmPX0oLgv1IUXuqJJ7cubMCrZKeISq60z48FFUz
+f38HYIhyhfzSKL3T/r4SLZL9+KQXKhfPbnT17bAx7cqNQZte3sxV1Rl1kp8H8KfS
+nS1ZyFxmynts9XKZrzNwCNUGlqZdpwPm132BVWqx4U6fp1rOT80lFxCLQ/Sta0lG
+vVc+qEMdVqbDPWWYt6xeLCoUkXNq9VQVKHhE0Iz84ytM7EqnQOFcBgUAEQEAAbQj
+SXRhbG8gQS4gQ2FzYXMgPG1lQGl0YWxvYWNhc2FzLmNvbT6JAiIEEgEIAAwFAlia
+OQsFgweGH4AACgkQ5zvGQcwR9MjBjxAAtLf1vcDkOsYtU+RCrpfWotwaFoYLRDlc
+DIjFLO1bX2TIy1YFXDA9c0x8J5Pbt3wmhtkFojgmaGqvWpCJkb7lnudx9Qi/a2gx
+ys7HS9heaUDoYM8kgeXVHJe1UcVi4veOthg8wp/hQJDUuKba1Xw9ujVi1PqbBNCw
+5ALJK1iNcFmgjtk4Ab2rgCFHqTr/KOUNtYLs/uI9YOHGnzUAW0SrLgHQFD2B6TWv
+kFBsRkR+LrY1xGinzt2V34BWmTgIvivC/DNdibhVoU2tSEj0VFkJuyKNSEj2PLA3
+lzaDteCezITqkn0TFpWVkl0NH8c39WV9d9OE60zvTPKfWYteio7VKIQpnCIMGhwr
+ojt0RD0EEznmc5UV+RWKRcoWk7B2BqsZxFp94XRBqFjVOmWeK/hMZxoMl7I0V4gk
+NyLbPMRyi87ZrVmof+wv7B7Vs8eBKiPDQu9W53bozX4bSf2oyZ3EWSPg+GCCSFc6
+NbBfkq8kdyA5LTKGRgxYZseiKaGvAP20AgRVSYhikl1zlcnGtnjjv6PeAAb4PlQc
+ANhLLZ27XUVOWAtUdm9WQyGC7ONNKF7VbR1ikT04JaQMHb7a+cSiLlsV27B+9gk0
+bqIDSr8LOT1EDYFb4Xpw1eWCHlepbCFGl0MHOSuOzr4MXgZAjPiGrW6fCk7zCFlc
+bjfaMmOafUSJAjgEEwEIACwFAliGktYJECPv7+k8TP/+AhsDBQkeEzgAAhkBBAsH
+CQMFFQgKAgMEFgABAgAAx9IQANh9VjRLD8cLrsjVgKeC8/ncD6cpk7OqbH5vKjse
+56RK0ABpU3ZSS9rzJdT+h3vTnIgRKCUBaw2xcv7oN+GCNT3VJ7MmyF4NyDTOjBiP
+o/Wvck1C81n2t4+05INt6AL7Zn5HfeEGWVLo7zbzReCXdm3kmoifYxxwIEnPZeJa
+Ly3nJRUlTMWm59lfU88q0RCyBZdI9+muiD7voSIR5Nu6Uf/Erw+YryXcBLlRIG9k
+1nML5cAcH1qhvhyu9Fj6B2SeDcBHK37KyxiOmsIY5H1KsX7ijdR1MrLUSIbqODpi
+pN4qFHPR+IzDyAWXs2QdEAEruh33SCzYX1rcVpVQU0buARBlGK+XzxwIXUn/V1Ku
+2bTRl5eKbgvn4bB6V9fxrUvN3g/mdmB/pGLCt9imEqPcVoiApnLbTJ6HIIFT/rNe
+RomqK5iDNG27HjGxofIKbkqhFJ2j/JEBJKpG4DHrVEkup6GTxzAzCHLr6Rkmyp32
+LQUq5yrV6u7e7tV6HoyaEDo6ywafAuBTfh3DAcfMandkpFdujGVniGrj9PJ8Ux4/
+Jxu1pN151uHifMITuVCkmjrS6gfFzCoSzcQV7yjNecvnse5ipCcyo6QJ2yCkwK+f
+u+VcWy5JVw+FOvS44tgGLcsBexPPOtZPxVeZ1GCMVjPawNMjOjmB0jLBA2lmvDJk
+iSumuQINBFiGktYBEACvROrJShVGFXjlldqr+DpTMsN7HBirnM7v6esapd1HGJNB
+QNhK16vGC6NwD7fpOJ5bn0AzE1RPNKZ/CXOEoCne70M4XuzskUlqR74kwvRcxkV1
+WAHN+ABUIOXmfIVQZiQ9bM8FlUFFoW75MXDd8UeaOnMaxOMfYMQn0zCk+0w2o6UH
+KtyTJEQ6L9XfFePaxTqxpWlWgDL50JeLPcqQbF5av851xppPqRrrSMat0E4T5I4h
+W2m96A4KTCXt0TyrcziYSJ1elhiXZpgJ+ZlwEpk3lD32JDjar49gpcx2Nno4qj2i
+Mdx62D2/OxpckLoRNaj25sdgC7JZBzmGGwbuSbE1q5QTwjMInbNccsUmFNECWPBM
+vpJK/RC+/Htz8q373t/45W4d7zXNgQxlAKF99NVhZ1EBD5CSy3Q6qPqdrbdJh3Dl
+VH/KnFl+hLwxsnjV0VhXPJgsg62TzIGDlS/N6N5C62lj9cCW6biek4QULgN1/Ni0
+hedK6aBdzDtpS4CR1s1rca+rgqimrgOtl6qJW3+MSxtiLsDLLDAYsZdhWnuBhUB7
+XIyBBtNir5rFibLNjkdxUF4Ug89U99m8vNOFiTaOBjy3rTvF9XtEqY3qg/KSUf75
+Wwp4ys1LuA7RoKkNET/WXsGiU47eS0dD6DOQmSKrrAIPfqseW9phJD+hbbrPWQAR
+AQABiQI1BBgBCAApBQJYhpLWCRAj7+/pPEz//gIbDAUJHhM4AAQLBwkDBRUICgID
+BBYAAQIAAAsJD/0aaHE3/txaeMU1bfDs0nWIBmSrqhVvHEvyzIzWK30D6Nfmv7bP
+81hILfa2PfxjIgOCHtdA4xtAqV3G2/+7UeWLKlv0tuiZmx8p8mQkA6MsOnuDR4sW
+TQ8Vd0arkTyzlBOwvz/SL8YXDSxWeSAgSSbQ+Ri7XrwwE+BjcWSeKabqmgQ4Hp7L
+bQ0IvQ5f+hBWfLvugCgHI/7PRPhQbpallIdQLE7Qoavl8aDG8AqeN6tBLfjn19RR
+kottbntbUlSG+WoYk2hYiydZGRlKwkNfcsuaaNF0p9pH0HR6RrsknrqxT+l8DaLm
+4BwIMFXjnSuCEPfiJ3kV4bzRRND7iOfokdjJioj4ChrFR6461kDl7zqdkGIqU45q
+Q+aklo0WTFvfiiTrsMXLpIhrCNn8oGST0eM8u3GCfmMFbxhO897NTDYnz1wOMcXu
+MVqJ489aDKKvEV8zLljjUjJiZVDnbq0QE1abzVdmBtJRA3732buBwrzlHL5z4Bca
+Zwe1bQsPHAzyC9EpJn7PtJcdDkfBk1PsGWx9cmPvqvX1Xbm8UoVie0x+wge5SM77
+5JeDdR41lHndWw67Ry59GgQapkOoargTqKyNYMYAxZBqKvdvIhS8jdAt5ldagJpV
+quRCpSq91OAxMG0TFGCBXKjtqzsHk58WtAalk49TvO/0r0inTnfWSORiKQ==
+=jVEm
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/pkgs/development/web/nodejs/update-keyring b/pkgs/development/web/nodejs/update-keyring
new file mode 100755
index 00000000000..39737758e76
--- /dev/null
+++ b/pkgs/development/web/nodejs/update-keyring
@@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#! nix-shell --pure -i bash -p coreutils findutils gnupg curl
+
+# https://github.com/nodejs/node#release-team
+HOME=`mktemp -d`
+keyserver="pool.sks-keyservers.net"
+cat << EOF | xargs -P 4 -n 1 gpg --keyserver $keyserver --recv-keys
+94AE36675C464D64BAFA68DD7434390BDBE9B9C5
+FD3A5288F042B6850C66B31F09FE44734EB7990E
+71DCFD284A79C3B38668286BC97EC7A07EDE3FC1
+DD8F2338BAE7501E3DD5AC78C273792F7D83545D
+C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
+B9AE9905FFD7803F25714661B63B535A4C206CA9
+56730D5401028683275BD23C23EFEFE93C4CFFFE
+77984A986EBC2AA786BC0F66B01FBB92821C587A
+EOF
+
+gpg -a --export > nodejs-release-keys.asc

From 43cf893d44aede3ecb62399f5c28c0046a5148f4 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 18 Feb 2018 22:19:01 +0800
Subject: [PATCH 0025/2266] nodejs: Add updater script

---
 pkgs/development/web/nodejs/nodejs.nix |  9 +++++++++
 pkgs/development/web/nodejs/update.nix | 27 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/update.nix

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 8d8a253f01d..263de2ec96b 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser
 , pkgconfig, which
+# Updater dependencies
+, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix
+, gnupg
 , darwin ? null
 }:
 
@@ -78,6 +81,12 @@ in
       ''}
     '';
 
+    passthru.updateScript = import ./update.nix {
+      inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
+      inherit (stdenv) lib;
+      majorVersion = with stdenv.lib; elemAt (splitString "." version) 0;
+    };
+
     meta = {
       description = "Event-driven I/O framework for the V8 JavaScript engine";
       homepage = https://nodejs.org;
diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix
new file mode 100644
index 00000000000..9ff11982b65
--- /dev/null
+++ b/pkgs/development/web/nodejs/update.nix
@@ -0,0 +1,27 @@
+{ lib
+, writeScript
+, coreutils
+, curl
+, gnugrep
+, jq
+, gnupg
+, common-updater-scripts
+, majorVersion
+, nix
+}:
+
+writeScript "update-nodejs" ''
+  PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]}
+
+  HOME=`mktemp -d`
+  cat ${./nodejs-release-keys.asc} | gpg --import
+
+  tags=`curl --silent https://api.github.com/repos/nodejs/node/git/refs/tags`
+  version=`echo $tags | jq -r '.[] | select(.ref | startswith("refs/tags/v${majorVersion}")) | .ref' | sort --version-sort  | tail -1 | grep -oP "^refs/tags/v\K.*"`
+
+  curl --silent -o $HOME/SHASUMS256.txt.asc https://nodejs.org/dist/v''${version}/SHASUMS256.txt.asc
+  hash_hex=`gpgv --keyring=$HOME/.gnupg/pubring.kbx --output - $HOME/SHASUMS256.txt.asc | grep -oP "^([0-9a-f]{64})(?=\s+node-v''${version}.tar.xz$)"`
+  hash=`nix-hash --type sha256 --to-base32 ''${hash_hex}`
+
+  update-source-version nodejs-${majorVersion}_x "''${version}" "''${hash}"
+''

From 242e77271b5d6a00581de3ac846e477e9a2bdc01 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Sun, 18 Feb 2018 18:44:56 +0300
Subject: [PATCH 0026/2266] dar: 2.5.9 -> 2.5.14

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

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index d75b50bca1a..f2ba1d70fca 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "dar-2.5.9";
+  name = "dar-2.5.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "0bm91d82amh5h2sla2ngbpxd0l64alcdjhxz35bhj3cpz9562wv9";
+    sha256 = "1if50d3cby30id18jh7bzy9mn2jjb89lsgpynjflyaibdcb4kq7s";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From df9ebaf8c7dda31cd42e6e897761abe98def7179 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 13 Feb 2018 15:24:12 -0600
Subject: [PATCH 0027/2266] nginx/modules: use eustas' brotli module, google
 one is abandoned

This fork is also used by FreeBSD as of Dec 2017:
https://svnweb.freebsd.org/ports?view=revision&revision=455560

See also:
https://github.com/google/ngx_brotli/issues/62
---
 pkgs/servers/http/nginx/modules.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 780f2001798..40eba200c1f 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -2,13 +2,17 @@
 
 {
   brotli = {
-    src = fetchFromGitHub {
-      owner = "google";
+    src = let gitsrc = pkgs.fetchFromGitHub {
+      owner = "eustas";
       repo = "ngx_brotli";
-      rev = "bfd2885b2da4d763fed18f49216bb935223cd34b";
-      sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n";
-      fetchSubmodules = true;
-    };
+      rev = "47550a25d07363f8eb87ef901b2de5883c46352b";
+      sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6";
+    }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
+      cp -a ${gitsrc} $out
+      substituteInPlace $out/config \
+        --replace /usr/local ${lib.getDev pkgs.brotli}
+    '';
+    inputs = [ pkgs.brotli ];
   };
 
   rtmp ={

From 40b14109d34453b3178c637c9d33061ed3a5c579 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Feb 2018 14:07:12 -0600
Subject: [PATCH 0028/2266] nginx/modules: brotli: no-op bump to latest that
 uses 1.0.2 as submodule

We have it use our system copy regardless, but might as well.

(yes, hash does not change, since we don't fetch submodule here)
---
 pkgs/servers/http/nginx/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 40eba200c1f..32d1523547e 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -5,7 +5,7 @@
     src = let gitsrc = pkgs.fetchFromGitHub {
       owner = "eustas";
       repo = "ngx_brotli";
-      rev = "47550a25d07363f8eb87ef901b2de5883c46352b";
+      rev = "8cd9dd5fc232d3a01644584921e52dae99034779";
       sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6";
     }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
       cp -a ${gitsrc} $out

From ced800572b327327f33a6b0196e1daac24b92f07 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 21 Feb 2018 11:35:40 +0800
Subject: [PATCH 0029/2266] libva, libva-utils and vaapiIntel: 2.0.0 -> 2.1.0
 (VA-API: 1.0.0 -> 1.1.0)

---
 pkgs/development/libraries/libva-utils/default.nix | 2 +-
 pkgs/development/libraries/libva/default.nix       | 5 +++--
 pkgs/development/libraries/vaapi-intel/default.nix | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index fad72105912..95d4be08548 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "01org";
     repo   = "libva-utils";
     rev    = version;
-    sha256 = "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi";
+    sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index dca548a6f9d..ddc0d9e87df 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -6,13 +6,14 @@
 
 stdenv.mkDerivation rec {
   name = "libva-${lib.optionalString (!minimal) "full-"}${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
+  # update libva-utils and vaapiIntel as well
   src = fetchFromGitHub {
     owner  = "01org";
     repo   = "libva";
     rev    = version;
-    sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy";
+    sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w";
   };
 
   outputs = [ "dev" "out" ];
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 7bd036cf2e5..3f376dedbb7 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "01org";
     repo   = "libva-intel-driver";
     rev    = version;
-    sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz";
+    sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763";
   };
 
   patchPhase = ''

From a98a767695765a263e0da0f35033fe21950feefe Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 22 Feb 2018 11:21:59 -0600
Subject: [PATCH 0030/2266] qt5: install pkg_config files on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #31685

This patch is applied in Homebrew here and looks to have worked for
them:

https://github.com/Homebrew/homebrew-core/blob/fafbdbd237ee87fb49b1080821e2597b38ff521c/Formula/qt.rb#L33-L44

I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).

Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.

This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.
---
 pkgs/development/libraries/qt-5/5.10/default.nix  |  4 +++-
 .../libraries/qt-5/5.10/restore-pc-files.patch    | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch

diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix
index eeff3456833..63d50c19a19 100644
--- a/pkgs/development/libraries/qt-5/5.10/default.nix
+++ b/pkgs/development/libraries/qt-5/5.10/default.nix
@@ -37,7 +37,9 @@ let
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
   patches = {
-    qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
+    qtbase = [ ./qtbase.patch ] ++
+      optionals stdenv.isDarwin [ ./qtbase-darwin.patch
+                                  ./restore-pc-files.patch ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
new file mode 100644
index 00000000000..a2355549d4a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
@@ -0,0 +1,15 @@
+Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
+
+diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf
+index bb28af97..36bb6483 100644
+--- i/mkspecs/features/qt_module.prf
++++ w/mkspecs/features/qt_module.prf
+@@ -245,7 +245,7 @@ load(qt_installs)
+ load(qt_targets)
+
+ # this builds on top of qt_common
+-!internal_module:!lib_bundle:if(unix|mingw) {
++!internal_module:if(unix|mingw) {
+     CONFIG += create_pc
+     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+     host_build: \
\ No newline at end of file

From 32cc6826245ccda337e809cb632a165d4b761359 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Feb 2018 03:00:47 +0100
Subject: [PATCH 0031/2266] texlive.bin: fix compatibility with poppler 0.62

---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 44c2dc16317..6881d005a25 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -28,6 +28,14 @@ let
       sha256 = "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81";
     };
 
+    patches = [
+      (fetchurl {
+        name = "texlive-poppler-0.59.patch";
+        url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin&id=6308ec39bce2a4d735f6ff8a4e94473748d7b450;
+        sha256 = "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n";
+      })
+    ];
+
     configureFlags = [
       "--with-banner-add=/NixOS.org"
       "--disable-missing" "--disable-native-texlive-build"
@@ -58,7 +66,7 @@ texliveYear = year;
 core = stdenv.mkDerivation rec {
   name = "texlive-bin-${version}";
 
-  inherit (common) src;
+  inherit (common) src patches;
 
   outputs = [ "out" "doc" ];
 
@@ -153,7 +161,7 @@ inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
   name = "texlive-core-big.bin-${version}";
 
-  inherit (common) src;
+  inherit (common) src patches;
 
   hardeningDisable = [ "format" ];
 

From 8f789693d410a0883659b7bf6fcba6e20a3f4d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 19 Feb 2018 10:43:50 +0100
Subject: [PATCH 0032/2266] wayland-protocols: 1.11 -> 1.13

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

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 5b1495ccbe1..ed986604819 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "wayland-protocols-${version}";
-  version = "1.11";
+  version = "1.13";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0138psvx6fv8z5x2p6xi4iij6m5k62c0qyfsb45xgcf5a4fyxz1s";
+    sha256 = "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a7a0d78f1c6d1d24bc6aa9001f7622191914e649 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 22 Feb 2018 09:52:28 +0100
Subject: [PATCH 0033/2266] epoxy: add mesa to libepoxy runpath as fallback

- libepoxy dlopen()s libEGL / libGL but didn't have mesa in its runpath
  -> error unless lib is already open or in LD_LIBRARY_PATH
- change dependency from mesa (should be avoided) to mesa_nonglu
---
 pkgs/development/libraries/epoxy/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index 18ce05af07a..c3cc5b2cd06 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python
-, mesa, libX11
+, mesa_noglu, libX11
 }:
 
 stdenv.mkDerivation rec {
@@ -16,13 +16,18 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
-  buildInputs = [ mesa libX11 ];
+  buildInputs = [ mesa_noglu libX11 ];
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
     substituteInPlace configure --replace build_glx=no build_glx=yes
     substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
   '';
 
+  # add mesa_nonglu to rpath because libepoxy dlopen()s libEGL
+  postFixup = ''
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ mesa_noglu ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0
+  '';
+
   meta = with stdenv.lib; {
     description = "A library for handling OpenGL function pointer management";
     homepage = https://github.com/anholt/libepoxy;

From 104dfd6f856f7d98b7c09ddee0e7c95fde5e50ce Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 21 Feb 2018 15:33:19 +0100
Subject: [PATCH 0034/2266] postgresql93: 9.3.20 -> 9.3.21

See https://www.postgresql.org/docs/9.3/static/release-9-3-21.html for
release information
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 02a620cee53..a607ff6fe8d 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -93,9 +93,9 @@ let
 in {
 
   postgresql93 = common {
-    version = "9.3.20";
+    version = "9.3.21";
     psqlSchema = "9.3";
-    sha256 = "1jp6lac4b0q6hb28yrdsl0ymzn75gg59hvp5zasarf3mf3b8l4zb";
+    sha256 = "1q2038rvqa00rpk8sjbnwb19x64fcyjphw9x087432hq918vrfmr";
   };
 
   postgresql94 = common {

From 10ef07fd628a9a3a3de11bc4f0975467ec92d8b6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 21 Feb 2018 15:34:45 +0100
Subject: [PATCH 0035/2266] postgresql94: 9.4.15 -> 9.4.16

See https://www.postgresql.org/docs/9.4/static/release-9-4-16.html for
release information
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a607ff6fe8d..c0b2228a46b 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -99,9 +99,9 @@ in {
   };
 
   postgresql94 = common {
-    version = "9.4.15";
+    version = "9.4.16";
     psqlSchema = "9.4";
-    sha256 = "1i5c67gg4fj38hk07h6w6m4mqak84bhnblqsjbpiamg4x33v7gqj";
+    sha256 = "10ay2cy3m4g66jwvxknc0f0w6mv2v7vm0dzkq92s9n7446v65g6w";
   };
 
   postgresql95 = common {

From 67e45dfd58c3780adbcbeb671f574b11a3a1afc3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 21 Feb 2018 15:35:24 +0100
Subject: [PATCH 0036/2266] postgresql95: 9.5.10 -> 9.5.11

See https://www.postgresql.org/docs/9.5/static/release-9-5-11.html for
release information.
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c0b2228a46b..751d2bb12e1 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -105,9 +105,9 @@ in {
   };
 
   postgresql95 = common {
-    version = "9.5.10";
+    version = "9.5.11";
     psqlSchema = "9.5";
-    sha256 = "10gjfn16bhzkmlqfsn384w49db0j39bg3n4majwxdpjd17g7lpcl";
+    sha256 = "1pf8fwx8a6vn344b80a1bf2p4hjg06sh69kb2qwswxbsw9scv0l1";
   };
 
   postgresql96 = common {

From 67f892b08fb43220ec53ef814a161338e0bcfc95 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 21 Feb 2018 15:36:15 +0100
Subject: [PATCH 0037/2266] postgresql96: 9.6.6 -> 9.6.7

See https://www.postgresql.org/docs/9.6/static/release-9-6-7.html for
release information
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 751d2bb12e1..5a45782d167 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -111,9 +111,9 @@ in {
   };
 
   postgresql96 = common {
-    version = "9.6.6";
+    version = "9.6.7";
     psqlSchema = "9.6";
-    sha256 = "0m417h30s18rwa7yzkqqcdb22ifpcda2fpg2cyx8bxvjp3ydz71r";
+    sha256 = "1ii4lrw8sncnz5g0fss1011shjhmbajzzhxx4f0bgsniq7rkvgif";
   };
 
   postgresql100 = common {

From 4080c2ae8be122bf474d90396be64701ef450ba5 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 21 Feb 2018 15:36:54 +0100
Subject: [PATCH 0038/2266] postgresql100: 10.1 -> 10.2

See https://www.postgresql.org/docs/10/static/release-10-2.html for
release information
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5a45782d167..f7b894111e4 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -117,9 +117,9 @@ in {
   };
 
   postgresql100 = common {
-    version = "10.1";
+    version = "10.2";
     psqlSchema = "10.0";
-    sha256 = "04z7lm4h94625vbncwv98svycqr942n3q47ailqaczkszqjlxjrw";
+    sha256 = "1bav2iyi93h866skrrlqlvsp4sfv1sfww1s305zpzffxcadh0cpy";
   };
 
 }

From 6450c1941991c219e4388a69328e050c65cd861f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 22 Feb 2018 01:25:02 +0000
Subject: [PATCH 0039/2266] sqlite: 3.21.0 -> 3.22.0

---
 pkgs/development/libraries/sqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 0625183fb7d..95a32c62a72 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.21.0";
+  name = "sqlite-3.22.0";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz";
-    sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp";
+    url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz";
+    sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 19a9ada1111d0b19adc378aeb5eb39beb3e6a130 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 22 Feb 2018 01:32:12 +0000
Subject: [PATCH 0040/2266] sqlite3_analyzer: 3.20.1 -> 3.22.0

---
 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index d971587ee6e..1feedb94c15 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.20.1";
+  name = "sqlite3_analyzer-3.22.0";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2017/sqlite-src-3200100.zip";
-    sha256 = "0aicmapa99141hjncyxwg66ndhr16nwpbqy27x79fg1ikzhwlnv6";
+    url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip";
+    sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv";
   };
 
   nativeBuildInputs = [ unzip ];

From 998fdfdc94b14f49ea3e8042f2d1e74dd4945bcb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 23 Feb 2018 13:39:24 +0300
Subject: [PATCH 0041/2266] cups: fix path to socket and run directory

We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.
---
 pkgs/misc/cups/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index db344b32d21..3e215cba101 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
-    "--with-rundir=/run"
     "--enable-raw-printing"
     "--enable-threads"
   ] ++ optionals stdenv.isLinux [

From 9c1c424e525b637560d91b99430b83cdaed24820 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 23 Feb 2018 13:41:15 +0300
Subject: [PATCH 0042/2266] cups service: fix client sockets

Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
---
 nixos/modules/services/printing/cupsd.nix | 7 +++++--
 nixos/tests/printing.nix                  | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 4c7f58d1d8b..ecab8cfc7df 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -124,7 +124,7 @@ in
 
       listenAddresses = mkOption {
         type = types.listOf types.str;
-        default = [ "127.0.0.1:631" ];
+        default = [ "localhost:631" ];
         example = [ "*:631" ];
         description = ''
           A list of addresses and ports on which to listen.
@@ -321,7 +321,10 @@ in
             ''}
           '';
 
-          serviceConfig.PrivateTmp = true;
+          serviceConfig = {
+            PrivateTmp = true;
+            RuntimeDirectory = [ "cups" ];
+          };
       };
 
     systemd.services.cups-browsed = mkIf avahiEnabled
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 2d3ecaf94cf..98900883061 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -39,7 +39,9 @@ import ./make-test.nix ({pkgs, ... }: {
       $client->waitForUnit("cups.service");
       $client->sleep(10); # wait until cups is fully initialized
       $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
-      $client->succeed("lpstat -H") =~ "localhost:631" or die;
+      # Test that UNIX socket is used for connections.
+      $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
+      # Test that HTTP server is available too.
       $client->succeed("curl --fail http://localhost:631/");
       $client->succeed("curl --fail http://server:631/");
       $server->fail("curl --fail --connect-timeout 2  http://client:631/");

From edf201583d6d2facefe8f98171957d83b77c093c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Feb 2018 14:21:04 -0600
Subject: [PATCH 0043/2266] ncurses6: 20171125 -> 6.1

From my experience on slightly older tree,
a few *old* programs incorrectly rely on ncurses internal details
and may now require setting NCURSES_INTERNALS=1 to allow this badness.

Since this is release, we can grab it from gnu mirrors.
---
 pkgs/development/libraries/ncurses/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index d63536e75f0..9ccdb48916a 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -11,18 +11,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "6.0-20171125";
+  version = "6.1";
   name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
 
   src = fetchurl {
-    urls = [
-      # Remove this mirror on next upgrade, it's only needed because upstream took ncurses-6.0-20171125.tgz down!
-      "http://bld1.alpinelinux.org/distfiles/v3.5/ncurses-${version}.tgz"
-
-      "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
-      "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
-    ];
-    sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92";
+    url = "mirror://gnu/ncurses/${name}.tar.gz";
+    sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
   };
 
   patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;

From be6e6d2e0481a819648e1caf970c152822aebd20 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Feb 2018 14:30:20 -0600
Subject: [PATCH 0044/2266] ncurses 6.1: fix URL, accomodate
 captoinfo/infotocap along with tic

---
 pkgs/development/libraries/ncurses/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 9ccdb48916a..1524b265999 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
 
   src = fetchurl {
-    url = "mirror://gnu/ncurses/${name}.tar.gz";
+    url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";
     sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
   };
 
@@ -117,6 +117,8 @@ stdenv.mkDerivation rec {
     moveToOutput "bin/tic" "$out"
     moveToOutput "bin/tput" "$out"
     moveToOutput "bin/tset" "$out"
+    moveToOutput "bin/captoinfo" "$out"
+    moveToOutput "bin/infotocap" "$out"
   '';
 
   preFixup = lib.optionalString (!hostPlatform.isCygwin) ''

From cdf19abfa598800bb2c6354b6c780d950e4e5673 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 23 Feb 2018 20:36:21 +0100
Subject: [PATCH 0045/2266] zziplib: use postPatch instead of patchPhase

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

diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 07a6f7ef088..a68973b06c6 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j";
   };
 
-  patchPhase = ''
+  postPatch = ''
     sed -i -e s,--export-dynamic,, configure
   '';
 

From ee16feed37d3dfa5d0a01b62a0a2e0b3c3b3ee9d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 23 Feb 2018 21:10:27 +0100
Subject: [PATCH 0046/2266] zziplib: add docbook_xml_dtd_412

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

diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index a68973b06c6..3ddc40705c4 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, perl, python2, zip, xmlto, zlib }:
+{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }:
 
 stdenv.mkDerivation rec {
   name = "zziplib-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sed -i -e s,--export-dynamic,, configure
   '';
 
-  buildInputs = [ perl python2 zip xmlto zlib ];
+  buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ];
 
   doCheck = true;
 

From 9f6a942fc7725e63f36c7eb8eefe840628cf9f14 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 23 Feb 2018 21:11:05 +0100
Subject: [PATCH 0047/2266] zziplib: 0.13.67 -> 0.13.68

Bump zziplib to 0.13.68 to fix multiple CVE issues:

 - CVE-2018-6381
 (https://github.com/gdraheim/zziplib/commit/a803559fa9194be895422ba3684cf6309b6bb598)
 - CVE-2018-6484
 (https://github.com/gdraheim/zziplib/issues/14#issuecomment-363198084)
 - CVE-2018-6540
 (https://github.com/gdraheim/zziplib/commit/72ec933663f738d8e166979aa7fd5590b2104a07)
 - CVE-2018-6541
 (https://github.com/gdraheim/zziplib/issues/16#issuecomment-363197718)
 - CVE-2018-6542
 (https://github.com/gdraheim/zziplib/commit/931f962ddfec0e00d6f486df2c56d9857b55944e)

Unfortunately, getting only those patches is hard, as they're not well
referenced to linked issues. The testsuite checking for vulns
requires network access (so we can't easily test it here).

https://github.com/gdraheim/zziplib/issues/20 might still be an issue,
so keeping this as a TODO here.
---
 pkgs/development/libraries/zziplib/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 3ddc40705c4..d43c481c859 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -2,20 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "zziplib-${version}";
-  version = "0.13.67";
+  version = "0.13.68";
 
   src = fetchurl {
     url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz";
-    sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j";
+    sha256 = "0chhl6m02562z6c4hjy568mh11pbq2qngw6g2x924ajr8sdr2q4l";
   };
 
   postPatch = ''
     sed -i -e s,--export-dynamic,, configure
   '';
 
+  # TODO: still an issue: https://github.com/gdraheim/zziplib/issues/27
+
   buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ];
 
-  doCheck = true;
+  # tests are broken (https://github.com/gdraheim/zziplib/issues/20),
+  # and test/zziptests.py requires network access
+  # (https://github.com/gdraheim/zziplib/issues/24)
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Library to extract data from files archived in a zip file";

From 4bbd6900f8f74dac9e4b3ebd9eb4dc52767f2279 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 23 Feb 2018 21:36:13 +0000
Subject: [PATCH 0048/2266] protobuf: 3.4.0 -> {3.4.1, 3.5.1.1}

---
 pkgs/development/libraries/protobuf/3.4.nix | 4 ++--
 pkgs/development/libraries/protobuf/3.5.nix | 6 ++++++
 pkgs/top-level/all-packages.nix             | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/protobuf/3.5.nix

diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix
index 75f1bb22c24..5a9034a56a8 100644
--- a/pkgs/development/libraries/protobuf/3.4.nix
+++ b/pkgs/development/libraries/protobuf/3.4.nix
@@ -1,6 +1,6 @@
 { callPackage, lib, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
-  version = "3.4.0";
-  sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";
+  version = "3.4.1";
+  sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix
new file mode 100644
index 00000000000..db9cb6f0371
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.5.nix
@@ -0,0 +1,6 @@
+{ callPackage, lib, ... }:
+
+lib.overrideDerivation (callPackage ./generic-v3.nix {
+  version = "3.5.1.1";
+  sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
+}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5cba0bfa202..c0a0a8b9b63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10769,8 +10769,10 @@ with pkgs;
 
   postgis = callPackage ../development/libraries/postgis { };
 
-  protobuf = callPackage ../development/libraries/protobuf/3.4.nix { };
+  protobuf = protobuf3_5;
 
+  protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
+  protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 

From af1f5676c9190a9e6f92f0e62b49e515699c9b41 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 23 Feb 2018 16:58:00 -0600
Subject: [PATCH 0049/2266] Add .gitattributes file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds the .gitattributes file to the tree. I’ve added two
attributes: linguist-generated, and linguist-documentation.

GitHub’s Linguist will follow this when calculating our language stats
as well as in other cases like commit diffs.

Any additional attributes or other generated files are welcome to be added!
---
 .gitattributes | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..a636295ebd6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+**/deps.nix linguist-generated
+**/node-packages.nix linguist-generated
+
+pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
+pkgs/development/r-modules/*-packages.nix linguist-generated
+pkgs/development/haskell-modules/hackage-packages.nix linguist-generated
+pkgs/development/beam-modules/hex-packages.nix linguist-generated
+
+doc/** linguist-documentation
+doc/default.nix linguist-documentation=false
+
+nixos/doc/** linguist-documentation
+nixos/doc/default.nix linguist-documentation=false

From ccbd01f9d43d11b1c54174a458aee55b605d1c14 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 24 Feb 2018 02:10:32 +0000
Subject: [PATCH 0050/2266] protobuf: protobuf3_5 -> protobuf3_4

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0a0a8b9b63..60f6f03f36d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10769,7 +10769,7 @@ with pkgs;
 
   postgis = callPackage ../development/libraries/postgis { };
 
-  protobuf = protobuf3_5;
+  protobuf = protobuf3_4;
 
   protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
   protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };

From 18ec7f719035a2a5c3ad1fd80372be06e34501e3 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sat, 24 Feb 2018 18:44:17 +0100
Subject: [PATCH 0051/2266] osrm-backend: 5.15.0 -> 5.16.0

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

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 14f422f9610..8815ca3e210 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.15.0";
+  version = "5.16.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "1vdy7j1k1brgd5jgvi5pm3flfw70v48d4rwfq404iiyipkjdy3kz";
+    sha256 = "14vf0av63zizz1knjzhj34hxadxwcza2zakhaj6si3kb8zhihmaf";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From b6476968c46b600bfee43ab0bacfee14eee095d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Feb 2018 10:46:38 +0100
Subject: [PATCH 0052/2266] libdrm: 2.4.89 -> 2.4.90

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index e5e1e2e7a39..3eb7325132a 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.89";
+  name = "libdrm-2.4.90";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e";
+    sha256 = "db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b";
   };
 
   outputs = [ "out" "dev" "bin" ];

From ddb422714da24bb9fd216ffc5ee0f63f044e89a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Feb 2018 11:23:39 +0100
Subject: [PATCH 0053/2266] mesa: 17.3.3 -> 17.3.5 (maintenance)

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index fa3336c4cea..8d2e3e90716 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -66,7 +66,7 @@ let
 in
 
 let
-  version = "17.3.3";
+  version = "17.3.5";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "16rpm4rwmzd4kdgipa1gw262jqg3346gih0y3bsc3bgn1vgcbfj1";
+    sha256 = "eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a";
   };
 
   prePatch = "patchShebangs .";

From 01bf8381fd7719f6ca20036c876ed2c3d1047af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Feb 2018 14:57:24 +0100
Subject: [PATCH 0054/2266] gtk3: 3.22.26 -> 3.22.28 (maintenance)

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

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 4c377c73571..e9c93660bf7 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "26";
+  ver_min = "28";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967";
+    sha256 = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f";
   };
 
   outputs = [ "out" "dev" ];

From e571f14d39460fdd53eabd023c8b6050a750d9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Feb 2018 15:01:06 +0100
Subject: [PATCH 0055/2266] harfbuzz: 1.7.1 -> 1.7.5

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 2c38387eb83..bb68ae94a7f 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.7.1";
+  version = "1.7.5";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e";
+    sha256 = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563";
   };
 
   outputs = [ "out" "dev" ];

From 0479e913094af56ae270a0adcbbe027bfe27488e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Feb 2018 21:21:22 +0100
Subject: [PATCH 0056/2266] lightdm-gtk-greeter: fix build by ignoring a
 warning

---
 .../display-managers/lightdm-gtk-greeter/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 13740dd9dfd..a54f0a49921 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
+
   installFlags = [
     "localstatedir=\${TMPDIR}"
     "sysconfdir=\${out}/etc"

From 30eb16701472666915b9340a2ba1d9c7e62d09f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 25 Feb 2018 12:00:55 +0100
Subject: [PATCH 0057/2266] zotero: 5.0.25 -> 5.0.35.1

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

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index b259623bf91..bbeb05624c1 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }:
 
 let
-version = "5.0.25";
+version = "5.0.35.1";
 meta = with stdenv.lib; {
   homepage = https://www.zotero.org;
   description = "Collect, organize, cite, and share your research sources";
@@ -15,7 +15,7 @@ zoteroSrc = stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k";
+    sha256 = "0d2imvp84svllrnja1dl4nldp634z632g5xkm2q9v7j3dwbzw1hw";
   };
 
   buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];

From 337d8ab2e1b17ff065e69059483bd064271ec2f6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 08:20:45 -0500
Subject: [PATCH 0058/2266] libidn2: Fix cross-compilation

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

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 521fe00b56d..d375785e497 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }:
 
 with stdenv.lib;
 
@@ -15,8 +15,10 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
 
-  buildInputs = [ libunistring ronn ]
-    ++ optionals stdenv.isDarwin [ libiconv help2man ];
+  nativeBuildInputs = [ ronn ]
+    ++ optional stdenv.isDarwin help2man;
+  buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   meta = {
     homepage = "https://www.gnu.org/software/libidn/#libidn2";

From 24ad5077f246f90315569b381b57fc701aa3ef77 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 08:24:34 -0500
Subject: [PATCH 0059/2266] libgcrypt: Remove verbosity intended to avoid a
 systemd rebuild.

libidn2 is going to require it anyway
---
 pkgs/development/libraries/libgcrypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index a02aefb0a74..6f36199bd1a 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -21,18 +21,18 @@ stdenv.mkDerivation rec {
   # The build enables -O2 by default for everything else.
   hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
 
-  depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   buildInputs = [ libgpgerror ]
     ++ stdenv.lib.optional stdenv.isDarwin gettext
     ++ stdenv.lib.optional enableCapabilities libcap;
 
-  preConfigure = if stdenv.isCross then ''
+  preConfigure = stdenv.lib.optionalString stdenv.isCross ''
     # This is intentional: gpg-error-config is a shell script that will work during the build
     mkdir -p "$NIX_BUILD_TOP"/bin
     ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"
     export PATH="$NIX_BUILD_TOP/bin:$PATH"
-  '' else null;
+  '';
 
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config

From afb505fb5a6e2845de144c5587e45a65941bd79f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 25 Feb 2018 13:40:00 +0000
Subject: [PATCH 0060/2266] cfr: 0_101 -> 0_125

---
 pkgs/development/tools/java/cfr/default.nix | 24 +++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index bfb37fc5f03..c7cc0543976 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, makeWrapper, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
-  version = "0_101";
+  version = "0_125";
 
   src = fetchurl {
-    sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch";
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
+    sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa";
   };
 
-  buildInputs = [ jre ];
+  buildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    jar=$out/share/cfr/cfr_${version}.jar
-
-    install -Dm644 ${src} $jar
-
-    cat << EOF > cfr
-    #!${stdenv.shell}
-    exec ${jre}/bin/java -jar $jar "\''${@}"
-    EOF
-    install -Dm755 cfr $out/bin/cfr
+  buildCommand = ''
+    jar=$out/share/java/cfr_${version}.jar
+    install -Dm444 $src $jar
+    makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar"
   '';
 
   meta = with stdenv.lib; {

From 42c87765713500722b12ca8eab72826d6b279802 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 09:07:14 -0500
Subject: [PATCH 0061/2266] systemd: Take python3 from buildPackages.

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 383e3c340e6..548594d2810 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -9,12 +9,13 @@
 , patchelf
 , getent
 , hostPlatform
+, buildPackages
 }:
 
 assert stdenv.isLinux;
 
 let
-  pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
+  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
 
 in
 
@@ -35,7 +36,7 @@ in
       [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
         ninja meson
         coreutils # meson calls date, stat etc.
-        pythonLxmlEnv glibcLocales
+        glibcLocales
         patchelf getent
       ];
     buildInputs =
@@ -43,6 +44,8 @@ in
         /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2
         libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
         iptables gnu-efi
+        # This is actually native, but we already pull it from buildPackages
+        pythonLxmlEnv
       ];
 
     #dontAddPrefix = true;
@@ -128,7 +131,7 @@ in
 
         for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
           substituteInPlace $i \
-            --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python"
+            --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"
         done
 
         substituteInPlace src/journal/catalog.c \

From e21300a6ae8997895f2b902e52eef5f11c98ec8a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 09:38:55 -0500
Subject: [PATCH 0062/2266] libapparmor: Fix cross-compilation.

---
 pkgs/os-specific/linux/apparmor/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 0bb5561e957..c8e58dfbf6f 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -8,6 +8,7 @@
 , swig
 , ncurses
 , pam
+, buildPackages
 }:
 
 let
@@ -29,8 +30,8 @@ let
   };
 
   prePatchCommon = ''
-    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
-    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
+    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"
+    substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html"
     substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
     substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
   '';
@@ -70,9 +71,10 @@ let
       swig
       ncurses
       which
+      perl
     ];
 
-    buildInputs = [
+    buildInputs = stdenv.lib.optionals (!stdenv.isCross) [
       perl
       python
     ];
@@ -87,11 +89,12 @@ let
     inherit patches;
 
     postPatch = "cd ./libraries/libapparmor";
-    configureFlags = "--with-python --with-perl";
+    # https://gitlab.com/apparmor/apparmor/issues/1
+    configureFlags = stdenv.lib.optionalString (!stdenv.isCross) "--with-python --with-perl";
 
-    outputs = [ "out" "python" ];
+    outputs = if stdenv.isCross then [ "out" ] else [ "out" "python" ];
 
-    postInstall = ''
+    postInstall = stdenv.lib.optionalString (!stdenv.isCross) ''
       mkdir -p $python/lib
       mv $out/lib/python* $python/lib/
     '';

From dcab8d611d1e4652346f10bc1f16e4784368a364 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 09:46:49 -0500
Subject: [PATCH 0063/2266] lzip: Fix cross compilation

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

diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index 298e490be87..2f6f9aca432 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";
   };
 
-  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
+  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++";
 
   setupHook = ./lzip-setup-hook.sh;
 

From d7b151c54e5db830ca1abc16e1abd6567b6ca8c2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 11:10:43 -0800
Subject: [PATCH 0064/2266] btrfs-progs: 4.14.1 -> 4.15.1

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs --version` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs version` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/mkfs.btrfs --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/mkfs.btrfs -V` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/mkfs.btrfs --version` and found version 4.15.1
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-debug-tree help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-image --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-find-root --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfstune --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/btrfs-convert --help` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/fsck.btrfs -h` got 0 exit code
- ran `/nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1/bin/fsck.btrfs --help` got 0 exit code
- found 4.15.1 with grep in /nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1
- found 4.15.1 in filename of file in /nix/store/23glaba4yda3cyjixsxni52i2grvi799-btrfs-progs-4.15.1
---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 46c5bc6071f..793a540d9bf 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
 }:
 
-let version = "4.14.1"; in
+let version = "4.15.1"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1palnddw3d50kyflwk1j4xapbc6jniid6j5i9dsr8l8a7nkv7ich";
+    sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1e8223439045c271bf1b86cdac738985992b03ba Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 14:21:12 -0800
Subject: [PATCH 0065/2266] certstrap: 1.0.1 -> 1.1.1

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -h` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --help` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap help` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -v` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --version` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -h` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --help` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap help` and found version 1.1.1
- found 1.1.1 with grep in /nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin
- found 1.1.1 in filename of file in /nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin
---
 pkgs/tools/security/certstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index bf659f19e9b..e0935f0f760 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "certstrap-${version}";
-  version = "1.0.1";
+  version = "1.1.1";
 
   goPackagePath = "github.com/square/certstrap";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "square";
     repo = "certstrap";
     rev = "v${version}";
-    sha256 = "0pw1g6nyb212ayic42rkm6i0cf4n2003f02qym6zp130m6aysb47";
+    sha256 = "0j7gi2nzykny7i0gjax9vixw72l9jcm4wnwxgm72hh1pji0ysa8n";
   };
 
   meta = with stdenv.lib; {

From c9a1639e20afc3a11a74b9ce806934b6bd1ac326 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 25 Feb 2018 23:23:59 +0100
Subject: [PATCH 0066/2266] cacert: add output "unbundled"

which contains all certs, each in a separate file.
This output is not installed by default.
---
 pkgs/data/misc/cacert/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 91af84c4224..23875b985ba 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   src = nss.src;
 
+  outputs = [ "out" "unbundled" ];
+
   nativeBuildInputs = [ python ];
 
   configurePhase = ''
@@ -50,6 +52,10 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -pv $out/etc/ssl/certs
     cp -v ca-bundle.crt $out/etc/ssl/certs
+    # install individual certs in unbundled output
+    mkdir -pv $unbundled/etc/ssl/certs
+    cp -v *.crt $unbundled/etc/ssl/certs
+    rm -f $unbundled/etc/ssl/certs/ca-bundle.crt  # not wanted in unbundled
   '';
 
   setupHook = ./setup-hook.sh;

From 92e74ec23645cd76db3af36bcd4d962b8cd909f8 Mon Sep 17 00:00:00 2001
From: Tom Smeets <Tom.TSmeets@Gmail.com>
Date: Mon, 26 Feb 2018 00:03:37 +0100
Subject: [PATCH 0067/2266] android-studio: Depend on ncurses5

The android ndk fails to compile the test program because it could not
find the `ncurses.so.5` library.

Also, `ncurses5` is a dependency according to https://developer.android.com/studio/troubleshoot.html#linux_libraries
---
 pkgs/applications/editors/android-studio/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 2c2227dd4ee..66313d68c5c 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -106,6 +106,7 @@ let
   # environment is used as a work around for that.
   fhsEnv = buildFHSUserEnv {
     name = "${pname}-fhs-env";
+    multiPkgs = pkgs: [ pkgs.ncurses5 ];
   };
 
 in

From f79fa7794176c11530a3be3f05ffbc10f1e53003 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 20:36:43 -0500
Subject: [PATCH 0068/2266] Guile: Fix cross-compilation

---
 pkgs/development/interpreters/guile/2.0.nix     | 10 +++++-----
 pkgs/development/interpreters/guile/default.nix | 10 +++++-----
 pkgs/development/interpreters/guile/riscv.patch | 13 +++++++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/interpreters/guile/riscv.patch

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 5746300fca0..ea8ff924064 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform
+, hostPlatform, buildPackages
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -19,7 +19,9 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
+    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile_2_0;
   buildInputs = [ readline libtool libunistring libffi ];
   propagatedBuildInputs = [ gmp boehmgc ]
 
@@ -29,9 +31,6 @@
     # see below.
     ++ [ libtool libunistring ];
 
-  # A native Guile 2.0 is needed to cross-build Guile.
-  selfNativeBuildInput = true;
-
   enableParallelBuilding = true;
 
   patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
@@ -40,6 +39,7 @@
       url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
       sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
     })
+    ./riscv.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index e10c5fbb568..fc7cd2b60ea 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform
+, hostPlatform, buildPackages
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -20,7 +20,9 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
+    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile;
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [ gmp boehmgc ]
@@ -30,13 +32,11 @@
     # see below.
     ++ [ libtool libunistring ];
 
-  # A native Guile 2.0 is needed to cross-build Guile.
-  selfNativeBuildInput = true;
-
   enableParallelBuilding = true;
 
   patches = [
     ./eai_system.patch
+    ./riscv.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
diff --git a/pkgs/development/interpreters/guile/riscv.patch b/pkgs/development/interpreters/guile/riscv.patch
new file mode 100644
index 00000000000..b835e161383
--- /dev/null
+++ b/pkgs/development/interpreters/guile/riscv.patch
@@ -0,0 +1,13 @@
+diff --git a/module/system/base/target.scm b/module/system/base/target.scm
+index 95ab8d8c9..93616f4a3 100644
+--- a/module/system/base/target.scm
++++ b/module/system/base/target.scm
+@@ -86,6 +86,8 @@
+              (endianness big))
+             ((string=? "aarch64" cpu)
+              (endianness little))
++            ((string-match "riscv[1-9][0-9]*" cpu)
++             (endianness little))
+             (else
+              (error "unknown CPU endianness" cpu)))))
+ 

From 6b1ab50738d1f61cdb9d2b2f8d85ed8368b76366 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 20:37:08 -0500
Subject: [PATCH 0069/2266] Autogen: Fix unnecessary duplication during
 cross-compilation

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

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 77944297a97..660917ee9f1 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ which pkgconfig perl ]
     # autogen needs a build autogen when cross-compiling
     ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-      buildPackages.autogen buildPackages.texinfo ];
+      buildPackages.buildPackages.autogen buildPackages.texinfo ];
   buildInputs = [
     guile libxml2
   ];

From 4042708b7f2c5f0f84cff05c98e8b46f61f33818 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 20:18:18 -0800
Subject: [PATCH 0070/2266] double-conversion: 2.0.1 -> 3.0.0

Semi-automatic update. These checks were performed:

- built on NixOS
- found 3.0.0 with grep in /nix/store/3401963nw3aw97ng939gk6viifymqzgx-double-conversion-3.0.0
- found 3.0.0 in filename of file in /nix/store/3401963nw3aw97ng939gk6viifymqzgx-double-conversion-3.0.0
---
 pkgs/development/libraries/double-conversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 47c165c1bad..c656220f760 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "double-conversion-${version}";
-  version = "2.0.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
-    sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
+    sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz";
   };
 
   nativeBuildInputs = [ cmake ];

From 251eca2f7da3ca61337b10585f179ea8859a14ab Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 20:44:16 -0800
Subject: [PATCH 0071/2266] electrum-ltc: 3.0.5.1 -> 3.0.6.2

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc -h` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc --help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc version` and found version 3.0.6.2
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped -h` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped --help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped version` and found version 3.0.6.2
- found 3.0.6.2 with grep in /nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2
- found 3.0.6.2 in filename of file in /nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2
---
 pkgs/applications/misc/electrum-ltc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index 10b2aacbf8c..8540c39d133 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -5,11 +5,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-ltc-${version}";
-  version = "3.0.5.1";
+  version = "3.0.6.2";
 
   src = fetchurl {
     url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
-    sha256 = "1acsgzmd83cz6ha5fw63mi7123fr6gbiq537p5lxxfs2i8zrl63r";
+    sha256 = "1bay4vfkanxsa8pj8n99sj55yc59s84nns97lbvagyp0p0lclia7";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 71286aa5ec757b4de5109146d4543cdaca381b67 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 20:47:15 -0800
Subject: [PATCH 0072/2266] emscripten: 1.37.16 -> 1.37.34

Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.37.34 with grep in /nix/store/mdr47v3wdjmzic5c2nvdx5krdwl6bcxf-emscripten-1.37.34
---
 pkgs/development/compilers/emscripten/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ae80ad6fc80..f8fc12200b7 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rev = "1.37.16";
+  rev = "1.37.34";
   appdir = "share/emscripten";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
+    sha256 = "1v62jg0b65shh10lbkvjg79xwnwwms6lr6w5vn1gaq6cpc712y19";
     inherit rev;
   };
 

From e0c155e26b6a73bba06d6f2ced12bd4bcb0d6503 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 26 Feb 2018 09:42:57 +0100
Subject: [PATCH 0073/2266] automake: 1.15.1 -> 1.16

See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00008.html
for release announcement and changes.
---
 .../automake/{automake-1.15.x.nix => automake-1.16.x.nix}     | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/tools/misc/automake/{automake-1.15.x.nix => automake-1.16.x.nix} (91%)

diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
similarity index 91%
rename from pkgs/development/tools/misc/automake/automake-1.15.x.nix
rename to pkgs/development/tools/misc/automake/automake-1.16.x.nix
index 507df5def0c..43efcf46280 100644
--- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.15.1";
+  name = "automake-1.16";
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg";
+    sha256 = "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr";
   };
 
   nativeBuildInputs = [ autoconf perl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70516d3c533..a41aeb7a1f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7339,11 +7339,11 @@ with pkgs;
 
   autocutsel = callPackage ../tools/X11/autocutsel{ };
 
-  automake = automake115x;
+  automake = automake116x;
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
-  automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };
+  automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { };
 
   automoc4 = callPackage ../development/tools/misc/automoc4 { };
 

From 4728ef130e17f194fddedfea386e4fc909e1c4cb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Feb 2018 05:24:36 -0500
Subject: [PATCH 0074/2266] RISC-V: Add upstream gcc patch to fix -pthread.

Fixes libmicrohttpd build.
---
 pkgs/development/compilers/gcc/7/default.nix        |  4 +++-
 .../compilers/gcc/7/riscv-pthread-reentrant.patch   | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e8997b1efb0..68a47987b2e 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -73,7 +73,9 @@ let version = "7.3.0";
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
-      ++ optional langFortran ../gfortran-driving.patch;
+      ++ optional langFortran ../gfortran-driving.patch
+         # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html
+      ++ optional targetPlatform.isRiscV ./riscv-pthread-reentrant.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
diff --git a/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch b/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch
new file mode 100644
index 00000000000..c7527ffb2b1
--- /dev/null
+++ b/pkgs/development/compilers/gcc/7/riscv-pthread-reentrant.patch
@@ -0,0 +1,13 @@
+Index: gcc/config/riscv/linux.h
+===================================================================
+--- a/gcc/config/riscv/linux.h	(revision 257620)
++++ b/gcc/config/riscv/linux.h	(revision 257621)
+@@ -47,6 +47,8 @@
+ 
+ #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
+ 
++#define CPP_SPEC "%{pthread:-D_REENTRANT}"
++
+ #define LINK_SPEC "\
+ -melf" XLEN_SPEC "lriscv \
+ %{shared} \

From 284f75a258e0f766b8b5d047c486f11c4c4e102d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Feb 2018 06:33:00 -0500
Subject: [PATCH 0075/2266] meson: Support cross-compiling

---
 .../tools/build-managers/meson/default.nix    | 26 +++++++++++++++++--
 .../tools/build-managers/meson/setup-hook.sh  |  8 ++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 5db0bce21f7..27aa38cfa7e 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,5 +1,7 @@
-{ lib, python3Packages }:
-python3Packages.buildPythonApplication rec {
+{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, m4 }: let
+  targetPrefix = lib.optionalString stdenv.isCross
+                   (targetPlatform.config + "-");
+in python3Packages.buildPythonApplication rec {
   version = "0.44.0";
   pname = "meson";
   name = "${pname}-${version}";
@@ -33,6 +35,26 @@ python3Packages.buildPythonApplication rec {
 
   setupHook = ./setup-hook.sh;
 
+  crossFile = writeTextDir "cross-file.conf" ''
+    [binaries]
+    c = '${targetPrefix}cc'
+    cpp = '${targetPrefix}c++'
+    ar = '${targetPrefix}ar'
+    strip = '${targetPrefix}strip'
+    pkgconfig = 'pkg-config'
+
+    [properties]
+    needs_exe_wrapper = true
+
+    [host_machine]
+    system = '${targetPlatform.parsed.kernel.name}'
+    cpu_family = '${targetPlatform.parsed.cpu.family}'
+    cpu = '${targetPlatform.parsed.cpu.name}'
+    endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"}
+  '';
+
+  inherit (stdenv) cc isCross;
+
   meta = with lib; {
     homepage = http://mesonbuild.com;
     description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 8f96e6146be..22e46a62cb9 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -6,11 +6,15 @@ mesonConfigurePhase() {
     fi
 
     # Build release by default.
-    mesonFlags="--buildtype=${mesonBuildType:-release} $mesonFlags"
+    if [ -n "@isCross@" ]; then
+      crossMesonFlags="--cross-file=@crossFile@/cross-file.conf"
+    fi
+
+    mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
 
     echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
 
-    meson build $mesonFlags "${mesonFlagsArray[@]}"
+    CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}"
     cd build
 
     if ! [[ -v enableParallelBuilding ]]; then

From 9d2af8d61ca651b5ad505c37f42e10ace4894fc2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Feb 2018 06:38:42 -0500
Subject: [PATCH 0076/2266] systemd: Fix cross-compiling

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 548594d2810..df51284689e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -37,11 +37,11 @@ in
         ninja meson
         coreutils # meson calls date, stat etc.
         glibcLocales
-        patchelf getent
+        patchelf getent m4
       ];
     buildInputs =
       [ linuxHeaders libcap kmod xz pam acl
-        /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2
+        /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
         libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
         iptables gnu-efi
         # This is actually native, but we already pull it from buildPackages

From aadaf2097084a3ba21815cc8cee68e0d666324c0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 06:21:03 -0800
Subject: [PATCH 0077/2266] fprintd: 0.7.0 -> 0.8.0

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-verify -h` got 0 exit code
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-verify --help` got 0 exit code
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-enroll -h` got 0 exit code
- ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-enroll --help` got 0 exit code
- found 0.8.0 with grep in /nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0
- found 0.8.0 in filename of file in /nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0

cc "@abbradar"
---
 pkgs/tools/security/fprintd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index effdaaecb18..52bc59abb4c 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "fprintd-${version}";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5";
+    sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k";
   };
 
   buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ];

From 435288caca4aeac2258dd87a431c254d340c9929 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 26 Feb 2018 08:30:20 -0600
Subject: [PATCH 0078/2266] llvm_4: fix cosmetic issue in help output

Can be observed in programs like "llvm-link".
---
 .../compilers/llvm/4/cmdline-help.patch       | 39 +++++++++++++++++++
 pkgs/development/compilers/llvm/4/llvm.nix    |  3 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/4/cmdline-help.patch

diff --git a/pkgs/development/compilers/llvm/4/cmdline-help.patch b/pkgs/development/compilers/llvm/4/cmdline-help.patch
new file mode 100644
index 00000000000..a693719c2cf
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/cmdline-help.patch
@@ -0,0 +1,39 @@
+From c7a9aa3a697c81432786a5583bf973771c7be15e Mon Sep 17 00:00:00 2001
+From: Don Hinton <hintonda@gmail.com>
+Date: Wed, 12 Jul 2017 01:15:46 +0000
+Subject: [PATCH] Fix minor typo introduced in r276404
+
+Summary:
+A space was added between '-' and 'help' when emitting help output.
+
+See https://reviews.llvm.org/D22621 for details.
+
+Reviewers: MaggieYi, vsk
+
+Reviewed By: vsk
+
+Subscribers: llvm-commits
+
+Differential Revision: https://reviews.llvm.org/D35283
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307745 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Support/CommandLine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
+index 3889902eea5..79defa5c36c 100644
+--- a/lib/Support/CommandLine.cpp
++++ b/lib/Support/CommandLine.cpp
+@@ -1236,7 +1236,7 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
+              << ": Not enough positional command line arguments specified!\n"
+              << "Must specify at least " << NumPositionalRequired
+              << " positional argument" << (NumPositionalRequired > 1 ? "s" : "")
+-             << ": See: " << argv[0] << " - help\n";
++             << ": See: " << argv[0] << " -help\n";
+     }
+ 
+     ErrorParsing = true;
+-- 
+2.14.0
+
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 7fd94316d73..787175b859c 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -78,6 +78,9 @@ in stdenv.mkDerivation (rec {
       substituteInPlace lib/esan/esan_sideline_linux.cpp \
         --replace 'struct sigaltstack' 'stack_t'
     )
+  '' + # Fix extra space printed in commandline help sometimes, "- help"
+  ''
+    patch -p1 -i ${./cmdline-help.patch}
   '' + stdenv.lib.optionalString stdenv.isAarch64 ''
     patch -p0 < ${../aarch64.patch}
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

From 319942aa65b411520c2d98983069dcf42682a494 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:12 +0100
Subject: [PATCH 0079/2266] python: aiohttp: 3.0.1 -> 3.0.3

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 19ad64e7472..53635e7d53a 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.0.1";
+  version = "3.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221";
+    sha256 = "a96be9189b2d51e366106e4207c9afaf3d69462562548a613e399c311ff70b88";
   };
 
   disabled = pythonOlder "3.4";

From 2d74d853ddd5eab57ac6a8c91561c3c3eb7dfbff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:12 +0100
Subject: [PATCH 0080/2266] python: aniso8601: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index ba60922856e..04df5d2fde8 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "2.0.0";
+  version = "2.0.1";
   name = "${pname}-${version}";
 
   meta = with stdenv.lib; {
@@ -16,6 +16,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "085786415d3550e89785ffbedaa9bb37d41de0707a1268bdbba11249064b71d1";
+    sha256 = "b7215a41e5194a829dc87d1ea5039315be85a6158ba15c8157a284c29fa6808b";
   };
 }

From 006a6db0128766b32b5e681cedc0e837c4549824 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0081/2266] python: behave: 1.2.5 -> 1.2.6

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

diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 80acc58f654..60160b128a4 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -5,14 +5,14 @@
 }:
 buildPythonApplication rec {
   pname = "behave";
-  version = "1.2.5";
+  version = "1.2.6";
   name = "${pname}-${version}";
 
   disabled = pythonAtLeast "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b";
+    sha256 = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86";
   };
 
   checkInputs = [ mock nose pyhamcrest ];

From ca01ff1ae39358cfe1a5d96574d042eb6fbe2a89 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0082/2266] python: botocore: 1.8.45 -> 1.8.50

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e363136615e..67f09cf9275 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.8.45";
+  version = "1.8.50";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f91b648a216dc945783d1539c013fc08a9e65ecc4fc5aae017bdd5961fd3468";
+    sha256 = "a80a23e080f4a93d11a1c067a69304dd407d18c358cba1e0df8c96f56c9e98b4";
   };
 
   propagatedBuildInputs = [

From 5c6d4687cfd6af79991ccb56ab90f5af2cb6f16d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0083/2266] python: dask: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 8a8437767d8..70b4b55f5c6 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.17.0";
+  version = "0.17.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4d2b0754d16ddc3f87026c1fc4fa3b589d7604a41d3f6510268f172abc1d0a5e";
+    sha256 = "0a6aec8b3489419c97486afd46e30b63caafc642205726a884b7fe488906d359";
   };
 
   checkInputs = [ pytest ];

From b1ef93a132d1139a4ece713e8618b0e5960ae29d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0084/2266] python: ipykernel: 4.8.1 -> 4.8.2

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

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 018a522a591..3f09975d66b 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "4.8.1";
+  version = "4.8.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe2837622a4121cbe42b354db1e2ab46c91e807ffcb92f4c2cfd323a75f8737f";
+    sha256 = "c091449dd0fad7710ddd9c4a06e8b9e15277da306590bc07a3a1afa6b4453c8f";
   };
 
   buildInputs = [ nose ] ++ lib.optional isPy27 mock;

From 1680228e078a501e26d2a34d65f09c07e522b6f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0085/2266] python: msgpack: 0.5.4 -> 0.5.6

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

diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index 2400a76bd6e..3068a31f1e2 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "msgpack";
-  version = "0.5.4";
+  version = "0.5.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13ckbs2qc4dww7fddnm9cw116j4spgxqab49ijmj6jr178ypwl80";
+    sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";
   };
 
   checkPhase = ''

From 24ee19f8a637787ad29023c6675397f8774bf6ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0086/2266] python: numpy: 1.14.0 -> 1.14.1

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

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index f32f417c391..3fce29cd8cd 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.14.0";
+  version = "1.14.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "3de643935b212307b420248018323a44ec51987a336d1d747c1322afc3c099fb";
+    sha256 = "fa0944650d5d3fb95869eaacd8eedbd2d83610c85e271bd9d3495ffa9bc4dc9c";
   };
 
   disabled = isPyPy;

From ed4745273916e4d8fdbd12653a2b66b3b1d08e2f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:13 +0100
Subject: [PATCH 0087/2266] python: pendulum: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index 12d5c82d511..2d3ccf83a8a 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pendulum";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3f16fb759e6126dd89d49886f8100caa72e5ab36563bc148b4f7eddfa0099c0f";
+    sha256 = "39a255776528afe11ea0d57814f9bf3729c1e0b99063af2e5c6cfd750c3e1f7f";
   };
 
   propagatedBuildInputs = [ dateutil pytzdata tzlocal ];

From 9d0112455a9017ff0b186350e5e9dc675a29b754 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:14 +0100
Subject: [PATCH 0088/2266] python: plotly: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index a202ef8b85a..fb5a5c93a12 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.4.0";
+  version = "2.4.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e7ee039231fec52b0b38d45e7470f70b117f6527b08cc922d74992f4d082858";
+    sha256 = "f588991dce15437debd825eca935c8cfbabf438cdc0dcd2ce7a88f429d982f69";
   };
 
   propagatedBuildInputs = [

From 3bf9a5e0f988fa4a078d933b2b4efadba502db8f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:14 +0100
Subject: [PATCH 0089/2266] python: pyopencl: 2018.1 -> 2018.1.1

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

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index a2d019374c9..d90ff458107 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2018.1";
+  version = "2018.1.1";
 
   checkInputs = [ pytest ];
   buildInputs = [ opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b692966bbaaa65ef8949ee25660d6b0cc7cbadc7f4a35eb9c5139dfa4dde6d4a";
+    sha256 = "29683b47ec729c77a1be4d6fae2bd3718ca4cfcbe14655261a3a14d5bf55530a";
   };
 
   # py.test is not needed during runtime, so remove it from `install_requires`

From 9494156d36fe674922a3c655e565dc9b6f53b5dd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:14 +0100
Subject: [PATCH 0090/2266] python: pytest: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 9b7f5cc12de..7288ad0332b 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -2,7 +2,7 @@
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k
 }:
 buildPythonPackage rec {
-  version = "3.4.0";
+  version = "3.4.1";
   pname = "pytest";
 
   preCheck = ''
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6074ea3b9c999bd6d0df5fa9d12dd95ccd23550df2a582f5f5b848331d2e82ca";
+    sha256 = "9ddcb879c8cc859d2540204b5399011f842e5e8823674bf429f70ada281b3cc6";
   };
 
   checkInputs = [ hypothesis ];

From fd35c5c8fdd00de9c40305784d227ac1f4018316 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:14 +0100
Subject: [PATCH 0091/2266] python: regex: 2018.02.08 -> 2018.02.21

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

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 44650618f5f..6c7e2be8886 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2018.02.08";
+  version = "2018.02.21";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2353c0e983c4029caf32016f1dddef623c3117ac282a818468c6d2f5d541698d";
+    sha256 = "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29";
   };
 
   meta = {

From 78b372175322685ac31fc0320e736ad3ffa23b7a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:14 +0100
Subject: [PATCH 0092/2266] python: restructuredtext_lint: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix
index e58066cbef4..af1f28d6d72 100644
--- a/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "restructuredtext_lint";
-  version = "1.1.2";
+  version = "1.1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9201d354e22c27be61cf6d8212da6e10c875eec7ec8d1bdb1067b2a5ba931637";
+    sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037";
   };
 
   checkInputs = [ nose flake8 pyyaml testtools ];

From abcb806b485119afe58dcd3b7789d410049dd5bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:15 +0100
Subject: [PATCH 0093/2266] python: Sphinx: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 2256bcc7310..fb37279ea84 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -27,10 +27,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.7.0";
+  version = "1.7.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "278b7923f3f4ed2a1d1359f0ae94d89ac90ddd4189e8362f4b4d3baa2afe6b4a";
+    sha256 = "da987de5fcca21a4acc7f67a86a363039e67ac3e8827161e61b91deb131c0ee8";
   };
   LC_ALL = "en_US.UTF-8";
 

From a194770585fb6cfbaa9169f1dc6271a2d5947ee8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:15 +0100
Subject: [PATCH 0094/2266] python: SQLAlchemy: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 18540cb63f8..00ea37e3ada 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9e9ec143e2e246f385cfb2de8daa89d2fa466279addcb7be9e102988fdf33d24";
+    sha256 = "6997507af46b10630e13b605ac278b78885fd683d038896dbee0e7ec41d809d2";
   };
 
   checkInputs = [

From ae18bc591312a29b7e03caee90b96bbbd2ff91dd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:15 +0100
Subject: [PATCH 0095/2266] python: xarray: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index afde3f3b45b..0cf38e80d2d 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af1449e8df84a6eb09eb1d56c1dc5ac7f24a9563d4f2b9391ff364dc0c62344c";
+    sha256 = "cc183c2d7b1788cdaeb895102b1b6c2b6a3544182ff714e92f404c29db93cc9d";
   };
 
   checkInputs = [ pytest ];

From b92d9945015d40a76a6ce5a84ef0e49098f15faa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:46 +0100
Subject: [PATCH 0096/2266] Python: fix update script for nix 2.0

---
 maintainers/scripts/update-python-libraries | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index ec2691ff617..4536662c842 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git
+#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
 
 """
 Update a Python package expression by passing in the `.nix` file, or the directory containing it.
@@ -358,4 +358,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

From cd528ddd8ec8bfb17a71ba526e71c3053929feeb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:17 +0100
Subject: [PATCH 0097/2266] python: spyder: 3.2.6 -> 3.2.7

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

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 04a5def81e6..ed6e6334a5d 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonApplication rec {
   pname = "spyder";
-  version = "3.2.6";
+  version = "3.2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a";
+    sha256 = "b5bb8fe0a556930dc09b68fa2741a0de3da6488843ec960e0c62f1f3b2e08e2f";
   };
 
   # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?

From c96c80365dafebb10b74b7101a6db256f77f97c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:22 +0100
Subject: [PATCH 0098/2266] python: nbstripout: 0.3.0 -> 0.3.1

---
 pkgs/applications/version-management/nbstripout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index c4c09094edd..324bbf690d5 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -3,7 +3,7 @@
 with python2Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
   pname = "nbstripout";
 
   # Mercurial should be added as a build input but because it's a Python
@@ -14,7 +14,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";
+    sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95";
   };
 
   # for some reason, darwin uses /bin/sh echo native instead of echo binary, so

From 1fdb74a217c6c0888fdd8573d00564bc75f2ed70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:27 +0100
Subject: [PATCH 0099/2266] python: aiohttp: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 53635e7d53a..0788d1d5388 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a96be9189b2d51e366106e4207c9afaf3d69462562548a613e399c311ff70b88";
+    sha256 = "6569b8850103595be10fcfa1fa911b01f876651921f52d769017b21d822e5dc3";
   };
 
   disabled = pythonOlder "3.4";

From 66d74b6f3dc8797c008713534e7b6502f65ac45b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:32 +0100
Subject: [PATCH 0100/2266] python: astral: 1.5 -> 1.6

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

diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index c6a3ac47aa7..46b4b6bc8ea 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "astral";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6";
+    sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
   };
 
   propagatedBuildInputs = [ pytz ];

From 7fd6793bfe7b6406d1f40182b7c8d6d2bbc8f40d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:37 +0100
Subject: [PATCH 0101/2266] python: cached-property: 1.3.1 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 6ab5015a1e7..1cd8e36594b 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cached-property";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3";
+    sha256 = "a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0";
   };
 
   checkInputs = [ freezegun ];

From 4aaab4bd15dd15ea533d42a790a5ac6d73748f9a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:42 +0100
Subject: [PATCH 0102/2266] python: cachetools: 1.1.3 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix
index edfe965fa80..6daa735cfae 100644
--- a/pkgs/development/python-modules/cachetools/1.nix
+++ b/pkgs/development/python-modules/cachetools/1.nix
@@ -3,12 +3,12 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "cachetools";
-  version = "1.1.3";
+  version = "2.0.1";
   disabled = isPyPy;  # a test fails
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20";
+    sha256 = "ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d";
   };
 
   meta = with stdenv.lib; {

From d9c2da634fe284971d742ef11f856794b9de88a2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:47 +0100
Subject: [PATCH 0103/2266] python: python-can: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index fbb53828d2a..395122b4da9 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "python-can";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c6zfd29ck9ffdklfb5xgxvfl52xdaqd89isykkypm1ll97yk2fs";
+    sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc";
   };
 
   propagatedBuildInputs = [ pyserial ];

From 2669ebec8e49e4fab6da94e48dbccac9efb6d6a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:52 +0100
Subject: [PATCH 0104/2266] python: chainer: 3.3.0 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index b7a58f11a15..31cd0236a59 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "chainer";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0669375e5b09d687781a37d6c025ee0a6015f575b4d2c70a2ad09c33b8228f86";
+    sha256 = "b7bcd8fc1a39b3602b4a78a0be6012721ba6c8792c4d14773496a4c6d038f886";
   };
 
   checkInputs = [

From d7508d4a22841fd48d4388034fa1bb640fa5f6b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:57 +0100
Subject: [PATCH 0105/2266] python: cupy: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index e020eafc04c..bfb296470cf 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7426f6332cb01513d2a6a687792dfa17c678ff64dd1b19b04559ddd5672c833f";
+    sha256 = "96ac44dface1a73673e9c0549fc897f8fa31a7648ff9963dff799ddabd67fde2";
   };
 
   checkInputs = [

From 9fd13a944a945ba361132faec0a0235d7270cd28 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:02 +0100
Subject: [PATCH 0106/2266] python: Django: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
index c1f935e51c6..907d2ba6e00 100644
--- a/pkgs/development/python-modules/django/2_0.nix
+++ b/pkgs/development/python-modules/django/2_0.nix
@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0by1gswkrzxn594fa26llkzsc410999fq8s0b5d1598jwi5q0syr";
+    sha256 = "dc3b61d054f1bced64628c62025d480f655303aea9f408e5996c339a543b45f0";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 4f42e781cf8674ce19a23a518cba0e5a2df8acff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:12 +0100
Subject: [PATCH 0107/2266] python: fonttools: 3.22.0 -> 3.23.0

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index a8a89f0e8ca..28d4053888f 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.22.0";
+  version = "3.23.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01640dfbc0ba752181b21fe74240b8a7bbf7af75581737245836ada5565bd549";
+    sha256 = "9af97075be0395b631880a82ba88dcf694c8aa76b07a622bf5f650e8f8cff293";
     extension = "zip";
   };
 

From 481465e0cc918de1fde96e5e1917cf48c8755905 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:18 +0100
Subject: [PATCH 0108/2266] python: GPy: 1.8.5 -> 1.9.2

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

diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index bb39746d296..72415879b41 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "GPy";
-  version = "1.8.5";
+  version = "1.9.2";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3";
+    sha256 = "372e43d41df5c90e0958d3073070994b351a7409c2e5fbd349cffe13bc24c10a";
   };
 
   # running tests produces "ImportError: cannot import name 'linalg_cython'"

From 42aa273308df00700e7b21a31b460b74f8bd7aa3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:23 +0100
Subject: [PATCH 0109/2266] python: guessit: 2.0.4 -> 2.1.4

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

diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix
index 59fb650c883..c8f30746310 100644
--- a/pkgs/development/python-modules/guessit/2.0.nix
+++ b/pkgs/development/python-modules/guessit/2.0.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "guessit";
-  version = "2.0.4";
+  version = "2.1.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg";
+    sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
   };
 
   # Tests require more packages.

From 43982ce0fbb4bbe8e9dbf9d8001e79e134daf338 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:27 +0100
Subject: [PATCH 0110/2266] python: hyperlink: 17.3.1 -> 18.0.0

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

diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 9886f705d54..4fbce36ee7e 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "hyperlink";
-  version = "17.3.1";
+  version = "18.0.0";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
-    sha256 = "bc4ffdbde9bdad204d507bd8f554f16bba82dd356f6130cb16f41422909c33bc";
+    sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";
   };
 
   checkInputs = [ pytest ];

From 1885c1564500c6c37bbd1c61b1f0c253eb44ff87 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:37 +0100
Subject: [PATCH 0111/2266] python: kafka-python: 1.3.5 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index f5392202d4d..f88a021d53d 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "1.3.5";
+  version = "1.4.1";
   pname = "kafka-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19m9fdckxqngrgh0www7g8rgi7z0kq13wkhcqy1r8aa4sxad0f5j";
+    sha256 = "596e9b4e302a0dc04d35be159cf23d31c4cba73a218e16fc8cd1be0ad57f8c22";
   };
 
   checkInputs = [ pytest six mock ];

From 324656b8976429024d4a28dbefe47e0db13cf2e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:42 +0100
Subject: [PATCH 0112/2266] python: llvmlite: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index d702d8f95b0..b420e7149d7 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "llvmlite";
-  version = "0.21.0";
+  version = "0.22.0";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8";
+    sha256 = "a0a875f3d502f41f4a24444aa98fbf076a6bf36e2a0b3b4481b22e1c4a3acdc2";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;

From 29b50300f28f50f35f5c1d5c5a0ae31bf7bcf678 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:47 +0100
Subject: [PATCH 0113/2266] python: mozdevice: 0.50 -> 0.52

---
 .../python-modules/marionette-harness/mozdevice.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 00329aa1d3f..af26c8d071d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "mozdevice";
-  version = "0.50";
+  version = "0.52";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cfxzhfxdphlzj80vkd3h7m0mg5w7zhb8h6f5lmybliqdiv9vz20";
+    sha256 = "5b6fcbc7179c0f09bd99f7f7c42b614bce5f39543fb18b190e408488f987d6b5";
   };
 
   propagatedBuildInputs = [ moznetwork mozprocess ];

From 22114aa0c4b65c39f6f2589b98e8cf97c4f5ce32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:53 +0100
Subject: [PATCH 0114/2266] python: mozlog: 3.4 -> 3.7

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

diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 5960848ff63..605a4ae4a38 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "mozlog";
-  version = "3.4";
+  version = "3.7";
   name = "${pname}-${version}";
 
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq";
+    sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9";
   };
 
   propagatedBuildInputs = [ blessings mozfile ];

From 7746fcecb1f77fc313ca8c0bc626b4e725e41d23 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:58 +0100
Subject: [PATCH 0115/2266] python: mozprocess: 0.25 -> 0.26

---
 .../python-modules/marionette-harness/mozprocess.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index b6bea84aa23..80b13d94a2d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "mozprocess";
-  version = "0.25";
+  version = "0.26";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lfflwjkwvc8bqvsgdib3b78w2pms8nharh3sc3zgsrmqb1mbzks";
+    sha256 = "9f471c45bee9ff14e936c6ee216a6cc4941223659c01fa626bce628001d8485c";
   };
 
   propagatedBuildInputs = [ mozinfo ];

From c992c9a4f368960442a4aaffe1af4e228804650f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:03 +0100
Subject: [PATCH 0116/2266] python: mozprofile: 0.28 -> 0.29

---
 .../python-modules/marionette-harness/mozprofile.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index 5e939d4f333..a783c125af3 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "mozprofile";
-  version = "0.28";
+  version = "0.29";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15xsdhrpbg7hlr6nvb3k3ci33h786hrv12az8j2k7aa9gzjcf8nh";
+    sha256 = "92af4b9f527a18997dccb60e846e1844b2428668dadf3ccb1a8cd30c706b25c1";
   };
 
   propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; 

From b41be56a3d1835eaabbb395fdd2211c28680142a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:08 +0100
Subject: [PATCH 0117/2266] python: mozrunner: 6.13 -> 6.14

---
 .../python-modules/marionette-harness/mozrunner.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index b0c3f6d8bcf..368ab51845c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "mozrunner";
-  version = "6.13";
+  version = "6.14";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d5k3a0w1iyyk6l28l65j47grq87zd207h369x4vahq02nrx2g6l";
+    sha256 = "a401ea5141cdd15d8f047f19a30ccbeabeb0aea079674b684121acddc5dcf810";
   };
 
   propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess

From b32937cc561cd255da4024f46940a2b7cf6ac280 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:13 +0100
Subject: [PATCH 0118/2266] python: mozversion: 1.4 -> 1.5

---
 .../python-modules/marionette-harness/mozversion.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
index 62605a1d21d..729f110858c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "mozversion";
-  version = "1.4";
+  version = "1.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15ipddn6bpqxl590cy37fj52vgpa4faw2dax1mwvdxj7b18s3pwh";
+    sha256 = "e9b11e4a46bf7a4a11469ea4589c75f3ba50b34b7801e7edf1a09147af8bf70f";
   };
 
   propagatedBuildInputs = [ mozlog mozdevice ];

From daf18bdca5812848bdbc3e4e4814dfb8700c5e01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:18 +0100
Subject: [PATCH 0119/2266] python: numba: 0.36.2 -> 0.37.0

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 97aad8c0928..e62fff7bca3 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.36.2";
+  version = "0.37.0";
   pname = "numba";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2";
+    sha256 = "c62121b2d384d8b4d244ef26c1cf8bb5cb819278a80b893bf41918ad6d391258";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

From 9861cff0dff92a28e8e5b3e3bf0443ee1953463f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:29 +0100
Subject: [PATCH 0120/2266] python: paramz: 0.8.5 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 3d9fd2afaca..daca12f66c0 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "paramz";
-  version = "0.8.5";
+  version = "0.9.1";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "297e59b48e57e78e15f547b1af8b21ddfd19a6312d70b9dc07c7262711adfed9";
+    sha256 = "8a5a2fe5cdb033eb869c49e81fde2a9d0055fadb53a8af1665a7f48f320179cf";
   };
 
   propagatedBuildInputs = [ numpy scipy six decorator ];

From d31f490229b6070f6820255d79cf0eba68f89bcb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:34 +0100
Subject: [PATCH 0121/2266] python: phonenumbers: 8.8.9 -> 8.9.0

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 14e59ce3a95..e00aeb5d70d 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.8.9";
+  version = "8.9.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d819299c3aa8f85f248295ab8559e202af429b4017301b122a0b4c387aed10d2";
+    sha256 = "2cb4822ba895200b06f46a788e852d6ae8200fdc97e1d7c86b0ee10c99d4ff3a";
   };
 
   meta = {

From b4f40beac27b51eb33c5cb2c2dfd7f1550e3bc5c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:39 +0100
Subject: [PATCH 0122/2266] python: pydub: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 819c6ffe489..6450cb7c70e 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -3,10 +3,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pydub";
-  version = "0.20.0";
+  version = "0.21.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hqsvvph6ks4kxj0m2q1xvl5bllqmpk78rlqpqhh79schl344xkv";
+    sha256 = "27acc5977b0f5220682175d44fda737bbf818143b0832c0c3863b5dde38e197a";
   };
 
   patches = [

From 12a98f33533030752d5064e6cce219bd85f8d363 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:44 +0100
Subject: [PATCH 0123/2266] python: python-oauth2: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix
index 38649ca1985..f4d87dc035c 100644
--- a/pkgs/development/python-modules/python-oauth2/default.nix
+++ b/pkgs/development/python-modules/python-oauth2/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "python-oauth2";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a1d0qnlgm07wq9r9bbm5jqkqry73w34m87p0141bk76lg7bb0sm";
+    sha256 = "b24da812837c19183df1924e80a22ba0a1869582dea8b04a9ecd807b04dbc525";
   };
   # attempts to run mysql
   doCheck = false;

From a69333bc1c6ef332af7b75fa0685d4b78d5651b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:49 +0100
Subject: [PATCH 0124/2266] python: pytools: 2017.6 -> 2018.1

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

diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 2bf7413c600..1fba3303e3f 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2017.6";
+  version = "2018.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115";
+    sha256 = "0063b87285cb1172e3602a996bfd7342bf407361cf67b562cb6d806f70422e71";
   };
 
   checkInputs = [ pytest ];

From 1dd167efe0d682cf34e10c4a2059420325749ef4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:05 +0100
Subject: [PATCH 0125/2266] python: stripe: 1.77.2 -> 1.79.0

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 7e7aa4756bb..1bfcb8eb002 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.77.2";
+  version = "1.79.0";
   name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bcd55108dd2c0e853a91147ee843bc375f35767e64d0f7680e5bd82ddb7fbf1";
+    sha256 = "490bb7bfc7d224e483d643171fd860f8a1670e31fd9cef8cb8d9a7c19806d450";
   };
 
   buildInputs = [ unittest2 mock ];

From 5eda61d20213e31e097840d00adb7d1cbba0cb42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:10 +0100
Subject: [PATCH 0126/2266] python: text-unidecode: 1.1 -> 1.2

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

diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix
index 79ee34c733b..94aebc59512 100644
--- a/pkgs/development/python-modules/text-unidecode/default.nix
+++ b/pkgs/development/python-modules/text-unidecode/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "text-unidecode";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1l081m1w8ibbx684ca71ibdy68iwqsivy6rf6yqvysdclzldbbyh";
+    sha256 = "5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d";
   };
 
   checkInputs = [ pytest ];

From 5ead05c0a8898f8eb108dd75c07a22c7e84c740b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:15 +0100
Subject: [PATCH 0127/2266] python: textacy: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 333c4825f0f..47b8b04c4f6 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -25,11 +25,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "textacy";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406";
+    sha256 = "70ebd8f6536c1536132c997988a4f27731a2db5a7ca7bab29fb33746b444959f";
   };
 
   disabled = isPy27; # 2.7 requires backports.csv

From 2e89e4e9747fc9816e5ab549297b891967e6973b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:20 +0100
Subject: [PATCH 0128/2266] python: tifffile: 0.13.5 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 12edef190dc..6e1baf2f2e9 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "tifffile";
-  version = "0.13.5";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bca0fc9eaf609a27ebd99d8466e05d5a6e79389957f17582b70643dbca65e3d8";
+    sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e";
   };
 
   checkInputs = [ nose ];

From 4a277c1efe120024f0d54b2764b657154800e939 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:31 +0100
Subject: [PATCH 0129/2266] python: txtorcon: 0.19.3 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index cd2d6c9a365..2e7c07c74f3 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "txtorcon";
-  version = "0.19.3";
+  version = "0.20.0";
 
   checkInputs = [ pytest mock lsof GeoIP ];
   propagatedBuildInputs = [
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp";
+    sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e";
   };
 
   # ipaddress isn't required for Python 3 although it's in requirements.txt.

From ae57d3a0ea44c26e423e6674e12e2896cbc4cba7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:36 +0100
Subject: [PATCH 0130/2266] python: zeroconf: 0.19.1 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 5502a8236da..f3dbf70eecf 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.19.1";
+  version = "0.20.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
+    sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb";
   };
 
   propagatedBuildInputs = [ netifaces six enum-compat ];

From b5a4395c4aedd5e0d243c81e4d046fd459a54704 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:41 +0100
Subject: [PATCH 0131/2266] python: autoflake: 1.0 -> 1.1

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

diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index 9522b1cf6b7..ce650adb7ef 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -3,12 +3,12 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "autoflake";
-  version = "1.0";
+  version = "1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12k4v8w7awqp83j727y0iwcbjqj3ccvbai7c9m0wgbmq5xkvav8a";
+    sha256 = "a74d684a7a02654f74582addc24a3016c06809316cc140457a4fe93a1e6ed131";
   };
 
   propagatedBuildInputs = [ pyflakes ];

From fdb6655f2caa8d45265edf8820113268eb9b0501 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:51 +0100
Subject: [PATCH 0132/2266] python: conan: 0.28.1 -> 1.0.4

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

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 4a2afbeedfe..423a952026a 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonApplication rec {
-  version = "0.28.1";
+  version = "1.0.4";
   pname = "conan";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a";
+    sha256 = "6f5cea887ecd6285bd83ae2acc3f76ed06dd52a79c106fe686d210b3ead89060";
   };
 
   propagatedBuildInputs = [

From aec31bf3629b0dcd963dfa3084b8cc2a15d6ba92 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:57 +0100
Subject: [PATCH 0133/2266] python: pew: 1.1.0 -> 1.1.2

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

diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix
index 16fc4817417..82014691a1f 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@@ -2,11 +2,11 @@
 with python3Packages; buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "pew";
-    version = "1.1.0";
+    version = "1.1.2";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh";
+      sha256 = "b8312728526c9010295c88215c95a1b1731fdbd1a568f728e069932bd0545611";
     };
 
     propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ];

From b50a66c3a0c8da96a8736a84b94a60b027e6c33a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:48:02 +0100
Subject: [PATCH 0134/2266] python: vcstool: 0.1.31 -> 0.1.32

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

diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 51e066f3d39..2dd03b1d02a 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -6,11 +6,11 @@ with python3Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "vcstool";
-  version = "0.1.31";
+  version = "0.1.32";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n2zkvy2km9ky9lljf1mq5nqyqi5qqzfy2a6sgkjg2grvsk7abxc";
+    sha256 = "adf09fad9feaa9bc2d7fe53e909951b6b7300db2f2e0717f12ccd44e047a8839";
   };
 
   propagatedBuildInputs = [ pyyaml ];

From 9e4057ed283bb4ee246ec3455a194dbe5f8ca826 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:48:07 +0100
Subject: [PATCH 0135/2266] python: yq: 2.3.4 -> 2.4.1

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

diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 6fb7f8440ef..3283136590a 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -3,7 +3,7 @@
 buildPythonApplication rec {
 
   pname = "yq";
-  version = "2.3.4";
+  version = "2.4.1";
 
   propagatedBuildInputs = [ pyyaml jq ];
 
@@ -12,7 +12,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04ckrlmin8m176iicyfhddp4r0yry5hx306vhfglf8mcp1jkga78";
+    sha256 = "4833d4055b0f1c1f1a2fd292421b3472da39c7dc2727d7819efd11065a5fd310";
   };
 
   meta = with lib; {

From ab672401a844de1e5cf13a4ac2ba774d5ccee44f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:48:23 +0100
Subject: [PATCH 0136/2266] python: you-get: 0.4.1011 -> 0.4.1025

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

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 3a917040863..b6aaaab0d93 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1011";
+  version = "0.4.1025";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h6aspnfic30s89xsv6qss1jfka9px4ll60bqrjbds4y0k3h818g";
+    sha256 = "d348b89bd4798ef2225f5b357510505a4bc781380479c9f59b69d80ff9a56ab5";
   };
 
   meta = with stdenv.lib; {

From 50c978fae0a1bf8e3a28f9a3bd908566ff7602a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:04:25 +0100
Subject: [PATCH 0137/2266] python: setuptools: 38.4.0 -> 38.4.1

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

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index b8fd011c4ea..cd07a64ae49 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "38.4.0";
+  version = "38.4.1";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75";
+    sha256 = "3b5f74bd33b046a121f052632f248b580f5e83848bb4cebda9e38741a445a969";
   };
 
   nativeBuildInputs = [ unzip wrapPython ];

From 55ef50c257d052ebf5e760877c5d62ec24ed1c4b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:06:01 +0100
Subject: [PATCH 0138/2266] python.pkgs.bootstrapped-pip: setuptools 38.4.0 ->
 38.4.1

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

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 37c3ea5d72a..86e45e17ed5 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,9 +9,9 @@ let
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";
-    version = "38.4.0";
+    version = "38.4.1";
     format = "wheel";
-    sha256 = "155c2ec9fdcc00c3973d966b416e1cf3a1e7ce75f4c09fb760b23f94b935926e";
+    sha256 = "22f8bcff5ce7fd1867785701769eaba42b79331d0abf890974a9288787dc015b";
   };
 
   # TODO: Shouldn't be necessary anymore for pip > 9.0.1!

From 7d7c60b2734a589b4176aac9bcfa468d7d74e23a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:18:12 +0100
Subject: [PATCH 0139/2266] python.pkgs.apsw: 3.7.6.2-r1 -> 3.9.2-r1

---
 pkgs/development/python-modules/apsw/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index 3e7e970da6c..c16fb3c4c46 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , sqlite, isPyPy }:
 
 buildPythonPackage rec {
   pname = "apsw";
-  version = "3.7.6.2-r1";
-  name = "${pname}-${version}";
+  version = "3.9.2-r1";
 
   disabled = isPyPy;
 
-  src = fetchurl {
-    url = "http://apsw.googlecode.com/files/${name}.zip";
-    sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dab96fd164dde9e59f7f27228291498217fa0e74048e2c08c7059d7e39589270";
   };
 
   buildInputs = [ sqlite ];
 
   # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
-  doCheck = false;
+#   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A Python wrapper for the SQLite embedded relational database engine";

From b6fea27bae6b7003efbb0aa9b022e85874467cdd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:19:00 +0100
Subject: [PATCH 0140/2266] python.pkgs.absl-py: 0.1.9 -> 0.1.10

---
 pkgs/development/python-modules/absl-py/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 5e295bb9516..5acbf12aafc 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,12 +6,11 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.1.9";
-  name = "${pname}-${version}";
+  version = "0.1.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c787e3bc7ef8fea7a8a79cf36b0c550b4bd66e13c05d1352fbc5786488befb0";
+    sha256 = "908eba9a96a37c10f10074aba57d685070b814906b02a1ea2cf54bb10a6b8c74";
   };
 
   propagatedBuildInputs = [ six ];

From 38f02f84e8fb37f2761e2ce8a5167bdec0e96ea4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:23:58 +0100
Subject: [PATCH 0141/2266] python3.pkgs.MechanicalSoup: 0.9.0.post4 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix
index b5d202af50a..63eb93a207c 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -3,15 +3,13 @@
 , pytestrunner, requests-mock, pytestcov, pytest
 }:
 
-
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "MechanicalSoup";
-  version = "0.9.0.post4";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab";
+    sha256 = "22423efd025c3eedb06f41d3ff1127174a59f40dc560e82dce143956976195bf";
   };
 
   checkInputs = [ pytest pytestrunner requests-mock pytestcov ];

From 26ea14c4dce5838f38836c476d1cea0f2bce738f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:24:16 +0100
Subject: [PATCH 0142/2266] python.pkgs.blaze: use FetchFromGitHub

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

diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix
index 74e327fd342..b3c56a618e8 100644
--- a/pkgs/development/python-modules/blaze/default.nix
+++ b/pkgs/development/python-modules/blaze/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchurl
+, fetchFromGitHub
 , pytest
 , contextlib2
 , cytoolz
@@ -27,9 +27,11 @@ buildPythonPackage rec {
   pname = "blaze";
   version = "0.11.3";
 
-  src = fetchurl {
-    url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
-    sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0w916k125058p40cf7i090f75pgv3cqdb8vwjzqhb9r482fa6717";
   };
 
   checkInputs = [ pytest ];

From 73d381a13a160cffb83ebb2afe94ecbd616b6a1e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:25:27 +0100
Subject: [PATCH 0143/2266] python.pkgs.codecov: 2.0.9 -> 2.1.15

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

diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix
index 93620098446..6b2063f4992 100644
--- a/pkgs/development/python-modules/codecov/default.nix
+++ b/pkgs/development/python-modules/codecov/default.nix
@@ -2,15 +2,14 @@
 
 buildPythonPackage rec {
   pname = "codecov";
-  version = "2.0.9";
-  name = "${pname}-${version}";
+  version = "2.0.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "037h4dcl8xshlq3rj8409p11rpgnyqrhlhfq8j34s94nm0n1h76v";
+    sha256 = "8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788";
   };
 
-  buildInputs = [ unittest2 ]; # Tests only
+  checkInputs = [ unittest2 ]; # Tests only
 
   propagatedBuildInputs = [ requests coverage ];
 
@@ -18,6 +17,9 @@ buildPythonPackage rec {
     sed -i 's/, "argparse"//' setup.py
   '';
 
+  # No tests in archive
+  doCheck = false;
+
   meta = {
     description = "Python report uploader for Codecov";
     homepage = https://codecov.io/;

From 9928b03832ce024b199f61e20c7ceec87bbbda67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:31:19 +0100
Subject: [PATCH 0144/2266] python.pkgs.flask_script: improve expression

---
 .../python-modules/flask-script/default.nix           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix
index ace3cee2d22..33b44080343 100644
--- a/pkgs/development/python-modules/flask-script/default.nix
+++ b/pkgs/development/python-modules/flask-script/default.nix
@@ -1,17 +1,20 @@
-{ lib, buildPythonPackage, fetchurl, flask, pytest }:
+{ lib, buildPythonPackage, fetchPypi, flask, pytest }:
 
 buildPythonPackage rec {
-  name = "Flask-Script-${version}";
+  pname = "Flask-Script";
   version = "2.0.6";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Script/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
   };
 
   propagatedBuildInputs = [ flask ];
   checkInputs = [ pytest ];
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with lib; {
     homepage = http://github.com/smurfix/flask-script;
     description = "Scripting support for Flask";

From 925a73468815632aee4d13b469c62eb2fa5c771f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:33:30 +0100
Subject: [PATCH 0145/2266] python.pkgs.pybfd: use pname and version

---
 pkgs/development/python-modules/pybfd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix
index 0ac437bfb29..8f074943dd3 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:
 
 buildPythonPackage rec {
-  name = "pybfd-0.1.1.2017-12-31";
+  pname = "pybfd";
+  version = "-0.1.1.2017-12-31";
 
   disabled = isPyPy || isPy3k;
 

From d2124e3f93c5e728919bb6e6268b38d0a285cda3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 20:59:21 +0100
Subject: [PATCH 0146/2266] pythonPackages.hyperlink: add idna dependency

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

diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 4fbce36ee7e..d36db696ef6 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, pytest }:
+{ stdenv, buildPythonPackage, fetchurl, idna, pytest }:
 
 buildPythonPackage rec {
   pname = "hyperlink";
@@ -10,6 +10,8 @@ buildPythonPackage rec {
     sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";
   };
 
+  propagatedBuildInputs = [ idna ];
+
   checkInputs = [ pytest ];
 
   checkPhase = ''

From a367095153c446223c64e8ffea6a95b0c91402c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 21:00:28 +0100
Subject: [PATCH 0147/2266] pythonPackages.hyperlink: modernize expression

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

diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index d36db696ef6..53a245c45dc 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, buildPythonPackage, fetchurl, idna, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, idna, pytest }:
 
 buildPythonPackage rec {
   pname = "hyperlink";
   version = "18.0.0";
-  name = pname + "-" + version;
 
-  src = fetchurl {
-    url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";
   };
 

From e2243a5ac95826b5b8c23c77c3562d81e5146b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 26 Feb 2018 22:54:48 +0100
Subject: [PATCH 0148/2266] Revert "Revert "Merge staging at '8d490ca9934d0'
 into master""

This reverts commit f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.
---
 pkgs/applications/misc/pytrainer/default.nix  |  16 +-
 pkgs/build-support/cc-wrapper/utils.sh        |   6 +-
 pkgs/data/misc/poppler-data/default.nix       |  12 +-
 pkgs/development/libraries/gnutls/3.6.nix     |   4 +-
 .../libraries/libatomic_ops/default.nix       |   2 +
 .../libraries/libseccomp/default.nix          |   2 +
 .../development/libraries/poppler/default.nix |  45 ++----
 pkgs/development/libraries/poppler/qt4.nix    |  44 +++++
 .../python-modules/asgiref/default.nix        |  22 ++-
 .../python-modules/bibtexparser/default.nix   |  25 ++-
 .../python-modules/binaryornot/default.nix    |  27 ++++
 .../python-modules/cram/default.nix           |  16 +-
 .../python-modules/curtsies/default.nix       |   8 +-
 .../python-modules/daphne/default.nix         |  26 ++-
 .../python-modules/dbf/default.nix            |   9 +-
 .../python-modules/ecpy/default.nix           |   5 +-
 .../python-modules/faker/default.nix          |   8 +-
 .../python-modules/green/default.nix          |  26 +++
 .../python-modules/konfig/default.nix         |  48 ++++++
 .../python-modules/natsort/default.nix        |   8 +-
 .../python-modules/networkx/default.nix       |  16 +-
 .../python-modules/pomegranate/default.nix    |   5 +-
 .../python-modules/prov/default.nix           |  16 +-
 .../python-modules/pytest-mock/default.nix    |   7 +-
 .../python-modules/pytest-xdist/default.nix   |   4 +-
 .../python-modules/rednose/default.nix        |  24 +++
 .../python-modules/termstyle/default.nix      |  20 +++
 .../python-modules/text-unidecode/default.nix |  23 +++
 .../python-modules/xdot/default.nix           |  21 +++
 .../tools/build-managers/meson/setup-hook.sh  |   2 +-
 pkgs/tools/filesystems/e2fsprogs/default.nix  |   4 +-
 pkgs/top-level/all-packages.nix               |   5 +-
 pkgs/top-level/python-packages.nix            | 150 +-----------------
 33 files changed, 389 insertions(+), 267 deletions(-)
 create mode 100644 pkgs/development/libraries/poppler/qt4.nix
 create mode 100644 pkgs/development/python-modules/binaryornot/default.nix
 create mode 100644 pkgs/development/python-modules/green/default.nix
 create mode 100644 pkgs/development/python-modules/konfig/default.nix
 create mode 100644 pkgs/development/python-modules/rednose/default.nix
 create mode 100644 pkgs/development/python-modules/termstyle/default.nix
 create mode 100644 pkgs/development/python-modules/text-unidecode/default.nix
 create mode 100644 pkgs/development/python-modules/xdot/default.nix

diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index ecc4c341a68..8605801dea1 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel
+{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel
 , withWebKit ? false }:
 
 let
 
   # Pytrainer needs a matplotlib with GTK backend. Also ensure we are
   # using the pygtk with glade support as needed by pytrainer.
-  matplotlibGtk = python2Packages.matplotlib.override {
+  matplotlibGtk = python.pkgs.matplotlib.override {
     enableGtk2 = true;
-    pygtk = python2Packages.pyGtkGlade;
+    pygtk = python.pkgs.pyGtkGlade;
   };
 
 in
 
-python2Packages.buildPythonApplication rec {
-  name = "pytrainer-${version}";
+python.pkgs.buildPythonApplication rec {
+  pname = "pytrainer";
   version = "1.11.0";
 
   src = fetchFromGitHub {
@@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec {
     ./pytrainer-webkit.patch
   ];
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = with python.pkgs; [
     dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
   ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
 
@@ -45,6 +45,10 @@ python2Packages.buildPythonApplication rec {
   dontPatchELF = true;
   dontStrip = true;
 
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/pytrainer/pytrainer/wiki;
     description = "Application for logging and graphing sporting excursions";
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 4b2b1380918..9215fe2dc39 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -25,7 +25,11 @@ mangleVarBool() {
     for infix in "${role_infixes[@]}"; do
         local inputVar="${var/+/${infix}}"
         if [ -v "$inputVar" ]; then
-            let "${outputVar} |= ${!inputVar}"
+            # "1" in the end makes `let` return success error code when
+            # expression itself evaluates to zero.
+            # We don't use `|| true` because that would silence actual
+            # syntax errors from bad variable values.
+            let "${outputVar} |= ${!inputVar:-0}" "1"
         fi
     done
 }
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index f0f6505cb24..5c8e0970518 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,18 +1,14 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, cmake, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.4.7";
+  name = "poppler-data-0.4.8";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7";
+    sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh";
   };
 
-  postPatch = ''
-    sed -i 's,$(datadir)/pkgconfig,$(prefix)/lib/pkgconfig,g' Makefile
-  '';
-
-  installFlags = [ "prefix=$(out)" ];
+  nativeBuildInputs = [ cmake ninja ];
 
   meta = with stdenv.lib; {
     homepage = https://poppler.freedesktop.org/;
diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix
index 35344dfde7d..7fb1af70a28 100644
--- a/pkgs/development/libraries/gnutls/3.6.nix
+++ b/pkgs/development/libraries/gnutls/3.6.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
-    sha256 = "1vdsir53ddxyapnxh5fpnfyij3scx3818iri4hl07g4lk4n0vc90";
+    sha256 = "07wdffklwmxpa9i50sh5nwrc5ajb47skrldm6rzjc0jf4dxxpmdw";
   };
 
   # Skip two tests introduced in 3.5.11.  Probable reasons of failure:
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 714e9361440..fe4cd3ca0a9 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 ="1rif2hjscq5mh639nsnjhb90c01gnmy1sbmj6x6hsn1xmpnj95r1";
   };
 
+  outputs = [ "out" "dev" "doc" ];
+
   # https://github.com/ivmai/libatomic_ops/pull/32
   patches = if hostPlatform.isRiscV then [ ./riscv.patch ] else null;
 
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 023c51c2b14..d953fd12e68 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz";
   };
 
+  outputs = [ "out" "lib" "dev" "man" ];
+
   buildInputs = [ getopt makeWrapper ];
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 5fcb7d386fa..9a3d24fc0b2 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
+{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , withData ? true, poppler_data
-, qt4Support ? false, qt4 ? null
 , qt5Support ? false, qtbase ? null
 , introspectionSupport ? false, gobjectIntrospection ? null
 , utils ? false
 , minimal ? false, suffix ? "glib"
-, hostPlatform
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.56.0";
-  sha256 = "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6";
+  version = "0.62.0";
+  mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    inherit sha256;
+    sha256 = "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv";
   };
 
   outputs = [ "out" "dev" ];
@@ -29,36 +27,19 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = with lib;
     [ zlib freetype fontconfig libjpeg openjpeg ]
     ++ optionals (!minimal) [ cairo lcms curl ]
-    ++ optional qt4Support qt4
     ++ optional qt5Support qtbase
     ++ optional introspectionSupport gobjectIntrospection;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
 
-  NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
-
-  CXXFLAGS = lib.optional qt5Support "-std=c++11";
-
-  configureFlags = with lib;
-    [
-      "--enable-xpdf-headers"
-      "--enable-libcurl"
-      "--enable-zlib"
-      "--enable-build-type=release"
-    ]
-    ++ optionals minimal [
-      "--disable-poppler-glib" "--disable-poppler-cpp"
-      "--disable-libcurl"
-    ]
-    ++ optional (!utils) "--disable-utils"
-    ++ optional introspectionSupport "--enable-introspection";
-
-  enableParallelBuilding = true;
-
-  crossAttrs.postPatch =
-    # there are tests using `strXXX_s` functions that are missing apparently
-    stdenv.lib.optionalString (hostPlatform.libc or null == "msvcrt")
-      "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in";
+  cmakeFlags = [
+    (mkFlag true "XPDF_HEADERS")
+    (mkFlag (!minimal) "GLIB")
+    (mkFlag (!minimal) "CPP")
+    (mkFlag (!minimal) "LIBCURL")
+    (mkFlag utils "UTILS")
+    (mkFlag qt5Support "QT5")
+  ];
 
   meta = with lib; {
     homepage = https://poppler.freedesktop.org/;
diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix
new file mode 100644
index 00000000000..c82a543413e
--- /dev/null
+++ b/pkgs/development/libraries/poppler/qt4.nix
@@ -0,0 +1,44 @@
+# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883)
+{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
+, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
+, poppler_data, qt4
+}:
+
+let
+  # Last version supporting QT4
+  version = "0.61.1";
+in
+stdenv.mkDerivation rec {
+  name = "poppler-qt4-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/poppler-${version}.tar.xz";
+    sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty;
+
+  propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ];
+
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
+
+  cmakeFlags = [
+    "-DENABLE_XPDF_HEADERS=on"
+    "-DENABLE_UTILS=off"
+  ];
+
+  meta = with lib; {
+    homepage = https://poppler.freedesktop.org/;
+    description = "A PDF rendering library";
+
+    longDescription = ''
+      Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+    '';
+
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 223f53698e9..2b3be05d060 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, buildPythonPackage, fetchurl, six }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
 buildPythonPackage rec {
-  version = "2.1.5";
+  version = "2.1.6";
   pname = "asgiref";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/a/asgiref/${name}.tar.gz";
-    sha256 = "1a46196df28c67e046a54cc537ce5a8f6a59eb68649f54680d7e4fc3b113ab1b";
+  # PyPI tarball doesn't include tests directory
+  src = fetchFromGitHub {
+    owner = "django";
+    repo = pname;
+    rev = version;
+    sha256 = "12p1i2ai03x2hx6b3i7xgicyfi2x11is6pkbdac4jpz7fmbz3zlh";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [ async-timeout ];
+
+  checkInputs = [ pytest pytest-asyncio ];
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = with stdenv.lib; {
     description = "Reference ASGI adapters and channel layers";
diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix
index 50e389a9e14..06d7c689e65 100644
--- a/pkgs/development/python-modules/bibtexparser/default.nix
+++ b/pkgs/development/python-modules/bibtexparser/default.nix
@@ -1,20 +1,31 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pyparsing
+, future
+, nose
+, glibcLocales
 }:
 
 buildPythonPackage rec {
   pname = "bibtexparser";
   version = "1.0.1";
-  name = "${pname}-${version}";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cc41cdd8332c2bf44b97daf1f135f4f267c3b744c33976655cd270b66f964c0a";
+  # PyPI tarball does not ship tests
+  src = fetchFromGitHub {
+    owner = "sciunto-org";
+    repo = "python-${pname}";
+    rev = "v${version}";
+    sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai";
   };
 
-  # No tests in archive
-  doCheck = false;
+  propagatedBuildInputs = [ pyparsing future ];
+
+  checkInputs = [ nose glibcLocales ];
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests
+  '';
 
   meta = {
     description = "Bibtex parser for python 2.7 and 3.3 and newer";
diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix
new file mode 100644
index 00000000000..2f0b01a5c23
--- /dev/null
+++ b/pkgs/development/python-modules/binaryornot/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, chardet, hypothesis }:
+
+buildPythonPackage rec {
+  pname = "binaryornot";
+  version = "0.4.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061";
+  };
+
+  prePatch = ''
+    # See https://github.com/audreyr/binaryornot/issues/40
+    substituteInPlace tests/test_check.py \
+      --replace "average_size=512" "average_size=128"
+  '';
+
+  propagatedBuildInputs = [ chardet ];
+
+  checkInputs = [ hypothesis ];
+
+  meta = with lib; {
+    homepage = https://github.com/audreyr/binaryornot;
+    description = "Ultra-lightweight pure Python package to check if a file is binary or text";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix
index c0fc5b177e0..232a4a19fd8 100644
--- a/pkgs/development/python-modules/cram/default.nix
+++ b/pkgs/development/python-modules/cram/default.nix
@@ -1,11 +1,10 @@
-{stdenv, lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}:
+{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "0.7";
   pname = "cram";
 
-  buildInputs = [ coverage which ];
+  checkInputs = [ which ];
 
   src = fetchPypi {
     inherit pname version;
@@ -13,20 +12,13 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
+    patchShebangs scripts/cram
     substituteInPlace tests/test.t \
       --replace "/bin/bash" "${bash}/bin/bash"
   '';
 
-  # This testing is copied from Makefile. Simply using `make test` doesn't work
-  # because it uses the unpatched `scripts/cram` executable which has a bad
-  # shebang. Also, for some reason, coverage fails on one file so let's just
-  # ignore that one.
   checkPhase = ''
-    # scripts/cram tests
-    #COVERAGE=${coverage}/bin/coverage $out/bin/cram tests
-    #${coverage}/bin/coverage report --fail-under=100
-    COVERAGE=coverage $out/bin/cram tests
-    coverage report --fail-under=100 --omit="*/_encoding.py,*/__main__.py"
+    scripts/cram tests
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index 8d6052c5299..d29ad1d6474 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }:
+{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }:
 
 buildPythonPackage rec {
   pname = "curtsies";
@@ -8,12 +8,12 @@ buildPythonPackage rec {
     sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";
   };
 
-  propagatedBuildInputs = [ blessings wcwidth pyte ];
+  propagatedBuildInputs = [ blessings wcwidth typing ];
 
-  checkInputs = [ nose mock pytest ];
+  checkInputs = [ mock pyte nose ];
 
   checkPhase = ''
-    py.test
+    nosetests tests
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 86b00ca7408..7fafee56b42 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -1,19 +1,31 @@
-{ stdenv, buildPythonPackage, fetchPypi,
-  asgiref, autobahn, twisted, hypothesis
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
+, asgiref, autobahn, twisted, pytestrunner
+, hypothesis, pytest, pytest-asyncio
 }:
 buildPythonPackage rec {
   pname = "daphne";
-  name = "${pname}-${version}";
   version = "2.0.3";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bb2075ce35ca00f2e5440cc034dfebd5c00d346de62ea45f099db089b868c31f";
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "django";
+    repo = pname;
+    rev = version;
+    sha256 = "1rdnzpgyk5cnx4xc3c7k11v2x9xpihgjpq14fib80jfpcqggw687";
   };
 
-  buildInputs = [ hypothesis ];
+  nativeBuildInputs = [ pytestrunner ];
+
   propagatedBuildInputs = [ asgiref autobahn twisted ];
 
+  checkInputs = [ hypothesis pytest pytest-asyncio ];
+
+  checkPhase = ''
+    # Other tests fail, seems to be due to filesystem access
+    py.test -k "test_cli or test_utils"
+  '';
+
   meta = with stdenv.lib; {
     description = "Django ASGI (HTTP/WebSocket) server";
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 2343ea2918b..ac8087be63e 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }:
 
 buildPythonPackage rec {
     pname = "dbf";
     version = "0.96.8";
-    name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
       sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
     };
 
-    propagatedBuildInputs = [ aenum ];
+    propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
 
     doCheck = !isPy3k;
     # tests are not yet ported.
     # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w
 
+    checkPhase = ''
+      ${python.interpreter} dbf/test.py
+    '';
+
     meta = with stdenv.lib; {
       description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
       homepage    = "https://pypi.python.org/pypi/dbf";
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 84830e7f2b8..277a5cece56 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchPypi, buildPythonPackage, hidapi
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi
 , pycrypto, pillow, protobuf, future, ecpy
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ECPy";
   version = "0.8.3";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "ef3d95419d53368f52fb7d4b883b8df0dfc2dd19a76243422d24981c3e5f27bd";
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 2d459d625d0..55750f5bf3b 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, pythonOlder,
   # Build inputs
-  dateutil, six, ipaddress ? null,
+  dateutil, six, text-unidecode, ipaddress ? null,
   # Test inputs
   email_validator, nose, mock, ukpostcodeparser }:
 
@@ -8,12 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.8.8";
-  name = "${pname}-${version}";
+  version = "0.8.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a";
+    sha256 = "126kdy6lj10rwgchzz0lzjabx0zcyskamhn0qib67k69fcksjmq8";
   };
 
   checkInputs = [
@@ -26,6 +25,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     dateutil
     six
+    text-unidecode
   ] ++ lib.optional (pythonOlder "3.3") ipaddress;
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
new file mode 100644
index 00000000000..fa09e4ded21
--- /dev/null
+++ b/pkgs/development/python-modules/green/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, colorama, coverage, termstyle, unidecode, mock, backports_shutil_get_terminal_size }:
+
+buildPythonPackage rec {
+  pname = "green";
+  version = "2.12.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8cdd2934eff754c9664f373ee0d77cb1cb35dbbf3b719b8ae3b059718db875df";
+  };
+
+  prePatch = ''
+    # See https://github.com/CleanCut/green/pull/182
+    substituteInPlace setup.py --replace python-termstyle termstyle
+  '';
+
+  propagatedBuildInputs = [
+    colorama coverage termstyle unidecode
+  ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ];
+
+  meta = with lib; {
+    description = "Python test runner";
+    homepage = https://github.com/CleanCut/green;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/konfig/default.nix b/pkgs/development/python-modules/konfig/default.nix
new file mode 100644
index 00000000000..e7062bad5ee
--- /dev/null
+++ b/pkgs/development/python-modules/konfig/default.nix
@@ -0,0 +1,48 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, writeText, configparser, six, pytest, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "konfig";
+  version = "1.1";
+
+  # konfig unconditionaly depend on configparser, even if it is part of
+  # the standard library in python 3.2 or above.
+  disabled = isPy3k;
+
+  # PyPI tarball is missing utf8.ini, required for tests
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
+    rev = version;
+    sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";
+  };
+
+  propagatedBuildInputs = [ configparser six ];
+
+  patches = [ (writeText "konfig.patch" ''
+    diff --git a/setup.py b/setup.py
+    index 96fd858..bb4db06 100644
+    --- a/setup.py
+    +++ b/setup.py
+    @@ -20,7 +20,7 @@ setup(name='konfig',
+           author_email="tarek@mozilla.com",
+           include_package_data=True,
+           install_requires = [
+    -        'configparser', 'argparse', 'six'
+    +        'configparser', 'six'
+           ],
+           zip_safe=False,
+           classifiers=classifiers,
+  '') ];
+
+  checkInputs = [ pytest glibcLocales ];
+
+  checkPhase = ''
+    LC_ALL=en_US.utf8 pytest -v konfig/tests
+  '';
+
+  meta = with lib; {
+    description = "Yet Another Config Parser";
+    homepage    = "https://github.com/mozilla-services/konfig";
+    license     = licenses.mpl20;
+  };
+}
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index a5940ed6c9f..3e4b0d1368b 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -1,12 +1,9 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, isPy35
-, isPy36
 , fetchPypi
 , hypothesis
 , pytestcache
-, pytestcov
 , pytestflakes
 , pytestpep8
 , pytest
@@ -19,10 +16,9 @@ buildPythonPackage rec {
   pname = "natsort";
   version = "5.2.0";
 
-  buildInputs = [
+  checkInputs = [
     hypothesis
     pytestcache
-    pytestcov
     pytestflakes
     pytestpep8
     pytest
@@ -41,7 +37,7 @@ buildPythonPackage rec {
   # testing based on project's tox.ini
   checkPhase = ''
     pytest --doctest-modules natsort
-    pytest --flakes --pep8 --cov natsort --cov-report term-missing
+    pytest --flakes --pep8
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index f6fc4139c85..3388aef9cef 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -3,32 +3,24 @@
 , fetchPypi
 , nose
 , decorator
-, isPy36
-, isPyPy
 }:
 
 buildPythonPackage rec {
   pname = "networkx";
-  version = "1.11";
-
-  # Currently broken on PyPy.
-  # https://github.com/networkx/networkx/pull/1361
-  disabled = isPyPy;
+  version = "2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd";
+    extension = "zip";
+    sha256 = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1";
   };
 
   checkInputs = [ nose ];
   propagatedBuildInputs = [ decorator ];
 
-  # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299
-  doCheck = !(isPy36);
-
   meta = {
     homepage = "https://networkx.github.io/";
     description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index 77b373de259..e611e2ea5b1 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "pomegranate";
   version = "0.8.1";
-  name  = "${pname}-${version}";
   
   src = fetchFromGitHub {
     repo = pname;
@@ -21,5 +20,9 @@ buildPythonPackage rec {
     homepage = https://github.com/jmschrei/pomegranate;
     license = licenses.mit;
     maintainers = with maintainers; [ rybern ];
+
+    # "pomegranate does not yet work with networkx 2.0"
+    # see https://github.com/jmschrei/pomegranate/issues/209
+    broken = true; 
   };
 }
diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index 8866382ea8f..f5f5b719b06 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -7,6 +7,8 @@
 , six
 , pydotplus
 , rdflib
+, pydot
+, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -18,6 +20,10 @@ buildPythonPackage rec {
     sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb";
   };
 
+  prePatch = ''
+    substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
+  '';
+
   propagatedBuildInputs = [
     lxml
     networkx
@@ -26,7 +32,15 @@ buildPythonPackage rec {
     pydotplus
     rdflib
   ];
-  doCheck = false; # takes ~60 mins
+
+  checkInputs = [
+    pydot
+    glibcLocales
+  ];
+
+  preCheck = ''
+    export LC_ALL="en_US.utf-8"
+  '';
 
   meta = with stdenv.lib; {
     description = "A Python library for W3C Provenance Data Model (PROV)";
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 51ec2a1f4cb..6b852583c7e 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pytest-mock";
@@ -9,6 +9,11 @@ buildPythonPackage rec {
     sha256 = "8ed6c9ac6b7565b226b4da2da48876c9198d76401ec8d9c5e4c69b45423e33f8";
   };
 
+  patches = fetchpatch {
+    url = "${meta.homepage}/pull/107.patch";
+    sha256 = "07p7ra6lilfv04wyxc855zmfwxvnpmi9s0v6vh5bx769cj9jwxck";
+  };
+
   propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock;
   nativeBuildInputs = [ setuptools_scm ];
 
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 596ce38ed0a..27aed12c338 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";
+    sha256 = "fcd6f36bab93b0b24ec45ca12f798b9b3af71da826db0b0794b358d2f5c038de";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix
new file mode 100644
index 00000000000..d9736dcb6f3
--- /dev/null
+++ b/pkgs/development/python-modules/rednose/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, nose, six, colorama, termstyle }:
+
+buildPythonPackage rec {
+  pname = "rednose";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6da77917788be277b70259edc0bb92fc6f28fe268b765b4ea88206cc3543a3e1";
+  };
+
+  prePatch = ''
+    substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
+  '';
+
+  checkInputs = [ six ];
+  propagatedBuildInputs = [ nose colorama termstyle ];
+
+  meta = with lib; {
+    description = "A python nose plugin adding color to console results";
+    homepage = https://github.com/JBKahn/rednose;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/termstyle/default.nix b/pkgs/development/python-modules/termstyle/default.nix
new file mode 100644
index 00000000000..0a1c4e76412
--- /dev/null
+++ b/pkgs/development/python-modules/termstyle/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "termstyle";
+  version = "0.1.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ef74b83698ea014112040cf32b1a093c1ab3d91c4dd18ecc03ec178fd99c9f9f";
+  };
+
+  # Only manual tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Console colouring for python";
+    homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";
+    license = licenses.bsdOriginal;
+  };
+}
diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix
new file mode 100644
index 00000000000..79ee34c733b
--- /dev/null
+++ b/pkgs/development/python-modules/text-unidecode/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "text-unidecode";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1l081m1w8ibbx684ca71ibdy68iwqsivy6rf6yqvysdclzldbbyh";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "The most basic Text::Unidecode port";
+    homepage = https://github.com/kmike/text-unidecode;
+    license = licenses.artistic1;
+  };
+}
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
new file mode 100644
index 00000000000..526376a4163
--- /dev/null
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi
+, wrapGAppsHook, gobjectIntrospection, pygobject3, graphviz, gnome3 }:
+
+buildPythonPackage rec {
+  pname = "xdot";
+  version = "0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+  propagatedBuildInputs = [ gobjectIntrospection pygobject3 graphviz gnome3.gtk ];
+
+  meta = with lib; {
+    description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
+    homepage = https://github.com/jrfonseca/xdot.py;
+    license = licenses.lgpl3Plus;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 8f96e6146be..eeffa6bf6cf 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -29,7 +29,7 @@ fi
 mesonCheckPhase() {
     runHook preCheck
 
-    meson test
+    meson test --print-errorlogs
 
     runHook postCheck
 }
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 6326cda3539..62eab06c387 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.43.8";
+  name = "e2fsprogs-1.43.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1pn33rap3lcjm3gx07pmgyhx4j634gja63phmi4g5dq8yj0z8ciz";
+    sha256 = "15rqvkzylqqckshfy7vmk15k7wds2rh3k1pwrkrs684p3g0gzq2v";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd81cffd6f7..f1af52ac789 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10798,10 +10798,7 @@ with pkgs;
     suffix = "min";
   };
 
-  poppler_qt4 = poppler.override {
-    qt4Support = true;
-    suffix = "qt4";
-  };
+  poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { };
 
   poppler_utils = poppler.override { suffix = "utils"; utils = true; };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 54cc7c81015..c9d69ff810a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1673,27 +1673,7 @@ in {
     };
   };
 
-
-  binaryornot = buildPythonPackage rec {
-    name = "binaryornot-${version}";
-    version = "0.4.0";
-
-    src = pkgs.fetchurl {
-      url ="mirror://pypi/b/binaryornot/${name}.tar.gz";
-      sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
-    };
-
-    buildInputs = with self; [ hypothesis ];
-
-    propagatedBuildInputs = with self; [ chardet ];
-
-    meta = {
-      homepage = https://github.com/audreyr/binaryornot;
-      description = "Ultra-lightweight pure Python package to check if a file is binary or text";
-      license = licenses.bsd3;
-    };
-  };
-
+  binaryornot = callPackage ../development/python-modules/binaryornot { };
 
   bitbucket_api = buildPythonPackage rec {
     name = "bitbucket-api-0.4.4";
@@ -9227,44 +9207,7 @@ in {
     };
   };
 
-  konfig = buildPythonPackage rec {
-    name = "konfig-${version}";
-    version = "1.1";
-
-    # konfig unconditionaly depend on configparser, even if it is part of
-    # the standard library in python 3.2 or above.
-    disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = https://github.com/mozilla-services/konfig.git;
-      rev = "refs/tags/${version}";
-      sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";
-    };
-
-    propagatedBuildInputs = with self; [ configparser six ];
-
-    patches = [ (pkgs.writeText "konfig.patch" ''
-      diff --git a/setup.py b/setup.py
-      index 96fd858..bb4db06 100644
-      --- a/setup.py
-      +++ b/setup.py
-      @@ -20,7 +20,7 @@ setup(name='konfig',
-             author_email="tarek@mozilla.com",
-             include_package_data=True,
-             install_requires = [
-      -        'configparser', 'argparse', 'six'
-      +        'configparser', 'six'
-             ],
-             zip_safe=False,
-             classifiers=classifiers,
-    '') ];
-
-    meta = {
-      description = "Yet Another Config Parser";
-      homepage    = "https://github.com/mozilla-services/konfig";
-      license     = licenses.mpl20;
-    };
-  };
+  konfig = callPackage ../development/python-modules/konfig { };
 
   kitchen = callPackage ../development/python-modules/kitchen/default.nix { };
 
@@ -10640,24 +10583,6 @@ in {
 
   mysql-connector = callPackage ../development/python-modules/mysql-connector { };
 
-  mysql_connector_repackaged = buildPythonPackage rec {
-    name = "mysql-connector-repackaged-0.3.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mysql-connector-repackaged/${name}.tar.gz";
-      sha256 = "170fbf11c54def1b5fcc919be0a890b760bb2eca81f56123a5dda0c69b5b099e";
-    };
-
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.linux;
-    };
-  };
-
-
   namebench = buildPythonPackage (rec {
     name = "namebench-1.3.1";
     disabled = isPy3k || isPyPy;
@@ -14817,22 +14742,7 @@ in {
 
   redis = callPackage ../development/python-modules/redis { };
 
-  rednose = buildPythonPackage rec {
-    name = "rednose-${version}";
-    version = "1.2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rednose/${name}.tar.gz";
-      sha256 = "0b0bsna217lr1nykyhl5fgjly15zhdvqd4prg4wy1zrgfv7al6m0";
-    };
-
-    meta = {
-      description = "A python nose plugin adding color to console results.";
-    };
-
-    buildInputs = with self; [ nose six ];
-    propagatedBuildInputs = with self; [ colorama termstyle ];
-  };
+  rednose = callPackage ../development/python-modules/rednose { };
 
   reikna = callPackage ../development/python-modules/reikna { };
 
@@ -15777,6 +15687,8 @@ in {
 
   stevedore = callPackage ../development/python-modules/stevedore {};
 
+  text-unidecode = callPackage ../development/python-modules/text-unidecode { };
+
   Theano = callPackage ../development/python-modules/Theano rec {
     cudaSupport = pkgs.config.cudaSupport or false;
     cudnnSupport = cudaSupport;
@@ -18058,23 +17970,7 @@ EOF
 
   persistent = callPackage ../development/python-modules/persistent {};
 
-  xdot = buildPythonPackage rec {
-    name = "xdot-0.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xdot/${name}.tar.gz";
-      sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3";
-    };
-
-    nativeBuildInputs = with pkgs; [ wrapGAppsHook ];
-    propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.graphviz pkgs.gnome3.gtk ];
-
-    meta = {
-      description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
-      homepage = https://github.com/jrfonseca/xdot.py;
-      license = licenses.lgpl3Plus;
-    };
-  };
+  xdot = callPackage ../development/python-modules/xdot { };
 
   zetup = callPackage ../development/python-modules/zetup { };
 
@@ -20682,39 +20578,9 @@ EOF
     };
   };
 
-  termstyle = buildPythonPackage rec {
-    name = "python-termstyle-${version}";
-    version = "0.1.10";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-termstyle/${name}.tar.gz";
-      sha256 = "1qllzkx1alf14zcfapppf8w87si4cpa7lgjmdp3f5idzdyqnnapl";
-    };
+  termstyle = callPackage ../development/python-modules/termstyle { };
 
-    meta = {
-      description = "Console colouring for python";
-      homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";
-      license = licenses.bsdOriginal;
-    };
-
-  };
-
-  green = buildPythonPackage rec {
-    name = "green-${version}";
-    version = "2.3.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/green/${name}.tar.gz";
-      sha256 = "1888khfl9yxb8yfxq9b48dxwplqlxx8s0l530z5j7c6bx74v08b4";
-    };
-
-    propagatedBuildInputs = with self; [ termstyle colorama ];
-    buildInputs = with self; [ mock ];
-
-    meta = {
-      description = "Python test runner";
-      homepage = "https://github.com/CleanCut/green";
-      license = licenses.mit;
-    };
-  };
+  green = callPackage ../development/python-modules/green { };
 
   topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
 

From f760fcb239641870101b057bc40827afe16464f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 23:42:14 +0100
Subject: [PATCH 0149/2266] pythonPackages.cached-property: fix tests

Need to fetch from GitHub because conftest.py is necessary to disable some tests for Python 2.
---
 .../cached-property/default.nix               | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 1cd8e36594b..5daa505429e 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytest
 , freezegun
 }:
 
@@ -8,12 +9,20 @@ buildPythonPackage rec {
   pname = "cached-property";
   version = "1.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0";
+  # conftest.py is missing in PyPI tarball
+  # https://github.com/pydanny/cached-property/pull/87
+  src = fetchFromGitHub {
+    owner = "pydanny";
+    repo = pname;
+    rev = version;
+    sha256 = "0w7709grs4yqhfbnn7lva2fgyphvh43xcfqhi95lhh8sjad3xwkw";
   };
 
-  checkInputs = [ freezegun ];
+  checkInputs = [ pytest freezegun ];
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = {
     description = "A decorator for caching properties in classes";
@@ -22,4 +31,4 @@ buildPythonPackage rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ ericsagnes ];
   };
-}
\ No newline at end of file
+}

From 0ab1067d120e15a0fa8594f63441cb720f08f0c3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Feb 2018 00:00:00 +0000
Subject: [PATCH 0150/2266] bintools-wrapper: allow building without
 documentation

---
 .../bintools-wrapper/default.nix              | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 48fd8665cb4..e88482397f2 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -5,7 +5,8 @@
 # script that sets up the right environment variables so that the
 # compiler and the linker just "work".
 
-{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+{ name ? ""
+, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , bintools ? null, libc ? null
 , coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
 , extraPackages ? [], extraBuildCommands ? ""
@@ -15,7 +16,7 @@
 
 with stdenvNoCC.lib;
 
-assert nativeTools -> nativePrefix != "";
+assert nativeTools -> !propagateDoc && nativePrefix != "";
 assert !nativeTools ->
   bintools != null && coreutils != null && gnugrep != null;
 assert !(nativeLibc && noLibc);
@@ -83,7 +84,7 @@ stdenv.mkDerivation {
 
   inherit targetPrefix infixSalt;
 
-  outputs = [ "out" "info" "man" ];
+  outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];
 
   passthru = {
     inherit bintools libc nativeTools nativeLibc nativePrefix;
@@ -111,7 +112,7 @@ stdenv.mkDerivation {
     ''
       set -u
 
-      mkdir -p $out/bin {$out,$info,$man}/nix-support
+      mkdir -p $out/bin $out/nix-support
 
       wrap() {
         local dst="$1"
@@ -237,28 +238,27 @@ stdenv.mkDerivation {
     '')
 
     + optionalString (!nativeTools) ''
-
       ##
       ## User env support
       ##
 
       # Propagate the underling unwrapped bintools so that if you
-      # install the wrapper, you get tools like objdump, the manpages,
-      # etc. as well (same for any binaries of libc).
+      # install the wrapper, you get tools like objdump (same for any
+      # binaries of libc).
       printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+    ''
 
+    + optionalString propagateDoc ''
       ##
       ## Man page and info support
       ##
 
-      printWords ${bintools.info or ""} \
-        >> $info/nix-support/propagated-build-inputs
-      printWords ${bintools.man or ""} \
-        >> $man/nix-support/propagated-build-inputs
+      mkdir -p $man/nix-support $info/nix-support
+      printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs
+      printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs
     ''
 
     + ''
-
       ##
       ## Hardening support
       ##
@@ -286,8 +286,8 @@ stdenv.mkDerivation {
       ##
       ## Extra custom steps
       ##
-
     ''
+
     + extraBuildCommands;
 
   inherit dynamicLinker expand-response-params;

From f1074211ce4c2f59f3c6e24dc5d54ee69478a502 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Feb 2018 00:00:00 +0000
Subject: [PATCH 0151/2266] cc-wrapper: allow building without documentation,
 propagate info pages

---
 pkgs/build-support/cc-wrapper/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 8de2366ff5f..ba8aca87c72 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -5,7 +5,8 @@
 # script that sets up the right environment variables so that the
 # compiler and the linker just "work".
 
-{ name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+{ name ? ""
+, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
@@ -14,7 +15,7 @@
 
 with stdenvNoCC.lib;
 
-assert nativeTools -> nativePrefix != "";
+assert nativeTools -> !propagateDoc && nativePrefix != "";
 assert !nativeTools ->
   cc != null && coreutils != null && gnugrep != null;
 assert !(nativeLibc && noLibc);
@@ -84,7 +85,7 @@ stdenv.mkDerivation {
 
   inherit targetPrefix infixSalt;
 
-  outputs = [ "out" "man" ];
+  outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];
 
   passthru = {
     # "cc" is the generic name for a C compiler, but there is no one for package
@@ -115,7 +116,7 @@ stdenv.mkDerivation {
     ''
       set -u
 
-      mkdir -p $out/bin $out/nix-support $man/nix-support
+      mkdir -p $out/bin $out/nix-support
 
       wrap() {
         local dst="$1"
@@ -246,7 +247,6 @@ stdenv.mkDerivation {
     ''
 
     + optionalString (!nativeTools) ''
-
       ##
       ## Initial CFLAGS
       ##
@@ -276,19 +276,19 @@ stdenv.mkDerivation {
 
       echo "$ccLDFlags" > $out/nix-support/cc-ldflags
       echo "$ccCFlags" > $out/nix-support/cc-cflags
+    ''
 
+    + optionalString propagateDoc ''
       ##
-      ## User env support
+      ## Man page and info support
       ##
 
-      # Propagate the wrapped cc so that if you install the wrapper,
-      # you get tools like gcov, the manpages, etc. as well (including
-      # for binutils and Glibc).
+      mkdir -p $man/nix-support $info/nix-support
       printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
+      printWords ${cc.info or ""}  > $info/nix-support/propagated-user-env-packages
     ''
 
     + ''
-
       ##
       ## Hardening support
       ##
@@ -308,8 +308,8 @@ stdenv.mkDerivation {
       ##
       ## Extra custom steps
       ##
-
     ''
+
     + extraBuildCommands;
 
   inherit expand-response-params;

From 522437362aa4e4cf9e9e50b50e560c87cd3dfc2d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Feb 2018 00:00:00 +0000
Subject: [PATCH 0152/2266] stdenv: linux, darwin: don't build documentation
 for the the intermediate stages

For the cc of the intermediate stages, to be precise. Doing the same for
bintools requires lots of refactoring.

This is mainly for the future extensibility as now you can change
documentation generation with impunity without rebuilding the
whole of stdenv.
---
 pkgs/stdenv/darwin/default.nix | 1 +
 pkgs/stdenv/linux/default.nix  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 28b2f203dae..73dadc38420 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -86,6 +86,7 @@ in rec {
         extraPackages = lib.optional (libcxx != null) libcxx;
 
         nativeTools  = false;
+        propagateDoc = false;
         nativeLibc   = false;
         inherit buildPackages coreutils gnugrep bintools;
         libc         = last.pkgs.darwin.Libsystem;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 249f788c17a..cd11dee9c82 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -89,6 +89,7 @@ let
              then null
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
+          propagateDoc = false;
           nativeLibc = false;
           buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
             inherit (prevStage) stdenv;

From e654d9a9ca55c301d1209cd0706c96b682d5baa2 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Feb 2018 00:00:00 +0000
Subject: [PATCH 0153/2266] stdenv: linux: give distinct names to all the
 stages

Mainly for debugging.
---
 pkgs/stdenv/linux/default.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index cd11dee9c82..dcf6ecd1f26 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -66,7 +66,7 @@ let
     let
 
       thisStdenv = import ../generic {
-        name = "stdenv-linux-boot";
+        name = "${name}-stdenv-linux";
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
@@ -88,6 +88,7 @@ let
         cc = if isNull prevStage.gcc-unwrapped
              then null
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
+          name = "${name}-gcc-wrapper";
           nativeTools = false;
           propagateDoc = false;
           nativeLibc = false;
@@ -99,7 +100,6 @@ let
           isGNU = true;
           libc = getLibc prevStage;
           inherit (prevStage) coreutils gnugrep;
-          name = name;
           stdenvNoCC = prevStage.ccWrapperStdenv;
         };
 
@@ -139,7 +139,7 @@ in
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
   (prevStage: stageFun prevStage {
-    name = null;
+    name = "bootstrap-stage0";
 
     overrides = self: super: {
       # We thread stage0's stdenv through under this name so downstream stages
@@ -153,7 +153,7 @@ in
       # create a dummy Glibc here, which will be used in the stdenv of
       # stage1.
       ${localSystem.libc} = self.stdenv.mkDerivation {
-        name = "bootstrap-${localSystem.libc}";
+        name = "bootstrap-stage0-${localSystem.libc}";
         buildCommand = ''
           mkdir -p $out
           ln -s ${bootstrapTools}/lib $out/lib
@@ -165,13 +165,13 @@ in
       };
       gcc-unwrapped = bootstrapTools;
       binutils = import ../../build-support/bintools-wrapper {
+        name = "bootstrap-stage0-binutils-wrapper";
         nativeTools = false;
         nativeLibc = false;
         buildPackages = { };
         libc = getLibc self;
         inherit (self) stdenvNoCC coreutils gnugrep;
         bintools = bootstrapTools;
-        name = "bootstrap-binutils-wrapper";
       };
       coreutils = bootstrapTools;
       gnugrep = bootstrapTools;
@@ -190,7 +190,7 @@ in
   # simply re-export those packages in the middle stage(s) using the
   # overrides attribute and the inherit syntax.
   (prevStage: stageFun prevStage {
-    name = "bootstrap-gcc-wrapper";
+    name = "bootstrap-stage1";
 
     # Rebuild binutils to use from stage2 onwards.
     overrides = self: super: {
@@ -214,7 +214,7 @@ in
   # 2nd stdenv that contains our own rebuilt binutils and is used for
   # compiling our own Glibc.
   (prevStage: stageFun prevStage {
-    name = "bootstrap-gcc-wrapper";
+    name = "bootstrap-stage2";
 
     overrides = self: super: {
       inherit (prevStage)
@@ -235,7 +235,7 @@ in
   # one uses the rebuilt Glibc from stage2.  It still uses the recent
   # binutils and rest of the bootstrap tools, including GCC.
   (prevStage: stageFun prevStage {
-    name = "bootstrap-gcc-wrapper";
+    name = "bootstrap-stage3";
 
     overrides = self: super: rec {
       inherit (prevStage)
@@ -263,7 +263,7 @@ in
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
   (prevStage: stageFun prevStage {
-    name = "";
+    name = "bootstrap-stage4";
 
     overrides = self: super: {
       # Zlib has to be inherited and not rebuilt in this stage,
@@ -292,7 +292,6 @@ in
         bintools = self.binutils;
         libc = getLibc self;
         inherit (self) stdenvNoCC coreutils gnugrep;
-        name = "";
         shell = self.bash + "/bin/bash";
       };
     };
@@ -311,6 +310,8 @@ in
   (prevStage: {
     inherit config overlays;
     stdenv = import ../generic rec {
+      name = "stdenv-linux";
+
       buildPlatform = localSystem;
       hostPlatform = localSystem;
       targetPlatform = localSystem;

From 49afe1d490894e27830d38a600bd503dd7f306f1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 25 Feb 2018 22:03:40 +0000
Subject: [PATCH 0154/2266] stdenv: darwin: give distinct names to all the
 stages

---
 pkgs/stdenv/darwin/default.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 73dadc38420..c1ac6473736 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -61,12 +61,14 @@ in rec {
                           libcxx,
                           allowedRequisites ? null}:
     let
+      name = "bootstrap-stage${toString step}";
+
       buildPackages = lib.optionalAttrs (last ? stdenv) {
         inherit (last) stdenv;
       };
 
-      coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; };
-      gnugrep   = { name = "gnugrep-9.9.9";   outPath = bootstrapTools; };
+      coreutils = { name = "${name}-coreutils"; outPath = bootstrapTools; };
+      gnugrep   = { name = "${name}-gnugrep";   outPath = bootstrapTools; };
 
       bintools = import ../../build-support/bintools-wrapper {
         inherit shell;
@@ -76,7 +78,7 @@ in rec {
         nativeLibc   = false;
         inherit buildPackages coreutils gnugrep;
         libc         = last.pkgs.darwin.Libsystem;
-        bintools     = { name = "binutils-9.9.9";  outPath = bootstrapTools; };
+        bintools     = { name = "${name}-binutils"; outPath = bootstrapTools; };
       };
 
       cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
@@ -91,17 +93,17 @@ in rec {
         inherit buildPackages coreutils gnugrep bintools;
         libc         = last.pkgs.darwin.Libsystem;
         isClang      = true;
-        cc           = { name = "clang-9.9.9";     outPath = bootstrapTools; };
+        cc           = { name = "${name}-clang"; outPath = bootstrapTools; };
       };
 
       thisStdenv = import ../generic {
+        name = "${name}-stdenv-darwin";
+
         inherit config shell extraNativeBuildInputs extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
           cc.expand-response-params cc.bintools
         ];
 
-        name = "stdenv-darwin-boot-${toString step}";
-
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
@@ -146,7 +148,7 @@ in rec {
     overrides = self: super: with stage0; rec {
       darwin = super.darwin // {
         Libsystem = stdenv.mkDerivation {
-          name = "bootstrap-Libsystem";
+          name = "bootstrap-stage0-Libsystem";
           buildCommand = ''
             mkdir -p $out
             ln -s ${bootstrapTools}/lib $out/lib
@@ -157,7 +159,7 @@ in rec {
       };
 
       libcxx = stdenv.mkDerivation {
-        name = "bootstrap-libcxx";
+        name = "bootstrap-stage0-libcxx";
         phases = [ "installPhase" "fixupPhase" ];
         installPhase = ''
           mkdir -p $out/lib $out/include
@@ -169,7 +171,7 @@ in rec {
       };
 
       libcxxabi = stdenv.mkDerivation {
-        name = "bootstrap-libcxxabi";
+        name = "bootstrap-stage0-libcxxabi";
         buildCommand = ''
           mkdir -p $out/lib
           ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
@@ -325,11 +327,11 @@ in rec {
       inherit binutils binutils-raw;
     };
   in import ../generic rec {
+    name = "stdenv-darwin";
+
     inherit config;
     inherit (pkgs.stdenv) fetchurlBoot;
 
-    name = "stdenv-darwin";
-
     buildPlatform = localSystem;
     hostPlatform = localSystem;
     targetPlatform = localSystem;

From d45e39c9a9961544933bfd5b3b59ea47b1c7efb3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Feb 2018 00:00:00 +0000
Subject: [PATCH 0155/2266] bash, bashInteractive: install manpages for both
 variants

This mostly reverts commit bd0e161f0cd6a34a5fa777570b1489f1275af417.
---
 pkgs/shells/bash/4.4.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 63c7fbc7a0e..04a03698289 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -36,9 +36,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  outputs = [ "out" "dev" "doc" "info" ]
-    # the man pages are small and useful enough, so include them in $out in interactive builds
-    ++ stdenv.lib.optional (!interactive) "man";
+  outputs = [ "out" "dev" "man" "doc" "info" ];
 
   NIX_CFLAGS_COMPILE = ''
     -DSYS_BASHRC="/etc/bashrc"

From 283002461b7927865945e44ac357be63f28449e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 23:56:36 +0100
Subject: [PATCH 0156/2266] pythonPackages.mozterm: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix
new file mode 100644
index 00000000000..6adba7ef2b9
--- /dev/null
+++ b/pkgs/development/python-modules/mozterm/default.nix
@@ -0,0 +1,16 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "mozterm";
+  version = "0.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561";
+  };
+
+  meta = with lib; {
+    description = "Terminal abstractions built around the blessings module";
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e4837ba325..ec2b99a9fbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9860,6 +9860,8 @@ in {
     };
   };
 
+  mozterm = callPackage ../development/python-modules/mozterm { };
+
   mplleaflet = callPackage ../development/python-modules/mplleaflet { };
 
   multidict = callPackage ../development/python-modules/multidict { };

From e459171f9a847fe6138d91010e4a82872d3e3d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 23:59:46 +0100
Subject: [PATCH 0157/2266] pythonPackages.mozlog: correct dependencies

---
 .../python-modules/marionette-harness/mozlog.nix           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 605a4ae4a38..dfe91309ea4 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -4,13 +4,14 @@
 , fetchPypi
 , isPy3k
 , blessings
+, mozterm
+, six
 , mozfile
 }:
 
 buildPythonPackage rec {
   pname = "mozlog";
   version = "3.7";
-  name = "${pname}-${version}";
 
   disabled = isPy3k;
 
@@ -19,7 +20,9 @@ buildPythonPackage rec {
     sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9";
   };
 
-  propagatedBuildInputs = [ blessings mozfile ];
+  propagatedBuildInputs = [ blessings mozterm six ];
+
+  checkInputs = [ mozfile ];
 
   meta = {
     description = "Mozilla logging library";

From c5fab86a7ef4102e597ea03ba9630f217ecb29ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 00:22:09 +0100
Subject: [PATCH 0158/2266] pythonPackages.astral: fix build

---
 pkgs/development/python-modules/astral/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 46b4b6bc8ea..488c5ed6651 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytz, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, pytz, requests, pytest }:
 
 buildPythonPackage rec {
   pname = "astral";
@@ -9,11 +9,13 @@ buildPythonPackage rec {
     sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
   };
 
-  propagatedBuildInputs = [ pytz ];
+  propagatedBuildInputs = [ pytz requests ];
 
   checkInputs = [ pytest ];
   checkPhase = ''
-    py.test -k "not test_GoogleLocator"
+    # https://github.com/sffjunkie/astral/pull/13
+    touch src/test/.api_key
+    py.test -m "not webtest"
   '';
 
   meta = with stdenv.lib; {

From d6e25bfc3b34c0b4a7b7874e7cabe78e6447ede7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 00:27:01 +0100
Subject: [PATCH 0159/2266] home-assistant: pin astral version to 1.5

---
 pkgs/servers/home-assistant/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cb9424ad5cf..e2f3deb6c48 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -35,6 +35,13 @@ let
           sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s";
         };
       });
+      astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+        version = "1.5";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6";
+        };
+      });
       hass-frontend = super.callPackage ./frontend.nix { };
     };
   };

From 31a94650e2a3be50fce643436c8252e7ee396b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 00:41:49 +0100
Subject: [PATCH 0160/2266] pythonPackages.stripe: add simplejson dependency
 for python 2

---
 pkgs/development/python-modules/stripe/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 1bfcb8eb002..9a3ed36d893 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, unittest2, mock, requests }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, unittest2, mock, requests, simplejson }:
 
 buildPythonPackage rec {
   pname = "stripe";
   version = "1.79.0";
-  name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
   # them. ~ C.
@@ -15,11 +14,11 @@ buildPythonPackage rec {
     sha256 = "490bb7bfc7d224e483d643171fd860f8a1670e31fd9cef8cb8d9a7c19806d450";
   };
 
-  buildInputs = [ unittest2 mock ];
+  checkInputs = [ unittest2 mock ];
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Stripe Python bindings";
     homepage = https://github.com/stripe/stripe-python;
     license = licenses.mit;

From 4e50deb14ae7577dbad0b6983f73c3e4aa05c057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 01:02:25 +0100
Subject: [PATCH 0161/2266] yq: add xmltodict dependency

---
 pkgs/development/tools/yq/default.nix | 8 +++-----
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 3283136590a..c911cdb5825 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, jq }:
+{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
 
 buildPythonApplication rec {
-
   pname = "yq";
   version = "2.4.1";
 
-  propagatedBuildInputs = [ pyyaml jq ];
+  propagatedBuildInputs = [ pyyaml xmltodict jq ];
 
   # ValueError: underlying buffer has been detached
   doCheck = false;
@@ -17,9 +16,8 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "Command-line YAML processor - jq wrapper for YAML documents.";
-    homepage = https://pypi.python.org/pypi/yq;
+    homepage = https://github.com/kislyuk/yq;
     license = [ licenses.asl20 ];
     maintainers = [ maintainers.womfoo ];
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fa73015ca9..75ab0c4aaf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8214,7 +8214,7 @@ with pkgs;
   yodl = callPackage ../development/tools/misc/yodl { };
 
   yq = callPackage ../development/tools/yq {
-    inherit (python3Packages) buildPythonApplication fetchPypi pyyaml;
+    inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict;
   };
 
   winpdb = callPackage ../development/tools/winpdb { };

From 12c2f2a430fbde3af98dee893488438499405ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 01:14:21 +0100
Subject: [PATCH 0162/2266] pythonPackages.green: 2.12.0 -> 2.12.1

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

diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index fa09e4ded21..81d2a7e204c 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -2,18 +2,13 @@
 
 buildPythonPackage rec {
   pname = "green";
-  version = "2.12.0";
+  version = "2.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8cdd2934eff754c9664f373ee0d77cb1cb35dbbf3b719b8ae3b059718db875df";
+    sha256 = "4c0c163bd2ce2da1f201eb69fd92fc24aaeab884f9e5c5a8c23d507a53336fa8";
   };
 
-  prePatch = ''
-    # See https://github.com/CleanCut/green/pull/182
-    substituteInPlace setup.py --replace python-termstyle termstyle
-  '';
-
   propagatedBuildInputs = [
     colorama coverage termstyle unidecode
   ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ];

From 933e8663ad7b2adc41c158fd2c765eef2334baca Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Feb 2018 17:44:40 -0500
Subject: [PATCH 0163/2266] openjdk: Clean up platform conditionals

---
 pkgs/development/compilers/openjdk/8.nix      |  4 +--
 .../compilers/openjdk/bootstrap.nix           | 29 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index b74c8a47dde..24cf1b8a0c9 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -14,9 +14,9 @@ let
    * The JRE libraries are in directories that depend on the CPU.
    */
   architecture =
-    if stdenv.system == "i686-linux" then
+    if stdenv.hostPlatform.system == "i686-linux" then
       "i386"
-    else if stdenv.system == "x86_64-linux" then
+    else if stdenv.hostPlatform.system == "x86_64-linux" then
       "amd64"
     else
       throw "openjdk requires i686-linux or x86_64 linux";
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 48a22638813..38171c4d3fe 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -1,11 +1,14 @@
-{ stdenv, runCommand, glibc, fetchurl, file
+{ stdenv
+, runCommand, fetchurl, file
 
 , version
 }:
 
+assert stdenv.hostPlatform.libc == "glibc";
+
 let
   # !!! These should be on nixos.org
-  src = if glibc.system == "x86_64-linux" then
+  src = if stdenv.hostPlatform.system == "x86_64-linux" then
     (if version == "8" then
       fetchurl {
         url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1";
@@ -17,7 +20,7 @@ let
         sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra";
       }
     else throw "No bootstrap for version")
-  else if glibc.system == "i686-linux" then
+  else if stdenv.hostPlatform.system == "i686-linux" then
     (if version == "8" then
       fetchurl {
         url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1";
@@ -39,22 +42,18 @@ let
 
     LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')"
 
-    for i in $out/bin/*; do
-      patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $i || true
-      patchelf --set-rpath "${glibc.out}/lib:$LIBDIRS" $i || true
-    done
-
-    find $out -name \*.so\* | while read lib; do
-      patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $lib || true
-      patchelf --set-rpath "${glibc.out}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" $lib || true
+    find "$out" -type f -print0 | while IFS= read -r -d "" elf; do
+      isELF "$elf" || continue
+      patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true
+      patchelf --set-rpath "${stdenv.cc.libc}/lib:$LIBDIRS" "$elf" || true
     done
 
     # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
-    exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
-    for file in $exes; do
-      paxmark m "$file"
+    find "$out/bin" -type f -print0 | while IFS= read -r -d "" elf; do
+      isELF "$elf" || continue
+      paxmark m "$elf"
       # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
-      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
+      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$elf"''}
     done
   '';
 in bootstrap

From fb0d99696eb07896a0fb2ed9f74f05851691e726 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:24:54 -0800
Subject: [PATCH 0164/2266] libevdev: 1.5.7 -> 1.5.8

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/s03fn5nf1d4bxiwnjngz4fa8qbxxak2d-libevdev-1.5.8/bin/libevdev-tweak-device -h` got 0 exit code
- ran `/nix/store/s03fn5nf1d4bxiwnjngz4fa8qbxxak2d-libevdev-1.5.8/bin/libevdev-tweak-device --help` got 0 exit code
- found 1.5.8 with grep in /nix/store/s03fn5nf1d4bxiwnjngz4fa8qbxxak2d-libevdev-1.5.8
- found 1.5.8 in filename of file in /nix/store/s03fn5nf1d4bxiwnjngz4fa8qbxxak2d-libevdev-1.5.8

cc "@amorsillo"
---
 pkgs/development/libraries/libevdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 090a12f63de..5bcb9a1ede2 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.5.7";
+  name = "libevdev-1.5.8";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1";
+    sha256 = "0vac7n1miqdprikq4g63vsk681q8v416r0nbh2xai7b08qgdi0v0";
   };
 
   buildInputs = [ python ];

From b09e2961ca7b57c9dfa6c7e93831245bd4f992a3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:30:24 -0800
Subject: [PATCH 0165/2266] libgsf: 1.14.41 -> 1.14.42

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf -h` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf --help` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf help` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf -v` and found version 1.14.42
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf --version` and found version 1.14.42
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf -h` and found version 1.14.42
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf --help` and found version 1.14.42
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf-vba-dump -h` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf-vba-dump --help` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf-vba-dump help` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf-office-thumbnailer -h` got 0 exit code
- ran `/nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42/bin/gsf-office-thumbnailer --help` got 0 exit code
- found 1.14.42 with grep in /nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42
- found 1.14.42 in filename of file in /nix/store/r5m45cyq4pdbqf6a3fal3x7dgy69hqiv-libgsf-1.14.42

cc "@lovek323"
---
 pkgs/development/libraries/libgsf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 6e036522b1c..54a17d94a59 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
 let inherit (stdenv.lib) optionals; in
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.41";
+  name = "libgsf-1.14.42";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "1lq87wnrsjbjafpk3c8xwd56gqx319fhck9xkg2da88hd9c9h2qm";
+    sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 728e119bd3af4ba17ebbf000d3bd1169451163d3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:49:14 -0800
Subject: [PATCH 0166/2266] libmicrohttpd: 0.9.58 -> 0.9.59

Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.9.59 with grep in /nix/store/vrgb5pfvbcn7f3c6gn4smc5w0xjmb6ss-libmicrohttpd-0.9.59
- found 0.9.59 in filename of file in /nix/store/vrgb5pfvbcn7f3c6gn4smc5w0xjmb6ss-libmicrohttpd-0.9.59

cc "@eelco @vrthra @fpletz"
---
 pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 35928e6dbf9..2e7c913e6a8 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmicrohttpd-${version}";
-  version = "0.9.58";
+  version = "0.9.59";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "1wq17qvizis7bsyvyw1gnfycvivssncngziddnyrbzv2dhvy24bs";
+    sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v";
   };
 
   outputs = [ "out" "dev" "devdoc" "info" ];

From d9dc6c4199e7cacf26ef3d92a6627d1d7fc7de91 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:49:44 -0800
Subject: [PATCH 0167/2266] libmng: 2.0.2 -> 2.0.3

Semi-automatic update. These checks were performed:

- built on NixOS
- found 2.0.3 with grep in /nix/store/g7hv6hhrr23j1jcf0z03kz1jk19l8h32-libmng-2.0.3
- found 2.0.3 in filename of file in /nix/store/g7hv6hhrr23j1jcf0z03kz1jk19l8h32-libmng-2.0.3

cc "@marcweber"
---
 pkgs/development/libraries/libmng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index ff627499855..749a5d60e46 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
 
 stdenv.mkDerivation rec {
-  name = "libmng-2.0.2";
+  name = "libmng-2.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmng/${name}.tar.xz";
-    sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317";
+    sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 08005850eaff06723a5cd5e3a1a020067ebbbb8f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:58:45 -0800
Subject: [PATCH 0168/2266] libraw1394: 2.1.1 -> 2.1.2

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/testlibraw -h` got 0 exit code
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/testlibraw --help` got 0 exit code
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/testlibraw help` got 0 exit code
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/sendiso -h` got 0 exit code
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/sendiso --help` got 0 exit code
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/dumpiso -h` got 0 exit code
- ran `/nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2/bin/dumpiso --help` got 0 exit code
- found 2.1.2 with grep in /nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2
- found 2.1.2 in filename of file in /nix/store/qxim1bskvnx2i91zlyblc62npb2m6yw1-libraw1394-2.1.2

cc "@wkennington"
---
 pkgs/development/libraries/libraw1394/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index c767ef9a9ea..39d5c64f64f 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libraw1394-2.1.1";
+  name = "libraw1394-2.1.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
-    sha256 = "0x6az154wr7wv3945485grjvpk604khv34dbaph6vmc1zdasqq59";
+    sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x";
   };
 
   meta = with stdenv.lib; {

From 04ec090f6f5036ed33333d3f1e34ce07b6b370d8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 21:15:04 -0800
Subject: [PATCH 0169/2266] libuv: 1.19.1 -> 1.19.2

Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.19.2 with grep in /nix/store/f45rl4z9a2rqd7hdhwnj9g831z1k4ilr-libuv-1.19.2
- found 1.19.2 in filename of file in /nix/store/f45rl4z9a2rqd7hdhwnj9g831z1k4ilr-libuv-1.19.2

cc "@cstrahan"
---
 pkgs/development/libraries/libuv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 59fd95eefee..e8877c7f54b 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.19.1";
+  version = "1.19.2";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "020jap4xvjns1rgb2kvpf1nib3f2d5fyqh04afgkk32hiag0kn66";
+    sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z";
   };
 
   postPatch = let

From 4101087746e906d2bbaa408a5508f5682af05acc Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 21:24:47 -0800
Subject: [PATCH 0170/2266] libwacom: 0.26 -> 0.28

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/yi7myg1fay4my7dl64nbj0mlv2qdma6z-libwacom-0.28/bin/libwacom-list-local-devices -h` got 0 exit code
- ran `/nix/store/yi7myg1fay4my7dl64nbj0mlv2qdma6z-libwacom-0.28/bin/libwacom-list-local-devices --help` got 0 exit code
- ran `/nix/store/yi7myg1fay4my7dl64nbj0mlv2qdma6z-libwacom-0.28/bin/libwacom-list-local-devices help` got 0 exit code
- found 0.28 with grep in /nix/store/yi7myg1fay4my7dl64nbj0mlv2qdma6z-libwacom-0.28
- found 0.28 in filename of file in /nix/store/yi7myg1fay4my7dl64nbj0mlv2qdma6z-libwacom-0.28
---
 pkgs/development/libraries/libwacom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 6674f303739..8e36edff7ed 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libwacom-${version}";
-  version = "0.26";
+  version = "0.28";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
-    sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63";
+    sha256 = "1vv768870597rvwxdb59v6pjn1pxaxg4r6znbb5j3cl828q35mp7";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 73072e688b7e7daeed46414ab5a67e5d961020b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 09:25:53 +0100
Subject: [PATCH 0171/2266] awscli: 1.14.41 -> 1.14.47

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

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 4c6a91ec321..adc733cbeb2 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -26,12 +26,12 @@ let
 
 in buildPythonPackage rec {
   pname = "awscli";
-  version = "1.14.41";
+  version = "1.14.47";
   namePrefix = "";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8cf2a52d56f26e22e2fbd7b72649ef1d3de8930df7a730d7f27418d129bb3a6a";
+    sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
   };
 
   # No tests included

From 6617c0cc306d02903b28ceb30ba74509e4d1d5fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 09:26:12 +0100
Subject: [PATCH 0172/2266] python: botocore: 1.8.50 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 67f09cf9275..e03aade3d95 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.8.50";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a80a23e080f4a93d11a1c067a69304dd407d18c358cba1e0df8c96f56c9e98b4";
+    sha256 = "f70f7f5682a2e7593079ec813f774044ef464b0ebe680dab47930f40e230d6d5";
   };
 
   propagatedBuildInputs = [

From ae870798dc8803e1298e335cebc1d1de22068c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 09:26:19 +0100
Subject: [PATCH 0173/2266] awscli: refactor

---
 pkgs/tools/admin/awscli/default.nix | 44 ++++++++++++-----------------
 pkgs/top-level/all-packages.nix     |  2 +-
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index adc733cbeb2..eb735a04abb 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -1,35 +1,27 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, botocore
-, bcdoc
-, s3transfer
-, six
-, colorama
-, docutils
-, rsa
-, pyyaml
+{ lib
+, python
 , groff
 , less
 }:
 
 let
-  colorama_3_7 = colorama.overrideAttrs (old: rec {
-    name = "${pname}-${version}";
-    pname = "colorama";
-    version = "0.3.7";
-    src = old.src.override {
-      inherit version;
-      sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+  py = python.override {
+    packageOverrides = self: super: {
+      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+        version = "0.3.7";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+        };
+      });
     };
-  });
+  };
 
-in buildPythonPackage rec {
+in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
   version = "1.14.47";
-  namePrefix = "";
 
-  src = fetchPypi {
+  src = py.pkgs.fetchPypi {
     inherit pname version;
     sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
   };
@@ -37,12 +29,12 @@ in buildPythonPackage rec {
   # No tests included
   doCheck = false;
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with py.pkgs; [
     botocore
     bcdoc
     s3transfer
     six
-    colorama_3_7
+    colorama
     docutils
     rsa
     pyyaml
@@ -58,10 +50,10 @@ in buildPythonPackage rec {
     rm $out/bin/aws.cmd
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://aws.amazon.com/cli/;
     description = "Unified tool to manage your AWS services";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ muflax ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75ab0c4aaf9..32e3f985688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -552,7 +552,7 @@ with pkgs;
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
-  awscli = pythonPackages.callPackage ../tools/admin/awscli { };
+  awscli = callPackage ../tools/admin/awscli { };
 
   awsebcli = callPackage ../tools/virtualization/awsebcli {};
 

From d96f70fc540c1edff4130fb4e3d5a0f6d3f8cb7f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 09:43:40 +0100
Subject: [PATCH 0174/2266] python: boto3: 1.4.8 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index eaab0031205..ccada6dd140 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.4.8";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "boto";
     repo  = "boto3";
     rev   = version;
-    sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi";
+    sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

From b7ec621e91b2653d8ddb72cc8bb8e5972d30717d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Feb 2018 20:07:35 +0800
Subject: [PATCH 0175/2266] jquery & jquery-ui: Move to nixos/lib/testing/

These (outdated) derivations are only used by nixos/lib/testing.nix.

If we want to provide jquery & jquery-ui packages this is better done
in nodePackages.
---
 nixos/lib/testing.nix                                  | 10 +++++++---
 .../default.nix => nixos/lib/testing/jquery-ui.nix     |  0
 .../jquery/default.nix => nixos/lib/testing/jquery.nix |  0
 pkgs/top-level/aliases.nix                             |  1 -
 pkgs/top-level/all-packages.nix                        |  4 ----
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/development/libraries/javascript/jquery-ui/default.nix => nixos/lib/testing/jquery-ui.nix (100%)
 rename pkgs/development/libraries/javascript/jquery/default.nix => nixos/lib/testing/jquery.nix (100%)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index efcafbaa555..d990a5f8b6a 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -3,7 +3,11 @@
 with import ./build-vms.nix { inherit system minimal config; };
 with pkgs;
 
-rec {
+let
+  jquery-ui = callPackage ./testing/jquery-ui.nix { };
+  jquery = callPackage ./testing/jquery.nix { };
+
+in rec {
 
   inherit pkgs;
 
@@ -143,8 +147,8 @@ rec {
       test = passMeta (runTests driver);
       report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
 
-    in (if makeCoverageReport then report else test) // { 
-      inherit nodes driver test; 
+    in (if makeCoverageReport then report else test) // {
+      inherit nodes driver test;
     };
 
   runInMachine =
diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/nixos/lib/testing/jquery-ui.nix
similarity index 100%
rename from pkgs/development/libraries/javascript/jquery-ui/default.nix
rename to nixos/lib/testing/jquery-ui.nix
diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/nixos/lib/testing/jquery.nix
similarity index 100%
rename from pkgs/development/libraries/javascript/jquery/default.nix
rename to nixos/lib/testing/jquery.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 06da21813ae..c65d3efb368 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -103,7 +103,6 @@ mapAliases (rec {
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
-  jquery_ui = jquery-ui;  # added 2014-09-07
   kdiff3-qt5 = kdiff3; # added 2017-02-18
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   keepassx-reboot = keepassx-community; # added 2017-02-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ba3e8f2979..9708a5bf856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11873,10 +11873,6 @@ with pkgs;
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 
-  jquery = callPackage ../development/libraries/javascript/jquery { };
-
-  jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { };
-
   yuicompressor = callPackage ../development/tools/yuicompressor { };
 
   ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)

From 15beb89da6e14c4c78ab439f8cab18e109bcd356 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 16:35:57 +0100
Subject: [PATCH 0176/2266] python: wrapt: 1.10.5 -> 1.10.11

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

diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
new file mode 100644
index 00000000000..badecc776d7
--- /dev/null
+++ b/pkgs/development/python-modules/wrapt/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "wrapt";
+  version = "1.10.11";
+
+  # No tests in archive
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6";
+  };
+
+  meta = {
+    description = "Module for decorators, wrappers and monkey patching";
+    license = lib.licenses.bsd2;
+    homepage = https://github.com/GrahamDumpleton/wrapt;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26493fce9f2..2fed7a0a1c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11822,18 +11822,7 @@ in {
 
   doc8 = callPackage ../development/python-modules/doc8 { };
 
-  wrapt = buildPythonPackage rec {
-    name = "wrapt-${version}";
-    version = "1.10.5";
-
-    # No tests in archive
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/wrapt/${name}.tar.gz";
-      sha256 = "0cq8rlpzkxzk48b50yrfhzn1d1hrq4gjcdqlrgq4v5palgiv9jwr";
-    };
-  };
+  wrapt = callPackage ../development/python-modules/wrapt { };
 
   pagerduty = buildPythonPackage rec {
     name = "pagerduty-${version}";

From d0a427d24f7f362a1a9190fdc0fbf0049db09c15 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 12:03:25 -0800
Subject: [PATCH 0177/2266] psi-plus: 0.16.575.639 -> 1.2.235

Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.2.235 with grep in /nix/store/9z3lbwjmcvgxpicxnkqsqyn2bmkyqvsw-psi-plus-1.2.235

cc "@orivej"
---
 .../networking/instant-messengers/psi-plus/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index c4d13ac7643..7c6f33935dc 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "psi-plus-${version}";
-  version = "0.16.575.639";
+  version = "1.2.235";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = "${version}";
-    sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg";
+    sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47";
   };
 
   resources = fetchFromGitHub {

From a3b406c0aa6b555b00857532bac123c6e3c62c35 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 27 Feb 2018 20:50:21 +0000
Subject: [PATCH 0178/2266] far2l: 2017-10-08 -> 2018-02-27

---
 .../misc/far2l/add-nix-syntax-highlighting.patch            | 6 +++---
 pkgs/applications/misc/far2l/default.nix                    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
index 0ed98ee947b..a50070c4ead 100644
--- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -77,9 +77,9 @@ index 0000000..1bd9bb5
 +      <block start="/(\()/"   end="/(\))/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
 +      <block start="/(\[)/"   end="/(\])/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
 +
-+      <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+=?~-]+)+/"                         region0="Path"/>
-+      <regexp match="/&lt;[\w\d\/.+=?~-]+&gt;/"                                 region0="Path"/>
-+      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/"    region0="URL"/>
++      <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+?~-]+)+/"                          region0="Path"/>
++      <regexp match="/&lt;[\w\d\/.+?~-]+&gt;/"                                  region0="Path"/>
++      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~+-]+/"   region0="URL"/>
 +      <block start="/(&quot;)/"       end="/(&quot;)/"       scheme="String"      region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
 +      <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
 +
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index aaaa7f3c214..9ddd39981cc 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -3,15 +3,15 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  rev = "192dace49c2e5456ca235833ee9877e4b8b491cc";
-  build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}";
+  rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";
+  build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl";
+    sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];

From a2bc30c94dff12e65d99aa7d85640f6524939f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 17:12:33 +0100
Subject: [PATCH 0179/2266] pythonPackages.pytest-xdist: 1.22.1 -> 1.22.2

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

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 27aed12c338..38d34a95854 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fcd6f36bab93b0b24ec45ca12f798b9b3af71da826db0b0794b358d2f5c038de";
+    sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From cd323e86025198fd58a0e827f8e3b5b9d8a11dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 17:40:42 +0100
Subject: [PATCH 0180/2266] python3Packages.netdisco: allow newer zeroconf
 versions

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

diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index 96de3ee2836..105607fe375 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }:
 
 buildPythonPackage rec {
   pname = "netdisco";
@@ -14,6 +14,12 @@ buildPythonPackage rec {
     sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm";
   };
 
+  # Allow newer zeroconf versions
+  patches = fetchpatch {
+    url = "${meta.homepage}/commit/78f83046a2a0d77527274c8be9c3fd75737c19d0.patch";
+    sha256 = "098zkwqg9181vavw97yhi9rsdsf023gnapg4gkr1n0awz3f3l9nm";
+  };
+
   propagatedBuildInputs = [ requests zeroconf netifaces ];
 
   checkInputs = [ pytest ];
@@ -24,7 +30,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python library to scan local network for services and devices";
-    homepage = https://github.com/home-assistant/netdisco/;
+    homepage = https://github.com/home-assistant/netdisco;
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ dotlambda ];

From bd49adca4943277d291191aa281027f866c3b394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 21:01:21 +0100
Subject: [PATCH 0181/2266] pythonPackages.aiohttp: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 0788d1d5388..c9bc6cb781c 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6569b8850103595be10fcfa1fa911b01f876651921f52d769017b21d822e5dc3";
+    sha256 = "bb873da531401416acb7045a8f0bdf6555e9c6866989cd977166fae3cbbb954b";
   };
 
   disabled = pythonOlder "3.4";

From d509dd8bd36addc78a9e59fa9fc90e315f23626e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 21:18:19 +0100
Subject: [PATCH 0182/2266] pythonPackages.asynctest: 0.11.1 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index 2b0348a8758..a0f408764a0 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "asynctest";
-  version = "0.11.1";
+  version = "0.12.0";
 
   disabled = pythonOlder "3.4";
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "Martiusweb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vvh5vbq2fbz6426figs85z8779r7svb4dp2v3xynhhv05nh2y6v";
+    sha256 = "0rcb3kz2m0iwvgxpx2avfz9cqsd9xbaq93zykr2fki3ikmnp3vyg";
   };
 
   postPatch = ''

From 250aa352c4b88af694abf6588acadcf02dfa8f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 21:41:08 +0100
Subject: [PATCH 0183/2266] pythonPackages.BlinkStick: move expression

---
 .../python-modules/blinkstick/default.nix     | 20 +++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +------------------
 2 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/blinkstick/default.nix

diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix
new file mode 100644
index 00000000000..f3c06f8330c
--- /dev/null
+++ b/pkgs/development/python-modules/blinkstick/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, pyusb }:
+
+buildPythonPackage rec {
+  pname = "BlinkStick";
+  version = "1.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
+  };
+
+  propagatedBuildInputs = [ pyusb ];
+
+  meta = with lib; {
+    description = "Python package to control BlinkStick USB devices";
+    homepage = https://pypi.python.org/pypi/BlinkStick/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2fed7a0a1c9..c4ff8feca56 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18738,30 +18738,7 @@ EOF
 
   pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; };
 
-  BlinkStick = buildPythonPackage rec {
-    name = "BlinkStick-${version}";
-    version = "1.1.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/B/BlinkStick/${name}.tar.gz";
-      sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
-    };
-
-    # Requires pyusb 1.0.0b1.
-    # Likely current pyusb will work but we need to patch the hard requirement then.
-    broken = true;
-
-    patchPhase = "substituteInPlace setup.py --replace pyusb==1.0.0b1 pyusb==1.0.0";
-
-    propagatedBuildInputs = with self; [ pyusb ];
-
-    meta = {
-      description = "Python package to control BlinkStick USB devices";
-      homepage = https://pypi.python.org/pypi/BlinkStick/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  BlinkStick = callPackage ../development/python-modules/blinkstick { };
 
   usbtmc = callPackage ../development/python-modules/usbtmc {};
 

From bfe6d6ab34db705af62b0ae8026db57d9a5a44d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 21:43:30 +0100
Subject: [PATCH 0184/2266] pythonPackages.BlinkStick: patch for newer pyusb
 version

---
 .../python-modules/blinkstick/default.nix           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix
index f3c06f8330c..96f7bfebdeb 100644
--- a/pkgs/development/python-modules/blinkstick/default.nix
+++ b/pkgs/development/python-modules/blinkstick/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pyusb }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }:
 
 buildPythonPackage rec {
   pname = "BlinkStick";
@@ -9,6 +9,17 @@ buildPythonPackage rec {
     sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch;
+      sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f";
+    })
+    (fetchpatch {
+      url = https://github.com/arvydas/blinkstick-python/pull/54.patch;
+      sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl";
+    })
+  ];
+
   propagatedBuildInputs = [ pyusb ];
 
   meta = with lib; {

From 7076991eec964534ff146bd5af7f772028152d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 22:06:27 +0100
Subject: [PATCH 0185/2266] pythonPackages.virtual-display: move expression

---
 .../virtual-display/default.nix               | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +----------------
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/virtual-display/default.nix

diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix
new file mode 100644
index 00000000000..0d559c8c88a
--- /dev/null
+++ b/pkgs/development/python-modules/virtual-display/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, EasyProcess }:
+
+buildPythonPackage rec {
+  pname = "PyVirtualDisplay";
+  version = "0.1.5";
+
+  propagatedBuildInputs = [ EasyProcess ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";
+  };
+
+  meta = with lib; {
+    description = "Python wrapper for Xvfb, Xephyr and Xvnc";
+    homepage = "https://github.com/ponty/pyvirtualdisplay";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ layus ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4ff8feca56..5e5d5582d48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17458,23 +17458,7 @@ in {
 
   virtkey = callPackage ../development/python-modules/virtkey { };
 
-  virtual-display = buildPythonPackage rec {
-    name = "PyVirtualDisplay-0.1.5";
-
-    propagatedBuildInputs = with self; [ EasyProcess ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz";
-      sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";
-    };
-
-    meta = {
-      description = "Python wrapper for Xvfb, Xephyr and Xvnc";
-      homepage = "https://github.com/ponty/pyvirtualdisplay";
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [ layus ];
-    };
-  };
+  virtual-display = callPackage ../development/python-modules/virtual-display { };
 
   virtualenv = callPackage ../development/python-modules/virtualenv { };
 

From 5d7f24e8b5be46ff4cccb7e5954d9cf27cea907a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 22:14:04 +0100
Subject: [PATCH 0186/2266] pythonPackages.virtual-display: 0.1.5 -> 0.2.1 and
 disable tests

---
 .../development/python-modules/virtual-display/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix
index 0d559c8c88a..262d2a5d33a 100644
--- a/pkgs/development/python-modules/virtual-display/default.nix
+++ b/pkgs/development/python-modules/virtual-display/default.nix
@@ -2,15 +2,18 @@
 
 buildPythonPackage rec {
   pname = "PyVirtualDisplay";
-  version = "0.1.5";
+  version = "0.2.1";
 
   propagatedBuildInputs = [ EasyProcess ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";
+    sha256 = "012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982";
   };
 
+  # requires X server
+  doCheck = false;
+
   meta = with lib; {
     description = "Python wrapper for Xvfb, Xephyr and Xvnc";
     homepage = "https://github.com/ponty/pyvirtualdisplay";

From 34c87c1ac2375cdf5e075c32deff4364304a76f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 22:24:09 +0100
Subject: [PATCH 0187/2266] pythonPackages.txtorcon: remove superfluous patch

---
 pkgs/development/python-modules/txtorcon/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 2e7c07c74f3..09004e9337a 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -3,7 +3,6 @@
 , GeoIP}:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "txtorcon";
   version = "0.20.0";
 
@@ -19,13 +18,6 @@ buildPythonPackage rec {
     sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e";
   };
 
-  # ipaddress isn't required for Python 3 although it's in requirements.txt.
-  # Because ipaddress doesn't install on Python 3, remove the requirement so the
-  # installation of this package doesn't fail on Python 3.
-  postPatch = "" + lib.optionalString isPy3k ''
-    substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" ""
-  '';
-
   # Skip a failing test until fixed upstream:
   # https://github.com/meejah/txtorcon/issues/250
   checkPhase = ''

From cf5b06f9ce56b93cf0be6e21070a5d6618ad44e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 22:44:47 +0100
Subject: [PATCH 0188/2266] pythonPackages.tunigo: move expression

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

diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix
new file mode 100644
index 00000000000..14c7e101c0b
--- /dev/null
+++ b/pkgs/development/python-modules/tunigo/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, nose }:
+
+buildPythonPackage rec {
+  pname = "tunigo";
+  version = "1.0.0";
+
+  propagatedBuildInputs = [ requests ];
+
+  src = fetchFromGitHub {
+    owner = "trygveaa";
+    repo = "python-tunigo";
+    rev = "v${version}";
+    sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
+  };
+
+  checkInputs = [ mock nose ];
+
+  meta = with lib; {
+    description = "Python API for the browse feature of Spotify";
+    homepage = https://github.com/trygveaa/python-tunigo;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e5d5582d48..ddd47b9a882 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18299,26 +18299,7 @@ EOF
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
-  tunigo = buildPythonPackage rec {
-    name = "tunigo-${version}";
-    version = "1.0.0";
-    propagatedBuildInputs = with self; [ requests ];
-
-    src = pkgs.fetchFromGitHub {
-      owner = "trygveaa";
-      repo = "python-tunigo";
-      rev = "v${version}";
-      sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
-    };
-
-    buildInputs = with self; [ mock nose ];
-
-    meta = {
-      description = "Python API for the browse feature of Spotify";
-      homepage = https://github.com/trygveaa/python-tunigo;
-      license = licenses.asl20;
-    };
-  };
+  tunigo = callPackage ../development/python-modules/tunigo { };
 
   screenkey = buildPythonPackage rec {
     version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6";

From c5d6e665c9d7803a192449a81bc49f992a86a9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 22:46:38 +0100
Subject: [PATCH 0189/2266] pythonPackages.tunigo: fix tests

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

diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix
index 14c7e101c0b..767bb21f0fd 100644
--- a/pkgs/development/python-modules/tunigo/default.nix
+++ b/pkgs/development/python-modules/tunigo/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, responses, pytest }:
 
 buildPythonPackage rec {
   pname = "tunigo";
@@ -13,7 +13,11 @@ buildPythonPackage rec {
     sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
   };
 
-  checkInputs = [ mock nose ];
+  checkInputs = [ mock responses pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = with lib; {
     description = "Python API for the browse feature of Spotify";

From 9e29b4b2691f4521680909a30915ec4eadbb2c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 23:28:00 +0100
Subject: [PATCH 0190/2266] pythonPackages.tmdb3: move expression

---
 .../python-modules/tmdb3/default.nix           | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 16 +---------------
 2 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/tmdb3/default.nix

diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix
new file mode 100644
index 00000000000..0c71b9b6952
--- /dev/null
+++ b/pkgs/development/python-modules/tmdb3/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "tmdb3";
+  version = "0.6.17";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";
+  };
+
+  meta = with lib; {
+    description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
+    homepage = https://pypi.python.org/pypi/tmdb3;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ddd47b9a882..887001598f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16915,21 +16915,7 @@ in {
     };
   };
 
-  tmdb3 = buildPythonPackage rec {
-    name = "tmdb3-${version}";
-    version = "0.6.17";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tmdb3/${name}.zip";
-      sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";
-    };
-
-    meta = {
-      description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
-      homepage = https://pypi.python.org/pypi/tmdb3;
-      license = licenses.bsd3;
-    };
-  };
+  tmdb3 = callPackage ../development/python-modules/tmdb3 { };
 
   toolz = callPackage ../development/python-modules/toolz { };
 

From f76e8cb742abd76e86884f39c84150d7f7ce8e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 23:34:41 +0100
Subject: [PATCH 0191/2266] pythonPackages.tmdb3: 0.6.17 -> 0.7.2

---
 pkgs/development/python-modules/tmdb3/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix
index 0c71b9b6952..87b62cd78ac 100644
--- a/pkgs/development/python-modules/tmdb3/default.nix
+++ b/pkgs/development/python-modules/tmdb3/default.nix
@@ -2,14 +2,16 @@
 
 buildPythonPackage rec {
   pname = "tmdb3";
-  version = "0.6.17";
+  version = "0.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";
+    sha256 = "9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983";
   };
 
+  # no tests implemented
+  doCheck = false;
+
   meta = with lib; {
     description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
     homepage = https://pypi.python.org/pypi/tmdb3;

From 94baae5e6baa7bbe7f25c56e7ed802fc382eb4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 23:55:50 +0100
Subject: [PATCH 0192/2266] pythonPackages.wp_export_parser: uninit

Package is broken and umnaintained.
Upstream has not been updated since 2013.
---
 pkgs/top-level/python-packages.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 887001598f8..37949d37530 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21183,18 +21183,6 @@ EOF
 
   whitenoise = callPackage ../development/python-modules/whitenoise { };
 
-  wp_export_parser = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "wp_export_parser";
-    version = "1.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "RealGeeks";
-      repo = "wp_export_parser";
-      rev = "479211f6c5a7d034fd77762dfed381c3315cd773";
-      sha256 = "1ad0mkixc0s86djwsvhp1qlvcfs25086nh0qw7bys49gz8shczzi";
-    };
-  };
-
   XlsxWriter = callPackage ../development/python-modules/XlsxWriter { };
 
   yowsup = callPackage ../development/python-modules/yowsup { };

From 3836f7939bde474ac4ec418e82a661e63cf1dadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 28 Feb 2018 01:17:26 +0100
Subject: [PATCH 0193/2266] pythonPackages.pythondaemon: move expression

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

diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
new file mode 100644
index 00000000000..1327a7e398a
--- /dev/null
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, mock, testscenarios, docutils, lockfile }:
+
+buildPythonPackage rec {
+  pname = "python-daemon";
+  version = "2.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q";
+  };
+
+  # A test fail within chroot builds.
+  doCheck = false;
+
+  buildInputs = [ mock testscenarios ];
+  propagatedBuildInputs = [ docutils lockfile ];
+
+  meta = with lib; {
+    description = "Library to implement a well-behaved Unix daemon process";
+    homepage = https://alioth.debian.org/projects/python-daemon/;
+    license = [ licenses.gpl3Plus licenses.asl20 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37949d37530..cb689085574 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15841,27 +15841,7 @@ in {
       };
     in if isPy3k then py3 else py2;
 
-  pythondaemon = buildPythonPackage rec {
-    name = "python-daemon-${version}";
-    version = "2.1.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-daemon/${name}.tar.gz";
-      sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q";
-    };
-
-    # A test fail within chroot builds.
-    doCheck = false;
-
-    buildInputs = with self; [ mock testscenarios ];
-    propagatedBuildInputs = with self; [ docutils lockfile ];
-
-    meta = {
-      description = "Library to implement a well-behaved Unix daemon process";
-      homepage = https://alioth.debian.org/projects/python-daemon/;
-      license = [ licenses.gpl3Plus licenses.asl20 ];
-    };
-  };
+  pythondaemon = callPackage ../development/python-modules/python-daemon { };
 
   sympy = callPackage ../development/python-modules/sympy { };
 

From 920ef8a93cbef6bb865e56629b09ff4dd3676852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 28 Feb 2018 01:18:56 +0100
Subject: [PATCH 0194/2266] pythonPackages.pythondaemon: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 1327a7e398a..c44af185a10 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-daemon";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q";
+    sha256 = "261c859be5c12ae7d4286dc6951e87e9e1a70a882a8b41fd926efc1ec4214f73";
   };
 
   # A test fail within chroot builds.

From dff9d10fdb2739ccf6d8ac40b4bb3a09be12a536 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 07:57:18 -0800
Subject: [PATCH 0195/2266] nasm: 2.13.02 -> 2.13.03

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/nasm -h` got 0 exit code
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/nasm help` got 0 exit code
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/nasm -v` and found version 2.13.03
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/nasm --version` and found version 2.13.03
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/ndisasm -h` got 0 exit code
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/ndisasm help` got 0 exit code
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/ndisasm -V` and found version 2.13.03
- ran `/nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03/bin/ndisasm -v` and found version 2.13.03
- found 2.13.03 with grep in /nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03
- found 2.13.03 in filename of file in /nix/store/nppkg7zibkkfdsccavaxljl7x1svxvhj-nasm-2.13.03

cc "@pSub @willibutz"
---
 pkgs/development/compilers/nasm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 5394f2bcbbf..89dd7dc3fdc 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nasm-${version}";
-  version = "2.13.02";
+  version = "2.13.03";
 
   src = fetchurl {
     url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
-    sha256 = "1gmvjckxvkmx1kbglgrakc98qhy55xlqlk5flrdihz5yhv92hc4d";
+    sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
   };
 
   nativeBuildInputs = [ perl ];

From 1f3780135ea21b38610021bb6db4a2cd9488dd1a Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Tue, 20 Feb 2018 08:05:59 -0500
Subject: [PATCH 0196/2266] perlPackages.POE: init at 1.367

Note that I encountered bugs as part of this effort as documented in
the following github PRs and CPAN bug tickets:

    https://github.com/rcaputo/poe/pull/25
    https://rt.cpan.org/Ticket/Display.html?id=124495
	POE-1.367 failed t/10_units/01_pod/03_pod_no404s.t

    https://github.com/rcaputo/poe/pull/26
    https://rt.cpan.org/Ticket/Display.html?id=124496
	POE-1.367 failed t/10_units/01_pod/04_pod_linkcheck.t

... and these bugs are addressed by the perl-POE-1.367-pod_no404s.patch
and perl-POE-1.367-pod_linkcheck.patch files included with this patch,
respectively.
---
 .../perl-POE-1.367-pod_linkcheck.patch        | 40 ++++++++++++++++
 .../perl-POE-1.367-pod_no404s.patch           | 46 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              | 41 +++++++++++++++++
 3 files changed, 127 insertions(+)
 create mode 100644 pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
 create mode 100644 pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch

diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
new file mode 100644
index 00000000000..e2f604985be
--- /dev/null
+++ b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
@@ -0,0 +1,40 @@
+commit 6d985026
+Author: Michael Brantley <limeytexan@gmail.com>
+Date:   Tue Feb 20 07:12:06 2018 -0500
+
+    Update broken Pod links in lib/POE/Filter/HTTPD.pm
+    
+    Update Pod links to refer only to the utf8 module and not its methods,
+    fix a mis-capitalized internal reference, and convert the dangling
+    "MaxContent" link into a code reference.
+    
+    Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124496
+
+diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm
+index 9d4898e3..517be691 100644
+--- a/lib/POE/Filter/HTTPD.pm
++++ b/lib/POE/Filter/HTTPD.pm
+@@ -621,10 +621,10 @@ how to use these objects.
+ 
+ HTTP headers are not allowed to have UTF-8 characters; they must be
+ ISO-8859-1.  POE::Filter::HTTPD will convert all UTF-8 into the MIME encoded
+-equivalent.  It uses L<utf8::is_utf8> for detection-8 and
++equivalent.  It uses C<utf8::is_utf8> for detection-8 and
+ L<Email::MIME::RFC2047::Encoder> for convertion.  If L<utf8> is not
+ installed, no conversion happens.  If L<Email::MIME::RFC2047::Encoder> is
+-not installed, L<utf8::downgrade> is used instead.  In this last case, you will
++not installed, C<utf8::downgrade> is used instead.  In this last case, you will
+ see a warning if you try to send UTF-8 headers.
+ 
+ 
+@@ -651,8 +651,8 @@ streaming mode this filter will return either an HTTP::Request object or a
+ block of content.  The HTTP::Request object's content will return empty. 
+ The blocks of content will be parts of the request's body, up to
+ Content-Length in size.  You distinguish between request objects and content
+-blocks using C<Scalar::Util/bless> (See L</Streaming request> below).  This
+-option supersedes L</MaxContent>.
++blocks using C<Scalar::Util/bless> (See L</Streaming Request> below).  This
++option supersedes C<MaxContent>.
+ 
+ =head1 CAVEATS
+ 
diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
new file mode 100644
index 00000000000..097a7677e51
--- /dev/null
+++ b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
@@ -0,0 +1,46 @@
+commit 32571a21
+Author: Michael Brantley <limeytexan@gmail.com>
+Date:   Tue Feb 20 07:07:22 2018 -0500
+
+    Update old URLs referenced in Pod
+    
+    Remove mention of old URLs, replace mention of canonical SVN repo with
+    the new git-based one at github.com.
+    
+    Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124495
+
+diff --git a/lib/POE.pm b/lib/POE.pm
+index 80e7feac..0554ff70 100644
+--- a/lib/POE.pm
++++ b/lib/POE.pm
+@@ -465,7 +465,7 @@ code snippets there as well.
+ The following command will fetch the most current version of POE into
+ the "poe" subdirectory:
+ 
+-  svn co https://poe.svn.sourceforge.net/svnroot/poe poe
++  git clone https://github.com/rcaputo/poe.git
+ 
+ =head2 SourceForge
+ 
+@@ -535,18 +535,9 @@ https://rt.cpan.org/Dist/Display.html?Status=Active&Queue=POE
+ 
+ =head2 Repositories and Changes
+ 
+-Thanks to the magic of distributed version control, POE is hosted at
+-three locations for redundancy.  You can browse the source at any one
+-of:
+-
+-https://github.com/rcaputo/poe
+-
+-https://gitorious.org/poe
+-
+-http://poe.git.sourceforge.net/git/gitweb-index.cgi
+-
+-Complete change logs can also be browsed at those sites.  They all
+-provide RSS news feeds for those who want to follow development in
++You can browse the POE source and complete change logs at
++https://github.com/rcaputo/poe. It also provides an RSS
++news feed for those who want to follow development in
+ near-realtime.
+ 
+ =head2 Other Resources
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 815bf73210f..f0d6e788861 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11375,6 +11375,47 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  POE = buildPerlPackage rec {
+    name = "POE-1.367";
+    patches = [
+      ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
+      ../development/perl-modules/perl-POE-1.367-pod_no404s.patch
+    ];
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz";
+      sha256 = "0b9s7yxaa2lgzyi56brgygycfjk7lz33d1ddvc1wvwwvm45p4wmp";
+    };
+    # N.B. removing TestPodLinkCheck from buildInputs because tests requiring
+    # this module don't disable themselves when "run_network_tests" is
+    # not present (see below).
+    buildInputs = [
+      Curses EmailMIME HTTPMessage IOTty LWPProtocolHttps POETestLoops
+      TermReadKey TestPod TestPodCoverage TestPodNo404s YAML
+    ];
+    propagatedBuildInputs = [ pkgs.cacert IOPipely ];
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "Portable multitasking and networking framework for any event loop";
+      license = stdenv.lib.licenses.artistic2;
+    };
+    preCheck = ''
+      set -x
+
+      : Makefile.PL touches the following file as a "marker" to indicate
+      : it should perform tests which use the network. Delete this file
+      : for sandbox builds.
+      rm -f run_network_tests
+
+      : Certs are required if not running in a sandbox.
+      export SSL_CERT_FILE=${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt
+
+      : The following flag enables extra tests not normally performed.
+      export RELEASE_TESTING=1
+
+      set +x
+    '';
+  };
+
   POETestLoops = buildPerlPackage rec {
     name = "POE-Test-Loops-1.360";
     src = fetchurl {

From 085bfcefb908fb503a16bd8fba9d4f5ba82d37ad Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 12:50:13 -0500
Subject: [PATCH 0197/2266] utillinux: Fix cross-compiling when building with
 systemd

---
 pkgs/os-specific/linux/util-linux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index e8a2b342849..618ba42e741 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -30,7 +30,8 @@ in stdenv.mkDerivation rec {
 
   crossAttrs = {
     # Work around use of `AC_RUN_IFELSE'.
-    preConfigure = "export scanf_cv_type_modifier=ms";
+    preConfigure = "export scanf_cv_type_modifier=ms" + lib.optionalString (systemd != null)
+      "\nconfigureFlags+=\" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/\"";
   };
 
   preConfigure = lib.optionalString (systemd != null) ''

From a1e219e56245e46bbb68096c7a64cf0ac66ff4ec Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 17:27:48 -0500
Subject: [PATCH 0198/2266] bind: Fix cross-compilation

---
 pkgs/servers/dns/bind/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index c0176db1576..e2262cdb7c8 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
-, enableSeccomp ? false, libseccomp ? null }:
+, enableSeccomp ? false, libseccomp ? null, buildPackages
+}:
 
 assert enableSeccomp -> libseccomp != null;
 
@@ -13,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9";
   };
 
+  preConfigure = "export AR=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}ar";
+
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
 
   patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
@@ -24,6 +27,10 @@ stdenv.mkDerivation rec {
 
   STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase
 
+  BUILD_CC = "cc";
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--with-libtool"
@@ -39,6 +46,11 @@ stdenv.mkDerivation rec {
     "--without-pkcs11"
     "--without-purify"
     "--without-python"
+    "--with-randomdev=/dev/random"
+    "--with-ecdsa"
+    "--with-gost"
+    "--without-eddsa"
+    "--with-aes"
   ] ++ lib.optional enableSeccomp "--enable-seccomp";
 
   postInstall = ''

From a5bb01b15310d91ef2e6906dc8f234e9f09841e2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 17:37:02 -0500
Subject: [PATCH 0199/2266] libaio: Add generic cross-compilation patch

---
 pkgs/os-specific/linux/libaio/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index 1e85182d6c3..e2be136adee 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "0.3.110";
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
   };
 
+  patches = [ (fetchpatch {
+    url = https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch;
+    sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c";
+  }) ];
+
   makeFlags = "prefix=$(out)";
 
   hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector";

From 1f2701379a1f4471aa8a4ce85cee1600679aa4d9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 17:58:09 -0500
Subject: [PATCH 0200/2266] boost: Fix cross-compilation

---
 pkgs/development/libraries/boost/1.66.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix
index 3fd9c160824..02cf511a6fd 100644
--- a/pkgs/development/libraries/boost/1.66.nix
+++ b/pkgs/development/libraries/boost/1.66.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
+{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.66_0";
@@ -9,4 +9,5 @@ callPackage ./generic.nix (args // rec {
     sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
   };
 
+  toolset = if stdenv.cc.isClang then "clang" else null;
 })

From 0221112542508a3f6d74d7febe61162de0b1ab95 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 18:11:17 -0500
Subject: [PATCH 0201/2266] iputils: Fix cross compile

---
 pkgs/os-specific/linux/iputils/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index a7fbcce3175..3fc4f3b2377 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -24,16 +24,21 @@ stdenv.mkDerivation rec {
   # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111
   makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no";
 
+  depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ];
   buildInputs = [
-    libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt nettle
+    libsysfs openssl libcap libgcrypt nettle
   ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn;
 
-  buildFlags = "man all ninfod";
+  # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure...
+  buildFlags = "man all" + stdenv.lib.optionalString (!stdenv.isCross) " ninfod";
 
   installPhase =
     ''
       mkdir -p $out/bin
-      cp -p ping tracepath clockdiff arping rdisc ninfod/ninfod $out/bin/
+      cp -p ping tracepath clockdiff arping rdisc $out/bin/
+      if [ -x ninfod/ninfod ]; then
+        cp -p ninfod/ninfod $out/bin
+      fi
 
       mkdir -p $out/share/man/man8
       cp -p \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6cd3e3f5f7..ef629d09292 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12994,7 +12994,7 @@ with pkgs;
   iproute = callPackage ../os-specific/linux/iproute { };
 
   iputils = callPackage ../os-specific/linux/iputils {
-    inherit (perlPackages) SGMLSpm;
+    inherit (buildPackages.buildPackages.perlPackages) SGMLSpm;
   };
 
   iptables = callPackage ../os-specific/linux/iptables { };

From 5815c7dfa648e5249cd2b26e9a6507ed398a53b8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 18:13:16 -0500
Subject: [PATCH 0202/2266] sudo: Fix cross compilation

---
 pkgs/tools/security/sudo/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 1edd5b60926..85dba08255d 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
     installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy"
     '';
 
-  buildInputs = [ coreutils pam groff ];
+  nativeBuildInputs = [ groff ];
+  buildInputs = [ pam ];
 
   enableParallelBuilding = true;
 

From d61a22fb0e5f48f7559e1ff91dad228a37d6cb9e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 20:31:15 -0500
Subject: [PATCH 0203/2266] strace: Fix cross-compilation

---
 pkgs/development/libraries/libunwind/default.nix | 2 ++
 pkgs/development/tools/misc/strace/default.nix   | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 6afdac3fdf5..b901d352808 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -33,4 +33,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.mit;
   };
+
+  passthru.supportsHost = !stdenv.hostPlatform.isRiscV;
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 80d1a75e801..f5da3f9daa4 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libunwind }:
+{ stdenv, fetchurl, perl, libunwind, buildPackages }:
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
@@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw";
   };
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
 
-  buildInputs = [ libunwind ]; # support -k
+  buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k
 
-  configureFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 "--enable-mpers=check";
+  configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
 
   meta = with stdenv.lib; {
     homepage = http://strace.io/;

From a92930128145113d3a7d1eb91c449dc7bb7cc455 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 20:34:13 -0500
Subject: [PATCH 0204/2266] nixos: kexec: Disable on non-keexecable systems.

---
 nixos/modules/system/boot/kexec.nix | 37 +++++++++++++++--------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index b7821f9509f..14ebe66e632 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,21 +1,22 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  environment.systemPackages = [ pkgs.kexectools ];
+  config = lib.mkIf (pkgs.kexectools != null) {
+    environment.systemPackages = [ pkgs.kexectools ];
 
-  systemd.services."prepare-kexec" =
-    { description = "Preparation for kexec";
-      wantedBy = [ "kexec.target" ];
-      before = [ "systemd-kexec.service" ];
-      unitConfig.DefaultDependencies = false;
-      serviceConfig.Type = "oneshot";
-      path = [ pkgs.kexectools ];
-      script =
-        ''
-          p=$(readlink -f /nix/var/nix/profiles/system)
-          if ! [ -d $p ]; then exit 1; fi
-          exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
-        '';
-    };
-
-}
\ No newline at end of file
+    systemd.services."prepare-kexec" =
+      { description = "Preparation for kexec";
+        wantedBy = [ "kexec.target" ];
+        before = [ "systemd-kexec.service" ];
+        unitConfig.DefaultDependencies = false;
+        serviceConfig.Type = "oneshot";
+        path = [ pkgs.kexectools ];
+        script =
+          ''
+            p=$(readlink -f /nix/var/nix/profiles/system)
+            if ! [ -d $p ]; then exit 1; fi
+            exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
+          '';
+      };
+  };
+}

From c0e814a434fe570282a67f8e27768cab57bba732 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 20:34:41 -0500
Subject: [PATCH 0205/2266] nixos: udev: Generate hwdb with build-native
 udevadm.

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

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 9f42f9e59ad..7bfc3bb6487 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -146,7 +146,7 @@ let
 
       echo "Generating hwdb database..."
       # hwdb --update doesn't return error code even on errors!
-      res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
+      res="$(${pkgs.buildPackages.udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
       echo "$res"
       [ -z "$(echo "$res" | egrep '^Error')" ]
       mv etc/udev/hwdb.bin $out

From ed5bd8ad4997424f492dedac45da9f57532c6827 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 20:58:38 -0500
Subject: [PATCH 0206/2266] fuse: Fix cross-compilation

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

diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index b9ac015f459..a10a4f466c7 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -4,6 +4,7 @@
 , fusePackages, utillinux, gettext
 , autoconf, automake, libtool
 , meson, ninja, pkgconfig
+, autoreconfHook
 }:
 
 let
@@ -18,6 +19,8 @@ in stdenv.mkDerivation rec {
     sha256 = sha256Hash;
   };
 
+  preAutoreconf = "touch config.rpath";
+
   patches =
     stdenv.lib.optional
       (!isFuse3 && stdenv.isAarch64)
@@ -30,8 +33,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = if isFuse3
     then [ meson ninja pkgconfig ]
-    else [ autoconf automake libtool ];
-  buildInputs = stdenv.lib.optional (!isFuse3) gettext;
+    else [ autoreconfHook gettext ];
 
   outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
 

From aebb024b2f35d826f99d3e97caeff8522ff6e3c7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 21:01:15 -0500
Subject: [PATCH 0207/2266] nixos: Take glibcLocales from buildPackages.

No need to cross-compile pure data...
---
 nixos/modules/config/i18n.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 46b22fc1285..6bf8c653e11 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -10,7 +10,7 @@ with lib;
     i18n = {
       glibcLocales = mkOption {
         type = types.path;
-        default = pkgs.glibcLocales.override {
+        default = pkgs.buildPackages.glibcLocales.override {
           allLocales = any (x: x == "all") config.i18n.supportedLocales;
           locales = config.i18n.supportedLocales;
         };

From b28cb729080e42fc9f8cc7ae29f1c1d8070b5d5a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 21:05:41 -0500
Subject: [PATCH 0208/2266] nixos: stage-1: Don't try to test binaries when
 cross-compiling.

---
 nixos/modules/system/boot/stage-1.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index df450be8c40..c23b54ee65f 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -37,7 +37,7 @@ let
   # we just copy what we need from Glibc and use patchelf to make it
   # work.
   extraUtils = pkgs.runCommandCC "extra-utils"
-    { buildInputs = [pkgs.nukeReferences];
+    { nativeBuildInputs = [pkgs.buildPackages.nukeReferences];
       allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
     }
     ''
@@ -132,6 +132,7 @@ let
         fi
       done
 
+      if [ -z "${toString pkgs.stdenv.isCross}" ]; then
       # Make sure that the patchelf'ed binaries still work.
       echo "testing patched programs..."
       $out/bin/ash -c 'echo hello world' | grep "hello world"
@@ -144,6 +145,7 @@ let
       $out/bin/mdadm --version
 
       ${config.boot.initrd.extraUtilsCommandsTest}
+      fi
     ''; # */
 
 

From cc81202293a3cdd9a9bec58f8e2bf942d4539c74 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 21:14:48 -0500
Subject: [PATCH 0209/2266] nixos: initrd-kmod-blacklist-ubuntu: Fix
 cross-compilation.

---
 nixos/modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index c23b54ee65f..494780f1748 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -247,7 +247,7 @@ let
             { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; }
             ''
               target=$out
-              ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
+              ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
             '';
           symlink = "/etc/modprobe.d/ubuntu.conf";
         }

From 6a32291523a92d6b1b763e8e8198a99214a874c2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 21:17:49 -0500
Subject: [PATCH 0210/2266] makeModulesClosure: Fix cross-compilation

---
 pkgs/build-support/kernel/modules-closure.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index a527770adcd..d82e279799b 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -9,7 +9,7 @@
 stdenvNoCC.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
-  buildInputs = [ nukeReferences kmod ];
+  nativeBuildInputs = [ nukeReferences kmod ];
   inherit kernel firmware rootModules allowMissing;
   allowedReferences = ["out"];
 }

From 8e6520540e6ab0ce5d265cf4bcf68bf8e4ec64a5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 21:19:12 -0500
Subject: [PATCH 0211/2266] nixos: keymap: Fix cross-compilation.

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

diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 7fb3cbc5c1b..fbe42b8e8f0 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -13,7 +13,7 @@ let
   isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);
 
   optimizedKeymap = pkgs.runCommand "keymap" {
-    nativeBuildInputs = [ pkgs.kbd ];
+    nativeBuildInputs = [ pkgs.buildPackages.kbd ];
     LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**";
   } ''
     loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out

From 306d5cdf03ad6375861a20b8885ef38699ca3c23 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 12:00:03 -0500
Subject: [PATCH 0212/2266] perlPackages: Add cross-compilation support.

This involved:

* Installing miniperl as $dev/bin/perl
* Setting miniperl to take INC from
  lib/perl5/{site_perl/,}cross_perl/${version} as well as
  lib/perl5/{site_perl/,}/${version}/${runtimeArch}, in that
  order. miniperl taking from runtimeArch is not really correct, but
  it works in some pure-perl cases (e.g. Config.pm) and can be
  overridden with the cross_perl variant.
* Installing perl-cross's stubs into
  $dev/lib/perl5/cross_perl/${version}
* Patching MakeMaker.pm to gracefully degrade (very slightly) if B.pm
  can't be loaded, which it can't in cross-compilation.
* Passing the right build-time and runtime perls to Makefile.PL
---
 doc/languages-frameworks/perl.xml             | 13 +++++++
 .../interpreters/perl/MakeMaker-cross.patch   | 17 ++++++++
 .../development/interpreters/perl/default.nix | 39 +++++++++++++++++--
 .../interpreters/perl/setup-hook-cross.sh     | 12 ++++++
 .../perl-modules/generic/builder.sh           |  2 +-
 .../perl-modules/generic/default.nix          |  5 ++-
 6 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/interpreters/perl/MakeMaker-cross.patch
 create mode 100644 pkgs/development/interpreters/perl/setup-hook-cross.sh

diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index dfb463b9991..7f219b8b09d 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -177,5 +177,18 @@ you need it.</para>
 
 </section>
 
+<section xml:id="ssec-perl-cross-compilation"><title>Cross-compiling modules</title>
+
+<para>Nixpkgs has experimental support for cross-compiling Perl
+modules. In many cases, it will just work out of the box, even for
+modules with native extensions. Sometimes, however, the Makefile.PL
+for a module may (indirectly) import a native module. In that case,
+you will need to make a stub for that module that will satisfy the
+Makefile.PL and install it into
+<filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>.
+</para>
+
+</section>
+
 </section>
 
diff --git a/pkgs/development/interpreters/perl/MakeMaker-cross.patch b/pkgs/development/interpreters/perl/MakeMaker-cross.patch
new file mode 100644
index 00000000000..40626c51f9b
--- /dev/null
+++ b/pkgs/development/interpreters/perl/MakeMaker-cross.patch
@@ -0,0 +1,17 @@
+diff -Naur a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm	2017-06-30 17:03:20.000000000 -0400
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm	2018-02-28 10:06:37.031237946 -0500
+@@ -1267,7 +1267,12 @@
+     my $value = shift;
+     return $value if $UNDER_CORE;
+     my $tvalue = '';
+-    require B;
++    eval {
++        require B;
++    };
++    if ($@) {
++        return $tvalue;
++    }
+     my $sv = B::svref_2object(\$value);
+     my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
+     while ( $magic ) {
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f7324fc6d01..0fd55bd8d71 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc, fetchpatch }:
+{ lib, stdenv, fetchurlBoot, buildPackages
+, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper
+}:
 
 with lib;
 
@@ -29,7 +31,8 @@ let
     };
 
     # TODO: Add a "dev" output containing the header files.
-    outputs = [ "out" "man" "devdoc" ];
+    outputs = [ "out" "man" "devdoc" ] ++
+      stdenv.lib.optional crossCompiling "dev";
     setOutputFlags = false;
 
     patches =
@@ -45,7 +48,8 @@ let
         })
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optional stdenv.isDarwin ./cpp-precomp.patch
-      ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch;
+      ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch
+      ++ optional crossCompiling ./MakeMaker-cross.patch;
 
     postPatch = ''
       pwd="$(type -P pwd)"
@@ -117,6 +121,28 @@ let
               if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
             }" /no-such-path \
           --replace "$man" /no-such-path
+      '' + stdenv.lib.optionalString crossCompiling
+      ''
+        mkdir -p $dev/lib/perl5/cross_perl/${version}
+        for dir in cnf/{stub,cpan}; do
+          cp -r $dir/* $dev/lib/perl5/cross_perl/${version}
+        done
+
+        mkdir -p $dev/bin
+        install -m755 miniperl $dev/bin/perl
+
+        export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})"
+        # wrapProgram should use a runtime-native SHELL by default, but
+        # it actually uses a buildtime-native one. If we ever fix that,
+        # we'll need to fix this to use a buildtime-native one.
+        #
+        # Adding the arch-specific directory is morally incorrect, as
+        # miniperl can't load the native modules there. However, it can
+        # (and sometimes needs to) load and run some of the pure perl
+        # code there, so we add it anyway. When needed, stubs can be put
+        # into $dev/lib/perl5/cross_perl/${version}.
+        wrapProgram $dev/bin/perl --prefix PERL5LIB : \
+          "$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"
       ''; # */
 
     meta = {
@@ -139,7 +165,7 @@ let
       sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";
     };
 
-    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
 
     postUnpack = ''
       unpackFile ${perl-cross-src}
@@ -150,6 +176,11 @@ let
     '';
 
     configurePlatforms = [ "build" "host" "target" ];
+
+    inherit version;
+
+    # TODO merge setup hooks
+    setupHook = ./setup-hook-cross.sh;
   });
 in rec {
   perl = perl524;
diff --git a/pkgs/development/interpreters/perl/setup-hook-cross.sh b/pkgs/development/interpreters/perl/setup-hook-cross.sh
new file mode 100644
index 00000000000..95aae0b2670
--- /dev/null
+++ b/pkgs/development/interpreters/perl/setup-hook-cross.sh
@@ -0,0 +1,12 @@
+addPerlLibPath () {
+    addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@
+    addToSearchPath PERL5LIB $1/lib/perl5/site_perl/cross_perl/@version@
+    # Adding the arch-specific directory is morally incorrect, as
+    # miniperl can't load the native modules there. However, it can
+    # (and sometimes needs to) load and run some of the pure perl
+    # code there, so we add it anyway. When needed, stubs can be put
+    # into $1/lib/perl5/site_perl/cross_perl/@version@
+    addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@/@runtimeArch@
+}
+
+addEnvHooks "$targetOffset" addPerlLibPath
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 1b8888dd3ce..937dad971b8 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -22,7 +22,7 @@ preConfigure() {
         fi
     done
 
-    perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags
+    perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=$perl/bin/perl
 }
 
 
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 9e21a141c72..b33861d83ee 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -1,6 +1,6 @@
 perl:
 
-{ buildInputs ? [], name, ... } @ attrs:
+{ nativeBuildInputs ? [], name, ... } @ attrs:
 
 perl.stdenv.mkDerivation (
   {
@@ -27,6 +27,7 @@ perl.stdenv.mkDerivation (
   {
     name = "perl-" + name;
     builder = ./builder.sh;
-    buildInputs = buildInputs ++ [ perl ];
+    nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
+    inherit perl;
   }
 )

From dd6c92636242550d50c61e1e9fd0180618d415b8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 12:09:14 -0500
Subject: [PATCH 0213/2266] perlPackages.DBI: Stub out dbd_postamble for
 cross-compilation.

---
 doc/languages-frameworks/perl.xml |  3 ++-
 pkgs/top-level/perl-packages.nix  | 41 ++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index 7f219b8b09d..149fcb275a0 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -186,7 +186,8 @@ for a module may (indirectly) import a native module. In that case,
 you will need to make a stub for that module that will satisfy the
 Makefile.PL and install it into
 <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>.
-</para>
+See the <varname>postInstall</varname> for <varname>DBI</varname> for
+an example.</para>
 
 </section>
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 815bf73210f..c92a5572178 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3835,11 +3835,50 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBI = buildPerlPackage rec {
-    name = "DBI-1.636";
+    name = "DBI-${version}";
+    version = "1.6.36";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz";
       sha256 = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c";
     };
+    postInstall = stdenv.lib.optionalString (perl ? crossVersion) ''
+      mkdir -p $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI
+      cat > $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI.pm <<EOF
+      package DBI;
+      BEGIN {
+      our \$VERSION = "$version";
+      }
+      1;
+      EOF
+
+      autodir=$(echo $out/lib/perl5/site_perl/${perl.version}/*/auto/DBI)
+      cat > $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI/DBD.pm <<EOF
+      package DBI::DBD;
+      use Exporter ();
+      use vars qw (@ISA @EXPORT);
+      @ISA = qw(Exporter);
+      @EXPORT = qw(dbd_postamble);
+      sub dbd_postamble {
+          return '
+      # --- This section was generated by DBI::DBD::dbd_postamble()
+      DBI_INSTARCH_DIR=$autodir
+      DBI_DRIVER_XST=$autodir/Driver.xst
+
+      # The main dependency (technically correct but probably not used)
+      \$(BASEEXT).c: \$(BASEEXT).xsi
+
+      # This dependency is needed since MakeMaker uses the .xs.o rule
+      \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi
+
+      \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h
+      	\$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi
+
+      # ---
+      ';
+      }
+      1;
+      EOF
+    '';
     meta = {
       homepage = http://dbi.perl.org/;
       description = "Database independent interface for Perl";

From b0d6c67505e1df13220c29970cd16e24873f986b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 12:10:11 -0500
Subject: [PATCH 0214/2266] perlPackages.JSON: Fix cross-compilation.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c92a5572178..39a7a55b30b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7646,6 +7646,13 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz;
       sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd";
     };
+    preConfigure = ''
+      cp lib/JSON/backportPP.pm{,orig}
+      echo "1;" > lib/JSON/backportPP.pm
+    '';
+    postConfigure = ''
+      cp lib/JSON/backportPP.pm{,orig}
+    '';
     buildInputs = [ TestPod ];
     meta = {
       description = "JSON (JavaScript Object Notation) encoder/decoder";

From fe406d66b24e528e6775fd0f5684cb02a6699849 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 14:37:26 -0500
Subject: [PATCH 0215/2266] nixos: sudo: Use build-time visudo for syntax
 check.

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

diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index a57f14bb5ae..e0ec77a2959 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -215,7 +215,7 @@ in
           { src = pkgs.writeText "sudoers-in" cfg.configFile; }
           # Make sure that the sudoers file is syntactically valid.
           # (currently disabled - NIXOS-66)
-          "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+          "${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out";
         target = "sudoers";
         mode = "0440";
       };

From e51a76ce730e2193f0ee12164eb79f242297a443 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 14:40:49 -0500
Subject: [PATCH 0216/2266] make-dbus-conf: Fix cross-compilation.

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

diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index 71da22ee374..c3c41b74f09 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -24,16 +24,17 @@ runCommand "dbus-1"
           rewritePrefix="file://${dbus}/share/xml/dbus/"/>
       </catalog>
     '';
+    nativeBuildInputs = [ libxslt ];
   }
   ''
     mkdir -p $out
 
-    ${libxslt.bin}/bin/xsltproc --nonet \
+    xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
       --stringparam suidHelper "$suidHelper" \
       ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
       > $out/system.conf
-    ${libxslt.bin}/bin/xsltproc --nonet \
+    xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
       ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
       > $out/session.conf

From 942855c8bd01dd0c571eb7b10859d9225445502a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 14:50:17 -0500
Subject: [PATCH 0217/2266] tzdata: Fix cross-compilation

---
 pkgs/data/misc/tzdata/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index ada2ed997da..6c8fd6229a3 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, buildPackages }:
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -28,8 +28,23 @@ stdenv.mkDerivation rec {
     "MANDIR=$(man)/share/man"
     "AWK=awk"
     "CFLAGS=-DHAVE_LINK=0"
+    "cc=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
   ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  installFlags = [ "ZIC=./zic-native" ];
+
+  preInstall = ''
+     mv zic.o zic.o.orig
+     mv zic zic.orig
+     make $makeFlags cc=cc AR=ar zic
+     mv zic zic-native
+     mv zic.o.orig zic.o
+     mv zic.orig zic
+  '';
+
   postInstall =
     ''
       rm $out/share/zoneinfo-posix

From 4e207ba1df211c872fd5aab30f575578a8bfff03 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 28 Feb 2018 14:37:20 -0600
Subject: [PATCH 0218/2266] qt5: install headers on darwin also

---
 .../qt-5/5.10/restore-pc-files.patch          | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
index a2355549d4a..a012c3f583e 100644
--- a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
+++ b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
@@ -1,15 +1,27 @@
-Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
-
-diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf
-index bb28af97..36bb6483 100644
---- i/mkspecs/features/qt_module.prf
-+++ w/mkspecs/features/qt_module.prf
-@@ -245,7 +245,7 @@ load(qt_installs)
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index e6a0d97f1a..b50ce77d51 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -266,7 +266,7 @@ load(qt_installs)
  load(qt_targets)
-
+ 
  # this builds on top of qt_common
 -!internal_module:!lib_bundle:if(unix|mingw) {
 +!internal_module:if(unix|mingw) {
      CONFIG += create_pc
      QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-     host_build: \
\ No newline at end of file
+     host_build: \
+diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
+index 62b88c6fe2..f302f1e202 100644
+--- a/mkspecs/features/qt_module_headers.prf
++++ b/mkspecs/features/qt_module_headers.prf
+@@ -102,8 +102,7 @@ git_build: \
+ else: \
+     INC_PATH = $$MODULE_BASE_INDIR
+ include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
+-!lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.
+-    CONFIG += qt_install_headers
++CONFIG += qt_install_headers
+ 
+ alien_syncqt: return()
+ 

From babb7be8b8617dc612c56b90d119c5958882af32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Wed, 28 Feb 2018 16:03:41 +0100
Subject: [PATCH 0219/2266] gawk: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 6783158ca77..c0c06813dc9 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -19,11 +19,11 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "gawk-4.2.0";
+  name = "gawk-4.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "1wm9lqj77y7xz07zi0n187aqm8zavzxzpm1j53ahxz81q0qwvwyl";
+    sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi";
   };
 
   # When we do build separate interactive version, it makes sense to always include man.

From 1ad37a8c6e627f8650a7c9c41e38a358146db860 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Feb 2018 19:22:29 -0500
Subject: [PATCH 0220/2266] texlive.bin: Fix duplicate patch definition

---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 1dd7072f4c5..8318ad2afe9 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -161,7 +161,7 @@ inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
   name = "texlive-core-big.bin-${version}";
 
-  inherit (common) src patches;
+  inherit (common) src;
 
   hardeningDisable = [ "format" ];
 
@@ -176,7 +176,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
         # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
       ];
 
-  patches = [ ./luatex-gcc7.patch ];
+  patches = common.patches ++ [ ./luatex-gcc7.patch ];
 
   configureScript = ":";
 

From bcc04c75f8f3d82cd1a86bec6af21daa42e09385 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 22:16:34 -0800
Subject: [PATCH 0221/2266] lzip: 1.19 -> 1.20

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -h` got 0 exit code
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --help` got 0 exit code
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -V` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --version` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -h` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --help` and found version 1.20
- found 1.20 with grep in /nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20
- found 1.20 in filename of file in /nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20
---
 pkgs/tools/compression/lzip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index 2f6f9aca432..25d09e6e947 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lzip-${version}";
-  version = "1.19";
+  version = "1.20";
 
   buildInputs = [ texinfo ];
 
   src = fetchurl {
     url = "mirror://savannah/lzip/${name}.tar.gz";
-    sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";
+    sha256 = "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9";
   };
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++";

From c54730dde8861b9baf68a25096f4a1ae896a63a7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 07:36:36 -0500
Subject: [PATCH 0222/2266] gobjectIntrospection: Enable building without X11
 support.

Also disable it when noXlibs in NixOS.
---
 nixos/modules/config/no-x-libs.nix                          | 1 +
 .../development/libraries/gobject-introspection/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index d8980944adc..b9d5b2b903e 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -36,6 +36,7 @@ with lib;
       networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
       networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
       pinentry = pkgs.pinentry_ncurses;
+      gobjectIntrospection = pkgs.gobjectIntrospection.override { x11Support = false; };
     };
   };
 }
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 870f77686b3..387ecc1b6cf 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
 , libintlOrEmpty, cctools, cairo
 , substituteAll, nixStoreDir ? builtins.storeDir
+, x11Support ? true
 }:
 # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
 # it may be worth thinking about using multiple derivation outputs
@@ -43,12 +44,11 @@ stdenv.mkDerivation rec {
       src = ./absolute_shlib_path.patch;
       inherit nixStoreDir;
     })
-    # https://github.com/NixOS/nixpkgs/issues/34080
+  ] ++ stdenv.lib.optional x11Support # https://github.com/NixOS/nixpkgs/issues/34080
     (substituteAll {
       src = ./absolute_gir_path.patch;
       cairoLib = "${getLib cairo}/lib";
-    })
-  ];
+    });
 
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";

From bcb1bb5c11b311b08bb8326e1bf2760c5500d2ea Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 09:11:07 -0500
Subject: [PATCH 0223/2266] groff: Fix cross-compilation

---
 pkgs/tools/text/groff/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 6d01c42f93d..4495a85b288 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals (ghostscript != null) [
     "--with-gs=${ghostscript}/bin/gs"
   ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "ac_cv_path_PERL=${perl}/bin/perl"
+    "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
   ];
 
   doCheck = true;
@@ -103,6 +103,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $perl/bin/grog \
       --replace $out/lib/groff/grog $perl/lib/groff/grog
 
+  '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|'
   '';
 
   meta = with stdenv.lib; {

From 559c79d7b7810308762aa525e05dcfb1115d929c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 8 Jan 2018 10:33:59 -0600
Subject: [PATCH 0224/2266] dhcp: 4.3.4 -> 4.3.6

---
 pkgs/tools/networking/dhcp/default.nix        | 10 +--
 pkgs/tools/networking/dhcp/flush-if.patch     | 76 -------------------
 pkgs/tools/networking/dhcp/set-hostname.patch | 24 +++---
 3 files changed, 14 insertions(+), 96 deletions(-)
 delete mode 100644 pkgs/tools/networking/dhcp/flush-if.patch

diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 1812e95dcbb..c6ad737ce1f 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,19 +4,15 @@
 
 stdenv.mkDerivation rec {
   name = "dhcp-${version}";
-  version = "4.3.4";
+  version = "4.3.6";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
-    sha256 = "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm";
+    sha256 = "06vgxhm6agzkp6r1jy10467vrfw2rzcp2mnkcph7ydziciisy7m4";
   };
 
   patches =
-    [ # Don't bring down interfaces, because wpa_supplicant doesn't
-      # recover when the wlan interface goes down.  Instead just flush
-      # all addresses, routes and neighbours of the interface.
-      ./flush-if.patch
-
+    [
       # Make sure that the hostname gets set on reboot.  Without this
       # patch, the hostname doesn't get set properly if the old
       # hostname (i.e. before reboot) is equal to the new hostname.
diff --git a/pkgs/tools/networking/dhcp/flush-if.patch b/pkgs/tools/networking/dhcp/flush-if.patch
deleted file mode 100644
index ff72248b0ab..00000000000
--- a/pkgs/tools/networking/dhcp/flush-if.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --exclude '*~' -rc dhcp-4.1.0p1-orig/client/scripts/linux dhcp-4.1.0p1/client/scripts/linux
-*** dhcp-4.1.0p1-orig/client/scripts/linux	2008-05-23 15:56:07.000000000 +0200
---- dhcp-4.1.0p1/client/scripts/linux	2009-09-29 17:56:57.000000000 +0200
-***************
-*** 67,72 ****
---- 67,80 ----
-    exit $exit_status
-  }
-  
-+ # Delete the old addresses, routes and ARP information for this
-+ # interface.
-+ flush_if() {
-+   ${ip} -4 address flush dev $interface
-+   ${ip} -4 route flush dev $interface
-+   ${ip} -4 neighbour flush dev $interface
-+ }
-+ 
-  # Invoke the local dhcp client enter hooks, if they exist.
-  if [ -f /etc/dhclient-enter-hooks ]; then
-    exit_status=0
-***************
-*** 150,159 ****
-      ifconfig $interface:0- inet 0
-    fi
-    if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
-!     # IP address changed. Bringing down the interface will delete all routes,
-!     # and clear the ARP cache.
-!     ifconfig $interface inet 0 down
-! 
-    fi
-    if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-       [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
---- 158,165 ----
-      ifconfig $interface:0- inet 0
-    fi
-    if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
-!     # IP address changed.
-!     flush_if
-    fi
-    if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-       [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-***************
-*** 189,196 ****
-      ifconfig $interface:0- inet 0
-    fi
-    if [ x$old_ip_address != x ]; then
-!     # Shut down interface, which will delete routes and clear arp cache.
-!     ifconfig $interface inet 0 down
-    fi
-    if [ x$alias_ip_address != x ]; then
-      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
---- 195,201 ----
-      ifconfig $interface:0- inet 0
-    fi
-    if [ x$old_ip_address != x ]; then
-!     flush_if
-    fi
-    if [ x$alias_ip_address != x ]; then
-      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-***************
-*** 225,231 ****
-      make_resolv_conf
-      exit_with_hooks 0
-    fi
-!   ifconfig $interface inet 0 down
-    exit_with_hooks 1
-  fi
-  
---- 230,236 ----
-      make_resolv_conf
-      exit_with_hooks 0
-    fi
-!   flush_if
-    exit_with_hooks 1
-  fi
-  
diff --git a/pkgs/tools/networking/dhcp/set-hostname.patch b/pkgs/tools/networking/dhcp/set-hostname.patch
index 495a8a124be..7aa9d081451 100644
--- a/pkgs/tools/networking/dhcp/set-hostname.patch
+++ b/pkgs/tools/networking/dhcp/set-hostname.patch
@@ -1,14 +1,12 @@
-diff -ru -x '*~' dhcp-4.1.2-P1-orig//client/scripts/linux dhcp-4.1.2-P1//client/scripts/linux
---- dhcp-4.1.2-P1-orig//client/scripts/linux	2010-09-15 00:49:48.000000000 +0200
-+++ dhcp-4.1.2-P1//client/scripts/linux	2011-04-01 16:08:10.984372269 +0200
+--- a/client/scripts/linux	2010-09-15 00:49:48.000000000 +0200
++++ b/client/scripts/linux	2011-04-01 16:08:10.984372269 +0200
 @@ -133,9 +133,7 @@
-      [ x$current_hostname = "x(none)" ] || \
-      [ x$current_hostname = xlocalhost ] || \
-      [ x$current_hostname = x$old_host_name ]; then
--    if [ x$new_host_name != x$old_host_name ]; then
--      hostname "$new_host_name"
--    fi
-+    hostname "$new_host_name"
-   fi
-     
-   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+            [ "$current_hostname" = '(none)' ] ||
+            [ "$current_hostname" = 'localhost' ] ||
+            [ "$current_hostname" = "$old_host_name" ]; then
+-           if [ "$new_host_name" != "$old_host_name" ]; then
+-               hostname "$new_host_name"
+-           fi
++           hostname "$new_host_name"
+         fi
+     fi

From b59df6ba04b450e5d73677de21b3581c85f1a9b9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 1 Mar 2018 08:50:30 -0600
Subject: [PATCH 0225/2266] dhcp: 4.3.6 -> 4.3.6-P1

https://kb.isc.org/article/AA-01570/82/DHCP-4.3.6-P1-Release-Notes.html
---
 pkgs/tools/networking/dhcp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index c6ad737ce1f..8b1ac864a43 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "dhcp-${version}";
-  version = "4.3.6";
+  version = "4.3.6-P1";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
-    sha256 = "06vgxhm6agzkp6r1jy10467vrfw2rzcp2mnkcph7ydziciisy7m4";
+    sha256 = "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g";
   };
 
   patches =

From 2493064a05529ee8ed42bcfa3645837fc6bda3ab Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 13:03:53 -0800
Subject: [PATCH 0226/2266] re2c: 0.16 -> 1.0.3

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c -h` got 0 exit code
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c --help` got 0 exit code
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c help` got 0 exit code
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c -V` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c -v` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c --version` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c version` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c help` and found version 1.0.3
- found 1.0.3 with grep in /nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3
- found 1.0.3 in filename of file in /nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3

cc "@thoughtpolice"
---
 pkgs/development/tools/parsing/re2c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index dcf89d1604d..da1bcced32e 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "re2c-${version}";
-  version = "0.16";
+  version = "1.0.3";
 
   sourceRoot = "${src.name}/re2c";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "skvadrik";
     repo   = "re2c";
     rev    = version;
-    sha256 = "0cijgmbyx34nwl2jmsswggkgvzy364871rkbxz8biq9x8xrhhjw5";
+    sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 20072d733bd6ecf9afd98c7cfbb3f3574de4eaef Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 10:37:57 -0500
Subject: [PATCH 0227/2266] nixos: manual: Fix cross-compilation.

---
 nixos/doc/manual/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 6098b057a37..3b01f4fed35 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -87,7 +87,7 @@ let
       echo "for hints about the offending path)."
       exit 1
     fi
-    ${libxslt.bin}/bin/xsltproc \
+    ${buildPackages.libxslt.bin}/bin/xsltproc \
       --stringparam revision '${revision}' \
       -o $out ${./options-to-docbook.xsl} $optionsXML
   '';
@@ -139,7 +139,7 @@ let
 
   manual-combined = runCommand "nixos-manual-combined"
     { inherit sources;
-      buildInputs = [ libxml2 libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
       meta.description = "The NixOS manual as plain docbook XML";
     }
     ''
@@ -194,7 +194,7 @@ let
 
   olinkDB = runCommand "manual-olinkdb"
     { inherit sources;
-      buildInputs = [ libxml2 libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
     }
     ''
       xsltproc \
@@ -244,7 +244,7 @@ in rec {
   # Generate the NixOS manual.
   manual = runCommand "nixos-manual"
     { inherit sources;
-      buildInputs = [ libxml2 libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
       meta.description = "The NixOS manual in HTML format";
       allowedReferences = ["out"];
     }
@@ -302,7 +302,7 @@ in rec {
   # Generate the NixOS manpages.
   manpages = runCommand "nixos-manpages"
     { inherit sources;
-      buildInputs = [ libxml2 libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
       allowedReferences = ["out"];
     }
     ''

From 020e80104a4723260684c8e672ac3c5c973be88d Mon Sep 17 00:00:00 2001
From: Adam Ruzicka <a.ruzicka@outlook.com>
Date: Wed, 28 Feb 2018 23:17:15 +0100
Subject: [PATCH 0228/2266] hg-git: 0.8.10 -> 0.8.11

0.8.10 is not compatible with mercurial-4.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 3a62945849a..a4b6ddacf80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7183,12 +7183,12 @@ in {
 
   hg-git = buildPythonPackage rec {
     name = "hg-git-${version}";
-    version = "0.8.10";
+    version = "0.8.11";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/h/hg-git/${name}.tar.gz";
-      sha256 = "03dzcs4l7hzq59sgjhngxgmi34xfyd7jcxyjl0f68rwq8b1yqrp3";
+      sha256 = "08kw1sj3sq1q1571hwkc51w20ks9ysmlg93pcnmd6gr66bz02dyn";
     };
 
     propagatedBuildInputs = with self; [ dulwich ];
@@ -7197,6 +7197,7 @@ in {
       description = "Push and pull from a Git server using Mercurial";
       homepage = http://hg-git.github.com/;
       maintainers = with maintainers; [ koral ];
+      license = stdenv.lib.licenses.gpl2;
     };
   };
 

From 897b7c7e9b45c6cb272f3221a28f2e5529a52e19 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 13:31:36 -0500
Subject: [PATCH 0229/2266] nixos: Fix initrd dependency detection when
 cross-compiling.

---
 nixos/modules/system/boot/stage-1.nix | 48 +++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 494780f1748..55bb6d3449c 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -30,6 +30,50 @@ let
   # mounting `/`, like `/` on a loopback).
   fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
 
+  # A utility for enumerating the shared-library dependencies of a program
+  findLibs = pkgs.writeShellScriptBin "find-libs" ''
+    set -euo pipefail
+
+    declare -A seen
+    declare -a left
+
+    patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf"
+
+    function add_needed {
+      rpath="$($patchelf --print-rpath $1)"
+      dir="$(dirname $1)"
+      for lib in $($patchelf --print-needed $1); do
+        left+=("$lib" "$rpath" "$dir")
+      done
+    }
+
+    add_needed $1
+
+    while [ ''${#left[@]} -ne 0 ]; do
+      next=''${left[0]}
+      rpath=''${left[1]}
+      ORIGIN=''${left[2]}
+      left=("''${left[@]:3}")
+      if [ -z ''${seen[$next]+x} ]; then
+        seen[$next]=1
+        IFS=: read -ra paths <<< $rpath
+        res=
+        for path in "''${paths[@]}"; do
+          path=$(eval "echo $path")
+          if [ -f "$path/$next" ]; then
+              res="$path/$next"
+              echo "$res"
+              add_needed "$res"
+              break
+          fi
+        done
+        if [ -z "$res" ]; then
+          echo "Couldn't satisfy dependency $next" >&2
+          exit 1
+        fi
+      fi
+    done
+  '';
 
   # Some additional utilities needed in stage 1, like mount, lvm, fsck
   # etc.  We don't want to bring in all of those packages, so we just
@@ -103,9 +147,7 @@ let
       # Copy all of the needed libraries
       find $out/bin $out/lib -type f | while read BIN; do
         echo "Copying libs for executable $BIN"
-        LDD="$(ldd $BIN)" || continue
-        LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"
-        for LIB in $LIBS; do
+        for LIB in $(${findLibs}/bin/find-libs $BIN); do
           TGT="$out/lib/$(basename $LIB)"
           if [ ! -f "$TGT" ]; then
             SRC="$(readlink -e $LIB)"

From 948e2908957bdd8c95e544b0353ea91aa78b8574 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 14:03:41 -0500
Subject: [PATCH 0230/2266] stage-2-init: Use the host bash as SHELL

---
 nixos/modules/system/boot/stage-2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 8db6d2d2f73..78afbd8dbc1 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -10,6 +10,7 @@ let
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
+    shell = "${pkgs.bash}/bin/bash";
     isExecutable = true;
     inherit (config.nix) readOnlyStore;
     inherit (config.networking) useHostResolvConf;

From e70f61f5a19b00337082ab28a5013e0b440bda92 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 14:37:45 -0500
Subject: [PATCH 0231/2266] Add top-level aliases for the runtime shell and its
 package.

This is like stdenv.shell{,Package}, but for the runtime system. The
majority of uses of stdenv.shell probably want this instead.
---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef629d09292..2db002876c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5646,6 +5646,9 @@ with pkgs;
 
   ### SHELLS
 
+  runtimeShell = "${runtimeShellPackage}/bin/bash";
+  runtimeShellPackage = bash;
+
   bash = lowPrio (callPackage ../shells/bash/4.4.nix {
     texinfo = null;
     interactive = stdenv.isCygwin; # patch for cygwin requires readline support

From fec543436d4d35dacde01a9e8b69a2781841f901 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 14:38:53 -0500
Subject: [PATCH 0232/2266] nixos: Move uses of stdenv.shell to runtimeShell.

---
 nixos/modules/config/zram.nix                        |  2 +-
 nixos/modules/hardware/video/nvidia.nix              |  8 ++++----
 nixos/modules/programs/rootston.nix                  |  2 +-
 nixos/modules/programs/ssh.nix                       |  2 +-
 nixos/modules/security/audit.nix                     |  6 +++---
 .../continuous-integration/buildkite-agent.nix       |  2 +-
 nixos/modules/services/databases/4store-endpoint.nix |  2 +-
 nixos/modules/services/databases/4store.nix          |  2 +-
 nixos/modules/services/editors/emacs.nix             |  2 +-
 nixos/modules/services/misc/folding-at-home.nix      |  2 +-
 nixos/modules/services/misc/geoip-updater.nix        |  2 +-
 nixos/modules/services/misc/gitit.nix                |  2 +-
 nixos/modules/services/misc/ihaskell.nix             |  2 +-
 nixos/modules/services/misc/mesos-slave.nix          |  2 +-
 nixos/modules/services/misc/nix-daemon.nix           |  2 +-
 nixos/modules/services/misc/nixos-manual.nix         |  2 +-
 nixos/modules/services/misc/ssm-agent.nix            |  2 +-
 nixos/modules/services/monitoring/apcupsd.nix        |  2 +-
 nixos/modules/services/monitoring/smartd.nix         |  2 +-
 .../services/network-filesystems/xtreemfs.nix        |  2 +-
 .../services/network-filesystems/yandex-disk.nix     |  4 ++--
 nixos/modules/services/networking/amuled.nix         |  2 +-
 nixos/modules/services/networking/firewall.nix       |  2 +-
 nixos/modules/services/networking/flashpolicyd.nix   |  2 +-
 nixos/modules/services/networking/nftables.nix       |  2 +-
 nixos/modules/services/networking/rdnssd.nix         |  2 +-
 nixos/modules/services/security/torify.nix           |  2 +-
 nixos/modules/services/security/torsocks.nix         |  2 +-
 nixos/modules/services/torrent/transmission.nix      |  2 +-
 .../services/web-servers/apache-httpd/owncloud.nix   |  2 +-
 nixos/modules/services/x11/desktop-managers/xfce.nix |  2 +-
 nixos/modules/services/x11/display-managers/slim.nix |  2 +-
 .../modules/system/activation/activation-script.nix  |  2 +-
 nixos/modules/system/boot/loader/grub/grub.nix       |  4 ++--
 nixos/modules/system/boot/systemd.nix                | 12 ++++++------
 nixos/modules/tasks/network-interfaces.nix           |  8 ++++----
 nixos/modules/virtualisation/amazon-init.nix         |  2 +-
 nixos/modules/virtualisation/azure-agent.nix         |  2 +-
 nixos/modules/virtualisation/containers.nix          |  4 ++--
 nixos/modules/virtualisation/openvswitch.nix         |  2 +-
 nixos/modules/virtualisation/qemu-vm.nix             |  2 +-
 41 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index ad41ad4f3d7..ae1b0a6c8e1 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -93,7 +93,7 @@ in
             serviceConfig = {
               Type = "oneshot";
               RemainAfterExit = true;
-              ExecStop = "${pkgs.stdenv.shell} -c 'echo 1 > /sys/class/block/${dev}/reset'";
+              ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'";
             };
             script = ''
               set -u
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 50c085dd7ee..eafc9869315 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -75,10 +75,10 @@ in
     # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
     services.udev.extraRules =
       ''
-        KERNEL=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 255'"
-        KERNEL=="nvidia_modeset", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 254'"
-        KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) %n'"
-        KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
+        KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 255'"
+        KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 254'"
+        KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $(grep nvidia-frontend /proc/devices | cut -d \  -f 1) %n'"
+        KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
       '';
 
     boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ];
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
index 1946b1db657..842d9e6cfb4 100644
--- a/nixos/modules/programs/rootston.nix
+++ b/nixos/modules/programs/rootston.nix
@@ -6,7 +6,7 @@ let
   cfg = config.programs.rootston;
 
   rootstonWrapped = pkgs.writeScriptBin "rootston" ''
-    #! ${pkgs.stdenv.shell}
+    #! ${pkgs.runtimeShell}
     if [[ "$#" -ge 1 ]]; then
       exec ${pkgs.rootston}/bin/rootston "$@"
     else
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0935bf0cae7..36289080a82 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -13,7 +13,7 @@ let
 
   askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"
     ''
-      #! ${pkgs.stdenv.shell} -e
+      #! ${pkgs.runtimeShell} -e
       export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
       exec ${askPassword}
     '';
diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix
index 7ac21fd9650..2b22bdd9f0a 100644
--- a/nixos/modules/security/audit.nix
+++ b/nixos/modules/security/audit.nix
@@ -13,7 +13,7 @@ let
   };
 
   disableScript = pkgs.writeScript "audit-disable" ''
-    #!${pkgs.stdenv.shell} -eu
+    #!${pkgs.runtimeShell} -eu
     # Explicitly disable everything, as otherwise journald might start it.
     auditctl -D
     auditctl -e 0 -a task,never
@@ -23,7 +23,7 @@ let
   # put in the store like this. At the same time, it doesn't feel like a huge deal and working
   # around that is a pain so I'm leaving it like this for now.
   startScript = pkgs.writeScript "audit-start" ''
-    #!${pkgs.stdenv.shell} -eu
+    #!${pkgs.runtimeShell} -eu
     # Clear out any rules we may start with
     auditctl -D
 
@@ -43,7 +43,7 @@ let
   '';
 
   stopScript = pkgs.writeScript "audit-stop" ''
-    #!${pkgs.stdenv.shell} -eu
+    #!${pkgs.runtimeShell} -eu
     # Clear the rules
     auditctl -D
 
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 0a0c9f665d2..03af9a7859e 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -18,7 +18,7 @@ let
   hooksDir = let
     mkHookEntry = name: value: ''
       cat > $out/${name} <<EOF
-      #! ${pkgs.stdenv.shell}
+      #! ${pkgs.runtimeShell}
       set -e
       ${value}
       EOF
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 906cb320df9..d528355671f 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -2,7 +2,7 @@
 let
   cfg = config.services.fourStoreEndpoint;
   endpointUser = "fourstorehttp";
-  run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${endpointUser} -c";
+  run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${endpointUser} -c";
 in
 with lib;
 {
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 62856822f90..abb62e1f263 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -3,7 +3,7 @@ let
   cfg = config.services.fourStore;
   stateDir = "/var/lib/4store";
   fourStoreUser = "fourstore";
-  run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fourStoreUser}";
+  run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fourStoreUser}";
 in
 with lib;
 {
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 2c5a0c4849e..bbc9bcf3dae 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.emacs;
 
   editorScript = pkgs.writeScriptBin "emacseditor" ''
-    #!${pkgs.stdenv.shell}
+    #!${pkgs.runtimeShell}
     if [ -z "$1" ]; then
       exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs
     else
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 053e7e95635..164221cbab7 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -57,7 +57,7 @@ in {
         chown ${fahUser} ${stateDir}
         cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg
       '';
-      script = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
+      script = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
     };
 
     services.foldingAtHome.config = ''
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index 760fa66e80d..e0b9df96f8e 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -14,7 +14,7 @@ let
   # ExecStart= command with '@' doesn't work because we start a shell (new
   # process) that creates a new argv[0].)
   geoip-updater = pkgs.writeScriptBin "geoip-updater" ''
-    #!${pkgs.stdenv.shell}
+    #!${pkgs.runtimeShell}
     skipExisting=0
     debug()
     {
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 44880ebeda1..94a98e0335d 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -17,7 +17,7 @@ let
   gititSh = hsPkgs: extras: with pkgs; let
     env = gititWithPkgs hsPkgs extras;
   in writeScript "gitit" ''
-    #!${stdenv.shell}
+    #!${runtimeShell}
     cd $HOME
     export NIX_GHC="${env}/bin/ghc"
     export NIX_GHCPKG="${env}/bin/ghc-pkg"
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index e07a4a44613..6da9cc8c47e 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -55,7 +55,7 @@ in
       serviceConfig = {
         User = config.users.extraUsers.ihaskell.name;
         Group = config.users.extraGroups.ihaskell.name;
-        ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
+        ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
       };
     };
   };
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index 47be10274d3..12485141e21 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -188,7 +188,7 @@ in {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      path = [ pkgs.stdenv.shellPackage ];
+      path = [ pkgs.runtimeShellPackage ];
       serviceConfig = {
         ExecStart = ''
           ${pkgs.mesos}/bin/mesos-slave \
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index a169b0f2c78..c076f90e540 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -30,7 +30,7 @@ let
       # /bin/sh in the sandbox as a bind-mount to bash. This means we
       # also need to include the entire closure of bash. Nix >= 2.0
       # provides a /bin/sh by default.
-      sh = pkgs.stdenv.shell;
+      sh = pkgs.runtimeShell;
       binshDeps = pkgs.writeReferencesToFile sh;
     in
       pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; inherit binshDeps; } ''
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 5d0f2abd13a..b8253956d54 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -43,7 +43,7 @@ let
 
   helpScript = pkgs.writeScriptBin "nixos-help"
     ''
-      #! ${pkgs.stdenv.shell} -e
+      #! ${pkgs.runtimeShell} -e
       browser="$BROWSER"
       if [ -z "$browser" ]; then
         browser="$(type -P xdg-open || true)"
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix
index a57fbca86fb..e951a4c7ffa 100644
--- a/nixos/modules/services/misc/ssm-agent.nix
+++ b/nixos/modules/services/misc/ssm-agent.nix
@@ -8,7 +8,7 @@ let
   # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM
   # looks for. See https://github.com/aws/amazon-ssm-agent/issues/38 for upstream fix.
   fake-lsb-release = pkgs.writeScriptBin "lsb_release" ''
-    #!${pkgs.stdenv.shell}
+    #!${pkgs.runtimeShell}
 
     case "$1" in
       -i) echo "nixos";;
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 9abd6e9ab64..839116de626 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -38,7 +38,7 @@ let
   ];
 
   shellCmdsForEventScript = eventname: commands: ''
-    echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}"
+    echo "#!${pkgs.runtimeShell}" > "$out/${eventname}"
     echo '${commands}' >> "$out/${eventname}"
     chmod a+x "$out/${eventname}"
   '';
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index b8d9e58a5a8..fecae4ca1b3 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -14,7 +14,7 @@ let
   nx = cfg.notifications.x11;
 
   smartdNotify = pkgs.writeScript "smartd-notify.sh" ''
-    #! ${pkgs.stdenv.shell}
+    #! ${pkgs.runtimeShell}
     ${optionalString nm.enable ''
       {
       ${pkgs.coreutils}/bin/cat << EOF
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index 0c6714563d8..95d7641e8b5 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -11,7 +11,7 @@ let
   home = cfg.homeDir;
 
   startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" ''
-    #! ${pkgs.stdenv.shell}
+    #! ${pkgs.runtimeShell}
     JAVA_HOME="${pkgs.jdk}"
     JAVADIR="${xtreemfs}/share/java"
     JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar"
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index 4de20664133..44b0edf6201 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -99,10 +99,10 @@ in
             exit 1
         fi
 
-        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+        ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \
           -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token'
 
-        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \
+        ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \
           -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}'
       '';
 
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index fc7d56a24fa..9898f164c5c 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -68,7 +68,7 @@ in
       '';
 
       script = ''
-        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
+        ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \
             -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
       '';
     };
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index bce48c8f65e..20c0b0acf16 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -54,7 +54,7 @@ let
     '';
 
   writeShScript = name: text: let dir = pkgs.writeScriptBin name ''
-    #! ${pkgs.stdenv.shell} -e
+    #! ${pkgs.runtimeShell} -e
     ${text}
   ''; in "${dir}/bin/${name}";
 
diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix
index 5ba85178179..5b83ce13138 100644
--- a/nixos/modules/services/networking/flashpolicyd.nix
+++ b/nixos/modules/services/networking/flashpolicyd.nix
@@ -22,7 +22,7 @@ let
 
   flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd"
     ''
-      #! ${pkgs.stdenv.shell}
+      #! ${pkgs.runtimeShell}
       exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \
         --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \
         2> /dev/null
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 56b94205414..ad7c013a544 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -116,7 +116,7 @@ in
           include "${cfg.rulesetFile}"
         '';
         checkScript = pkgs.writeScript "nftables-check" ''
-          #! ${pkgs.stdenv.shell} -e
+          #! ${pkgs.runtimeShell} -e
           if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then
             echo "Unload ip_tables before using nftables!" 1>&2
             exit 1
diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix
index 95833d31e99..a102242eae7 100644
--- a/nixos/modules/services/networking/rdnssd.nix
+++ b/nixos/modules/services/networking/rdnssd.nix
@@ -6,7 +6,7 @@
 with lib;
 let
   mergeHook = pkgs.writeScript "rdnssd-merge-hook" ''
-    #! ${pkgs.stdenv.shell} -e
+    #! ${pkgs.runtimeShell} -e
     ${pkgs.openresolv}/bin/resolvconf -u
   '';
 in
diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index a29cb3f33da..08da726437e 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
@@ -7,7 +7,7 @@ let
   torify = pkgs.writeTextFile {
     name = "tsocks";
     text = ''
-        #!${pkgs.stdenv.shell}
+        #!${pkgs.runtimeShell}
         TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@"
     '';
     executable = true;
diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix
index 1b5a05b21e7..c60c745443b 100644
--- a/nixos/modules/services/security/torsocks.nix
+++ b/nixos/modules/services/security/torsocks.nix
@@ -23,7 +23,7 @@ let
   wrapTorsocks = name: server: pkgs.writeTextFile {
     name = name;
     text = ''
-        #!${pkgs.stdenv.shell}
+        #!${pkgs.runtimeShell}
         TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@"
     '';
     executable = true;
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index dd6b585b7e2..4911a64c95d 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -90,7 +90,7 @@ in
       # 1) Only the "transmission" user and group have access to torrents.
       # 2) Optionally update/force specific fields into the configuration file.
       serviceConfig.ExecStartPre = ''
-          ${pkgs.stdenv.shell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"
+          ${pkgs.runtimeShell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"
       '';
       serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";
       serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index cfddab2f504..82b8bf3e30d 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -346,7 +346,7 @@ let
   postgresql = serverInfo.fullConfig.services.postgresql.package;
 
   setupDb = pkgs.writeScript "setup-owncloud-db" ''
-    #!${pkgs.stdenv.shell}
+    #!${pkgs.runtimeShell}
     PATH="${postgresql}/bin"
     createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
     createdb "${config.dbName}" -O "${config.dbUser}" || true
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 489bffbee91..7dcc600d266 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -128,7 +128,7 @@ in
         # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
         export GTK_DATA_PREFIX=${config.system.path}
 
-        ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} &
+        ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
         waitPID=$!
       '';
     }];
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 0c4dd1973b5..f645a5c2f07 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -14,7 +14,7 @@ let
       default_xserver ${dmcfg.xserverBin}
       xserver_arguments ${toString dmcfg.xserverArgs}
       sessiondir ${dmcfg.session.desktops}
-      login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
+      login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session"
       halt_cmd ${config.systemd.package}/sbin/shutdown -h now
       reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
       logfile /dev/stderr
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index c2ac731d433..dd7929285cd 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -61,7 +61,7 @@ in
       apply = set: {
         script =
           ''
-            #! ${pkgs.stdenv.shell}
+            #! ${pkgs.runtimeShell}
 
             systemConfig=@out@
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0d83391de89..3f5254fe1ca 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -40,7 +40,7 @@ let
     { splashImage = f cfg.splashImage;
       grub = f grub;
       grubTarget = f (grub.grubTarget or "");
-      shell = "${pkgs.stdenv.shell}";
+      shell = "${pkgs.runtimeShell}";
       fullName = (builtins.parseDrvName realGrub.name).name;
       fullVersion = (builtins.parseDrvName realGrub.name).version;
       grubEfi = f grubEfi;
@@ -536,7 +536,7 @@ in
             btrfsprogs = pkgs.btrfs-progs;
           };
         in pkgs.writeScript "install-grub.sh" (''
-        #!${pkgs.stdenv.shell}
+        #!${pkgs.runtimeShell}
         set -e
         export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
         ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index aff46ea861a..92c9ee0c469 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -241,37 +241,37 @@ let
         }
         (mkIf (config.preStart != "")
           { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''
-              #! ${pkgs.stdenv.shell} -e
+              #! ${pkgs.runtimeShell} -e
               ${config.preStart}
             '';
           })
         (mkIf (config.script != "")
           { serviceConfig.ExecStart = makeJobScript "${name}-start" ''
-              #! ${pkgs.stdenv.shell} -e
+              #! ${pkgs.runtimeShell} -e
               ${config.script}
             '' + " " + config.scriptArgs;
           })
         (mkIf (config.postStart != "")
           { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" ''
-              #! ${pkgs.stdenv.shell} -e
+              #! ${pkgs.runtimeShell} -e
               ${config.postStart}
             '';
           })
         (mkIf (config.reload != "")
           { serviceConfig.ExecReload = makeJobScript "${name}-reload" ''
-              #! ${pkgs.stdenv.shell} -e
+              #! ${pkgs.runtimeShell} -e
               ${config.reload}
             '';
           })
         (mkIf (config.preStop != "")
           { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" ''
-              #! ${pkgs.stdenv.shell} -e
+              #! ${pkgs.runtimeShell} -e
               ${config.preStop}
             '';
           })
         (mkIf (config.postStop != "")
           { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" ''
-              #! ${pkgs.stdenv.shell} -e
+              #! ${pkgs.runtimeShell} -e
               ${config.postStop}
             '';
           })
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5036b701bd8..9c781f2b23c 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -26,7 +26,7 @@ let
     executable = true;
     destination = "/bin/bridge-stp";
     text = ''
-      #!${pkgs.stdenv.shell} -e
+      #!${pkgs.runtimeShell} -e
       export PATH="${pkgs.mstpd}/bin"
 
       BRIDGES=(${concatStringsSep " " (attrNames rstpBridges)})
@@ -64,7 +64,7 @@ let
 
   # udev script that configures a physical wlan device and adds virtual interfaces
   wlanDeviceUdevScript = device: interfaceList: pkgs.writeScript "wlan-${device}-udev-script" ''
-    #!${pkgs.stdenv.shell}
+    #!${pkgs.runtimeShell}
 
     # Change the wireless phy device to a predictable name.
     if [ -e "/sys/class/net/${device}/phy80211/name" ]; then
@@ -1158,7 +1158,7 @@ in
             # The script creates the required, new WLAN interfaces interfaces and configures the
             # existing, default interface.
             curInterfaceScript = device: current: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${device}.sh" ''
-              #!${pkgs.stdenv.shell}
+              #!${pkgs.runtimeShell}
               # Change the wireless phy device to a predictable name.
               ${pkgs.iw}/bin/iw phy `${pkgs.coreutils}/bin/cat /sys/class/net/$INTERFACE/phy80211/name` set name ${device}
 
@@ -1177,7 +1177,7 @@ in
 
             # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
             newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
-              #!${pkgs.stdenv.shell}
+              #!${pkgs.runtimeShell}
               # Configure the new interface
               ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
               ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"}
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index a7362423eb4..8032b2c6d7c 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -2,7 +2,7 @@
 
 let
   script = ''
-    #!${pkgs.stdenv.shell} -eu
+    #!${pkgs.runtimeShell} -eu
 
     echo "attempting to fetch configuration from EC2 user data..."
 
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index 6817eb837a0..201d5f71ba3 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -47,7 +47,7 @@ let
   };
 
   provisionedHook = pkgs.writeScript "provisioned-hook" ''
-    #!${pkgs.stdenv.shell}
+    #!${pkgs.runtimeShell}
     ${config.systemd.package}/bin/systemctl start provisioned.target
   '';
 
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 4038454b2d2..e54a5fe7d40 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -33,7 +33,7 @@ let
     in
       pkgs.writeScript "container-init"
       ''
-        #! ${pkgs.stdenv.shell} -e
+        #! ${pkgs.runtimeShell} -e
 
         # Initialise the container side of the veth pair.
         if [ "$PRIVATE_NETWORK" = 1 ]; then
@@ -223,7 +223,7 @@ let
   serviceDirectives = cfg: {
     ExecReload = pkgs.writeScript "reload-container"
       ''
-        #! ${pkgs.stdenv.shell} -e
+        #! ${pkgs.runtimeShell} -e
         ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \
           bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
       '';
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 4218a3840fc..38b138e0632 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -169,7 +169,7 @@ in {
         mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/}
         ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey
         ln -fs ${pkgs.writeScript "racoon-restart" ''
-        #!${pkgs.stdenv.shell}
+        #!${pkgs.runtimeShell}
         /var/run/current-system/sw/bin/systemctl $1 racoon
         ''} ${runDir}/ipsec/etc/init.d/racoon
       '';
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 13d0eb7de5c..271a0a08982 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -30,7 +30,7 @@ let
   # Shell script to start the VM.
   startVM =
     ''
-      #! ${pkgs.stdenv.shell}
+      #! ${pkgs.runtimeShell}
 
       NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
 

From c3bba10ae8ba743489eb5e1a07a88e294a0bece8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 14:52:04 -0500
Subject: [PATCH 0233/2266] dhcpcd: Fix cross-compilation.

This should almost certainly go into patchShebangs...
---
 pkgs/tools/networking/dhcpcd/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 5b7befb3bf6..a151f1d61e1 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev }:
+{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:
 
 stdenv.mkDerivation rec {
   name = "dhcpcd-7.0.1";
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
   # Check that the udev plugin got built.
   postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
 
+  postFixup = ''
+    find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|'
+  '';
+
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
     homepage = https://roy.marples.name/projects/dhcpcd;

From c0466ef834efee68eff58f5e8c36f5edc3f3563d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 1 Mar 2018 20:54:05 +0100
Subject: [PATCH 0234/2266] pythonPackages.csvkit: fix build

---
 .../python-modules/csvkit/default.nix         | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix
index bfabf4376e7..badf33f8c12 100644
--- a/pkgs/development/python-modules/csvkit/default.nix
+++ b/pkgs/development/python-modules/csvkit/default.nix
@@ -1,28 +1,38 @@
-{ stdenv, fetchPypi, buildPythonPackage,
-  dateutil, dbf, xlrd, sqlalchemy, openpyxl,
- agate-excel, agate-dbf, agate-sql, isPy3k }:
+{ lib, fetchPypi, buildPythonPackage, isPy3k
+, agate, agate-excel, agate-dbf, agate-sql, six
+, argparse, ordereddict, simplejson
+, glibcLocales, nose, mock, unittest2
+}:
 
 buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "csvkit";
-    version = "1.0.2";
+  pname = "csvkit";
+  version = "1.0.2";
 
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
-    };
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
+  };
 
-    propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl
-      agate-excel agate-dbf agate-sql ];
+  propagatedBuildInputs = [
+    agate agate-excel agate-dbf agate-sql six
+  ] ++ lib.optionals (!isPy3k) [
+    argparse ordereddict simplejson
+  ];
 
-    doCheck = !isPy3k;
-    # (only) python 3 we had 9 failures and 57 errors out of a much larger
-    # number of tests.
+  checkInputs = [
+    glibcLocales nose
+  ] ++ lib.optionals (!isPy3k) [
+    mock unittest2
+  ];
 
-    meta = with stdenv.lib; {
-      description = "A library of utilities for working with CSV, the king of tabular file formats";
-      maintainers = with maintainers; [ vrthra ];
-      license = with licenses; [ mit ];
-      homepage = https://github.com/wireservice/csvkit;
-    };
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" nosetests -e test_csvsql
+  '';
+
+  meta = with lib; {
+    description = "A library of utilities for working with CSV, the king of tabular file formats";
+    maintainers = with maintainers; [ vrthra ];
+    license = with licenses; [ mit ];
+    homepage = https://github.com/wireservice/csvkit;
+  };
 }

From a486cb1af61dd88579de254637ecd4b4d3fc3173 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 14:54:41 -0500
Subject: [PATCH 0235/2266] systemd: Fix references to /usr/bin in
 cross-compilation

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index df51284689e..915613cb0d2 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -82,6 +82,12 @@ in
 
       "-Dsysvinit-path="
       "-Dsysvrcnd-path="
+
+      "-Dkill-path=${coreutils}/bin/kill"
+      "-Dkmod-path=${kmod}/bin/kmod"
+      "-Dsulogin-path=${utillinux}/bin/sulogin"
+      "-Dmount-path=${utillinux}/bin/mount"
+      "-Dumount-path=${utillinux}/bin/umount"
       ];
 
     preConfigure =

From 34487947ce665d14c340719d844de0be08d7c85f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 14:58:15 -0500
Subject: [PATCH 0236/2266] nixos: Add nixpkgs.crossSystem option for
 cross-compilation

---
 nixos/modules/misc/nixpkgs.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 11bd148d5de..9217250eec2 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -61,7 +61,7 @@ in
             inherit (config.nixpkgs) config overlays system;
           }
         '';
-      default = import ../../.. { inherit (cfg) config overlays system; };
+      default = import ../../.. { inherit (cfg) config overlays system crossSystem; };
       type = pkgsType;
       example = literalExample ''import <nixpkgs> {}'';
       description = ''
@@ -130,6 +130,18 @@ in
       '';
     };
 
+    crossSystem = mkOption {
+      type = types.nullOr types.attrs;
+      default = null;
+      description = ''
+        The description of the system we're cross-compiling to, or null
+        if this isn't a cross-compile. See the description of the
+        crossSystem argument in the nixpkgs manual.
+
+        Ignored when <code>nixpkgs.pkgs</code> is set.
+      '';
+    };
+
     system = mkOption {
       type = types.str;
       example = "i686-linux";

From 600b08cf9b4de904e5050ea399abdac296c288a4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 16:11:51 -0500
Subject: [PATCH 0237/2266] dhcpcd: Add TODO to cleanup after patchShebangs fix

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index a151f1d61e1..255f3bb0aeb 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   # Check that the udev plugin got built.
   postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
 
+  # TODO shlevy remove once patchShebangs is fixed
   postFixup = ''
     find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|'
   '';

From 980dd631417683a15b2e0c36193e8aaf9f239c50 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 2 Mar 2018 00:26:09 +0100
Subject: [PATCH 0238/2266] epoxy: 1.3.1 -> 1.5.0

---
 pkgs/development/libraries/epoxy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index c3cc5b2cd06..dfb6fe27b63 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "epoxy-${version}";
-  version = "1.3.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "anholt";
     repo = "libepoxy";
-    rev = "v${version}";
-    sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl";
+    rev = "${version}";
+    sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0";
   };
 
   outputs = [ "out" "dev" ];

From 60c8c028774983d53c91905a8eab887190ea0c52 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 Mar 2018 18:33:36 -0500
Subject: [PATCH 0239/2266] bind: Remove unnecessary environment defines.

---
 pkgs/servers/dns/bind/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index e2262cdb7c8..55368ac9a4d 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9";
   };
 
-  preConfigure = "export AR=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}ar";
-
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
 
   patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
@@ -27,8 +25,6 @@ stdenv.mkDerivation rec {
 
   STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase
 
-  BUILD_CC = "cc";
-
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   configureFlags = [

From f14c9ae8837ce1349b6a08edf8a033ec2f653164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 02:03:28 +0100
Subject: [PATCH 0240/2266] pythonPackages.ldappool: move expression

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

diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
new file mode 100644
index 00000000000..83a731936a8
--- /dev/null
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  name = "ldappool-${version}";
+  version = "1.0";
+
+  src = fetchPypi {
+    pname = "ldappool";
+    inherit version;
+    sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
+  };
+
+  # Judging from SyntaxError
+  disabled = isPy3k;
+
+  meta = with lib; {
+    homepage = "https://github.com/mozilla-services/ldappool";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb689085574..43c6936e848 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11678,23 +11678,7 @@ in {
     };
   };
 
-  ldappool = buildPythonPackage rec {
-    name = "ldappool-${version}";
-    version = "1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/ldappool/${name}.tar.gz";
-      sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
-    };
-
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/mozilla-services/ldappool";
-    };
-  };
-
+  ldappool = callPackage ../development/python-modules/ldappool { };
 
   lz4 = buildPythonPackage rec {
     name = "lz4-0.8.2";

From 3680fc9fd44f634b328151d5cb30827ef97c310b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 02:19:38 +0100
Subject: [PATCH 0241/2266] pythonPackages.ldappool: 1.0 -> 2.2.0

---
 .../python-modules/ldappool/default.nix          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 83a731936a8..58ca72a3dc9 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, pbr, ldap, fixtures, testresources, testtools }:
 
 buildPythonPackage rec {
   name = "ldappool-${version}";
-  version = "1.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     pname = "ldappool";
@@ -10,10 +11,15 @@ buildPythonPackage rec {
     sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
   };
 
-  # Judging from SyntaxError
-  disabled = isPy3k;
+  nativeBuildInputs = [ pbr ];
+
+  propagatedBuildInputs = [ ldap ];
+
+  checkInputs = [ fixtures testresources testtools ];
 
   meta = with lib; {
-    homepage = "https://github.com/mozilla-services/ldappool";
+    description = "A simple connector pool for python-ldap";
+    homepage = https://git.openstack.org/cgit/openstack/ldappool;
+    license = licenses.mpl20;
   };
 }

From 150d0b7428c2a92e70844df92c3b4a3b112d9b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 02:37:58 +0100
Subject: [PATCH 0242/2266] pythonPackages.pycups: move expression

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

diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
new file mode 100644
index 00000000000..c9dce559701
--- /dev/null
+++ b/pkgs/development/python-modules/pycups/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchurl, cups }:
+
+buildPythonPackage rec {
+  pname = "pycups";
+  version = "1.9.73";
+
+  src = fetchurl {
+    url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
+    sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";
+  };
+
+  buildInputs = [ cups ];
+
+  # Wants to connect to CUPS
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python bindings for libcups";
+    homepage = http://cyberelk.net/tim/software/pycups/;
+    license = with licenses; [ gpl2Plus ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43c6936e848..322168954bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13079,27 +13079,7 @@ in {
     };
   });
 
-  pycups = buildPythonPackage rec {
-    name = "pycups-${version}";
-    version = "1.9.73";
-
-    src = pkgs.fetchurl {
-      url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
-      sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";
-    };
-
-    buildInputs = [ pkgs.cups ];
-
-    # Wants to connect to CUPS
-    doCheck = false;
-
-    meta = {
-      description = "Python bindings for libcups";
-      homepage = http://cyberelk.net/tim/software/pycups/;
-      license = with licenses; [ gpl2Plus ];
-    };
-
-  };
+  pycups = callPackage ../development/python-modules/pycups { };
 
   pycurl = buildPythonPackage (rec {
     name = "pycurl-7.19.5.1";

From a5e1dfe3e2836350bcf776c500387cb25fe87e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 02:38:48 +0100
Subject: [PATCH 0243/2266] pythonPackages.pycups: fix on Darwin

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

diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
index c9dce559701..28dff352e38 100644
--- a/pkgs/development/python-modules/pycups/default.nix
+++ b/pkgs/development/python-modules/pycups/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchurl, cups }:
+{ stdenv, lib, buildPythonPackage, fetchurl, cups, libiconv }:
 
 buildPythonPackage rec {
   pname = "pycups";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";
   };
 
-  buildInputs = [ cups ];
+  buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv;
 
   # Wants to connect to CUPS
   doCheck = false;

From 143fd427d4e8fc9130b85387405e5514250ae7d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 02:46:11 +0100
Subject: [PATCH 0244/2266] pythonPackages.affinity: disable for Python 3

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

diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix
index f2cb2ef6445..4eaaf56b441 100644
--- a/pkgs/development/python-modules/affinity/default.nix
+++ b/pkgs/development/python-modules/affinity/default.nix
@@ -1,13 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "affinity";
   version = "0.1.0";
+
+  # syntax error
+  disabled = isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
   };
+
   meta = {
     description = "control processor affinity on windows and linux";
     homepage    = http://cheeseshop.python.org/pypi/affinity;

From 7b525acee2ed65058fe2039ffef2db71588c4f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 02:56:57 +0100
Subject: [PATCH 0245/2266] pythonPackages.dj-database-url: init at 0.5.0

---
 .../dj-database-url/default.nix               | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/dj-database-url/default.nix

diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
new file mode 100644
index 00000000000..f334b7efeac
--- /dev/null
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "dj-database-url";
+  version = "0.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163";
+  };
+
+  # Tests access a DB via network
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Use Database URLs in your Django Application";
+    homepage = https://github.com/kennethreitz/dj-database-url;
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 322168954bd..4fccdf0097f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7142,6 +7142,8 @@ in {
     };
   };
 
+  dj-database-url = callPackage ../development/python-modules/dj-database-url { };
+
   djmail = callPackage ../development/python-modules/djmail { };
 
   pillowfight = buildPythonPackage rec {

From ae56cc1f30ec745bd9b045767f1da42eeae17643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 03:05:55 +0100
Subject: [PATCH 0246/2266] pythonPackages.django-polymorphic: fix tests

---
 .../django-polymorphic/default.nix             | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index 8cb68ed1e7d..2cd112d8150 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -1,18 +1,24 @@
-{ stdenv, buildPythonPackage, fetchPypi, django }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }:
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
   version = "2.0.2";
-  name = "${pname}-${version}";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e1821d7b5874509a158a0f22bebf544330e0944c481c5a3e6da6cac8887e4e88";
+  # PyPI tarball is missing some test files
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2";
   };
 
-  checkInputs = [ django ];
+  checkInputs = [ dj-database-url ];
   propagatedBuildInputs = [ django ];
 
+  checkPhase = ''
+    ${python.interpreter} runtests.py
+  '';
+
   meta = {
     homepage = https://github.com/django-polymorphic/django-polymorphic;
     description = "Improved Django model inheritance with automatic downcasting";

From 2732be0649b884be5d30127a339461d8f8db3f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 03:20:25 +0100
Subject: [PATCH 0247/2266] pythonPackages.fonttools: 3.23.0 -> 3.24.0

---
 pkgs/development/python-modules/fonttools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 28d4053888f..d96e434f279 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.23.0";
-  name = "${pname}-${version}";
+  version = "3.24.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9af97075be0395b631880a82ba88dcf694c8aa76b07a622bf5f650e8f8cff293";
+    sha256 = "d09126f443bc8797d1b7e76274e65f4c169c04722745953ecf536451b1d9a15f";
     extension = "zip";
   };
 
@@ -23,6 +22,7 @@ buildPythonPackage rec {
   checkInputs = [
     pytest
     pytestrunner
+    glibcLocales
   ];
 
   meta = {

From a412ecc43952602b94cb1b0df8c766f98bac75da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 03:21:19 +0100
Subject: [PATCH 0248/2266] pythonPackages.fonttools: fix tests

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index d96e434f279..d7e789b02fa 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -3,6 +3,7 @@
 , numpy
 , pytest
 , pytestrunner
+, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -25,6 +26,10 @@ buildPythonPackage rec {
     glibcLocales
   ];
 
+  preCheck = ''
+    export LC_ALL="en_US.UTF-8"
+  '';
+
   meta = {
     homepage = https://github.com/fonttools/fonttools;
     description = "A library to manipulate font files from Python";

From 92896e2739bd681150c317f7834991a2c361d963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 03:27:11 +0100
Subject: [PATCH 0249/2266] pythonPackages.ftputil: move expression

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

diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
new file mode 100644
index 00000000000..8d9daa154e2
--- /dev/null
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  version = "3.3";
+  pname = "ftputil";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
+  };
+
+  disabled = isPy3k;
+
+  meta = with lib; {
+    description = "High-level FTP client library (virtual file system and more)";
+    homepage    = https://pypi.python.org/pypi/ftputil;
+    license     = licenses.bsd2; # "Modified BSD license, says pypi"
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fccdf0097f..0fb4e9cd805 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4512,24 +4512,7 @@ in {
     };
   };
 
-  ftputil = buildPythonPackage rec {
-    version = "3.3";
-    name = "ftputil-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/ftputil/${name}.tar.gz";
-      sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
-    };
-
-    disabled = isPy3k;
-
-    meta = {
-      description = "High-level FTP client library (virtual file system and more)";
-      homepage    = https://pypi.python.org/pypi/ftputil;
-      platforms   = platforms.linux;
-      license     = licenses.bsd2; # "Modified BSD license, says pypi"
-    };
-  };
+  ftputil = callPackage ../development/python-modules/ftputil { };
 
   fudge = buildPythonPackage rec {
     name = "fudge-1.1.0";

From 62bb869309e165dadecfbe19a83e8ef7e76e52b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 2 Mar 2018 03:41:20 +0100
Subject: [PATCH 0250/2266] pythonPackages.ftputil: 3.3 -> 3.4 and fix tests

---
 .../python-modules/ftputil/default.nix         | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index 8d9daa154e2..d3d338a2c8d 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -1,19 +1,27 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
-  version = "3.3";
+  version = "3.4";
   pname = "ftputil";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
+    sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762";
   };
 
-  disabled = isPy3k;
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    touch Makefile
+    # Disable tests that require network access or access /home
+    py.test test \
+      -k "not test_public_servers and not test_real_ftp \
+          and not test_set_parser and not test_repr"
+  '';
 
   meta = with lib; {
     description = "High-level FTP client library (virtual file system and more)";
-    homepage    = https://pypi.python.org/pypi/ftputil;
+    homepage    = http://ftputil.sschwarzer.net/;
     license     = licenses.bsd2; # "Modified BSD license, says pypi"
   };
 }

From 51f65aa931cab74fcb530dc1c605fbcb0ac9e4d4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 2 Mar 2018 09:41:29 +0100
Subject: [PATCH 0251/2266] libunistring: 0.9.8 -> 0.9.9

See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00010.html
for release information
---
 pkgs/development/libraries/libunistring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 8d1f5115bdf..e3be66e8b1c 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libunistring-${version}";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/${name}.tar.gz";
-    sha256 = "1x9wnpzg7vxyjpnzab6vw0afbcijfbd57qrrkqrppynh0nyz54mp";
+    sha256 = "0jm8pr469y7ybb90ll8k1585rciqm8ckzif0laipqhp5z440rsgm";
   };
 
   outputs = [ "out" "dev" "info" "doc" ];

From 84adbd0d9849da89870e3f5f1b2c5a54146e6b94 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Sat, 24 Feb 2018 11:42:35 +0900
Subject: [PATCH 0252/2266] janeStreet: 0.9.0 -> 0.10.0

---
 .../ocaml-modules/janestreet/default.nix      | 223 +++++++++---------
 .../ocaml-modules/janestreet/janePackage.nix  |   2 +-
 pkgs/top-level/ocaml-packages.nix             |   5 +-
 3 files changed, 111 insertions(+), 119 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 27a65c50275..9e3c6622e87 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime,
-  ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num,
-  openssl }:
+{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes,
+  magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re,
+  zarith, num, openssl }:
 
 rec {
 
@@ -9,56 +9,46 @@ rec {
   sexplib = janePackage {
     name = "sexplib";
     meta.description = "Automated S-expression conversion";
-    version = "0.10.0";
     hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2";
-    buildInputs = [ num ];
+    propagatedBuildInputs = [ num ];
   };
 
   base = janePackage {
     name = "base";
-    version = "0.9.4";
-    hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw";
+    hash = "13brvkkj76syh8ws1k3lnvk88jvc6jxx16nsq5ysh558db91v5x7";
     propagatedBuildInputs = [ sexplib ];
     meta.description = "Full standard library replacement for OCaml";
   };
 
   ocaml-compiler-libs = janePackage {
     name = "ocaml-compiler-libs";
-    hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l";
+    hash = "0dg9jgwwir99y28bki17cqf3v30apd7cf0qdi8hfwb5pkgp9zdng";
     meta.description = "OCaml compiler libraries repackaged";
   };
 
-  ppx_ast = janePackage ({
+  ppx_ast = janePackage {
     name = "ppx_ast";
+    hash = "02jsi9b200071i4x0w358by09xabw9v13q7xrx6cdshqxw0q97kf";
     propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
     meta.description = "OCaml AST used by Jane Street ppx rewriters";
-  } // (if lib.versionAtLeast ocaml.version "4.06"
-    then {
-      version = "0.9.2";
-      hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0";
-    } else {
-      version = "0.9.1";
-      hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw";
-    }
-  ));
+  };
 
   ppx_traverse_builtins = janePackage {
     name = "ppx_traverse_builtins";
-    hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi";
+    hash = "0hhw565cwjlr1cwpgkfj0v2kc0lqxyjcrmi9q3hx3344biql8q17";
     meta.description = "Builtins for Ppx_traverse";
   };
 
   stdio = janePackage {
     name = "stdio";
-    version = "0.9.1";
-    hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx";
-    propagatedBuildInputs = [ base ];
+    hash = "0ydhy4f89f00n0pfgk8fanj6chzx433qnlcrxnddzg4d3dhb4254";
+    propagatedBuildInputs = [ base sexplib ];
     meta.description = "Standard IO library for OCaml";
   };
 
   ppx_core = janePackage {
     name = "ppx_core";
-    hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3";
+    hash = "0fm26bgf10gk8xl6j4xvwa5s7nmns8rlx7iblb7haj4dxc0qsjhd";
     propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ];
     meta.description = "Jane Street's standard library for ppx rewriters";
   };
@@ -67,15 +57,14 @@ rec {
 
   ppx_optcomp = janePackage {
     name = "ppx_optcomp";
-    hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd";
+    hash = "134anhlh32s5yjjbiqsrmjw51i08pyghzccmrwg1bipl64q55m6n";
     propagatedBuildInputs = [ ppx_core ];
     meta.description = "Optional compilation for OCaml";
   };
 
   ppx_driver = janePackage {
     name = "ppx_driver";
-    version = "0.9.1";
-    hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay";
+    hash = "0kzijcsq32wf33f4spgja3w5jb9s8wnzmr6lpm8lahw05g80q8nj";
     buildInputs = [ ocamlbuild ];
     propagatedBuildInputs = [ ppx_optcomp ];
     meta.description = "Feature-full driver for OCaml AST transformers";
@@ -83,56 +72,56 @@ rec {
 
   ppx_metaquot = janePackage {
     name = "ppx_metaquot";
-    hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k";
+    hash = "1wb8pl5v57yy1g0g61mvgnxgn2ix2r5skiz33g8hdjvx91pbgmv4";
     propagatedBuildInputs = [ ppx_driver ];
     meta.description = "Metaquotations for ppx_ast";
   };
 
   ppx_type_conv = janePackage {
     name = "ppx_type_conv";
-    hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p";
+    hash = "0xvn00fzj8lb41slkl91p9z62byg0rlnygdxf4xvrqglg04wa9cz";
     propagatedBuildInputs = [ ppx_metaquot ppx_deriving ];
     meta.description = "Support Library for type-driven code generators";
   };
 
   ppx_sexp_conv = janePackage {
     name = "ppx_sexp_conv";
-    hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l";
+    hash = "0kvbm34wbxrcpvrrbh5wq4kzx4yb67iidzcq5x1d4bygvp8x2lzd";
     propagatedBuildInputs = [ ppx_type_conv sexplib ];
     meta.description = "Generation of S-expression conversion functions from type definitions";
   };
 
   ppx_compare = janePackage {
     name = "ppx_compare";
-    hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9";
+    hash = "1fjrb7bz7wrykf4pm7s4s32030jdw65hi7kzd22ibd1afnkz3xw1";
     propagatedBuildInputs = [ ppx_type_conv ];
     meta.description = "Generation of comparison functions from types";
   };
 
   ppx_enumerate = janePackage {
     name = "ppx_enumerate";
-    hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46";
+    hash = "1b4q1h19bh2xdxgqwdmn5kv95lyvpyf6mfh2fswagf2ajyfshksx";
     propagatedBuildInputs = [ ppx_type_conv ];
     meta.description = "Generate a list containing all values of a finite type";
   };
 
   ppx_hash = janePackage {
     name = "ppx_hash";
-    hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d";
+    hash = "12yln0gpf21ifr205qxk7dn83bsj07zhmak2xsjap7xkq4k8g9gc";
     propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
     meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
   };
 
   ppx_js_style = janePackage {
     name = "ppx_js_style";
-    hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59";
+    hash = "11i2cwavbbplhsl5n4zmgpr8gjc4ixa5016vc72y8h78g71jj18n";
     propagatedBuildInputs = [ ppx_metaquot octavius ];
     meta.description = "Code style checker for Jane Street Packages";
   };
 
   ppx_base = janePackage {
     name = "ppx_base";
-    hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3";
+    hash = "1rk7dlnhl30prda9q34ic0xv375i52j47bkr664ry3ghklxx6d8y";
     propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
     meta.description = "Base set of ppx rewriters";
   };
@@ -141,64 +130,63 @@ rec {
 
   fieldslib = janePackage {
     name = "fieldslib";
-    hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501";
+    hash = "19l05d7hhc74zg48hj0m7sips8z3vpara1f0lvd8h7n46wpbs608";
     propagatedBuildInputs = [ ppx_driver ];
     meta.description = "OCaml record fields as first class values";
   };
 
   variantslib = janePackage {
     name = "variantslib";
-    hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz";
+    hash = "0j1qlz7g8ny1qf3a7d38v2a7sxiis1nwcxkvz0myfsc3dkn716an";
     propagatedBuildInputs = [ ppx_driver ];
     meta.description = "OCaml variants as first class values";
   };
 
   ppx_traverse = janePackage {
     name = "ppx_traverse";
-    hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2";
+    hash = "1ps7s4vwvzik9wvmwd0i3a1sjgm0xx32yivc2r8ix9qqwylvjllq";
     propagatedBuildInputs = [ ppx_type_conv ];
     meta.description = "Automatic generation of open recursion classes";
   };
 
   ppx_custom_printf = janePackage {
     name = "ppx_custom_printf";
-    hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19";
+    hash = "113dvmiy07lb6mf0f88avf4cfkix4q029xqi2w0h26xngp88s31p";
     propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ];
     meta.description = "Printf-style format-strings for user-defined string conversion";
   };
 
   ppx_fields_conv = janePackage {
     name = "ppx_fields_conv";
-    hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z";
+    hash = "1df095qczkzclmdcs1nrm89wswnxivn9kvn6sw65jpvryfkf5v5k";
     propagatedBuildInputs = [ fieldslib ppx_type_conv ];
     meta.description = "Generation of accessor and iteration functions for OCaml records";
   };
 
   ppx_variants_conv = janePackage {
     name = "ppx_variants_conv";
-    hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834";
+    hash = "1l19rkclf65f8snw2v0yibkvk28by241dkp6jb0076dyghbln451";
     propagatedBuildInputs = [ ppx_type_conv variantslib ];
     meta.description = "Generation of accessor and iteration functions for OCaml variant types";
   };
 
   bin_prot = janePackage {
     name = "bin_prot";
-    version = "0.9.1";
-    hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk";
+    hash = "1yyjpwr2s5l8sm9j77a4cmr92rdx73iy3fwqyxf7dr8hfrmd938v";
     propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
     meta.description = "Binary protocol generator";
   };
 
   ppx_here = janePackage {
     name = "ppx_here";
-    hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh";
+    hash = "0ysx25ai7mpzxfpbswd9k38hpxhjm12bj0iw5ghvhdjnnn07kwcv";
     propagatedBuildInputs = [ ppx_driver ];
     meta.description = "Expands [%here] into its location";
   };
 
   ppx_bin_prot = janePackage {
     name = "ppx_bin_prot";
-    hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3";
+    hash = "06n7gs51847p75baay9ar8n15ynqzhdbnwd8xvp8vxs6krr6wpfd";
     propagatedBuildInputs = [ ppx_here bin_prot ];
     meta.description = "Generation of bin_prot readers and writers from types";
   };
@@ -207,92 +195,91 @@ rec {
 
   ppx_assert = janePackage {
     name = "ppx_assert";
-    hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z";
+    hash = "09xrcs2sk1a9vjn16bd1cpz3b52kbck7fhc7zrz24lv121wspiaj";
     propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ];
     meta.description = "Assert-like extension nodes that raise useful errors on failure";
   };
 
   ppx_inline_test = janePackage {
     name = "ppx_inline_test";
-    version = "0.9.2";
-    hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa";
+    hash = "0ar4lpl3zwb7k1f4clqsw1hyzwa104gf118a2i89c4hvj2721jwf";
     propagatedBuildInputs = [ ppx_metaquot ];
     meta.description = "Syntax extension for writing in-line tests in OCaml code";
   };
 
   typerep = janePackage {
     name = "typerep";
-    hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3";
+    hash = "11na0kag6aggckx7326zq8hh9pzymkwqfxsd25fswskk5lpnvwqv";
     propagatedBuildInputs = [ base ];
     meta.description = "Runtime types for OCaml";
   };
 
   ppx_bench = janePackage {
     name = "ppx_bench";
-    hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93";
+    hash = "17l5shhi613l02yfipyr4hna3lj94kn6zy746rvsgcibyc7nybq6";
     propagatedBuildInputs = [ ppx_inline_test ];
     meta.description = "Syntax extension for writing in-line benchmarks in OCaml code";
   };
 
   ppx_expect = janePackage {
     name = "ppx_expect";
-    hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b";
+    hash = "0qq07iqfsbksklwn7rr1wdz79kji0iyq5qkyfwxrxm0ci9fz0h1w";
     propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ];
     meta.description = "Cram like framework for OCaml";
   };
 
   ppx_fail = janePackage {
     name = "ppx_fail";
-    hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32";
+    hash = "0cwz16xy5s0ijm9y98lh9089ic7wd161njpdncgsxy6lgsjawap2";
     propagatedBuildInputs = [ ppx_here ppx_metaquot ];
     meta.description = "Add location to calls to failwiths";
   };
 
   ppx_let = janePackage {
     name = "ppx_let";
-    hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr";
+    hash = "0smdxkjh4nxrf3mwzfvkjbymvwbz04v70k2gwxsaz5f6wvnhyvmm";
     propagatedBuildInputs = [ ppx_driver ];
     meta.description = "Monadic let-bindings";
   };
 
   ppx_optional = janePackage {
     name = "ppx_optional";
-    hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82";
+    hash = "1qmc0yzp9jab8yndxs0ca3qx35wyhfwiknqk0gfjmar2ji87zlzn";
     propagatedBuildInputs = [ ppx_metaquot ];
     meta.description = "Pattern matching on flat options";
   };
 
   ppx_pipebang = janePackage {
     name = "ppx_pipebang";
-    hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h";
+    hash = "0lzw6qc9f9g7zkbhhp4603b3mj3jvca4phx40f95d49y370325qx";
     propagatedBuildInputs = [ ppx_metaquot ];
     meta.description = "A ppx rewriter that inlines reverse application operators |> and |!";
   };
 
   ppx_sexp_message = janePackage {
     name = "ppx_sexp_message";
-    hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv";
+    hash = "1gddia4ry2pmnh4qj5855a044lqs23g5h038bkny73xg7w06jhrk";
     propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
     meta.description = "A ppx rewriter for easy construction of s-expressions";
   };
 
   ppx_sexp_value = janePackage {
     name = "ppx_sexp_value";
-    hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah";
+    hash = "1xd5ln997wka8x4dba58yh525a5f36sklngg2z7iyiss7xi4yg7i";
     propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
     meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values";
   };
 
   ppx_typerep_conv = janePackage {
     name = "ppx_typerep_conv";
-    hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1";
+    hash = "1bk8zgagf6q5lb7icsrbzs05c8dz1gij0clzk39am40l83zs3ain";
     propagatedBuildInputs = [ ppx_type_conv typerep ];
     meta.description = "Generation of runtime types from type declarations";
   };
 
   ppx_jane = janePackage {
     name = "ppx_jane";
-    hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc";
+    hash = "1lhzcfh129dc54bkg16rnldi97682nlzdr8a47ham3hg2kkab8kr";
     propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
     meta.description = "Standard Jane Street ppx rewriters";
   };
@@ -301,35 +288,33 @@ rec {
 
   configurator = janePackage {
     name = "configurator";
-    version = "0.9.1";
-    hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix";
-    propagatedBuildInputs = [ ppx_base ];
+    hash = "0lydjj4r21ipmc91hyf91mjjvcibk4r7ipan8bqfzb5l490r95rp";
+    propagatedBuildInputs = [ base stdio ];
     meta.description = "Helper library for gathering system configuration";
   };
 
   jane-street-headers = janePackage {
     name = "jane-street-headers";
-    hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy";
+    hash = "1sqyqzhgi52vq33i8ha2pmjg026qiqmpaqmibs3pfj4jsscwl842";
     meta.description = "Jane Street header files";
   };
 
   core_kernel = janePackage {
     name = "core_kernel";
-    hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh";
+    hash = "00iqd9wcana2blgdih1lq9zqd31agr6az912bhsklyarvvcn9hcb";
     propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ];
     meta.description = "Jane Street's standard library overlay (kernel)";
   };
 
   spawn = janePackage {
     name = "spawn";
-    hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5";
+    hash = "1av1pjkiqq3nz0rjmykiylhf0iv6d1ssvqqj6wcc3c0bzvgyih0p";
     meta.description = "Spawning sub-processes";
   };
 
   core = janePackage {
     name = "core";
-    version = "0.9.1";
-    hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8";
+    hash = "06cra34rlqpmxh4f3v1vps9fs7hy90jjnipdvcf9z8cn925mdj46";
     propagatedBuildInputs = [ core_kernel spawn ];
     meta.description = "Jane Street's standard library overlay";
   };
@@ -338,7 +323,8 @@ rec {
 
   re2 = janePackage {
     name = "re2";
-    hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi";
+    version = "0.10.1";
+    hash = "1d39brryfaj5fqp1kzw67n1bvfxv28xi058mk5il14wj40y5ldh1";
     propagatedBuildInputs = [ core_kernel ];
     meta = {
       description = "OCaml bindings for RE2";
@@ -348,14 +334,21 @@ rec {
 
   textutils = janePackage {
     name = "textutils";
-    hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d";
-    propagatedBuildInputs = [ core ];
+    hash = "0mnmrp8kd443qx9gahrwr04a8q4hskcad2i1k9amiypbwy566s37";
+    propagatedBuildInputs = [ core textutils_kernel ];
     meta.description = "Text output utilities";
   };
 
+  textutils_kernel = janePackage {
+    name = "textutils_kernel";
+    hash = "0w7nf7sycffff318fxr42ss1fxa3bsy9kj7y27dl1whrajip9mb7";
+    propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ];
+    meta.description = "The subset of textutils using only core_kernel and working in javascript";
+  };
+
   core_extended = janePackage {
     name = "core_extended";
-    hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk";
+    hash = "0g9adnr68l4ggayilmvz9nnf2slvnp0jzknjrxk10cab72l97rv4";
     propagatedBuildInputs = [ core re2 textutils ];
     postPatch = ''
       patchShebangs src/discover.sh
@@ -369,63 +362,63 @@ rec {
 
   async_kernel = janePackage {
     name = "async_kernel";
-    hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x";
+    hash = "09dzfyfmjf9894yimf1fpnc2l1v342f51a2wjr3d23pw6xnbcrl0";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Jane Street Capital's asynchronous execution library (core)";
   };
 
   async_rpc_kernel = janePackage {
     name = "async_rpc_kernel";
-    hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b";
-    propagatedBuildInputs = [ core_kernel async_kernel ];
+    hash = "1ardfr4vwbzc41qa2ccmzp15m9w3nbdl9cy4crvm87fi0ngkhixy";
+    propagatedBuildInputs = [ core_kernel async_kernel protocol_version_header ];
     meta.description = "Platform-independent core of Async RPC library";
   };
 
   async_unix = janePackage {
     name = "async_unix";
-    hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d";
+    hash = "151pn0543fwvi5gkdkbd05v8y9gjbxi1n69r4jxzc0bh842xx4xz";
     propagatedBuildInputs = [ core async_kernel ];
     meta.description = "Jane Street Capital's asynchronous execution library (unix)";
   };
 
   async_extra = janePackage {
     name = "async_extra";
-    hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0";
+    hash = "0vf3nfj8h7vnigs8l8m1bsg6w3szgaylaps6mbl4dsaihxdc732n";
     propagatedBuildInputs = [ async_rpc_kernel async_unix ];
     meta.description = "Jane Street's asynchronous execution library (extra)";
   };
 
   async = janePackage {
     name = "async";
-    hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1";
+    hash = "05ldvyw75648qrjx7q794m9llmlnqklh97lc09fv8biw515dby3d";
     propagatedBuildInputs = [ async_extra ];
     meta.description = "Jane Street Capital's asynchronous execution library";
   };
 
   async_find = janePackage {
     name = "async_find";
-    hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq";
+    hash = "05cpnz1m09h276cq6v3bh7da4iai14gmlh4cnh64v41f8hssw63s";
     propagatedBuildInputs = [ async ];
     meta.description = "Directory traversal with Async";
   };
 
   async_interactive = janePackage {
     name = "async_interactive";
-    hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j";
+    hash = "1h2419l6nlqph3ipp5zdwyq55d3s602i4bv4jhsridmzy6cxxdxs";
     propagatedBuildInputs = [ async ];
     meta.description = "Utilities for building simple command-line based user interfaces";
   };
 
   async_parallel = janePackage {
     name = "async_parallel";
-    hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn";
+    hash = "0r8q73v26w3grj9n9wyrf65cq9w6pfzrmg9iswsy4jjb5r02bpr5";
     propagatedBuildInputs = [ async ];
     meta.description = "Distributed computing library";
   };
 
   async_shell = janePackage {
     name = "async_shell";
-    hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2";
+    hash = "1snkr944l3a627k23yh8f0lr900dpg2aym2l59fpp75s29pyk5md";
     propagatedBuildInputs = [ core_extended async ];
     meta = {
       description = "Shell helpers for Async";
@@ -434,7 +427,7 @@ rec {
 
   async_ssl = janePackage {
     name = "async_ssl";
-    hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss";
+    hash = "1cb9wpmgifa5vj9gadbav6bq6vxcm3g0jc6wxnkj3hgvnj35j2vy";
     propagatedBuildInputs = [ async ctypes openssl ];
     meta.description = "Async wrappers for SSL";
   };
@@ -443,21 +436,21 @@ rec {
 
   sexp_pretty = janePackage {
     name = "sexp_pretty";
-    hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx";
+    hash = "106r91ahzdr8yvphs1s3ck8r89c4qhpcl9q6j5rbxrbihgb71i8d";
     propagatedBuildInputs = [ ppx_base re ];
     meta.description = "S-expression pretty-printer";
   };
 
   expect_test_helpers_kernel = janePackage {
     name = "expect_test_helpers_kernel";
-    hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6";
+    hash = "027pwfkdnz8rzgg9dqa4x2ir0zn8lav7gh64cih35r455xbfnvpr";
     propagatedBuildInputs = [ core_kernel sexp_pretty ];
     meta.description = "Helpers for writing expectation tests";
   };
 
   expect_test_helpers = janePackage {
     name = "expect_test_helpers";
-    hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2";
+    hash = "0rzsgj8h73gx18sz1a1d3pbrjkb0vd6shl1h71n4xl05njcfb73r";
     propagatedBuildInputs = [ async expect_test_helpers_kernel ];
     meta.description = "Async helpers for writing expectation tests";
   };
@@ -466,28 +459,28 @@ rec {
 
   bignum = janePackage {
     name = "bignum";
-    hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3";
-    propagatedBuildInputs = [ core_kernel zarith ];
+    hash = "0vs52aqq7pwazgv35zdd66c5v5ha1wrgrcmzc17c2qbswy8wcc37";
+    propagatedBuildInputs = [ core_kernel zarith num ];
     meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
   };
 
   cinaps = janePackage {
     name = "cinaps";
-    hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5";
+    hash = "1mwllcakvsirxpbwcqlglwqkiz8cks7vbjf1jvngs9703mx1xdcy";
     propagatedBuildInputs = [ re ];
     meta.description = "Trivial Metaprogramming tool using the OCaml toplevel";
   };
 
   command_rpc = janePackage {
     name = "command_rpc";
-    hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824";
+    hash = "0lq1vcz8qyyqabrz9isw2pw50663lwmq4w3187jp99ygar9lk5n2";
     propagatedBuildInputs = [ async ];
     meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout";
   };
 
   core_bench = janePackage {
     name = "core_bench";
-    hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h";
+    hash = "1py68z848gj5wdmknqmzdb6zg65k5zchv6i6vzygi5nszn3zzwgc";
     propagatedBuildInputs = [ core_extended ];
     meta = {
       description = "Micro-benchmarking library for OCaml";
@@ -496,7 +489,7 @@ rec {
 
   core_profiler = janePackage {
     name = "core_profiler";
-    hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44";
+    hash = "1vqkb8fzhs0k94k78whjnsznj85qa18kp0bq73mdkffz9562hdyr";
     propagatedBuildInputs = [ core_extended ];
     meta = {
       description = "Profiling library";
@@ -505,22 +498,22 @@ rec {
 
   csvfields = janePackage {
     name = "csvfields";
-    hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v";
-    propagatedBuildInputs = [ core ];
+    hash = "1qvcm2xkpw5ca5za2dfvz154h6kzm565wvynh7fffvrj2q719flm";
+    propagatedBuildInputs = [ core expect_test_helpers ];
     meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
   };
 
   ecaml = janePackage {
     name = "ecaml";
-    hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i";
-    propagatedBuildInputs = [ async ];
+    hash = "1h8m8nznsyc8md8f5rx3845lpl37ijqpxkpd52w92xy5hlc9bk1k";
+    propagatedBuildInputs = [ async expect_test_helpers_kernel ];
     meta.description = "Writing Emacs plugin in OCaml";
   };
 
   email_message = janePackage {
     name = "email_message";
-    hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz";
-    propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ];
+    hash = "0p56lak1ynqmimapsz529ankgdyd5yk90c0193q8fzv7fvvrzkzd";
+    propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ];
     meta = {
       description = "E-mail message parser";
     };
@@ -528,28 +521,28 @@ rec {
 
   incremental_kernel = janePackage {
     name = "incremental_kernel";
-    hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5";
+    hash = "15xw3l07fdqk5sla37fdvfnwykvq6fyrj9b2lwhc29rq0444m1yz";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Library for incremental computations depending only on core_kernel";
   };
 
   incremental = janePackage {
     name = "incremental";
-    hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh";
+    hash = "14hh7kxj70bpgylnx1fj3s5c40d12sgcb11cnh1xh7nwm190a9c2";
     propagatedBuildInputs = [ core incremental_kernel ];
     meta.description = "Library for incremental computations";
   };
 
   incr_map = janePackage {
     name = "incr_map";
-    hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv";
+    hash = "0s6c7f8a80s7bnjxcs7mdgm45i24d1j0vw4i2j884z1ssjrk33hw";
     propagatedBuildInputs = [ incremental_kernel ];
     meta.description = "Helpers for incremental operations on map like data structures";
   };
 
   ocaml_plugin = janePackage {
     name = "ocaml_plugin";
-    hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14";
+    hash = "0b63ciajc9hcjs3pl0chlj475y60i3l5mjzaiqmyz1pryfqpri7r";
     buildInputs = [ ocamlbuild ];
     propagatedBuildInputs = [ async ];
     meta.description = "Automatically build and dynlink ocaml source files";
@@ -557,59 +550,57 @@ rec {
 
   parsexp = janePackage {
     name = "parsexp";
-    hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b";
+    hash = "1k1z6kyp7c53l0wspz6qpvbb46bbr6aimnr06y6y1prxrpazm62w";
     propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ];
     meta.description = "S-expression parsing library";
   };
 
   parsexp_io = janePackage {
     name = "parsexp_io";
-    hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5";
+    hash = "0l9jrfm1zz0y6bfxla2s0fwjlvs9361ky83z3xwdlc48fgzks3a5";
     propagatedBuildInputs = [ parsexp ];
     meta.description = "S-expression parsing library (IO functions)";
   };
 
   patience_diff = janePackage {
     name = "patience_diff";
-    hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg";
+    hash = "11ws6hsalmq7zc7wp37mj7zs3qaqkq4zlnwr06ybryv6vz62xj1l";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Tool and library implementing patience diff";
   };
 
   posixat = janePackage {
     name = "posixat";
-    hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl";
+    hash = "0dmjzbpbmzl94h4c1gk6k75wglnvk1kqcm4zs4nb9hy2ja8ldl9x";
     propagatedBuildInputs = [ ppx_sexp_conv ];
     meta.description = "Binding to the posix *at functions";
-    meta.broken = lib.versionAtLeast ocaml.version "4.05";
+  };
+
+  protocol_version_header = janePackage {
+    name = "protocol_version_header";
+    hash = "1vl1kfn8n1zdm3vh7228c58vprac4v7mpqks60k8rnzjj4w2mj1n";
+    propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ];
+    meta.description = "Protocol aware version negotiation";
   };
 
   rpc_parallel = janePackage {
     name = "rpc_parallel";
-    hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38";
+    hash = "01nyjqgdj351ykdaqqpaljwzac48x824lzfpma64lbp6plqmjlbf";
     propagatedBuildInputs = [ async ];
     meta.description = "Type-safe library for building parallel applications";
   };
 
   shexp = janePackage {
     name = "shexp";
-    hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y";
+    hash = "1ck5gcsdp93194bw6d1i116zplyaqrz1r36h6mvrw5x7i2549n9p";
     propagatedBuildInputs = [ posixat spawn ];
     meta.description = "Process library and s-expression based shell";
   };
 
   topological_sort = janePackage {
     name = "topological_sort";
-    hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy";
+    hash = "08w1dx30frj2bxxk8djl23cd43sassjkrmissyhagn9fmq2l904m";
     propagatedBuildInputs = [ core_kernel ];
     meta.description = "Topological sort algorithm";
   };
-
-  typerep_extended = janePackage {
-    name = "typerep_extended";
-    hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p";
-    propagatedBuildInputs = [ core_kernel ];
-    meta.description = "Runtime types for OCaml (Extended)";
-  };
-
 }
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index 6d6a4d71442..d9c8b9e66fe 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }:
 
-{ name, version ? "0.9.0", buildInputs ? [], hash, meta, ...}@args:
+{ name, version ? "0.10.0", buildInputs ? [], hash, meta, ...}@args:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.03"
 then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4a6e4e815bb..efce8c412d9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -714,8 +714,9 @@ let
     janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
 
     janeStreet = import ../development/ocaml-modules/janestreet {
-      inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num;
-      inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
+      inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit;
+      inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
+      inherit ppx_deriving re zarith;
       inherit (pkgs) stdenv openssl;
     };
 

From 6a9ab8db119a5ff9704fec7a0d5dcb8984a32666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Feb 2018 20:20:09 +0100
Subject: [PATCH 0253/2266] mesa: 17.3.5 -> 17.3.6 (bugfix)

It's emergency bugfix for intel.
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 8d2e3e90716..6ae29ccfa72 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -66,7 +66,7 @@ let
 in
 
 let
-  version = "17.3.5";
+  version = "17.3.6";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a";
+    sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8";
   };
 
   prePatch = "patchShebangs .";

From ce34a9a331017ce29d57f8ee0965454e77cee45a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:16 +0100
Subject: [PATCH 0254/2266] python: botocore: 1.9.0 -> 1.9.3

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e03aade3d95..5276fdb9329 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.9.0";
+  version = "1.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f70f7f5682a2e7593079ec813f774044ef464b0ebe680dab47930f40e230d6d5";
+    sha256 = "d5b892ab86cd3e8d6cb570dd5275bf1c600cbbf9f07a40a22bcdd9023c0e844f";
   };
 
   propagatedBuildInputs = [

From 7ee5833cc8945b60470f3d095fb361e1e3ae59aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:21 +0100
Subject: [PATCH 0255/2266] python: zc.buildout: 2.11.0 -> 2.11.1

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

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index c4cde583f05..5c21757421b 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.11.0";
+  version = "2.11.1";
   name = "${pname}-nix-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "092b0a147d5fb4e79ee0afde665570f85738e714463854f9e4f7f38d0b27ea82";
+    sha256 = "08017dcd8f4b60b48b7d830da835a9350c07e7f383fa56d45925ab5144400281";
   };
 
   patches = [ ./nix.patch ];

From 0e5e184836ef495919a29ac9b182ce4a7bde62de Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:26 +0100
Subject: [PATCH 0256/2266] python: cffi: 1.11.4 -> 1.11.5

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

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 5e186a8f2f8..cd643806c3a 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,12 +2,12 @@
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
-  version = "1.11.4";
+  version = "1.11.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d";
+    sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4";
   };
 
   outputs = [ "out" "dev" ];

From c687e1606a2e9edf34c4e16804c2bf4876bcefb0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:31 +0100
Subject: [PATCH 0257/2266] python: google-cloud-core: 0.28.0 -> 0.28.1

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

diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index c0ccef3c959..d9111ac8915 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "0.28.0";
+  version = "0.28.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h8bx99ksla48zkb7bhkqy66b8prg49dp15alh851vzi9ii2zii7";
+    sha256 = "89e8140a288acec20c5e56159461d3afa4073570c9758c05d4e6cb7f2f8cc440";
   };
 
   propagatedBuildInputs = [ google_api_core grpcio ];

From dfdec6f6cca047b2400fe5d67a24083388a627bc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:36 +0100
Subject: [PATCH 0258/2266] python: google-cloud-speech: 0.32.0 -> 0.32.1

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

diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index c24e0d88067..9912316941f 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "0.32.0";
+  version = "0.32.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2513725e693c3a2fdf22cb3065f3fcb39de2ab962a0cbc5de11a3889834189e1";
+    sha256 = "4f9a8ab3eb6630d0c0ca6ac15230dceba7d55d6707d162a84f255139ff780ee9";
   };
 
   propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];

From 7ce85c014e9ceda9d680b67a133c138c857a3555 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:41 +0100
Subject: [PATCH 0259/2266] python: neovim: 0.2.1 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix
index 6fcd82aca9e..c4b2a7e9cc8 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/neovim/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "neovim";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16vzxmp7f6dl20n30j5cwwvrjj5h3c2ch8ldbss31anf36nirsdp";
+    sha256 = "989d720dc7636aa4260aa7774fa79aa524f51515b262eb8d7e9ba4336f758a99";
   };
 
   checkInputs = [ nose ];

From a8e3ffc789f52728d015d186c40935b2f6e60d41 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:46 +0100
Subject: [PATCH 0260/2266] python: nipype: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index a38f23d5536..30ee2b28561 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -29,11 +29,11 @@ assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea";
+    sha256 = "47f62fda3d6b9a37aa407a6b78c80e91240aa71e61191ed00da68b02839fe258";
   };
 
   doCheck = false;  # fails with TypeError: None is not callable

From c70226374306608e0a1d9c5d8106b78534c5a9e9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:58:50 +0100
Subject: [PATCH 0261/2266] python: pymongo: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 577cd9142f9..038b12b3a9e 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "3.6.0";
+  version = "3.6.1";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6de26d1e171cdc449745b82f1addbc873d105b8e7335097da991c0fc664a4a8";
+    sha256 = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796";
   };
 
   doCheck = false;

From e5bd0d904a281f53dd833835d5c8eb173b670d2b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:59:00 +0100
Subject: [PATCH 0262/2266] python: sqlmap: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 0fa889b88f2..5d5e6d4bfd2 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.2.2";
+  version = "1.2.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6256e0d5ab6d465152c8a8a21bdb97b50e155255d6bedd586ce214ed7a1fb9d7";
+    sha256 = "0db9d1dd2e9624befff25f7e1a356f32366e4f05fd7e1a1783499816416ae28e";
   };
 
   # No tests in archive

From e76de27ccaa3ff502d4a84bddf93f40b28f38208 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:59:05 +0100
Subject: [PATCH 0263/2266] python: stripe: 1.79.0 -> 1.79.1

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

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 9a3ed36d893..95da0ec9b4f 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.79.0";
+  version = "1.79.1";
 
   # Tests require network connectivity and there's no easy way to disable
   # them. ~ C.
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "490bb7bfc7d224e483d643171fd860f8a1670e31fd9cef8cb8d9a7c19806d450";
+    sha256 = "2ec19bf8ad588ec04b36c35f359196fa1991f9ad911b1686ac2a12651a154947";
   };
 
   checkInputs = [ unittest2 mock ];

From ea65fabd02ac48c3a40a3e989e70d50f8ed8a267 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:59:10 +0100
Subject: [PATCH 0264/2266] python: tqdm: 4.19.5 -> 4.19.6

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

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 209ee8ccd6b..44943cdabab 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.19.5";
+  version = "4.19.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "df32e6f127dc0ccbc675eadb33f749abbcb8f174c5cb9ec49c0cdb73aa737377";
+    sha256 = "5ec0d4442358e55cdb4a0471d04c6c831518fd8837f259db5537d90feab380df";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];

From d9cb2f39552f34bc88c6c602d89a06dfacb90997 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:59:15 +0100
Subject: [PATCH 0265/2266] python: pipenv: 10.1.0 -> 10.1.2

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

diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index de2e6eb96a8..c5c406ef36c 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -2,11 +2,11 @@
 with python3Packages; buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "pipenv";
-    version = "10.1.0";
+    version = "10.1.2";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "3732350e3cd8cc033d66748c418bab4b018dc0a4fcf1687f17a103ac44eac0c6";
+      sha256 = "ce6dbb305fb1f262dba0dcb50c06591e4d146f7bfe079cc9f0ce3f89c7516ae9";
     };
 
     LC_ALL = "en_US.UTF-8";

From 9c66da41fa873e3a1dd37e5999d655dc56b3ee05 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:59:20 +0100
Subject: [PATCH 0266/2266] python: vcstool: 0.1.32 -> 0.1.33

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

diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 2dd03b1d02a..0822b33aef0 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -6,11 +6,11 @@ with python3Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "vcstool";
-  version = "0.1.32";
+  version = "0.1.33";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "adf09fad9feaa9bc2d7fe53e909951b6b7300db2f2e0717f12ccd44e047a8839";
+    sha256 = "1140d3ecafb2c42c2c1a309950c7f327b09b548c00fbf6e37c8f44b8a610dfbc";
   };
 
   propagatedBuildInputs = [ pyyaml ];

From a5913ce2722b067fdc346a3c06e51ff5aaa1aef9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 11:59:25 +0100
Subject: [PATCH 0267/2266] python: you-get: 0.4.1025 -> 0.4.1040

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

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 5ae99d23939..795c2ab191d 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1025";
+  version = "0.4.1040";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dbalpwhzn39kgswjy84720wfjssa087adavbwig53krsjdvhj6k";
+    sha256 = "fdc9021e8b1cf936aad4bd6c74b80ea8fa3573b807c41242ba781e247f8c8ca8";
   };
 
   meta = with stdenv.lib; {

From bef07b86edadc8611bbc5805b723979cf86ff8ff Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Sat, 3 Mar 2018 20:39:17 +0900
Subject: [PATCH 0268/2266] bump janePackage's version lower bound

---
 pkgs/development/ocaml-modules/janestreet/janePackage.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index d9c8b9e66fe..ddbb11220a0 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -2,7 +2,7 @@
 
 { name, version ? "0.10.0", buildInputs ? [], hash, meta, ...}@args:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+if !stdenv.lib.versionAtLeast ocaml.version "4.04"
 then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation (args // {

From 03e54c5e8831def65208e65886e6e7afbfc29bb8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Mar 2018 17:14:09 +0100
Subject: [PATCH 0269/2266] Python: introduce toPythonApplication function

This commit introduces the `toPythonApplication` function. Certain
Python packages are considered both a library and an application, that
is, they expose importable modules, but typically executables that are
part of the package are used instead.

In this case, the package needs to be added to `python-packages.nix` in
order for it to be available as a library. An alias with this function
can then be added in `all-packages.nix`, e.g.:

```
ansible = with pythonPackages; toPythonApplication ansible;
```
---
 pkgs/top-level/python-packages.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c17112e623c..f216da0e0af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -98,6 +98,9 @@ let
   # providing Python modules.
   makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (requiredPythonModules drvs);
 
+  removePythonPrefix = name:
+    removePrefix namePrefix name;
+
   # Convert derivation to a Python module.
   toPythonModule = drv:
     drv.overrideAttrs( oldAttrs: {
@@ -109,14 +112,27 @@ let
       };
     });
 
+  # Convert a Python library to an application.
+  toPythonApplication = drv:
+    drv.overrideAttrs( oldAttrs: {
+      passthru = (oldAttrs.passthru or {}) // {
+        # Remove Python prefix from name so we have a "normal" name.
+        # While the prefix shows up in the store path, it won't be
+        # used by `nix-env`.
+        name = removePythonPrefix oldAttrs.name;
+        pythonModule = false;
+      };
+    });
+
   disabledIf = x: drv:
-    if x then throw "${removePrefix namePrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv;
+    if x then throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv;
 
 in {
 
   inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication;
   inherit fetchPypi callPackage;
   inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
+  inherit toPythonModule toPythonApplication;
 
   # helpers
 

From 2ca4e73fbaea47e94b9c3f76572d962f7e1deb03 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 10:01:19 +0800
Subject: [PATCH 0270/2266] pythonPackages.aiohttp-jinja2: init at 0.16.0

---
 .../python-modules/aiohttp-jinja2/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiohttp-jinja2/default.nix

diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
new file mode 100644
index 00000000000..7b3bd6bbcc5
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
+
+buildPythonPackage rec {
+  pname = "aiohttp-jinja2";
+  version = "0.16.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ps182yrc5g9ph55927a7ssqx6m9kx0bivfxpaj8sa3znrdkl94d";
+  };
+
+  propagatedBuildInputs = [ aiohttp jinja2 ];
+
+  checkInputs = [ pytest pytest-aiohttp ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "Jinja2 support for aiohttp";
+    homepage = https://github.com/aio-libs/aiohttp_jinja2;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0fb4e9cd805..fb0eb31be5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -430,6 +430,8 @@ in {
 
   aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { };
 
+  aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
+
   alabaster = callPackage ../development/python-modules/alabaster {};
 
   alembic = callPackage ../development/python-modules/alembic {};

From 861e2de8a8295702f010e77f42d5ef3750c1e0cb Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Sun, 4 Mar 2018 14:06:10 +0100
Subject: [PATCH 0271/2266] ansible-lint: init at 3.4.20

---
 lib/maintainers-list.nix                      |  5 +++++
 .../tools/ansible-lint/default.nix            | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/ansible-lint/default.nix

diff --git a/lib/maintainers-list.nix b/lib/maintainers-list.nix
index f397ee0ddb8..6d2308e5489 100644
--- a/lib/maintainers-list.nix
+++ b/lib/maintainers-list.nix
@@ -3155,6 +3155,11 @@
     github = "sellout";
     name = "Greg Pfeil";
   };
+  sengaya = {
+    email = "tlo@sengaya.de";
+    github = "sengaya";
+    name = "Thilo Uttendorfer";
+  };
   sepi = {
     email = "raffael@mancini.lu";
     github = "sepi";
diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix
new file mode 100644
index 00000000000..51f89698d5a
--- /dev/null
+++ b/pkgs/development/tools/ansible-lint/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, pythonPackages, ansible }:
+
+pythonPackages.buildPythonPackage rec {
+  pname = "ansible-lint";
+  version = "3.4.20";
+  doCheck = false;
+
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "1e7f1d5d5ee91b817dedc0b612c2beb5ff44879d592ea17a2eaa6571aa9a2bff";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ];
+
+  meta = {
+    homepage = "https://github.com/willthames/ansible-lint";
+    description = "Best practices checker for Ansible";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.sengaya ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79d4289d26c..ac86b86b6f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7338,6 +7338,8 @@ with pkgs;
   ansible  = ansible_2_4;
   ansible2 = ansible_2_4;
 
+  ansible-lint = callPackage ../development/tools/ansible-lint {};
+
   antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
 
   antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };

From 3572041533745460dbdd9e9a3fcb477ea202c79a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 08:01:40 -0800
Subject: [PATCH 0272/2266] newt: 0.52.15 -> 0.52.20

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/xbjik2b7dbm76gjy47mrvi27iwri304z-newt-0.52.20/bin/whiptail -h` got 0 exit code
- ran `/nix/store/xbjik2b7dbm76gjy47mrvi27iwri304z-newt-0.52.20/bin/whiptail --help` got 0 exit code
- ran `/nix/store/xbjik2b7dbm76gjy47mrvi27iwri304z-newt-0.52.20/bin/whiptail -v` and found version 0.52.20
- ran `/nix/store/xbjik2b7dbm76gjy47mrvi27iwri304z-newt-0.52.20/bin/whiptail --version` and found version 0.52.20
- found 0.52.20 with grep in /nix/store/xbjik2b7dbm76gjy47mrvi27iwri304z-newt-0.52.20
- found 0.52.20 in filename of file in /nix/store/xbjik2b7dbm76gjy47mrvi27iwri304z-newt-0.52.20

cc "@viric"
---
 pkgs/development/libraries/newt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index c4e019bf3ac..cd1e51bd19c 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, slang, popt }:
 
 stdenv.mkDerivation rec {
-  name = "newt-0.52.15";
+  name = "newt-0.52.20";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";
-    sha256 = "0hg2l0siriq6qrz6mmzr6l7rpl40ay56c8cak87rb2ks7s952qbs";
+    sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld";
   };
 
   patchPhase = ''

From d6ab8a666ddd4e109722cb84b76fe45bb4f8be88 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 21:09:24 -0800
Subject: [PATCH 0273/2266] libspatialite: 4.2.0 -> 4.3.0a

Semi-automatic update. These checks were performed:

- built on NixOS
- found 4.3.0a with grep in /nix/store/m0xjxq9ca1fwhwzl6klfaz4kj7v21cnr-libspatialite-4.3.0a
- found 4.3.0a in filename of file in /nix/store/m0xjxq9ca1fwhwzl6klfaz4kj7v21cnr-libspatialite-4.3.0a
---
 pkgs/development/libraries/libspatialite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index 19ccc9159a3..253c5365c8a 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -3,11 +3,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "libspatialite-4.2.0";
+  name = "libspatialite-4.3.0a";
 
   src = fetchurl {
     url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
-    sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz";
+    sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 59e58f7aa16f8197d5d7ba4cd0eec9f0b7807fe6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:58:16 -0800
Subject: [PATCH 0274/2266] libqmi: 1.18.0 -> 1.20.0

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmi-network --help` got 0 exit code
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmi-network --version` and found version 1.20.0
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmicli -h` got 0 exit code
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmicli --help` got 0 exit code
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmicli -V` and found version 1.20.0
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmicli --version` and found version 1.20.0
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmi-firmware-update -h` got 0 exit code
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmi-firmware-update --help` got 0 exit code
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmi-firmware-update -V` and found version 1.20.0
- ran `/nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0/bin/qmi-firmware-update --version` and found version 1.20.0
- found 1.20.0 with grep in /nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0
- found 1.20.0 in filename of file in /nix/store/zv2yn5d1z16kcmi5p3766mh5v5imp8ky-libqmi-1.20.0

cc "@wkennington"
---
 pkgs/development/libraries/libqmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index afa8a0451ac..a0f5ac73767 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }:
 
 stdenv.mkDerivation rec {
-  name = "libqmi-1.18.0";
+  name = "libqmi-1.20.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz";
-    sha256 = "1v4cz3nsmh7nn3smhlhwzrb7yh6l1f270bwf40qacxayjdajr950";
+    sha256 = "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 52b2e79a8b63f5faff42346e393000f0926994f1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 08:12:42 -0800
Subject: [PATCH 0275/2266] nspr: 4.17 -> 4.18

Semi-automatic update. These checks were performed:

- built on NixOS
- found 4.18 with grep in /nix/store/23322yndj5lh6n4pr3maj26irnwklq31-nspr-4.18
- found 4.18 in filename of file in /nix/store/23322yndj5lh6n4pr3maj26irnwklq31-nspr-4.18
---
 pkgs/development/libraries/nspr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index ccb04024f64..17805f32afb 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.17"; in
+let version = "4.18"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "158hdn285dsb5rys8wl1wi32dd1axwhqq0r8fwny4aj157m0l2jr";
+    sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq";
   };
 
   outputs = [ "out" "dev" ];

From d45a6a3e0d768686cb6aacac23a08de089794177 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:44:26 -0800
Subject: [PATCH 0276/2266] libmbim: 1.14.2 -> 1.16.0

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbim-network -h` got 0 exit code
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbim-network --help` got 0 exit code
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbim-network --version` and found version 1.16.0
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbimcli -h` got 0 exit code
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbimcli --help` got 0 exit code
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbimcli -V` and found version 1.16.0
- ran `/nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0/bin/mbimcli --version` and found version 1.16.0
- found 1.16.0 with grep in /nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0
- found 1.16.0 in filename of file in /nix/store/qp1xvvasv2abihckhlv8ygl6fgdgqdpw-libmbim-1.16.0

cc "@wkennington"
---
 pkgs/development/libraries/libmbim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 1c8e65dafd4..431770ef12d 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }:
 
 stdenv.mkDerivation rec {
-  name = "libmbim-1.14.2";
+  name = "libmbim-1.16.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz";
-    sha256 = "1krirl9881dnx7l29zhvagk2qlhi26vpvkzdifjklhrjhimzxji2";
+    sha256 = "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8";
   };
 
   outputs = [ "out" "dev" "man" ];

From 2e98f6b966c8e899113ceba5fbcd232b940737a9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:50:36 -0800
Subject: [PATCH 0277/2266] libmodplug: 0.8.8.5 -> 0.8.9.0

Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.8.9.0 with grep in /nix/store/vbfn9xivgfy294g5216r6jcy78dg9rf3-libmodplug-0.8.9.0
- found 0.8.9.0 in filename of file in /nix/store/vbfn9xivgfy294g5216r6jcy78dg9rf3-libmodplug-0.8.9.0

cc "@raskin"
---
 pkgs/development/libraries/libmodplug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index 600d7faace2..85800491016 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  version = "0.8.8.5";
+  version = "0.8.9.0";
 in stdenv.mkDerivation rec {
   name = "libmodplug-${version}";
 
@@ -15,6 +15,6 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz";
-    sha256 = "1bfsladg7h6vnii47dd66f5vh1ir7qv12mfb8n36qiwrxq92sikp";
+    sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";
   };
 }

From 3734c633da6f7e62ddae545e8db1ace9c58dffa9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:42:14 -0800
Subject: [PATCH 0278/2266] libkate: 0.3.8 -> 0.4.1

Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.4.1 with grep in /nix/store/mc5wm3bsmx9n4xxf54by4hck21yjzljx-libkate-0.4.1
- found 0.4.1 in filename of file in /nix/store/mc5wm3bsmx9n4xxf54by4hck21yjzljx-libkate-0.4.1

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

diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index 77f047b4c58..6c7e5881a78 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libogg, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "libkate-0.3.8";
+  name = "libkate-0.4.1";
 
   src = fetchurl {
     url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz";
-    sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n";
+    sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4";
   };
 
   buildInputs = [ libogg libpng ];

From c4f79b25649b743dd7c8254c211ead947601dcff Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:40:00 -0800
Subject: [PATCH 0279/2266] libinput: 1.9.4 -> 1.10.0

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/zx5s9rsk3jh7n9vlx7824chzd54fw3nd-libinput-1.10.0/bin/libinput -h` got 0 exit code
- ran `/nix/store/zx5s9rsk3jh7n9vlx7824chzd54fw3nd-libinput-1.10.0/bin/libinput --help` got 0 exit code
- ran `/nix/store/zx5s9rsk3jh7n9vlx7824chzd54fw3nd-libinput-1.10.0/bin/libinput --version` and found version 1.10.0
- found 1.10.0 with grep in /nix/store/zx5s9rsk3jh7n9vlx7824chzd54fw3nd-libinput-1.10.0
- found 1.10.0 in filename of file in /nix/store/zx5s9rsk3jh7n9vlx7824chzd54fw3nd-libinput-1.10.0

cc "@codyopel @wkennington"

(cherry picked from commit 174644d0288b79796f95f3464b02bad075558a89)

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index dc88df31fbf..0e2458a3895 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.9.4";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "142icwzpirwddl7ghfmynxpnsbjg53rjxpzv4arjsaiw9r6bvk8b";
+    sha256 = "0mrzsf0349d1g68lizkzxw7vaw459fl8xhl7v0s8njb31hp2riy2";
   };
 
   outputs = [ "out" "dev" ];

From c8ca339e1daffeebf064f00d916dd1d49baa0e5a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:28:57 -0800
Subject: [PATCH 0280/2266] libgme: 0.6.1 -> 0.6.2

Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.6.2 with grep in /nix/store/md3caddisps4xfvxh7ywmb2gdcpmcv4z-libgme-0.6.2
- found 0.6.2 in filename of file in /nix/store/md3caddisps4xfvxh7ywmb2gdcpmcv4z-libgme-0.6.2

cc "@lheckemann"
---
 pkgs/development/libraries/audio/libgme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index 9a87e31cbd2..ac6f0470a0a 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromBitbucket, cmake }:
 let
-  version = "0.6.1";
+  version = "0.6.2";
 in stdenv.mkDerivation {
   name = "libgme-${version}";
 
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
     owner = "mpyne";
     repo = "game-music-emu";
     rev = version;
-    sha256 = "04vwpv3pmjcil1jw5vcnlg45nch5awqs06y3xqdlp3ibx5i4k199";
+    sha256 = "00vlbfk5h99dq5rbwxk20dv72dig6wdwpgf83q451avsscky0jvk";
   };
 
   buildInputs = [ cmake ];

From ae6fcf3703d85be690c1c031e7b044477d4a4f2d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:20:51 -0800
Subject: [PATCH 0281/2266] libdvdcss: 1.4.0 -> 1.4.1

Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.4.1 with grep in /nix/store/vc0dcpqiashz0c0ihd4n2bj7jhawnpf3-libdvdcss-1.4.1
- found 1.4.1 in filename of file in /nix/store/vc0dcpqiashz0c0ihd4n2bj7jhawnpf3-libdvdcss-1.4.1
---
 pkgs/development/libraries/libdvdcss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 63978cfd740..66cb5215a8a 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdcss-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
-    sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290";
+    sha256 = "1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb";
   };
 
   meta = with stdenv.lib; {

From 4dcd9bde07688c821abe2102f800305f886a4d9c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 19:24:11 -0800
Subject: [PATCH 0282/2266] jansson: 2.10 -> 2.11

Semi-automatic update. These checks were performed:

- built on NixOS
- found 2.11 with grep in /nix/store/pn90js1s03dg2jhpnc6sdyc2p4l0wagx-jansson-2.11
- found 2.11 in filename of file in /nix/store/pn90js1s03dg2jhpnc6sdyc2p4l0wagx-jansson-2.11

cc "@wkennington"
---
 pkgs/development/libraries/jansson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 2fbb2e3948c..b1167efdfee 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "jansson-2.10";
+  name = "jansson-2.11";
 
   src = fetchurl {
     url = "http://www.digip.org/jansson/releases/${name}.tar.gz";
-    sha256 = "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq";
+    sha256 = "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf";
   };
 
   meta = with stdenv.lib; {

From b0ff7ca209db009d696c37e85c7ef0c49b9f802a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 18:44:03 -0800
Subject: [PATCH 0283/2266] http-parser: 2.7.0 -> 2.8.0

Semi-automatic update. These checks were performed:

- built on NixOS
- found 2.8.0 in filename of file in /nix/store/ngjpad116az0ib95brrcj761z4wh5hak-http-parser-2.8.0
---
 pkgs/development/libraries/http-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 60a1435462b..b17fc48c7e9 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }:
 
 let
-  version = "2.7.0";
+  version = "2.8.0";
 in stdenv.mkDerivation {
   name = "http-parser-${version}";
 
   src = fetchurl {
     url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
-    sha256 = "0rqij6v6wv1giwx4prfa082kw1nka5d9vlb06zkc8mwszq1vzidh";
+    sha256 = "17a7k3nxv2p1sp2x5d89wr51vk770753vz6qnlp2gz7nkgwwcxvj";
   };
 
   patches = [ ./build-shared.patch ];

From db277c22161d64a229bfff9ae0b0984c5480d87d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 20:01:55 -0800
Subject: [PATCH 0284/2266] lcms2: 2.8 -> 2.9

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/tificc --help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/tificc help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/linkicc --help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/linkicc help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/jpgicc --help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/jpgicc help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/psicc --help` got 0 exit code
- ran `/nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin/bin/psicc help` got 0 exit code
- found 2.9 with grep in /nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin
- found 2.9 in filename of file in /nix/store/qra3h0k7sckb5kdmicg9j8privyaw56i-lcms2-2.9-bin
---
 pkgs/development/libraries/lcms2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index 6fde8305da5..5d307dcfa7a 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libtiff, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lcms2-2.8";
+  name = "lcms2-2.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/lcms/${name}.tar.gz";
-    sha256 = "08pvl289g0mbznzx5l6ibhaldsgx41kwvdn2c974ga9fkli2pl36";
+    sha256 = "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 4aaf23a698b96cf11b36a4f4389f07d49d03d5ed Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sun, 4 Mar 2018 22:04:38 +0100
Subject: [PATCH 0285/2266] qgis: 2.18.16 -> 2.18.17

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index c2a09a507cc..21ee4297599 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.18.16";
+  name = "qgis-2.18.17";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9";
+    sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y";
   };
 
   cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

From 91456c67059e7921fb2c255a210fcf0fac50efdb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 09:43:27 +0800
Subject: [PATCH 0286/2266] pythonPackages.sseclient: init at 0.0.19

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

diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix
new file mode 100644
index 00000000000..9ac04e18e4f
--- /dev/null
+++ b/pkgs/development/python-modules/sseclient/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests, six
+, backports_unittest-mock, pluggy, pytest, pytestrunner }:
+
+buildPythonPackage rec {
+  pname = "sseclient";
+  version = "0.0.19";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7a2ea3f4c8525ae9a677bc8193df5db88e23bcaafcc34938a1ee665975703a9f";
+  };
+
+  propagatedBuildInputs = [ requests six ];
+
+  checkInputs = [ backports_unittest-mock pytest pytestrunner ];
+
+  meta = with stdenv.lib; {
+    description = "Client library for reading Server Sent Event streams";
+    homepage = https://github.com/btubbs/sseclient;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb0eb31be5c..15b1b3eaa49 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21173,6 +21173,8 @@ EOF
 
   spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
 
+  sseclient = callPackage ../development/python-modules/sseclient { };
+
   textacy = callPackage ../development/python-modules/textacy { };
 
   pyemd  = callPackage ../development/python-modules/pyemd { };

From 9c64494c8263351b5cb3b28175b658a52af7af0b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 09:38:11 +0800
Subject: [PATCH 0287/2266] appdaemon: init at 3.0.0b4

---
 pkgs/servers/home-assistant/appdaemon.nix | 62 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/appdaemon.nix

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
new file mode 100644
index 00000000000..db6380bcf12
--- /dev/null
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -0,0 +1,62 @@
+{ lib, python3, fetchpatch }:
+
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+
+      aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
+        version = "2.3.10";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+        };
+      });
+
+      yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
+        version = "1.1.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "6af895b45bd49254cc309ac0fe6e1595636a024953d710e01114257736184698";
+        };
+      });
+
+      aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec {
+        version = "0.15.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83";
+        };
+      });
+
+    };
+  };
+
+in python.pkgs.buildPythonApplication rec {
+  pname = "appdaemon";
+  version = "3.0.0b4";
+
+  src = python.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "0dfc37ecd8e1344001d4970d32813c581aba1385cf3b82c69f8b7df2eca6c019";
+  };
+
+  patches = fetchpatch {
+    url = "${meta.homepage}/pull/252.patch";
+    sha256 = "164qvgdibd2645yxm4n16bhnan13wrchfi70jp2ff806fwdg9mg0";
+  };
+
+  propagatedBuildInputs = with python.pkgs; [
+    aiohttp aiohttp-jinja2 astral bcrypt daemonize feedparser iso8601
+    jinja2 pyyaml requests sseclient voluptuous websocket_client yarl
+  ];
+
+  # no tests implemented
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
+    homepage = https://github.com/home-assistant/appdaemon;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad0556ab542..da14470920f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12028,6 +12028,8 @@ with pkgs;
   apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages;
   apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
 
+  appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
+
   archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };
 
   atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };

From 0bb55edb3ade61d1dcc96cf694e5f8a49fb79450 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 09:42:54 +0800
Subject: [PATCH 0288/2266] pythonPackages.deluge-client: init at 1.2.0

---
 .../python-modules/deluge-client/default.nix  | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/deluge-client/default.nix

diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
new file mode 100644
index 00000000000..838cc846387
--- /dev/null
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "deluge-client";
+  version = "1.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "048zfidv08sr4hivdd3xxf1pywhqbnszj5qcn51h2f4y1588fhpf";
+  };
+
+  # it will try to connect to a running instance
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Lightweight pure-python rpc client for deluge";
+    homepage = https://github.com/JohnDoee/deluge-client;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15b1b3eaa49..f08c6073f86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -624,6 +624,7 @@ in {
     gui = false;
   };
 
+  deluge-client = callPackage ../development/python-modules/deluge-client { };
 
   arrow = callPackage ../development/python-modules/arrow { };
 

From 4af9a88107bb7a593bb49c70670c8d917898201c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 10:40:13 +0800
Subject: [PATCH 0289/2266] pythonPackages.yahooweather: init at 0.10

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

diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix
new file mode 100644
index 00000000000..38c060aa8e8
--- /dev/null
+++ b/pkgs/development/python-modules/yahooweather/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "yahooweather";
+  version = "0.10";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa";
+  };
+
+  # Tests require network access
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Provide an interface to the Yahoo! Weather RSS feed";
+    homepage = https://github.com/pvizeli/yahooweather;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f08c6073f86..0ff5972e38b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21170,6 +21170,8 @@ EOF
 
   thinc = callPackage ../development/python-modules/thinc { };
 
+  yahooweather = callPackage ../development/python-modules/yahooweather { };
+
   spacy = callPackage ../development/python-modules/spacy { };
 
   spacy_models = callPackage ../development/python-modules/spacy/models.nix { };

From 083ac5add309581dc94b6f96dafc7f113a2909c7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 13:39:47 +0800
Subject: [PATCH 0290/2266] pythonPackages.ha-ffmpeg: init at 1.9

---
 .../python-modules/ha-ffmpeg/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/ha-ffmpeg/default.nix

diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
new file mode 100644
index 00000000000..4259b7ad053
--- /dev/null
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, ffmpeg, async-timeout }:
+
+buildPythonPackage rec {
+  pname = "ha-ffmpeg";
+  version = "1.9";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8";
+  };
+
+  buildInputs = [ ffmpeg ];
+
+  propagatedBuildInputs = [ async-timeout ];
+
+  # only manual tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pvizeli/ha-ffmpeg;
+    description = "Library for home-assistant to handle ffmpeg";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ff5972e38b..68a8ff36050 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -241,6 +241,8 @@ in {
     hdf5 = pkgs.hdf5-mpi;
   };
 
+  ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
+
   habanero = callPackage ../development/python-modules/habanero { };
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };

From b1d7d13e641b4db8f46959c29fd6644a3ec4f198 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 4 Mar 2018 22:09:15 +0800
Subject: [PATCH 0291/2266] pythonPackages.miniupnpc: init at 2.0.2

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

diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix
new file mode 100644
index 00000000000..d267cb6a976
--- /dev/null
+++ b/pkgs/development/python-modules/miniupnpc/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "miniupnpc";
+  version = "2.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y";
+  };
+
+  meta = with stdenv.lib; {
+    description = "miniUPnP client";
+    homepage = http://miniupnp.free.fr/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68a8ff36050..736c8b93767 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2888,6 +2888,8 @@ in {
     };
   };
 
+  miniupnpc = callPackage ../development/python-modules/miniupnpc {};
+
   mixpanel = buildPythonPackage rec {
     version = "4.0.2";
     name = "mixpanel-${version}";

From 33e16997b98d89fbe55ff44795db55df88b87fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 4 Mar 2018 21:07:52 +0100
Subject: [PATCH 0292/2266] pythonPackages.async: uninit because deprecated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Citing from PyPI:
DEPRECATION NOTE: Please do not use this library ! It’s not working correctly in python 3, and besides that might be called a failed experiment.
---
 pkgs/top-level/python-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 736c8b93767..4d67ef23fb3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -630,20 +630,6 @@ in {
 
   arrow = callPackage ../development/python-modules/arrow { };
 
-  async = buildPythonPackage rec {
-    name = "async-0.6.1";
-    disabled = isPy3k;
-    meta.maintainers = with maintainers; [ ];
-
-    buildInputs = with self; [ pkgs.zlib ];
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/async/${name}.tar.gz";
-      sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1";
-    };
-  };
-
   asynctest = callPackage ../development/python-modules/asynctest { };
 
   async-timeout = callPackage ../development/python-modules/async_timeout { };

From 15f63cb1146aca662c26b188ea732fc033be69a5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 28 Feb 2018 13:47:35 +0800
Subject: [PATCH 0293/2266] home-assistant: add missing dependencies

---
 pkgs/servers/home-assistant/component-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b031f33555..5961831b254 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -95,7 +95,7 @@
     "envisalink" = ps: with ps; [  ];
     "fan.xiaomi_miio" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
-    "ffmpeg" = ps: with ps; [  ];
+    "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
     "frontend" = ps: with ps; [ user-agents ];
     "gc100" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
@@ -272,7 +272,7 @@
     "sensor.crimereports" = ps: with ps; [  ];
     "sensor.cups" = ps: with ps; [  ];
     "sensor.darksky" = ps: with ps; [  ];
-    "sensor.deluge" = ps: with ps; [  ];
+    "sensor.deluge" = ps: with ps; [ deluge-client ];
     "sensor.deutsche_bahn" = ps: with ps; [  ];
     "sensor.dht" = ps: with ps; [  ];
     "sensor.discogs" = ps: with ps; [ discogs_client ];
@@ -365,7 +365,7 @@
     "sensor.xbox_live" = ps: with ps; [  ];
     "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
-    "sensor.yweather" = ps: with ps; [  ];
+    "sensor.yweather" = ps: with ps; [ yahooweather ];
     "shiftr" = ps: with ps; [ paho-mqtt ];
     "skybell" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
@@ -374,7 +374,7 @@
     "switch.acer_projector" = ps: with ps; [ pyserial ];
     "switch.anel_pwrctrl" = ps: with ps; [  ];
     "switch.broadlink" = ps: with ps; [  ];
-    "switch.deluge" = ps: with ps; [  ];
+    "switch.deluge" = ps: with ps; [ deluge-client ];
     "switch.digitalloggers" = ps: with ps; [  ];
     "switch.dlink" = ps: with ps; [  ];
     "switch.edimax" = ps: with ps; [  ];
@@ -409,7 +409,7 @@
     "tts.microsoft" = ps: with ps; [  ];
     "twilio" = ps: with ps; [ twilio ];
     "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [  ];
+    "upnp" = ps: with ps; [ miniupnpc ];
     "usps" = ps: with ps; [  ];
     "vacuum.roomba" = ps: with ps; [  ];
     "vacuum.xiaomi_miio" = ps: with ps; [  ];
@@ -425,7 +425,7 @@
     "weather.darksky" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
     "weather.openweathermap" = ps: with ps; [  ];
-    "weather.yweather" = ps: with ps; [  ];
+    "weather.yweather" = ps: with ps; [ yahooweather ];
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
     "xiaomi_aqara" = ps: with ps; [  ];

From fe5f012d074e9d7fb332288b53bd90b8587bf134 Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Sun, 4 Mar 2018 15:10:27 +0100
Subject: [PATCH 0294/2266] sqlite: Raising max variable number and max expr
 depth values

fixes #36293
---
 pkgs/development/libraries/sqlite/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 95a32c62a72..b8b7d0c701d 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation {
     "-DSQLITE_ENABLE_UNLOCK_NOTIFY"
     "-DSQLITE_SOUNDEX"
     "-DSQLITE_SECURE_DELETE"
+    "-DSQLITE_MAX_VARIABLE_NUMBER=250000"
+    "-DSQLITE_MAX_EXPR_DEPTH=10000"
   ];
 
   # Test for features which may not be available at compile time

From 8ed04b9348d5db13195ce0d762910be607327657 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 22 Feb 2018 17:29:54 +0100
Subject: [PATCH 0295/2266] chkcrontab: init at 1.7

`chkcrontab` is a simple utility to check crontab for errors.
Fixes #34969
---
 pkgs/tools/admin/chkcrontab/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/admin/chkcrontab/default.nix

diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix
new file mode 100644
index 00000000000..a4b119f126a
--- /dev/null
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@@ -0,0 +1,20 @@
+{ python, stdenv }:
+
+with python.pkgs;
+
+buildPythonApplication rec {
+  pname = "chkcrontab";
+  version = "1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A tool to detect crontab errors";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ma27 ];
+    homepage = https://github.com/lyda/chkcrontab;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f70da86d207..159947630e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -608,6 +608,8 @@ with pkgs;
 
   container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
 
+  chkcrontab = callPackage ../tools/admin/chkcrontab { };
+
   djmount = callPackage ../tools/filesystems/djmount { };
 
   dgsh = callPackage ../shells/dgsh { };

From 0b455cec930910cdaf128a246a1cb110c0738ae2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 23 Feb 2018 09:51:10 +0100
Subject: [PATCH 0296/2266] gnupg: 2.2.4 -> 2.2.5

See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00005.html
for release information
---
 pkgs/tools/security/gnupg/22.nix                        | 4 ++--
 pkgs/tools/security/gnupg/fix-libusb-include-path.patch | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 89fee90364e..c47780588cd 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0";
+    sha256 = "0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
index 18c4f110738..a5432f8e3d9 100644
--- a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
+++ b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
@@ -1,10 +1,11 @@
 --- a/configure
 +++ b/configure
-@@ -8872,7 +8872,7 @@
+@@ -8987,8 +8987,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
  $as_echo_n "checking libusb include dir... " >&6; }
     usb_incdir_found="no"
--   for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
+-   for _incdir in "" "/usr/include/libusb-1.0" \
+-       "/usr/local/include/libusb-1.0" "/usr/pkg/include/libusb-1.0"; do
 +   for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
       _libusb_save_cppflags=$CPPFLAGS
       if test -n "${_incdir}"; then

From 93752a8eebfe6811decdaa298158140d927bcdde Mon Sep 17 00:00:00 2001
From: Thorsten Weber <tw@360vier.de>
Date: Mon, 5 Mar 2018 16:14:21 +0100
Subject: [PATCH 0297/2266] linkchecker: 9.3 -> 9.3.1

This also uses an older requests version because
linkchecker breaks with requests > 2.14.2.
---
 pkgs/tools/networking/linkchecker/default.nix | 59 ++++++++++++++-----
 .../linkchecker/no-version-check.patch        | 14 -----
 2 files changed, 43 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/tools/networking/linkchecker/no-version-check.patch

diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix
index 686242aa067..6e41de8999b 100644
--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/pkgs/tools/networking/linkchecker/default.nix
@@ -1,23 +1,50 @@
-{ stdenv, lib, fetchurl, python2Packages, gettext }:
-
+{ stdenv, lib, fetchFromGitHub, fetchpatch, python2, gettext }:
+let
+  # pin requests version until next release.
+  # see: https://github.com/linkcheck/linkchecker/issues/76
+  python2Packages = (python2.override {
+    packageOverrides = self: super: {   
+      requests = super.requests.overridePythonAttrs(oldAttrs: rec {
+        version = "2.14.2";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0lyi82a0ijs1m7k9w1mqwbmq1qjsac35fazx7xqyh8ws76xanx52";
+        };
+      });
+    };
+  }).pkgs;
+in
 python2Packages.buildPythonApplication rec {
-  name = "LinkChecker-${version}";
-  version = "9.3";
+  pname = "LinkChecker";
+  version = "9.3.1";
 
-  buildInputs = with python2Packages ; [ pytest ];
-  propagatedBuildInputs = with python2Packages ; [ requests ] ++ [ gettext ];
+  propagatedBuildInputs = (with python2Packages; [ 
+    requests
+  ]) ++ [ gettext ];
 
-  src = fetchurl {
-    url = "mirror://pypi/L/LinkChecker/${name}.tar.gz";
-    sha256 = "0v8pavf0bx33xnz1kwflv0r7lxxwj7vg3syxhy2wzza0wh6sc2pf";
+  checkInputs = with python2Packages; [ pytest ];
+
+  # the original repository is abandoned, development is now happening here:
+  src = fetchFromGitHub {
+    owner = "linkcheck";
+    repo = "linkchecker";
+    rev = "v${version}";
+    sha256 = "080mv4iwvlsfnm7l9basd6i8p4q8990mdhkwick9s6javrbf1r1d";
   };
 
   # 1. upstream refuses to support ignoring robots.txt
-  # 2. work around requests version detection - can be dropped >v9.3
-  patches = [
-    ./add-no-robots-flag.patch
-    ./no-version-check.patch
-  ];
+  # 2. fix build: https://github.com/linkcheck/linkchecker/issues/10
+  patches = 
+    let
+      fix-setup-py = fetchpatch {
+        name = "fix-setup-py.patch";
+        url = https://github.com/linkcheck/linkchecker/commit/e62e630.patch;
+        sha256 = "046q1whg715w2yv33xx6rkj7fspvvz60cl978ax92lnf8j101czx";
+      };
+    in [
+      ./add-no-robots-flag.patch
+      fix-setup-py
+    ];
 
   postInstall = ''
     rm $out/bin/linkchecker-gui
@@ -35,8 +62,8 @@ python2Packages.buildPythonApplication rec {
 
   meta = {
     description = "Check websites for broken links";
-    homepage = https://wummel.github.io/linkchecker/;
+    homepage = https://linkcheck.github.io/linkchecker/;
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ peterhoeg ];
+    maintainers = with lib.maintainers; [ peterhoeg tweber ];
   };
 }
diff --git a/pkgs/tools/networking/linkchecker/no-version-check.patch b/pkgs/tools/networking/linkchecker/no-version-check.patch
deleted file mode 100644
index 49b674f3735..00000000000
--- a/pkgs/tools/networking/linkchecker/no-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
---- a/linkcheck/__init__.py	2014-07-16 13:34:58.000000000 +0800
-+++ b/linkcheck/__init__.py	2016-10-11 10:42:08.914085950 +0800
-@@ -26,8 +26,8 @@
-         sys.version_info < (2, 7, 2, 'final', 0)):
-     raise SystemExit("This program requires Python 2.7.2 or later.")
- import requests
--if requests.__version__ <= '2.2.0':
--    raise SystemExit("This program requires Python requests 2.2.0 or later.")
-+#if requests.__version__ <= '2.2.0':
-+#    raise SystemExit("This program requires Python requests 2.2.0 or later.")
- 
- import os
- # add the custom linkcheck_dns directory to sys.path

From b84d22cbbd79af695f0829f966d97b76400791fa Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 5 Mar 2018 19:29:35 +0100
Subject: [PATCH 0298/2266] skhd: init at 0.0.10

---
 pkgs/os-specific/darwin/skhd/default.nix      | 34 +++++++++++++++++++
 .../darwin/skhd/org.nixos.skhd.plist          | 23 +++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++-
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/skhd/default.nix
 create mode 100644 pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
new file mode 100644
index 00000000000..aa97a36e691
--- /dev/null
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, Carbon }:
+
+stdenv.mkDerivation rec {
+  name = "skhd-${version}";
+  version = "0.0.10";
+
+  src = fetchFromGitHub {
+    owner = "koekeishiya";
+    repo = "skhd";
+    rev = "v${version}";
+    sha256 = "0a0r8z9bvb1pzqag7nqa84xm99n0xvg27cw11qcv65snr06bqc9w";
+  };
+
+  buildInputs = [ Carbon ];
+
+  makeFlags = [ "BUILD_PATH=$(out)/bin" ];
+
+  postInstall = ''
+    mkdir -p $out/Library/LaunchDaemons
+    cp ${./org.nixos.skhd.plist} $out/Library/LaunchDaemons/org.nixos.skhd.plist
+    substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
+  '';
+
+  # See https://github.com/koekeishiya/skhd/issues/28
+  hardeningDisable = [ "all" ];
+
+  meta = with stdenv.lib; {
+    description = "Simple hotkey daemon for macOS";
+    homepage = https://github.com/koekeishiya/skhd;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ lnl7 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist b/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
new file mode 100644
index 00000000000..e6624487740
--- /dev/null
+++ b/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>org.nixos.skhd</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>@out@/bin/skhd</string>
+  </array>
+  <key>ProcessType</key>
+  <string>Interactive</string>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>@out@/bin:/nix/var/nix/profiles/default/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+  </dict>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+</dict>
+</plist>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f54b163c130..3769960fa72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -676,6 +676,10 @@ with pkgs;
 
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
+  skhd = callPackage ../os-specific/darwin/skhd {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
+  };
+
   qes = callPackage ../os-specific/darwin/qes {
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
@@ -10440,7 +10444,7 @@ with pkgs;
   ## libGL/libGLU/Mesa stuff
 
   # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them
-  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, 
+  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`,
   # or other runtime dispatcher
   libGL = mesa_noglu;
 

From 30877b1ed855f77b4a5da3184dbb83276c3649c0 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 5 Mar 2018 19:32:42 +0000
Subject: [PATCH 0299/2266] nix-serve: nix 2.0 fixes

---
 nixos/modules/services/networking/nix-serve.nix     | 2 ++
 pkgs/tools/package-management/nix-serve/default.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 3e865e3b76a..8499e7c0f7c 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -55,6 +55,8 @@ in
       environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
 
       serviceConfig = {
+        Restart = "always";
+        RestartSec = "5s";
         ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
           "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
         User = "nix-serve";
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 1e3579b197e..dadcab1ea4f 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit rev sha256;
   };
 
-  buildInputs = [ bzip2 perl nix ]
+  buildInputs = [ bzip2 perl nix nix.perl-bindings ]
     ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
   dontBuild = true;

From 1e621ff423ecc0aa1377a2735405945691ec14d0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 5 Mar 2018 11:15:34 -0600
Subject: [PATCH 0300/2266] demo: autologin through xserver

also disable upower on virtualbox
Fixes #36348
---
 nixos/modules/installer/virtualbox-demo.nix | 2 ++
 nixos/modules/profiles/demo.nix             | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 5316cfce906..13a0d7f4f6e 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -19,4 +19,6 @@ with lib;
   # Add some more video drivers to give X11 a shot at working in
   # VMware and QEMU.
   services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
+
+  powerManagement.enable = false;
 }
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index ef6fd77b5f8..c3ee6e98371 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -10,4 +10,10 @@
       password = "demo";
       uid = 1000;
     };
+
+  services.xserver.displayManager.sddm.autoLogin = {
+    enable = true;
+    relogin = true;
+    user = "demo";
+  };
 }

From c84cf5f64254ffff18d5c0c647ff996a2c82644c Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Mon, 5 Mar 2018 20:54:55 +0000
Subject: [PATCH 0301/2266] xen 4.8: fix gcc7-related build errors

---
 pkgs/applications/virtualization/xen/4.8.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index be6c4e3fcc7..558510b30f5 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -29,6 +29,18 @@ let
 
   xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 
+  xenlockprofpatch = (fetchpatch {
+    name = "xenlockprof-gcc7.patch";
+    url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222";
+    sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70";
+  });
+
+  xenpmdpatch = (fetchpatch {
+    name = "xenpmd-gcc7.patch";
+    url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3";
+    sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq";
+  });
+
   qemuDeps = [
     udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
     alsaLib
@@ -158,6 +170,8 @@ callPackage (import ./generic.nix (rec {
     XSA_249
     XSA_250
     XSA_251_48
+    xenlockprofpatch
+    xenpmdpatch
   ];
 
   # Fix build on Glibc 2.24.

From 8ad2cb1d0cc9af530a3b1fa0f914359136f48d32 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sun, 4 Mar 2018 19:13:58 -0800
Subject: [PATCH 0302/2266] pillow: Fix build on non-NixOS systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Pillow install script will, by default, add paths like /usr/lib and
/usr/include to the search paths.  This can break things when building
on a non-NixOS system that has some libraries installed that are not
installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't
build Pillow with this support).

We solve this by telling Pillow to knock it off 😄

Fixes #36317
---
 pkgs/development/python-modules/pillow/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 03474825527..cb6008ea9a2 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -31,6 +31,14 @@ buildPythonPackage rec {
     ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
 
   # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
+  # NOTE: The Pillow install script will, by default, add paths like /usr/lib
+  # and /usr/include to the search paths. This can break things when building
+  # on a non-NixOS system that has some libraries installed that are not
+  # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't
+  # build Pillow with this support). We patch the `disable_platform_guessing`
+  # setting here, instead of passing the `--disable-platform-guessing`
+  # command-line option, since the command-line option doesn't work when we run
+  # tests.
   preConfigure = let
     libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"'';
     libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';
@@ -41,7 +49,8 @@ buildPythonPackage rec {
             s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ;
             s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ;
             s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ;
-            s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;'
+            s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;
+            s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;'
     export LDFLAGS="-L${libwebp}/lib"
     export CFLAGS="-I${libwebp}/include"
   ''

From 7dafa09ed93e8fb932870d839b0668c9ed1c92ee Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Mar 2018 17:23:47 -0600
Subject: [PATCH 0303/2266] nix: fix conditional so brotli is used w/2.0
 builds, needed for logs!

cc https://github.com/NixOS/nix/issues/1951
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b634969c8ac..246819d3dc0 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -29,7 +29,7 @@ let
 
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-      ++ lib.optionals fromGit [ brotli ] # Since 1.12
+      ++ lib.optionals is20 [ brotli ] # Since 1.12
       ++ lib.optional (hostPlatform.isSeccomputable) libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {

From 13df5eec1e5478791fc28822c8c301b43af84135 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 5 Mar 2018 18:38:46 -0500
Subject: [PATCH 0304/2266] dbeaver: 4.3.3 -> 5.0.0

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index caf40ef5faf..5bb91c1a70f 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "4.3.3";
+  version = "5.0.0";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "063h2za2m33b4k9s756lwicxwszzsqr2sqr2gi4ai05dqkgkw951";
+    sha256 = "0n7l7ph002z8npn08vdn0ghgkipz14cr73i9c69s7wiq2d2baahv";
   };
 
   installPhase = ''

From c1c502e93bd17bdee729099b5507d967be1b1629 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Mar 2018 17:41:11 -0600
Subject: [PATCH 0305/2266] brotli: 1.0.2 -> 1.0.3

https://github.com/google/brotli/releases/tag/v1.0.3
---
 pkgs/tools/compression/brotli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 45af74b0b3e..707b8f0d799 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1rpg16zpr7h6vs7qr6npmqhyw4w5nkp24iq70s4dryn77m0r4mcv";
+    sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7";
   };
 
   nativeBuildInputs = [ cmake ];

From 10b1cb28a795c72d53fd5525db6596bdcd5a3e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 6 Mar 2018 00:11:42 +0000
Subject: [PATCH 0306/2266] ansible-lint: fix tests

---
 .../tools/ansible-lint/default.nix            | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix
index 51f89698d5a..16d2782b734 100644
--- a/pkgs/development/tools/ansible-lint/default.nix
+++ b/pkgs/development/tools/ansible-lint/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, pythonPackages, ansible }:
+{ stdenv, fetchFromGitHub, pythonPackages, ansible }:
 
 pythonPackages.buildPythonPackage rec {
   pname = "ansible-lint";
   version = "3.4.20";
-  doCheck = false;
 
-  src = pythonPackages.fetchPypi {
-    inherit pname version;
-    sha256 = "1e7f1d5d5ee91b817dedc0b612c2beb5ff44879d592ea17a2eaa6571aa9a2bff";
+  src = fetchFromGitHub {
+    owner = "willthames";
+    repo = "ansible-lint";
+    rev = "v${version}";
+    sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ];
 
+  checkInputs = [ pythonPackages.nose ];
+
+  postPatch = ''
+    patchShebangs bin/ansible-lint
+  '';
+
+  checkPhase = ''
+    nosetests test
+  '';
+
   meta = {
     homepage = "https://github.com/willthames/ansible-lint";
     description = "Best practices checker for Ansible";

From 5905fe069b02c2df5db5025b2f8311c75c394d5b Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 6 Mar 2018 03:10:24 +0000
Subject: [PATCH 0307/2266] tt-rss: use proper user and package for MySQL

---
 nixos/modules/services/web-apps/tt-rss.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index c784f4756d1..8f7a56189a0 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -505,7 +505,7 @@ let
                     ${cfg.database.name}''
 
               else if cfg.database.type == "mysql" then ''
-                  echo '${e}' | ${pkgs.mysql}/bin/mysql \
+                  echo '${e}' | ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.mysql.package}/bin/mysql \
                     -u ${cfg.database.user} \
                     ${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \
                     ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \

From 7f26c1b7fbd525f6b998fcde510e69278fd8e6f7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 6 Mar 2018 01:03:59 +0100
Subject: [PATCH 0308/2266] nixos/tests/keymap: Remove OCR-friendly SLiM theme

The test doesn't use OCR, so we actually don't need an OCR-friendly
theme here.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/tests/keymap.nix | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index eec674e227d..caa5f7107c2 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -50,38 +50,7 @@ let
     machine.i18n.consoleKeyMap = mkOverride 900 layout;
     machine.services.xserver.layout = mkOverride 900 layout;
     machine.imports = [ ./common/x11.nix extraConfig ];
-    machine.services.xserver.displayManager.slim = {
-      enable = true;
-
-      # Use a custom theme in order to get best OCR results
-      theme = pkgs.runCommand "slim-theme-ocr" {
-        nativeBuildInputs = [ pkgs.imagemagick ];
-      } ''
-        mkdir "$out"
-        convert -size 1x1 xc:white "$out/background.jpg"
-        convert -size 200x100 xc:white "$out/panel.jpg"
-        cat > "$out/slim.theme" <<EOF
-        background_color #ffffff
-        background_style tile
-
-        input_fgcolor #000000
-        msg_color #000000
-
-        session_color #000000
-        session_font Verdana:size=16:bold
-
-        username_msg Username:
-        username_font Verdana:size=16:bold
-        username_color #000000
-        username_x 50%
-        username_y 40%
-
-        password_msg Password:
-        password_x 50%
-        password_y 40%
-        EOF
-      '';
-    };
+    machine.services.xserver.displayManager.slim.enable = true;
 
     testScript = ''
       sub waitCatAndDelete ($) {

From 8f38b1cd8f72beae05d9ea0509c4c12a86e8ff0d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 6 Mar 2018 15:47:50 +0800
Subject: [PATCH 0309/2266] go-ethereum: 1.8.1 -> 1.8.2

---
 pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 18a9d043e18..84e0a32e7b2 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.8.1";
+  version = "1.8.2";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -27,7 +27,7 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "0k7ly9cw68ranksa1fdn7v2lncmlqgabw3qiiyqya2xz3s4aazlf";
+    sha256 = "19ryfy9dsmgk3kimkmq2hif1di4binqg9718xrmirf063rajk02a";
   };
 
   meta = with stdenv.lib; {

From 8529e0b05f8d0d8b20e4a8a0673db35ac7cfc556 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 6 Mar 2018 13:00:34 +0300
Subject: [PATCH 0310/2266] gnome3.gtksourceview: enable parallel building

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

diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
index b3948942c12..a870b16f925 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
@@ -36,6 +36,8 @@ in stdenv.mkDerivation rec {
 
   patches = [ ./nix_share_path.patch ];
 
+  enableParallelBuilding = true;
+
   doCheck = stdenv.isLinux;
   checkPhase = ''
     export NO_AT_BRIDGE=1
@@ -45,7 +47,9 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GtkSourceView;
     platforms = with platforms; linux ++ darwin;
+    license = licenses.lgpl21;
     maintainers = gnome3.maintainers;
   };
 }

From fe708a3462d884b55d8988140cb15668bf157505 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 6 Mar 2018 13:00:59 +0300
Subject: [PATCH 0311/2266] twemoji-color-font: include recommended fontconfig
 configuration

---
 pkgs/data/fonts/twemoji-color-font/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
index 9173387a4c7..9a8c6bf592a 100644
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
   preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";
   makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ];
   enableParallelBuilding = true;
-  installPhase = "install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf";
+
+  installPhase = ''
+    install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
+    install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf
+  '';
 
   meta = with stdenv.lib; {
     version = "1.3";

From 91a2ad21adcccc7061c2a5f27c0f980e784b6bd9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 6 Mar 2018 13:01:46 +0300
Subject: [PATCH 0312/2266] gtkmm2: enable parallel building

---
 pkgs/development/libraries/gtkmm/2.x.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 469c6adc6f7..69fd3f30e92 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -11,12 +11,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [pkgconfig];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];
 
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "C++ interface to the GTK+ graphical user interface library";
 

From 1f8d30f0bfcc829d7fa3f5a430d501f9e2f86ed4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 6 Mar 2018 13:58:01 +0300
Subject: [PATCH 0313/2266] avidemux: restrict platforms

---
 pkgs/applications/video/avidemux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index de2394cd4a1..99ed7378745 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -79,7 +79,8 @@ stdenv.mkDerivation rec {
     homepage = http://fixounet.free.fr/avidemux/;
     description = "Free video editor designed for simple video editing tasks";
     maintainers = with maintainers; [ viric abbradar ma27 ];
-    platforms = platforms.linux;
+    # "CPU not supported" errors on AArch64
+    platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.gpl2;
   };
 }

From 399edfec525ad425b28d4baafea9c3923a5b7717 Mon Sep 17 00:00:00 2001
From: Fatih Altinok <photonia@gmail.com>
Date: Tue, 6 Mar 2018 15:12:38 +0300
Subject: [PATCH 0314/2266] nodejs: 9.6.1 -> 9.7.1

---
 pkgs/development/web/nodejs/v9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix
index af3a8b4d22f..f17c5f6d26c 100644
--- a/pkgs/development/web/nodejs/v9.nix
+++ b/pkgs/development/web/nodejs/v9.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "9.6.1";
-    sha256 = "04hi7lwdizwqqbyi77f4z12gnsh673h92brmbssrmw5kjx6h4k5q";
+    version = "9.7.1";
+    sha256 = "0hlhj817s5bji2qdghxkwxjj40kwkyzgax4zyv32r5pbl6af3yh6";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
   }

From 0e6fc5c4e6ceaaf1f4f60089047511b9f94386ba Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 6 Mar 2018 14:06:23 +0100
Subject: [PATCH 0315/2266] =?UTF-8?q?gnome3.bijiben:=203.27.1=20=E2=86=92?=
 =?UTF-8?q?=203.28.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktops/gnome-3/apps/bijiben/default.nix | 58 ++++++++++---------
 .../apps/bijiben/no-update-icon-cache.patch   | 22 -------
 2 files changed, 31 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index eaf8528b6ff..91b16bbba96 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -1,51 +1,55 @@
-{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib
-, evolution-data-server, evolution, sqlite
+{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig
 , wrapGAppsHook, itstool, desktop-file-utils
-, clutter-gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+, glib, gtk3, evolution-data-server
+, libuuid, webkitgtk, zeitgeist
+, gnome3, libxml2 }:
 
-stdenv.mkDerivation rec {
+let
+  version = "3.28.0";
+in stdenv.mkDerivation rec {
   name = "bijiben-${version}";
-  version = "3.27.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "bijiben"; attrPath = "gnome3.bijiben"; };
+    sha256 = "047w8kigrdmphd17dma2lldf6r60sgx3zybai9bz9yr0hm601kr6";
   };
 
   doCheck = true;
 
-  patches = [
-    ./no-update-icon-cache.patch
-  ];
-
   postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
+    chmod +x build-aux/meson_post_install.py
+    patchShebangs build-aux/meson_post_install.py
   '';
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   nativeBuildInputs = [
     meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook
   ];
-  buildInputs = [ glib clutter-gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome-online-accounts zeitgeist
-                  gnome3.gsettings-desktop-schemas
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  evolution-data-server evolution sqlite ];
 
-  enableParallelBuilding = true;
+  buildInputs = [
+    glib gtk3 libuuid webkitgtk gnome3.tracker
+    gnome3.gnome-online-accounts zeitgeist
+    gnome3.gsettings-desktop-schemas
+    evolution-data-server
+    gnome3.defaultIconTheme
+  ];
+
+  mesonFlags = [
+    "-Dzeitgeist=true"
+    "-Dupdate_mimedb=false"
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "bijiben";
+      attrPath = "gnome3.bijiben";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
     description = "Note editor designed to remain simple to use";
-    maintainers = gnome3.maintainers;
+    homepage = https://wiki.gnome.org/Apps/Bijiben;
     license = licenses.gpl3;
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch b/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch
deleted file mode 100644
index c8b0043fb45..00000000000
--- a/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/meson_post_install.py
-+++ b/meson_post_install.py
-@@ -7,10 +7,6 @@
- if not os.environ.get('DESTDIR'):
-   datadir = sys.argv[1]
- 
--  icondir = os.path.join(datadir, 'icons', 'hicolor')
--  print('Update icon cache...')
--  subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
--
-   schemadir = os.path.join(datadir, 'glib-2.0', 'schemas')
-   print('Compile gsettings schemas...')
-   subprocess.call(['glib-compile-schemas', schemadir])
-@@ -18,8 +14,3 @@
-   desktop_file = os.path.join(datadir, 'applications', 'org.gnome.bijiben.desktop')
-   print('Validate desktop file...')
-   subprocess.call(['desktop-file-validate', desktop_file])
--
--  if sys.argv[2] == 'update-mimedb':
--    mimedir = os.path.join(datadir, 'mime')
--    print('Update mime database...')
--    subprocess.call(['update-mime-database', mimedir])

From ece4c62d4b3f6f53935ece6b9cd5efe644cee79b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Mar 2018 17:03:40 -0600
Subject: [PATCH 0316/2266] make-bootstrap-tools: preserve coreutils symlinks

We go out of our way (see top of file) to build a single binary
with symlinks for all of the tools, but were losing them
when preparing the bootstrap tools.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 8033d47d5db..5522bc5dea2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -88,7 +88,7 @@ in with pkgs; rec {
     '' else throw "unsupported libc for bootstrap tools")
     + ''
         # Copy coreutils, bash, etc.
-        cp ${coreutilsMinimal.out}/bin/* $out/bin
+        cp -d ${coreutilsMinimal.out}/bin/* $out/bin
         (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
 
         cp ${bash.out}/bin/bash $out/bin

From 0c7b8931f936cbffa60a6c0d3688092c9f96e93a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 23 Feb 2018 04:11:30 +0000
Subject: [PATCH 0317/2266] firefox-bin: fix pulseaudio references

---
 .../networking/browsers/firefox-bin/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 12cf5c30df4..3a6dd626ac6 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, config, wrapGAppsHook
+{ lib, stdenv, fetchurl, config, wrapGAppsHook
 , alsaLib
 , atk
 , cairo
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc
       alsaLib
-      alsaLib.dev
+      (lib.getDev alsaLib)
       atk
       cairo
       curl
@@ -124,7 +124,7 @@ stdenv.mkDerivation {
       pango
       libheimdal
       libpulseaudio
-      libpulseaudio.dev
+      (lib.getDev libpulseaudio)
       systemd
     ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
       stdenv.cc.cc

From 7966e0efeba4d1953d64f9fc511451463dc3b1bf Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 23 Feb 2018 04:19:05 +0000
Subject: [PATCH 0318/2266] telegram/tdesktop: fix pulseaudio references

---
 .../telegram/tdesktop/default.nix             | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 67b116274a2..bf564a6a192 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,6 +4,8 @@
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
 }:
 
+with lib;
+
 mkDerivation rec {
   name = "telegram-desktop-${version}";
   version = "1.2.6";
@@ -45,7 +47,7 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  GYP_DEFINES = lib.concatStringsSep "," [
+  GYP_DEFINES = concatStringsSep "," [
     "TDESKTOP_DISABLE_CRASH_REPORTS"
     "TDESKTOP_DISABLE_AUTOUPDATE"
     "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
@@ -57,14 +59,14 @@ mkDerivation rec {
     "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
     "-I${minizip}/include/minizip"
     # See Telegram/gyp/qt.gypi
-    "-I${qtbase.dev}/mkspecs/linux-g++"
-  ] ++ lib.concatMap (x: [
-    "-I${qtbase.dev}/include/${x}"
-    "-I${qtbase.dev}/include/${x}/${qtbase.version}"
-    "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}"
-    "-I${libopus.dev}/include/opus"
-    "-I${alsaLib.dev}/include/alsa"
-    "-I${libpulseaudio.dev}/include/pulse"
+    "-I${getDev qtbase}/mkspecs/linux-g++"
+  ] ++ concatMap (x: [
+    "-I${getDev qtbase}/include/${x}"
+    "-I${getDev qtbase}/include/${x}/${qtbase.version}"
+    "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
+    "-I${getDev libopus}/include/opus"
+    "-I${getDev alsaLib}/include/alsa"
+    "-I${getDev libpulseaudio}/include/pulse"
   ]) [ "QtCore" "QtGui" "QtDBus" ];
   CPPFLAGS = NIX_CFLAGS_COMPILE;
 
@@ -121,7 +123,7 @@ mkDerivation rec {
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Telegram Desktop messaging app";
     license = licenses.gpl3;
     platforms = platforms.linux;

From 1d4f3fa371d507d7906bd868a3d959ee9a16d7fb Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 4 Mar 2018 03:18:28 +0000
Subject: [PATCH 0319/2266] stdenv: check-meta: fix fallout from #36119

---
 pkgs/stdenv/generic/check-meta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 93d0f4cc980..a1878dc0136 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -144,7 +144,7 @@ let
     homepage = either (listOf str) str;
     downloadPage = str;
     license = either (listOf lib.types.attrs) (either lib.types.attrs str);
-    maintainers = listOf str;
+    maintainers = listOf (attrsOf str);
     priority = int;
     platforms = listOf str;
     hydraPlatforms = listOf str;

From 610b5b80451a78dd25a52ad5bcf63d86222ba044 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 4 Mar 2018 03:09:35 +0000
Subject: [PATCH 0320/2266] rename lib/maintainers-list.nix into
 maintainers/maintainer-list.nix

Many commits unrelated to `lib` touch that file, this will make `git log ./lib` much saner.

This is what I meant in https://github.com/NixOS/nixpkgs/pull/36119#issuecomment-370184101.
---
 lib/default.nix                                             | 2 +-
 lib/maintainers-list.nix => maintainers/maintainer-list.nix | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/maintainers-list.nix => maintainers/maintainer-list.nix (100%)

diff --git a/lib/default.nix b/lib/default.nix
index 4c36f3b0d79..7bd02106f7b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -21,7 +21,7 @@ let
 
     # packaging
     customisation = callLibs ./customisation.nix;
-    maintainers = import ./maintainers-list.nix;
+    maintainers = import ../maintainers/maintainer-list.nix;
     meta = callLibs ./meta.nix;
     sources = callLibs ./sources.nix;
     versions = callLibs ./versions.nix;
diff --git a/lib/maintainers-list.nix b/maintainers/maintainer-list.nix
similarity index 100%
rename from lib/maintainers-list.nix
rename to maintainers/maintainer-list.nix

From 96a3f1b54670047bb07ae521757ae7bcd29682b8 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Mon, 5 Mar 2018 15:13:15 +0100
Subject: [PATCH 0321/2266] soulseekqt: init at 2016-1-17

---
 .../networking/p2p/soulseekqt/default.nix     | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/soulseekqt/default.nix

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
new file mode 100644
index 00000000000..315106ea852
--- /dev/null
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, fetchurl
+, dbus
+, expat, zlib, fontconfig
+, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
+}:
+
+with stdenv.lib;
+let
+  libPath = makeLibraryPath
+    [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ];
+
+  version = "2016-1-17";
+
+  mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
+  srcs = {
+    "i686-linux" = fetchurl {
+      url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz";
+      sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir";
+    };
+
+    "x86_64-linux" = fetchurl {
+      url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz";
+      sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc";
+    };
+  };
+
+in stdenv.mkDerivation rec {
+
+  name = "soulseekqt-${version}";
+  inherit version;
+  src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+
+  sourceRoot = ".";
+  buildPhase = ":";   # nothing to build
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${mainbin} $out/bin/soulseekqt
+  '';
+
+  fixupPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             --set-rpath ${libPath} \
+             $out/bin/soulseekqt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Official Qt SoulSeek client";
+    homepage = http://www.soulseekqt.net;
+    license = licenses.unfree;
+    maintainers = [ maintainers.genesis ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c025469152b..85d741a766c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17494,6 +17494,8 @@ with pkgs;
     inherit (pkgs.vamp) vampSDK;
   };
 
+  soulseekqt = callPackage ../applications/networking/p2p/soulseekqt { };
+
   sox = callPackage ../applications/misc/audio/sox {
     enableLame = config.sox.enableLame or false;
   };

From 39cb0d8dd4c3e8670a8f793bc4bd88f637a62e1f Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Tue, 6 Mar 2018 23:26:12 +0900
Subject: [PATCH 0322/2266] fix bap regression

---
 .../ocaml-modules/janestreet/janePackage.nix  |   4 +-
 .../ocaml-modules/janestreet/old.nix          | 615 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  14 +-
 3 files changed, 629 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/old.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index ddbb11220a0..5cf22341b88 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }:
+{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, defaultVersion ? "0.10.0" }:
 
-{ name, version ? "0.10.0", buildInputs ? [], hash, meta, ...}@args:
+{ name, version ? defaultVersion, buildInputs ? [], hash, meta, ...}@args:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.04"
 then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else
diff --git a/pkgs/development/ocaml-modules/janestreet/old.nix b/pkgs/development/ocaml-modules/janestreet/old.nix
new file mode 100644
index 00000000000..27a65c50275
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/old.nix
@@ -0,0 +1,615 @@
+{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime,
+  ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num,
+  openssl }:
+
+rec {
+
+  # Jane Street packages, up to ppx_core
+
+  sexplib = janePackage {
+    name = "sexplib";
+    meta.description = "Automated S-expression conversion";
+    version = "0.10.0";
+    hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2";
+    buildInputs = [ num ];
+  };
+
+  base = janePackage {
+    name = "base";
+    version = "0.9.4";
+    hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw";
+    propagatedBuildInputs = [ sexplib ];
+    meta.description = "Full standard library replacement for OCaml";
+  };
+
+  ocaml-compiler-libs = janePackage {
+    name = "ocaml-compiler-libs";
+    hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l";
+    meta.description = "OCaml compiler libraries repackaged";
+  };
+
+  ppx_ast = janePackage ({
+    name = "ppx_ast";
+    propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
+    meta.description = "OCaml AST used by Jane Street ppx rewriters";
+  } // (if lib.versionAtLeast ocaml.version "4.06"
+    then {
+      version = "0.9.2";
+      hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0";
+    } else {
+      version = "0.9.1";
+      hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw";
+    }
+  ));
+
+  ppx_traverse_builtins = janePackage {
+    name = "ppx_traverse_builtins";
+    hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi";
+    meta.description = "Builtins for Ppx_traverse";
+  };
+
+  stdio = janePackage {
+    name = "stdio";
+    version = "0.9.1";
+    hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx";
+    propagatedBuildInputs = [ base ];
+    meta.description = "Standard IO library for OCaml";
+  };
+
+  ppx_core = janePackage {
+    name = "ppx_core";
+    hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3";
+    propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ];
+    meta.description = "Jane Street's standard library for ppx rewriters";
+  };
+
+  # Jane Street packages, up to ppx_base
+
+  ppx_optcomp = janePackage {
+    name = "ppx_optcomp";
+    hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd";
+    propagatedBuildInputs = [ ppx_core ];
+    meta.description = "Optional compilation for OCaml";
+  };
+
+  ppx_driver = janePackage {
+    name = "ppx_driver";
+    version = "0.9.1";
+    hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay";
+    buildInputs = [ ocamlbuild ];
+    propagatedBuildInputs = [ ppx_optcomp ];
+    meta.description = "Feature-full driver for OCaml AST transformers";
+  };
+
+  ppx_metaquot = janePackage {
+    name = "ppx_metaquot";
+    hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "Metaquotations for ppx_ast";
+  };
+
+  ppx_type_conv = janePackage {
+    name = "ppx_type_conv";
+    hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p";
+    propagatedBuildInputs = [ ppx_metaquot ppx_deriving ];
+    meta.description = "Support Library for type-driven code generators";
+  };
+
+  ppx_sexp_conv = janePackage {
+    name = "ppx_sexp_conv";
+    hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l";
+    propagatedBuildInputs = [ ppx_type_conv sexplib ];
+    meta.description = "Generation of S-expression conversion functions from type definitions";
+  };
+
+  ppx_compare = janePackage {
+    name = "ppx_compare";
+    hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9";
+    propagatedBuildInputs = [ ppx_type_conv ];
+    meta.description = "Generation of comparison functions from types";
+  };
+
+  ppx_enumerate = janePackage {
+    name = "ppx_enumerate";
+    hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46";
+    propagatedBuildInputs = [ ppx_type_conv ];
+    meta.description = "Generate a list containing all values of a finite type";
+  };
+
+  ppx_hash = janePackage {
+    name = "ppx_hash";
+    hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d";
+    propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
+    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+  };
+
+  ppx_js_style = janePackage {
+    name = "ppx_js_style";
+    hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59";
+    propagatedBuildInputs = [ ppx_metaquot octavius ];
+    meta.description = "Code style checker for Jane Street Packages";
+  };
+
+  ppx_base = janePackage {
+    name = "ppx_base";
+    hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3";
+    propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
+    meta.description = "Base set of ppx rewriters";
+  };
+
+  # Jane Street packages, up to ppx_bin_prot
+
+  fieldslib = janePackage {
+    name = "fieldslib";
+    hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "OCaml record fields as first class values";
+  };
+
+  variantslib = janePackage {
+    name = "variantslib";
+    hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "OCaml variants as first class values";
+  };
+
+  ppx_traverse = janePackage {
+    name = "ppx_traverse";
+    hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2";
+    propagatedBuildInputs = [ ppx_type_conv ];
+    meta.description = "Automatic generation of open recursion classes";
+  };
+
+  ppx_custom_printf = janePackage {
+    name = "ppx_custom_printf";
+    hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ];
+    meta.description = "Printf-style format-strings for user-defined string conversion";
+  };
+
+  ppx_fields_conv = janePackage {
+    name = "ppx_fields_conv";
+    hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z";
+    propagatedBuildInputs = [ fieldslib ppx_type_conv ];
+    meta.description = "Generation of accessor and iteration functions for OCaml records";
+  };
+
+  ppx_variants_conv = janePackage {
+    name = "ppx_variants_conv";
+    hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834";
+    propagatedBuildInputs = [ ppx_type_conv variantslib ];
+    meta.description = "Generation of accessor and iteration functions for OCaml variant types";
+  };
+
+  bin_prot = janePackage {
+    name = "bin_prot";
+    version = "0.9.1";
+    hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk";
+    propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
+    meta.description = "Binary protocol generator";
+  };
+
+  ppx_here = janePackage {
+    name = "ppx_here";
+    hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "Expands [%here] into its location";
+  };
+
+  ppx_bin_prot = janePackage {
+    name = "ppx_bin_prot";
+    hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3";
+    propagatedBuildInputs = [ ppx_here bin_prot ];
+    meta.description = "Generation of bin_prot readers and writers from types";
+  };
+
+  # Jane Street packages, up to ppx_jane
+
+  ppx_assert = janePackage {
+    name = "ppx_assert";
+    hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ];
+    meta.description = "Assert-like extension nodes that raise useful errors on failure";
+  };
+
+  ppx_inline_test = janePackage {
+    name = "ppx_inline_test";
+    version = "0.9.2";
+    hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa";
+    propagatedBuildInputs = [ ppx_metaquot ];
+    meta.description = "Syntax extension for writing in-line tests in OCaml code";
+  };
+
+  typerep = janePackage {
+    name = "typerep";
+    hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3";
+    propagatedBuildInputs = [ base ];
+    meta.description = "Runtime types for OCaml";
+  };
+
+  ppx_bench = janePackage {
+    name = "ppx_bench";
+    hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93";
+    propagatedBuildInputs = [ ppx_inline_test ];
+    meta.description = "Syntax extension for writing in-line benchmarks in OCaml code";
+  };
+
+  ppx_expect = janePackage {
+    name = "ppx_expect";
+    hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b";
+    propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ];
+    meta.description = "Cram like framework for OCaml";
+  };
+
+  ppx_fail = janePackage {
+    name = "ppx_fail";
+    hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32";
+    propagatedBuildInputs = [ ppx_here ppx_metaquot ];
+    meta.description = "Add location to calls to failwiths";
+  };
+
+  ppx_let = janePackage {
+    name = "ppx_let";
+    hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "Monadic let-bindings";
+  };
+
+  ppx_optional = janePackage {
+    name = "ppx_optional";
+    hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82";
+    propagatedBuildInputs = [ ppx_metaquot ];
+    meta.description = "Pattern matching on flat options";
+  };
+
+  ppx_pipebang = janePackage {
+    name = "ppx_pipebang";
+    hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h";
+    propagatedBuildInputs = [ ppx_metaquot ];
+    meta.description = "A ppx rewriter that inlines reverse application operators |> and |!";
+  };
+
+  ppx_sexp_message = janePackage {
+    name = "ppx_sexp_message";
+    hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+    meta.description = "A ppx rewriter for easy construction of s-expressions";
+  };
+
+  ppx_sexp_value = janePackage {
+    name = "ppx_sexp_value";
+    hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+    meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values";
+  };
+
+  ppx_typerep_conv = janePackage {
+    name = "ppx_typerep_conv";
+    hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1";
+    propagatedBuildInputs = [ ppx_type_conv typerep ];
+    meta.description = "Generation of runtime types from type declarations";
+  };
+
+  ppx_jane = janePackage {
+    name = "ppx_jane";
+    hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc";
+    propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
+    meta.description = "Standard Jane Street ppx rewriters";
+  };
+
+  # Jane Street packages, up to core
+
+  configurator = janePackage {
+    name = "configurator";
+    version = "0.9.1";
+    hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix";
+    propagatedBuildInputs = [ ppx_base ];
+    meta.description = "Helper library for gathering system configuration";
+  };
+
+  jane-street-headers = janePackage {
+    name = "jane-street-headers";
+    hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy";
+    meta.description = "Jane Street header files";
+  };
+
+  core_kernel = janePackage {
+    name = "core_kernel";
+    hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh";
+    propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ];
+    meta.description = "Jane Street's standard library overlay (kernel)";
+  };
+
+  spawn = janePackage {
+    name = "spawn";
+    hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5";
+    meta.description = "Spawning sub-processes";
+  };
+
+  core = janePackage {
+    name = "core";
+    version = "0.9.1";
+    hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8";
+    propagatedBuildInputs = [ core_kernel spawn ];
+    meta.description = "Jane Street's standard library overlay";
+  };
+
+  # Jane Street packages, up to core_extended
+
+  re2 = janePackage {
+    name = "re2";
+    hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi";
+    propagatedBuildInputs = [ core_kernel ];
+    meta = {
+      description = "OCaml bindings for RE2";
+      broken = stdenv.isDarwin;
+    };
+  };
+
+  textutils = janePackage {
+    name = "textutils";
+    hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d";
+    propagatedBuildInputs = [ core ];
+    meta.description = "Text output utilities";
+  };
+
+  core_extended = janePackage {
+    name = "core_extended";
+    hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk";
+    propagatedBuildInputs = [ core re2 textutils ];
+    postPatch = ''
+      patchShebangs src/discover.sh
+    '';
+    meta = {
+      description = "Jane Street Capital's standard library overlay";
+    };
+  };
+
+  # Jane Street async packages
+
+  async_kernel = janePackage {
+    name = "async_kernel";
+    hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Jane Street Capital's asynchronous execution library (core)";
+  };
+
+  async_rpc_kernel = janePackage {
+    name = "async_rpc_kernel";
+    hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b";
+    propagatedBuildInputs = [ core_kernel async_kernel ];
+    meta.description = "Platform-independent core of Async RPC library";
+  };
+
+  async_unix = janePackage {
+    name = "async_unix";
+    hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d";
+    propagatedBuildInputs = [ core async_kernel ];
+    meta.description = "Jane Street Capital's asynchronous execution library (unix)";
+  };
+
+  async_extra = janePackage {
+    name = "async_extra";
+    hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0";
+    propagatedBuildInputs = [ async_rpc_kernel async_unix ];
+    meta.description = "Jane Street's asynchronous execution library (extra)";
+  };
+
+  async = janePackage {
+    name = "async";
+    hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1";
+    propagatedBuildInputs = [ async_extra ];
+    meta.description = "Jane Street Capital's asynchronous execution library";
+  };
+
+  async_find = janePackage {
+    name = "async_find";
+    hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Directory traversal with Async";
+  };
+
+  async_interactive = janePackage {
+    name = "async_interactive";
+    hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Utilities for building simple command-line based user interfaces";
+  };
+
+  async_parallel = janePackage {
+    name = "async_parallel";
+    hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Distributed computing library";
+  };
+
+  async_shell = janePackage {
+    name = "async_shell";
+    hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2";
+    propagatedBuildInputs = [ core_extended async ];
+    meta = {
+      description = "Shell helpers for Async";
+    };
+  };
+
+  async_ssl = janePackage {
+    name = "async_ssl";
+    hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss";
+    propagatedBuildInputs = [ async ctypes openssl ];
+    meta.description = "Async wrappers for SSL";
+  };
+
+  # Jane Street packages, up to expect_test_helpers
+
+  sexp_pretty = janePackage {
+    name = "sexp_pretty";
+    hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx";
+    propagatedBuildInputs = [ ppx_base re ];
+    meta.description = "S-expression pretty-printer";
+  };
+
+  expect_test_helpers_kernel = janePackage {
+    name = "expect_test_helpers_kernel";
+    hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6";
+    propagatedBuildInputs = [ core_kernel sexp_pretty ];
+    meta.description = "Helpers for writing expectation tests";
+  };
+
+  expect_test_helpers = janePackage {
+    name = "expect_test_helpers";
+    hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2";
+    propagatedBuildInputs = [ async expect_test_helpers_kernel ];
+    meta.description = "Async helpers for writing expectation tests";
+  };
+
+  # Miscellaneous Jane Street packages
+
+  bignum = janePackage {
+    name = "bignum";
+    hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3";
+    propagatedBuildInputs = [ core_kernel zarith ];
+    meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
+  };
+
+  cinaps = janePackage {
+    name = "cinaps";
+    hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5";
+    propagatedBuildInputs = [ re ];
+    meta.description = "Trivial Metaprogramming tool using the OCaml toplevel";
+  };
+
+  command_rpc = janePackage {
+    name = "command_rpc";
+    hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout";
+  };
+
+  core_bench = janePackage {
+    name = "core_bench";
+    hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h";
+    propagatedBuildInputs = [ core_extended ];
+    meta = {
+      description = "Micro-benchmarking library for OCaml";
+    };
+  };
+
+  core_profiler = janePackage {
+    name = "core_profiler";
+    hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44";
+    propagatedBuildInputs = [ core_extended ];
+    meta = {
+      description = "Profiling library";
+    };
+  };
+
+  csvfields = janePackage {
+    name = "csvfields";
+    hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v";
+    propagatedBuildInputs = [ core ];
+    meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
+  };
+
+  ecaml = janePackage {
+    name = "ecaml";
+    hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Writing Emacs plugin in OCaml";
+  };
+
+  email_message = janePackage {
+    name = "email_message";
+    hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz";
+    propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ];
+    meta = {
+      description = "E-mail message parser";
+    };
+  };
+
+  incremental_kernel = janePackage {
+    name = "incremental_kernel";
+    hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Library for incremental computations depending only on core_kernel";
+  };
+
+  incremental = janePackage {
+    name = "incremental";
+    hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh";
+    propagatedBuildInputs = [ core incremental_kernel ];
+    meta.description = "Library for incremental computations";
+  };
+
+  incr_map = janePackage {
+    name = "incr_map";
+    hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv";
+    propagatedBuildInputs = [ incremental_kernel ];
+    meta.description = "Helpers for incremental operations on map like data structures";
+  };
+
+  ocaml_plugin = janePackage {
+    name = "ocaml_plugin";
+    hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14";
+    buildInputs = [ ocamlbuild ];
+    propagatedBuildInputs = [ async ];
+    meta.description = "Automatically build and dynlink ocaml source files";
+  };
+
+  parsexp = janePackage {
+    name = "parsexp";
+    hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b";
+    propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ];
+    meta.description = "S-expression parsing library";
+  };
+
+  parsexp_io = janePackage {
+    name = "parsexp_io";
+    hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5";
+    propagatedBuildInputs = [ parsexp ];
+    meta.description = "S-expression parsing library (IO functions)";
+  };
+
+  patience_diff = janePackage {
+    name = "patience_diff";
+    hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Tool and library implementing patience diff";
+  };
+
+  posixat = janePackage {
+    name = "posixat";
+    hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl";
+    propagatedBuildInputs = [ ppx_sexp_conv ];
+    meta.description = "Binding to the posix *at functions";
+    meta.broken = lib.versionAtLeast ocaml.version "4.05";
+  };
+
+  rpc_parallel = janePackage {
+    name = "rpc_parallel";
+    hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Type-safe library for building parallel applications";
+  };
+
+  shexp = janePackage {
+    name = "shexp";
+    hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y";
+    propagatedBuildInputs = [ posixat spawn ];
+    meta.description = "Process library and s-expression based shell";
+  };
+
+  topological_sort = janePackage {
+    name = "topological_sort";
+    hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Topological sort algorithm";
+  };
+
+  typerep_extended = janePackage {
+    name = "typerep_extended";
+    hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Runtime types for OCaml (Extended)";
+  };
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index efce8c412d9..82467fcd78c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -54,7 +54,9 @@ let
 
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
-    bap = callPackage ../development/ocaml-modules/bap { };
+    bap = callPackage ../development/ocaml-modules/bap {
+      inherit (janeStreet_0_9_0) core_kernel ppx_jane parsexp;
+    };
 
     batteries = callPackage ../development/ocaml-modules/batteries { };
 
@@ -712,13 +714,21 @@ let
     # Jane Street
 
     janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
-
+    
     janeStreet = import ../development/ocaml-modules/janestreet {
       inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit;
       inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
       inherit ppx_deriving re zarith;
       inherit (pkgs) stdenv openssl;
     };
+    
+    janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
+      janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; };
+      inherit lib ocaml ocamlbuild ctypes cryptokit;
+      inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
+      inherit ppx_deriving re zarith;
+      inherit (pkgs) stdenv openssl;
+    };
 
     js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};
 

From 467c03de31508050f982320866b6a807efc65116 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Tue, 6 Mar 2018 09:44:28 -0500
Subject: [PATCH 0323/2266] perlPackages.Socket: 2.020 -> 2.027

Also disable t/getaddrinfo.t test which requires network access.
---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 123e0c64c48..05ff6289ff4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12320,16 +12320,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   Socket = buildPerlPackage {
-    name = "Socket-2.020";
+    name = "Socket-2.027";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.020.tar.gz;
-      sha256 = "9ad4174c45b4c31d5e0b8019ada1fc767093849e77f268f0d1831eeb891dfdd7";
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.027.tar.gz;
+      sha256 = "1a725fbqx6bjzjf63bgs5wvzd20kffz1f94pbmv1670p9m4i270l";
     };
     postPatch = ''
       # requires network access
-      rm t/getnameinfo.t
+      rm t/getnameinfo.t t/getaddrinfo.t
     '';
     meta = {
+      homepage = https://metacpan.org/pod/Socket;
       description = "Networking constants and support functions";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };

From 96ebf614ad267150f417faeb122d80588e414d6d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 6 Mar 2018 13:00:14 +0000
Subject: [PATCH 0324/2266] chromium, google-chrome: fix escaping of
 commandLineArgs

---
 .../networking/browsers/chromium/default.nix    |  2 +-
 .../browsers/google-chrome/default.nix          | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1f6eb7c178f..1458a181656 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation {
     mkdir -p "$out/bin"
 
     eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      ${commandLineArgs} \
+      --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
       ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ed -v -s "$out/bin/chromium" << EOF
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index eaa05726f1c..d2d26190ce0 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, bash
+{ stdenv, fetchurl, patchelf, makeWrapper
 
 # Linked dynamic libraries.
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
   src = chromium.upstream-info.binary;
 
   buildInputs = [
-    patchelf
+    patchelf makeWrapper
 
     # needed for GSETTINGS_SCHEMAS_PATH
     gsettings-desktop-schemas glib gtk
@@ -120,14 +120,11 @@ in stdenv.mkDerivation rec {
       mv "$icon_file" "$logo_output_path/google-$appname.png"
     done
 
-    cat > $exe << EOF
-    #!${bash}/bin/sh
-    export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
-    export PATH=$binpath\''${PATH:+:\$PATH}
-    export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
-    $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
-    EOF
-    chmod +x $exe
+    makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
+      --prefix LD_LIBRARY_PATH : "$rpath" \
+      --prefix PATH            : "$binpath" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --add-flags ${escapeShellArg commandLineArgs}
 
     for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do
       patchelf --set-rpath $rpath $elf

From 73dbc7319660668ed13531ce98924c8deec95465 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 6 Mar 2018 16:16:26 +0100
Subject: [PATCH 0325/2266] xen 4.8: add xsa security patches 252-256

---
 pkgs/applications/virtualization/xen/4.8.nix  |  6 ++++
 .../virtualization/xen/xsa-patches.nix        | 29 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 558510b30f5..8dedb6a4d05 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -170,6 +170,12 @@ callPackage (import ./generic.nix (rec {
     XSA_249
     XSA_250
     XSA_251_48
+    XSA_252_49
+    # 253: 4.8 not affected
+    # 254: no patch supplied by xen project (Meltdown/Spectre)
+    XSA_255_49_1
+    XSA_255_49_2
+    XSA_256_48
     xenlockprofpatch
     xenpmdpatch
   ];
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 8f8cc459a24..668ba70343f 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -863,5 +863,34 @@ in rec {
       sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq";
     })
   ];
+  # 4.8
+  XSA_252_49 = [
+   (xsaPatch {
+      name = "252-4.9";
+      sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n";
+    })
+  ];
+  # 4.8
+  XSA_255_49_1= [
+   (xsaPatch {
+      name = "255-4.9-1";
+      sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc";
+    })
+  ];
+  # 4.8
+  XSA_255_49_2= [
+   (xsaPatch {
+      name = "255-4.9-2";
+      sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12";
+    })
+  ];
+  # 4.8
+  XSA_256_48= [
+   (xsaPatch {
+      name = "256-4.8";
+      sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4";
+    })
+  ];
+
 
 }

From d3c3364bfa797766875e17ca71dd8a5a8312f73a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 6 Mar 2018 15:24:07 +0000
Subject: [PATCH 0326/2266] SDL: add a patch to fix
 https://bugzilla.libsdl.org/show_bug.cgi?id=1769

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a752fbcbcdd..9679b104f20 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
       url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2";
       sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq";
     })
+    # https://bugzilla.libsdl.org/show_bug.cgi?id=1769
+    (fetchpatch {
+      url = "http://hg.libsdl.org/SDL/raw-rev/91ad7b43317a";
+      sha256 = "15g537vbl2my4mfrjxfkcx9ri6bk2gjvaqj650rjdxwk2nkdkn4b";
+    })
     # Workaround X11 bug to allow changing gamma
     # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
     (fetchpatch {

From 6166027ca88eab5372508f0fd3f3b6bc51e91a19 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 5 Mar 2018 17:30:34 +0000
Subject: [PATCH 0327/2266] SDL, SDL2: cleanup and cross-pollinate with useful
 changes to either expression

---
 pkgs/development/libraries/SDL/default.nix  | 76 ++++++++++++---------
 pkgs/development/libraries/SDL2/default.nix | 46 +++++++------
 2 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 9679b104f20..8af3f0a548c 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
 , openglSupport ? false, libGL, libGLU
 , alsaSupport ? true, alsaLib
 , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr
@@ -7,13 +7,32 @@
 , hostPlatform, buildPlatform
 }:
 
-# OSS is no longer supported, for it's much crappier than ALSA and
-# PulseAudio.
-assert hostPlatform.isLinux -> alsaSupport || pulseaudioSupport;
+# NOTE: When editing this expression see if the same change applies to
+# SDL2 expression too
+
+with lib;
+
+assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
+assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
 
 let
-  inherit (stdenv.lib) optional optionals;
+
+  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
+  # we must arrange to add it to its RPATH; however, `patchelf' seems
+  # to fail at doing this, hence `--disable-pulseaudio-shared'.
+  configureFlagsFun = attrs: [
+    "--disable-oss"
+    "--disable-video-x11-xme"
+    "--disable-x11-shared"
+    "--disable-alsa-shared"
+    "--enable-rpath"
+    "--disable-pulseaudio-shared"
+    "--disable-osmesa-shared"
+  ] ++ optional (!x11Support) "--without-x"
+    ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
+
 in
+
 stdenv.mkDerivation rec {
   name    = "SDL-${version}";
   version = "1.2.15";
@@ -29,35 +48,27 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-  propagatedBuildInputs =
-    optionals x11Support [ libXext libICE libXrandr ] ++
-    optional alsaSupport alsaLib ++
-    optional stdenv.isLinux libcap ++
-    optionals openglSupport [ libGL libGLU ] ++
-    optional pulseaudioSupport libpulseaudio ++
-    optional stdenv.isDarwin Cocoa;
+  propagatedBuildInputs = [ ]
+    ++ optionals x11Support [ libXext libICE libXrandr ]
+    ++ optional stdenv.isLinux libcap
+    ++ optionals openglSupport [ libGL libGLU ]
+    ++ optional alsaSupport alsaLib
+    ++ optional pulseaudioSupport libpulseaudio
+    ++ optional stdenv.isDarwin Cocoa;
 
-  buildInputs = let
-    notMingw = !hostPlatform.isMinGW;
-  in optional notMingw audiofile
-  ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]
-  ++ [ libiconv ];
+  buildInputs = [ libiconv ]
+    ++ optional (!hostPlatform.isMinGW) audiofile
+    ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 
-  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
-  # we must arrange to add it to its RPATH; however, `patchelf' seems
-  # to fail at doing this, hence `--disable-pulseaudio-shared'.
-  configureFlags = [
-    "--disable-oss"
-    "--disable-video-x11-xme"
-    "--disable-x11-shared"
-    "--disable-alsa-shared"
-    "--enable-rpath"
-    "--disable-pulseaudio-shared"
-    "--disable-osmesa-shared"
-  ] ++ optional (!x11Support) "--without-x"
-    ++ optional (alsaSupport && hostPlatform != buildPlatform) "--with-alsa-prefix=${alsaLib.out}/lib";
+  configureFlags = configureFlagsFun { inherit alsaLib; };
+
+  crossAttrs = {
+    configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
+  };
 
   patches = [
+    ./find-headers.patch
+
     # Fix window resizing issues, e.g. for xmonad
     # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430
     (fetchpatch {
@@ -97,10 +108,11 @@ stdenv.mkDerivation rec {
       url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
       sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
     })
-    ./find-headers.patch
   ];
 
-  postFixup = ''moveToOutput share/aclocal "$dev" '';
+  postInstall = ''
+    moveToOutput share/aclocal "$dev"
+  '';
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index f87e1d5067d..04e187a8256 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -11,19 +11,27 @@
 , libiconv
 }:
 
-# OSS is no longer supported, for it's much crappier than ALSA and
-# PulseAudio.
-assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
+# NOTE: When editing this expression see if the same change applies to
+# SDL expression too
 
-assert openglSupport -> (stdenv.isDarwin || libGL != null && x11Support);
+with lib;
+
+assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
+assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
 
 let
+
+  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
+  # we must arrange to add it to its RPATH; however, `patchelf' seems
+  # to fail at doing this, hence `--disable-pulseaudio-shared'.
   configureFlagsFun = attrs: [
       "--disable-oss" "--disable-x11-shared" "--disable-wayland-shared"
       "--disable-pulseaudio-shared" "--disable-alsa-shared"
-    ] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"
-      ++ lib.optional (!x11Support) "--without-x";
+    ] ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"
+      ++ optional (!x11Support) "--without-x";
+
 in
+
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
   version = "2.0.7";
@@ -34,24 +42,25 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "dev" ];
+  outputBin = "dev"; # sdl-config
 
   patches = [ ./find-headers.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-  propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++
-    lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++
-    lib.optional pulseaudioSupport libpulseaudio
-    ++ [ libiconv ];
+  propagatedBuildInputs = [ libiconv ]
+    ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
+    ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
+    ++ optional  pulseaudioSupport libpulseaudio;
 
-  buildInputs = [ audiofile ] ++
-    lib.optional openglSupport libGL ++
-    lib.optional alsaSupport alsaLib ++
-    lib.optional dbusSupport dbus ++
-    lib.optional udevSupport udev ++
-    lib.optional ibusSupport ibus ++
-    lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
+  buildInputs = [ audiofile ]
+    ++ optional openglSupport libGL
+    ++ optional alsaSupport alsaLib
+    ++ optional dbusSupport dbus
+    ++ optional udevSupport udev
+    ++ optional ibusSupport ibus
+    ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
 
   # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
   dontDisableStatic = true;
@@ -60,9 +69,6 @@ stdenv.mkDerivation rec {
   #   pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
   enableParallelBuilding = false;
 
-  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
-  # we must arrange to add it to its RPATH; however, `patchelf' seems
-  # to fail at doing this, hence `--disable-pulseaudio-shared'.
   configureFlags = configureFlagsFun { inherit alsaLib; };
 
   crossAttrs = {

From f114118842e19ced171fd634d6ff70a92746f2cb Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 5 Mar 2018 20:12:44 +0000
Subject: [PATCH 0328/2266] SDL, SDL2: don't link statically to any of the
 inputs

---
 pkgs/development/libraries/SDL/default.nix  | 17 ++++----
 pkgs/development/libraries/SDL2/default.nix | 43 ++++++++++++++-------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 8af3f0a548c..2e6c78fdf23 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -17,17 +17,10 @@ assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGL
 
 let
 
-  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
-  # we must arrange to add it to its RPATH; however, `patchelf' seems
-  # to fail at doing this, hence `--disable-pulseaudio-shared'.
   configureFlagsFun = attrs: [
     "--disable-oss"
     "--disable-video-x11-xme"
-    "--disable-x11-shared"
-    "--disable-alsa-shared"
     "--enable-rpath"
-    "--disable-pulseaudio-shared"
-    "--disable-osmesa-shared"
   ] ++ optional (!x11Support) "--without-x"
     ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
 
@@ -47,7 +40,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
   propagatedBuildInputs = [ ]
     ++ optionals x11Support [ libXext libICE libXrandr ]
     ++ optional stdenv.isLinux libcap
@@ -114,6 +106,15 @@ stdenv.mkDerivation rec {
     moveToOutput share/aclocal "$dev"
   '';
 
+  # See the same place in the expression for SDL2
+  postFixup = ''
+    for lib in $out/lib/*.so* ; do
+      if [[ -L "$lib" ]]; then
+        patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib"
+      fi
+    done
+  '';
+
   setupHook = ./setup-hook.sh;
 
   passthru = { inherit openglSupport; };
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 04e187a8256..ca88d42b84c 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -21,14 +21,10 @@ assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
 
 let
 
-  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
-  # we must arrange to add it to its RPATH; however, `patchelf' seems
-  # to fail at doing this, hence `--disable-pulseaudio-shared'.
   configureFlagsFun = attrs: [
-      "--disable-oss" "--disable-x11-shared" "--disable-wayland-shared"
-      "--disable-pulseaudio-shared" "--disable-alsa-shared"
-    ] ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"
-      ++ optional (!x11Support) "--without-x";
+    "--disable-oss"
+  ] ++ optional (!x11Support) "--without-x"
+    ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
 
 in
 
@@ -48,18 +44,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
   propagatedBuildInputs = [ libiconv ]
+    ++ optional  dbusSupport dbus
+    ++ optional  udevSupport udev
     ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
     ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
+    ++ optional  alsaSupport alsaLib
     ++ optional  pulseaudioSupport libpulseaudio;
 
   buildInputs = [ audiofile ]
-    ++ optional openglSupport libGL
-    ++ optional alsaSupport alsaLib
-    ++ optional dbusSupport dbus
-    ++ optional udevSupport udev
-    ++ optional ibusSupport ibus
+    ++ optional  openglSupport libGL
+    ++ optional  ibusSupport ibus
     ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
 
   # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
@@ -81,6 +76,28 @@ stdenv.mkDerivation rec {
     moveToOutput bin/sdl2-config "$dev"
   '';
 
+  # SDL is weird in that instead of just dynamically linking with
+  # libraries when you `--enable-*` (or when `configure` finds) them
+  # it `dlopen`s them at runtime. In principle, this means it can
+  # ignore any missing optional dependencies like alsa, pulseaudio,
+  # some x11 libs, wayland, etc if they are missing on the system
+  # and/or work with wide array of versions of said libraries. In
+  # nixpkgs, however, we don't need any of that. Moreover, since we
+  # don't have a global ld-cache we have to stuff all the propagated
+  # libraries into rpath by hand or else some applications that use
+  # SDL API that requires said libraries will fail to start.
+  #
+  # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to
+  # confirm that they actually use most of the `propagatedBuildInputs`
+  # from above in this way. This is pretty weird.
+  postFixup = ''
+    for lib in $out/lib/*.so* ; do
+      if [[ -L "$lib" ]]; then
+        patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib"
+      fi
+    done
+  '';
+
   setupHook = ./setup-hook.sh;
 
   passthru = { inherit openglSupport; };

From 39319f3a7598940218eab9b3ec6d4dd388627abe Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 5 Mar 2018 21:08:15 +0000
Subject: [PATCH 0329/2266] SDL2: don't compile any static outputs

After the previous patch there's no reason to have them. But I didn't try to
rebuild every single thing that depends on this, so try reverting this patch first
if something does break and you can't fix it.
---
 pkgs/development/libraries/SDL2/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index ca88d42b84c..ac9b4a42bb0 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -57,9 +57,6 @@ stdenv.mkDerivation rec {
     ++ optional  ibusSupport ibus
     ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
 
-  # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-  dontDisableStatic = true;
-
   # /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error:
   #   pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
   enableParallelBuilding = false;

From 9186aa1bf8bd579d7f8016d19433c8c5e0cd84b6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 6 Mar 2018 07:17:06 -0800
Subject: [PATCH 0330/2266] coqPackages.QuickChick: use fetchFromGitHub

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

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 2a0c3ade561..72603ad4485 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, coq, ssreflect }:
+{ stdenv, fetchFromGitHub, coq, ssreflect }:
 
 let param =
   {
@@ -27,8 +27,9 @@ stdenv.mkDerivation rec {
 
   name = "coq${coq.coq-version}-QuickChick-${param.version}";
 
-  src = fetchgit {
-    url = git://github.com/QuickChick/QuickChick.git;
+  src = fetchFromGitHub {
+    owner = "QuickChick";
+    repo = "QuickChick";
     inherit (param) rev sha256;
   };
 

From 4bd69fd24959d33b3f22f54d5447e509447aa9c9 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 6 Mar 2018 07:17:45 -0800
Subject: [PATCH 0331/2266] coqPackages.bignums: Change expression to match
 other Coq packages

Without this change, it's impossible to override bignums, or ignore it when
creating custom datasets for other versions of Coq (such as 8.8+alpha).
---
 .../coq-modules/bignums/default.nix           | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 5762da66fed..9d035fec9f9 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -1,20 +1,17 @@
 { stdenv, fetchFromGitHub, coq }:
 
-let rev_and_sha = {
-  "8.6" = {
-    rev = "v8.6.0";
-    sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
-  };
-  "8.7" = {
-    rev = "V8.7.0";
-    sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
-  };
-};
-in
-
-if ! (rev_and_sha ? "${coq.coq-version}") then
-  throw "bignums is not available for Coq ${coq.coq-version}"
-else with rev_and_sha."${coq.coq-version}";
+let param =
+  {
+    "8.6" = {
+      rev = "v8.6.0";
+      sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";
+    };
+    "8.7" = {
+      rev = "V8.7.0";
+      sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
+    };
+  }."${coq.coq-version}"
+; in
 
 stdenv.mkDerivation rec {
 
@@ -23,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "coq";
     repo = "bignums";
-    inherit rev sha256;
+    inherit (param) rev sha256;
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
@@ -35,4 +32,7 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+  };
 }

From 19130ebc5d05cc7720335c92d68a4fd1faf28dc0 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 6 Mar 2018 15:35:27 +0000
Subject: [PATCH 0332/2266] SDL: build statically against x11 on Darwin

---
 pkgs/development/libraries/SDL/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 2e6c78fdf23..0b853aad8ef 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -21,7 +21,14 @@ let
     "--disable-oss"
     "--disable-video-x11-xme"
     "--enable-rpath"
-  ] ++ optional (!x11Support) "--without-x"
+  # Building without this fails on Darwin with
+  #
+  #   ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
+  #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+  #
+  # Please try revert the change that introduced this comment when updating SDL.
+  ] ++ optional stdenv.isDarwin "--disable-x11-shared"
+    ++ optional (!x11Support) "--without-x"
     ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
 
 in
@@ -41,7 +48,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ ]
-    ++ optionals x11Support [ libXext libICE libXrandr ]
+    ++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ]
     ++ optional stdenv.isLinux libcap
     ++ optionals openglSupport [ libGL libGLU ]
     ++ optional alsaSupport alsaLib
@@ -49,6 +56,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isDarwin Cocoa;
 
   buildInputs = [ libiconv ]
+    ++ optionals (x11Support && stdenv.isDarwin) [ libXext libICE libXrandr ]
     ++ optional (!hostPlatform.isMinGW) audiofile
     ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 

From 3a40b33461a497f2b8f6580bebb4cd8b56df55fa Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Mar 2018 19:44:30 -0600
Subject: [PATCH 0333/2266] kernel-headers: remove deprecated and broken asm
 symlink fixups

Discussion:
https://github.com/NixOS/nixpkgs/pull/36303
---
 pkgs/os-specific/linux/kernel-headers/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 8107f7d9657..01cab57f719 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -39,14 +39,6 @@ let
       echo "${version}-default" > $out/include/config/kernel.release
     '';
 
-    # !!! hacky
-    fixupPhase = ''
-      ln -s asm $out/include/asm-$platform
-      if test "$platform" = "i386" -o "$platform" = "x86_64"; then
-        ln -s asm $out/include/asm-x86
-      fi
-    '';
-
     meta = with lib; {
       description = "Header files and scripts for Linux kernel";
       license = licenses.gpl2;

From 4134e62650c7cf5676e5b2ebd59e04bccabcb9c4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 6 Mar 2018 18:17:02 +0100
Subject: [PATCH 0334/2266] pythonPackages.pycdio: clean up patching

The BSDI driver is not used by platforms supported by Nixpkgs.
---
 pkgs/top-level/python-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 370fe91f998..4568d4b7ec2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13061,9 +13061,7 @@ in {
       sha256 = "1a1h0lmfl56a2a9xqhacnjclv81nv3906vdylalybxrk4bhrm3hj";
     };
 
-    prePatch = ''
-      sed -i -e "s|if type(driver_id)==int|if type(driver_id) in (int, long)|g" cdio.py
-    '';
+    prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py";
 
     preConfigure = ''
       patchShebangs .

From 1c357efdfc8dc7695ed052e6cd6b60a4a4faab26 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 6 Mar 2018 19:59:33 +0100
Subject: [PATCH 0335/2266] xen: 4.8.2 -> 4.8.3

---
 pkgs/applications/virtualization/xen/4.8.nix | 27 +++-----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 8dedb6a4d05..96e70d7431e 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -48,11 +48,11 @@ let
 in
 
 callPackage (import ./generic.nix (rec {
-  version = "4.8.2";
+  version = "4.8.3";
 
   src = fetchurl {
     url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
-    sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b";
+    sha256 = "0vhkpyy5x7kc36hnav95fn194ngsmc3m2xcc78vccs00gdf6m8q9";
   };
 
   # Sources needed to build tools and firmwares.
@@ -61,7 +61,7 @@ callPackage (import ./generic.nix (rec {
       src = fetchgit {
         url = https://xenbits.xen.org/git-http/qemu-xen.git;
         rev = "refs/tags/qemu-xen-${version}";
-        sha256 = "1l4sygd8p0mc13bskr4r1m31qh1kr58h195qn1s52869s58jyhvm";
+        sha256 = "090ibcgs3xwmavk9yg2vaqr3xp9hirnfd3r40ccvrl49c5x58w3g";
       };
       buildInputs = qemuDeps;
       meta.description = "Xen's fork of upstream Qemu";
@@ -150,26 +150,7 @@ callPackage (import ./generic.nix (rec {
     ++ optional (withInternalOVMF) "--enable-ovmf";
 
   patches = with xsa; flatten [
-    XSA_231
-    XSA_232
-    XSA_233
-    XSA_234_48
-    XSA_236
-    XSA_237_48
-    XSA_238
-    XSA_239
-    XSA_240_48
-    XSA_241
-    XSA_242
-    XSA_243_48
-    XSA_244
-    XSA_245
-    XSA_246
-    XSA_247_48
-    XSA_248_48
-    XSA_249
-    XSA_250
-    XSA_251_48
+    # XSA_231 to XSA-251 are fixed in 4.8.3 (verified with git log)
     XSA_252_49
     # 253: 4.8 not affected
     # 254: no patch supplied by xen project (Meltdown/Spectre)

From 458cce8d16099afbf91373fb003b78d94f4b3eae Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 6 Mar 2018 20:20:37 +0100
Subject: [PATCH 0336/2266] icmake: icmbuild uses tput

---
 pkgs/development/tools/build-managers/icmake/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 5b455f267d8..4a37ca011c2 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc }:
+{ stdenv, fetchFromGitHub, makeWrapper, gcc, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     sourceRoot=$(echo */icmake)
   '';
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ gcc ];
 
   preConfigure = ''
@@ -30,6 +31,9 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     ./icm_install all /
+
+    wrapProgram $out/bin/icmbuild \
+     --prefix PATH : ${ncurses}/bin
   '';
 
   meta = with stdenv.lib; {

From 55343222853751c3ab8bd1df90ccb5b0dce37aa7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 6 Mar 2018 20:24:08 +0100
Subject: [PATCH 0337/2266] yodl: 4.01.00 -> 4.02.00

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

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 06588e60a5e..1f5ead84677 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "4.01.00";
+  version = "4.02.00";
 
   nativeBuildInputs = [ icmake ];
 
   buildInputs = [ perl ];
 
   src = fetchFromGitHub {
-    sha256 = "1aahwmj4gmf59lrij2373lkgfj77i3ghdas9c7iqrjwaizb0430p";
+    sha256 = "08i3q3h581kxr5v7wi114bng66pwwsjs5qj3ywnnrr7ra1h5rzwa";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt
   '';
 
+  # Set TERM because icmbuild calls tput.
+  TERM = "xterm";
+
   buildPhase = ''
     ./build programs
     ./build macros

From 344bc9cde6bbb3ebf63b39fb330b4b12b01eb93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Tue, 6 Mar 2018 11:23:29 +0100
Subject: [PATCH 0338/2266] SDL2: 2.0.7 -> 2.0.8

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index f87e1d5067d..a037cd7dcfa 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -26,11 +26,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "http://www.libsdl.org/release/${name}.tar.gz";
-    sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf";
+    sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd";
   };
 
   outputs = [ "out" "dev" ];

From 231f213ffaffa59e643b6d26167e866e434203b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Tue, 6 Mar 2018 11:24:12 +0100
Subject: [PATCH 0339/2266] SDL2_image: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 91b4a563da0..b0f2d0e8b8d 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "SDL2_image-${version}";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
-    sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj";
+    sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m";
   };
 
   buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.libsdl.org/projects/SDL_image/;
     platforms = platforms.unix;
     license = licenses.zlib;
+    maintainers = with maintainers; [ cpages ];
   };
 }

From 08049f41e45f61073c405f3a7e09a63f50f426c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Tue, 6 Mar 2018 11:25:19 +0100
Subject: [PATCH 0340/2266] SDL2_gfx: 1.0.1 -> 1.0.4

Setting myself as maintainer. It was only set to bjg due to an original
copy-paste.
---
 pkgs/development/libraries/SDL2_gfx/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index a630e9cead8..ec61b8b4505 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,12 +1,13 @@
 { stdenv, darwin, fetchurl, SDL2 }:
 
 stdenv.mkDerivation rec {
-  name = "SDL2_gfx-${version}";
-  version = "1.0.1";
+  name = "${pname}-${version}";
+  pname = "SDL2_gfx";
+  version = "1.0.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz";
-    sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
+    url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz";
+    sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
   };
 
   buildInputs = [ SDL2 ]
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/sdlgfx/;
     license = licenses.zlib;
 
-    maintainers = with maintainers; [ bjg ];
+    maintainers = with maintainers; [ cpages ];
     platforms = platforms.unix;
   };
 }

From 2372e93981bf6c57736bc2484e5141a71de24c77 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 6 Mar 2018 21:37:18 +0200
Subject: [PATCH 0341/2266] trinity: Fix 32-bit build

---
 pkgs/os-specific/linux/trinity/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index b69bd576ed2..4c3a92cd87e 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq";
   };
 
+  # Fails on 32-bit otherwise
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   postPatch = ''
     patchShebangs ./configure
     patchShebangs ./scripts/

From ebfecf3e76d30cdc846b21fca97a42d12a674f5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 6 Mar 2018 02:31:35 +0100
Subject: [PATCH 0342/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d14774a67ecafc9d3bc5c3fab91e2575ede8f381.
---
 .../haskell-modules/hackage-packages.nix      | 405 ++++++++++++------
 1 file changed, 284 insertions(+), 121 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6a54b9df52e..40f28fc4d8d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6067,17 +6067,17 @@ self: {
      }) {};
 
   "GLFW" = callPackage
-    ({ mkDerivation, base, libX11, mesa, OpenGL }:
+    ({ mkDerivation, base, libGL, libX11, OpenGL }:
      mkDerivation {
        pname = "GLFW";
        version = "0.5.2.5";
        sha256 = "029sw2sykr6plffkrmigv5mj2aklllmgi021is5ybsbqv0mxgh9p";
        libraryHaskellDepends = [ base OpenGL ];
-       librarySystemDepends = [ libX11 mesa ];
+       librarySystemDepends = [ libGL libX11 ];
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs.xorg) libX11; mesa = null;};
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};
 
   "GLFW-OGL" = callPackage
     ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }:
@@ -6144,16 +6144,16 @@ self: {
      }) {};
 
   "GLHUI" = callPackage
-    ({ mkDerivation, base, libX11, mesa }:
+    ({ mkDerivation, base, libGL, libX11 }:
      mkDerivation {
        pname = "GLHUI";
        version = "1.1.0";
        sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa";
        libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ libX11 mesa ];
+       librarySystemDepends = [ libGL libX11 ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs.xorg) libX11; mesa = null;};
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};
 
   "GLM" = callPackage
     ({ mkDerivation, aeson, base, bytestring, interpolate, lens, mtl
@@ -6198,17 +6198,17 @@ self: {
      }) {};
 
   "GLURaw" = callPackage
-    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
+    ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
        version = "2.0.0.3";
        sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q";
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
-       librarySystemDepends = [ freeglut mesa ];
+       librarySystemDepends = [ libGL libGLU ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) freeglut; mesa = null;};
+     }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "GLUT" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
@@ -13990,7 +13990,7 @@ self: {
      }) {};
 
   "OpenGLRaw" = callPackage
-    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+    ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
      , text, transformers
      }:
      mkDerivation {
@@ -14000,11 +14000,11 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers fixed half text transformers
        ];
-       librarySystemDepends = [ mesa ];
+       librarySystemDepends = [ libGL ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) {mesa = null;};
+     }) {inherit (pkgs) libGL;};
 
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
@@ -29700,28 +29700,28 @@ self: {
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
      , Cabal, cli-setup, composition-prelude, containers, dependency
-     , dhall, directory, file-embed, filemanip, http-client
-     , http-client-tls, lzma, microlens, microlens-th
-     , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-ext, tar, temporary, text, unix, zip-archive, zlib
+     , dhall, directory, file-embed, filemanip, hashable, http-client
+     , http-client-tls, lens, lzma, mtl, optparse-applicative
+     , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
+     , text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.7.0.10";
-       sha256 = "15snn30g5hkwp0yv5iz84qx363d26lsy4via9l5h7qr2dahy8rkx";
+       version = "2.7.0.22";
+       sha256 = "0cm5psp9k207yqzacdribjp7clk8a3b5vx9qfb7kq5va3fv7hh05";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring bzlib Cabal
          composition-prelude containers dependency dhall directory
-         file-embed filemanip http-client http-client-tls lzma microlens
-         microlens-th parallel-io process shake shake-ats shake-ext tar text
-         unix zip-archive zlib
+         file-embed filemanip hashable http-client http-client-tls lens lzma
+         mtl parallel-io process shake shake-ats shake-ext tar text unix
+         zip-archive zlib
        ];
        executableHaskellDepends = [
-         base composition-prelude directory microlens optparse-applicative
-         shake shake-ats temporary text
+         base composition-prelude directory lens optparse-applicative shake
+         shake-ats temporary text
        ];
        homepage = "https://github.com/vmchale/atspkg#readme";
        description = "A build tool for ATS";
@@ -34437,9 +34437,10 @@ self: {
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
-    ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor
-     , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm
-     , mesa, template-haskell, test-framework, test-framework-hunit
+    ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
+     , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
+     , libXxf86vm, template-haskell, test-framework
+     , test-framework-hunit
      }:
      mkDerivation {
        pname = "bindings-GLFW";
@@ -34447,19 +34448,19 @@ self: {
        sha256 = "1xmmwxbjpxwndiacrh2mk3lih6cs8d83ax07vg5sgyp5d7qigvik";
        libraryHaskellDepends = [ base bindings-DSL template-haskell ];
        librarySystemDepends = [
-         libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
-         libXxf86vm mesa
+         libGL libX11 libXcursor libXext libXfixes libXi libXinerama
+         libXrandr libXxf86vm
        ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
-         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; 
-         inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
-         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; 
-         mesa = null;};
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
+         inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
+         inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
+         inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
+         inherit (pkgs.xorg) libXxf86vm;};
 
   "bindings-K8055" = callPackage
     ({ mkDerivation, base, K8055D }:
@@ -43837,8 +43838,8 @@ self: {
      }:
      mkDerivation {
        pname = "changelogged";
-       version = "0.1.0";
-       sha256 = "1krf1wkb4khmwvapnhh0shvf51475j9i2g22fcfl1hjahyqmk6lj";
+       version = "0.2.0";
+       sha256 = "05viyx641zwxf222gvhyhs5dclwbylp7s32n7h3zzja4bycf03f2";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -43855,7 +43856,7 @@ self: {
          unordered-containers
        ];
        homepage = "https://github.com/GetShopTV/changelogged#readme";
-       description = "Tool to manage project publishing history";
+       description = "Changelog manager for Git projects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -53940,8 +53941,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptocompare";
-       version = "0.1.0";
-       sha256 = "0ghdaf5m3axxzxbq3zm9klrnzh354maf82389aryskglr9l11fv4";
+       version = "0.1.1";
+       sha256 = "1cqnhg1ww79k3f6yisdir1fqiil13niv002p5s2kir9ks5phybni";
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions http-conduit
          MissingH text time transformers unordered-containers
@@ -54904,22 +54905,21 @@ self: {
 
   "curl-runnings" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs
-     , http-conduit, text, unordered-containers, yaml
+     , directory, hspec, hspec-expectations, http-conduit, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "curl-runnings";
-       version = "0.1.0";
-       sha256 = "055hislas8i417482x40ldvlwif9dihhrspb2fnwv0017gmhbjvf";
+       version = "0.2.0";
+       sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring http-conduit text
-         unordered-containers
+         aeson aeson-pretty base bytestring directory hspec
+         hspec-expectations http-conduit text unordered-containers yaml
        ];
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs text yaml
-       ];
-       testHaskellDepends = [ base ];
+       executableHaskellDepends = [ base cmdargs text ];
+       testHaskellDepends = [ base directory hspec hspec-expectations ];
        homepage = "https://github.com/aviaviavi/curl-runnings#readme";
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
@@ -65818,6 +65818,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easytest" = callPackage
+    ({ mkDerivation, async, base, containers, mtl, random, stm, text }:
+     mkDerivation {
+       pname = "easytest";
+       version = "0.1";
+       sha256 = "0wjimph83n5fvqgh85ng255qgw3yvagvv7ky1a9lz2blhzb02hh7";
+       libraryHaskellDepends = [
+         async base containers mtl random stm text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/joelburget/easytest";
+       description = "Simple, expressive testing library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ebeats" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -70848,11 +70863,14 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.2";
-       sha256 = "0q3fnljdsqh1937a8s9a62cmcg1nc787725jp0j32jlmbwwhkfyv";
+       version = "0.1.3";
+       sha256 = "1hb44k4558lwsx3z02lgmf1i24ajjlbyqbc88lzgjh3vswfahsj8";
        libraryHaskellDepends = [
          base containers expressions singletons transformers z3
        ];
+       testHaskellDepends = [
+         base containers expressions singletons transformers z3
+       ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70953,6 +70971,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_7_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+     , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
+     , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar
+     , tagged, template-haskell, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.7.2";
+       sha256 = "1qfnhgd7z2hn65gyn4vxn7fxrxzyqgh6j9vdwq8wbq6c8v6j413y";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava comonad constraints deepseq ghc-prim
+         hashable monad-skeleton mtl primitive profunctors QuickCheck
+         semigroups StateVar tagged template-haskell text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ base lens QuickCheck template-haskell ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -76665,14 +76707,15 @@ self: {
      }) {};
 
   "free-vector-spaces" = callPackage
-    ({ mkDerivation, base, lens, linear, MemoTrie, vector, vector-space
+    ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show
+     , vector, vector-space
      }:
      mkDerivation {
        pname = "free-vector-spaces";
-       version = "0.1.4.0";
-       sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj";
+       version = "0.1.5.0";
+       sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1";
        libraryHaskellDepends = [
-         base lens linear MemoTrie vector vector-space
+         base lens linear MemoTrie pragmatic-show vector vector-space
        ];
        homepage = "https://github.com/leftaroundabout/free-vector-spaces";
        description = "Instantiate the classes from the vector-space package with types from linear";
@@ -83902,7 +83945,7 @@ self: {
 
   "gl" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
-     , fixed, half, hxt, mesa, transformers
+     , fixed, half, hxt, libGL, transformers
      }:
      mkDerivation {
        pname = "gl";
@@ -83914,10 +83957,10 @@ self: {
        libraryHaskellDepends = [
          base containers fixed half transformers
        ];
-       librarySystemDepends = [ mesa ];
+       librarySystemDepends = [ libGL ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) {mesa = null;};
+     }) {inherit (pkgs) libGL;};
 
   "gl-capture" = callPackage
     ({ mkDerivation, base, bytestring, OpenGL }:
@@ -98457,7 +98500,7 @@ self: {
      }) {};
 
   "hayland" = callPackage
-    ({ mkDerivation, base, data-flags, mesa, process, template-haskell
+    ({ mkDerivation, base, data-flags, libGL, process, template-haskell
      , time, wayland, xml
      }:
      mkDerivation {
@@ -98469,13 +98512,13 @@ self: {
        libraryHaskellDepends = [
          base data-flags process template-haskell time xml
        ];
-       librarySystemDepends = [ mesa wayland ];
+       librarySystemDepends = [ libGL wayland ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {mesa = null; inherit (pkgs) wayland;};
+     }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
@@ -106037,8 +106080,8 @@ self: {
 
   "hp2any-graph" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , freeglut, GLUT, hp2any-core, mesa, network, OpenGL, parseargs
-     , process
+     , freeglut, GLUT, hp2any-core, libGL, libGLU, network, OpenGL
+     , parseargs, process
      }:
      mkDerivation {
        pname = "hp2any-graph";
@@ -106051,12 +106094,13 @@ self: {
          base bytestring containers directory filepath GLUT hp2any-core
          network OpenGL parseargs process
        ];
-       executableSystemDepends = [ freeglut mesa ];
+       executableSystemDepends = [ freeglut libGL libGLU ];
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) freeglut; mesa = null;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
+         inherit (pkgs) libGLU;};
 
   "hp2any-manager" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers
@@ -106632,18 +106676,18 @@ self: {
 
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
-     , cryptohash, exceptions, fields-json, hpqtypes, lifted-base
-     , log-base, monad-control, mtl, safe, tasty, tasty-hunit, text
-     , text-show, transformers
+     , cryptohash, data-default, exceptions, fields-json, hpqtypes
+     , lifted-base, log-base, monad-control, mtl, safe, tasty
+     , tasty-hunit, text, text-show, transformers
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.5.0.1";
-       sha256 = "022732jsji79a1bb805gh6pcif9ismivs2dwgwks0fb5i9hviilm";
+       version = "1.6.0.0";
+       sha256 = "1cp4dnamc0gia8xsf9f6hp8gfmhkfrfs8ijjcl9dqaka87m4hkmx";
        libraryHaskellDepends = [
-         base base16-bytestring bytestring containers cryptohash exceptions
-         fields-json hpqtypes lifted-base log-base monad-control mtl safe
-         text text-show
+         base base16-bytestring bytestring containers cryptohash
+         data-default exceptions fields-json hpqtypes lifted-base log-base
+         monad-control mtl safe text text-show
        ];
        testHaskellDepends = [
          base exceptions hpqtypes lifted-base log-base monad-control tasty
@@ -117555,7 +117599,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_3_0" = callPackage
+  "influxdb_1_3_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -117564,8 +117608,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.3.0";
-       sha256 = "1spvddqc3p9c292bcpp92xx4xzw8qc91y9jg63lzpdm0fmfx8k0l";
+       version = "1.3.0.1";
+       sha256 = "08i7bflcmvg5s4r5hv1xxd5niyq5irnawnjwmbz7w3ys0ink1bfl";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -124980,8 +125024,8 @@ self: {
      }:
      mkDerivation {
        pname = "labsat";
-       version = "0.0.0";
-       sha256 = "0ps5m31bwfrm7398i7kngrbvsjva7zvyb3cbj7sqk828j72abg9y";
+       version = "0.0.1";
+       sha256 = "0pyxlnm30rp3clplwwkf1nxczk3zj2c7wksgg6pwjxgr02b25y03";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139219,15 +139263,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_13_0_0" = callPackage
+  "miso_0_14_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.13.0.0";
-       sha256 = "1sv8q5f1nkvsxk365k8njmaggi1hyp47q539is2n2xhwmsysxwla";
+       version = "0.14.0.0";
+       sha256 = "16qi1wcijncjjrjdwxs90jn3xclw1cgb0j1gby1w9d457ys6hmnx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144965,8 +145009,8 @@ self: {
      }) {};
 
   "nanovg" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW
-     , hspec, inline-c, mesa, QuickCheck, text, vector
+    ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, hspec
+     , inline-c, libGL, libGLU, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "nanovg";
@@ -144977,14 +145021,14 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
-       librarySystemDepends = [ freeglut GLEW mesa ];
+       librarySystemDepends = [ GLEW libGL libGLU ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        homepage = "https://github.com/cocreature/nanovg-hs";
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {GLEW = null; inherit (pkgs) freeglut; mesa = null;};
+     }) {GLEW = null; inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "nanq" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
@@ -149510,25 +149554,24 @@ self: {
 
   "oauthenticated" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, case-insensitive, crypto-random, cryptohash
-     , exceptions, hspec, hspec-expectations, http-client
-     , http-client-tls, http-types, mtl, network, network-uri, text
-     , time, transformers
+     , bytestring, case-insensitive, cryptonite, exceptions, hspec
+     , hspec-expectations, http-client, http-client-tls, http-types
+     , memory, mtl, network, network-uri, text, time, transformers
      }:
      mkDerivation {
        pname = "oauthenticated";
-       version = "0.2.0.0";
-       sha256 = "01rfx9zc1d9pwqc66axkrl2bi0jnyw4l39kn0nh4q8j63laszc1h";
+       version = "0.2.1.0";
+       sha256 = "08njax7jchkmha1angh98v0p3haxn8zj12lajl5npcmzlihd0k6l";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
-         case-insensitive crypto-random cryptohash exceptions http-client
-         http-types mtl network network-uri text time transformers
+         case-insensitive cryptonite exceptions http-client http-types
+         memory mtl network network-uri text time transformers
        ];
        testHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
-         case-insensitive crypto-random cryptohash exceptions hspec
-         hspec-expectations http-client http-client-tls http-types mtl
-         network network-uri text time transformers
+         case-insensitive cryptonite exceptions hspec hspec-expectations
+         http-client http-client-tls http-types memory mtl network
+         network-uri text time transformers
        ];
        homepage = "https://github.com/tel/oauthenticated.git#readme";
        description = "Simple OAuth for http-client";
@@ -149799,8 +149842,8 @@ self: {
      }) {};
 
   "oculus" = callPackage
-    ({ mkDerivation, base, either, libX11, libXinerama, mesa, monads-tf
-     , ovr, systemd, transformers, vect-floating
+    ({ mkDerivation, base, either, libGL, libX11, libXinerama
+     , monads-tf, ovr, systemd, transformers, vect-floating
      }:
      mkDerivation {
        pname = "oculus";
@@ -149809,13 +149852,13 @@ self: {
        libraryHaskellDepends = [
          base either monads-tf transformers vect-floating
        ];
-       librarySystemDepends = [ libX11 libXinerama mesa ovr systemd ];
+       librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        homepage = "http://github.com/cpdurham/oculus";
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; 
-         mesa = null; ovr = null; systemd = null;};
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
+         inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;};
 
   "odbc" = callPackage
     ({ mkDerivation }:
@@ -182342,6 +182385,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-xml" = callPackage
+    ({ mkDerivation, base, bytestring, http-media, servant, xmlbf }:
+     mkDerivation {
+       pname = "servant-xml";
+       version = "1.0.0";
+       sha256 = "1adgxfv6lhl1nxpqb47a6xh5zx6vi5ry4vi50ffh8p8xx6ckkizi";
+       libraryHaskellDepends = [
+         base bytestring http-media servant xmlbf
+       ];
+       homepage = "https://github.com/fosskers/servant-xml";
+       description = "Servant support for the XML Content-Type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -183369,15 +183426,15 @@ self: {
      }) {};
 
   "shake-ats" = callPackage
-    ({ mkDerivation, base, binary, dependency, directory, hs2ats
-     , language-ats, microlens, shake, shake-ext, text
+    ({ mkDerivation, base, binary, dependency, directory, hashable
+     , hs2ats, language-ats, lens, shake, shake-ext, text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.5.0.7";
-       sha256 = "07ipqnzgk7ligq4xsddv7ab5z3gn67vsba6p2lkf9faqhwx91bi9";
+       version = "1.5.0.9";
+       sha256 = "1fjbdik7a2izl8sbxnv1i36h55df0v7w23pn7ivk1p18mgljc9lf";
        libraryHaskellDepends = [
-         base binary dependency directory hs2ats language-ats microlens
+         base binary dependency directory hashable hs2ats language-ats lens
          shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
@@ -183404,17 +183461,17 @@ self: {
      }) {};
 
   "shake-ext" = callPackage
-    ({ mkDerivation, base, Cabal, composition-prelude, directory, mtl
-     , shake, template-haskell, text
+    ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory
+     , shake, template-haskell
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.7.0.2";
-       sha256 = "1r9grv3r06w7ldddn1gq8dbylfi2nnq0xg66ks9z6r0c087l4xp1";
+       version = "2.7.0.3";
+       sha256 = "0j1558a43bz7jqbbhn0myjwd9nrd6mnn4r26ix5wqhnsgfpxcw1j";
        libraryHaskellDepends = [
-         base Cabal composition-prelude directory mtl shake template-haskell
-         text
+         base Cabal composition-prelude directory shake template-haskell
        ];
+       libraryToolDepends = [ cpphs ];
        homepage = "https://hub.darcs.net/vmchale/shake-ext";
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -189664,6 +189721,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sparse-linear-algebra_0_2_9_7" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
+     , scientific, transformers, vector, vector-algorithms, vector-space
+     }:
+     mkDerivation {
+       pname = "sparse-linear-algebra";
+       version = "0.2.9.7";
+       sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers exceptions mtl transformers vector
+         vector-algorithms vector-space
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec matrix-market-attoparsec mtl
+         mwc-random primitive QuickCheck scientific vector-space
+       ];
+       homepage = "https://github.com/ocramz/sparse-linear-algebra";
+       description = "Numerical computation in native Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparse-linear-algebra" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec
      , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
@@ -191928,19 +192009,22 @@ self: {
      }) {};
 
   "stagen" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default
-     , directory, filemanip, lucid, markdown, mtl, optparse-applicative
-     , parallel, parsec, text
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
+     , data-default, directory, feed, filemanip, json-feed, lucid
+     , markdown, mtl, network-uri, optparse-applicative, parallel
+     , parsec, text, text-conversions, time, xml, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "stagen";
-       version = "0.1.0";
-       sha256 = "0cd0639ms4vcdvjvhn8l0893d5nv51kzg3ky0xd9bnmjr8f0wpzm";
+       version = "0.2.1";
+       sha256 = "14gyak2gg05xbrx93bl1x7jfy2rwmzczpvip7h21bysqk964rh8j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base blaze-html bytestring data-default directory filemanip
-         lucid markdown mtl optparse-applicative parallel parsec text
+         aeson base base-compat blaze-html bytestring data-default directory
+         feed filemanip json-feed lucid markdown mtl network-uri
+         optparse-applicative parallel parsec text text-conversions time xml
+         xml-conduit xml-types
        ];
        executableHaskellDepends = [ base ];
        description = "Static site generator";
@@ -195910,6 +195994,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sv" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors
+     , bytestring, charset, containers, contravariant, deepseq, hedgehog
+     , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids
+     , semigroups, tasty, tasty-hedgehog, tasty-hunit, text
+     , transformers, trifecta, utf8-string, validation, vector, void
+     }:
+     mkDerivation {
+       pname = "sv";
+       version = "0.1";
+       sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s";
+       libraryHaskellDepends = [
+         ansi-wl-pprint attoparsec base bifunctors bytestring charset
+         containers contravariant deepseq lens mtl parsec parsers
+         profunctors readable semigroupoids semigroups text transformers
+         trifecta utf8-string validation vector void
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base bytestring contravariant hedgehog lens parsers
+         semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
+         trifecta utf8-string validation vector
+       ];
+       homepage = "https://github.com/qfpl/sv";
+       description = "Encode and decode separated values (CSV, PSV, ...)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
      , unordered-containers
@@ -197196,6 +197307,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "system-error" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "system-error";
+       version = "1.0.0";
+       sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/heroin-moose/system-error";
+       description = "Error reporting functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "system-extra" = callPackage
     ({ mkDerivation, base, bytestring, directory, hspec, process
      , QuickCheck
@@ -205625,6 +205748,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {toxcore = null;};
 
+  "toxiproxy-haskell" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, http-client
+     , process, servant, servant-client, silently, text, time
+     }:
+     mkDerivation {
+       pname = "toxiproxy-haskell";
+       version = "0.1.0.0";
+       sha256 = "19ls808f24in0c8swgv7iqwja9f126zvcc0a7ix615i0a9hp3ks6";
+       libraryHaskellDepends = [
+         aeson base containers http-client servant servant-client text
+       ];
+       testHaskellDepends = [
+         base containers hspec http-client process servant servant-client
+         silently time
+       ];
+       homepage = "https://github.com/jpittis/toxiproxy-haskell#readme";
+       description = "Client library for Toxiproxy: a TCP failure testing proxy";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "toysolver" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-builder, clock
      , containers, criterion, data-default, data-default-class
@@ -208529,8 +208672,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.0.0";
-       sha256 = "1nma1zrk11p5i6xbnsnlhb9h0xvixq784lymbb6i3ijabl4v2ksg";
+       version = "0.0.1";
+       sha256 = "0i16636dncb3k3564m5gjjgbpcvmlwnjg12wq4ndhcy5rwjp7w6b";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
@@ -210984,8 +211127,8 @@ self: {
      }:
      mkDerivation {
        pname = "unjson";
-       version = "0.15.0.0";
-       sha256 = "0ib7y7a4ham90hzy5anrhry7c1w8c847v39ygjj8556pq6j47nyg";
+       version = "0.15.1.0";
+       sha256 = "1k61lak22snr7fimpr7pjri33rg0gm1hhfn253bwlz3pvpn85vmp";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific text time unordered-containers vector
@@ -214220,6 +214363,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_14" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.14";
+       sha256 = "19x112bpc7fw3dqfpgp0bi6cw01vr8csfyqixi68128ij3b6csm0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers directory ghc-prof lens scientific text
+         vector vector-algorithms vty
+       ];
+       homepage = "https://github.com/maoe/viewprof";
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {

From f4b757bd3dfe2baa4033e0dbac21ed93aec643c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 6 Mar 2018 10:02:50 +0100
Subject: [PATCH 0343/2266] haskell-changelogged: add override to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 08443de111d..de6dcb9dd64 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1006,4 +1006,7 @@ self: super: {
   # Needs older hlint
   hpio = dontCheck super.hpio;
 
+  # Needs turtle >=1.5.0, which we use by default in lts-10.x.
+  changelogged = super.changelogged.override { turtle = self.turtle_1_5_4; };
+
 }

From 68fd23fbb2ba819092b99222ffba770222c17b76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 6 Mar 2018 21:24:50 +0100
Subject: [PATCH 0344/2266] hackage: update database snapshot to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 7cf4988771a..03fb2d448cd 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/30eca1c57b9358eff984ab93dbfd213d6b08706b.tar.gz";
-  sha256 = "0kd5y2jlydbr1jv2ckdpsn2ialbxk2aj19c8i0brzz0wwzirg7q5";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56955295749aea09bd42591cd506c2616d48ebfd.tar.gz";
+  sha256 = "17c8a1wj1jxr14sxvwq0i9kidwycz2hkl1ls51yfz14anylxr84l";
 }

From f96dc502b72c5cb37984787cc4a3afaf14caf24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Tue, 6 Mar 2018 20:59:18 +0100
Subject: [PATCH 0345/2266] qpid-cpp: 0.34 -> 1.37.0

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

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 6c256d14fe7..ea2c0325148 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "qpid-cpp-${version}";
 
-  version = "0.34";
+  version = "1.37.0";
 
   src = fetchurl {
     url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
-    sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
+    sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
   };
 
   buildInputs = [ cmake python2 boost libuuid ruby ];

From 5eb70d3481f2a45300f036561b86e606ed8a14b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Tue, 6 Mar 2018 21:37:44 +0100
Subject: [PATCH 0346/2266] SDL2_gfx: update homepage

---
 pkgs/development/libraries/SDL2_gfx/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index ec61b8b4505..04ec3f9652c 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -36,9 +36,8 @@ stdenv.mkDerivation rec {
       code. Its is written in plain C and can be used in C++ code.
     '';
 
-    homepage = https://sourceforge.net/projects/sdlgfx/;
+    homepage = http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/;
     license = licenses.zlib;
-
     maintainers = with maintainers; [ cpages ];
     platforms = platforms.unix;
   };

From 488f88a70ea9250ab303ae181028add6680eb812 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 6 Mar 2018 21:39:41 +0100
Subject: [PATCH 0347/2266] screen-message: clean up icon-theme.cache

---
 pkgs/tools/X11/screen-message/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 5433035d221..e8824024180 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "screen-message-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ gtk3 ];
+  buildInputs = [ gtk3 hicolor-icon-theme ];
 
   # screen-message installs its binary in $(prefix)/games per default
   makeFlags = [ "execgamesdir=$(out)/bin" ];

From 85f8b4018fe0efb20c5a094314f38b335cffd5aa Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 6 Mar 2018 21:46:06 +0100
Subject: [PATCH 0348/2266] screen-message: fix homepage

The old one 404s.
---
 pkgs/tools/X11/screen-message/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index e8824024180..92f24f2b4aa 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "execgamesdir=$(out)/bin" ];
 
   meta = {
-    homepage = http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian;
+    homepage = "https://www.joachim-breitner.de/en/projects#screen-message";
     description = "Displays a short text fullscreen in an X11 window";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.fpletz ];

From 15ddc6fcf82adeff1f464b8841c6368ff11a0962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Tue, 6 Mar 2018 22:04:57 +0100
Subject: [PATCH 0349/2266] maintainers: remove wrong info

I tried to contact bjg through mail but got no answer and can't find his
actual github account.
---
 maintainers/maintainer-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a6821217ff7..134ec56788e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -555,7 +555,6 @@
   };
   bjg = {
     email = "bjg@gnu.org";
-    github = "civodul";
     name = "Brian Gough";
   };
   bjornfor = {

From 9adb4d25e6a20ea3b9ae54df1cb9086c676b7d4c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 6 Mar 2018 15:37:05 -0500
Subject: [PATCH 0350/2266] Haskell: Added haskellPackages.shellFor

---
 .../haskell-modules/make-package-set.nix      | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 2a96c66dced..c793c0e7086 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -188,6 +188,52 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
         };
       in withPackages (packages ++ [ hoogle ]);
 
+    # Returns a derivation whose environment contains a GHC with only
+    # the dependencies of packages listed in `packages`, not the
+    # packages themselves. Using nix-shell on this derivation will
+    # give you an environment suitable for developing the listed
+    # packages with an incremental tool like cabal-install.
+    #
+    #     # default.nix
+    #     with import <nixpkgs> {};
+    #     haskellPackages.extend (haskell.lib.packageSourceOverrides {
+    #       frontend = ./frontend;
+    #       backend = ./backend;
+    #       common = ./common;
+    #     })
+    #
+    #     # shell.nix
+    #     (import ./.).shellFor {
+    #       packages = p: [p.frontend p.backend p.common];
+    #       withHoogle = true;
+    #     }
+    #
+    #     -- cabal.project
+    #     packages:
+    #       frontend/
+    #       backend/
+    #       common/
+    #
+    #     bash$ nix-shell --run "cabal new-build all"
+    shellFor = { packages, withHoogle ? false, ... } @ args:
+      let
+        selected = packages self;
+        packageInputs = builtins.map (p: p.override { mkDerivation = haskellLib.extractBuildInputs p.compiler; }) selected;
+        haskellInputs =
+          builtins.filter
+            (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
+            (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
+        systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs;
+        withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages;
+        mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"];
+      in pkgs.stdenv.mkDerivation (mkDrvArgs // {
+        name = "ghc-shell-for-packages";
+        nativeBuildInputs = [(withPackages (_: haskellInputs))] ++ mkDrvArgs.nativeBuildInputs or [];
+        buildInputs = systemInputs ++ mkDrvArgs.buildInputs or [];
+        phases = ["installPhase"];
+        installPhase = "echo $nativeBuildInputs $buildInputs > $out";
+      });
+
     ghc = ghc // {
       withPackages = self.ghcWithPackages;
       withHoogle = self.ghcWithHoogle;

From 2b14491a77f112fcf9c4358c0368750b4a3a0954 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 6 Mar 2018 22:40:27 +0100
Subject: [PATCH 0351/2266] xen 4.8.3: fix qemu-xen hash

---
 pkgs/applications/virtualization/xen/4.8.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 96e70d7431e..cce91dcd5de 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -61,7 +61,7 @@ callPackage (import ./generic.nix (rec {
       src = fetchgit {
         url = https://xenbits.xen.org/git-http/qemu-xen.git;
         rev = "refs/tags/qemu-xen-${version}";
-        sha256 = "090ibcgs3xwmavk9yg2vaqr3xp9hirnfd3r40ccvrl49c5x58w3g";
+        sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4";
       };
       buildInputs = qemuDeps;
       meta.description = "Xen's fork of upstream Qemu";

From 53f057f21b9501c7e3b131e16fdecda4067df3e8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 6 Mar 2018 23:26:59 +0100
Subject: [PATCH 0352/2266] electrum: 3.0.6 -> 3.1.0

---
 pkgs/applications/misc/electrum/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 40fc10a5673..47dfa30436f 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,22 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "3.0.6";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg";
+    sha256 = "1hc0ylkq89459wy3av42hp73p34pmh7grsa3qm8fb1k0qg17zy78";
   };
 
-  patches = [
-    # Trezor compat patch should be included in electrum > 3.0.6
-    (fetchpatch {
-      name = "trezor-compat.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/spesmilo/electrum/pull/3621.patch";
-      sha256 = "1bk1r2ikhnvw1fpfh71y4za2lnskcbkv50k8ynjxi5slx2wrfpl0";
-    })
-  ];
-
   propagatedBuildInputs = with python3Packages; [
     dnspython
     ecdsa

From 76bc1d3fae46f28dd28cad8bc998dba74d03285e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 5 Mar 2018 18:45:16 -0500
Subject: [PATCH 0353/2266] guile: Fix cross more, including 1.8

---
 pkgs/development/interpreters/guile/1.8.nix   | 37 +++++++++++--------
 pkgs/development/interpreters/guile/2.0.nix   | 17 +++++----
 .../interpreters/guile/default.nix            | 15 +++++---
 3 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index c50a5fbab07..6a2fdbdea43 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -1,25 +1,33 @@
-{ fetchurl, stdenv, libtool, readline, gmp
-, gawk, makeWrapper }:
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, makeWrapper, gawk, pkgconfig
+, libtool, readline, gmp
+}:
 
 stdenv.mkDerivation rec {
   name = "guile-1.8.8";
 
   src = fetchurl {
-    url = "mirror://gnu/guile/" + name + ".tar.gz";
+    url = "mirror://gnu/guile/${name}.tar.gz";
     sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
   };
 
-  patches = [ ./cpp-4.5.patch ];
-
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
   # GCC 4.6 raises a number of set-but-unused warnings.
   configureFlags = [ "--disable-error-on-warning" ];
 
-  nativeBuildInputs = [ makeWrapper gawk ];
-  propagatedBuildInputs = [ readline gmp libtool ];
-  selfNativeBuildInput = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile_1_8;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  buildInputs = [ readline libtool ];
+
+  propagatedBuildInputs = [ gmp ];
+
+  patches = [ ./cpp-4.5.patch ];
+
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
@@ -46,17 +54,16 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "GNU Guile, an embeddable Scheme interpreter";
+    description = "Embeddable Scheme implementation";
+    homepage    = http://www.gnu.org/software/guile/;
+    license     = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms   = stdenv.lib.platforms.unix;
+
     longDescription = ''
       GNU Guile is an interpreter for the Scheme programming language,
       packaged as a library that can be embedded into programs to make
       them extensible.  It supports many SRFIs.
     '';
-
-    homepage = http://www.gnu.org/software/guile/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ea8ff924064..afd90397e23 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform, buildPackages
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
+, libffi, libtool, readline, gmp, boehmgc, libunistring
+, coverageAnalysis ? null, gnu ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -19,12 +21,13 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
-    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile_2_0;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile_2_0;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
-  propagatedBuildInputs = [ gmp boehmgc ]
 
+  propagatedBuildInputs = [ gmp boehmgc ]
     # XXX: These ones aren't normally needed here, but since
     # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index fc7cd2b60ea..dc6e18ae1af 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform, buildPackages
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, makeWrapper, gawk, pkgconfig
+, libffi, libtool, readline, gmp, boehmgc, libunistring
+, coverageAnalysis ? null, gnu ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -20,9 +22,10 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
-    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [ gmp boehmgc ]

From 9f4ddfaf63e3c36fcda766b763375ce7dcdda9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 7 Mar 2018 00:35:29 +0000
Subject: [PATCH 0354/2266] radare2: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 6a7992b0131..d70332749d9 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -13,22 +13,22 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  version = "2.3.0";
+  version = "2.4.0";
   name = "radare2-${version}";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     rev = version;
-    sha256 = "0x5vcprqf0fnj876mdvryfvg7ymbrw1cxrr7a06v0swg7yql1lpw";
+    sha256 = "08zvxgsvc6rqpjaapcxz1wm9vzlrbsqgplfkx0lch2s67v6slr7z";
   };
 
   postPatch = let
-    cs_tip = "bdbc57de63725a98732ddc34b48de96f8ada66f2"; # version from $sourceRoot/shlr/Makefile
+    cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile
     capstone = fetchgit {
       url = "https://github.com/aquynh/capstone.git";
       rev = cs_tip;
-      sha256 = "1sqxpjf2dlrg87dm9p39p5d1qzahrnfnrjijpv1xg1shax439jni";
+      sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8";
       leaveDotGit = true;
     };
   in ''

From 8d580080390d12c5efe7d5a012f016a28a7602ad Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 6 Mar 2018 20:04:37 -0500
Subject: [PATCH 0355/2266] stdenv cross adapter: Get rid if
 `selfNativeBuildInput`

It is finally no longer used anywhere

Fixes #30587
---
 pkgs/stdenv/adapters.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3090b6283e9..8e3980c358c 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -75,22 +75,11 @@ rec {
   in stdenv // {
     mkDerivation =
       { nativeBuildInputs ? []
-      , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
       , ...
       } @ args:
 
-      let
-        # *BuildInputs exists temporarily as another name for
-        # *HostInputs.
-
-        # The base stdenv already knows that nativeBuildInputs and
-        # buildInputs should be built with the usual gcc-wrapper
-        # And the same for propagatedBuildInputs.
-        nativeDrv = stdenv.mkDerivation args;
-      in
         stdenv.mkDerivation (args // {
           nativeBuildInputs = nativeBuildInputs
-            ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
               # without proper `file` command, libtool sometimes fails
               # to recognize 64-bit DLLs
             ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file

From ee9a785c30c1bbc58ed77bd9c08e3cc208727572 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Wed, 7 Mar 2018 01:21:42 +0000
Subject: [PATCH 0356/2266] nixos doc: give context and definition re
 NIXOS_LUSTRATE

Re #36272
---
 .../installation/installing-from-other-distro.xml    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 55623898827..ecd020a067a 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -227,6 +227,18 @@ $ sudo groupdel nixbld</screen>
                         line)</para></listitem>
             </itemizedlist>
 
+            <note><para>Support for <literal>NIXOS_LUSTRATE</literal> was added
+                    in NixOS 16.09. The act of "lustrating" refers to the
+                    wiping of the existing distribution. Creating
+                    <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on
+                    NixOS to remove all mutable files from your root partition
+                    (anything that's not in <literal>/nix</literal> or
+                    <literal>/boot</literal> gets "lustrated" on the next
+                    boot.</para>
+                <para>lustrate /ˈlʌstreɪt/ verb.</para>
+                <para>purify by expiatory sacrifice, ceremonial washing, or
+                    some other ritual action.</para></note>
+
             <para>Let's create the files:</para>
 
             <screen>

From 5f9a1c18f2c103039e4c24088a06ca46e73a10a3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Mar 2018 13:31:50 +0800
Subject: [PATCH 0357/2266] okular: add support for CHM, ZIP and markdown files

---
 pkgs/applications/kde/okular.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 64511aabf7c..36573f9aeb9 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,25 +1,27 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
-  kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
-  kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
-  libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
+  chmlib, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks,
+  kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
+  kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet,
+  kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5,
+  qtdeclarative, qtsvg, threadweaver
 }:
 
 mkDerivation {
   name = "okular";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
-    kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
-    kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler
-    qca-qt5 qtdeclarative qtsvg threadweaver
+    chmlib discount djvulibre ebook_tools kactivities karchive kbookmarks
+    kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
+    kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
+    kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
+    qtdeclarative qtsvg threadweaver
   ];
-  meta = {
-    platforms = lib.platforms.linux;
+  meta = with lib; {
     homepage = http://www.kde.org;
-    license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+    maintainers = with maintainers; [ ttuegel ];
+    platforms = lib.platforms.linux;
   };
 }

From 18e97a3575b18dcebf36b796ede4e47ad46aa1a8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 7 Mar 2018 09:28:18 +0800
Subject: [PATCH 0358/2266] okular: exclude chmlib on ARM

---
 pkgs/applications/kde/okular.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 36573f9aeb9..5f6f28c95b0 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,7 +1,7 @@
 {
-  mkDerivation, lib,
+  stdenv, mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  chmlib, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks,
+  chmlib ? null, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks,
   kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet,
   kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5,
@@ -12,12 +12,12 @@ mkDerivation {
   name = "okular";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    chmlib discount djvulibre ebook_tools kactivities karchive kbookmarks
+    discount djvulibre ebook_tools kactivities karchive kbookmarks
     kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
     kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
     qtdeclarative qtsvg threadweaver
-  ];
+  ] ++ lib.optional (!stdenv.isAarch64) chmlib;
   meta = with lib; {
     homepage = http://www.kde.org;
     license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];

From 4c76a21aae4299b3ec980f0f56e2d7f2860a8826 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 6 Mar 2018 23:18:10 +0900
Subject: [PATCH 0359/2266] gdb: Flexible target matching for darwin

Outside of the nix-build the target is `x86_64-apple-darwin17.4.0`,
while inside the target is `x86_64-apple-darwin`. This difference
causes the fallback target configuration for darwin, which disables
gdb. Add a patch to make the target matching more flexible.
---
 .../tools/misc/gdb/darwin-target-match.patch          | 11 +++++++++++
 pkgs/development/tools/misc/gdb/default.nix           |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/gdb/darwin-target-match.patch

diff --git a/pkgs/development/tools/misc/gdb/darwin-target-match.patch b/pkgs/development/tools/misc/gdb/darwin-target-match.patch
new file mode 100644
index 00000000000..1328d919503
--- /dev/null
+++ b/pkgs/development/tools/misc/gdb/darwin-target-match.patch
@@ -0,0 +1,11 @@
+--- a/configure	2017-06-05 00:51:26.000000000 +0900
++++ b/configure	2018-03-06 23:12:58.000000000 +0900
+@@ -3603,7 +3603,7 @@
+     noconfigdirs="$noconfigdirs ld gprof"
+     noconfigdirs="$noconfigdirs sim target-rda"
+     ;;
+-  x86_64-*-darwin[912]*)
++  x86_64-*-darwin*)
+     noconfigdirs="$noconfigdirs ld gas gprof"
+     noconfigdirs="$noconfigdirs sim target-rda"
+     ;;
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index e068b908caf..b5840d07466 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
     sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg";
   };
 
-  patches = [ ./debug-info-from-env.patch ];
+  patches = [ ./debug-info-from-env.patch ]
+    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch;
 
   nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]
     # TODO(@Ericson2314) not sure if should be host or target

From c6fdf69d44d0113d1dd654d86745f3fd51db2f55 Mon Sep 17 00:00:00 2001
From: Eldar Tsraev <elts@culab.org>
Date: Wed, 7 Mar 2018 16:28:13 +1300
Subject: [PATCH 0360/2266] cl-launch: change platforms to unix

this will alow to build / use cl-launch on other platforms
e.g. MacOS, FreeBSD
---
 pkgs/development/tools/misc/cl-launch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index ffd668dbdee..c245a32a06d 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation {
     description = ''Common Lisp launcher script'';
     license = stdenv.lib.licenses.llgpl21 ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 2e2063074d8445efdbddbb732441d2ea490d0572 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 7 Mar 2018 11:56:33 +0800
Subject: [PATCH 0361/2266] dxx-rebirth: fix compilation with gcc7

---
 pkgs/games/dxx-rebirth/default.nix | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index cea07d873ab..3b05ed14292 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, scons, pkgconfig
+{ stdenv, fetchurl, fetchpatch, scons, pkgconfig
 , SDL, SDL_mixer, libGLU_combined, physfs
 }:
 
@@ -17,12 +17,34 @@ in stdenv.mkDerivation rec {
     sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka";
   };
 
+  # TODO: drop these when upgrading to version > 0.59.100
+  patches = [
+    (fetchpatch {
+      name   = "dxx-gcc7-fix1.patch";
+      url    = "https://github.com/dxx-rebirth/dxx-rebirth/commit/1ed7cec714c623758e3418ec69eaf3b3ff03e9f6.patch";
+      sha256 = "026pn8xglmxryaj8555h5rhzkx30lxmksja1fzdlfyb1vll75gq0";
+    })
+    (fetchpatch {
+      name   = "dxx-gcc7-fix2.patch";
+      url    = "https://github.com/dxx-rebirth/dxx-rebirth/commit/73057ad8ec6977ac747637db1080686f11b4c3cc.patch";
+      sha256 = "0s506vdd2djrrm3xl0ygn9ylpg6y8qxii2nnzk3sf9133glp3swy";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig scons ];
 
   buildInputs = [ libGLU_combined physfs SDL SDL_mixer ];
 
   enableParallelBuilding = true;
 
+  buildPhase = ''
+    runHook preBuild
+
+    scons prefix=$out
+
+    runHook postBuild
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -37,7 +59,7 @@ in stdenv.mkDerivation rec {
     description = "Source Port of the Descent 1 and 2 engines";
     homepage = http://www.dxx-rebirth.com/;
     license = licenses.free;
-    maintainers = with maintainers; [ viric ];
+    maintainers = with maintainers; [ viric peterhoeg ];
     platforms = with platforms; linux;
   };
 }

From 391b4d7388a4d213e82a6a86f7d023dc8aa054f5 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 7 Mar 2018 14:26:06 +0900
Subject: [PATCH 0362/2266] fix patdiff hash

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

diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
index 908da587d4b..98907ad4b82 100644
--- a/pkgs/tools/misc/patdiff/default.nix
+++ b/pkgs/tools/misc/patdiff/default.nix
@@ -4,7 +4,7 @@ with ocamlPackages;
 
 janePackage {
   name = "patdiff";
-  hash = "15b6nkmd2z07j4nnmkb2g6qn3daw2xmmz3lgswkj03v29ffib014";
+  hash = "04kl9h7j3pzpyic8p34b8i9vpf6qn7ixp077d8i44cpbymdqdn96";
   buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
   meta = {
     description = "File Diff using the Patience Diff algorithm";

From e06f67a970adce678a0490a75b6d1807da7181c4 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 7 Mar 2018 14:33:58 +0900
Subject: [PATCH 0363/2266] fix description and license

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

diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 862032572dc..b67c4a43cf5 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -42,9 +42,9 @@ python3Packages.buildPythonApplication rec {
 
 
   meta = with stdenv.lib; {
-    description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform";
+    description = "A screencasting program created with design in mind";
     homepage = https://code.launchpad.net/kazam;
-    #license = licenses.bsd2;
+    license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
   };

From fb6177722d3008e45d40fac477119b59ddec9fc4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 1 Mar 2018 15:41:23 +0800
Subject: [PATCH 0364/2266] terragrunt: 0.14.0 -> 0.14.2

Also pull in terraform-full as we need the plugins to actually do something.
---
 .../networking/cluster/terragrunt/default.nix | 10 ++++----
 .../networking/cluster/terragrunt/deps.nix    | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index a31c7882693..899c73b9f7b 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform-full, makeWrapper }:
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.14.0";
+  version = "0.14.2";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
   src = fetchFromGitHub {
-    rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1fz4ny7jmwr1xp68bmzlb6achird7jwbb6n6zim6c1w0qybxiqg9";
+    rev    = "v${version}";
+    sha256 = "0bnscp0sjnzhnqbm7m5ip6g2608yfvsnr60f03y2qqld8m9wmj32";
   };
 
   goDeps = ./deps.nix;
@@ -23,7 +23,7 @@ buildGoPackage rec {
 
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
-      --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
+      --set TERRAGRUNT_TFPATH ${lib.getBin terraform-full}/bin/terraform
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 30d6acb9afa..68d2cb48048 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "00cca3f093a8236a93fbbeeae7d28ad83811683c";
-      sha256 = "1x2frsin6d9drx9k65pv0r0l0asj16fzj815s2a9db2mxh8jycsp";
+      rev = "628f99e2cda77dd323992ede8b05961b41f4352f";
+      sha256 = "0dbr4czbjpnkira9bhackq01s9b13yvw5dscnxi3mr9adb89y9pm";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-errors/errors";
-      rev = "3afebba5a48dbc89b574d890b6b34d9ee10b4785";
-      sha256 = "1vwgczqzd5i6bx12g9ln5cqfsbc7g0f8cz8yvcrasss2injpndi0";
+      rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
+      sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "285374cdfad63de2c43d7562f49ced6dde5a7ba0";
-      sha256 = "0xmwxfb0vm20ga1j1r3lavxm15vwqdkisdkshw1nia7byhwmb4xm";
+      rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec";
+      sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "b4575eea38cca1123ec2dc90c26529b5c5acfcff";
-      sha256 = "1x80f3kcb1wd2mdxks3wcsp26q9g7ahr8b18z1anl5igg6zl61kf";
+      rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
+      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
     };
   }
   {
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
-      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
+      rev = "b89eecf5ca5db6d3ba60b237ffe3df7bafb7662f";
+      sha256 = "0g946ii8qjaynvidj648z8izl91i6yhy0ir6g3qsrn136im3r8wk";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "75104e932ac2ddb944a6ea19d9f9f26316ff1145";
-      sha256 = "13iagavgqq3sn9m3sck0chydwy5rcbhj0ylvc1169vs8q2m13yh9";
+      rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff";
+      sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i";
     };
   }
 ]

From 8154f9ebd50d1a3f94b8598b6868dad9ff6357d6 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Wed, 7 Mar 2018 09:10:02 +0100
Subject: [PATCH 0365/2266] restic: update project website (#36408)

* restic: update project website

The project website has changed, so I updated it.

* restic: no trailing slash
---
 pkgs/tools/backup/restic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 931fcea4a44..158d7f1d2cf 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -32,7 +32,7 @@ buildGoPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://restic.github.io;
+    homepage = https://restic.net;
     description = "A backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd2;

From 0935cbf2872d2b6fff3b700eeae324ad6e317068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 09:24:31 +0100
Subject: [PATCH 0366/2266] gnomeExtensions.system-monitor: fix this package
 and upgrade to v33

---
 .../default.nix}                                | 17 ++++++++++++-----
 .../remove_nonexisting_mounts.patch             | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                 |  1 +
 3 files changed, 26 insertions(+), 5 deletions(-)
 rename pkgs/desktops/gnome-3/extensions/{system-monitor.nix => system-monitor/default.nix} (53%)
 create mode 100644 pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
similarity index 53%
rename from pkgs/desktops/gnome-3/extensions/system-monitor.nix
rename to pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 0c3e65633c8..2c2f9870c7f 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, fetchFromGitHub, glib }:
+# This package needs the following configuration in configuration.nix:
+# services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.libgtop pkgs.glib_networking ];
+{ config, stdenv, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
-  version = "8b31f070e9e59109d729661ced313d6a63e31787";
+  version = "v33";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
     rev = version;
-    sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3";
+    sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk";
   };
 
   buildInputs = [
     glib
+    glib_networking
+    libgtop
   ];
 
+  patches = [ ./remove_nonexisting_mounts.patch ];
+
   buildPhase = ''
     ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
   '';
 
   installPhase = ''
-    cp -r ${uuid} $out
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r ${uuid} $out/share/gnome-shell/extensions
   '';
 
   uuid = "system-monitor@paradoxxx.zero.gmail.com";
@@ -28,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Display system informations in gnome shell status bar";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aneeshusa ];
+    maintainers = with maintainers; [ aneeshusa tiramiseb ];
     homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
new file mode 100644
index 00000000000..8bff7fbe24f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
@@ -0,0 +1,13 @@
+diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js
+index b4b7f15..d645654 100644
+--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js
++++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js
+@@ -386,7 +386,7 @@ const smMountsMonitor = new Lang.Class({
+     connected: false,
+     _init: function () {
+         this._volumeMonitor = Gio.VolumeMonitor.get();
+-        let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local'];
++        let sys_mounts = ['/home', '/tmp', '/boot'];
+         this.base_mounts = ['/'];
+         sys_mounts.forEach(Lang.bind(this, function (sMount) {
+             if (this.is_sys_mount(sMount + '/')) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..319133b89db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19289,6 +19289,7 @@ with pkgs;
     nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
     remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
+    system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { };
     taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
   };

From 0aa95d73bd213211258c6431914cd1c289f69cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 7 Mar 2018 08:25:51 +0000
Subject: [PATCH 0367/2266] bundler: 1.14.6 -> 1.16.1

---
 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 6ba1d5f10ec..894c9df558e 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.14.6";
-  source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
+  version = "1.16.1";
+  source.sha256 = "1s2nq4qnffxg3kwrk7cnwxcvfihlhxm9absl2l6d3qckf3sy1f22";
   dontPatchShebangs = true;
 
   postFixup = ''

From 2d047efe7fc851f25a31bbf8f1aa73b9fb554b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 10:19:31 +0100
Subject: [PATCH 0368/2266] gnomeExtensions.impatience: fix the package and
 upgrade to version 0.4.5

---
 pkgs/desktops/gnome-3/extensions/impatience.nix | 9 +++++----
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index d82ff652bd0..78baec6dd30 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-impatience-${version}";
-  version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494";
+  version = "version-0.4.5";
 
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
     rev = version;
-    sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn";
+    sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
   };
 
   buildInputs = [
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    cp -r impatience $out
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r impatience $out/share/gnome-shell/extensions/${uuid}
   '';
 
   uuid = "impatience@gfxmonk.net";
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Speed up builtin gnome-shell animations";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aneeshusa timbertson ];
+    maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ];
     homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..e2344e9257c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19285,6 +19285,7 @@ with pkgs;
     dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
     dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
+    impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
     mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { };
     nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };

From 1deb779a7adb5d70bdb1077da31501e393b25c8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 7 Mar 2018 10:29:30 +0100
Subject: [PATCH 0369/2266] nixUnstable: Point to Nix 2.0

---
 pkgs/tools/package-management/nix/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 246819d3dc0..a768ff84802 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -132,6 +132,8 @@ in rec {
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 
+  nixUnstable = nix;
+/*
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-2.0${suffix}";
     suffix = "pre5968_a6c0b773";
@@ -143,5 +145,6 @@ in rec {
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
+*/
 
 }

From 3f738231177cb1823f912c7f566cffa94ae3440e Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 7 Mar 2018 19:09:32 +0900
Subject: [PATCH 0370/2266] camlimages: 4.1.2 -> 5.0.0

---
 .../development/ocaml-modules/camlimages/default.nix | 12 ++++++++++++
 pkgs/top-level/ocaml-packages.nix                    |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/camlimages/default.nix

diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
new file mode 100644
index 00000000000..394b0c507be
--- /dev/null
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchzip, findlib, jbuilder, ocaml, configurator, cppo, lablgtk }:
+stdenv.mkDerivation rec {
+  name = "camlimages-${version}";
+  version = "5.0.0";
+  src = fetchzip {
+    url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz";
+    sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
+  };
+  buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ];
+  buildPhase = "jbuilder build -p camlimages";
+  inherit (jbuilder) installPhase;
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 82467fcd78c..f77de1057e5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -119,7 +119,10 @@ let
     camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {
       giflib = pkgs.giflib_4_1;
     };
-    camlimages = camlimages_4_1;
+    camlimages =
+          if lib.versionOlder "4.05" ocaml.version
+          then callPackage ../development/ocaml-modules/camlimages { }
+          else camlimages_4_1;
 
     benchmark = callPackage ../development/ocaml-modules/benchmark { };
 

From 41939f29a128e48b0414a118342c63ae0e887591 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 7 Mar 2018 13:34:24 +0300
Subject: [PATCH 0371/2266] primusLib: build only for x86 Linux

---
 pkgs/tools/X11/primus/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index d9bebf6055f..dcd50ee9158 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Low-overhead client-side GPU offloading";
     homepage = https://github.com/amonakov/primus;
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.bsd2;
     maintainers = with maintainers; [ abbradar ];
   };

From 1efef6b10b747682c96f99fc337ff2cc863b422d Mon Sep 17 00:00:00 2001
From: Adam Copp <adamcopp@adamcopp4.lon.corp.google.com>
Date: Wed, 7 Mar 2018 11:04:29 +0000
Subject: [PATCH 0372/2266] Add vo-amrwbenc library package.

With some changes to ffmpeg build file, this enables ffmpeg to perform
AMR-WB encoding.
---
 .../libraries/vo-amrwbenc/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/vo-amrwbenc/default.nix

diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix
new file mode 100644
index 00000000000..7a6089722c0
--- /dev/null
+++ b/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+let
+    version = "0.1.3";
+in
+stdenv.mkDerivation {
+  name = "vo-amrwbenc-${version}";
+  version = "0.1.3";
+  buildInputs = [ autoreconfHook ];
+  src = fetchurl {
+    url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz";
+    sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c";
+  };
+
+  meta = {
+    homepage = "http://sourceforge.net/projects/opencore-amr/";
+    description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
+    license = "stdenv.lib.licenses.apache";
+    maintainers = [ stdenv.lib.maintainers.esteth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..5e0f334408d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5222,6 +5222,8 @@ with pkgs;
 
   vncrec = callPackage ../tools/video/vncrec { };
 
+  vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { };
+
   vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
 
   vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };

From c9b4dc17f04717218059b0b0d8463d584710d142 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 7 Mar 2018 11:48:55 +0100
Subject: [PATCH 0373/2266] pythonPackages.pysha3: init at 1.0.2

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

diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix
new file mode 100644
index 00000000000..4df98623e11
--- /dev/null
+++ b/pkgs/development/python-modules/pysha3/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "pysha3";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+  disabled = pythonOlder "2.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17kkjapv6sr906ib0r5wpldmzw7scza08kv241r98vffy9rqx67y";
+  };
+
+  meta = {
+    description = "Backport of hashlib.sha3 for 2.7 to 3.5";
+    homepage = https://github.com/tiran/pysha3;
+    license = lib.licenses.psfl;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4568d4b7ec2..49a99cc4939 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13362,6 +13362,8 @@ in {
 
   pyrr = callPackage ../development/python-modules/pyrr { };
 
+  pysha3 = callPackage ../development/python-modules/pysha3 { };
+
   pyshp = callPackage ../development/python-modules/pyshp { };
 
   pysmbc = callPackage ../development/python-modules/pysmbc { };

From 7374c5bed9b85dc9a2ab93b365e55662bd487ef0 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 7 Mar 2018 11:50:23 +0100
Subject: [PATCH 0374/2266] pythonPackages.opentimestamps: init at 0.2.1

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

diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix
new file mode 100644
index 00000000000..1271a46f047
--- /dev/null
+++ b/pkgs/development/python-modules/opentimestamps/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, bitcoinlib, GitPython, pysha3 }:
+
+buildPythonPackage rec {
+  name = "opentimestamps-${version}";
+  version = "0.2.1";
+  disabled = (!isPy3k);
+
+  src = fetchFromGitHub {
+    owner = "opentimestamps";
+    repo = "python-opentimestamps";
+    rev = "python-opentimestamps-v0.2.1";
+    sha256 = "1cilv1ls9mdqk8zriqfkz7xcl8i1ncm0f89n4c8k4s82kf5y56rm";
+  };
+
+  # Remove a failing test which expects the test source file to reside in the
+  # project's Git repo
+  patchPhase = ''
+    rm opentimestamps/tests/core/test_git.py
+  '';
+
+  propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ];
+
+  meta = {
+    description = "Create and verify OpenTimestamps proofs";
+    homepage = https://github.com/opentimestamps/python-opentimestamps;
+    license = lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49a99cc4939..d97d6d45d84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11400,6 +11400,8 @@ in {
 
   openpyxl = callPackage ../development/python-modules/openpyxl { };
 
+  opentimestamps = callPackage ../development/python-modules/opentimestamps { };
+
   ordereddict = buildPythonPackage rec {
     name = "ordereddict-${version}";
     version = "1.1";

From 2ee097b820d21270e25d37e253a6adb533f9b01c Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 7 Mar 2018 12:00:32 +0100
Subject: [PATCH 0375/2266] opentimestamps-client: init at 0.5.1

---
 .../misc/opentimestamps-client/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/opentimestamps-client/default.nix

diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix
new file mode 100644
index 00000000000..a062aa992be
--- /dev/null
+++ b/pkgs/tools/misc/opentimestamps-client/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy3k
+, opentimestamps, GitPython, pysocks }:
+
+buildPythonApplication rec {
+  name = "opentimestamps-client-${version}";
+  version = "0.5.1";
+  disabled = (!isPy3k);
+
+  src = fetchFromGitHub {
+    owner = "opentimestamps";
+    repo = "opentimestamps-client";
+    rev = "opentimestamps-client-v0.5.1";
+    sha256 = "0s549xkb75r5wyvjlfmac8a1df6w0y55l98f492zsihdns1d6rzq";
+  };
+
+  propagatedBuildInputs = [ opentimestamps GitPython pysocks ];
+
+  meta = {
+    description = "Command-line tool to create and verify OpenTimestamps proofs";
+    homepage = https://github.com/opentimestamps/opentimestamps-client;
+    license = lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..04d38e9d8ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16860,6 +16860,8 @@ with pkgs;
 
   openscad = callPackage ../applications/graphics/openscad {};
 
+  opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
+
   opentx = callPackage ../applications/misc/opentx { };
 
   opera = callPackage ../applications/networking/browsers/opera {};

From 524afb85575ba35e1594cd7d4dee60cff36430ee Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Wed, 7 Mar 2018 13:22:31 +0200
Subject: [PATCH 0376/2266] tiled: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 438ae26f06f..bd08d599755 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = "tiled";
     rev = "v${version}";
-    sha256 = "1bzp89914rlrwf2whky3fx10rwxqiwbw9acyqllvam3l4hmv4nlz";
+    sha256 = "0rf50w7nkdm70999q1mj7sy5hyjj41qjf4izi849q9a7xnhddv44";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From 47116c2d5c21ca834c5539fb1cae6815fa0063cd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 7 Mar 2018 06:23:02 -0500
Subject: [PATCH 0377/2266] openjdk bootstrap: Fix rpath fixup

---
 pkgs/development/compilers/openjdk/bootstrap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 38171c4d3fe..668ca552adf 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -45,7 +45,7 @@ let
     find "$out" -type f -print0 | while IFS= read -r -d "" elf; do
       isELF "$elf" || continue
       patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true
-      patchelf --set-rpath "${stdenv.cc.libc}/lib:$LIBDIRS" "$elf" || true
+      patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true
     done
 
     # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:

From 89700d7b26c5c3877321e29893f21445bd0e8da8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 7 Mar 2018 06:43:47 -0500
Subject: [PATCH 0378/2266] perlPackages.XMLSAX: Disable broken testsuite

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 39a7a55b30b..a92ee601ff4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16284,6 +16284,8 @@ let self = _self // overrides; _self = with self; {
     postInstall = ''
       perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()"
       '';
+    # https://hydra.nixos.org/build/70726762, seems to be a quoting bug in the Makefile.PL when FULLPERL is passed
+    doCheck = false;
   };
 
   XMLSAXBase = buildPerlPackage {

From b6a28336e5471d94468617b29f2b0d510c43dc0f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 7 Mar 2018 14:43:16 +0300
Subject: [PATCH 0379/2266] megatools: 1.9.98 -> 2017-10-26

Old version doesn't work with new Mega API.
---
 pkgs/tools/networking/megatools/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index f6a75011287..e2d4880250c 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib-networking
-, asciidoc, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, fuse, curl, glib-networking
+, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "megatools-${version}";
-  version = "1.9.98";
+  version = "2017-10-26";
 
-  src = fetchurl {
-    url = "https://megatools.megous.com/builds/${name}.tar.gz";
-    sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
+  src = fetchFromGitHub {
+    owner = "megous";
+    repo = "megatools";
+    rev = "35dfba3262f620b4701ec1975293463957e20f26";
+    sha256 = "0xphgv78j731rmhxic4fwzdr7vq5px921qifrw1y40b93nhy4d5n";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ];
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig wrapGAppsHook asciidoc libxml2
+    docbook_xsl docbook_xml_dtd_45 libxslt
+  ];
   buildInputs = [ glib glib-networking fuse curl ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Command line client for Mega.co.nz";
     homepage = https://megatools.megous.com/;

From 9edd4c8835ddea0b023875f6d0df201a2595de5b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 7 Mar 2018 16:42:59 +0300
Subject: [PATCH 0380/2266] gajim: add plugin installer

It's not included into repository checkout (which we use because of tests), so
get it from release tarball instead.
---
 .../instant-messengers/gajim/default.nix          | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 42c51049557..2f5ea071568 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -22,7 +22,8 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.9";
+  majorVersion = "0.16";
+  version = "${majorVersion}.9";
 
   src = fetchurl {
     name = "${name}.tar.bz2";
@@ -31,6 +32,18 @@ stdenv.mkDerivation rec {
     sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3";
   };
 
+  # Needed for Plugin Installer
+  release = fetchurl {
+    url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
+    sha256 = "0v08zdvpqaig0wxpxn1l8rsj3wr3fqvnagn8cnvch17vfqv9gcr1";
+  };
+
+  postUnpack = ''
+    tar -xaf $release
+    cp -r ${name}/plugins/plugin_installer gajim-${name}-*/plugins
+    rm -rf ${name}
+  '';
+
   patches = let
     # An attribute set of revisions to apply from the upstream repository.
     cherries = {

From b2c8f8be810dd28a00c7240991059128d89c40a3 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 7 Mar 2018 23:17:28 +0900
Subject: [PATCH 0381/2266] add meta-attrs

---
 pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 394b0c507be..72c92380449 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -9,4 +9,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ];
   buildPhase = "jbuilder build -p camlimages";
   inherit (jbuilder) installPhase;
+  
+  meta = with stdenv.lib; {
+    branch = "5.0";
+    homepage = https://bitbucket.org/camlspotter/camlimages;
+    description = "OCaml image processing library";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vbgl maintainers maintainers.mt-caret ];
+  };
 }

From 0b04beb8054fe9f56f98d3836a1c5ecf4d9fb68d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 7 Mar 2018 08:22:32 -0600
Subject: [PATCH 0382/2266] git-sizer: init at 1.0.0

---
 .../version-management/git-sizer/default.nix  | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/git-sizer/default.nix

diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
new file mode 100644
index 00000000000..a0d7382de34
--- /dev/null
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "git-sizer";
+  name = "${pname}-${version}";
+  version = "1.0.0";
+
+  goPackagePath = "github.com/github/git-sizer";
+
+  src = fetchFromGitHub {
+    owner = "github";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "11rvqpsyl41ph0fgm62k5q2p33zgnwj1jd91rd4lkaarpcd1sg5h";
+  };
+
+  meta = with lib; {
+    description = "Compute various size metrics for a Git repository";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f54b163c130..43f6255aa16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2446,6 +2446,8 @@ with pkgs;
 
   git-series = callPackage ../development/tools/git-series { };
 
+  git-sizer = callPackage ../applications/version-management/git-sizer { };
+
   git-up = callPackage ../applications/version-management/git-up { };
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
@@ -10440,7 +10442,7 @@ with pkgs;
   ## libGL/libGLU/Mesa stuff
 
   # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them
-  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, 
+  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`,
   # or other runtime dispatcher
   libGL = mesa_noglu;
 

From 222dcf4a6b9d673b8067fcd9489a119ff425c6eb Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 7 Mar 2018 23:39:47 +0900
Subject: [PATCH 0383/2266] fix maintainers

---
 pkgs/development/ocaml-modules/camlimages/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 72c92380449..def710f3f1b 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = https://bitbucket.org/camlspotter/camlimages;
     description = "OCaml image processing library";
     license = licenses.gpl2;
-    maintainers = [ maintainers.vbgl maintainers maintainers.mt-caret ];
+    maintainers = [ maintainers.vbgl maintainers.mt-caret ];
   };
 }

From c7f69d04dd5dc4c9a997d855694e6119b8e30774 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 06:51:28 -0800
Subject: [PATCH 0384/2266] aj-snapshot: 0.9.7 -> 0.9.8

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.8 in filename of file in /nix/store/20clx4g7349qaa4z00grmvncaszmmr9w-aj-snapshot-0.9.8
---
 pkgs/applications/audio/aj-snapshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix
index c7033afac34..f84958e1f82 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/pkgs/applications/audio/aj-snapshot/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name =  packageName + "-" + version ;
   packageName = "aj-snapshot" ;
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/${packageName}/${name}.tar.bz2";
-    sha256 = "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8";
+    sha256 = "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p";
   };
 
   doCheck = false;

From e59b91bc9a07c643f365cc084850af5a2c2cc04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Mar 2018 16:05:39 +0100
Subject: [PATCH 0385/2266] nixos/release: fix evaluation if missing x86

... in supportedSystems
---
 nixos/release-combined.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 9d4a551a958..e010b532a68 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,17 +52,17 @@ in rec {
         (all nixos.dummy)
         (all nixos.manual)
 
-        nixos.iso_minimal.x86_64-linux
-        nixos.iso_minimal.i686-linux
-        nixos.iso_graphical.x86_64-linux
-        nixos.ova.x86_64-linux
+        nixos.iso_minimal.x86_64-linux or []
+        nixos.iso_minimal.i686-linux or []
+        nixos.iso_graphical.x86_64-linux or []
+        nixos.ova.x86_64-linux or []
 
         #(all nixos.tests.containers)
-        nixos.tests.chromium.x86_64-linux
+        nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
-        nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
+        nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)
@@ -81,7 +81,7 @@ in rec {
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         (all nixos.tests.hibernate)
-        nixos.tests.docker.x86_64-linux
+        nixos.tests.docker.x86_64-linux or []
         (all nixos.tests.ecryptfs)
         (all nixos.tests.env)
         (all nixos.tests.ipv6)

From f5a4fa7e9353ec16c2413bf0281907c44cc488cb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 07:41:49 -0800
Subject: [PATCH 0386/2266] ansifilter: 2.4 -> 2.9

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -h` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter --help` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter help` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -V` and found version 2.9
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -v` and found version 2.9
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter --version` and found version 2.9
- found 2.9 with grep in /nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9
- found 2.9 in filename of file in /nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9
---
 pkgs/tools/text/ansifilter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index a2b6e3e6c3b..7b899e0399e 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ansifilter-${version}";
-  version = "2.4";
+  version = "2.9";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
-    sha256 = "c57cb878afa7191c7b7db3c086a344b4234df814aed632596619a4bda5941d48";
+    sha256 = "0fmwb8w1bpfxjwddal6cnhgmip26xqgcanpz2vp8jasklkcc1i7r";
 
   };
 

From 0657fc210f5904efdd8ddbd4b00147e0ae3f2848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20B=C3=B6ddeker?= <frank.boeddeker@holidaycheck.com>
Date: Wed, 7 Mar 2018 17:06:08 +0100
Subject: [PATCH 0387/2266] sauce-connect: 4.4.8 -> 4.4.12

---
 pkgs/development/tools/sauce-connect/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 3caec9a75c1..fe32f7c2450 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -4,18 +4,18 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "sauce-connect-${version}";
-  version = "4.4.8";
+  version = "4.4.12";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6";
+      sha256 = "1yqvx64bgiq27hdhwkzgmzyib8pbjn1idpq6783srxq64asf6iyw";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n";
+      sha256 = "02kib56lv4lhwkj5r15484lvvbyjvf9ydi5vccsmxgsxrzmddnl6";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg";
+      sha256 = "1gqsbw9f6nachk3c86knbqq417smqyf19mi63fmrfxrbxzy2fkv2";
     }
   );
 

From bab699faefd763e54c9743184640a6efbbcd52f8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 08:24:27 -0800
Subject: [PATCH 0388/2266] apktool: 2.3.0 -> 2.3.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -h` got 0 exit code
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool --help` got 0 exit code
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool help` got 0 exit code
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -V` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -v` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool --version` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool version` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -h` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool --help` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool help` and found version 2.3.1
- found 2.3.1 with grep in /nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1
- found 2.3.1 in filename of file in /nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1
---
 pkgs/development/tools/apktool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 158de9226c6..d1320960f39 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     urls = [
       "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
       "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
     ];
-    sha256 = "b724c158ec99dbad723024e259fd73e5135c40d652a3c599cec6ade9264a568e";
+    sha256 = "01xj2hivwwp3msvv0psxyxrzg95vj2ny56l3n90glhwznn7l60ai";
   };
 
   phases = [ "installPhase" ];

From f51cc6fae68d30700ddf8a87b83f29adab80af25 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 08:28:46 -0800
Subject: [PATCH 0389/2266] argyllcms: 1.8.3 -> 2.0.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/hh6cqaai79dsh200g3c581iaq52yi580-argyllcms-2.0.0/bin/synthcal help` got 0 exit code
- found 2.0.0 with grep in /nix/store/hh6cqaai79dsh200g3c581iaq52yi580-argyllcms-2.0.0
- found 2.0.0 in filename of file in /nix/store/hh6cqaai79dsh200g3c581iaq52yi580-argyllcms-2.0.0
---
 pkgs/tools/graphics/argyllcms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 3cdb4497baf..d35eae87204 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
 , libXdmcp, libXau, lib, openssl, zlib }:
 let
-  version = "1.8.3";
+  version = "2.0.0";
  in
 stdenv.mkDerivation rec {
   name = "argyllcms-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
-    sha256 = "00ggh47qzb3xyl8rnppwxa6j113lr38aiwvsfyxwgs51aqmvq7bd";
+    sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx";
 
     # The argyllcms web server doesn't like curl ...
     curlOpts = "--user-agent 'Mozilla/5.0'";

From eab479a5f0e46ad461ebda9953477be8f1e5e2bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Mar 2018 17:28:18 +0100
Subject: [PATCH 0390/2266] nixos release: more evaluation fixes

... if missing x86 in supportedSystems
---
 nixos/release.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index c4a7f7fdb68..a1310a409a1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -16,7 +16,11 @@ let
     inherit system;
   } // args);
 
-  callTestOnTheseSystems = systems: fn: args: forTheseSystems systems (system: hydraJob (importTest fn args system));
+  # Note: only supportedSystems are considered.
+  callTestOnTheseSystems = systems: fn: args:
+    forTheseSystems
+      (intersectLists supportedSystems systems)
+      (system: hydraJob (importTest fn args system));
   callTest = callTestOnTheseSystems supportedSystems;
 
   callSubTests = callSubTestsOnTheseSystems supportedSystems;
@@ -231,7 +235,7 @@ in rec {
   tests.buildbot = callTest tests/buildbot.nix {};
   tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {};
   tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {};
-  tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable;
+  tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {};
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.cloud-init = callTest tests/cloud-init.nix {};
   tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
@@ -252,8 +256,8 @@ in rec {
   tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
   tests.ecryptfs = callTest tests/ecryptfs.nix {};
   tests.etcd = callTestOnTheseSystems ["x86_64-linux"] tests/etcd.nix {};
-  tests.ec2-nixops = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops;
-  tests.ec2-config = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config;
+  tests.ec2-nixops = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {};
+  tests.ec2-config = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
   tests.elk = callSubTestsOnTheseSystems ["x86_64-linux"] tests/elk.nix {};
   tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};
@@ -292,7 +296,7 @@ in rec {
   tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
-  tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; });
+  tests.kubernetes = callSubTestsOnTheseSystems ["x86_64-linux"] tests/kubernetes/default.nix {};
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
   tests.ldap = callTest tests/ldap.nix {};
   #tests.lightdm = callTest tests/lightdm.nix {};

From 2040e4c2f8733b30888dc7a2bd2abff40d55bc23 Mon Sep 17 00:00:00 2001
From: Adam Copp <adamcopp@adamcopp4.lon.corp.google.com>
Date: Wed, 7 Mar 2018 16:32:25 +0000
Subject: [PATCH 0391/2266] Fix maintainer list

---
 maintainers/maintainer-list.nix                    | 4 ++++
 pkgs/development/libraries/vo-amrwbenc/default.nix | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 134ec56788e..41e09ec09f6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -63,6 +63,10 @@
     github = "DmitryTsygankov";
     name = "Dmitry Tsygankov";
   };
+  Esteth = {
+    email = "adam.copp@gmail.com";
+    name = "Adam Copp";
+  };
   FireyFly = {
     email = "nix@firefly.nu";
     github = "FireyFly";
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix
index 7a6089722c0..70c5b5bda3e 100644
--- a/pkgs/development/libraries/vo-amrwbenc/default.nix
+++ b/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
     homepage = "http://sourceforge.net/projects/opencore-amr/";
     description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
     license = "stdenv.lib.licenses.apache";
-    maintainers = [ stdenv.lib.maintainers.esteth ];
+    maintainers = [ stdenv.lib.maintainers.Esteth ];
   };
 }

From dffa3d2b1f2f243acf13c2e1b16dbd52e6cbb55c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Feb 2018 13:42:47 -0500
Subject: [PATCH 0392/2266] nixos: setuid-wrapper: simplify readlink logic

---
 nixos/modules/security/wrappers/wrapper.c | 36 ++++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c
index 7091e314bb2..af34c2f2fc5 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixos/modules/security/wrappers/wrapper.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -161,22 +162,34 @@ static int make_caps_ambient(const char *selfPath)
 
 int main(int argc, char * * argv)
 {
-    // I *think* it's safe to assume that a path from a symbolic link
-    // should safely fit within the PATH_MAX system limit. Though I'm
-    // not positive it's safe...
-    char selfPath[PATH_MAX];
-    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath));
+    // O_PATH | O_NOFOLLOW gives us a fd pointing to the symlink
+    int selfExe = open("/proc/self/exe", O_PATH | O_CLOEXEC | O_NOFOLLOW);
+    assert(selfExe != -1);
+    struct stat st;
+    assert(fstat(selfExe, &st) != -1);
+    size_t selfPathCap = st.st_size + 1;
+    char *selfPath = malloc(selfPathCap);
+    assert(selfPath);
+    int selfPathSize = readlinkat(selfExe, "", selfPath, selfPathCap);
 
     assert(selfPathSize > 0);
 
     // Assert we have room for the zero byte, this ensures the path
     // isn't being truncated because it's too big for the buffer.
     //
-    // A better way to handle this might be to use something like the
-    // whereami library (https://github.com/gpakosz/whereami) or a
-    // loop that resizes the buffer and re-reads the link if the
-    // contents are being truncated.
-    assert(selfPathSize < sizeof(selfPath));
+    // selfPathSize is the number of bytes readlinkat put into the
+    // buffer, which does *not* append a null byte. selfPathCap is the
+    // capacity of the buffer, which was set to the number of bytes in
+    // the link contents (again, without the null byte) plus one for
+    // the null byte.
+    //
+    // I don't think it's possible for the link contents to change
+    // between opening a symlink fd and readlinkat on it, so this is
+    // probably not necessary. Doubly so since this is /proc/self/exe,
+    // not a normal symlink. But it's trivial to check.
+    assert(selfPathSize < selfPathCap);
+
+    assert(close(selfExe));
 
     // Set the zero byte since readlink doesn't do that for us.
     selfPath[selfPathSize] = '\0';
@@ -197,7 +210,6 @@ int main(int argc, char * * argv)
     // `selfPath', and not, say, as some other setuid program. That
     // is, our effective uid/gid should match the uid/gid of
     // `selfPath'.
-    struct stat st;
     assert(lstat(selfPath, &st) != -1);
 
     assert(!(st.st_mode & S_ISUID) || (st.st_uid == geteuid()));
@@ -228,6 +240,8 @@ int main(int argc, char * * argv)
     // capabilities too!
     make_caps_ambient(selfPath);
 
+    free(selfPath);
+
     execve(sourceProg, argv, environ);
     
     fprintf(stderr, "%s: cannot run `%s': %s\n",

From 77d1fdb2c1c31be7ee257e5766a46d80cd8e8d9c Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 7 Mar 2018 18:28:26 +0100
Subject: [PATCH 0393/2266] ecm: 6.4.4 -> 7.0.4

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

diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix
index 44dc7af98c1..7b768f7077e 100644
--- a/pkgs/applications/science/math/ecm/default.nix
+++ b/pkgs/applications/science/math/ecm/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "ecm";
-  version = "6.4.4";
+  version = "7.0.4";
   name = "${pname}-${version}";
 in
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
-    sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
+    url = "http://gforge.inria.fr/frs/download.php/file/36224/ecm-${version}.tar.gz";
+    sha256 = "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc";
   };
 
   # See https://trac.sagemath.org/ticket/19233

From e864675e10cc1af98dcb37d6882e358c134e5425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 19:57:55 +0100
Subject: [PATCH 0394/2266] gnomeExtensions.impatience: Fix the version number

---
 pkgs/desktops/gnome-3/extensions/impatience.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index 78baec6dd30..24b4c1cf703 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-impatience-${version}";
-  version = "version-0.4.5";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
-    rev = version;
+    rev = "version-${version}";
     sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
   };
 

From 058be360d367e7180f1d736b271762aa1367cc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 19:59:00 +0100
Subject: [PATCH 0395/2266] gnomeExtensions.system-monitor: Fix the version
 number

---
 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 2c2f9870c7f..01b3fbad7c2 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
-  version = "v33";
+  version = "33";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
-    rev = version;
+    rev = "v${version}";
     sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk";
   };
 

From 7a3855506f1cfa0702b26739c46468f1f56fd0f6 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 7 Mar 2018 15:09:25 -0500
Subject: [PATCH 0396/2266] thunderbird: fix typo in desktop item genericName

---
 .../applications/networking/mailreaders/thunderbird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index bfbd9700197..48b6d3fbbaa 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -140,7 +140,7 @@ in stdenv.mkDerivation rec {
           exec = "thunderbird %U";
           desktopName = "Thunderbird";
           icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png";
-          genericName = "Main Reader";
+          genericName = "Mail Reader";
           categories = "Application;Network";
           mimeType = stdenv.lib.concatStringsSep ";" [
             # Email

From 2653355a9ca9a405fd07ae5ced363c97a322b170 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 1 Mar 2018 14:44:25 +0100
Subject: [PATCH 0397/2266] pgmanage: fix build

The configure script uses the `command` builtin command which is bash
specific while having a "#!/bin/sh" head.

This forces the use nix default shell (bash)

(cherry picked from commit 159a021bd83bc3e1bd385fe89522aea877eea29c)
---
 pkgs/applications/misc/pgmanage/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index e08035aef57..aa6555a89f2 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw";
   };
 
+  patchPhase = ''
+    patchShebangs src/configure
+  '';
+
   buildInputs = [ postgresql openssl ];
 
   meta = with stdenv.lib; {

From 76e465de52969086b150cce088ca5151f92faad9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 7 Mar 2018 22:25:01 +0100
Subject: [PATCH 0398/2266] A note about scheme-* in texlive.combine

---
 doc/languages-frameworks/texlive.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index fdee1e405ec..4515e17ec09 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -39,6 +39,9 @@ nix-repl> :l &lt;nixpkgs>
 nix-repl> texlive.collection-&lt;TAB>
       </programlisting>
     </para></listitem>
+    <listitem><para>
+      Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example <varname>scheme-basic</varname>, into the combination.
+    </para></listitem>
   </itemizedlist>
 </section>
 

From 65b1c735de262d7d618a0fa03a12a6f0ef9e8bc3 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 7 Mar 2018 22:28:58 +0100
Subject: [PATCH 0399/2266] pgmanage: 10.1.0 -> 10.1.1

---
 pkgs/applications/misc/pgmanage/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index aa6555a89f2..7da71df7814 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -2,19 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "pgmanage-${version}";
-  version = "10.1.0";
+  version = "10.1.1";
 
   src = fetchFromGitHub {
     owner  = "pgManage";
     repo   = "pgManage";
     rev    = "v${version}";
-    sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw";
+    sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc";
   };
 
   patchPhase = ''
     patchShebangs src/configure
   '';
 
+  configurePhase = ''
+    ./configure --prefix $out
+  '';
+
   buildInputs = [ postgresql openssl ];
 
   meta = with stdenv.lib; {

From fbc0b8282e5bca77f9bfcdf27190a7a63d0a65df Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 4 Mar 2018 13:35:20 +0100
Subject: [PATCH 0400/2266] xen: fix broken version comparisons

string compare breaks with xen 4.10 (because "4.10" < "4.8")
---
 nixos/modules/virtualisation/xen-dom0.nix        | 6 +++---
 pkgs/applications/virtualization/xen/generic.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index afc5a42f8b4..11aeb31730e 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -262,7 +262,7 @@ in
         mkdir -p /var/lib/xen # so we create them here unconditionally.
         grep -q control_d /proc/xen/capabilities
         '';
-      serviceConfig = if cfg.package.version < "4.8" then
+      serviceConfig = if (builtins.compareVersions cfg.package.version "4.8" < 0) then
         { ExecStart = ''
             ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork
             '';
@@ -275,7 +275,7 @@ in
           NotifyAccess    = "all";
         };
       postStart = ''
-        ${optionalString (cfg.package.version < "4.8") ''
+        ${optionalString (builtins.compareVersions cfg.package.version "4.8" < 0) ''
           time=0
           timeout=30
           # Wait for xenstored to actually come up, timing out after 30 seconds
@@ -320,7 +320,7 @@ in
       serviceConfig = {
         ExecStart = ''
           ${cfg.package}/bin/xenconsoled\
-            ${optionalString ((cfg.package.version >= "4.8")) " -i"}\
+            ${optionalString ((builtins.compareVersions cfg.package.version "4.8" >= 0)) " -i"}\
             ${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
           '';
       };
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 9efcc45be35..20033276fc8 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -154,12 +154,12 @@ stdenv.mkDerivation (rec {
     substituteInPlace tools/xenstat/Makefile \
       --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
 
-    ${optionalString (config.version >= "4.8") ''
+    ${optionalString (builtins.compareVersions config.version "4.8" >= 0) ''
       substituteInPlace tools/hotplug/Linux/launch-xenstore.in \
         --replace /bin/mkdir mkdir
     ''}
 
-    ${optionalString (config.version < "4.6") ''
+    ${optionalString (builtins.compareVersions config.version "4.6" < 0) ''
       # TODO: use this as a template and support our own if-up scripts instead?
       substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \
         --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts

From fc790cb0f6c288496f30db88aba91913028e46e8 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 4 Mar 2018 13:52:24 +0100
Subject: [PATCH 0401/2266] xen: add v 4.10

---
 pkgs/applications/virtualization/xen/4.10.nix | 176 ++++++++++++++++++
 .../virtualization/xen/packages.nix           |  46 +++++
 .../virtualization/xen/xsa-patches.nix        |  40 ++++
 pkgs/top-level/all-packages.nix               |   5 +
 4 files changed, 267 insertions(+)
 create mode 100644 pkgs/applications/virtualization/xen/4.10.nix

diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
new file mode 100644
index 00000000000..c3280cbda94
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -0,0 +1,176 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
+, withInternalQemu ? true
+, withInternalTraditionalQemu ? true
+, withInternalSeabios ? true
+, withSeabios ? !withInternalSeabios, seabios ? null
+, withInternalOVMF ? false # FIXME: tricky to build
+, withOVMF ? false, OVMF
+, withLibHVM ? true
+
+# qemu
+, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
+, alsaLib, glib, python2
+, ... } @ args:
+
+assert withInternalSeabios -> !withSeabios;
+assert withInternalOVMF -> !withOVMF;
+
+with stdenv.lib;
+
+# Patching XEN? Check the XSAs at
+# https://xenbits.xen.org/xsa/
+# and try applying all the ones we don't have yet.
+
+let
+  xsaPatch = { name , sha256 }: (fetchpatch {
+    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+    inherit sha256;
+  });
+
+  xsa = import ./xsa-patches.nix { inherit fetchpatch; };
+
+  qemuDeps = [
+    udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
+    alsaLib glib python2
+  ];
+in
+
+callPackage (import ./generic.nix (rec {
+  version = "4.10.0";
+
+  src = fetchurl {
+    url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
+    sha256 = "0i38ap5b5m1kix6xb0vn9ya1yab35adyc98bzfnbq4lb7w1afqh2";
+  };
+
+  # Sources needed to build tools and firmwares.
+  xenfiles = optionalAttrs withInternalQemu {
+    "qemu-xen" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/qemu-xen.git;
+        # rev = "refs/tags/qemu-xen-${version}";
+        # use revision hash - reproducible but must be updated with each new version
+        rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2";
+        sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w";
+      };
+      buildInputs = qemuDeps;
+      postPatch = ''
+        # needed in build but /usr/bin/env is not available in sandbox
+        substituteInPlace scripts/tracetool.py \
+          --replace "/usr/bin/env python" "${python2}/bin/python"
+      '';
+      meta.description = "Xen's fork of upstream Qemu";
+    };
+  } // optionalAttrs withInternalTraditionalQemu {
+    "qemu-xen-traditional" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
+        # rev = "refs/tags/xen-${version}";
+        # use revision hash - reproducible but must be updated with each new version
+        rev = "c8ea0457495342c417c3dc033bba25148b279f60";
+        sha256 = "0v5nl3c08kpjg57fb8l191h1y57ykp786kz6l525jgplif28vx13";
+      };
+      buildInputs = qemuDeps;
+      patches = [
+      ];
+      postPatch = ''
+        substituteInPlace xen-hooks.mak \
+          --replace /usr/include/pci ${pciutils}/include/pci
+      '';
+      meta.description = "Xen's fork of upstream Qemu that uses old device model";
+    };
+  } // optionalAttrs withInternalSeabios {
+    "firmware/seabios-dir-remote" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/seabios.git;
+        rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df";
+        sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm";
+      };
+      patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
+      meta.description = "Xen's fork of Seabios";
+    };
+  } // optionalAttrs withInternalOVMF {
+    "firmware/ovmf-dir-remote" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/ovmf.git;
+        rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8";
+        sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr";
+      };
+      meta.description = "Xen's fork of OVMF";
+    };
+  } // {
+    # TODO: patch Xen to make this optional?
+    "firmware/etherboot/ipxe.git" = {
+      src = fetchgit {
+        url = https://git.ipxe.org/ipxe.git;
+        rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d";
+        sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09";
+      };
+      meta.description = "Xen's fork of iPXE";
+    };
+  } // optionalAttrs withLibHVM {
+    "xen-libhvm-dir-remote" = {
+      src = fetchgit {
+        name = "xen-libhvm";
+        url = https://github.com/michalpalka/xen-libhvm;
+        rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c";
+        sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd";
+      };
+      buildPhase = ''
+        make
+        cd biospt
+        cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
+      '';
+      installPhase = ''
+        make install
+        cp biospt/biospt $out/bin/
+      '';
+      meta = {
+        description = ''
+          Helper library for reading ACPI and SMBIOS firmware values
+          from the host system for use with the HVM guest firmware
+          pass-through feature in Xen'';
+        license = licenses.bsd2;
+      };
+    };
+  };
+
+  configureFlags = []
+    ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
+    ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
+    ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
+
+    ++ optional (withSeabios) "--with-system-seabios=${seabios}"
+    ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
+
+    ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
+    ++ optional (withInternalOVMF) "--enable-ovmf";
+
+  patches = with xsa; flatten [
+    XSA_252
+    XSA_253
+    XSA_255_1
+    XSA_255_2
+    XSA_256
+  ];
+
+  # Fix build on Glibc 2.24.
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+  postPatch = ''
+    # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
+    sed 1i'#include <sys/sysmacros.h>' \
+      -i tools/blktap2/control/tap-ctl-allocate.c \
+      -i tools/libxl/libxl_device.c
+    # Makefile didn't include previous PKG_CONFIG_PATH so glib wasn't found
+    substituteInPlace tools/Makefile \
+      --replace 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config' 'PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config:$(PKG_CONFIG_PATH)'
+  '';
+
+  passthru = {
+    qemu-system-i386 = if withInternalQemu
+      then "lib/xen/bin/qemu-system-i386"
+      else throw "this xen has no qemu builtin";
+  };
+
+})) args
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 4b5f15c8ff4..35f6febb712 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -103,6 +103,52 @@ rec {
     };
   };
 
+  xen_4_10-vanilla = callPackage ./4.10.nix {
+    meta = {
+      description = "vanilla";
+      longDescription = ''
+        Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
+        with Xen. This gives vanilla experince, but wastes space and
+        build time: typical NixOS setup that runs lots of VMs will
+        build three different versions of Qemu when using this (two
+        forks and upstream).
+      '';
+    };
+  };
+
+  xen_4_10-slim = xen_4_10-vanilla.override {
+    withInternalQemu = false;
+    withInternalTraditionalQemu = true;
+    withInternalSeabios = false;
+    withSeabios = true;
+
+    meta = {
+      description = "slim";
+      longDescription = ''
+        Slimmed-down version of Xen that reuses nixpkgs packages as
+        much as possible. Different parts may get out of sync, but
+        this builds faster and uses less space than vanilla. Use with
+        `qemu_xen` from nixpkgs.
+      '';
+    };
+  };
+
+  xen_4_10-light = xen_4_10-vanilla.override {
+    withInternalQemu = false;
+    withInternalTraditionalQemu = false;
+    withInternalSeabios = false;
+    withSeabios = true;
+
+    meta = {
+      description = "light";
+      longDescription = ''
+        Slimmed-down version of Xen without `qemu-traditional` (you
+        don't need it if you don't know what it is). Use with
+        `qemu_xen-light` from nixpkgs.
+      '';
+    };
+  };
+
   xen-vanilla = xen_4_5-vanilla;
   xen-slim = xen_4_5-slim;
   xen-light = xen_4_5-light;
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 668ba70343f..727546b69fb 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -893,4 +893,44 @@ in rec {
   ];
 
 
+  # 4.10
+  XSA_252 = [
+   (xsaPatch {
+      name = "252";
+      sha256 = "0v4sg20dnvnwrjh3x69gk81v2kmcql7g2s044vg3wcxhzvij1rrn";
+    })
+  ];
+
+  # 4.10
+  XSA_253 = [
+   (xsaPatch {
+      name = "253";
+      sha256 = "0445vzlzy3gd499xraqh5r4qjar6qr0y3813h22jy1n84nhxz27i";
+    })
+  ];
+
+  # 4.10
+  XSA_255_1 = [
+   (xsaPatch {
+      name = "255-1";
+      sha256 = "05g2f3ji1rrjlw3yw4nrns50pnmsib8ybrf64scr1817mj0q9myr";
+    })
+  ];
+
+  # 4.10
+  XSA_255_2 = [
+   (xsaPatch {
+      name = "255-2";
+      sha256 = "08wbngw5z0f9g8di59hww3hhi7j9z49bpc4xlwn5akfcwbgf0961";
+    })
+  ];
+
+  # 4.10
+  XSA_256 = [
+   (xsaPatch {
+      name = "256";
+      sha256 = "1hicwhbwj6k25px55f4ncx1c5xiihi8pfvsb3kv57k7kaicb7pza";
+    })
+  ];
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..06aec461816 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13672,6 +13672,8 @@ with pkgs;
   qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; });
   qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; });
   qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; });
+  qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; });
+  qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; });
 
   qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });
 
@@ -18313,6 +18315,9 @@ with pkgs;
   xen_4_8 = xenPackages.xen_4_8-vanilla;
   xen_4_8-slim = xenPackages.xen_4_8-slim;
   xen_4_8-light = xenPackages.xen_4_8-light;
+  xen_4_10 = xenPackages.xen_4_10-vanilla;
+  xen_4_10-slim = xenPackages.xen_4_10-slim;
+  xen_4_10-light = xenPackages.xen_4_10-light;
 
   xkbset = callPackage ../tools/X11/xkbset { };
 

From 08894b4d8aab6518befd5f813c634b687285031d Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 7 Mar 2018 18:31:41 +0100
Subject: [PATCH 0402/2266] xen 4.10: link /etc/xen/oxenstored.conf

this is required for oxenstored to start
---
 nixos/modules/virtualisation/xen-dom0.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 11aeb31730e..cf57868acef 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -241,6 +241,12 @@ in
           '';
           target = "default/xendomains";
         }
+      ]
+      ++ lib.optionals (builtins.compareVersions cfg.package.version "4.10" >= 0) [
+        # in V 4.10 oxenstored requires /etc/xen/oxenstored.conf to start
+        { source = "${cfg.package}/etc/xen/oxenstored.conf";
+          target = "xen/oxenstored.conf";
+        }
       ];
 
     # Xen provides udev rules.

From fa051cdd0a6de1eb906d370fa07f6af4795404d9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 7 Mar 2018 22:53:54 +0100
Subject: [PATCH 0403/2266] aiohttp-cors: 0.6.0 -> 0.7.0

Upstream removed support for Python 3.4 [0][1] (and the build fails).

[0]: https://github.com/aio-libs/aiohttp-cors/releases/tag/v0.7.0
[1]: https://github.com/aio-libs/aiohttp/releases/tag/v3.0.1
---
 pkgs/development/python-modules/aiohttp/cors.nix   | 14 +++++++++-----
 .../development/python-modules/aiohttp/default.nix |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix
index 9da239b524a..3065bb17c05 100644
--- a/pkgs/development/python-modules/aiohttp/cors.nix
+++ b/pkgs/development/python-modules/aiohttp/cors.nix
@@ -1,20 +1,24 @@
-{lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, typing, aiohttp }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, typing, aiohttp
+}:
 
 buildPythonPackage rec {
   pname = "aiohttp-cors";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
+    sha256 = "0pczn54bqd32v8zhfbjfybiza6xh1szwxy6as577dn8g23bwcfad";
   };
 
-  # Requires network access
-  doCheck = false;
+  disabled = pythonOlder "3.5";
 
   propagatedBuildInputs = [ aiohttp ]
   ++ lib.optional (pythonOlder "3.5") typing;
 
+  # Requires network access
+  doCheck = false;
+
   meta = with lib; {
     description = "CORS support for aiohttp";
     homepage = "https://github.com/aio-libs/aiohttp-cors";
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 19ad64e7472..6f6da7ee0a6 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221";
   };
 
-  disabled = pythonOlder "3.4";
+  disabled = pythonOlder "3.5";
 
   checkInputs = [ pytest gunicorn pytest-mock ];
 

From a183563cf06a578879a886bb686879f7ddf2e9b4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 7 Mar 2018 17:09:05 -0500
Subject: [PATCH 0404/2266] Revert "Merge branch 'setuid-wrapper-readlink'"

Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the
wrong NixOS test :(

This reverts commit 6dab907ebe9c8015b8cbc4871313ed48c64c548c, reversing
changes made to eab479a5f0e46ad461ebda9953477be8f1e5e2bb.
---
 nixos/modules/security/wrappers/wrapper.c | 36 +++++++----------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c
index af34c2f2fc5..7091e314bb2 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixos/modules/security/wrappers/wrapper.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -162,34 +161,22 @@ static int make_caps_ambient(const char *selfPath)
 
 int main(int argc, char * * argv)
 {
-    // O_PATH | O_NOFOLLOW gives us a fd pointing to the symlink
-    int selfExe = open("/proc/self/exe", O_PATH | O_CLOEXEC | O_NOFOLLOW);
-    assert(selfExe != -1);
-    struct stat st;
-    assert(fstat(selfExe, &st) != -1);
-    size_t selfPathCap = st.st_size + 1;
-    char *selfPath = malloc(selfPathCap);
-    assert(selfPath);
-    int selfPathSize = readlinkat(selfExe, "", selfPath, selfPathCap);
+    // I *think* it's safe to assume that a path from a symbolic link
+    // should safely fit within the PATH_MAX system limit. Though I'm
+    // not positive it's safe...
+    char selfPath[PATH_MAX];
+    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath));
 
     assert(selfPathSize > 0);
 
     // Assert we have room for the zero byte, this ensures the path
     // isn't being truncated because it's too big for the buffer.
     //
-    // selfPathSize is the number of bytes readlinkat put into the
-    // buffer, which does *not* append a null byte. selfPathCap is the
-    // capacity of the buffer, which was set to the number of bytes in
-    // the link contents (again, without the null byte) plus one for
-    // the null byte.
-    //
-    // I don't think it's possible for the link contents to change
-    // between opening a symlink fd and readlinkat on it, so this is
-    // probably not necessary. Doubly so since this is /proc/self/exe,
-    // not a normal symlink. But it's trivial to check.
-    assert(selfPathSize < selfPathCap);
-
-    assert(close(selfExe));
+    // A better way to handle this might be to use something like the
+    // whereami library (https://github.com/gpakosz/whereami) or a
+    // loop that resizes the buffer and re-reads the link if the
+    // contents are being truncated.
+    assert(selfPathSize < sizeof(selfPath));
 
     // Set the zero byte since readlink doesn't do that for us.
     selfPath[selfPathSize] = '\0';
@@ -210,6 +197,7 @@ int main(int argc, char * * argv)
     // `selfPath', and not, say, as some other setuid program. That
     // is, our effective uid/gid should match the uid/gid of
     // `selfPath'.
+    struct stat st;
     assert(lstat(selfPath, &st) != -1);
 
     assert(!(st.st_mode & S_ISUID) || (st.st_uid == geteuid()));
@@ -240,8 +228,6 @@ int main(int argc, char * * argv)
     // capabilities too!
     make_caps_ambient(selfPath);
 
-    free(selfPath);
-
     execve(sourceProg, argv, environ);
     
     fprintf(stderr, "%s: cannot run `%s': %s\n",

From 5fbf9dbf9b9847d0fb7e9786297c4d001fd06384 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Mar 2018 18:13:55 -0500
Subject: [PATCH 0405/2266] openldap: Fix test

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

diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index 1178701c609..1bef867c57b 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -28,8 +28,8 @@ import ./make-test.nix {
   };
 
   testScript = ''
-    $machine->succeed('systemctl status openldap.service');
     $machine->waitForUnit('openldap.service');
+    $machine->succeed('systemctl status openldap.service');
     $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
   '';
 }

From 535ba5f7f7400918211936e81e522ee93925ab54 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Mar 2018 17:38:15 -0600
Subject: [PATCH 0406/2266] lldb_4: fix w/gcc7

Same fix used in swift4, FWIW.
---
 pkgs/development/compilers/llvm/4/lldb.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 5ffc346a479..325149fc19b 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
   ];
 
+  # Add missing include to fix error when using std::bind
+  prePatch = ''
+    sed -i -e '30i#include <functional>' include/lldb/Utility/TaskPool.h
+  '';
+
   enableParallelBuilding = true;
 
   postInstall = ''

From ce37526ed71da825a5178f7466c5c2eb7c7d41d6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Mar 2018 18:03:50 -0600
Subject: [PATCH 0407/2266] squishyball: fix w/new ncurses

https://github.com/NixOS/nixpkgs/pull/34477
https://bugs.debian.org/860334
---
 pkgs/applications/audio/squishyball/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix
index 2022183f4a0..496ce779ffb 100644
--- a/pkgs/applications/audio/squishyball/default.nix
+++ b/pkgs/applications/audio/squishyball/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ flac libao libvorbis ncurses opusfile ];
 
+  NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS";
+
   patches = [ ./gnu-screen.patch ];
 
   postInstall = ''

From 895b9967b186823c1b710cb36bae310093544db5 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 8 Mar 2018 01:04:09 +0100
Subject: [PATCH 0408/2266] weston: fix typo in configure flag

---
 pkgs/applications/window-managers/weston/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index bd40a73d264..2ea0480cc5e 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     "--enable-weston-launch"
     "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
   ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
-    ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"
+    ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder"
     ++ stdenv.lib.optionals (xwayland != null) [
         "--enable-xwayland"
         "--with-xserver-path=${xwayland.out}/bin/Xwayland"

From 4191058bddd5056017e208851631ca35ae6294f7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Mar 2018 18:12:02 -0600
Subject: [PATCH 0409/2266] virtualbox: drop headless patch that no longer
 applies, fixed upstream

---
 ...redClipboard-x11-stub.cpp-use-RT_NOR.patch | 153 ------------------
 .../virtualization/virtualbox/default.nix     |   2 -
 2 files changed, 155 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch

diff --git a/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch b/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch
deleted file mode 100644
index 7abe62a59cb..00000000000
--- a/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 9ac54c606b581847a170ac2fe525419aff2e5341 Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Wed, 6 Dec 2017 23:58:20 +0100
-Subject: [PATCH] HostServices/SharedClipboard/x11-stub.cpp: use RT_NOREF
- rather than NOREF
-
-Currently, build process fails when configuring with --build-headless like this:
-
-```
-kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/service.cpp
-kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:29: error: macro "NOREF" passed 2 arguments, but takes just 1
-     NOREF(pClient, fHeadless);
-                             ^
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:30: error: macro "NOREF" passed 2 arguments, but takes just 1
-     NOREF(pClient, u32Formats);
-                              ^
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:37: error: macro "NOREF" passed 4 arguments, but takes just 1
-     NOREF(pClient, u32Format, pv, cb);
-                                     ^
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:37: error: macro "NOREF" passed 4 arguments, but takes just 1
-     NOREF(pClient, pv, cb, u32Format);
-                                     ^
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardConnect(VBOXCLIPBOARDCLIENTDATA*, bool)':
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:5: error: 'NOREF' was not declared in this scope
-     NOREF(pClient, fHeadless);
-     ^~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:55:52: warning: unused parameter 'pClient' [-Wunused-parameter]
- int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient,
-                                                    ^~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:56:32: warning: unused parameter 'fHeadless' [-Wunused-parameter]
-                           bool fHeadless)
-                                ^~~~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardFormatAnnounce(VBOXCLIPBOARDCLIENTDATA*, uint32_t)':
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:5: error: 'NOREF' was not declared in this scope
-     NOREF(pClient, u32Formats);
-     ^~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:91:60: warning: unused parameter 'pClient' [-Wunused-parameter]
- void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient,
-                                                            ^~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:92:44: warning: unused parameter 'u32Formats' [-Wunused-parameter]
-                                   uint32_t u32Formats)
-                                            ^~~~~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardReadData(VBOXCLIPBOARDCLIENTDATA*, uint32_t, void*, uint32_t, uint32_t*)':
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:5: error: 'NOREF' was not declared in this scope
-     NOREF(pClient, u32Format, pv, cb);
-     ^~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:53: warning: unused parameter 'pClient' [-Wunused-parameter]
- int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
-                                                     ^~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:71: warning: unused parameter 'u32Format' [-Wunused-parameter]
- int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
-                                                                       ^~~~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:34: warning: unused parameter 'pv' [-Wunused-parameter]
-                            void *pv, uint32_t cb, uint32_t *pcbActual)
-                                  ^~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:47: warning: unused parameter 'cb' [-Wunused-parameter]
-                            void *pv, uint32_t cb, uint32_t *pcbActual)
-                                               ^~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardWriteData(VBOXCLIPBOARDCLIENTDATA*, void*, uint32_t, uint32_t)':
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:5: error: 'NOREF' was not declared in this scope
-     NOREF(pClient, pv, cb, u32Format);
-     ^~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:55: warning: unused parameter 'pClient' [-Wunused-parameter]
- void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv,
-                                                       ^~~~~~~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:70: warning: unused parameter 'pv' [-Wunused-parameter]
- void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv,
-                                                                      ^~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:39: warning: unused parameter 'cb' [-Wunused-parameter]
-                              uint32_t cb, uint32_t u32Format)
-                                       ^~
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:52: warning: unused parameter 'u32Format' [-Wunused-parameter]
-                              uint32_t cb, uint32_t u32Format)
-                                                    ^~~~~~~~~
-kmk: *** [/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o] Error 1
-The failing command:
-@g++ -c -O2 -g -pipe -pedantic -Wshadow -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-trigraphs -fdiagnostics-show-option -Wno-unused-parameter     -Wlogical-op   -Wno-variadic-macros
--Wno-long-long -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter  -Wno-overloaded-virtual -Wno-variadic-macros -O2 -mtune=generic -fno-omit-frame-pointer -fno-strict-aliasing
--fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden   -fPIC -m64
--I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/dtrace -I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/include
--I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DVBOX_WITH_REM -DVBOX_WITH_RAW_MODE -DRT_OS_LINUX -D_FILE_OFFSET_BITS=64
--DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_DEBUGGER -DVBOX_WITH_HARDENING -DRTPATH_APP_PRIVATE=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\"
--DRTPATH_APP_PRIVATE_ARCH=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\"
--DRTPATH_APP_PRIVATE_ARCH_TOP=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\"
--DRTPATH_SHARED_LIBS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\" -DRTPATH_APP_DOCS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/doc\"
--DIN_RING3 -DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DVBOX_WITH_DTRACE -DVBOX_WITH_DTRACE_R3 -DPIC -DVBOX_WITH_HGCM
--Wp,-MD,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o.dep
--Wp,-MT,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o -Wp,-MP -o
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o
-/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
-```
-
-This seems to be caused by the usage of NOREF in
-src/VBox/HostServices/SharedClipboard/x11-stub.cpp, so use RT_NOREFN
-instead.
-
-Signed-off-by: Florian Klink <flokli@flokli.de>
----
- src/VBox/HostServices/SharedClipboard/x11-stub.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
-index d890215..57ba883 100644
---- a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
-+++ b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp
-@@ -55,7 +55,7 @@ void vboxClipboardDestroy (void)
- int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient,
-                           bool fHeadless)
- {
--    NOREF(pClient, fHeadless);
-+    RT_NOREF2(pClient, fHeadless);
-     LogFlowFunc(("called, returning VINF_SUCCESS.\n"));
-     return VINF_SUCCESS;
- }
-@@ -77,7 +77,7 @@ int vboxClipboardSync (VBOXCLIPBOARDCLIENTDATA * /* pClient */)
-  */
- void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
- {
--    NOREF(pClient);
-+    RT_NOREF1(pClient);
-     LogFlowFunc(("called, returning.\n"));
- }
- 
-@@ -91,7 +91,7 @@ void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
- void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient,
-                                   uint32_t u32Formats)
- {
--    NOREF(pClient, u32Formats);
-+    RT_NOREF2(pClient, u32Formats);
-     LogFlowFunc(("called, returning.\n"));
- }
- 
-@@ -107,7 +107,7 @@ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient,
- int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
-                            void *pv, uint32_t cb, uint32_t *pcbActual)
- {
--    NOREF(pClient, u32Format, pv, cb);
-+    RT_NOREF4(pClient, u32Format, pv, cb);
-     LogFlowFunc(("called, returning VINF_SUCCESS.\n"));
-     /* No data available. */
-     *pcbActual = 0;
-@@ -125,6 +125,6 @@ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format,
- void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv,
-                              uint32_t cb, uint32_t u32Format)
- {
--    NOREF(pClient, pv, cb, u32Format);
-+    RT_NOREF4(pClient, pv, cb, u32Format);
-     LogFlowFunc(("called, returning.\n"));
- }
--- 
-2.15.0
-
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 38509d299d9..011a4e34e74 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -94,8 +94,6 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-     # https://www.virtualbox.org/pipermail/vbox-dev/2017-December/014888.html
-  ++ optional headless [ ./HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch ]
   ++ [ ./qtx11extras.patch ];
 
 

From 9f4fa91d8fdd1dfe44dcc9151c7c802889b3f31b Mon Sep 17 00:00:00 2001
From: Michael Bishop <cleverca22@gmail.com>
Date: Wed, 7 Mar 2018 20:19:06 -0400
Subject: [PATCH 0410/2266] spotify: 1.0.69 -> 1.0.72

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 9ac0c49ebc3..7b78ceddda2 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
   # Be careful not to pick the testing version.
-  version = "1.0.69.336.g7edcc575-39";
+  version = "1.0.72.117.g6bd7cc73-35";
 
   deps = [
     alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
+    sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 4463de6ec746636a5ade606de3eb833968b2ecc8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Jan 2018 08:09:24 -0600
Subject: [PATCH 0411/2266] llvm6: copy llvm5

---
 .../compilers/llvm/6/clang/default.nix        | 109 +++++++++++
 .../compilers/llvm/6/clang/purity.patch       |  30 +++
 .../llvm/6/compiler-rt-codesign.patch         | 155 ++++++++++++++++
 pkgs/development/compilers/llvm/6/default.nix |  78 ++++++++
 .../compilers/llvm/6/libc++/default.nix       |  44 +++++
 .../compilers/llvm/6/libc++/setup-hook.sh     |   3 +
 .../compilers/llvm/6/libc++abi.nix            |  47 +++++
 pkgs/development/compilers/llvm/6/lld.nix     |  33 ++++
 pkgs/development/compilers/llvm/6/lldb.nix    |  56 ++++++
 .../compilers/llvm/6/llvm-outputs.patch       |  26 +++
 pkgs/development/compilers/llvm/6/llvm.nix    | 171 ++++++++++++++++++
 pkgs/development/compilers/llvm/6/openmp.nix  |  26 +++
 12 files changed, 778 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/6/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/6/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch
 create mode 100644 pkgs/development/compilers/llvm/6/default.nix
 create mode 100644 pkgs/development/compilers/llvm/6/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/6/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/6/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/6/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/6/llvm-outputs.patch
 create mode 100644 pkgs/development/compilers/llvm/6/llvm.nix
 create mode 100644 pkgs/development/compilers/llvm/6/openmp.nix

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
new file mode 100644
index 00000000000..0ee1404484b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -0,0 +1,109 @@
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+, enableManpages ? false
+}:
+
+let
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+  self = stdenv.mkDerivation ({
+    name = "clang-${version}";
+
+    unpackPhase = ''
+      unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"}
+      mv cfe-${version}* clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
+
+    nativeBuildInputs = [ cmake python ]
+      ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+    buildInputs = [ libedit libxml2 llvm ]
+      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+    cmakeFlags = [
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++ stdenv.lib.optionals enableManpages [
+      "-DCLANG_INCLUDE_DOCS=ON"
+      "-DLLVM_ENABLE_SPHINX=ON"
+      "-DSPHINX_OUTPUT_MAN=ON"
+      "-DSPHINX_OUTPUT_HTML=OFF"
+      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+    ]
+    # Maybe with compiler-rt this won't be needed?
+    ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}"
+    ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
+
+    patches = [ ./purity.patch ];
+
+    # XXX: TODO: This should be removed on next rebuild
+    postBuild = "";
+
+    postPatch = ''
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+             -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+             lib/Driver/ToolChains/*.cpp
+
+      # Patch for standalone doc building
+      sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+    '';
+
+    outputs = [ "out" "lib" "python" ];
+
+    # Clang expects to find LLVMgold in its own prefix
+    # Clang expects to find sanitizer libraries in its own prefix
+    postInstall = ''
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
+      ln -sv $out/bin/clang $out/bin/cpp
+
+      # Move libclang to 'lib' output
+      moveToOutput "lib/libclang.*" "$lib"
+      substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+          --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
+
+      mkdir -p $python/bin $python/share/clang/
+      mv $out/bin/{git-clang-format,scan-view} $python/bin
+      if [ -e $out/bin/set-xcode-analyzer ]; then
+        mv $out/bin/set-xcode-analyzer $python/bin
+      fi
+      mv $out/share/clang/*.py $python/share/clang
+      rm $out/bin/c-index-test
+    '';
+
+    enableParallelBuilding = true;
+
+    passthru = {
+      isClang = true;
+      inherit llvm;
+    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+      inherit gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.ncsa;
+      platforms   = stdenv.lib.platforms.all;
+    };
+  } // stdenv.lib.optionalAttrs enableManpages {
+    name = "clang-manpages-${version}";
+
+    buildPhase = ''
+      make docs-clang-man
+    '';
+
+    installPhase = ''
+      mkdir -p $out/share/man/man1
+      # Manually install clang manpage
+      cp docs/man/*.1 $out/share/man/man1/
+    '';
+
+    outputs = [ "out" ];
+
+    doCheck = false;
+
+    meta.description = "man page for Clang ${version}";
+  });
+in self
diff --git a/pkgs/development/compilers/llvm/6/clang/purity.patch b/pkgs/development/compilers/llvm/6/clang/purity.patch
new file mode 100644
index 00000000000..b30d0d0b5d5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   if (!Args.hasArg(options::OPT_static)) {
+     if (Args.hasArg(options::OPT_rdynamic))
+       CmdArgs.push_back("-export-dynamic");
+-
+-    if (!Args.hasArg(options::OPT_shared)) {
+-      const std::string Loader =
+-          D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+-      CmdArgs.push_back("-dynamic-linker");
+-      CmdArgs.push_back(Args.MakeArgString(Loader));
+-    }
+   }
+ 
+   CmdArgs.push_back("-o");
+-- 
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch
new file mode 100644
index 00000000000..8f4c76bca1e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch
@@ -0,0 +1,155 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake |  8 ------
+ test/asan/CMakeLists.txt          | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt          | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+         set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+         set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+       endif()
+-      if(APPLE)
+-        # Ad-hoc sign the dylibs
+-        add_custom_command(TARGET ${libname}
+-          POST_BUILD  
+-          COMMAND codesign --sign - $<TARGET_FILE:${libname}>
+-          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+-        )
+-      endif()
+     endif()
+     install(TARGETS ${libname}
+       ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt
+index 8bfc15b5c..f23d0f71a 100644
+--- a/test/asan/CMakeLists.txt
++++ b/test/asan/CMakeLists.txt
+@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH})
+   endif()
+ endforeach()
+ 
+-# iOS and iOS simulator test suites
+-# These are not added into "check-all", in order to run these tests, use
+-# "check-asan-iossim-x86_64" and similar. They also require that an extra env
+-# variable to select which iOS device or simulator to use, e.g.:
+-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
+-if(APPLE)
+-  set(EXCLUDE_FROM_ALL ON)
+-
+-  set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
+-  set(ASAN_TEST_IOS "1")
+-  pythonize_bool(ASAN_TEST_IOS)
+-  set(ASAN_TEST_DYNAMIC True)
+-
+-  foreach(arch ${DARWIN_iossim_ARCHS})
+-    set(ASAN_TEST_IOSSIM "1")
+-    pythonize_bool(ASAN_TEST_IOSSIM)
+-    set(ASAN_TEST_TARGET_ARCH ${arch})
+-    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
+-    get_bits_for_arch(${arch} ASAN_TEST_BITS)
+-    string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-    set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
+-    configure_lit_site_cfg(
+-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-      )
+-    add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests"
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-      DEPENDS ${ASAN_TEST_DEPS})
+-  endforeach()
+-
+-  foreach (arch ${DARWIN_ios_ARCHS})
+-    set(ASAN_TEST_IOSSIM "0")
+-    pythonize_bool(ASAN_TEST_IOSSIM)
+-    set(ASAN_TEST_TARGET_ARCH ${arch})
+-    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
+-    get_bits_for_arch(${arch} ASAN_TEST_BITS)
+-    string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-    set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
+-    configure_lit_site_cfg(
+-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-      )
+-    add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests"
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-      DEPENDS ${ASAN_TEST_DEPS})
+-  endforeach()
+-
+-  set(EXCLUDE_FROM_ALL OFF)
+-endif()
+-
+ # Add unit tests.
+ if(COMPILER_RT_INCLUDE_TESTS)
+   set(ASAN_TEST_DYNAMIC False)
+diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
+index a68908612..cde0accb5 100644
+--- a/test/tsan/CMakeLists.txt
++++ b/test/tsan/CMakeLists.txt
+@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH})
+   list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
+ endforeach()
+ 
+-# iOS and iOS simulator test suites
+-# These are not added into "check-all", in order to run these tests, use
+-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment
+-# variable to select which iOS device or simulator to use, e.g.:
+-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
+-if(APPLE)
+-  set(EXCLUDE_FROM_ALL ON)
+-
+-  set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
+-  set(TSAN_TEST_IOS "1")
+-  pythonize_bool(TSAN_TEST_IOS)
+-
+-  set(arch "x86_64")
+-  set(TSAN_TEST_IOSSIM "1")
+-  pythonize_bool(TSAN_TEST_IOSSIM)
+-  set(TSAN_TEST_TARGET_ARCH ${arch})
+-  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
+-  string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-  set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
+-  configure_lit_site_cfg(
+-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-    )
+-  add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-    DEPENDS ${TSAN_TEST_DEPS})
+-
+-  set(arch "arm64")
+-  set(TSAN_TEST_IOSSIM "0")
+-  pythonize_bool(TSAN_TEST_IOSSIM)
+-  set(TSAN_TEST_TARGET_ARCH ${arch})
+-  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
+-  string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-  set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
+-  configure_lit_site_cfg(
+-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-    )
+-  add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-    DEPENDS ${TSAN_TEST_DEPS})
+-
+-  set(EXCLUDE_FROM_ALL OFF)
+-endif()
+-
+ if(COMPILER_RT_INCLUDE_TESTS)
+   configure_lit_site_cfg(
+     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
+-- 
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
new file mode 100644
index 00000000000..13e1d2308f8
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -0,0 +1,78 @@
+{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
+, darwin
+}:
+
+let
+  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+
+  release_version = "5.0.1";
+  version = release_version; # differentiating these is important for rc's
+
+  fetch = name: sha256: fetchurl {
+    url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
+    inherit sha256;
+  };
+
+  compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf";
+  clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs";
+
+  # Add man output without introducing extra dependencies.
+  overrideManOutput = drv:
+    let drv-manpages = drv.override { enableManpages = true; }; in
+    drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
+
+  llvm = callPackage ./llvm.nix {
+    inherit compiler-rt_src stdenv;
+  };
+
+  clang-unwrapped = callPackage ./clang {
+    inherit clang-tools-extra_src stdenv;
+  };
+
+  self = {
+    llvm = overrideManOutput llvm;
+    clang-unwrapped = overrideManOutput clang-unwrapped;
+
+    libclang = self.clang-unwrapped.lib;
+    llvm-manpages = lowPrio self.llvm.man;
+    clang-manpages = lowPrio self.clang-unwrapped.man;
+
+    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+
+    libstdcxxClang = ccWrapperFun {
+      cc = self.clang-unwrapped;
+      /* FIXME is this right? */
+      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
+      extraPackages = [ libstdcxxHook ];
+    };
+
+    libcxxClang = ccWrapperFun {
+      cc = self.clang-unwrapped;
+      /* FIXME is this right? */
+      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
+      extraPackages = [ self.libcxx self.libcxxabi ];
+    };
+
+    stdenv = stdenv.override (drv: {
+      allowedRequisites = null;
+      cc = self.clang;
+    });
+
+    libcxxStdenv = stdenv.override (drv: {
+      allowedRequisites = null;
+      cc = self.libcxxClang;
+    });
+
+    lld = callPackage ./lld.nix {};
+
+    lldb = callPackage ./lldb.nix {};
+
+    libcxx = callPackage ./libc++ {};
+
+    libcxxabi = callPackage ./libc++abi.nix {};
+
+    openmp = callPackage ./openmp.nix {};
+  };
+
+in self
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
new file mode 100644
index 00000000000..6f03e225ad6
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }:
+
+stdenv.mkDerivation rec {
+  name = "libc++-${version}";
+
+  src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs";
+
+  postUnpack = ''
+    unpackFile ${libcxxabi.src}
+    export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+  '';
+
+  prePatch = ''
+    substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+  '';
+
+  preConfigure = ''
+    # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+    cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+  '';
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  cmakeFlags = [
+    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+    "-DLIBCXX_LIBCPPABI_VERSION=2"
+    "-DLIBCXX_CXX_ABI=libcxxabi"
+  ];
+
+  enableParallelBuilding = true;
+
+  linkCxxAbi = stdenv.isLinux;
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
new file mode 100644
index 00000000000..9022fced6ec
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
@@ -0,0 +1,3 @@
+linkCxxAbi="@linkCxxAbi@"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
new file mode 100644
index 00000000000..166f4260291
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -0,0 +1,47 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+
+stdenv.mkDerivation {
+  name = "libc++abi-${version}";
+
+  src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+
+  postUnpack = ''
+    unpackFile ${libcxx.src}
+    unpackFile ${llvm.src}
+    export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export TRIPLE=x86_64-apple-darwin
+  '';
+
+  installPhase = if stdenv.isDarwin
+    then ''
+      for file in lib/*.dylib; do
+        # this should be done in CMake, but having trouble figuring out
+        # the magic combination of necessary CMake variables
+        # if you fancy a try, take a look at
+        # http://www.cmake.org/Wiki/CMake_RPATH_handling
+        install_name_tool -id $out/$file $file
+      done
+      make install
+      install -d 755 $out/include
+      install -m 644 ../include/*.h $out/include
+    ''
+    else ''
+      install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.so.1.0 $out/lib
+      install -m 644 ../include/cxxabi.h $out/include
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+    '';
+
+  meta = {
+    homepage = http://libcxxabi.llvm.org/;
+    description = "A new implementation of low level support for a standard C++ library";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
new file mode 100644
index 00000000000..1d00b16cce1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, llvm
+, python
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "lld-${version}";
+
+  src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ llvm ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    moveToOutput include "$dev"
+    moveToOutput lib "$dev"
+  '';
+
+  meta = {
+    description = "The LLVM Linker";
+    homepage    = http://lld.llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
new file mode 100644
index 00000000000..559c52831cd
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -0,0 +1,56 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python
+, version
+, darwin
+}:
+
+stdenv.mkDerivation {
+  name = "lldb-${version}";
+
+  src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp";
+
+  postPatch = ''
+    # Fix up various paths that assume llvm and clang are installed in the same place
+    sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
+      cmake/modules/LLDBStandalone.cmake
+  '';
+
+  nativeBuildInputs = [ cmake python which swig ];
+  buildInputs = [ ncurses zlib libedit libxml2 llvm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+
+  CXXFLAGS = "-fno-rtti";
+  hardeningDisable = [ "format" ];
+
+  cmakeFlags = [
+    "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp ../docs/lldb.1 $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A next-generation high-performance debugger";
+    homepage    = http://llvm.org/;
+    license     = licenses.ncsa;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/6/llvm-outputs.patch b/pkgs/development/compilers/llvm/6/llvm-outputs.patch
new file mode 100644
index 00000000000..40096fa3497
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
++  /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++  if (!IsInDevelopmentTree) {
++    bool WantShared = true;
++    for (int i = 1; i < argc; ++i) {
++      StringRef Arg = argv[i];
++      if (Arg == "--link-shared")
++        WantShared = true;
++      else if (Arg == "--link-static")
++        WantShared = false; // the last one wins
++    }
++
++    if (WantShared)
++      ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++  }
++
+   /// We only use `shared library` mode in cases where the static library form
+   /// of the components provided are not available; note however that this is
+   /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
new file mode 100644
index 00000000000..400ffa34117
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -0,0 +1,171 @@
+{ stdenv
+, fetch
+, fetchpatch
+, perl
+, groff
+, cmake
+, python
+, libffi
+, libbfd
+, libxml2
+, valgrind
+, ncurses
+, version
+, release_version
+, zlib
+, compiler-rt_src
+, libcxxabi
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, darwin
+}:
+
+let
+  src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz";
+
+  # Used when creating a version-suffixed symlink of libLLVM.dylib
+  shortVersion = with stdenv.lib;
+    concatStringsSep "." (take 2 (splitString "." release_version));
+in stdenv.mkDerivation (rec {
+  name = "llvm-${version}";
+
+  unpackPhase = ''
+    unpackFile ${src}
+    mv llvm-${version}* llvm
+    sourceRoot=$PWD/llvm
+    unpackFile ${compiler-rt_src}
+    mv compiler-rt-* $sourceRoot/projects/compiler-rt
+  '';
+
+  outputs = [ "out" ]
+    ++ stdenv.lib.optional enableSharedLibraries "lib";
+
+  nativeBuildInputs = [ perl groff cmake python ]
+    ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+  buildInputs = [ libxml2 libffi ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+
+    substituteInPlace cmake/modules/AddLLVM.cmake \
+      --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \
+      --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
+  ''
+  # Patch llvm-config to return correct library path based on --link-{shared,static}.
+  + stdenv.lib.optionalString (enableSharedLibraries) ''
+    substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+    patch -p1 < ./llvm-outputs.patch
+  '' + ''
+    # FileSystem permissions tests fail with various special bits
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "Path.cpp" ""
+    rm unittests/Support/Path.cpp
+
+    # Revert compiler-rt commit that makes codesign mandatory
+    patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
+  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+    patch -p0 < ${../aarch64.patch}
+  '';
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+    "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
+    "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+  ]
+  ++ stdenv.lib.optional enableSharedLibraries
+    "-DLLVM_LINK_LLVM_DYLIB=ON"
+  ++ stdenv.lib.optionals enableManpages [
+    "-DLLVM_BUILD_DOCS=ON"
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_OUTPUT_HTML=OFF"
+    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+  ]
+  ++ stdenv.lib.optional (!isDarwin)
+    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+  ++ stdenv.lib.optionals (isDarwin) [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DCAN_TARGET_i386=false"
+  ];
+
+  postBuild = ''
+    rm -fR $out
+
+    paxmark m bin/{lli,llvm-rtdyld}
+    paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
+    paxmark m unittests/ExecutionEngine/Orc/OrcJITTests
+    paxmark m unittests/Support/SupportTests
+    paxmark m bin/lli-child-target
+  '';
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+  '';
+
+  postInstall = stdenv.lib.optionalString enableSharedLibraries ''
+    moveToOutput "lib/libLLVM-*" "$lib"
+    moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+  ''
+  + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+  '';
+
+  doCheck = stdenv.isLinux && (!stdenv.isi686);
+
+  checkTarget = "check-all";
+
+  enableParallelBuilding = true;
+
+  passthru.src = src;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+} // stdenv.lib.optionalAttrs enableManpages {
+  name = "llvm-manpages-${version}";
+
+  buildPhase = ''
+    make docs-llvm-man
+  '';
+
+  propagatedBuildInputs = [];
+
+  installPhase = ''
+    make -C docs install
+  '';
+
+  outputs = [ "out" ];
+
+  doCheck = false;
+
+  meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
new file mode 100644
index 00000000000..5a01c191b5a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "openmp-${version}";
+
+  src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd";
+
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [ llvm ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Components required to build an executable OpenMP program";
+    homepage    = http://openmp.llvm.org/;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}

From 42c3a74a2a070ed7e6d4ecc7f9020a94e29fdfc6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Jan 2018 08:09:43 -0600
Subject: [PATCH 0412/2266] llvm6: rc1, hashes, top-level

---
 pkgs/development/compilers/llvm/6/clang/default.nix  |  2 +-
 pkgs/development/compilers/llvm/6/default.nix        | 10 +++++-----
 pkgs/development/compilers/llvm/6/libc++/default.nix |  2 +-
 pkgs/development/compilers/llvm/6/libc++abi.nix      |  2 +-
 pkgs/development/compilers/llvm/6/lld.nix            |  2 +-
 pkgs/development/compilers/llvm/6/lldb.nix           |  2 +-
 pkgs/development/compilers/llvm/6/llvm.nix           |  2 +-
 pkgs/development/compilers/llvm/6/openmp.nix         |  2 +-
 pkgs/top-level/all-packages.nix                      |  7 +++++++
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 0ee1404484b..5ef97ef7d82 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"}
+      unpackFile ${fetch "cfe" "1mrj0ig9x5dxvglmkyw6i8yb9hvznywqn2g6lqaw7a5fhjjdq0x2"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 13e1d2308f8..3fa53f7281e 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -6,16 +6,16 @@
 let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
-  release_version = "5.0.1";
-  version = release_version; # differentiating these is important for rc's
+  release_version = "6.0.0";
+  version = "6.0.0rc1"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
+    url = "http://prereleases.llvm.org/${release_version}/rc1/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf";
-  clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs";
+  compiler-rt_src = fetch "compiler-rt" "08dwlax5sfmpzwfbzdwig9hbmrqzlq2332rb5yh0l5xrp0y5869z";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1rj4b6cqn05s2b3qiw7iadc8a1hrn4vs6g06nwxmqwpx3790dqyn";
 
   # Add man output without introducing extra dependencies.
   overrideManOutput = drv:
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 6f03e225ad6..e0294430a26 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs";
+  src = fetch "libcxx" "0l026xx364a6zbx8sbd3280wbag0pkmj342v8zh1lg0661w52l8d";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index 166f4260291..3ffd5637ee0 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as";
+  src = fetch "libcxxabi" "0kmfmxm3iph9l1ndj2z7gj52n8bmy0rnnxzidfbliays2qzbwrsk";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 1d00b16cce1..2b3d6aadd7f 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym";
+  src = fetch "lld" "1yzq762bh375sskjgkcr0vqlhlii2br86z8wi2jbxmml0pj0xn99";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm ];
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 559c52831cd..fa9bde903f6 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp";
+  src = fetch "lldb" "1a0bmk0p4rclk0wvfg2ga4wkqp8lm6l3wx6g4g4dgiavd4bgsgl4";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 400ffa34117..4aba455c4c9 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz";
+  src = fetch "llvm" "0dsik1l6jshd617fh4qs1373s6dfkq4gsjhyf6zq2qb6kyisy2vd";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 5a01c191b5a..f4c2a3f160a 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd";
+  src = fetch "openmp" "0infci57hr89nxgs3v34z87kaqdw9pdkr6apyywkb8av032rhhpf";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83424eabba..2f49e02e34c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5780,6 +5780,7 @@ with pkgs;
     };
   };
 
+  clang_6  = llvmPackages_6.clang;
   clang_5  = llvmPackages_5.clang;
   clang_4  = llvmPackages_4.clang;
   clang_39 = llvmPackages_39.clang;
@@ -6465,13 +6466,16 @@ with pkgs;
   lld = llvmPackages.lld;
   lld_4 = llvmPackages_4.lld;
   lld_5 = llvmPackages_5.lld;
+  lld_6 = llvmPackages_6.lld;
 
   lldb = llvmPackages.lldb;
   lldb_4 = llvmPackages_4.lldb;
   lldb_5 = llvmPackages_5.lldb;
+  lldb_6 = llvmPackages_6.lldb;
 
   llvm = llvmPackages.llvm;
 
+  llvm_6  = llvmPackages_6.llvm;
   llvm_5  = llvmPackages_5.llvm;
   llvm_4  = llvmPackages_4.llvm;
   llvm_39 = llvmPackages_39.llvm;
@@ -6535,6 +6539,9 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
+  llvmPackages_6 = callPackage ../development/compilers/llvm/6 {
+    inherit (stdenvAdapters) overrideCC;
+  };
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (

From a192c9d67ae605041421e5a26b53618798ba6cc0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Jan 2018 08:50:18 -0600
Subject: [PATCH 0413/2266] lld: Add dep on libxml2

---
 pkgs/development/compilers/llvm/6/lld.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 2b3d6aadd7f..79bdacbf90c 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetch
 , cmake
-, zlib
+, libxml2
 , llvm
 , python
 , version
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetch "lld" "1yzq762bh375sskjgkcr0vqlhlii2br86z8wi2jbxmml0pj0xn99";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ llvm ];
+  buildInputs = [ llvm libxml2 ];
 
   outputs = [ "out" "dev" ];
 

From 0d90539cdab37069361e248daa97cc4c6a8fe3f3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 2 Feb 2018 06:34:25 -0600
Subject: [PATCH 0414/2266] llvm6: no need to patch on aarch64, already applied

---
 pkgs/development/compilers/llvm/6/llvm.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 4aba455c4c9..072fa9a11cc 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -74,8 +74,6 @@ in stdenv.mkDerivation (rec {
 
     # Revert compiler-rt commit that makes codesign mandatory
     patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
-  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
-    patch -p0 < ${../aarch64.patch}
   '';
 
   # hacky fix: created binaries need to be run before installation

From 11cb7d00caa24cac2210cf00047fa0bb8235a356 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 2 Feb 2018 06:38:15 -0600
Subject: [PATCH 0415/2266] llvm6: same python output fix from #33871

Unlike that PR, however, this doesn't need to go to staging
since no one depends on a package that doesn't exist yet :).
---
 pkgs/development/compilers/llvm/6/llvm.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 072fa9a11cc..4cfef8044b5 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation (rec {
     mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
-  outputs = [ "out" ]
+  outputs = [ "out" "python" ]
     ++ stdenv.lib.optional enableSharedLibraries "lib";
 
   nativeBuildInputs = [ perl groff cmake python ]
@@ -120,7 +120,11 @@ in stdenv.mkDerivation (rec {
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
   '';
 
-  postInstall = stdenv.lib.optionalString enableSharedLibraries ''
+  postInstall = ''
+    mkdir -p $python/share
+    mv $out/share/opt-viewer $python/share/opt-viewer
+  ''
+  + stdenv.lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \

From 62011cfaeabda6a4e49c5a4872a232a241111fb8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Feb 2018 11:03:57 -0600
Subject: [PATCH 0416/2266] llvm6: rc1 -> rc2

---
 pkgs/development/compilers/llvm/6/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/6/default.nix        | 8 ++++----
 pkgs/development/compilers/llvm/6/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/6/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/6/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/6/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/6/llvm.nix           | 2 +-
 pkgs/development/compilers/llvm/6/openmp.nix         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 5ef97ef7d82..a5e639cde6d 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1mrj0ig9x5dxvglmkyw6i8yb9hvznywqn2g6lqaw7a5fhjjdq0x2"}
+      unpackFile ${fetch "cfe" "1j9pzl71r1bnp0dsxj33p5pvl6njg0bf2yyi9vhci13nw7y71i0x"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 3fa53f7281e..c49f9e3d734 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -7,15 +7,15 @@ let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
   release_version = "6.0.0";
-  version = "6.0.0rc1"; # differentiating these is important for rc's
+  version = "6.0.0rc2"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://prereleases.llvm.org/${release_version}/rc1/${name}-${version}.src.tar.xz";
+    url = "http://prereleases.llvm.org/${release_version}/rc2/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "08dwlax5sfmpzwfbzdwig9hbmrqzlq2332rb5yh0l5xrp0y5869z";
-  clang-tools-extra_src = fetch "clang-tools-extra" "1rj4b6cqn05s2b3qiw7iadc8a1hrn4vs6g06nwxmqwpx3790dqyn";
+  compiler-rt_src = fetch "compiler-rt" "1ajk4iykgppc3wxij552m0qnj4rx3z1yyxj2yxhffwpsf973x68j";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0vhaq3yq97w82jvq3w6ccvciwg7zp78b7s1246f3xdai6ijgk8g3";
 
   # Add man output without introducing extra dependencies.
   overrideManOutput = drv:
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index e0294430a26..cd9a7c548fc 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "0l026xx364a6zbx8sbd3280wbag0pkmj342v8zh1lg0661w52l8d";
+  src = fetch "libcxx" "0rpgd25v4h7dgvmqjnksgjmss3lhqzah57lfirpskdllcj9cfa9z";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index 3ffd5637ee0..0a32e1e33b5 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "0kmfmxm3iph9l1ndj2z7gj52n8bmy0rnnxzidfbliays2qzbwrsk";
+  src = fetch "libcxxabi" "10rc7r33bhz4fflnqdian9jvgf1r85p9qxkkgr78wxc7680f0ccx";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 79bdacbf90c..f52d5e70fef 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "1yzq762bh375sskjgkcr0vqlhlii2br86z8wi2jbxmml0pj0xn99";
+  src = fetch "lld" "0wj8rwd4bqh32p03hksy9bngv5pwrwmlxglslm8clwlxrc2rkb1f";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index fa9bde903f6..8890f154b4f 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1a0bmk0p4rclk0wvfg2ga4wkqp8lm6l3wx6g4g4dgiavd4bgsgl4";
+  src = fetch "lldb" "118yj804rgg5fwdj9j2yydamgfqx7c585ahiyap26x09cz5g2l1v";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 4cfef8044b5..75d096416c1 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  src = fetch "llvm" "0dsik1l6jshd617fh4qs1373s6dfkq4gsjhyf6zq2qb6kyisy2vd";
+  src = fetch "llvm" "1jnk30b7csdldar88pws2b000k3n1484k6gg2sxgz2fc6j7ldkzn";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index f4c2a3f160a..dc1b9b32544 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "0infci57hr89nxgs3v34z87kaqdw9pdkr6apyywkb8av032rhhpf";
+  src = fetch "openmp" "1jz7i7gw8yazkn9hxsnq2lw9mj60g4wff4529yhx956jq1g1mr0k";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From ab0a72a33d9cda25cf27b93c6b93581d84fccfe9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 19 Feb 2018 13:01:42 -0600
Subject: [PATCH 0417/2266] clang-6 test variants

---
 pkgs/top-level/all-packages.nix | 2 ++
 pkgs/top-level/release.nix      | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f49e02e34c..25c21f7cf6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20904,6 +20904,8 @@ with pkgs;
     cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
     cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
     cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
+    cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; };
+    cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
     stdenv-inputs = callPackage ../test/stdenv-inputs { };
 
     cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e7f8d3f2e4c..aee73f20669 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -119,7 +119,11 @@ let
               jobs.tests.cc-wrapper-clang-5.x86_64-linux
               jobs.tests.cc-wrapper-clang-5.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-5.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-6.x86_64-linux
+              jobs.tests.cc-wrapper-clang-6.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-linux
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
               jobs.tests.cc-multilib-gcc.x86_64-linux
               jobs.tests.cc-multilib-clang.x86_64-linux
               jobs.tests.stdenv-inputs.x86_64-linux

From e876e97ef0dc0b198d8767b8ed999ca37ec5ec00 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 19 Feb 2018 19:17:34 -0600
Subject: [PATCH 0418/2266] llvm6: musl compat

---
 .../compilers/llvm/6/clang/default.nix            |  2 ++
 .../compilers/llvm/6/libc++/default.nix           | 15 +++++++++++----
 pkgs/development/compilers/llvm/6/libc++abi.nix   |  2 ++
 pkgs/development/compilers/llvm/6/llvm.nix        | 13 +++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index a5e639cde6d..2cf5cdb974d 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -47,6 +47,8 @@ let
 
       # Patch for standalone doc building
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
     '';
 
     outputs = [ "out" "lib" "python" ];
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index cd9a7c548fc..5093c268786 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
+  # on next rebuild, this can be replaced with optionals; for now set to null to avoid
+  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = if stdenv.hostPlatform.isMusl then [
+    ../../libcxx-0001-musl-hacks.patch
+  ] else null;
+
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
   '';
@@ -17,9 +23,10 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
     cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+    patchShebangs utils/cat_files.py
   '';
-
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python;
 
   buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
@@ -27,7 +34,7 @@ stdenv.mkDerivation rec {
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
     "-DLIBCXX_LIBCPPABI_VERSION=2"
     "-DLIBCXX_CXX_ABI=libcxxabi"
-  ];
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index 0a32e1e33b5..62b6bf58627 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
     export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
   installPhase = if stdenv.isDarwin
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 75d096416c1..3fe8d932d04 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -74,6 +74,11 @@ in stdenv.mkDerivation (rec {
 
     # Revert compiler-rt commit that makes codesign mandatory
     patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -i ${../TLI-musl.patch}
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "add_subdirectory(DynamicLibrary)" ""
+    rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -104,6 +109,14 @@ in stdenv.mkDerivation (rec {
   ++ stdenv.lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
+  ]
+  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
+    "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
+
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''

From c3e16a42eec5be554ec7852311ceee39861c6c06 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 19 Feb 2018 19:17:52 -0600
Subject: [PATCH 0419/2266] llvm6: drop perl and groff, as in llvm4/5

---
 pkgs/development/compilers/llvm/6/llvm.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 3fe8d932d04..9f3bd41c6ae 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -1,8 +1,6 @@
 { stdenv
 , fetch
 , fetchpatch
-, perl
-, groff
 , cmake
 , python
 , libffi
@@ -41,7 +39,7 @@ in stdenv.mkDerivation (rec {
   outputs = [ "out" "python" ]
     ++ stdenv.lib.optional enableSharedLibraries "lib";
 
-  nativeBuildInputs = [ perl groff cmake python ]
+  nativeBuildInputs = [ cmake python ]
     ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
   buildInputs = [ libxml2 libffi ]

From 9306e2fb6f4f72872a8fb33f746072bbaaa03ce4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 19 Feb 2018 19:20:05 -0600
Subject: [PATCH 0420/2266] llvm6: remove copied "remove this on next rebuild"
 value :)

---
 pkgs/development/compilers/llvm/6/clang/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 2cf5cdb974d..b1f2ba27e8c 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -37,9 +37,6 @@ let
 
     patches = [ ./purity.patch ];
 
-    # XXX: TODO: This should be removed on next rebuild
-    postBuild = "";
-
     postPatch = ''
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
              -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \

From 08db02e37a1f5ebfeb112e894068ac3e3c773d88 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 26 Feb 2018 13:58:03 -0600
Subject: [PATCH 0421/2266] llvm6: rc2 -> rc3

---
 pkgs/development/compilers/llvm/6/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/6/default.nix        | 8 ++++----
 pkgs/development/compilers/llvm/6/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/6/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/6/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/6/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/6/llvm.nix           | 2 +-
 pkgs/development/compilers/llvm/6/openmp.nix         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index b1f2ba27e8c..6707ebd5413 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1j9pzl71r1bnp0dsxj33p5pvl6njg0bf2yyi9vhci13nw7y71i0x"}
+      unpackFile ${fetch "cfe" "1nxx253czzjy7bsrwvk2pyaxwiqwqkjzk0k8x8w7y19mzmmfz883"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index c49f9e3d734..8d9fdfc2620 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -7,15 +7,15 @@ let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
   release_version = "6.0.0";
-  version = "6.0.0rc2"; # differentiating these is important for rc's
+  version = "6.0.0rc3"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://prereleases.llvm.org/${release_version}/rc2/${name}-${version}.src.tar.xz";
+    url = "http://prereleases.llvm.org/${release_version}/rc3/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "1ajk4iykgppc3wxij552m0qnj4rx3z1yyxj2yxhffwpsf973x68j";
-  clang-tools-extra_src = fetch "clang-tools-extra" "0vhaq3yq97w82jvq3w6ccvciwg7zp78b7s1246f3xdai6ijgk8g3";
+  compiler-rt_src = fetch "compiler-rt" "1lv5xawwn0spisa7jknq247pdndh4mlj22z1s0d7a5gqy9y0rlwv";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0qv7rl8cpsj0l2xl5iym6ymxi3906mb2yx95mcf5ihlwjcms5klf";
 
   # Add man output without introducing extra dependencies.
   overrideManOutput = drv:
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 5093c268786..a1d1a17f278 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "0rpgd25v4h7dgvmqjnksgjmss3lhqzah57lfirpskdllcj9cfa9z";
+  src = fetch "libcxx" "1dvnvxx588wdyxbn18fwpyjxgypn316arz48zqll03z6zi2rqisa";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index 62b6bf58627..c33f0c126cf 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "10rc7r33bhz4fflnqdian9jvgf1r85p9qxkkgr78wxc7680f0ccx";
+  src = fetch "libcxxabi" "04m1w7a1cxwr6dqlilp0vn6jfjwd9al3nv1sfmypi01r90w69n0r";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index f52d5e70fef..25b7edbe6c0 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "0wj8rwd4bqh32p03hksy9bngv5pwrwmlxglslm8clwlxrc2rkb1f";
+  src = fetch "lld" "16nzzi233kknb3sz0hvwypfp6wa1d6rc7izf0v5zzhgrcr86yy98";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 8890f154b4f..264f2dc6f7b 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "118yj804rgg5fwdj9j2yydamgfqx7c585ahiyap26x09cz5g2l1v";
+  src = fetch "lldb" "00gkkxsmz1dgj00mcv8ghxgi51skwbrfdw5rxqx27ay1pqbwa1zl";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 9f3bd41c6ae..e45e2ec75f1 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -20,7 +20,7 @@
 }:
 
 let
-  src = fetch "llvm" "1jnk30b7csdldar88pws2b000k3n1484k6gg2sxgz2fc6j7ldkzn";
+  src = fetch "llvm" "10qwr79kgkziqsaymszx36n265k0rpcr5c86xasi46rcigy59x4a";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index dc1b9b32544..9461e8b8421 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "1jz7i7gw8yazkn9hxsnq2lw9mj60g4wff4529yhx956jq1g1mr0k";
+  src = fetch "openmp" "1lgsn70rsmmc52qynd2r05bq34cllzyxb40vsqqv2vl3kicjis5k";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From a5147c52201e20416c009b3577b4b6aa297b6954 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 05:47:38 +0100
Subject: [PATCH 0422/2266] gnome3: automated update

---
 pkgs/desktops/gnome-3/apps/evolution/default.nix     |  4 ++--
 .../gnome-3/core/evolution-data-server/default.nix   |  4 ++--
 pkgs/development/compilers/vala/default.nix          | 12 ++++++------
 pkgs/development/libraries/gvfs/default.nix          |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index a1586754dbd..82cf6447cc7 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.26.5";
+  version = "3.26.6";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1j748f3407zavrh3bqw0mpf8f1i6b788kfjvwkk5bg7mm3c65n2g";
+    sha256 = "1adqh5f5aijkj5cnj1qprig8cd594m0qb0mzxn0zx44k0b6z5m1p";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 388553976f8..ae97fbc0e4d 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.26.5";
+  version = "3.26.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0m0y4l5wrdxpb6bs929ml7ayicwygfvngrzxf88hn0vkw0crfa9z";
+    sha256 = "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4";
   };
 
   passthru = {
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index f42cdcabae3..34d4932b7f2 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -20,10 +20,10 @@ let
 
     meta = with stdenv.lib; {
       description = "Compiler for GObject type system";
-      homepage = http://live.gnome.org/Vala;
+      homepage = https://wiki.gnome.org/Projects/Vala;
       license = licenses.lgpl21Plus;
       platforms = platforms.unix;
-      maintainers = with maintainers; [ antono lethalman peterhoeg ];
+      maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ];
     };
   };
 
@@ -55,14 +55,14 @@ in rec {
 
   vala_0_34 = generic {
     major   = "0.34";
-    minor   = "13";
-    sha256  = "0ahbnhgwhhjkndmbr1d039ws0g2bb324c60fk6wgx7py5wvmgcd2";
+    minor   = "17";
+    sha256  = "0wd2zxww4z1ys4iqz218lvzjqjjqwsaad4x2by8pcyy43sbr7qp2";
   };
 
   vala_0_36 = generic {
     major   = "0.36";
-    minor   = "8";
-    sha256  = "1nz5a8kcb22ss9idb7k1higwpvghd617xwf40fi0a9ggws614lfz";
+    minor   = "12";
+    sha256  = "1nvw721piwdh15bipg0sdll9kvgpz0y9i5fpszlc7y9w64yis25l";
   };
 
   vala_0_38 = generic {
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 0f8c9f3d343..964344d6892 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -6,14 +6,14 @@
 
 let
   pname = "gvfs";
-  version = "1.34.2";
+  version = "1.34.2.1";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0scn7bmfi27dnn764m090cj999dhda05pd9hnd9pcsfwygmcglv0";
+    sha256 = "1smmzix8wqrmj10pqy3xhrlv7xza6rpmg2v052gwk9ysxdric9fm";
   };
 
   nativeBuildInputs = [

From 760b5eeee03659f2340772b9e6ab86b070b9ee1e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 19:05:13 +0100
Subject: [PATCH 0423/2266] gnome3: add GNOME updatables to the attrset

---
 pkgs/desktops/gnome-3/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b79b04565fe..cd150c2d683 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -52,8 +52,11 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
+  inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
+    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf
+    easytag meld orca rhythmbox shotwell
     clutter clutter-gst clutter-gtk cogl gtkvnc;
+
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };

From 6be7d949149e5bbd0bce1858c5d9a5ce1aee1177 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Thu, 1 Mar 2018 21:17:21 +0300
Subject: [PATCH 0424/2266] ghc841:  bump to 8.4.1-release

---
 pkgs/development/compilers/ghc/8.4.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix
index 8f7cdc9568e..d60060000fa 100644
--- a/pkgs/development/compilers/ghc/8.4.1.nix
+++ b/pkgs/development/compilers/ghc/8.4.1.nix
@@ -24,7 +24,7 @@
   # platform). Static libs are always built.
   enableShared ? true
 
-, version ? "8.4.0.20180224"
+, version ? "8.4.1"
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
-    rev = "a1e15c8f59092ef2d11be7966bd20688d8dc01e6";
-    sha256 = "1pimf5ryl76r3vwnc2n0qzk4yh7zckp2r2g5rlz8nbddsws2v893";
+    rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb";
+    sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi";
   };
 
   enableParallelBuilding = true;

From 0145a00d9c34c56e37654a9df228cf2b63f6c326 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Wed, 7 Mar 2018 00:46:02 +0300
Subject: [PATCH 0425/2266] ghc841:  fix for the bump-broken integer-gmp: m4 is
 now a dependency

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

diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix
index d60060000fa..dd0e5e4b057 100644
--- a/pkgs/development/compilers/ghc/8.4.1.nix
+++ b/pkgs/development/compilers/ghc/8.4.1.nix
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? false, gmp ? null, m4
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
+  nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;

From 05412c95da24b1f6eada4f260eca0bd6dc83c8c2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 8 Mar 2018 09:12:14 +0800
Subject: [PATCH 0426/2266] syncthing: 0.14.44 -> 0.14.45

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 64c0b31a2a4..d79396f3b1d 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
 let
   common = { stname, target, patches ? [], postInstall ? "" }:
     stdenv.mkDerivation rec {
-      version = "0.14.44";
+      version = "0.14.45";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh";
+        sha256 = "0hhldmvsbvkaj0x6af7c41zq5mbzcymv5xxmwvb4h5zbz49z9vzl";
       };
 
       inherit patches;

From bd43449a2d6aeaaa5ca1d2842fd030697c160728 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 17:37:23 -0800
Subject: [PATCH 0427/2266] bareos: 15.2.4 -> 17.2.5

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bpluginfo -h` got 0 exit code
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bpluginfo --help` got 0 exit code
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bpluginfo -V` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bpluginfo --version` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bpluginfo -h` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bpluginfo --help` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto -h` got 0 exit code
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto --help` got 0 exit code
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto help` got 0 exit code
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto -V` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto --version` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto -h` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/bscrypto --help` and found version 17.2.5
- ran `/nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5/bin/testls help` got 0 exit code
- found 17.2.5 with grep in /nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5
- found 17.2.5 in filename of file in /nix/store/ayjbl5v8ng7fdzcjv93c7n5lax2q03hm-bareos-17.2.5
---
 pkgs/tools/backup/bareos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 4af20f76449..691568673df 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -12,14 +12,14 @@ let
 in
 stdenv.mkDerivation rec {
   name = "bareos-${version}";
-  version = "15.2.4";
+  version = "17.2.5";
 
   src = fetchFromGitHub {
     owner = "bareos";
     repo = "bareos";
     rev = "Release/${version}";
     name = "${name}-src";
-    sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd";
+    sha256 = "1mgh25lhd05m26sq1sj5ir2b4n7560x93ib25cvf9vmmypm1c7pn";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 08c9302672244623054ba40af508a7d79676318a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 17:53:19 -0800
Subject: [PATCH 0428/2266] baresip: 0.5.6 -> 0.5.8

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.5.8 with grep in /nix/store/v1xv4aj5wq1mw5mdml2hwh4qd5bfdcim-baresip-0.5.8
- found 0.5.8 in filename of file in /nix/store/v1xv4aj5wq1mw5mdml2hwh4qd5bfdcim-baresip-0.5.8
---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 10f246957d7..225d622c69f 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
-  version = "0.5.6";
+  version = "0.5.8";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "036hvl652zndqj3kmkv8z9pv7r4d1jxq8b7rg8jf0hh82vpyz38l";
+    sha256 = "0qk6y83mm7cz4j66d7zy72l7890k7ifqnqbqnjd3bjfn1yjivwfr";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem

From dbeb64eb2b17d284dcb77b50ca0346a4491c187f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 18:08:42 -0800
Subject: [PATCH 0429/2266] bftpd: 4.4 -> 4.8

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8/bin/bftpd -h` got 0 exit code
- ran `/nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8/bin/bftpd --help` got 0 exit code
- ran `/nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8/bin/bftpd -v` and found version 4.8
- ran `/nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8/bin/bftpd --version` and found version 4.8
- ran `/nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8/bin/bftpd -h` and found version 4.8
- ran `/nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8/bin/bftpd --help` and found version 4.8
- found 4.8 with grep in /nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8
- found 4.8 in filename of file in /nix/store/jl7d3l14s4p2f7r9mm9pij1ifpszkziv-bftpd-4.8
---
 pkgs/servers/ftp/bftpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index cc1582eb9e9..865b6f3faba 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bftpd";
-  version = "4.4";
+  version = "4.8";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
-    sha256 = "0hgpqwv7mj1yln8ps9bbcjhl5hvs02nxjfkk9nhkr6fysfyyn1dq";
+    sha256 = "1zlsajj6wjd9wcijzngmafhy2gr3sm5rphsr5n44rlmx1jdkk00c";
   };
   buildInputs = [];
   preConfigure = ''

From 848d597eab83fe26f46f5988f998770064789e37 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 18:25:56 -0800
Subject: [PATCH 0430/2266] biboumi: 6.1 -> 7.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2/bin/biboumi --help` got 0 exit code
- found 7.2 with grep in /nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2
- found 7.2 in filename of file in /nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2
---
 pkgs/servers/xmpp/biboumi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index e59aaa9116c..f46b3189edf 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "biboumi-${version}";
-  version = "6.1";
+  version = "7.2";
 
   src = fetchurl {
     url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz";
-    sha256 = "1la1n502v2wyfm0vl8v4m0hbigkkjchi21446n9mb203fz1cvr77";
+    sha256 = "0gyr2lp2imrjm5hvijcq0s7k9fzkirfl70cprjy9r4yvq6mg1jvd";
   };
 
   louiz_catch = fetchgit {

From 2bb8c17e5536eec0d4bd6b480839e29af7a3770d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:01:36 -0800
Subject: [PATCH 0431/2266] binaryen: 42 -> 44

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-shell -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-shell --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-shell help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-opt -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-opt --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-merge -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-merge --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-metadce -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-metadce --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/asm2wasm -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/asm2wasm --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm2asm -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm2asm --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/s2wasm -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/s2wasm --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/s2wasm help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-emscripten-finalize -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-emscripten-finalize --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-as -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-as --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-dis -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-dis --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-ctor-eval -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-ctor-eval --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-reduce -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-reduce --help` got 0 exit code
- found 44 with grep in /nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44
- found 44 in filename of file in /nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44
---
 pkgs/development/compilers/binaryen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 3f9ee17ca27..2b3919160e4 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "42";
+  version = "44";
   rev = "version_${version}";
   name = "binaryen-${version}";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "binaryen";
-    sha256 = "0b8qc9cd7ncshgfjwv4hfapmwa81gmniaycnxmdkihq9bpm26x2k";
+    sha256 = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
     inherit rev;
   };
 

From 617a8bda3bd27e247b20ae082d4bd56523fc7f2c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:16:54 -0800
Subject: [PATCH 0432/2266] bleachbit: 1.12 -> 2.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped -h` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped --help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped -v` and found version 2.0
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped --version` and found version 2.0
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit -h` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit --help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit -v` and found version 2.0
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit --version` and found version 2.0
- found 2.0 with grep in /nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0
- found 2.0 in filename of file in /nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0
---
 pkgs/applications/misc/bleachbit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 196db45d905..f0dce54675c 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -1,13 +1,13 @@
 { stdenv, pythonPackages, fetchurl }:
 pythonPackages.buildPythonApplication rec {
   name = "bleachbit-${version}";
-  version = "1.12";
+  version = "2.0";
 
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://sourceforge/bleachbit/${name}.tar.bz2";
-    sha256 = "1x58n429q1c77nfpf2g3vyh6yq8wha69zfzmxf1rvjvcvvmqs62m";
+    sha256 = "0ps98zx4n13q92bq7ykqi6hj3i7brdqgm87i9gk6ibvljp1vxdz9";
   };
 
   buildInputs = [  pythonPackages.wrapPython ];

From a14df21aae6cfc3d56ebe73cfd61d9caa03b35d1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Mar 2018 22:23:59 -0500
Subject: [PATCH 0433/2266] samba: 4.7.4 -> 4.7.5

Also, fix kerberos dependency to include krb5kdc
---
 pkgs/servers/samba/4.x.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 90b00169a51..187e79da43c 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
-, kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
+, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
 , gnutls, libgcrypt, libgpgerror
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
@@ -19,11 +19,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.7.4";
+  version = "4.7.5";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv";
+    sha256 = "13gyr0sk9vx6mccr2h35ca3g92kp50cqxrlzfgrddfmskzx08v9i";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline talloc popt iniparser
-      libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos
+      libbsd libarchive zlib acl fam libiconv gettext libunwind krb5Full
     ]
     ++ optionals stdenv.isLinux [ libaio pam systemd ]
     ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
     [ "--with-static-modules=NONE"
       "--with-shared-modules=ALL"
       "--with-system-mitkrb5"
+      "--with-system-mitkdc" "${krb5Full}"
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"

From 00a44c0c8cd396da43a9b973d5b1119c0fb1f945 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:33:22 -0800
Subject: [PATCH 0434/2266] bwidget: 1.9.10 -> 1.9.12

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.12 with grep in /nix/store/5rrcmy0g4sj5q2yhxxyczgddnjhgjfxm-bwidget-1.9.12
- found 1.9.12 in filename of file in /nix/store/5rrcmy0g4sj5q2yhxxyczgddnjhgjfxm-bwidget-1.9.12
---
 pkgs/development/libraries/bwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 6dc658c03e3..76c041e2ad5 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bwidget-${version}";
-  version = "1.9.10";
+  version = "1.9.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
-    sha256 = "025lmriaq4qqy99lh826wx2cnqqgxn7srz4m3q06bl6r9ch15hr6";
+    sha256 = "0qrj8k4zzrnhwgdn5dpa6j0q5j739myhwn60ssnqrzq77sljss1g";
   };
 
   dontBuild = true;

From bf110ef56a9cb3b521efe58df6a85cd7d6627285 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:34:38 -0800
Subject: [PATCH 0435/2266] byobu: 5.121 -> 5.124

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu -v` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu --version` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ctrl-a -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ctrl-a --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable-prompt -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable-prompt --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable-prompt help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-enable -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-enable --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-enable help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-janitor -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-janitor --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-janitor help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-keybindings -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-keybindings --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-keybindings help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launch -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launch --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launch help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher -v` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher --version` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-install -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-install --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-install help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-uninstall -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-uninstall --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-uninstall help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-select-profile -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status-detail -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status-detail --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status-detail help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph version` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph -h` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph --help` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ulevel -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ulevel --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ulevel --help` and found version 5.124
- found 5.124 with grep in /nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124
- found 5.124 in filename of file in /nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124
---
 pkgs/tools/misc/byobu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 82ae4d40f2d..8f3c067018d 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.121";
+  version = "5.124";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "0rbwb7kh0f458ad51grrhz56889g6xj1c29c838pi37cjdgl3wjx";
+    sha256 = "08pipvh2iwy5d4b1bnrh0vwlmm884cqzgsz6jx3ar4shp63i5jjf";
   };
 
   doCheck = true;

From 600e977898d776faee44ccf74ba53315e1347d4e Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 8 Mar 2018 12:45:39 +0900
Subject: [PATCH 0436/2266] buildLinux: removes unnecessary parameters

and passes parameters in a single set
---
 pkgs/os-specific/linux/kernel/generic.nix | 12 +++++-------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index f69865cdc4d..a8f55d81466 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,12 +1,10 @@
-{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
+{ buildPackages
 , ncurses
-, libelf
-, utillinux
-, writeTextFile, ubootTools
 , callPackage
-}:
-
-{ stdenv, buildPackages, perl, buildLinux
+, perl
+, bison ? null
+, flex ? null
+, stdenv
 
 , # The kernel source tarball.
   src
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98001c416fa..ac39582a1a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13445,7 +13445,7 @@ with pkgs;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
-  buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
+  buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;
 
   keyutils = callPackage ../os-specific/linux/keyutils { };
 

From 3ccc65a36cbb9871830d746e1b2c9b1a09e71291 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 8 Mar 2018 12:47:06 +0900
Subject: [PATCH 0437/2266] buildLinux: allow to override arch/modules/builtin

- Easy override of autoModules and preferBuiltin and kernelArch parameters (currently living in `hostSystem` set).
---
 pkgs/os-specific/linux/kernel/generic.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index a8f55d81466..1b8c3f76155 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -33,6 +33,12 @@
                        hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 , hostPlatform
+
+# easy overrides to hostPlatform.platform members
+, autoModules ? hostPlatform.platform.kernelAutoModules
+, preferBuiltin ? hostPlatform.platform.kernelPreferBuiltin or false
+, kernelArch ? hostPlatform.platform.kernelArch
+
 , ...
 } @ args:
 
@@ -65,7 +71,7 @@ let
     in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
 
   configfile = stdenv.mkDerivation {
-    inherit ignoreConfigErrors;
+    inherit ignoreConfigErrors autoModules preferBuiltin kernelArch;
     name = "linux-config-${version}";
 
     generateConfig = ./generate-config.pl;
@@ -81,9 +87,6 @@ let
     kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;
     # e.g. "bzImage"
     kernelTarget = hostPlatform.platform.kernelTarget;
-    autoModules = hostPlatform.platform.kernelAutoModules;
-    preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false;
-    arch = hostPlatform.platform.kernelArch;
 
     prePatch = kernel.prePatch + ''
       # Patch kconfig to print "###" after every question so that
@@ -97,12 +100,12 @@ let
       export buildRoot="''${buildRoot:-build}"
 
       # Get a basic config file for later refinement with $generateConfig.
-      make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$arch
+      make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$kernelArch
 
       # Create the config file.
       echo "generating kernel configuration..."
       echo "$kernelConfig" > "$buildRoot/kernel-config"
-      DEBUG=1 ARCH=$arch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
+      DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
            PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig
     '';
 

From bc7ca17345e660c7c03d207dff029850203005f6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:50:56 -0800
Subject: [PATCH 0438/2266] cadvisor: 0.28.3 -> 0.29.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.29.1 with grep in /nix/store/8zpvaz7imhsknld6d0qyykqw9b718lxi-cadvisor-0.29.1
- found 0.29.1 in filename of file in /nix/store/8zpvaz7imhsknld6d0qyykqw9b718lxi-cadvisor-0.29.1
---
 pkgs/servers/monitoring/cadvisor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 695e5aa4558..0480d056c59 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
-  version = "0.28.3";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "1rdw09cbhs4il63lv1f92dw8pav9rjnkbrqx37lqij8x6xmv01gy";
+    sha256 = "132mpcp35cymm2zqig0yrvhnvgn72k7cmn6gla0v7r0yxfl879m3";
   };
 
   nativeBuildInputs = [ go ];

From 7272190333510b2c8f84c8e56161424ea633088c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 7 Mar 2018 22:06:50 -0600
Subject: [PATCH 0439/2266] json2hcl: init at 0.0.6

Fixes #36416
---
 pkgs/development/tools/json2hcl/default.nix | 24 +++++++++++++++++++++
 pkgs/development/tools/json2hcl/deps.nix    | 20 +++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/tools/json2hcl/default.nix
 create mode 100644 pkgs/development/tools/json2hcl/deps.nix

diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
new file mode 100644
index 00000000000..cddf6054d48
--- /dev/null
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "json2hcl";
+  name = "${pname}-${version}";
+  version = "0.0.6";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0knil88n2w41w3nzqz6ljgfjkl5r3x0bh7ifqgiyf6sin3pl4pn0";
+  };
+
+  owner = "kvz";
+  goPackagePath = "github.com/${owner}/${pname}";
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Convert JSON to HCL, and vice versa";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.matthewbauer ];
+  };
+}
diff --git a/pkgs/development/tools/json2hcl/deps.nix b/pkgs/development/tools/json2hcl/deps.nix
new file mode 100644
index 00000000000..bb9df28ad87
--- /dev/null
+++ b/pkgs/development/tools/json2hcl/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/Acconut/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Acconut/hcl";
+      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f6255aa16..18bfc58e988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9359,6 +9359,8 @@ with pkgs;
 
   jshon = callPackage ../development/tools/parsing/jshon { };
 
+  json2hcl = callPackage ../development/tools/json2hcl { };
+
   json-glib = callPackage ../development/libraries/json-glib { };
 
   json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable

From 6edbf98d341f6b7e2acd3b5b619619756c1f5849 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 20:08:56 -0800
Subject: [PATCH 0440/2266] calc: 2.12.6.3 -> 2.12.6.6

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -V` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere --version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -h` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere --help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/fproduct -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/fproduct --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/fproduct help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/mersenne -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/mersenne --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/mersenne help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/piforever -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/piforever -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus --version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus --help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/powerterm -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/powerterm --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/powerterm help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped -v` and found version 2.12.6.6
- found 2.12.6.6 with grep in /nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6
- found 2.12.6.6 in filename of file in /nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6
---
 pkgs/applications/science/math/calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 5787cb3d6b8..efd38f05345 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -12,11 +12,11 @@ in
 stdenv.mkDerivation rec {
 
   name = "calc-${version}";
-  version = "2.12.6.3";
+  version = "2.12.6.6";
 
   src = fetchurl {
     url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "01m20s5zs74zyb23x6zg6i13gc30a2ay2iz1rdbkxram01cblzky";
+    sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5";
   };
 
   buildInputs = [ makeWrapper readline ncurses utillinux ];

From a1bf5bd907cc6f4568f0c17383d255952dddcc7d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 23:08:48 -0800
Subject: [PATCH 0441/2266] checkstyle: 6.19 -> 8.8

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 8.8 with grep in /nix/store/09g6vrj90r6lbwj2hwb319sgd3ppp14k-checkstyle-8.8
- found 8.8 in filename of file in /nix/store/09g6vrj90r6lbwj2hwb319sgd3ppp14k-checkstyle-8.8
---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 91037588552..6043e2d289d 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.19";
+  version = "8.8";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "0x899i5yamwyhv7wgii80fv5hl8bdq0b8wlx1f789l85ik8rjwk9";
+    sha256 = "0yawd6mbz6cqj0qlrh01vy33p30f4s3pfrvsxwg5l11p416zzrz4";
   };
 
   installPhase = ''

From 99547c4334db4d4ed18a57b2bf3aca5e9bdccb38 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 23:24:18 -0800
Subject: [PATCH 0442/2266] cherrytree: 0.37.6 -> 0.38.4

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/.cherrytree-wrapped -h` got 0 exit code
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/.cherrytree-wrapped --help` got 0 exit code
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/cherrytree -h` got 0 exit code
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/cherrytree --help` got 0 exit code
- found 0.38.4 with grep in /nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4
- found 0.38.4 in filename of file in /nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4
---
 pkgs/applications/misc/cherrytree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 324fa12dc46..ff1712f12fe 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "cherrytree-${version}";
-  version = "0.37.6";
+  version = "0.38.4";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s";
+    sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2";
   };
 
   buildInputs = with pythonPackages;

From 2f090641ecf4555884d61e23140c626a3eb030e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 23:44:47 -0800
Subject: [PATCH 0443/2266] chessx: 1.4.0 -> 1.4.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.6 with grep in /nix/store/9cv1znh739dblr4avnhnp463v77yq9by-chessx-1.4.6
- found 1.4.6 in filename of file in /nix/store/9cv1znh739dblr4avnhnp463v77yq9by-chessx-1.4.6
---
 pkgs/games/chessx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index b8a4d4e06dc..c8d23fcc9de 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
 stdenv.mkDerivation rec {
   name = "chessx-${version}";
-  version = "1.4.0";
+  version = "1.4.6";
   src = fetchurl {
     url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
-    sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74";
+    sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
   };
   buildInputs = [
    qtbase

From 09fb415c187995e5db7495d0e7c074ca25db0f79 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Thu, 8 Mar 2018 11:49:48 +0900
Subject: [PATCH 0444/2266] camlimages: fix regression

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

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f77de1057e5..ef534f189ae 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -120,7 +120,7 @@ let
       giflib = pkgs.giflib_4_1;
     };
     camlimages =
-          if lib.versionOlder "4.05" ocaml.version
+          if lib.versionOlder "4.06" ocaml.version
           then callPackage ../development/ocaml-modules/camlimages { }
           else camlimages_4_1;
 

From eb03591afd1756ee67e09fdc59e93b73ac8acf58 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:00:11 -0800
Subject: [PATCH 0445/2266] chromedriver: 2.35 -> 2.36

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver -h` got 0 exit code
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver --help` got 0 exit code
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver -v` and found version 2.36
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver --version` and found version 2.36
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver -h` and found version 2.36
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver --help` and found version 2.36
- found 2.36 with grep in /nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36
- found 2.36 in filename of file in /nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36
---
 pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 554a5585f15..d5671b974f5 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,7 +6,7 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "13iyz6579yw4fk9dr4nf2pdj55v1iflj8yf9a4zz7qw5996d5yk7";
+      sha256 = "1m119kbsr6gm8a37q92rflp5mp3fjzw8cy4r5j4bnihkai7khq94";
     };
 
     "x86_64-darwin" = {
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.35";
+  version = "2.36";
 
   src = fetchurl {
     url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From efea9f0fa93a0a8dab1ab135028f62f4113b8e7f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:16:47 -0800
Subject: [PATCH 0446/2266] cminpack: 1.3.4 -> 1.3.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.6 in filename of file in /nix/store/ch2n83jgh0mv5h7992gm4lf9lmxp59lp-cminpack-1.3.6
---
 pkgs/development/libraries/cminpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix
index a13b42a08a8..cb4f3e39aef 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cminpack-1.3.4";
+  name = "cminpack-1.3.6";
   
   src = fetchurl {
     url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
-    sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v";
+    sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
   };
 
   patchPhase = ''

From 50287f8c09c33466974b2ee4dd4c553de881abd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Wed, 7 Mar 2018 19:10:17 +0100
Subject: [PATCH 0447/2266] pythonPackages.antlr4-python3-runtime: init at
 4.7.1

---
 .../antlr4-python3-runtime/default.nix         | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/antlr4-python3-runtime/default.nix

diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
new file mode 100644
index 00000000000..84f2859d50c
--- /dev/null
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  version = "4.7.1";
+  name = "antlr4-python3-runtime-${version}";
+  disabled = !isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/a/antlr4-python3-runtime/${name}.tar.gz";
+    sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv";
+  };
+
+  meta = {
+    description = "Runtime for ANTLR";
+    homepage = "http://www.antlr.org/";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4568d4b7ec2..f674e6c1755 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -539,6 +539,8 @@ in {
 
   amqplib = callPackage ../development/python-modules/amqplib {};
 
+  antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {};
+
   apipkg = callPackage ../development/python-modules/apipkg {};
 
   appdirs = callPackage ../development/python-modules/appdirs { };

From 48801b8507d13107b2d372a2fd3d1a2ae8bc6d08 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:33:13 -0800
Subject: [PATCH 0448/2266] cmst: 2017.09.19 -> 2018.01.06

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.01.06 with grep in /nix/store/va2g67lavq3xhp2154dlgz95p4438ccx-cmst-2018.01.06
- found 2018.01.06 in filename of file in /nix/store/va2g67lavq3xhp2154dlgz95p4438ccx-cmst-2018.01.06
---
 pkgs/tools/networking/cmst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index e0912007d95..1d9e2e1677f 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
-  version = "2017.09.19";
+  version = "2018.01.06";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
     rev = name;
-    sha256 = "14inss0mr9i4q6vfqqfxbjgpjaclp1kh60qlm5xv4cwnvi395rc7";
+    sha256 = "1a3v7z75ghziymdj2w8603ql9nfac5q224ylfsqfxcqxw4bdip4r";
   };
 
   nativeBuildInputs = [ qmake ];

From 0d961f02d234e3af3e376533b56dc4a4671d79aa Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:48:25 -0800
Subject: [PATCH 0449/2266] cni: 0.5.2 -> 0.6.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.0 with grep in /nix/store/20rzgnqnxfx21j49wr48pd4p9wb0ai5z-cni-0.6.0
- found 0.6.0 in filename of file in /nix/store/20rzgnqnxfx21j49wr48pd4p9wb0ai5z-cni-0.6.0
---
 pkgs/applications/networking/cluster/cni/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index a7205f1bc7a..3ce056c1e11 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cni-${version}";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "cni";
     rev = "v${version}";
-    sha256 = "0n2sc5xf1h0i54am80kj7imrvawddn0kxvgi65w0194dpmyrg5al";
+    sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
   };
 
   buildInputs = [ go ];

From 024220bd7f5995353275353de08d6bf34bc31124 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Mon, 18 Dec 2017 13:36:32 -0800
Subject: [PATCH 0450/2266] nixos/tomcat: add serverXml, environment files and
 log directories

* add serverXml verbatim override
* add environment file
* add log directory creation
---
 nixos/modules/services/web-servers/tomcat.nix | 57 +++++++++++++++++--
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 0b2e5c0b69d..f9a6c4f4f1e 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -40,6 +40,21 @@ in
         description = "Location where Tomcat stores configuration files, webapplications and logfiles";
       };
 
+      logDirs = mkOption {
+        default = [];
+        description = "Directories to create in baseDir/logs/";
+      };
+
+      extraConfigFiles = mkOption {
+        default = [];
+        description = "Extra configuration files to pull into the tomcat conf directory";
+      };
+
+      environment = mkOption {
+        default = "";
+        description = "File to be sourced before executing tomcat. Can be used to set environment variables";
+      };
+
       extraGroups = mkOption {
         default = [];
         example = [ "users" ];
@@ -71,6 +86,14 @@ in
         description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications";
       };
 
+      serverXml = mkOption {
+        default = "";
+        description = "
+          Verbatim server.xml configuration.
+          This is mutualyl exclusive with the virtualHosts options.
+        ";
+      };
+
       commonLibs = mkOption {
         default = [];
         description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container";
@@ -147,6 +170,8 @@ in
         # Create the base directory
         mkdir -p ${cfg.baseDir}
 
+        mkdir -p ${cfg.baseDir}
+
         # Create a symlink to the bin directory of the tomcat component
         ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
 
@@ -160,6 +185,13 @@ in
             ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
         done
 
+        ${if cfg.extraConfigFiles != [] then ''
+          for i in ${toString cfg.extraConfigFiles}
+          do
+            ln -sfn $i ${cfg.baseDir}/conf/`basename $i`
+          done
+        '' else ""}
+
         # Create subdirectory for virtual hosts
         mkdir -p ${cfg.baseDir}/virtualhosts
 
@@ -169,14 +201,24 @@ in
             -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
             ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
 
-        # Create a modified server.xml which also includes all virtual hosts
-        sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
-                     toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
-            ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
-
+        ${if cfg.serverXml != "" then ''
+          cat <<'EOF' > ${cfg.baseDir}/conf/server.xml
+          ${cfg.serverXml}EOF
+          '' else ''
+          # Create a modified server.xml which also includes all virtual hosts
+          sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
+                ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
+          ''
+        }
         # Create a logs/ directory
         mkdir -p ${cfg.baseDir}/logs
         chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
+        ${if cfg.logDirs != [] then ''
+            for i in ${toString cfg.logDirs}; do
+                mkdir -p ${cfg.baseDir}/logs/$i
+                chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i
+            done
+        '' else ""}
         ${if cfg.logPerVirtualHost then
            toString (map (h: ''
                                 mkdir -p ${cfg.baseDir}/logs/${h.name}
@@ -353,6 +395,11 @@ in
       '';
 
       script = ''
+          ${if cfg.environment != "" then ''
+              if [ -r ${cfg.environment} ]; then
+                  . ${cfg.environment}
+              fi
+          '' else ""}
           ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
       '';
 

From 196e21a1606ee024f5228d2f83d72610aa495ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Feb 2018 13:13:53 +0000
Subject: [PATCH 0451/2266] nixos/tomcat: add types + proper systemd
 integration

fixes #35443
---
 nixos/modules/services/web-servers/tomcat.nix | 341 ++++++++----------
 1 file changed, 148 insertions(+), 193 deletions(-)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index f9a6c4f4f1e..aa94e0e976c 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -19,11 +19,7 @@ in
   options = {
 
     services.tomcat = {
-
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable Apache Tomcat";
-      };
+      enable = mkEnableOption "Apache Tomcat";
 
       package = mkOption {
         type = types.package;
@@ -36,23 +32,28 @@ in
       };
 
       baseDir = mkOption {
+        type = lib.types.path;
         default = "/var/tomcat";
         description = "Location where Tomcat stores configuration files, webapplications and logfiles";
       };
 
       logDirs = mkOption {
         default = [];
+        type = types.listOf types.path;
         description = "Directories to create in baseDir/logs/";
       };
 
       extraConfigFiles = mkOption {
         default = [];
+        type = types.listOf types.path;
         description = "Extra configuration files to pull into the tomcat conf directory";
       };
 
-      environment = mkOption {
-        default = "";
-        description = "File to be sourced before executing tomcat. Can be used to set environment variables";
+      extraEnvironment = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "ENVIRONMENT=production" ];
+        description = "Environment Variables to pass to the tomcat service";
       };
 
       extraGroups = mkOption {
@@ -62,39 +63,46 @@ in
       };
 
       user = mkOption {
+        type = types.str;
         default = "tomcat";
         description = "User account under which Apache Tomcat runs.";
       };
 
       group = mkOption {
+        type = types.str;
         default = "tomcat";
         description = "Group account under which Apache Tomcat runs.";
       };
 
       javaOpts = mkOption {
+        type = types.either (types.listOf types.str) types.str;
         default = "";
         description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
       };
 
       catalinaOpts = mkOption {
+        type = types.either (types.listOf types.str) types.str;
         default = "";
         description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
       };
 
       sharedLibs = mkOption {
+        type = types.listOf types.str;
         default = [];
         description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications";
       };
 
       serverXml = mkOption {
+        type = types.lines;
         default = "";
         description = "
           Verbatim server.xml configuration.
-          This is mutualyl exclusive with the virtualHosts options.
+          This is mutually exclusive with the virtualHosts options.
         ";
       };
 
       commonLibs = mkOption {
+        type = types.listOf types.str;
         default = [];
         description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container";
       };
@@ -107,11 +115,21 @@ in
       };
 
       virtualHosts = mkOption {
+        type = types.listOf (types.submodule {
+          options = {
+            name = mkOption {
+              type = types.listOf types.str;
+              description = "name of the virtualhost";
+              default = [];
+            };
+          };
+        });
         default = [];
         description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host";
       };
 
       logPerVirtualHost = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable logging per virtual host.";
       };
@@ -127,11 +145,13 @@ in
 
         enable = mkOption {
           default = false;
+          type = types.bool;
           description = "Whether to enable an Apache Axis2 container";
         };
 
         services = mkOption {
           default = [];
+          type = types.listOf types.str;
           description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2";
         };
 
@@ -163,149 +183,104 @@ in
       description = "Apache Tomcat server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      serviceConfig.Type = "oneshot";
-      serviceConfig.RemainAfterExit = true;
 
       preStart = ''
         # Create the base directory
-        mkdir -p ${cfg.baseDir}
-
-        mkdir -p ${cfg.baseDir}
+        mkdir -p \
+          ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work}
+        chown ${cfg.user}:${cfg.group} \
+          ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work}
 
         # Create a symlink to the bin directory of the tomcat component
         ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
 
-        # Create a conf/ directory
-        mkdir -p ${cfg.baseDir}/conf
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
-
         # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
-        for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
-        do
-            ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+        for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml); do
+          ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
         done
 
         ${if cfg.extraConfigFiles != [] then ''
-          for i in ${toString cfg.extraConfigFiles}
-          do
+          for i in ${toString cfg.extraConfigFiles}; do
             ln -sfn $i ${cfg.baseDir}/conf/`basename $i`
           done
         '' else ""}
 
-        # Create subdirectory for virtual hosts
-        mkdir -p ${cfg.baseDir}/virtualhosts
-
         # Create a modified catalina.properties file
         # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
         sed -e 's|''${catalina.home}|''${catalina.base}|g' \
-            -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
-            ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
+          -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
+          ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
 
         ${if cfg.serverXml != "" then ''
-          cat <<'EOF' > ${cfg.baseDir}/conf/server.xml
-          ${cfg.serverXml}EOF
+          cp -f ${pkgs.writeTextDir "server.xml" cfg.serverXml}/* ${cfg.baseDir}/conf/
           '' else ''
           # Create a modified server.xml which also includes all virtual hosts
           sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
                 ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
           ''
         }
-        # Create a logs/ directory
-        mkdir -p ${cfg.baseDir}/logs
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
-        ${if cfg.logDirs != [] then ''
-            for i in ${toString cfg.logDirs}; do
-                mkdir -p ${cfg.baseDir}/logs/$i
-                chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i
-            done
-        '' else ""}
-        ${if cfg.logPerVirtualHost then
-           toString (map (h: ''
-                                mkdir -p ${cfg.baseDir}/logs/${h.name}
-                                chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
-                             '') cfg.virtualHosts) else ''''}
-
-        # Create a temp/ directory
-        mkdir -p ${cfg.baseDir}/temp
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
-
-        # Create a lib/ directory
-        mkdir -p ${cfg.baseDir}/lib
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
-
-        # Create a shared/lib directory
-        mkdir -p ${cfg.baseDir}/shared/lib
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
-
-        # Create a webapps/ directory
-        mkdir -p ${cfg.baseDir}/webapps
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
+        ${optionalString (cfg.logDirs != []) ''
+          for i in ${toString cfg.logDirs}; do
+            mkdir -p ${cfg.baseDir}/logs/$i
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i
+          done
+        ''}
+        ${optionalString cfg.logPerVirtualHost (toString (map (h: ''
+          mkdir -p ${cfg.baseDir}/logs/${h.name}
+          chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
+        '') cfg.virtualHosts))}
 
         # Symlink all the given common libs files or paths into the lib/ directory
-        for i in ${tomcat} ${toString cfg.commonLibs}
-        do
-            if [ -f $i ]
-            then
-                # If the given web application is a file, symlink it into the common/lib/ directory
-                ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
-            elif [ -d $i ]
-            then
-                # If the given web application is a directory, then iterate over the files
-                # in the special purpose directories and symlink them into the tomcat tree
+        for i in ${tomcat} ${toString cfg.commonLibs}; do
+          if [ -f $i ]; then
+            # If the given web application is a file, symlink it into the common/lib/ directory
+            ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
+          elif [ -d $i ]; then
+            # If the given web application is a directory, then iterate over the files
+            # in the special purpose directories and symlink them into the tomcat tree
 
-                for j in $i/lib/*
-                do
-                    ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
-                done
-            fi
+            for j in $i/lib/*; do
+              ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
+            done
+          fi
         done
 
         # Symlink all the given shared libs files or paths into the shared/lib/ directory
-        for i in ${toString cfg.sharedLibs}
-        do
-            if [ -f $i ]
-            then
-                # If the given web application is a file, symlink it into the common/lib/ directory
-                ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
-            elif [ -d $i ]
-            then
-                # If the given web application is a directory, then iterate over the files
-                # in the special purpose directories and symlink them into the tomcat tree
+        for i in ${toString cfg.sharedLibs}; do
+          if [ -f $i ]; then
+            # If the given web application is a file, symlink it into the common/lib/ directory
+            ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
+          elif [ -d $i ]; then
+            # If the given web application is a directory, then iterate over the files
+            # in the special purpose directories and symlink them into the tomcat tree
 
-                for j in $i/shared/lib/*
-                do
-                    ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
-                done
-            fi
+            for j in $i/shared/lib/*; do
+              ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
+            done
+          fi
         done
 
         # Symlink all the given web applications files or paths into the webapps/ directory
-        for i in ${toString cfg.webapps}
-        do
-            if [ -f $i ]
-            then
-                # If the given web application is a file, symlink it into the webapps/ directory
-                ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
-            elif [ -d $i ]
-            then
-                # If the given web application is a directory, then iterate over the files
-                # in the special purpose directories and symlink them into the tomcat tree
+        for i in ${toString cfg.webapps}; do
+          if [ -f $i ]; then
+            # If the given web application is a file, symlink it into the webapps/ directory
+            ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
+          elif [ -d $i ]; then
+            # If the given web application is a directory, then iterate over the files
+            # in the special purpose directories and symlink them into the tomcat tree
 
-                for j in $i/webapps/*
-                do
-                    ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
-                done
+            for j in $i/webapps/*; do
+              ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
+            done
 
-                # Also symlink the configuration files if they are included
-                if [ -d $i/conf/Catalina ]
-                then
-                    for j in $i/conf/Catalina/*
-                    do
-                        mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
-                        ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
-                    done
-                fi
+            # Also symlink the configuration files if they are included
+            if [ -d $i/conf/Catalina ]; then
+              for j in $i/conf/Catalina/*; do
+                mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
+                ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+              done
             fi
+          fi
         done
 
         ${toString (map (virtualHost: ''
@@ -317,99 +292,79 @@ in
 
           # Symlink all the given web applications files or paths into the webapps/ directory
           # of this virtual host
-          for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
-          do
-              if [ -f $i ]
-              then
-                  # If the given web application is a file, symlink it into the webapps/ directory
-                  ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
-              elif [ -d $i ]
-              then
-                  # If the given web application is a directory, then iterate over the files
-                  # in the special purpose directories and symlink them into the tomcat tree
+          for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"; do
+            if [ -f $i ]; then
+              # If the given web application is a file, symlink it into the webapps/ directory
+              ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
+            elif [ -d $i ]; then
+              # If the given web application is a directory, then iterate over the files
+              # in the special purpose directories and symlink them into the tomcat tree
 
-                  for j in $i/webapps/*
-                  do
-                      ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
-                  done
+              for j in $i/webapps/*; do
+                ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
+              done
 
-                  # Also symlink the configuration files if they are included
-                  if [ -d $i/conf/Catalina ]
-                  then
-                      for j in $i/conf/Catalina/*
-                      do
-                          mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
-                          ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
-                      done
-                  fi
+              # Also symlink the configuration files if they are included
+              if [ -d $i/conf/Catalina ]; then
+                for j in $i/conf/Catalina/*; do
+                  mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
+                  ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
+                done
               fi
+            fi
           done
+        '') cfg.virtualHosts)}
 
-          ''
-        ) cfg.virtualHosts) }
+        ${optionalString cfg.axis2.enable ''
+          # Copy the Axis2 web application
+          cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
 
-        # Create a work/ directory
-        mkdir -p ${cfg.baseDir}/work
-        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
+          # Turn off addressing, which causes many errors
+          sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
 
-        ${if cfg.axis2.enable then
-            ''
-            # Copy the Axis2 web application
-            cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
+          # Modify permissions on the Axis2 application
+          chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
 
-            # Turn off addressing, which causes many errors
-            sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
+          # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
+          for i in ${toString cfg.axis2.services}; do
+            if [ -f $i ]; then
+              # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
+              ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
+            elif [ -d $i ]; then
+              # If the given web application is a directory, then iterate over the files
+              # in the special purpose directories and symlink them into the tomcat tree
 
-            # Modify permissions on the Axis2 application
-            chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
+              for j in $i/webapps/axis2/WEB-INF/services/*; do
+                ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
+              done
 
-            # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
-            for i in ${toString cfg.axis2.services}
-            do
-                if [ -f $i ]
-                then
-                    # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
-                    ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
-                elif [ -d $i ]
-                then
-                    # If the given web application is a directory, then iterate over the files
-                    # in the special purpose directories and symlink them into the tomcat tree
-
-                    for j in $i/webapps/axis2/WEB-INF/services/*
-                    do
-                        ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
-                    done
-
-                    # Also symlink the configuration files if they are included
-                    if [ -d $i/conf/Catalina ]
-                    then
-                        for j in $i/conf/Catalina/*
-                        do
-                            ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
-                        done
-                    fi
-                fi
-            done
-            ''
-        else ""}
-      '';
-
-      script = ''
-          ${if cfg.environment != "" then ''
-              if [ -r ${cfg.environment} ]; then
-                  . ${cfg.environment}
+              # Also symlink the configuration files if they are included
+              if [ -d $i/conf/Catalina ]; then
+                for j in $i/conf/Catalina/*; do
+                  ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+                done
               fi
-          '' else ""}
-          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
-      '';
-
-      preStop = ''
-        echo "Stopping tomcat..."
-        CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
+            fi
+          done
+        ''}
       '';
 
+      serviceConfig = {
+        Type = "forking";
+        PermissionsStartOnly = true;
+        PIDFile="/run/tomcat/tomcat.pid";
+        RuntimeDirectory = "tomcat";
+        User = cfg.user;
+        Environment=[
+          "CATALINA_BASE=${cfg.baseDir}"
+          "CATALINA_PID=/run/tomcat/tomcat.pid"
+          "JAVA_HOME='${cfg.jdk}'"
+          "JAVA_OPTS='${builtins.toString cfg.javaOpts}'"
+          "CATALINA_OPTS='${builtins.toString cfg.catalinaOpts}'"
+        ] ++ cfg.extraEnvironment;
+        ExecStart = "${tomcat}/bin/startup.sh";
+        ExecStop = "${tomcat}/bin/shutdown.sh";
+      };
     };
-
   };
-
 }

From 62190a66aec0766b96af62c697d06c7021939a55 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 01:20:28 -0800
Subject: [PATCH 0452/2266] cppcheck: 1.80 -> 1.82

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/misra.py -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/misra.py --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/misra.py help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/naming.py -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/naming.py --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/naming.py help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/y2038.py -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/y2038.py --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/y2038.py help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/cppcheck -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/cppcheck --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/cppcheck --version` and found version 1.82
- found 1.82 with grep in /nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82
- found 1.82 in filename of file in /nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82
---
 pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 97bd0d6e3df..02f44f4bf70 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.80";
+  version = "1.82";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1yx06yhkqlv9849ns7p97mj09gm9j7xc51q7yvzkk8ldvx4d4h88";
+    sha256 = "0kk9injrxbv4mmmjswrh1kidal6l0sdzbp40kv8vwf5aiv8jjaz0";
   };
 
   buildInputs = [ pcre ];

From 752736b34836eb58b79bed3400cd74ebb57e754d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 01:39:13 -0800
Subject: [PATCH 0453/2266] csound: 6.09.0 -> 6.10.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csanalyze -h` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csanalyze --help` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csanalyze help` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csb64enc help` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/makecsd help` got 0 exit code
- found 6.10.0 with grep in /nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0
- found 6.10.0 in filename of file in /nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0
---
 pkgs/applications/audio/csound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index dc0c8eabcac..191074eba27 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   name = "csound-${version}";
-  version = "6.09.0";
+  version = "6.10.0";
 
   enableParallelBuilding = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih";
+    sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

From 1e2afe8b19c43b909cd861cd98a1b82694ca16a4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 01:55:09 -0800
Subject: [PATCH 0454/2266] dateutils: 0.4.2 -> 0.4.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone --version` and found version 0.4.3
- found 0.4.3 with grep in /nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3
- found 0.4.3 in filename of file in /nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3
---
 pkgs/tools/misc/dateutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 86a8d3f234b..7c689211f6e 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.3";
   name = "dateutils-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
-    sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc";
+    sha256 = "06lgqp2cyvmh09j04lm3g6ml7yxn1x92rjzgnwzq4my95c37kmdh";
   };
 
   meta = with stdenv.lib; {

From f18054f8ad66da789e9a5eb8ae0808df5d111324 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:11:02 -0800
Subject: [PATCH 0455/2266] discount: 2.2.2 -> 2.2.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown help` got 0 exit code
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown -V` and found version 2.2.3
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown --version` and found version 2.2.3
- found 2.2.3 with grep in /nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3
- found 2.2.3 in filename of file in /nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3
---
 pkgs/tools/text/discount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index d3dcb662c49..8a1de29b0d9 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "2.2.2";
+  version = "2.2.3";
   name = "discount-${version}";
 
   src = fetchurl {
     url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
-    sha256 = "0r4gjyk1ngx47zhb25q0gkjm3bz2m5x8ngrk6rim3y1y3rricygc";
+    sha256 = "17797xiaq0kk152pj4rvd9grg4i518x3glnwg1lgl8rry3dbrzx8";
   };
 
   patches = ./fix-configure-path.patch;

From 48608f3e16a03f8ddf7597c2ae2c8c012ad198f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Thu, 8 Mar 2018 02:13:04 -0800
Subject: [PATCH 0456/2266] pythonPackages.sphinx-navtree: init at 0.3.0
 (#36442)

---
 .../python-modules/sphinx-navtree/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx-navtree/default.nix

diff --git a/pkgs/development/python-modules/sphinx-navtree/default.nix b/pkgs/development/python-modules/sphinx-navtree/default.nix
new file mode 100644
index 00000000000..02e5711e888
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-navtree/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchPypi, buildPythonPackage, sphinx }:
+
+buildPythonPackage rec {
+  version = "0.3.0";
+  pname = "sphinx-navtree";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nqcsbqwr8ihk1fv534i0naag1qw04f7ibcgl2j8csvkh8q90b4p";
+  };
+
+  propagatedBuildInputs = [ sphinx ];
+
+  meta = {
+    description = "Navigation tree customization for Sphinx";
+    homepage = "https://github.com/bintoro/sphinx-navtree";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f674e6c1755..76fbeb202dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16326,6 +16326,8 @@ in {
     };
   });
 
+  sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {};
+
   sphinxcontrib_newsfeed = buildPythonPackage (rec {
     name = "sphinxcontrib-newsfeed-${version}";
     version = "0.1.4";

From c4605f23874d31b4bfc11194bc3e9d91a2efee02 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:26:41 -0800
Subject: [PATCH 0457/2266] doit: 0.30.3 -> 0.31.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped --help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped --version` and found version 0.31.0
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit --help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit --version` and found version 0.31.0
- found 0.31.0 with grep in /nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0
- found 0.31.0 in filename of file in /nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0
---
 pkgs/development/tools/build-managers/doit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix
index 200ec6429a7..aeeb4dbd779 100644
--- a/pkgs/development/tools/build-managers/doit/default.nix
+++ b/pkgs/development/tools/build-managers/doit/default.nix
@@ -3,14 +3,14 @@
 let
 
   name = "doit";
-  version = "0.30.3";
+  version = "0.31.0";
 
 in python3Packages.buildPythonApplication {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz";
-    sha256 = "1fcsslc3mc4bszq5xdqbxv37720s1s31d6pbfwc2iyxk1x2wi219";
+    sha256 = "0v1yr04bfqnz3sp261np3zhf0y1b3a1daxc83iq308lscf39fdgx";
   };
 
   buildInputs = with python3Packages; [ mock pytest ];

From 81776365f460730906835057cc7f72dfb594f5a3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 8 Mar 2018 11:42:30 +0100
Subject: [PATCH 0458/2266] rapidjson: fix gcc7 compile error

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

diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
index 5e9a11d4251..8e6b3b44491 100644
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ b/pkgs/development/libraries/rapidjson/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig cmake ];
 
+  # detected by gcc7
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ];
+
   meta = with lib; {
     description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
     homepage = "http://rapidjson.org/";

From 54adc7a8244c0e6726ea52f15902521298ba7049 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:44:00 -0800
Subject: [PATCH 0459/2266] drumstick: 1.1.0 -> 1.1.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome --help` and found version 1.1.1
- found 1.1.1 with grep in /nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1
- found 1.1.1 in filename of file in /nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1
---
 pkgs/development/libraries/drumstick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index a46c6bab647..ab25a651844 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumstick-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
-    sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df";
+    sha256 = "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn";
   };
 
   outputs = [ "out" "dev" "man" ];

From 691c823a2ed1f74b8360063746cd4edac5dfe3d8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:59:55 -0800
Subject: [PATCH 0460/2266] easyloggingpp: 9.96.0 -> 9.96.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 9.96.1 with grep in /nix/store/ha2fl2l2j3p9lcn6scxn1n50f1vsb5k6-easyloggingpp-9.96.1
- found 9.96.1 in filename of file in /nix/store/ha2fl2l2j3p9lcn6scxn1n50f1vsb5k6-easyloggingpp-9.96.1
---
 pkgs/development/libraries/easyloggingpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 80c3f7b100e..4aa1f279886 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -4,12 +4,12 @@
 { stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
   name = "easyloggingpp-${version}";
-  version = "9.96.0";
+  version = "9.96.1";
   src = fetchFromGitHub {
     owner = "muflihun";
     repo = "easyloggingpp";
     rev = "v${version}";
-    sha256 = "134arh13rksfsxa80h6xw104458ihzp1mpblz5sprx5gxkq7yqfv";
+    sha256 = "1x5wwm62l1231sgxfwx8mj7fc8452j3f509jyxa9wd2krkpvqxmy";
   };
 
   nativeBuildInputs = [cmake];

From 2e3077c9074b95204d5191718f1394e63ede0982 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 8 Mar 2018 11:21:04 +0000
Subject: [PATCH 0461/2266] SDL: propagate X11 libs even when building
 statically against them on Darwin

Packages like SDL_image, SDL_mixer, SDL_net, SDL_ttf depend on this.

This reverts a piece of 19130ebc5d05cc7720335c92d68a4fd1faf28dc0.
---
 pkgs/development/libraries/SDL/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 0b853aad8ef..534f31ad1f4 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ ]
-    ++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ]
+    ++ optionals x11Support [ libXext libICE libXrandr ]
     ++ optional stdenv.isLinux libcap
     ++ optionals openglSupport [ libGL libGLU ]
     ++ optional alsaSupport alsaLib
@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isDarwin Cocoa;
 
   buildInputs = [ libiconv ]
-    ++ optionals (x11Support && stdenv.isDarwin) [ libXext libICE libXrandr ]
     ++ optional (!hostPlatform.isMinGW) audiofile
     ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 

From bc3ec20c29f1f075e0ae14c9f2d3ef16bee0050a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 03:42:55 -0800
Subject: [PATCH 0462/2266] emby: 3.2.70.0 -> 3.3.0.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.0.0 with grep in /nix/store/nnp01d2wwym58qqvw6kigskycdqch47x-emby-3.3.0.0
---
 pkgs/servers/emby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 12c475bfc28..eeb3d39fa1d 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.70.0";
+  version = "3.3.0.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "051mbzh1igcbda43n14aijbvhhh98rqw8i13f06xqsm67afrjjcv";
+    sha256 = "14nnrlwx8bghiz72lspxahwadhvnf8vs3bqbffnd5nrrv4shijhm";
   };
 
   buildInputs = with pkgs; [

From fc1ae833334e500ee0367e312884c1b92bd29519 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 8 Mar 2018 13:02:13 +0100
Subject: [PATCH 0463/2266] xtreemfs: build with boost165

doesn't build with boost166 due to API changes
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83424eabba..6540e949e5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5582,7 +5582,9 @@ with pkgs;
 
   xsv = callPackage ../tools/text/xsv { };
 
-  xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
+  xtreemfs = callPackage ../tools/filesystems/xtreemfs {
+    boost = boost165;
+  };
 
   xurls = callPackage ../tools/text/xurls {};
 

From b746e2f148e6efaf5408799bfcfceac1779af805 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 04:03:19 -0800
Subject: [PATCH 0464/2266] fldigi: 3.23.15 -> 4.0.16

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/vxx260nm7dk471pgh1090pp9xlm53hbs-fldigi-4.0.16/bin/fldigi --help` got 0 exit code
- ran `/nix/store/vxx260nm7dk471pgh1090pp9xlm53hbs-fldigi-4.0.16/bin/fldigi --version` and found version 4.0.16
- ran `/nix/store/vxx260nm7dk471pgh1090pp9xlm53hbs-fldigi-4.0.16/bin/flarq --help` got 0 exit code
- found 4.0.16 with grep in /nix/store/vxx260nm7dk471pgh1090pp9xlm53hbs-fldigi-4.0.16
- found 4.0.16 in filename of file in /nix/store/vxx260nm7dk471pgh1090pp9xlm53hbs-fldigi-4.0.16
---
 pkgs/applications/audio/fldigi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 545e7c5047a..246e02c53c7 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -2,13 +2,13 @@
   libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
-  version = "3.23.15";
+  version = "4.0.16";
   pname = "fldigi";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m";
+    sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7";
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio

From 0450c596f061612ad3f4fbb0e88684d0bffd887e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Wed, 7 Mar 2018 20:14:58 +0100
Subject: [PATCH 0465/2266] pythonPackages.latexcodec: init at 1.0.5

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

diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix
new file mode 100644
index 00000000000..3b639ee2afb
--- /dev/null
+++ b/pkgs/development/python-modules/latexcodec/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, six }:
+
+buildPythonPackage rec {
+  pname = "latexcodec";
+  version = "1.0.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = {
+    homepage = "https://github.com/mcmtroffaes/latexcodec";
+    description = "Lexer and codec to work with LaTeX code in Python";
+    license = stdenv.lib.licenses.mit;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76fbeb202dc..673c88761d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5297,6 +5297,8 @@ in {
     };
   };
 
+  latexcodec = callPackage ../development/python-modules/latexcodec {};
+
   libsexy = callPackage ../development/python-modules/libsexy {
     libsexy = pkgs.libsexy;
   };

From 5210122969396b589cbc3f5a2746a0ea185f45a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Wed, 7 Mar 2018 20:18:49 +0100
Subject: [PATCH 0466/2266] pythonPackages.pybtex: init at 0.21

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

diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix
new file mode 100644
index 00000000000..20689255435
--- /dev/null
+++ b/pkgs/development/python-modules/pybtex/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
+
+buildPythonPackage rec {
+  version = "0.21";
+  pname = "pybtex";
+
+  doCheck = false;
+  propagatedBuildInputs = [ latexcodec pyyaml ];
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg";
+  };
+
+  meta = {
+    homepage = "https://pybtex.org/";
+    description = "A BibTeX-compatible bibliography processor written in Python";
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 673c88761d3..cb04a555a89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5968,6 +5968,8 @@ in {
     };
   };
 
+  pybtex = callPackage ../development/python-modules/pybtex {};
+
   pycallgraph = buildPythonPackage rec {
     name = "pycallgraph-${version}";
     version = "1.0.1";

From e8a588894e0693fd00b3fd7ce87fa4de1167cfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Wed, 7 Mar 2018 20:34:17 +0100
Subject: [PATCH 0467/2266] pythonPackages.pybtex-docutils: init at 0.2.1

---
 .../pybtex-docutils/default.nix               | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/pybtex-docutils/default.nix

diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix
new file mode 100644
index 00000000000..45d907df223
--- /dev/null
+++ b/pkgs/development/python-modules/pybtex-docutils/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
+
+buildPythonPackage rec {
+  version = "0.2.1";
+  pname = "pybtex-docutils";
+
+  doCheck = false;
+  buildInputs = [ docutils pybtex six ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dqk4lplij7rbqqi4dbpw3wzr4wj08ysswvdibls6s0x3ij7bc74";
+  };
+
+  meta = {
+    description = "A docutils backend for pybtex";
+    homepage = "https://github.com/mcmtroffaes/pybtex-docutils";
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb04a555a89..110f2873a6b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5970,6 +5970,8 @@ in {
 
   pybtex = callPackage ../development/python-modules/pybtex {};
 
+  pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils {};
+
   pycallgraph = buildPythonPackage rec {
     name = "pycallgraph-${version}";
     version = "1.0.1";

From 4b0717b2fa1826998b3c33987a79542c376020b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Wed, 7 Mar 2018 20:37:33 +0100
Subject: [PATCH 0468/2266] pythonPackages.oset: init at 0.1.3

---
 .../python-modules/oset/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/oset/default.nix

diff --git a/pkgs/development/python-modules/oset/default.nix b/pkgs/development/python-modules/oset/default.nix
new file mode 100644
index 00000000000..aa435b403e8
--- /dev/null
+++ b/pkgs/development/python-modules/oset/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "oset";
+  version = "0.1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "017rr1m72s2fh9bmz5vrvc5mshczgzisi5894v9zkvvfr7gdf7sc";
+  };
+
+  doCheck = false;
+
+  meta = {
+    description = "Ordered set";
+    license = stdenv.lib.licenses.psfl;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 110f2873a6b..5ad6730424c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5725,6 +5725,7 @@ in {
 
   odfpy = callPackage ../development/python-modules/odfpy { };
 
+  oset = callPackage ../development/python-modules/oset { };
 
   pamela = buildPythonPackage rec {
     name = "pamela-${version}";

From 073e635f67d16658d88ec95505d068ffe09d7971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Wed, 7 Mar 2018 20:40:54 +0100
Subject: [PATCH 0469/2266] pythonPackages.sphinxcontrib-bibtex: init at 0.3.6

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

diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
new file mode 100644
index 00000000000..4911c982cd0
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, oset, pybtex, pybtex-docutils, sphinx
+}:
+
+buildPythonPackage rec {
+  version = "0.3.6";
+  pname = "sphinxcontrib-bibtex";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mfl3k6axq6rzqwq62fj8y9gabim2zcvydjpqmjj27f8v1qw0kpc";
+  };
+
+  propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
+
+  meta = {
+    description = "A Sphinx extension for BibTeX style citations";
+    homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex";
+    license = stdenv.lib.licenses.bsd2;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ad6730424c..aa741766315 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16271,6 +16271,8 @@ in {
 
   sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };
 
+  sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {};
+
   sphinxcontrib-blockdiag = buildPythonPackage (rec {
     name = "${pname}-${version}";
     pname = "sphinxcontrib-blockdiag";

From 6e2345c81277def1d2553425980808a4497add3b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 04:20:26 -0800
Subject: [PATCH 0470/2266] focuswriter: 1.6.8 -> 1.6.10

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.6.10 with grep in /nix/store/xj71q5kp9k5m2nsfydjhjra8axf3kdj8-focuswriter-1.6.10
- found 1.6.10 in filename of file in /nix/store/xj71q5kp9k5m2nsfydjhjra8axf3kdj8-focuswriter-1.6.10
---
 pkgs/applications/editors/focuswriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 4964de13986..7be55b873bc 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.6.8";
+  version = "1.6.10";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "1d2q99xa7dhdpqkipapzi1r1mvynf70s7sgdczd59kn0d8sr3map";
+    sha256 = "0hrbycy5lapdkaa2xm90j45sgsiqdnlk9wry41kxxpdln9msabxs";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From cedffe1677faeea9a2f78ac6841275032425c2b9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 04:57:54 -0800
Subject: [PATCH 0471/2266] fping: 3.16 -> 4.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0 with grep in /nix/store/mcwq9l7zxi30ksdmlfj5vlcw98dv08ny-fping-4.0
- found 4.0 in filename of file in /nix/store/mcwq9l7zxi30ksdmlfj5vlcw98dv08ny-fping-4.0
---
 pkgs/tools/networking/fping/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 8cdda4e35e3..b76b32ec4c8 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.16";
+  name = "fping-4.0";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54";
+    sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7";
   };
 
   configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];

From 300e272e021e1c3cae868dbc0fd1a7f69b7197d9 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@geerds.org>
Date: Thu, 8 Mar 2018 14:12:09 +0100
Subject: [PATCH 0472/2266] maintainer-list: Change my email address

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 134ec56788e..12cbb38a24f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1662,7 +1662,7 @@
     name = "Johannes Frankenau";
   };
   jgeerds = {
-    email = "jascha@jgeerds.name";
+    email = "jascha@geerds.org";
     github = "jgeerds";
     name = "Jascha Geerds";
   };

From 561a90f6f3b719f413133a918e26db0f7020d85b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 05:21:39 -0800
Subject: [PATCH 0473/2266] freeswitch: 1.6.15 -> 1.6.19

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/freeswitch -h` got 0 exit code
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -h` got 0 exit code
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli --help` got 0 exit code
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -V` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -v` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli --version` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -h` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli --help` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fsxs --help` got 0 exit code
- found 1.6.19 with grep in /nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19
- found 1.6.19 in filename of file in /nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19
---
 pkgs/servers/sip/freeswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 9a1ea5b5580..559af3bdbef 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -3,11 +3,11 @@
 , ldns, libedit, yasm, which, lua, libopus, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.6.15";
+  name = "freeswitch-1.6.19";
 
   src = fetchurl {
     url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
-    sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld";
+    sha256 = "019n16yyzk9yp6h7iwsg30h62zj5vqvigr5cl8pjik4106xzcjyr";
   };
   postPatch = ''
     patchShebangs     libs/libvpx/build/make/rtcd.pl

From 6d7b419706373f443f2496ad373f33e032dafc15 Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Thu, 8 Mar 2018 14:30:14 +0100
Subject: [PATCH 0474/2266] unp: init at 2.0-pre7

---
 pkgs/tools/archivers/unp/default.nix | 39 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/archivers/unp/default.nix

diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
new file mode 100644
index 00000000000..7583663ebf0
--- /dev/null
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
+
+stdenv.mkDerivation rec {
+  name = "unp-${version}";
+  version = "2.0-pre7";
+
+  runtime_bins =  [ file unrar unzip gzip ] ++ extraBackends;
+  buildInputs = [ perl makeWrapper ] ++ runtime_bins;
+
+  src = fetchurl {
+    # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";
+    url = "mirror://debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";
+    sha256 = "09w2sy7ivmylxf8blf0ywxicvb4pbl0xhrlbb3i9x9d56ll6ybbw";
+    name = "unp_2.0_pre7+nmu1.tar.bz2";
+  };
+
+  configurePhase = "true";
+  buildPhase = "true";
+  installPhase = ''
+  mkdir -p $out/bin
+  mkdir -p $out/share/man
+  cp unp $out/bin/
+  cp ucat $out/bin/
+  cp debian/unp.1 $out/share/man
+
+  wrapProgram $out/bin/unp \
+    --prefix PATH : ${lib.makeBinPath runtime_bins}
+  wrapProgram $out/bin/ucat \
+    --prefix PATH : ${lib.makeBinPath runtime_bins}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Command line tool for unpacking archives easily";
+    homepage = https://packages.qa.debian.org/u/unp.html;
+    license = with licenses; [ gpl2 ];
+    maintainers = [ maintainers.timor ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83424eabba..46ee4bae443 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5408,6 +5408,8 @@ with pkgs;
 
   unarj = callPackage ../tools/archivers/unarj { };
 
+  unp = callPackage ../tools/archivers/unp { };
+
   unshield = callPackage ../tools/archivers/unshield { };
 
   unzip = callPackage ../tools/archivers/unzip { };

From 6fcf691545896b278cc8e6961af5db9331656f8c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 8 Mar 2018 08:36:35 -0500
Subject: [PATCH 0475/2266] lib-tests: Don't depend on /bin/sh

https://hydra.nixos.org/build/70748333
---
 lib/tests/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index a6184041682..9904a25ecc4 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -21,7 +21,7 @@ pkgs.stdenv.mkDerivation {
     nix-store --init
 
     cd ${pkgs.path}/lib/tests
-    ./modules.sh
+    bash ./modules.sh
 
     [[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]]
 

From 4ea383e1c264d94a69ee1e8232245b56ca6117e9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 05:42:29 -0800
Subject: [PATCH 0476/2266] gdcm: 2.6.4 -> 2.8.4

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcm2vtk -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcm2vtk --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcm2vtk -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcm2vtk --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcm2vtk -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcm2vtk --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmviewer help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmdump --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmraw -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmraw --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmraw -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmraw --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmraw -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmraw --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscanner -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscanner --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscanner -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscanner --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscanner -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscanner --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmanon -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmanon --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmanon -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmanon --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmanon -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmanon --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmgendir -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmgendir --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmgendir -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmgendir --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmgendir -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmgendir --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmimg -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmimg --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmimg -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmimg --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmimg -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmimg --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmconv -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmconv --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmconv -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmconv --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmconv -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmconv --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmtar -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmtar --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmtar -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmtar --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmtar -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmtar --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcminfo --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscu -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscu --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscu -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscu --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscu -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmscu --help` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmpap3 -h` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmpap3 --help` got 0 exit code
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmpap3 -v` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmpap3 --version` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmpap3 -h` and found version 2.8.4
- ran `/nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4/bin/gdcmpap3 --help` and found version 2.8.4
- found 2.8.4 with grep in /nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4
- found 2.8.4 in filename of file in /nix/store/bqj3bkqyb9cz4lqffcbmd0k31lvx2wya-gdcm-2.8.4
---
 pkgs/development/libraries/gdcm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 2d7e26b9e1a..6da29ef2a3c 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, vtk }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.4";
+  version = "2.8.4";
   name = "gdcm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
-    sha256 = "14bysjdldq7xb9k1ayskxijm08dy2n45v9bg379dqrcz1q5xq5mi";
+    sha256 = "1wjs9sfdi1v4bm750xl26mik5zyvmlk88jy2zf2jsm9y3qmcyfff";
   };
 
   dontUseCmakeBuildDir = true;

From 8a6f05331783d7592e135ffec813b4704a6360c4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 8 Mar 2018 02:15:41 +0000
Subject: [PATCH 0477/2266] docbook2x: add perlPackages.XMLSAXBase to
 dependencies

---
 pkgs/tools/typesetting/docbook2x/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index 37cd6a2e50b..9c802a1187a 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, texinfo, perl
-, XMLSAX, XMLParser, XMLNamespaceSupport
+, XMLSAX, XMLSAXBase, XMLParser, XMLNamespaceSupport
 , groff, libxml2, libxslt, gnused, libiconv, opensp
 , docbook_xml_dtd_43
 , makeWrapper }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       # XXX: We work around the fact that `wrapProgram' doesn't support
       # spaces below by inserting escaped backslashes.
       wrapProgram $out/bin/$i --prefix PERL5LIB :			\
-        "${XMLSAX}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \
+        "${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \
 	--prefix PERL5LIB :						\
 	"${XMLNamespaceSupport}/lib/perl5/site_perl"			\
 	--prefix XML_CATALOG_FILES "\ "					\
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9b4fcdf412..63f9c1686a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1928,7 +1928,7 @@ with pkgs;
   doas = callPackage ../tools/security/doas { };
 
   docbook2x = callPackage ../tools/typesetting/docbook2x {
-    inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
+    inherit (perlPackages) XMLSAX XMLSAXBase XMLParser XMLNamespaceSupport;
   };
 
   docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };

From b7f1aa391c9f617809940e88191f6832e01d092c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 8 Mar 2018 14:07:03 +0000
Subject: [PATCH 0478/2266] XML-SAX: 0.96 -> 1.00

dependencies:
XML-SAX-Base: 1.08 -> 1.09
constant: cleanup
XML-NamespaceSupport: 1.11 -> 1.12
Test-Simple: 1.302120 -> 1.302125
ExtUtils-MakeMaker: 6.98 -> 7.32
---
 pkgs/top-level/perl-packages.nix | 45 +++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a92ee601ff4..6a697328051 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2482,9 +2482,11 @@ let self = _self // overrides; _self = with self; {
   constant = buildPerlPackage rec {
     name = "constant-1.33";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/constant-1.33.tar.gz;
       sha256 = "015my616h5l2fswh52x4dp3n007gk5lax83ww9q6cmzb610mv5kr";
     };
+    propagatedBuildInputs = [ TestSimple13 ];
+    buildInputs = [ ExtUtilsMakeMaker ];
   };
 
   constantboolean = buildPerlPackage {
@@ -5287,13 +5289,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsMakeMaker = buildPerlPackage {
-    name = "ExtUtils-MakeMaker-6.98";
+    name = "ExtUtils-MakeMaker-7.32";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.98.tar.gz;
-      sha256 = "2eb023189e5fa6b9dcc66858b1fde953d1f1b86f971ec5ab42dd36c172da63ef";
+      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.32.tar.gz;
+      sha256 = "9a269f52ab59b125eb80b968271d9f49da0975d43e51363dbfd1695000ed69de";
     };
-    propagatedBuildInputs =
-      [ ParseCPANMeta JSONPP JSONPPCompat5006 CPANMetaYAML FileCopyRecursive ];
     meta = {
       homepage = https://metacpan.org/release/ExtUtils-MakeMaker;
       description = "Create a module Makefile";
@@ -14442,16 +14442,17 @@ let self = _self // overrides; _self = with self; {
   TestSimple = null;
 
   TestSimple13 = buildPerlPackage rec {
-    name = "Test-Simple-1.302120";
+    name = "Test-Simple-1.302125";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
-      sha256 = "c82360092d4dacd6e3248b613fa00053072fe9cf55d022f1e0f427f51d04346c";
+      url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302125.tar.gz;
+      sha256 = "8a3785a4fa60c4c5ae0c5cac2f3312242f2b36ca20e368d8a9ec22b4061aa317";
     };
     meta = {
       description = "Basic utilities for writing tests";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.rycee ];
     };
+    buildInputs = [ ExtUtilsMakeMaker ];
   };
 
   TestSpec = buildPerlPackage rec {
@@ -16205,11 +16206,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLNamespaceSupport = buildPerlPackage {
-    name = "XML-NamespaceSupport-1.11";
+    name = "XML-NamespaceSupport-1.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz;
-      sha256 = "1sklgcldl3w6gn706vx1cgz6pm4y5lfgsjxnfqyk20pilgq530bd";
+      url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz;
+      sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7";
     };
+    propagatedBuildInputs = [ constant ];
+    buildInputs = [ ExtUtilsMakeMaker ];
   };
 
   XMLParser = buildPerlPackage {
@@ -16275,30 +16278,30 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLSAX = buildPerlPackage {
-    name = "XML-SAX-0.96";
+    name = "XML-SAX-1.00";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz;
-      sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv";
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz;
+      sha256 = "1qra9k3wszjxvsgbragl55z3qba4nri0ipmjaxfib4l6xxj6bsj5";
     };
-    propagatedBuildInputs = [XMLNamespaceSupport];
+    propagatedBuildInputs = [ XMLNamespaceSupport XMLSAXBase ];
     postInstall = ''
       perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()"
       '';
-    # https://hydra.nixos.org/build/70726762, seems to be a quoting bug in the Makefile.PL when FULLPERL is passed
-    doCheck = false;
+    buildInputs = [ ExtUtilsMakeMaker ];
   };
 
   XMLSAXBase = buildPerlPackage {
-    name = "XML-SAX-Base-1.08";
+    name = "XML-SAX-Base-1.09";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.08.tar.gz;
-      sha256 = "666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e";
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz;
+      sha256 = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0";
     };
     meta = {
       description = "Base class for SAX Drivers and Filters";
       homepage = https://github.com/grantm/XML-SAX-Base;
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
+    buildInputs = [ ExtUtilsMakeMaker TestSimple13 ];
   };
 
   XMLSAXWriter = buildPerlPackage {

From 89fca290994c84f67e013343c6aa99142d9c51fa Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 07:52:17 -0800
Subject: [PATCH 0479/2266] gfan: 0.6 -> 0.6.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/gdzrfmvi5x26is0hbv0yyg5s61cxm7dy-gfan-0.6.2/bin/gfan --help` got 0 exit code
- found 0.6.2 with grep in /nix/store/gdzrfmvi5x26is0hbv0yyg5s61cxm7dy-gfan-0.6.2
- found 0.6.2 in filename of file in /nix/store/gdzrfmvi5x26is0hbv0yyg5s61cxm7dy-gfan-0.6.2
---
 pkgs/applications/science/math/gfan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index 9a9a1ff762f..65d551f39a7 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "gfan";
-  version = "0.6";
+  version = "0.6.2";
 
   src = fetchurl {
     url = "http://home.math.au.dk/jensen/software/gfan/gfan${version}.tar.gz";
-    sha256 = "02d6dvzfwy0lnidfgf98052jfqwy285nfm1h5nnx7jbgic1nnpgz";
+    sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
   };
 
   makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1'';

From b36ea92f88dbf1a5ea82131c772586d512cf1c89 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 8 Mar 2018 10:01:35 -0600
Subject: [PATCH 0480/2266] llvm6: rc3 -> final

---
 pkgs/development/compilers/llvm/6/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/6/default.nix        | 8 ++++----
 pkgs/development/compilers/llvm/6/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/6/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/6/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/6/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/6/llvm.nix           | 2 +-
 pkgs/development/compilers/llvm/6/openmp.nix         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 6707ebd5413..919efdc8ef9 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1nxx253czzjy7bsrwvk2pyaxwiqwqkjzk0k8x8w7y19mzmmfz883"}
+      unpackFile ${fetch "cfe" "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 8d9fdfc2620..cfa9e9e15fc 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -7,15 +7,15 @@ let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
   release_version = "6.0.0";
-  version = "6.0.0rc3"; # differentiating these is important for rc's
+  version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://prereleases.llvm.org/${release_version}/rc3/${name}-${version}.src.tar.xz";
+    url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "1lv5xawwn0spisa7jknq247pdndh4mlj22z1s0d7a5gqy9y0rlwv";
-  clang-tools-extra_src = fetch "clang-tools-extra" "0qv7rl8cpsj0l2xl5iym6ymxi3906mb2yx95mcf5ihlwjcms5klf";
+  compiler-rt_src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5";
 
   # Add man output without introducing extra dependencies.
   overrideManOutput = drv:
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index a1d1a17f278..3c6c009a58f 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "1dvnvxx588wdyxbn18fwpyjxgypn316arz48zqll03z6zi2rqisa";
+  src = fetch "libcxx" "1n8d0iadkk9fdpplvxkdgrgh2szc6msrx1mpdjpmilz9pn3im4vh";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index c33f0c126cf..05fab16c25c 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "04m1w7a1cxwr6dqlilp0vn6jfjwd9al3nv1sfmypi01r90w69n0r";
+  src = fetch "libcxxabi" "06v4dnqh6q0r3p5h2jznlgb69lg79126lzb2s0lcw1k38b2xkili";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 25b7edbe6c0..4997f0a7c94 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "16nzzi233kknb3sz0hvwypfp6wa1d6rc7izf0v5zzhgrcr86yy98";
+  src = fetch "lld" "02qfkjkjq0snmf8dw9c255xkh8dg06ndny1x470300pk7j1lm33b";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 264f2dc6f7b..eb565a93ef6 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "00gkkxsmz1dgj00mcv8ghxgi51skwbrfdw5rxqx27ay1pqbwa1zl";
+  src = fetch "lldb" "0m6l2ks4banfmdh7xy7l77ri85kmzavgfy81gkc4gl6wg8flrxa6";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index e45e2ec75f1..4f7a2835cc9 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -20,7 +20,7 @@
 }:
 
 let
-  src = fetch "llvm" "10qwr79kgkziqsaymszx36n265k0rpcr5c86xasi46rcigy59x4a";
+  src = fetch "llvm" "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 9461e8b8421..091e378af2a 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "1lgsn70rsmmc52qynd2r05bq34cllzyxb40vsqqv2vl3kicjis5k";
+  src = fetch "openmp" "1z1qghx6drdvnlp406q1cp3mgikxxmwymcwzaxbv18vxbw6ha3kw";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From fa2b7aa221b5f829530a818eff21b760eabbfc35 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 08:07:36 -0800
Subject: [PATCH 0481/2266] gibo: 1.0.4 -> 1.0.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.6 with grep in /nix/store/jk28x9x2szkp8cgfg3x7vmsrjhh4nabs-gibo-1.0.6
- found 1.0.6 in filename of file in /nix/store/jk28x9x2szkp8cgfg3x7vmsrjhh4nabs-gibo-1.0.6
---
 pkgs/tools/misc/gibo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix
index 67c84494692..5c8bacac162 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/pkgs/tools/misc/gibo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gibo-${version}";
-  version = "1.0.4";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "simonwhitaker";
     repo = "gibo";
     rev = version;
-    sha256 = "1vzchggxv660c1cj5v0hlmln7yda48wjy2cv0qwi619cmr5hwbgh";
+    sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

From e729cebdc9d5caf02c9eb299887dd0c48be74beb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 08:40:52 -0800
Subject: [PATCH 0482/2266] ginac: 1.7.2 -> 1.7.4

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/36kx0mbdfnf20mfrcicwgplcz0sibvpk-ginac-1.7.4/bin/viewgar -h` got 0 exit code
- ran `/nix/store/36kx0mbdfnf20mfrcicwgplcz0sibvpk-ginac-1.7.4/bin/viewgar --help` got 0 exit code
- ran `/nix/store/36kx0mbdfnf20mfrcicwgplcz0sibvpk-ginac-1.7.4/bin/viewgar help` got 0 exit code
- found 1.7.4 with grep in /nix/store/36kx0mbdfnf20mfrcicwgplcz0sibvpk-ginac-1.7.4
- found 1.7.4 in filename of file in /nix/store/36kx0mbdfnf20mfrcicwgplcz0sibvpk-ginac-1.7.4
---
 pkgs/applications/science/math/ginac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 1956ebdcb0f..944460de9c7 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
 
 stdenv.mkDerivation rec {
-  name = "ginac-1.7.2";
+  name = "ginac-1.7.4";
 
   src = fetchurl {
     url    = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "1dyq47gc97jn1r5sy0klxs5b4lzhckyjqgsvwcs2a9ybqmhmpdr4";
+    sha256 = "1vvqv73yk9klbq0mz239zzw77rlp72qcvzci4j1v6rafvji1616n";
   };
 
   propagatedBuildInputs = [ cln ];

From 94e3d29892f1c8fae1db8c45cebe9c818f7dd27e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 08:56:24 -0800
Subject: [PATCH 0483/2266] git-radar: 0.5 -> 0.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6 in filename of file in /nix/store/jps6rx12iqgxihhkg2gdi9k29nv1w2kz-git-radar-0.6
---
 .../version-management/git-and-tools/git-radar/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index 1bf7a14932e..d72df802875 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-radar-${version}";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "michaeldfallen";
     repo = "git-radar";
     rev = "v${version}";
-    sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9";
+    sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j";
   };
 
   dontBuild = true;

From dafc368d72491d2acff1c7df5eccfeb5106faa5d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 09:11:49 -0800
Subject: [PATCH 0484/2266] git-review: 1.25.0 -> 1.26.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/.git-review-wrapped -h` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/.git-review-wrapped --help` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/.git-review-wrapped --version` and found version 1.26.0
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/git-review -h` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/git-review --help` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/git-review --version` and found version 1.26.0
- found 1.26.0 with grep in /nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0
- found 1.26.0 in filename of file in /nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0
---
 pkgs/applications/version-management/git-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index c9251b987e9..21ceccf9f35 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "git-review-${version}";
-  version = "1.25.0";
+  version = "1.26.0";
 
   # Manually set version because prb wants to get it from the git
   # upstream repository (and we are installing from tarball instead)
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
 
   src = fetchurl rec {
     url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
-    sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce";
+    sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];

From 3d90bab505a1ce15f2fb4b928138911ea0f7abee Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 09:27:03 -0800
Subject: [PATCH 0485/2266] git-secret: 0.2.2 -> 0.2.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3/bin/.git-secret-wrapped --version` and found version 0.2.3
- found 0.2.3 with grep in /nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3
- found 0.2.3 in filename of file in /nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3
---
 .../version-management/git-and-tools/git-secret/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 3f64d9d86bb..02dc7f86fb3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
 
 let
-  version = "0.2.2";
+  version = "0.2.3";
   repo = "git-secret";
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
     inherit repo;
     owner = "sobolevn";
     rev = "v${version}";
-    sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh";
+    sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6";
   };
 
   buildInputs = [ makeWrapper ];

From e50c1ad98a58d649eb19155c2353c63ccbe42b37 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 8 Mar 2018 18:42:23 +0100
Subject: [PATCH 0486/2266] namecoin: nc0.13.0rc1 -> nc0.15.99-name-tab-beta2

---
 pkgs/applications/altcoins/namecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index 83bead0adac..f7349581169 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/pkgs/applications/altcoins/namecoin.nix
@@ -3,14 +3,14 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "nc0.13.0rc1";
+  version = "nc0.15.99-name-tab-beta2";
   name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
 
   src = fetchFromGitHub {
     owner = "namecoin";
     repo = "namecoin-core";
     rev = version;
-    sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39";
+    sha256 = "1r0v0yvlazmidxp6xhapbdawqb8fhzrdp11d4an5vgxa208s6wdf";
   };
 
   nativeBuildInputs = [

From de1427fabf13419e486f7557211f6048ccc6c635 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 8 Mar 2018 18:52:38 +0100
Subject: [PATCH 0487/2266] wyrd: fix build error with ncurses-6.0-abi5-compat

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

diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index d02ce41b6aa..261c08ad31d 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml ncurses remind camlp4 ];
 
+  # needed for configure phase to succeed
+  CPPFLAGS = "-DNCURSES_INTERNALS";
+
   preferLocalBuild = true;
 
   meta = with stdenv.lib; {

From bdc7145ef95ca2f7ab6e5df4ea1e5e7fa4001c4b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 09:57:44 -0800
Subject: [PATCH 0488/2266] gitless: 0.8.5 -> 0.8.6

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped -h` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped --help` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped --version` and found version 0.8.6
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl -h` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl --help` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl --version` and found version 0.8.6
- found 0.8.6 with grep in /nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6
- found 0.8.6 in filename of file in /nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6
---
 pkgs/applications/version-management/gitless/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
index 2b93a95e45a..d062c32d018 100644
--- a/pkgs/applications/version-management/gitless/default.nix
+++ b/pkgs/applications/version-management/gitless/default.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub, pythonPackages, stdenv }:
 
 pythonPackages.buildPythonApplication rec {
-  ver = "0.8.5";
+  ver = "0.8.6";
   name = "gitless-${ver}";
 
   src = fetchFromGitHub {
     owner = "sdg-mit";
     repo = "gitless";
     rev = "v${ver}";
-    sha256 = "1v22i5lardswpqb6vxjgwra3ac8652qyajbijfj18vlkhajz78hq";
+    sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g";
   };
 
   propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ];

From 7410ea33991b7faf058efce61a9c9eac47a4f467 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 10:14:16 -0800
Subject: [PATCH 0489/2266] global: 6.5.7 -> 6.6.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gozilla --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gozilla --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags -h` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope -h` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope -V` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped --version` and found version 6.6.2
- found 6.6.2 with grep in /nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2
- found 6.6.2 in filename of file in /nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2
---
 pkgs/development/tools/misc/global/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 35126c85d3f..296d9673d8f 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "global-${version}";
-  version = "6.5.7";
+  version = "6.6.2";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "0cnd7a7d1pl46yk15q6mnr9i9w3xi8pxgchw4ia9njgr4jjqzh6r";
+    sha256 = "0zvi5vxwiq0dy8mq2cgs64m8harxs0fvkmsnvi0ayb0w608lgij3";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];

From a47adc152e43391281613bce3885c80d18e51bba Mon Sep 17 00:00:00 2001
From: Cody Yu <codyleyu45@gmail.com>
Date: Thu, 8 Mar 2018 13:24:24 -0500
Subject: [PATCH 0490/2266] Upgrade Nuget version from 2.8.5 to 3.4.3

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 43182b3f2aa..ce3bbf32fdf 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -888,13 +888,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Nuget = buildDotnetPackage {
     baseName = "Nuget";
-    version = "2.8.5";
+    version = "3.4.3";
 
     src = fetchFromGitHub {
       owner = "mono";
       repo = "nuget-binary";
-      rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047";
-      sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3";
+      rev = "1f3025c2eb13bfcb56b47ddd77329ac3d9911d1c";
+      sha256 = "01snk05hcrp5i2ys3p1y34r05q1b460q6wb8p3vwpba2q2czdax5";
     };
 
     buildInputs = [ unzip ];

From b127000fa8a0856112bd542abe16e8d5ae9ed3fb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 10:30:08 -0800
Subject: [PATCH 0491/2266] glpk: 4.64 -> 4.65

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -h` got 0 exit code
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --help` got 0 exit code
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -v` and found version 4.65
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --version` and found version 4.65
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -h` and found version 4.65
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --help` and found version 4.65
- found 4.65 with grep in /nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65
- found 4.65 in filename of file in /nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65
---
 pkgs/development/libraries/glpk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index d608b3af6ce..b9634e01900 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.64";
+  name = "glpk-4.65";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "096cqgjc7vkq6wd8znhcxjbs1s2rym3qf753fqxrrq531vs6g4jk";
+    sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
   };
 
   doCheck = true;

From 6eeb06f13c228c8fcd44fd13086906c82b7a14ff Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 10:48:21 -0800
Subject: [PATCH 0492/2266] gmic: 1.7.9 -> 2.2.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/akcdj31wk383lglx9afg3vyyilvfmbnb-gmic-2.2.0/bin/gmic --version` and found version 2.2.0
- ran `/nix/store/akcdj31wk383lglx9afg3vyyilvfmbnb-gmic-2.2.0/bin/gmic version` and found version 2.2.0
- found 2.2.0 in filename of file in /nix/store/akcdj31wk383lglx9afg3vyyilvfmbnb-gmic-2.2.0
---
 pkgs/tools/graphics/gmic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 6ac152cb7b8..cbfdd56cca1 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gmic-${version}";
-  version = "1.7.9";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm";
+    sha256 = "0yvb9iwwmjxvck2in3ymqszaddz502v2ryk50qs0wskhbhdh96c7";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From c69d8bf5e606915820b30d6db8fa9dfa39766f67 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 8 Mar 2018 13:56:36 -0500
Subject: [PATCH 0493/2266] treewide: Remove gnat support.

See discussion in https://github.com/NixOS/nixpkgs/commit/6ac7b19c978e951c124c5ea434c94f95f593888e.
---
 pkgs/build-support/cc-wrapper/add-flags.sh    |   5 -
 pkgs/build-support/cc-wrapper/default.nix     |  28 +-
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 122 -----
 .../cc-wrapper/gnatlink-wrapper.sh            |  40 --
 pkgs/build-support/gcc-wrapper-old/add-flags  |  28 --
 pkgs/build-support/gcc-wrapper-old/builder.sh | 215 --------
 .../build-support/gcc-wrapper-old/default.nix |  76 ---
 .../gcc-wrapper-old/gcc-wrapper-old.sh        | 146 ------
 .../gcc-wrapper-old/gcc-wrapper.sh            | 147 ------
 .../gcc-wrapper-old/gnat-wrapper.sh           | 113 -----
 .../gcc-wrapper-old/gnatlink-wrapper.sh       |  43 --
 .../gcc-wrapper-old/ld-solaris-wrapper.sh     |  40 --
 .../gcc-wrapper-old/ld-wrapper.sh             | 166 ------
 .../gcc-wrapper-old/setup-hook.sh             |  33 --
 pkgs/build-support/gcc-wrapper-old/utils.sh   |  26 -
 .../development/compilers/gcc/4.5/default.nix | 472 ------------------
 .../compilers/gcc/4.5/ghdl-ortho-cflags.patch | 111 ----
 .../compilers/gcc/4.5/no-sys-dirs.patch       |  54 --
 .../development/compilers/gcc/4.5/sources.nix |  26 -
 .../development/compilers/gcc/4.8/default.nix |  22 +-
 .../development/compilers/gcc/4.9/default.nix |  22 +-
 pkgs/development/compilers/gcc/5/default.nix  |  22 +-
 pkgs/development/compilers/gcc/6/default.nix  |  22 +-
 pkgs/development/compilers/gcc/7/default.nix  |  21 +-
 pkgs/development/compilers/gcc/builder.sh     |   2 -
 .../compilers/gcc/gnat-cflags.patch           |  33 --
 .../compilers/gcc/snapshot/default.nix        |  22 +-
 pkgs/development/compilers/ghdl/default.nix   |  44 --
 .../compilers/gnatboot/default.nix            |  48 --
 pkgs/top-level/all-packages.nix               |  47 --
 pkgs/top-level/release-small.nix              |   1 -
 31 files changed, 13 insertions(+), 2184 deletions(-)
 delete mode 100644 pkgs/build-support/cc-wrapper/gnat-wrapper.sh
 delete mode 100644 pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/add-flags
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/builder.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/default.nix
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh
 delete mode 100755 pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/setup-hook.sh
 delete mode 100644 pkgs/build-support/gcc-wrapper-old/utils.sh
 delete mode 100644 pkgs/development/compilers/gcc/4.5/default.nix
 delete mode 100644 pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch
 delete mode 100644 pkgs/development/compilers/gcc/4.5/sources.nix
 delete mode 100644 pkgs/development/compilers/gcc/gnat-cflags.patch
 delete mode 100644 pkgs/development/compilers/ghdl/default.nix
 delete mode 100644 pkgs/development/compilers/gnatboot/default.nix

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index d8b42244607..604aaf6b6cf 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -9,7 +9,6 @@ var_templates_list=(
     NIX+CFLAGS_LINK
     NIX+CXXSTDLIB_COMPILE
     NIX+CXXSTDLIB_LINK
-    NIX+GNATFLAGS_COMPILE
 )
 var_templates_bool=(
     NIX+ENFORCE_NO_NATIVE
@@ -51,10 +50,6 @@ if [ -e @out@/nix-support/cc-cflags ]; then
     NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
 fi
 
-if [ -e @out@/nix-support/gnat-cflags ]; then
-    NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE"
-fi
-
 if [ -e @out@/nix-support/cc-ldflags ]; then
     NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
 fi
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index ba8aca87c72..43cd87fb459 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -8,7 +8,7 @@
 { name ? ""
 , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
-, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
+, extraPackages ? [], extraBuildCommands ? ""
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
 }:
@@ -21,9 +21,6 @@ assert !nativeTools ->
 assert !(nativeLibc && noLibc);
 assert (noLibc || nativeLibc) == (libc == null);
 
-# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper.
-assert cc.langVhdl or false -> zlib != null;
-
 let
   stdenv = stdenvNoCC;
   inherit (stdenv) hostPlatform targetPlatform;
@@ -189,17 +186,6 @@ stdenv.mkDerivation {
 
     + optionalString cc.langGo or false ''
       wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo
-    ''
-
-    + optionalString cc.langAda or false ''
-      wrap ${targetPrefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gnatgcc
-      wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake
-      wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind
-      wrap ${targetPrefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${targetPrefix}gnatlink
-    ''
-
-    + optionalString cc.langVhdl or false ''
-      ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl
     '';
 
   propagatedBuildInputs = [ bintools ];
@@ -262,18 +248,6 @@ stdenv.mkDerivation {
       ccLDFlags+=" -L${cc_solib}/lib"
       ccCFlags+=" -B${cc_solib}/lib"
 
-      ${optionalString cc.langVhdl or false ''
-        ccLDFlags+=" -L${zlib.out}/lib"
-      ''}
-
-      # Find the gcc libraries path (may work only without multilib).
-      ${optionalString cc.langAda or false ''
-        basePath=`echo ${cc_solib}/lib/*/*/*`
-        ccCFlags+=" -B$basePath -I$basePath/adainclude"
-        gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
-        echo "$gnatCFlags" > $out/nix-support/gnat-cflags
-      ''}
-
       echo "$ccLDFlags" > $out/nix-support/cc-ldflags
       echo "$ccCFlags" > $out/nix-support/cc-cflags
     ''
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
deleted file mode 100644
index a86c9fe4ada..00000000000
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#! @shell@
-set -eu -o pipefail +o posix
-shopt -s nullglob
-
-if (( "${NIX_DEBUG:-0}" >= 7 )); then
-    set -x
-fi
-
-# N.B. Gnat is not used during bootstrapping, so we don't need to
-# worry about the old bash empty array `set -u` workarounds.
-
-path_backup="$PATH"
-
-# phase separation makes this look useless
-# shellcheck disable=SC2157
-if [ -n "@coreutils_bin@" ]; then
-    PATH="@coreutils_bin@/bin"
-fi
-
-source @out@/nix-support/utils.sh
-
-if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-nonFlagArgs=0
-
-for i in "$@"; do
-    if [ "$i" = -c ]; then
-        dontLink=1
-    elif [ "$i" = -M ]; then
-        dontLink=1
-    elif [ "${i:0:1}" != - ]; then
-        nonFlagArgs=1
-    fi
-done
-
-# If we pass a flag like -Wl, then gcc will call the linker unless it
-# can figure out that it has to do something else (e.g., because of a
-# "-c" flag).  So if no non-flag arguments are given, don't pass any
-# linker flags.  This catches cases like "gcc" (should just print
-# "gcc: no input files") and "gcc -v" (should print the version).
-if [ "$nonFlagArgs" = 0 ]; then
-    dontLink=1
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then
-    rest=()
-    for p in "${params[@]}"; do
-        if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
-            skip "${p:2}"
-        elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then
-            skip "${p:2}"
-        elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then
-            skip "${p:2}"
-        elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then
-            skip "${p:2}"
-        else
-            rest+=("$p")
-        fi
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Clear march/mtune=native -- they bring impurity.
-if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then
-    rest=()
-    for p in "${params[@]}"; do
-        if [[ "$p" = -m*=native ]]; then
-            skip "$p"
-        else
-            rest+=("$p")
-        fi
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the GNAT compiler proper.
-extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE)
-extraBefore=()
-
-if [ "$(basename "$0")x" = "gnatmakex" ]; then
-  extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink ")
-fi
-
-#if [ "$dontLink" != 1 ]; then
-#    # Add the flags that should be passed to the linker (and prevent
-#    # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
-#    for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do
-#        extraBefore+=("-largs" "$i")
-#    done
-#    for i in $NIX_@infixSalt@_LDFLAGS; do
-#        if [ "${i:0:3}" = -L/ ]; then
-#            extraAfter+=("$i")
-#        else
-#            extraAfter+=("-largs" "$i")
-#        fi
-#    done
-#    export NIX_@infixSalt@_LDFLAGS_SET=1
-#fi
-
-# Optionally print debug info.
-if (( "${NIX_DEBUG:-0}" >= 1 )); then
-    echo "extra flags before to @prog@:" >&2
-    printf "  %q\n" "${extraBefore[@]}"  >&2
-    echo "original flags to @prog@:" >&2
-    printf "  %q\n" "${params[@]}" >&2
-    echo "extra flags after to @prog@:" >&2
-    printf "  %q\n" "${extraAfter[@]}" >&2
-fi
-
-PATH="$path_backup"
-exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
deleted file mode 100644
index 0944d74e431..00000000000
--- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#! @shell@
-set -eu -o pipefail +o posix
-shopt -s nullglob
-
-if (( "${NIX_DEBUG:-0}" >= 7 )); then
-    set -x
-fi
-
-# N.B. Gnat is not used during bootstrapping, so we don't need to
-# worry about the old bash empty array `set -u` workarounds.
-
-# Add the flags for the GNAT compiler proper.
-extraAfter=("--GCC=@out@/bin/gcc")
-extraBefore=()
-
-## Add the flags that should be passed to the linker (and prevent
-## `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
-#for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do
-#    extraBefore+=("-largs" "$i")
-#done
-#for i in $NIX_@infixSalt@_LDFLAGS; do
-#    if [ "${i:0:3}" = -L/ ]; then
-#        extraAfter+=("$i")
-#    else
-#        extraAfter+=("-largs" "$i")
-#    fi
-#done
-#export NIX_@infixSalt@_LDFLAGS_SET=1
-
-# Optionally print debug info.
-if (( "${NIX_DEBUG:-0}" >= 1 )); then
-    echo "extra flags before to @prog@:" >&2
-    printf "  %q\n" "${extraBefore[@]}"  >&2
-    echo "original flags to @prog@:" >&2
-    printf "  %q\n" "$@" >&2
-    echo "extra flags after to @prog@:" >&2
-    printf "  %q\n" "${extraAfter[@]}" >&2
-fi
-
-exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"
diff --git a/pkgs/build-support/gcc-wrapper-old/add-flags b/pkgs/build-support/gcc-wrapper-old/add-flags
deleted file mode 100644
index 93da917a541..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/add-flags
+++ /dev/null
@@ -1,28 +0,0 @@
-# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
-export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
-
-if test -e @out@/nix-support/libc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/cc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/gnat-cflags; then
-    export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/libc-ldflags; then
-    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"
-fi
-
-if test -e @out@/nix-support/cc-ldflags; then
-    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/cc-ldflags)"
-fi
-
-if test -e @out@/nix-support/libc-ldflags-before; then
-    export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
-fi
-
-export NIX_CC_WRAPPER_FLAGS_SET=1
diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh
deleted file mode 100644
index 22e32814927..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/builder.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-source $stdenv/setup
-
-
-mkdir -p $out/bin
-mkdir -p $out/nix-support
-
-
-if test -z "$nativeLibc"; then
-    dynamicLinker="$libc/lib/$dynamicLinker"
-    echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-    if test -e $libc/lib/32/ld-linux.so.2; then
-        echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
-    fi
-
-    # The "-B$libc/lib/" flag is a quick hack to force gcc to link
-    # against the crt1.o from our own glibc, rather than the one in
-    # /usr/lib.  (This is only an issue when using an `impure'
-    # compiler/linker, i.e., one that searches /usr/lib and so on.)
-    #
-    # Unfortunately, setting -B appears to override the default search
-    # path. Thus, the gcc-specific "../includes-fixed" directory is
-    # now longer searched and glibc's <limits.h> header fails to
-    # compile, because it uses "#include_next <limits.h>" to find the
-    # limits.h file in ../includes-fixed. To remedy the problem,
-    # another -idirafter is necessary to add that directory again.
-    echo "-B$libc/lib/ -idirafter $libc_dev/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
-
-    echo "-L$libc/lib" > $out/nix-support/libc-ldflags
-
-    # The dynamic linker is passed in `ldflagsBefore' to allow
-    # explicit overrides of the dynamic linker by callers to gcc/ld
-    # (the *last* value counts, so ours should come first).
-    echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before
-fi
-
-if test -n "$nativeTools"; then
-    gccPath="$nativePrefix/bin"
-    ldPath="$nativePrefix/bin"
-else
-    if test -e "$gcc/lib64"; then
-        gccLDFlags="$gccLDFlags -L$gcc_lib/lib64"
-    fi
-    gccLDFlags="$gccLDFlags -L$gcc_lib/lib"
-    if [ -n "$langVhdl" ]; then
-        gccLDFlags="$gccLDFlags -L$zlib/lib"
-    fi
-    echo "$gccLDFlags" > $out/nix-support/cc-ldflags
-
-    # GCC shows $gcc/lib in `gcc -print-search-dirs', but not
-    # $gcc/lib64 (even though it does actually search there...)..
-    # This confuses libtool.  So add it to the compiler tool search
-    # path explicitly.
-    if test -e "$gcc/lib64"; then
-        gccCFlags="$gccCFlags -B$gcc/lib64"
-    fi
-
-    # Find the gcc libraries path (may work only without multilib)
-    if [ -n "$langAda" ]; then
-        basePath=`echo $gcc/lib/*/*/*`
-        gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude"
-
-        gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
-        echo "$gnatCFlags" > $out/nix-support/gnat-cflags
-    fi
-    echo "$gccCFlags" > $out/nix-support/cc-cflags
-    
-    gccPath="$gcc/bin"
-    # On Illumos/Solaris we might prefer native ld
-    if test -n "$nativePrefix"; then
-      ldPath="$nativePrefix/bin"
-    else
-      ldPath="$binutils/bin"
-    fi;
-fi
-
-
-doSubstitute() {
-    local src=$1
-    local dst=$2
-    local ld="$ldPath/ld"
-    if $ld -V 2>&1 |grep Solaris; then
-      # Use Solaris specific linker wrapper
-      ld="$out/bin/ld-solaris"
-    fi
-    # Can't use substitute() here, because replace may not have been
-    # built yet (in the bootstrap).
-    sed \
-        -e "s^@out@^$out^g" \
-        -e "s^@shell@^$shell^g" \
-        -e "s^@gcc@^$gcc^g" \
-        -e "s^@gccProg@^$gccProg^g" \
-        -e "s^@gnatProg@^$gnatProg^g" \
-        -e "s^@gnatlinkProg@^$gnatlinkProg^g" \
-        -e "s^@binutils@^$binutils^g" \
-        -e "s^@coreutils@^$coreutils^g" \
-        -e "s^@libc@^$libc^g" \
-        -e "s^@libc_bin@^$libc_bin^g" \
-        -e "s^@ld@^$ld^g" \
-        < "$src" > "$dst" 
-}
-
-
-# Make wrapper scripts around gcc, g++, and gfortran.  Also make symlinks
-# cc, c++, and f77.
-mkGccWrapper() {
-    local dst=$1
-    local src=$2
-
-    if ! test -f "$src"; then
-        echo "$src does not exist (skipping)"
-        return 1
-    fi
-
-    gccProg="$src"
-    doSubstitute "$gccWrapper" "$dst"
-    chmod +x "$dst"
-}
-
-mkGnatWrapper() {
-    local dst=$1
-    local src=$2
-
-    if ! test -f "$src"; then
-        echo "$src does not exist (skipping)"
-        return 1
-    fi
-
-    gnatProg="$src"
-    doSubstitute "$gnatWrapper" "$dst"
-    chmod +x "$dst"
-}
-
-mkGnatLinkWrapper() {
-    local dst=$1
-    local src=$2
-
-    if ! test -f "$src"; then
-        echo "$src does not exist (skipping)"
-        return 1
-    fi
-
-    gnatlinkProg="$src"
-    doSubstitute "$gnatlinkWrapper" "$dst"
-    chmod +x "$dst"
-}
-
-if mkGccWrapper $out/bin/gcc $gccPath/gcc
-then
-    ln -sv gcc $out/bin/cc
-fi
-
-if mkGccWrapper $out/bin/g++ $gccPath/g++
-then
-    ln -sv g++ $out/bin/c++
-fi
-
-mkGccWrapper $out/bin/cpp $gccPath/cpp || true
-
-if mkGccWrapper $out/bin/gfortran $gccPath/gfortran
-then
-    ln -sv gfortran $out/bin/g77
-    ln -sv gfortran $out/bin/f77
-fi
-
-mkGccWrapper $out/bin/gcj $gccPath/gcj || true
-
-mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true
-
-mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true
-mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true
-mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true
-mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true
-
-if [ -f $gccPath/ghdl ]; then
-    ln -sf $gccPath/ghdl $out/bin/ghdl
-fi
-
-
-# Create a symlink to as (the assembler).  This is useful when a
-# gcc-wrapper is installed in a user environment, as it ensures that
-# the right assembler is called.
-ln -s $ldPath/as $out/bin/as
-
-
-# Make a wrapper around the linker.
-doSubstitute "$ldWrapper" "$out/bin/ld"
-chmod +x "$out/bin/ld"
-
-# Copy solaris ld wrapper if needed
-if $ldPath/ld -V 2>&1 |grep Solaris; then
-  # Use Solaris specific linker wrapper
-  sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris"
-  chmod +x "$out/bin/ld-solaris"
-fi
-
-
-# Emit a setup hook.  Also store the path to the original GCC and
-# Glibc.
-test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
-test -n "$libc" && echo $libc > $out/nix-support/orig-libc
-
-doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
-
-doSubstitute "$setupHook" "$out/nix-support/setup-hook"
-
-cp -p $utils $out/nix-support/utils.sh
-
-
-# Propagate the wrapped gcc so that if you install the wrapper, you get
-# tools like gcov, the manpages, etc. as well (including for binutils
-# and Glibc).
-if test -z "$nativeTools"; then
-    printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
-fi
diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
deleted file mode 100644
index 2c2b2c0e1d5..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
-# know where the C library and standard header files are.  Therefore
-# the compiler produced by that package cannot be installed directly
-# in a user environment and used from the command line.  This
-# stdenv.mkDerivation provides a wrapper that sets up the right environment
-# variables so that the compiler and the linker just "work".
-
-{ name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? ""
-, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
-, zlib ? null
-, hostPlatform, targetPlatform, targetPackages
-}:
-
-assert nativeTools -> nativePrefix != "";
-assert !nativeTools -> gcc != null && binutils != null && coreutils != null;
-assert !nativeLibc -> libc != null;
-
-# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper
-assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null;
-
-let
-
-  gccVersion = (builtins.parseDrvName gcc.name).version;
-  gccName = (builtins.parseDrvName gcc.name).name;
-
-  langGo = if nativeTools then false else gcc ? langGo && gcc.langGo;
-in
-
-stdenv.mkDerivation {
-  name =
-    (if name != "" then name else gccName + "-wrapper") +
-    (if gcc != null && gccVersion != "" then "-" + gccVersion else "");
-
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  gccWrapper = ./gcc-wrapper.sh;
-  gnatWrapper = ./gnat-wrapper.sh;
-  gnatlinkWrapper = ./gnatlink-wrapper.sh;
-  ldWrapper = ./ld-wrapper.sh;
-  ldSolarisWrapper = ./ld-solaris-wrapper.sh;
-  utils = ./utils.sh;
-  addFlags = ./add-flags;
-
-  inherit nativeTools nativeLibc nativePrefix gcc;
-  gcc_lib = lib.getLib gcc;
-  libc = if nativeLibc then null else libc;
-  libc_dev = if nativeLibc then null else lib.getDev libc;
-  libc_bin = if nativeLibc then null else lib.getBin libc;
-  binutils = if nativeTools then null else lib.getBin binutils;
-  # The wrapper scripts use 'cat', so we may need coreutils
-  coreutils = if nativeTools then null else lib.getBin coreutils;
-
-  langC = if nativeTools then true else gcc.langC;
-  langCC = if nativeTools then true else gcc.langCC;
-  langFortran = if nativeTools then false else gcc ? langFortran;
-  langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;
-  langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
-  zlib = if gcc != null && gcc ? langVhdl then zlib else null;
-  shell = shell + shell.shellPath or "";
-
-  preferLocalBuild = true;
-
-  meta =
-    let gcc_ = if gcc != null then gcc else {}; in
-    (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
-    { description =
-        stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_
-        + " (wrapper script)";
-    };
-
-  # The dynamic linker has different names on different platforms.
-  dynamicLinker =
-    if !nativeLibc then
-      targetPackages.stdenv.cc.bintools.dynamicLinker
-    else "";
-}
diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh
deleted file mode 100644
index a9d18036952..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#! @shell@ -e
-
-if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then
-    source "$NIX_CC_WRAPPER_START_HOOK"
-fi
-
-if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-getVersion=0
-nonFlagArgs=0
-
-for i in "$@"; do
-    if [ "$i" = -c ]; then
-        dontLink=1
-    elif [ "$i" = -S ]; then
-        dontLink=1
-    elif [ "$i" = -E ]; then
-        dontLink=1
-    elif [ "$i" = -E ]; then
-        dontLink=1
-    elif [ "$i" = -M ]; then
-        dontLink=1
-    elif [ "$i" = -MM ]; then
-        dontLink=1
-    elif [ "$i" = -x ]; then
-        # At least for the cases c-header or c++-header we should set dontLink.
-        # I expect no one use -x other than making precompiled headers.
-        dontLink=1
-    elif [ "${i:0:1}" != - ]; then
-        nonFlagArgs=1
-    elif [ "$i" = -m32 ]; then
-        if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
-        fi
-    fi
-done
-
-# If we pass a flag like -Wl, then gcc will call the linker unless it
-# can figure out that it has to do something else (e.g., because of a
-# "-c" flag).  So if no non-flag arguments are given, don't pass any
-# linker flags.  This catches cases like "gcc" (should just print
-# "gcc: no input files") and "gcc -v" (should print the version).
-if [ "$nonFlagArgs" = 0 ]; then
-    dontLink=1
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then
-    rest=()
-    n=0
-    while [ $n -lt ${#params[*]} ]; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
-            skip $p
-        elif [ "$p" = -L ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then
-            skip $p
-        elif [ "$p" = -I ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif [ "$p" = -isystem ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE)
-extraBefore=()
-
-# When enforcing purity, pretend gcc can't find the current date and
-# time
-if [ "$NIX_ENFORCE_PURITY" = 1 ]; then
-    extraAfter+=('-D__DATE__="Jan 01 1970"'
-        '-D__TIME__="00:00:01"'
-        )
-fi
-
-
-if [ "$dontLink" != 1 ]; then
-
-    # Add the flags that should only be passed to the compiler when
-    # linking.
-    extraAfter+=($NIX_CFLAGS_LINK)
-
-    # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
-        extraBefore=(${extraBefore[@]} "-Wl,$i")
-    done
-    for i in $NIX_LDFLAGS; do
-        if [ "${i:0:3}" = -L/ ]; then
-            extraAfter+=("$i")
-        else
-            extraAfter+=("-Wl,$i")
-        fi
-    done
-    export NIX_LDFLAGS_SET=1
-fi
-
-# As a very special hack, if the arguments are just `-v', then don't
-# add anything.  This is to prevent `gcc -v' (which normally prints
-# out the version number and returns exit code 0) from printing out
-# `No input files specified' and returning exit code 1.
-if [ "$*" = -v ]; then
-    extraAfter=()
-    extraBefore=()
-fi
-
-# Optionally print debug info.
-if [ -n "$NIX_DEBUG" ]; then
-  echo "original flags to @prog@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @prog@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @prog@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then
-    source "$NIX_CC_WRAPPER_EXEC_HOOK"
-fi
-
-exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh
deleted file mode 100644
index 8f12f08ddc7..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_CC_WRAPPER_START_HOOK"; then
-    source "$NIX_CC_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-getVersion=0
-nonFlagArgs=0
-
-for i in "$@"; do
-    if test "$i" = "-c"; then
-        dontLink=1
-    elif test "$i" = "-S"; then
-        dontLink=1
-    elif test "$i" = "-E"; then
-        dontLink=1
-    elif test "$i" = "-E"; then
-        dontLink=1
-    elif test "$i" = "-M"; then
-        dontLink=1
-    elif test "$i" = "-MM"; then
-        dontLink=1
-    elif test "$i" = "-x"; then
-        # At least for the cases c-header or c++-header we should set dontLink.
-        # I expect no one use -x other than making precompiled headers.
-        dontLink=1
-    elif test "${i:0:1}" != "-"; then
-        nonFlagArgs=1
-    elif test "$i" = "-m32"; then
-        if test -e @out@/nix-support/dynamic-linker-m32; then
-            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
-        fi
-    fi
-done
-
-# If we pass a flag like -Wl, then gcc will call the linker unless it
-# can figure out that it has to do something else (e.g., because of a
-# "-c" flag).  So if no non-flag arguments are given, don't pass any
-# linker flags.  This catches cases like "gcc" (should just print
-# "gcc: no input files") and "gcc -v" (should print the version).
-if test "$nonFlagArgs" = "0"; then
-    dontLink=1
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-I" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-isystem" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE)
-extraBefore=()
-
-if test "$dontLink" != "1"; then
-
-    # Add the flags that should only be passed to the compiler when
-    # linking.
-    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
-
-    # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
-        extraBefore=(${extraBefore[@]} "-Wl,$i")
-    done
-    for i in $NIX_LDFLAGS; do
-	if test "${i:0:3}" = "-L/"; then
-	    extraAfter=(${extraAfter[@]} "$i")
-	else
-	    extraAfter=(${extraAfter[@]} "-Wl,$i")
-	fi
-    done
-    export NIX_LDFLAGS_SET=1
-fi
-
-# As a very special hack, if the arguments are just `-v', then don't
-# add anything.  This is to prevent `gcc -v' (which normally prints
-# out the version number and returns exit code 0) from printing out
-# `No input files specified' and returning exit code 1.
-if test "$*" = "-v"; then
-    extraAfter=()
-    extraBefore=()
-fi    
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gccProg@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @gccProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gccProg@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_CC_WRAPPER_EXEC_HOOK"
-fi
-
-
-# Call the real `gcc'.  Filter out warnings from stderr about unused
-# `-B' flags, since they confuse some programs.  Deep bash magic to
-# apply grep to stderr (by swapping stdin/stderr twice).
-if test -z "$NIX_CC_NEEDS_GREP"; then
-    @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
-else
-    (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
-        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
-    exit $?
-fi    
diff --git a/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh
deleted file mode 100644
index f6fa4b18400..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_GNAT_WRAPPER_START_HOOK"; then
-    source "$NIX_GNAT_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_GNAT_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-getVersion=0
-nonFlagArgs=0
-
-for i in "$@"; do
-    if test "$i" = "-c"; then
-        dontLink=1
-    elif test "$i" = "-M"; then
-        dontLink=1
-    elif test "${i:0:1}" != "-"; then
-        nonFlagArgs=1
-    elif test "$i" = "-m32"; then
-        if test -e @out@/nix-support/dynamic-linker-m32; then
-            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
-        fi
-    fi
-done
-
-# If we pass a flag like -Wl, then gcc will call the linker unless it
-# can figure out that it has to do something else (e.g., because of a
-# "-c" flag).  So if no non-flag arguments are given, don't pass any
-# linker flags.  This catches cases like "gcc" (should just print
-# "gcc: no input files") and "gcc -v" (should print the version).
-if test "$nonFlagArgs" = "0"; then
-    dontLink=1
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
-            skip $p
-        elif test "${p:0:4}" = "-aI/" && badPath "${p:3}"; then
-            skip $p
-        elif test "${p:0:4}" = "-aO/" && badPath "${p:3}"; then
-            skip $p
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the GNAT compiler proper.
-extraAfter=($NIX_GNATFLAGS_COMPILE)
-extraBefore=()
-
-if [ "`basename $0`x" = "gnatmakex" ]; then
-  extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ")
-fi
-
-# Add the flags that should be passed to the linker (and prevent
-# `ld-wrapper' from adding NIX_LDFLAGS again).
-#for i in $NIX_LDFLAGS_BEFORE; do
-#    extraBefore=(${extraBefore[@]} "-largs $i")
-#done
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gnatProg@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @gnatProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gnatProg@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
-fi
-
-
-# Call the real `gcc'.  Filter out warnings from stderr about unused
-# `-B' flags, since they confuse some programs.  Deep bash magic to
-# apply grep to stderr (by swapping stdin/stderr twice).
-if test -z "$NIX_GNAT_NEEDS_GREP"; then
-    @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
-else
-    (@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
-        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
-    exit $?
-fi
diff --git a/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh
deleted file mode 100644
index 25907108b4d..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! @shell@ -e
-
-# Add the flags for the GNAT compiler proper.
-extraAfter="--GCC=@out@/bin/gcc"
-extraBefore=()
-
-# Add the flags that should be passed to the linker (and prevent
-# `ld-wrapper' from adding NIX_LDFLAGS again).
-#for i in $NIX_LDFLAGS_BEFORE; do
-#    extraBefore=(${extraBefore[@]} "-largs $i")
-#done
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gnatlinkProg@:" >&2
-  for i in "$@"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @gnatlinkProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gnatlinkProg@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
-fi
-
-
-# Call the real `gcc'.  Filter out warnings from stderr about unused
-# `-B' flags, since they confuse some programs.  Deep bash magic to
-# apply grep to stderr (by swapping stdin/stderr twice).
-if test -z "$NIX_GNAT_NEEDS_GREP"; then
-    @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]}
-else
-    (@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
-        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
-    exit $?
-fi
diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
deleted file mode 100755
index 263ea5408e9..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!@shell@
-
-set -e
-set -u
-
-# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(
-# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3
-#   but still no success.
-cmd="@ld@ -z ignore"
-
-args=("$@");
-
-# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library.
-# GNU binutils does not have this problem:
-#   http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter
-i=0;
-while [[ $i -lt $# ]]; do
-    case "${args[$i]}" in
-        -L)  cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;;
-        -L*) cmd="$cmd ${args[$i]}" ;;
-        *)   ;;
-    esac
-    i=($i+1);
-done
-
-i=0;
-while [[ $i -lt $# ]]; do
-    case "${args[$i]}" in
-        -L)  i=($i+1); ;;
-        -L*) ;;
-        *)   cmd="$cmd ${args[$i]}" ;;
-    esac
-    i=($i+1);
-done
-
-# Trace:
-set -x
-exec $cmd
-
-exit 0
diff --git a/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh
deleted file mode 100644
index db50d25cb3b..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
-    source "$NIX_LD_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
-        -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-rpath" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:1}" = "/" && badPath "$p"; then
-            # We cannot skip this; barf.
-            echo "impure path \`$p' used in link" >&2
-            exit 1
-        elif test "${p:0:9}" = "--sysroot"; then
-            # Our ld is not built with sysroot support (Can we fix that?)
-            :
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-extra=()
-extraBefore=()
-
-if test -z "$NIX_LDFLAGS_SET"; then
-    extra+=($NIX_LDFLAGS)
-    extraBefore+=($NIX_LDFLAGS_BEFORE)
-fi
-
-extra+=($NIX_LDFLAGS_AFTER)
-
-
-# Add all used dynamic libraries to the rpath.
-if test "$NIX_DONT_SET_RPATH" != "1"; then
-
-    libPath=""
-    addToLibPath() {
-        local path="$1"
-        if test "${path:0:1}" != "/"; then return 0; fi
-        case "$path" in
-            *..*|*./*|*/.*|*//*)
-                local path2
-                if path2=$(readlink -f "$path"); then
-                    path="$path2"
-                fi
-                ;;
-        esac
-        case $libPath in
-            *\ $path\ *) return 0 ;;
-        esac
-        libPath="$libPath $path "
-    }
-    
-    addToRPath() {
-        # If the path is not in the store, don't add it to the rpath.
-        # This typically happens for libraries in /tmp that are later
-        # copied to $out/lib.  If not, we're screwed.
-        if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
-        case $rpath in
-            *\ $1\ *) return 0 ;;
-        esac
-        rpath="$rpath $1 "
-    }
-
-    libs=""
-    addToLibs() {
-        libs="$libs $1"
-    }
-
-    rpath=""
-
-    # First, find all -L... switches.
-    allParams=("${params[@]}" ${extra[@]})
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:3}" = "-L/"; then
-            addToLibPath ${p:2}
-        elif test "$p" = "-L"; then
-            addToLibPath ${p2}
-            n=$((n + 1))
-        elif test "$p" = "-l"; then
-            addToLibs ${p2}
-            n=$((n + 1))
-        elif test "${p:0:2}" = "-l"; then
-            addToLibs ${p:2}
-        elif test "$p" = "-dynamic-linker"; then
-            # Ignore the dynamic linker argument, or it 
-            # will get into the next 'elif'. We don't want
-            # the dynamic linker path rpath to go always first.
-            n=$((n + 1))
-        elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
-            # This is a direct reference to a shared library, so add
-            # its directory to the rpath.
-            path="$(dirname "$p")";
-            addToRPath "${path}"
-        fi
-        n=$((n + 1))
-    done
-
-    # Second, for each directory in the library search path (-L...),
-    # see if it contains a dynamic library used by a -l... flag.  If
-    # so, add the directory to the rpath.
-    # It's important to add the rpath in the order of -L..., so
-    # the link time chosen objects will be those of runtime linking.
-    
-    for i in $libPath; do
-        for j in $libs; do
-            if test -f "$i/lib$j.so"; then
-                addToRPath $i
-                break
-            fi
-        done
-    done
-    
-
-    # Finally, add `-rpath' switches.
-    for i in $rpath; do
-        extra=(${extra[@]} -rpath $i)
-    done
-fi
-
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @ld@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extra flags to @ld@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_LD_WRAPPER_EXEC_HOOK"
-fi
-
-exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh
deleted file mode 100644
index ad3ffeffbbb..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-gccWrapperOld_addCVars () {
-    if test -d $1/include; then
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"
-    fi
-
-    if test -d $1/lib64; then
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
-    fi
-
-    if test -d $1/lib; then
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
-    fi
-}
-
-envBuildBuildHooks+=(gccWrapperOld_addCVars)
-
-# Note: these come *after* $out in the PATH (see setup.sh).
-
-if test -n "@gcc@"; then
-    addToSearchPath PATH @gcc@/bin
-fi
-
-if test -n "@binutils@"; then
-    addToSearchPath PATH @binutils@/bin
-fi
-
-if test -n "@libc@"; then
-    addToSearchPath PATH @libc_bin@/bin
-fi
-
-if test -n "@coreutils@"; then
-    addToSearchPath PATH @coreutils@/bin
-fi
diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh
deleted file mode 100644
index fa19f91bf5d..00000000000
--- a/pkgs/build-support/gcc-wrapper-old/utils.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-skip () {
-    if test "$NIX_DEBUG" = "1"; then
-        echo "skipping impure path $1" >&2
-    fi
-}
-
-
-# Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but
-# `/nix/store/.../lib/foo.so' isn't.
-badPath() {
-    local p=$1
-    
-    # Relative paths are okay (since they're presumably relative to
-    # the temporary build directory).
-    if test "${p:0:1}" != "/"; then return 1; fi
-    
-    @extraPathTests@
-
-    # Otherwise, the path should refer to the store or some temporary
-    # directory (including the build directory).
-    test \
-        "$p" != "/dev/null" -a \
-        "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
-        "${p:0:4}" != "/tmp" -a \
-        "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
-}
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
deleted file mode 100644
index c63867a1d2d..00000000000
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ /dev/null
@@ -1,472 +0,0 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
-, langC ? true, langCC ? true, langFortran ? false
-, langJava ? false
-, langAda ? false
-, langVhdl ? false
-, profiledCompiler ? false
-, staticCompiler ? false
-, enableShared ? true
-, texinfo ? null
-, perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, libmpc, gettext, which
-, libelf                      # optional, for link-time optimizations (LTO)
-, ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework
-, zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null
-, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
-, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
-, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
-, gnatboot ? null
-, enableMultilib ? false
-, name ? "gcc"
-, libcCross ? null
-, crossStageStatic ? false
-, gnat ? null
-, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
-, buildPlatform, hostPlatform, targetPlatform
-, buildPackages
-}:
-
-assert langJava     -> zip != null && unzip != null
-                       && zlib != null && boehmgc != null
-                       && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
-
-# LTO needs libelf and zlib.
-assert libelf != null -> zlib != null;
-
-with stdenv.lib;
-with builtins;
-
-let version = "4.5.4";
-    javaEcj = fetchurl {
-      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
-      # `configure' time.
-
-      # XXX: Eventually we might want to take it from upstream.
-      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
-      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
-    };
-
-    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
-    # binary distribution here to allow the whole chain to be bootstrapped.
-    javaAntlr = fetchurl {
-      url = http://www.antlr.org/download/antlr-3.1.3.jar;
-      sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
-    };
-
-    xlibs = [
-      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
-      xproto renderproto xextproto inputproto randrproto
-    ];
-
-    javaAwtGtk = langJava && gtk2 != null;
-
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
-    /* Cross-gcc settings */
-    crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
-
-    crossConfigureFlags =
-      # Ensure that -print-prog-name is able to find the correct programs.
-      [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
-        "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
-      (if crossMingw && crossStageStatic then [
-        "--with-headers=${libcCross}/include"
-        "--with-gcc"
-        "--with-gnu-as"
-        "--with-gnu-ld"
-        "--with-gnu-ld"
-        "--disable-shared"
-        "--disable-nls"
-        "--disable-debug"
-        "--enable-sjlj-exceptions"
-        "--enable-threads=win32"
-        "--disable-win32-registry"
-      ] else if crossStageStatic then [
-        "--disable-libssp"
-        "--disable-nls"
-        "--without-headers"
-        "--disable-threads"
-        "--disable-libmudflap"
-        "--disable-libgomp"
-        "--disable-shared"
-        "--disable-decimal-float" # libdecnumber requires libc
-      ] else [
-        "--with-headers=${libcCross}/include"
-        "--enable-__cxa_atexit"
-        "--enable-long-long"
-      ] ++
-        (if crossMingw then [
-          "--enable-threads=win32"
-          "--enable-sjlj-exceptions"
-          "--enable-hash-synchronization"
-          "--enable-version-specific-runtime-libs"
-          "--enable-libssp"
-          "--disable-nls"
-          "--with-dwarf2"
-        ] else [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
-        ]));
-    stageNameAddon = if crossStageStatic then "-stage-static" else
-      "-stage-final";
-    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
-
-in
-
-# We need all these X libraries when building AWT with GTK+.
-assert gtk2 != null -> (filter (x: x == null) xlibs) == [];
-
-stdenv.mkDerivation ({
-  name = "${name}-${version}" + crossNameAddon;
-
-  builder = ../builder.sh;
-
-  src = (import ./sources.nix) {
-    inherit fetchurl optional version;
-    inherit langC langCC langFortran langJava langAda;
-  };
-
-  hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all";
-
-  outputs = [ "out" "man" "info" ]
-    ++ optional (!(hostPlatform.is64bit && langAda)) "lib";
-
-  setOutputFlags = false;
-  NIX_NO_SELF_RPATH = true;
-
-  libc_dev = stdenv.cc.libc_dev;
-
-  patches =
-    [ ]
-    ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
-    ++ optional noSysDirs ./no-sys-dirs.patch
-    # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-    # target libraries and tools.
-    ++ optional langAda ../gnat-cflags.patch
-    ++ optional langVhdl ./ghdl-ortho-cflags.patch
-    ++ [ ../struct-ucontext-4.5.patch ] # glibc-2.26
-    ;
-
-  postPatch =
-    if (stdenv.system == "i586-pc-gnu"
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"
-            && libcCross != null))
-    then
-      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
-      # in glibc, so add the right `-I' flags to the default spec string.
-      assert libcCross != null -> libpthreadCross != null;
-      let
-        libc = if libcCross != null then libcCross else stdenv.glibc;
-        gnu_h = "gcc/config/gnu.h";
-        i386_gnu_h = "gcc/config/i386/gnu.h";
-        extraCPPDeps =
-             libc.propagatedBuildInputs
-          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
-          ++ stdenv.lib.optional (libpthread != null) libpthread;
-        extraCPPSpec =
-          concatStrings (intersperse " "
-                          (map (x: "-I${x.dev or x}/include") extraCPPDeps));
-        extraLibSpec =
-          if libpthreadCross != null
-          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
-          else "-L${libpthread}/lib";
-      in
-        '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..."
-           sed -i "${i386_gnu_h}" \
-               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
-
-           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
-           sed -i "${gnu_h}" \
-               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
-
-           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
-           sed -i "${gnu_h}" \
-               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
-           sed -i gcc/config/t-gnu \
-               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g'
-        ''
-    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
-      # On NixOS, use the right path to the dynamic linker instead of
-      # `/lib/ld*.so'.
-      let
-        libc = if libcCross != null then libcCross else stdenv.cc.libc;
-      in
-        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
-           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
-           do
-             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
-             echo "  fixing \`$header'..."
-             sed -i "$header" \
-                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
-           done
-        ''
-    else null;
-
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs profiledCompiler staticCompiler langJava
-    libcCross crossMingw;
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ texinfo which gettext ]
-    ++ optional (perl != null) perl;
-
-  # For building runtime libs
-  depsBuildTarget =
-    if hostPlatform == buildPlatform then [
-      targetPackages.stdenv.cc.bintools # newly-built gcc will be used
-    ] else assert targetPlatform == hostPlatform; [ # build != host == target
-      stdenv.cc
-    ];
-
-  buildInputs = [
-    gmp mpfr libmpc libelf
-    targetPackages.stdenv.cc.bintools # For linking code at run-time
-  ] ++ (optional (ppl != null) ppl)
-    ++ (optional (cloogppl != null) cloogppl)
-    ++ (optional (zlib != null) zlib)
-    ++ (optional langJava boehmgc)
-    ++ (optionals langJava [zip unzip])
-    ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
-    ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
-    ;
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-
-  configureFlags =
-    # Basic dependencies
-    [
-      "--with-gmp=${gmp.dev}"
-      "--with-mpfr=${mpfr.dev}"
-      "--with-mpc=${libmpc}"
-    ] ++
-    optional (libelf != null) "--with-libelf=${libelf}" ++
-    optional (!(crossMingw && crossStageStatic))
-      "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
-
-    # Basic configuration
-    [
-      "--disable-libstdcxx-pch"
-      "--without-included-gettext"
-      "--with-system-zlib"
-      "--enable-languages=${
-        concatStrings (intersperse ","
-          (  optional langC        "c"
-          ++ optional langCC       "c++"
-          ++ optional langFortran  "fortran"
-          ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
-          )
-        )
-      }"
-    ] ++
-    optional (!enableMultilib) "--disable-multilib" ++
-    optional (!enableShared) "--disable-shared" ++
-
-    # Optional features
-    optional (cloogppl != null) "--with-cloog=${cloogppl}" ++
-    optional (ppl != null) "--with-ppl=${ppl}" ++
-
-    # Java options
-    optionals langJava [
-      "--with-ecj-jar=${javaEcj}"
-
-      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
-      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
-      "--enable-java-home"
-      "--with-java-home=\${prefix}/lib/jvm/jre"
-    ] ++
-    optional javaAwtGtk "--enable-java-awt=gtk" ++
-    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
-    # Ada
-    optional langAda "--enable-libada" ++
-
-    platformFlags ++
-    optional (targetPlatform != hostPlatform) crossConfigureFlags ++
-
-    # Platform-specific flags
-    optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
-    # Trick that should be taken out once we have a mipsel-linux not loongson2f
-    optional (targetPlatform == hostPlatform && stdenv.system == "mipsel-linux") "--with-arch=loongson2f"
-  ;
-
-  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
-
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-  };
-
-  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
-  # library headers and binaries, regarless of the language being compiled.
-  #
-  # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
-  # `--with-gmp' et al., e.g., when building
-  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
-  # them to $CPATH and $LIBRARY_PATH in this case.
-  #
-  # Likewise, the LTO code doesn't find zlib.
-  #
-  # Cross-compiling, we need gcc not to read ./specs in order to build the g++
-  # compiler (after the specs for the cross-gcc are created). Having
-  # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
-
-  CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
-    ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
-    ++ optional (libpthread != null) libpthread
-    ++ optional (libpthreadCross != null) libpthreadCross
-
-    # On GNU/Hurd glibc refers to Mach & Hurd
-    # headers.
-    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
-                 libcCross.propagatedBuildInputs
-  ));
-
-  LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
-    ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
-    ++ optional (libpthread != null) libpthread)
-  );
-
-  EXTRA_TARGET_FLAGS = optionals
-    (targetPlatform != hostPlatform && libcCross != null)
-    ([
-      "-idirafter ${libcCross.dev}/include"
-    ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
-    ]);
-
-  EXTRA_TARGET_LDFLAGS = optionals
-    (targetPlatform != hostPlatform && libcCross != null)
-    ([
-      "-Wl,-L${libcCross.out}/lib"
-    ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
-      ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
-    ]) ++ optionals (libpthreadCross != null) [
-      "-L${libpthreadCross}/lib"
-      "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
-    ]);
-
-  passthru = {
-    inherit langC langCC langAda langFortran langVhdl enableMultilib version;
-    isGNU = true;
-    hardeningUnsupportedFlags = [ "stackprotector" ];
-  };
-
-  enableParallelBuilding = !langAda;
-
-  meta = {
-    homepage = http://gcc.gnu.org/;
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
-    description = "GNU Compiler Collection, version ${version}"
-      + (if stripped then "" else " (with debugging info)");
-
-    longDescription = ''
-      The GNU Compiler Collection includes compiler front ends for C, C++,
-      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
-      as libraries for these languages (libstdc++, libgcj, libgomp,...).
-
-      GCC development is a part of the GNU Project, aiming to improve the
-      compiler used in the GNU system including the GNU/Linux variant.
-    '';
-
-    maintainers = [
-      stdenv.lib.maintainers.viric
-    ];
-
-    # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
-    platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];
-  };
-}
-
-// optionalAttrs (targetPlatform != hostPlatform || libcCross != null) {
-  # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of,
-  # say, "i586-pc-gnu-gcc -E" when building `gcc.crossDrv'.
-  # FIXME: Fix `builder.sh' directly in the next stdenv-update.
-  postUnpack = "unset CPP";
-}
-
-// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
-  makeFlags = [ "all-gcc" "all-target-libgcc" ];
-  installTargets = "install-gcc install-target-libgcc";
-}
-
-# GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do
-# the stripping by default.
-// optionalAttrs (!stripped) { dontStrip = true; }
-
-// optionalAttrs langVhdl rec {
-  name = "ghdl-0.29";
-
-  ghdlSrc = fetchurl {
-    url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2";
-    sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva";
-  };
-
-  # Ghdl has some timestamps checks, storing file timestamps in '.cf' files.
-  # As we will change the timestamps to 1970-01-01 00:00:01, we also set the
-  # content of that .cf to that value. This way ghdl does not complain on
-  # the installed object files from the basic libraries (ieee, ...)
-  postInstallGhdl = ''
-    pushd $out
-    find . -name "*.cf" -exec \
-        sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \;
-    popd
-  '';
-
-  postUnpack = ''
-    tar xvf ${ghdlSrc}
-    mv ghdl-*/vhdl gcc*/gcc
-    rm -Rf ghdl-*
-  '';
-
-  meta = {
-    homepage = http://ghdl.free.fr/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    description = "Complete VHDL simulator, using the GCC technology (gcc ${version})";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-
-})
diff --git a/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch
deleted file mode 100644
index 901534591c8..00000000000
--- a/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in
-index 8f481df..681ac59 100644
---- a/gcc/vhdl/Make-lang.in
-+++ b/gcc/vhdl/Make-lang.in
-@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../
- AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \
-  -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \
-  -I$(AGCC_GCCSRC_DIR)/libcpp/include
--AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS)
-+AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES)
- 
- AGCC_LOCAL_OBJS=ortho-lang.o
- 
-@@ -140,7 +140,7 @@ ghdl$(exeext): force
- 
- # Ghdl libraries.
- ghdllib: ghdl$(exeext) $(GCC_PASSES) force
--	$(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib
-+	$(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib
- 
- # Build hooks:
- 
-diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in
-index d754c6c..07abc4a 100644
---- a/gcc/vhdl/Makefile.in
-+++ b/gcc/vhdl/Makefile.in
-@@ -80,7 +80,8 @@ T_CPPFLAGS =
- X_ADAFLAGS =
- T_ADAFLAGS =
- 
--ADAC = $(CC)
-+# Never use the bootstrapped compiler, as it may not be built for ada
-+ADAC = gcc
- 
- ECHO = echo
- CHMOD = chmod
-diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c
-index 84aeb92..8eddd42 100644
---- a/gcc/vhdl/ortho-lang.c
-+++ b/gcc/vhdl/ortho-lang.c
-@@ -16,6 +16,7 @@
- #include "options.h"
- #include "real.h"
--#include "tree-gimple.h"
-+#include "gimple.h"
-+#include "tree.h"
- #include "function.h"
- #include "cgraph.h"
- #include "target.h"
-@@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp)
- 
- const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
- 
--/* Tree code classes.  */
--
--#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
--
--const enum tree_code_class tree_code_type[] = {
--#include "tree.def"
--  'x'
--};
--#undef DEFTREECODE
--
--/* Table indexed by tree code giving number of expression
--   operands beyond the fixed part of the node structure.
--   Not used for types or decls.  */
--
--#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
--
--const unsigned char tree_code_length[] = {
--#include "tree.def"
--  0
--};
--#undef DEFTREECODE
--
--#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME,
--const char * const tree_code_name[] = {
--#include "tree.def"
--  "@@dummy"
--};
--#undef DEFTREECODE
- 
- union lang_tree_node 
-   GTY((desc ("0"),
--       chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)")))
-+       chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)")))
- {
-   union tree_node GTY ((tag ("0"))) generic;
- };
-@@ -1162,7 +1135,7 @@ new_access_type (tree dtype)
-       res = make_node (POINTER_TYPE);
-       TREE_TYPE (res) = NULL_TREE;
-       /* Seems necessary.  */
--      TYPE_MODE (res) = Pmode;
-+      SET_TYPE_MODE (res, Pmode);
-       layout_type (res);
-       return res;
-     }
-diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in
-index e201f64..f36fb97 100644
---- a/gcc/vhdl/Make-lang.in
-+++ b/gcc/vhdl/Make-lang.in
-@@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force
- 	 -cargs $(CFLAGS) $(GHDL_ADAFLAGS)
- 	$(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \
- 	 -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \
--	 -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS)
-+	 -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS)
- 
- # The driver for ghdl.
- ghdl$(exeext): force
diff --git a/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch
deleted file mode 100644
index 8128fa87da5..00000000000
--- a/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c
---- gcc-4.3.1-orig/gcc/cppdefault.c	2007-07-26 10:37:01.000000000 +0200
-+++ gcc-4.3.1/gcc/cppdefault.c	2008-06-25 17:48:23.000000000 +0200
-@@ -41,6 +41,10 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+#undef LOCAL_INCLUDE_DIR
-+#undef SYSTEM_INCLUDE_DIR
-+#undef STANDARD_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
-diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c
---- gcc-4.3.1-orig/gcc/gcc.c	2008-03-02 23:55:19.000000000 +0100
-+++ gcc-4.3.1/gcc/gcc.c	2008-06-25 17:52:53.000000000 +0200
-@@ -1478,10 +1478,10 @@
- /* Default prefixes to attach to command names.  */
- 
- #ifndef STANDARD_STARTFILE_PREFIX_1
--#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_1 ""
- #endif
- #ifndef STANDARD_STARTFILE_PREFIX_2
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 ""
- #endif
- 
- #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
---- gcc-4.3.1-orig/gcc/Makefile.in	2008-05-11 20:54:15.000000000 +0200
-+++ gcc-4.3.1/gcc/Makefile.in	2008-06-25 17:48:23.000000000 +0200
-@@ -378,7 +378,11 @@
- MD5_H	    = $(srcdir)/../include/md5.h
- 
- # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
--NATIVE_SYSTEM_HEADER_DIR = /usr/include
-+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
-+# `fixinc' from fixing header files in /usr/include.  However,
-+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
-+# it to some dummy directory.
-+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
- # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
- CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
- 
-@@ -3277,7 +3281,7 @@
-   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
-   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
--  -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
-+  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
-   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
-   -DPREFIX=\"$(prefix)/\" \
diff --git a/pkgs/development/compilers/gcc/4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix
deleted file mode 100644
index 71e1e483cac..00000000000
--- a/pkgs/development/compilers/gcc/4.5/sources.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Automatically generated by `update-gcc.sh', do not edit.
-   For GCC 4.5.4.  */
-{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
-
-assert version == "4.5.4";
-optional /* langC */ true (fetchurl {
-  url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-  sha256 = "894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a";
-}) ++
-optional langCC (fetchurl {
-  url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-  sha256 = "f7e3bab5e22713fbce46c2acb35fb727748473a34a942ce00393d75e1b09b6b9";
-}) ++
-optional langFortran (fetchurl {
-  url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-  sha256 = "cf0803b4f5334a526dd8da1b2171d6724f50c17346b2d5c509b6abc973d2ef34";
-}) ++
-optional langJava (fetchurl {
-  url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-  sha256 = "c98398da6f8c4c7d1758e291089d99853fdd27112cd3f146b7a8c26e6d762a23";
-}) ++
-optional langAda (fetchurl {
-  url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
-  sha256 = "8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e";
-}) ++
-[]
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 36adfd075df..0a6ea59e5ac 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -3,8 +3,6 @@
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
-, langAda ? false
-, langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
@@ -21,13 +19,11 @@
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , x11Support ? langJava
-, gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
 , crossStageStatic ? false
-, gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
@@ -39,8 +35,6 @@
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
 
 # We enable the isl cloog backend.
 assert cloog != null -> isl != null;
@@ -68,9 +62,6 @@ let version = "4.8.5";
       ++ optional enableParallelBuilding ../parallel-bconfig.patch
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
-      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-      # target libraries and tools.
-      ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch
       ++ [(fetchpatch {
@@ -279,8 +270,6 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
@@ -330,8 +319,6 @@ stdenv.mkDerivation ({
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
           ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -369,9 +356,6 @@ stdenv.mkDerivation ({
     optional javaAwtGtk "--enable-java-awt=gtk" ++
     optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
 
-    # Ada
-    optional langAda "--enable-libada" ++
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -464,7 +448,7 @@ stdenv.mkDerivation ({
     ]);
 
   passthru = {
-    inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version;
+    inherit langC langCC langObjC langObjCpp langFortran langGo version;
     isGNU = true;
     hardeningUnsupportedFlags = [ "stackprotector" ];
   };
@@ -490,13 +474,11 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
       stdenv.lib.platforms.illumos ++
-      optionals (langAda == false) stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c436da678fd..5dfdbd02cbf 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -3,8 +3,6 @@
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
-, langAda ? false
-, langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
@@ -21,13 +19,11 @@
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , x11Support ? langJava
-, gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
 , crossStageStatic ? false
-, gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
@@ -39,8 +35,6 @@
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
 
 # We enable the isl cloog backend.
 assert cloog != null -> isl != null;
@@ -69,9 +63,6 @@ let version = "4.9.4";
       ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
-      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-      # target libraries and tools.
-      ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26
       ;
@@ -284,8 +275,6 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
@@ -338,8 +327,6 @@ stdenv.mkDerivation ({
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
           ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -377,9 +364,6 @@ stdenv.mkDerivation ({
     optional javaAwtGtk "--enable-java-awt=gtk" ++
     optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
 
-    # Ada
-    optional langAda "--enable-libada" ++
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -472,7 +456,7 @@ stdenv.mkDerivation ({
     ]);
 
   passthru =
-    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+    { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
 
   inherit enableParallelBuilding enableMultilib;
 
@@ -495,13 +479,11 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
       stdenv.lib.platforms.illumos ++
-      optionals (langAda == false) stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index b9ca8696d4e..e42bb736676 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -3,8 +3,6 @@
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
-, langAda ? false
-, langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
@@ -21,13 +19,11 @@
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , x11Support ? langJava
-, gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
 , crossStageStatic ? false
-, gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
@@ -40,8 +36,6 @@
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
 
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
@@ -67,9 +61,6 @@ let version = "5.5.0";
       [ ../use-source-date-epoch.patch ]
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
-      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-      # target libraries and tools.
-      ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
 
       # This could be applied unconditionally but I don't want to cause a full
@@ -306,8 +297,6 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
@@ -359,8 +348,6 @@ stdenv.mkDerivation ({
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
           ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -393,9 +380,6 @@ stdenv.mkDerivation ({
     optional javaAwtGtk "--enable-java-awt=gtk" ++
     optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
 
-    # Ada
-    optional langAda "--enable-libada" ++
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -489,7 +473,7 @@ stdenv.mkDerivation ({
     ]);
 
   passthru =
-    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+    { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
 
   inherit enableParallelBuilding enableMultilib;
 
@@ -512,12 +496,10 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
-      optionals (langAda == false) stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index df0c1578dae..cf71f51627c 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -3,8 +3,6 @@
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
-, langAda ? false
-, langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
@@ -21,13 +19,11 @@
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , x11Support ? langJava
-, gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
 , crossStageStatic ? false
-, gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
@@ -40,8 +36,6 @@
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
 
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
@@ -66,9 +60,6 @@ let version = "6.4.0";
       [ ../use-source-date-epoch.patch ]
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
-      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-      # target libraries and tools.
-      ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
       ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
@@ -306,8 +297,6 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
@@ -363,8 +352,6 @@ stdenv.mkDerivation ({
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
           ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -397,9 +384,6 @@ stdenv.mkDerivation ({
     optional javaAwtGtk "--enable-java-awt=gtk" ++
     optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
 
-    # Ada
-    optional langAda "--enable-libada" ++
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -492,7 +476,7 @@ stdenv.mkDerivation ({
     ]);
 
   passthru =
-    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+    { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
 
   inherit enableParallelBuilding enableMultilib;
 
@@ -515,12 +499,10 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
-      optionals (langAda == false) stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 68a47987b2e..8e7cd3d3fab 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -3,8 +3,6 @@
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
-, langAda ? false
-, langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
@@ -21,13 +19,11 @@
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , x11Support ? langJava
-, gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
 , crossStageStatic ? false
-, gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
@@ -40,8 +36,6 @@
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
 
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
@@ -70,9 +64,6 @@ let version = "7.3.0";
         url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
         sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
       })
-      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-      # target libraries and tools.
-      ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
          # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html
       ++ optional targetPlatform.isRiscV ./riscv-pthread-reentrant.patch;
@@ -308,8 +299,6 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
@@ -361,8 +350,6 @@ stdenv.mkDerivation ({
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
           ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -395,8 +382,6 @@ stdenv.mkDerivation ({
     optional javaAwtGtk "--enable-java-awt=gtk" ++
     optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
 
-    # Ada
-    optional langAda "--enable-libada" ++
 
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
@@ -490,7 +475,7 @@ stdenv.mkDerivation ({
     ]);
 
   passthru =
-    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+    { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
 
   inherit enableParallelBuilding enableMultilib;
 
@@ -513,12 +498,10 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ ];
 
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
-      optionals (langAda == false) stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.darwin;
   };
 }
 
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 1796c83385e..a3250f4021a 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -287,8 +287,6 @@ postInstall() {
     # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31
     paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus}
 
-    eval "$postInstallGhdl"
-
     # Two identical man pages are shipped (moving and compressing is done later)
     ln -sf gcc.1 "$out"/share/man/man1/g++.1
 }
diff --git a/pkgs/development/compilers/gcc/gnat-cflags.patch b/pkgs/development/compilers/gcc/gnat-cflags.patch
deleted file mode 100644
index bf2acf065e9..00000000000
--- a/pkgs/development/compilers/gcc/gnat-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libada/Makefile.in b/libada/Makefile.in
-index f5057a0..337e0c6 100644
---- a/libada/Makefile.in
-+++ b/libada/Makefile.in
-@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
- WARN_CFLAGS = @warn_cflags@
- 
- TARGET_LIBGCC2_CFLAGS=
--GNATLIBCFLAGS= -g -O2
-+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
- GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
- 	-DIN_RTS @have_getipinfo@
- 
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
- SOME_ADAFLAGS =-gnata
- FORCE_DEBUG_ADAFLAGS = -g
- GNATLIBFLAGS = -gnatpg -nostdinc
--GNATLIBCFLAGS = -g -O2
-+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
- # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
- # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libgcc
-+GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
- 
- # End of variables for you to override.
- 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index c1306d374d5..e41e8789c9e 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -3,8 +3,6 @@
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
-, langAda ? false
-, langVhdl ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
@@ -21,13 +19,11 @@
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , x11Support ? langJava
-, gnatboot ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
 , crossStageStatic ? false
-, gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
 , gnused ? null
@@ -41,8 +37,6 @@
 assert langJava     -> zip != null && unzip != null
                        && zlib != null && boehmgc != null
                        && perl != null;  # for `--enable-java-home'
-assert langAda      -> gnatboot != null;
-assert langVhdl     -> gnat != null;
 
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
@@ -67,9 +61,6 @@ let version = "7-20170409";
       [ ]
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
-      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
-      # target libraries and tools.
-      ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch;
 
     javaEcj = fetchurl {
@@ -278,8 +269,6 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-    ++ (optionals langAda [gnatboot])
-    ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
@@ -331,8 +320,6 @@ stdenv.mkDerivation ({
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
           ++ optional langJava     "java"
-          ++ optional langAda      "ada"
-          ++ optional langVhdl     "vhdl"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -365,9 +352,6 @@ stdenv.mkDerivation ({
     optional javaAwtGtk "--enable-java-awt=gtk" ++
     optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
 
-    # Ada
-    optional langAda "--enable-libada" ++
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -460,7 +444,7 @@ stdenv.mkDerivation ({
     ]);
 
   passthru =
-    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+    { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
 
   inherit enableParallelBuilding enableMultilib;
 
@@ -483,12 +467,10 @@ stdenv.mkDerivation ({
 
     maintainers = with stdenv.lib.maintainers; [ ];
 
-    # gnatboot is not available out of linux platforms, so we disable the darwin build
-    # for the gnat (ada compiler).
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
-      optionals (langAda == false) stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.darwin;
 
     broken = true;
   };
diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
deleted file mode 100644
index eaf9949b52d..00000000000
--- a/pkgs/development/compilers/ghdl/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchFromGitHub, gnat, zlib, llvm_35, ncurses, clang, flavour ? "mcode" }:
-
-# mcode only works on x86, while the llvm flavour works on both x86 and x86_64.
-
-
-assert flavour == "llvm" || flavour == "mcode";
-
-let
-  inherit (stdenv.lib) optional;
-  inherit (stdenv.lib) optionals;
-  version = "0.33";
-in
-stdenv.mkDerivation rec {
-  name = "ghdl-${flavour}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "tgingold";
-    repo = "ghdl";
-    rev = "v${version}";
-    sha256 = "0g72rk2yzr0lrpncq2c1qcv71w3mi2hjq84r1yzgjr6d0qm87r2a";
-  };
-
-  buildInputs = [ gnat zlib ] ++ optionals (flavour == "llvm") [ clang ncurses ];
-
-  configureFlags = optional (flavour == "llvm") "--with-llvm=${llvm_35}";
-
-  patchPhase = ''
-    # Disable warnings-as-errors, because there are warnings (unused things)
-    sed -i s/-gnatwae/-gnatwa/ Makefile.in ghdl.gpr.in
-  '';
-
-  hardeningDisable = [ "all" ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = https://sourceforge.net/p/ghdl-updates/wiki/Home/;
-    description = "Free VHDL simulator";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ]
-      else [ "i686-linux" ]);
-    license = stdenv.lib.licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix
deleted file mode 100644
index a209e392bc6..00000000000
--- a/pkgs/development/compilers/gnatboot/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gentoo-gnatboot-4.1";
-
-  src = if stdenv.system == "i686-linux" then
-    fetchurl {
-      url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2";
-      sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr";
-    }
-    else if stdenv.system == "x86_64-linux" then
-    fetchurl {
-      url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2";
-      sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4";
-    } else throw "Platform not supported";
-
-  dontStrip=1;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -R * $out
-    set +e
-    for a in $out/bin/* ; do
-      patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a
-    done
-    set -e
-    mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc
-    ln -s $out/bin/gnatgcc $out/bin/gcc
-  '';
-
-  passthru = {
-    langC = true; /* TRICK for gcc-wrapper to wrap it */
-    langCC = false;
-    langFortran = false;
-    langAda = true;
-  };
-
-  meta = {
-    homepage = http://gentoo.org;
-    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
-    maintainers = [
-      stdenv.lib.maintainers.viric
-    ];
-    
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63f9c1686a7..d5ac725f90d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5958,20 +5958,6 @@ with pkgs;
     inherit binutils;
   };
 
-  gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
-    inherit noSysDirs;
-    texinfo = texinfo4;
-
-    ppl = null;
-    cloogppl = null;
-
-    # bootstrapping a profiled compiler does not work in the sheevaplug:
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = !stdenv.isArm;
-
-    libcCross = if targetPlatform != buildPlatform then libcCross else null;
-  }));
-
   gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {
     inherit noSysDirs;
 
@@ -6096,23 +6082,6 @@ with pkgs;
     inherit (gnome2) libart_lgpl;
   });
 
-  gnat = gnat45; # failed to make 4.6 or 4.8 build
-
-  gnat45 = wrapCC (gcc45.cc.override {
-    name = "gnat";
-    langCC = false;
-    langC = true;
-    langAda = true;
-    profiledCompiler = false;
-    inherit gnatboot;
-    # We can't use the ppl stuff, because we would have
-    # libstdc++ problems.
-    cloogppl = null;
-    ppl = null;
-  });
-
-  gnatboot = wrapGCC-old (callPackage ../development/compilers/gnatboot {});
-
   gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk {
     emacsSupport = config.emacsSupport or false;
   };
@@ -6126,14 +6095,6 @@ with pkgs;
     profiledCompiler = false;
   });
 
-  ghdl_mcode = callPackage_i686 ../development/compilers/ghdl {
-    flavour = "mcode";
-  };
-
-  ghdl_llvm = callPackage ../development/compilers/ghdl {
-    flavour = "llvm";
-  };
-
   gcl = callPackage ../development/compilers/gcl {
     gmp = gmp4;
   };
@@ -6791,14 +6752,6 @@ with pkgs;
     bintools = if targetPlatform.isDarwin then darwin.binutils else binutils;
     libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
   };
-  # legacy version, used for gnat bootstrapping
-  wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
-    nativeTools = stdenv.cc.nativeTools or false;
-    nativeLibc = stdenv.cc.nativeLibc or false;
-    nativePrefix = stdenv.cc.nativePrefix or "";
-    gcc = baseGCC;
-    libc = glibc;
-  };
 
   wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun {
     nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 391d79e47f1..ca4036dad80 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -48,7 +48,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   gcj = linux;
   glibc = linux;
   glibcLocales = linux;
-  gnat = linux;
   gnugrep = all;
   gnum4 = all;
   gnumake = all;

From 42c33ce12f59d36d11d3d5cb74aca460168fc737 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 8 Mar 2018 12:56:55 -0600
Subject: [PATCH 0494/2266] llvmPackages_6: build using gcc6 on i686, like
 others.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7053ab77cb..9226cd30f87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6539,9 +6539,12 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
-  llvmPackages_6 = callPackage ../development/compilers/llvm/6 {
+  llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
     inherit (stdenvAdapters) overrideCC;
-  };
+  } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  });
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (

From 56bfad192ad9d7e6a2b8e0f67a1135734a67631e Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Thu, 8 Mar 2018 19:15:54 +0000
Subject: [PATCH 0495/2266] bumping ATS2 version form 0.3.7 to 0.3.9

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

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 6c523ebb4f1..579af7a8d23 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
 , withContrib ? true }:
 
 let
-  versionPkg = "0.3.7" ;
+  versionPkg = "0.3.9" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "1w59ir9ij5bvvnxj6fb1rvzycfqa57i31wmpwawxbsb10bqwzyr6";
+    sha256 = "627bb99ecf2e3d5976f95f2faa13c7c330726601e8bb05a2113c9b69c98749b5";
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "19nxyi39fn42sp38kl14a6pvbxq9wr8y405wx0zz7mqb77r0m0h5";
+    sha256 = "c69a7c58964df26227e77656659129ca4c05205d2ebcacc7084edba818fb6e81";
   };
 
   buildInputs = [ gmp ];

From daafd1d71f9592fa85bde7ab7f42a73acaafc9d4 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Thu, 8 Mar 2018 19:15:30 +0000
Subject: [PATCH 0496/2266] citrix-receiver: 13.8.0 -> 13.9.0

The "A network error occured (SSL error 4)" is finally fixed!
---
 .../remote/citrix-receiver/default.nix        | 25 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  5 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 00332754c26..51a37d3152b 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -69,18 +69,29 @@ let
       x86hash   = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6";
       x64suffix = "10276927";
       x86suffix = "10276925";
-      homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html;
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html;
     };
 
     "13.8.0" = {
-      major = "13";
-      minor = "8";
-      patch = "0";
-      x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931";
-      x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7";
+      major     = "13";
+      minor     = "8";
+      patch     = "0";
+      x64hash   = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931";
+      x86hash   = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7";
       x64suffix = "10299729";
       x86suffix = "10299729";
-      homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html;
+    };
+
+    "13.9.0" = {
+      major     = "13";
+      minor     = "9";
+      patch     = "0";
+      x64hash   = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9";
+      x86hash   = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag";
+      x64suffix = "102";
+      x86suffix = "102";
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
     };
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9226cd30f87..acae743c2c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1581,9 +1581,8 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)"
-  # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735
-  citrix_receiver        = hiPrio citrix_receiver_13_8_0;
+  citrix_receiver        = hiPrio citrix_receiver_13_9_0;
+  citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; };
   citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; };
   citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };
   citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; };

From 365a2e5acc618cc6a4e6097f183f090b539b34ff Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 11:29:17 -0800
Subject: [PATCH 0497/2266] gmsh: 3.0.5 -> 3.0.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.6 with grep in /nix/store/ha4gl4kswiq7pz4chb1ba9ixb51rcdsn-gmsh-3.0.6
- found 3.0.6 in filename of file in /nix/store/ha4gl4kswiq7pz4chb1ba9ixb51rcdsn-gmsh-3.0.6
---
 pkgs/applications/science/math/gmsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 96b800661a7..33b458ba30a 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "3.0.5"; in
+let version = "3.0.6"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "ae39ed81178d94b76990b8c89b69a5ded8910fd8f7426b800044d00373d12a93";
+    sha256 = "0ywqhr0zmdhn8dvi6l8z1vkfycyv67fdrz6b95mb39np832bq04p";
   };
 
   # The original CMakeLists tries to use some version of the Lapack lib

From 0d980165c97bec84a1dfe75f414d4f32306d0551 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 8 Mar 2018 20:44:43 +0100
Subject: [PATCH 0498/2266] libreswan: fix build with gcc7

---
 pkgs/tools/networking/libreswan/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index b2024f55c4e..fd2461f5171 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -25,7 +25,12 @@ stdenv.mkDerivation {
   };
 
   # These flags were added to compile v3.18. Try to lift them when updating.
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" ];
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
+    # these flags were added to build with gcc7
+    "-Wno-error=implicit-fallthrough"
+    "-Wno-error=format-truncation"
+    "-Wno-error=pointer-compare"
+  ];
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent

From 393235f9d61051a16f123dde3022eebde9e4500b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 11:44:47 -0800
Subject: [PATCH 0499/2266] gmtp: 1.3.10 -> 1.3.11

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.11 with grep in /nix/store/8lp6lwxfy7zq94jd2f26vgxc1zs0scfm-gmtp-1.3.11
- found 1.3.11 in filename of file in /nix/store/8lp6lwxfy7zq94jd2f26vgxc1zs0scfm-gmtp-1.3.11
---
 pkgs/applications/misc/gmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index 776a10b7e0c..423eea914b9 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -2,14 +2,14 @@
 , gsettings-desktop-schemas, wrapGAppsHook
 }:
 
-let version = "1.3.10"; in
+let version = "1.3.11"; in
 
 stdenv.mkDerivation {
   name = "gmtp-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
-    sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b";
+    sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From d940c7913066b2afa2867bfdce388be421acee8a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 8 Mar 2018 20:49:52 +0100
Subject: [PATCH 0500/2266] bitcoin-abc: 0.16.0 -> 0.16.2

---
 pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++--
 pkgs/applications/altcoins/default.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 011e3cd7c87..219ab5d4f80 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.16.0";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh";
+    sha256 = "0d5npn4p321jqsbqjxkbv0ncvs2hp9vdp30np6n8n53f896cxl92";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index a4caf8d4ef5..e564ceb604b 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
+{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
 
 rec {
 
@@ -7,8 +7,8 @@ rec {
   bitcoin  = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
 
-  bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
-  bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };
+  bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; };
+  bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; };
 
   bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
   bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };

From b3d39c6555336e0bb140fc2f39c62921c2bc9c64 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 12:02:01 -0800
Subject: [PATCH 0501/2266] gnubg: 1.04.000 -> 1.06.001

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg --help` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg -v` and found version 1.06.001
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg --version` and found version 1.06.001
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makebearoff -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makebearoff --help` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makehyper -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makehyper --help` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/bearoffdump -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/bearoffdump --help` got 0 exit code
- found 1.06.001 with grep in /nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001
- found 1.06.001 in filename of file in /nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001
---
 pkgs/games/gnubg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix
index 1527a22b4ab..01815cade5e 100644
--- a/pkgs/games/gnubg/default.nix
+++ b/pkgs/games/gnubg/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }:
 
-let version = "1.04.000"; in
+let version = "1.06.001"; in
 stdenv.mkDerivation {
   name = "gnubg-"+version;
 
   src = fetchurl {
     url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz";
-    sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6";
+    sha256 = "0snz3j1bvr25ji7lg82bl2gm2s2x9lrpc7viw0hclgz0ql74cw7b";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From bbd8664e01233df2701945240f50add617131f56 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 8 Mar 2018 20:59:40 +0100
Subject: [PATCH 0502/2266] bitcoin-classic: 1.3.6 -> 1.3.8

---
 pkgs/applications/altcoins/bitcoin-classic.nix | 4 ++--
 pkgs/applications/altcoins/default.nix         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 9a2145d91cf..31c8ed6fc8d 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
-  version = "1.3.6";
+  version = "1.3.8";
 
   src = fetchFromGitHub {
     owner = "bitcoinclassic";
     repo = "bitcoinclassic";
     rev = "v${version}";
-    sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07";
+    sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index a4caf8d4ef5..17faaacceba 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
+{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
 
 rec {
 
@@ -13,8 +13,8 @@ rec {
   bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
   bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
 
-  bitcoin-classic  = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
-  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
+  bitcoin-classic  = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; };
+  bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; };
 
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };

From c6d3f0d3c659bb6698eefb80fe6f5136449984a5 Mon Sep 17 00:00:00 2001
From: wchresta <34962284+wchresta@users.noreply.github.com>
Date: Thu, 8 Mar 2018 11:28:58 +0100
Subject: [PATCH 0503/2266] tamarin-prover: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index bed7eb65e32..796b36c9173 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -4,12 +4,12 @@
 }:
 
 let
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchFromGitHub {
     owner  = "tamarin-prover";
     repo   = "tamarin-prover";
-    rev    = "8e823691ad3325bce8921617b013735523d74557";
-    sha256 = "0rr2syl9xhv17bwky5p39mhn0bypr24h8pld1xidxv87vy7vk7nr";
+    rev    = "120c7e706f3e1d4646b233faf2bc9936834ed9d3";
+    sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x";
   };
 
   # tamarin has its own dependencies, but they're kept inside the repo,

From f2661ed72b23583a75fdd415d07c7638bc19d98e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 8 Mar 2018 21:24:37 +0100
Subject: [PATCH 0504/2266] libjack2: remove clang patch

/cc ZHF #36454
---
 pkgs/misc/jackaudio/clang.patch | 22 ----------------------
 pkgs/misc/jackaudio/default.nix |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/misc/jackaudio/clang.patch

diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch
deleted file mode 100644
index 131f8c4c04d..00000000000
--- a/pkgs/misc/jackaudio/clang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test.cpp b/tests/test.cpp
-index 8a8a811..31e8459 100644
---- a/tests/test.cpp
-+++ b/tests/test.cpp
-@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
- 	jack_nframes_t delta_time = cur_time - last_time;
- 
- 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
--	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
-+	if (delta_time > 0  && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) {
- 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
- 	}
- 
-@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[])
-     }
-     jack_sleep(1 * 1000);
-     cur_buffer_size = jack_get_buffer_size(client1);
--    if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
-+    if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
-         printf("!!! ERROR !!! Buffer size has not been changed !\n");
-         printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n");
-     } else {
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a242f0261c7..a6396fc8c28 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
 
   # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ];
 
   prePatch = ''
     substituteInPlace svnversion_regenerate.sh \

From 8e3a3102946bc655711eaa6903be14031022bb07 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 12:33:16 -0800
Subject: [PATCH 0505/2266] gocr: 0.50 -> 0.51

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51/bin/gocr --help` got 0 exit code
- ran `/nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51/bin/gocr --help` and found version 0.51
- found 0.51 with grep in /nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51
- found 0.51 in filename of file in /nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51
---
 pkgs/applications/graphics/gocr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 6fe37d605ae..98a32ad1899 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, tk }:
 
 stdenv.mkDerivation rec {
-  name = "gocr-0.50";
+  name = "gocr-0.51";
 
   src = fetchurl {
     url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
-    sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw";
+    sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf";
   };
 
   buildFlags = [ "all" "libs" ];

From 1d4bbef0e88a066521ec4fef1e64220149fcadca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 7 Mar 2018 16:52:35 +0000
Subject: [PATCH 0506/2266] wyrd: fix build

---
 pkgs/tools/misc/wyrd/default.nix  | 11 +++++++----
 pkgs/top-level/all-packages.nix   |  2 +-
 pkgs/top-level/ocaml-packages.nix |  4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index 261c08ad31d..1029dbb29d8 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }:
+{ stdenv, fetchurl, ocamlPackages, ncurses, remind }:
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
@@ -9,10 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
   };
 
-  buildInputs = [ ocaml ncurses remind camlp4 ];
+  NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
 
-  # needed for configure phase to succeed
-  CPPFLAGS = "-DNCURSES_INTERNALS";
+  preConfigure = ''
+    substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"
+  '';
+
+  buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ];
 
   preferLocalBuild = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 173b02fab24..e97a4d38acb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5505,7 +5505,7 @@ with pkgs;
 
   wv2 = callPackage ../tools/misc/wv2 { };
 
-  inherit (ocamlPackages) wyrd;
+  wyrd = callPackage ../tools/misc/wyrd { };
 
   x86info = callPackage ../os-specific/linux/x86info { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ef534f189ae..a8111f9256e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -969,10 +969,6 @@ let
 
     # Apps / from all-packages
 
-    wyrd = callPackage ../tools/misc/wyrd {
-      ncurses = pkgs.ncurses5;
-    };
-
     haxe = callPackage ../development/compilers/haxe { };
 
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };

From 84cb65850565e8229135113d4ecc15cf7771e60c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 12:48:47 -0800
Subject: [PATCH 0507/2266] google-cloud-sdk: 184.0.0 -> 190.0.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 190.0.1 with grep in /nix/store/y7rvgsj3077w8div5qny11xhgyjvy06c-google-cloud-sdk-190.0.1
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index d6425ede4f4..c9cec3fd236 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -29,13 +29,13 @@ let
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "1ynvllxzjr3y4qflw06njj7qqcf7539mbp06rs03i8hargsgbamx";
+      sha256 = "0rblb0akwdzr5i8al0dcz482xmx1xdnjnzgqywjvwd8fzdyzq7bp";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "184.0.0";
+  version = "190.0.1";
 
   src = fetchurl (sources name stdenv.system);
 

From a611114b463e4cbc44f9c254c1982c823f73106f Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Fri, 16 Feb 2018 22:36:07 +0100
Subject: [PATCH 0508/2266] qmc2 : init at 0.195

---
 pkgs/misc/emulators/qmc2/default.nix | 40 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/misc/emulators/qmc2/default.nix

diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
new file mode 100644
index 00000000000..2e47cead8ec
--- /dev/null
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchurl, qmake, qttools, pkgconfig
+, minizip, zlib
+, qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
+, rsync, SDL2, xwininfo
+, utillinux
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+  name = "qmc2-${version}";
+  version = "0.195";
+
+  src = fetchurl {
+      url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz";
+      sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
+  };
+  
+  preBuild = ''
+    patchShebangs scripts
+  '';
+
+  nativeBuildInputs = [ qttools pkgconfig ];
+  buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit
+                  qttranslations qtxmlpatterns rsync SDL2
+                  xwininfo zlib utillinux xorg.libxcb ];
+
+  makeFlags = [ "DESTDIR=$(out)"
+                "PREFIX=/"
+                "DATADIR=/share/"
+                "SYSCONFDIR=/etc" ];
+
+  meta = with stdenv.lib; {
+    description = "A Qt frontend for MAME/MESS";
+    homepage = https://qmc2.batcom-it.net;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83424eabba..2404b17ba19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14300,6 +14300,8 @@ with pkgs;
 
   qgo = libsForQt5.callPackage ../games/qgo { };
 
+  qmc2 = libsForQt5.callPackage ../misc/emulators/qmc2 { };
+
   quattrocento = callPackage ../data/fonts/quattrocento {};
 
   quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {};

From 82cfc448afe96ad6411e8b52b447900314c4c51a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 12:17:36 -0800
Subject: [PATCH 0509/2266] goaccess: 1.1.1 -> 1.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/nify4rsvfsn7fbiq1c30060mr3386sz4-goaccess-1.2/bin/goaccess -V` and found version 1.2
- ran `/nix/store/nify4rsvfsn7fbiq1c30060mr3386sz4-goaccess-1.2/bin/goaccess --version` and found version 1.2
- found 1.2 with grep in /nix/store/nify4rsvfsn7fbiq1c30060mr3386sz4-goaccess-1.2
- found 1.2 in filename of file in /nix/store/nify4rsvfsn7fbiq1c30060mr3386sz4-goaccess-1.2
---
 pkgs/tools/misc/goaccess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 8586244b415..e048a2800df 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.1";
+  version = "1.2";
   name = "goaccess-${version}";
 
   src = fetchurl {
     url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
-    sha256 = "1lxnhvh4xhkgzdv0l2fiza2099phn9zs04p9cqfhhl5k6xq18wsc";
+    sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb";
   };
 
   configureFlags = [

From 8e0e8e57f8d4cfac52593f048b52d84c635a663e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 8 Mar 2018 21:08:23 +0000
Subject: [PATCH 0510/2266] dotnetPackages.Nuget: fix binary casing issue

Didn't notice the first time around because macOS isn't case-sensitive
by default, but on Linux the build failed to produce a wrapper script.
---
 pkgs/top-level/dotnet-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ce3bbf32fdf..ca4469e9e99 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -903,7 +903,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
     outputFiles = [ "*" ];
     dllFiles = [ "NuGet*.dll" ];
-    exeFiles = [ "NuGet.exe" ];
+    exeFiles = [ "nuget.exe" ];
   };
 
   Paket = buildDotnetPackage rec {

From 37a97fa8e31bf632c74045b2b69d1e09a0807d8c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 8 Mar 2018 22:14:11 +0100
Subject: [PATCH 0511/2266] bazel_0_4: mark linux only

/cc ZHF #36454
---
 pkgs/development/tools/build-managers/bazel/0.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix
index d131232e96d..7fa39ef2162 100644
--- a/pkgs/development/tools/build-managers/bazel/0.4.nix
+++ b/pkgs/development/tools/build-managers/bazel/0.4.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
     maintainers = with maintainers; [ cstrahan philandstuff ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 
   name = "bazel-${version}";

From f8dd6d60571c2d5dc81da8e458dc133ac421e815 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 13:21:18 -0800
Subject: [PATCH 0512/2266] google-play-music-desktop-player: 4.4.1 -> 4.5.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.5.0 with grep in /nix/store/9xvi5jsdbiphz2w704njd975xkv31y8g-google-play-music-desktop-player-4.5.0
- found 4.5.0 in filename of file in /nix/store/9xvi5jsdbiphz2w704njd975xkv31y8g-google-play-music-desktop-player-4.5.0
---
 .../audio/google-play-music-desktop-player/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 83df4b33940..6c7d6dba455 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "4.4.1";
+  version = "4.5.0";
 
   deps = [
     alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
-    sha256 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw";
+    sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q";
   };
 
   dontBuild = true;

From 13ca830f1dde5214d1c30e891531c525fb3b9a4d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 8 Mar 2018 22:31:55 +0100
Subject: [PATCH 0513/2266] bchunk: fix clang build

/cc ZHF #36454
---
 pkgs/tools/cd-dvd/bchunk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index a4298bf2920..6828ef7d61d 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
+  makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
+
   installPhase = ''
     install -Dt $out/bin bchunk
-    install -Dt $out/share/man/man1 bchunk.1    
+    install -Dt $out/share/man/man1 bchunk.1
   '';
 
   meta = with stdenv.lib; {

From da4e07b6665f53f94527eb42d32d4a7240474819 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 13:38:16 -0800
Subject: [PATCH 0514/2266] gource: 0.47 -> 0.48

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/gyy4z4wamcdzymm7q4a6j1dljxcad7w2-gource-0.48/bin/gource -h` got 0 exit code
- ran `/nix/store/gyy4z4wamcdzymm7q4a6j1dljxcad7w2-gource-0.48/bin/gource --help` got 0 exit code
- ran `/nix/store/gyy4z4wamcdzymm7q4a6j1dljxcad7w2-gource-0.48/bin/gource -h` and found version 0.48
- ran `/nix/store/gyy4z4wamcdzymm7q4a6j1dljxcad7w2-gource-0.48/bin/gource --help` and found version 0.48
- found 0.48 with grep in /nix/store/gyy4z4wamcdzymm7q4a6j1dljxcad7w2-gource-0.48
- found 0.48 in filename of file in /nix/store/gyy4z4wamcdzymm7q4a6j1dljxcad7w2-gource-0.48
---
 pkgs/applications/version-management/gource/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index e201add472b..d617d363fa0 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.47";
+  version = "0.48";
   name = "gource-${version}";
 
   src = fetchurl {
     url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj";
+    sha256 = "04qxcm05qiyr9rg2kv6abfy7kkzqr8ziw4iyp1d14lniv93m61dp";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 75f4b0fc0f96efb8730c09fd02bb8140155706d6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 8 Mar 2018 22:40:22 +0100
Subject: [PATCH 0515/2266] bitcoin-xt: 0.11G2 -> 0.11H

---
 pkgs/applications/altcoins/bitcoin-xt.nix | 4 ++--
 pkgs/applications/altcoins/default.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index 38867619804..ccc55d17bcf 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
-  version = "0.11G2";
+  version = "0.11H";
 
   src = fetchFromGitHub {
     owner = "bitcoinxt";
     repo = "bitcoinxt";
     rev = "v${version}";
-    sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs";
+    sha256 = "1v43bynmidn2zdpky939km721x3ks91bzyh4200gji61qzsmyg62";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index a4caf8d4ef5..8a2d5c4d527 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
+{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
 
 rec {
 
@@ -16,8 +16,8 @@ rec {
   bitcoin-classic  = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
   bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
 
-  bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
-  bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
+  bitcoin-xt  = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; };
+  bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; };
 
   btc1 = callPackage ./btc1.nix { withGui = true; };
   btc1d = callPackage ./btc1.nix { withGui = false; };

From bd3558086088e36a93590947ce68dc9dad274b8d Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Thu, 8 Mar 2018 22:38:38 +0100
Subject: [PATCH 0516/2266] nixos/tests/acme: go compat update, unvendor pkcs11

---
 nixos/tests/common/letsencrypt.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
index 9b53d9d61a1..569df02cee9 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt.nix
@@ -138,8 +138,8 @@ let
   boulder = let
     owner = "letsencrypt";
     repo = "boulder";
-    rev = "9866abab8962a591f06db457a4b84c518cc88243";
-    version = "20170510";
+    rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a";
+    version = "20180129";
 
   in pkgs.buildGoPackage rec {
     name = "${repo}-${version}";
@@ -147,7 +147,7 @@ let
     src = pkgs.fetchFromGitHub {
       name = "${name}-src";
       inherit rev owner repo;
-      sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1";
+      sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55";
     };
 
     postPatch = ''
@@ -168,6 +168,18 @@ let
       cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
     '';
 
+    # Until vendored pkcs11 is go 1.9 compatible
+    preBuild = ''
+      rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11
+    '';
+
+    extraSrcs = map mkGoDep [
+      { goPackagePath = "github.com/miekg/pkcs11";
+        rev           = "6dbd569b952ec150d1425722dbbe80f2c6193f83";
+        sha256        = "1m8g6fx7df6hf6q6zsbyw1icjmm52dmsx28rgb0h930wagvngfwb";
+      }
+    ];
+
     goPackagePath = "github.com/${owner}/${repo}";
     buildInputs = [ pkgs.libtool ];
   };

From df3706c47cbdea7d69b82a7ba857d58f3d4ea51f Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Thu, 8 Mar 2018 22:40:55 +0100
Subject: [PATCH 0517/2266] nixos/tests/acme: use mail-test-srv tls certs from
 source

---
 nixos/tests/common/letsencrypt.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
index 569df02cee9..10cde45d18a 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt.nix
@@ -296,7 +296,11 @@ let
     ocsp-updater.after = [ "boulder-publisher" ];
     ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json";
     ct-test-srv = {};
-    mail-test-srv.args = "--closeFirst 5";
+    mail-test-srv.args = let
+      key = "${boulderSource}/test/mail-test-srv/minica-key.pem";
+      crt = "${boulderSource}/test/mail-test-srv/minica.pem";
+     in
+      "--closeFirst 5 --cert ${crt} --key ${key}";
   };
 
   commonPath = [ softhsm pkgs.mariadb goose boulder ];

From 77b205b9fd661f235dddcf3ffc078d2defa02cf9 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 8 Mar 2018 22:54:24 +0100
Subject: [PATCH 0518/2266] masterpdfeditor: 4.3.61 -> 4.3.82

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

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 76d23f1a8f0..19a45e7d17b 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
   let
-    version = "4.3.61";
+    version = "4.3.82";
   in
     stdenv.mkDerivation {
       name = "masterpdfeditor-${version}";
       src = fetchurl {
         url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-        sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
+        sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4";
       };
       libPath = stdenv.lib.makeLibraryPath [
         stdenv.cc.cc

From 8e411e491cb3c580a0b98fd17c1bf9d9bc0cf644 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 14:02:45 -0800
Subject: [PATCH 0519/2266] gifsicle: 1.90 -> 1.91 (#36536)

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifsicle -h` got 0 exit code
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifsicle --help` got 0 exit code
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifsicle --version` and found version 1.91
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifdiff -h` got 0 exit code
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifdiff --help` got 0 exit code
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifdiff -v` and found version 1.91
- ran `/nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91/bin/gifdiff --version` and found version 1.91
- found 1.91 with grep in /nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91
- found 1.91 in filename of file in /nix/store/7852k36z8l2vfsxm3ylgm0la1ggl9c8w-gifsicle-1.91
---
 pkgs/tools/graphics/gifsicle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 7c5f9eaf5de..05ce6b6f7c9 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gifsicle-${version}";
-  version = "1.90";
+  version = "1.91";
 
   src = fetchurl {
     url = "http://www.lcdf.org/gifsicle/${name}.tar.gz";
-    sha256 = "0kc35g99fygzjj7qjcy87rdb8mbgmacr2mga9ihgln1dfnbb0wrd";
+    sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha";
   };
 
   buildInputs = optional gifview [ xproto libXt libX11 ];

From 7d0f602e98c6a6e1421166c83e0ef238ba0a79cf Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 14:14:10 -0800
Subject: [PATCH 0520/2266] grails: 3.3.0 -> 3.3.2

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.2 with grep in /nix/store/j3w2l8kqw37ndh3x7chkzw0mgryly4py-grails-3.3.2
---
 pkgs/development/web/grails/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index c447173b608..b15109757f2 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "grails-${version}";
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "0lk9ll0x9w2akmlwkams9pxyafmgjmsr3fa45gx1r16nx563qxsg";
+    sha256 = "0rr1q84zgr8xvy40w0wq9ai9gilyn6by4j6av02aszjxciqblvzd";
   };
 
   buildInputs = [ unzip ];

From a30cb1bf5524a390da2c3605b519fd16b87177cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 8 Mar 2018 22:18:13 +0000
Subject: [PATCH 0521/2266] google-cloud-sdk: also fix darwin

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index c9cec3fd236..b109a835635 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -17,14 +17,9 @@ let
 
   baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
   sources = name: system: {
-    i686-linux = {
-      url = "${baseUrl}/${name}-linux-x86.tar.gz";
-      sha256 = "0fq8zw1a5c0mnmw6f7j9j80y6kq0f0v2wn1d7b8mfq8ih5x53a85";
-    };
-
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "1h4m70fk3hri4lgm9lh2pm0v196nc2r3hpf42h3xx5k7sqklsns2";
+      sha256 = "0c4jj580f7z6phiw4zhd32dlf4inkrxy3cig6ng66fi4zi6vnpc9";
     };
 
     x86_64-linux = {
@@ -64,7 +59,7 @@ in stdenv.mkDerivation rec {
         mkdir -p $out/bin
         ln -s $programPath $binaryPath
     done
-    
+
     # disable component updater and update check
     substituteInPlace $out/google-cloud-sdk/lib/googlecloudsdk/core/config.json \
       --replace "\"disable_updater\": false" "\"disable_updater\": true"
@@ -88,6 +83,6 @@ in stdenv.mkDerivation rec {
     license = licenses.free;
     homepage = "https://cloud.google.com/sdk/";
     maintainers = with maintainers; [ stephenmw zimbatm ];
-    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 2d78e8df259d9b831b62166f7e47ff36201fef13 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 14:29:53 -0800
Subject: [PATCH 0522/2266] gramps: 4.2.6 -> 4.2.8

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/gramps -h` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/gramps --help` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/gramps help` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/gramps -v` and found version 4.2.8
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/gramps --version` and found version 4.2.8
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/..gramps-wrapped-wrapped -h` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/..gramps-wrapped-wrapped --help` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/..gramps-wrapped-wrapped help` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/..gramps-wrapped-wrapped -v` and found version 4.2.8
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/..gramps-wrapped-wrapped --version` and found version 4.2.8
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/.gramps-wrapped -h` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/.gramps-wrapped --help` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/.gramps-wrapped help` got 0 exit code
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/.gramps-wrapped -v` and found version 4.2.8
- ran `/nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8/bin/.gramps-wrapped --version` and found version 4.2.8
- found 4.2.8 with grep in /nix/store/wpccn0mfc52ia42cx83v2q7irnvi99gg-gramps-4.2.8
---
 pkgs/applications/misc/gramps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index ace91bfafff..9b8628d1527 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -7,7 +7,7 @@
 let
   inherit (pythonPackages) python buildPythonApplication;
 in buildPythonApplication rec {
-  version = "4.2.6";
+  version = "4.2.8";
   name = "gramps-${version}";
 
   buildInputs = [ intltool gtk3 ] 
@@ -22,7 +22,7 @@ in buildPythonApplication rec {
     owner = "gramps-project";
     repo = "gramps";
     rev = "v${version}";
-    sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1";
+    sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd";
   };
 
   pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ];

From e716a11026c0ee74b7519474bb1aa13a80fd7f89 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 14:47:43 -0800
Subject: [PATCH 0523/2266] graylog: 2.4.1 -> 2.4.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -h` got 0 exit code
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --help` got 0 exit code
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl help` got 0 exit code
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -V` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -v` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --version` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl version` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -h` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --help` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl help` and found version 2.4.3
- found 2.4.3 with grep in /nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3
- found 2.4.3 in filename of file in /nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3
---
 pkgs/tools/misc/graylog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index d4acc063b4d..b9945a3afd3 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.1";
+  version = "2.4.3";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "1dps1vvv8b154ayamhjxdgiq101qs4w0nk79j3zb41pdyn2fji4j";
+    sha256 = "0kwgg9m9sqzl4y2ri69fpi7w9961psbmfdq3avjsbgbs60ly1hn6";
   };
 
   dontBuild = true;

From 62bcd3b02e003f1bf100597c05c4c5a5c4e269cb Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 26 Feb 2018 21:27:39 +0000
Subject: [PATCH 0524/2266] gnulib: 0.1-357-gffe6467 -> 20180226

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

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index f11bb83a74a..4ca3bf5e074 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,17 +1,16 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnulib-0.1-357-gffe6467";
-
-  phases = ["unpackPhase" "installPhase"];
+  name = "gnulib-20180226";
 
   src = fetchgit {
     url = "http://git.savannah.gnu.org/r/gnulib.git";
-    rev = "92b60e61666f008385d9b7f7443da17c7a44d1b1";
-    sha256 = "0sa1dndvaxhw0zyc19al5cmpgzlwnnznjz89lw1b4vj3xn7avjnr";
+    rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
+    sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
   };
 
   installPhase = "mkdir -p $out; mv * $out/";
+  dontFixup = true;
 
   meta = {
     homepage = http://www.gnu.org/software/gnulib/;

From 54e2c28b09d962860a92b5fd688c6394fb44483b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 7 Mar 2018 22:11:52 -0600
Subject: [PATCH 0525/2266] darwin: disable broken packages

---
 pkgs/applications/misc/apvlv/default.nix                  | 2 +-
 pkgs/applications/misc/bb/default.nix                     | 2 +-
 pkgs/applications/misc/confclerk/default.nix              | 2 +-
 pkgs/applications/science/math/bcal/default.nix           | 2 +-
 pkgs/development/libraries/cmark/default.nix              | 2 +-
 pkgs/development/misc/avr/gcc/default.nix                 | 2 +-
 .../darwin/apple-source-releases/shell_cmds/default.nix   | 4 +++-
 pkgs/tools/backup/bdsync/default.nix                      | 2 +-
 pkgs/tools/misc/cutecom/default.nix                       | 2 +-
 pkgs/top-level/all-packages.nix                           | 8 ++++++--
 10 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index f1d84a91972..e6d2ede01ef 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = licenses.lgpl2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = [ maintainers.ardumont ];
   };
 
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index 3d04b53dcde..0689843af61 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "AA-lib demo";
     license     = licenses.gpl2;
     maintainers = [ maintainers.rnhmjoj ];
-    platforms   = platforms.unix;
+    platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index de18a211c45..7781f0df853 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
     homepage = http://www.toastfreeware.priv.at/confclerk;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ ehmry ];
-    inherit (qt4.meta) platforms;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
index baede83f651..9a0a084a1f0 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3Packages.pytest ];
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
   checkPhase = ''
     python3 -m pytest test.py
   '';
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 5fdd1edfd97..6c73bd01603 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
   checkPhase = ''
     export LD_LIBRARY_PATH=$(readlink -f ./src)
     CTEST_OUTPUT_ON_FAILURE=1 make test
diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix
index 0bfa6d1f238..8d1eb43c934 100644
--- a/pkgs/development/misc/avr/gcc/default.nix
+++ b/pkgs/development/misc/avr/gcc/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
     description = "GNU Compiler Collection, version ${version} for AVR microcontrollers";
     homepage = http://gcc.gnu.org;
     license = licenses.gpl3Plus;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ mguentner ];
   };
 }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index f434e15794e..4f527acc950 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -10,10 +10,12 @@ appleDerivation rec {
     # - su ('security/pam_appl.h' file not found)
     # - find (Undefined symbol '_get_date')
     # - w (Undefined symbol '_res_9_init')
+    # - expr
     substituteInPlace shell_cmds.xcodeproj/project.pbxproj \
       --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \
       --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \
-      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," ""
+      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \
+      --replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," ""
 
     # disable w, test install
     # get rid of permission stuff
diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix
index 8ef846a8dca..2fd67765aaf 100644
--- a/pkgs/tools/backup/bdsync/default.nix
+++ b/pkgs/tools/backup/bdsync/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "Fast block device synchronizing tool";
     homepage = https://github.com/TargetHolding/bdsync;
     license = licenses.gpl2;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ jluttine ];
   };
 
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index e3f8a4c43a5..b20e493a585 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://cutecom.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.bennofs ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f54b163c130..a6d76e4e6df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12273,7 +12273,9 @@ with pkgs;
   knot-dns = callPackage ../servers/dns/knot-dns { };
   knot-resolver = callPackage ../servers/dns/knot-resolver {
     # TODO: vimNox after it gets fixed on Darwin or something lighter
-    hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
+    hexdump = if stdenv.isLinux then utillinux.bin
+              else if stdenv.isDarwin then darwin.shell_cmds
+              else vim/*xxd*/;
   };
 
   rdkafka = callPackage ../development/libraries/rdkafka { };
@@ -19884,7 +19886,9 @@ with pkgs;
 
   pcalc = callPackage ../applications/science/math/pcalc { };
 
-  bcal = callPackage ../applications/science/math/bcal { };
+  bcal = callPackage ../applications/science/math/bcal {
+    stdenv = gccStdenv;
+  };
 
   pspp = callPackage ../applications/science/math/pspp {
     inherit (gnome3) gtksourceview;

From aa5a07977e8e8454e6cd2334cbe3b2fb473f598e Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 8 Mar 2018 12:14:43 +0100
Subject: [PATCH 0526/2266] v8: build with gcc6 on linux

doesn't build with gcc 7 due to this issue in upstream code:
https://bugs.chromium.org/p/chromium/issues/detail?id=614289
---
 pkgs/top-level/all-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e97a4d38acb..5f4f07cbf0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11595,11 +11595,14 @@ with pkgs;
     inherit (python2Packages) python;
   };
 
-  v8 = callPackage ../development/libraries/v8 {
+  v8 = callPackage ../development/libraries/v8 ({
     inherit (python2Packages) python gyp;
     cctools = darwin.cctools;
     icu = icu58; # v8-5.4.232 fails against icu4c-59.1
-  };
+  } // lib.optionalAttrs stdenv.isLinux {
+    # doesn't build with gcc7
+    stdenv = overrideCC stdenv gcc6;
+  });
 
   v8_static = lowPrio (self.v8.override { static = true; });
 

From adbd25c75c6b2809bcd97486a22caf0cfeb74d4c Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 8 Mar 2018 23:34:57 +0100
Subject: [PATCH 0527/2266] libav: remove /bin/sh dependencies

that resulted in some Hydra build fails
---
 pkgs/development/libraries/libav/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a069894f6c8..317768518c3 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl
+{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash
 , mp3Support    ? true,   lame      ? null
 , speexSupport  ? true,   speex     ? null
 , theoraSupport ? true,   libtheora ? null
@@ -45,7 +45,11 @@ let
       ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
       ;
 
-    preConfigure = "patchShebangs doc/texi2pod.pl";
+    postPatch = ''
+      patchShebangs .
+      # another shebang was hidden in a here document text
+      substituteInPlace ./configure --replace "#! /bin/sh" "#!${bash}/bin/sh"
+    '';
 
     configureFlags =
       assert stdenv.lib.all (x: x!=null) buildInputs;
@@ -71,8 +75,8 @@ let
       ++ optional freetypeSupport "--enable-libfreetype"
       ;
 
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ lame yasm zlib bzip2 SDL ]
+  nativeBuildInputs = [ pkgconfig perl ];
+    buildInputs = [ lame yasm zlib bzip2 SDL bash ]
       ++ [ perl ] # for install-man target
       ++ optional mp3Support lame
       ++ optional speexSupport speex
@@ -95,6 +99,7 @@ let
     # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc.
     buildFlags = "all alltools install-man";
 
+
     postInstall = ''
       moveToOutput bin "$bin"
       # alltools target compiles an executable in tools/ for every C

From 632e9e62c817bdaa163510429625b5f48b6a18e4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 26 Feb 2018 22:50:46 +0000
Subject: [PATCH 0528/2266] libvirt: 3.10.0 -> 4.1.0

---
 nixos/modules/virtualisation/libvirtd.nix     | 14 +----
 .../virtualization/virt-top/default.nix       | 12 ++--
 .../libraries/libvirt/build-on-bsd.patch      | 58 ------------------
 .../development/libraries/libvirt/default.nix | 61 +++++++++++--------
 .../ocaml-modules/ocaml-libvirt/default.nix   |  6 +-
 .../python-modules/libvirt/default.nix        | 11 ++--
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/perl-packages.nix              | 10 +--
 8 files changed, 62 insertions(+), 114 deletions(-)
 delete mode 100644 pkgs/development/libraries/libvirt/build-on-bsd.patch

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index a369b7ddbe1..024db7f87c2 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -119,18 +119,10 @@ in {
       after = [ "systemd-udev-settle.service" ]
               ++ optional vswitch.enable "vswitchd.service";
 
-      environment = {
-        LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
-      };
+      environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
 
-      path = with pkgs; [
-          bridge-utils
-          dmidecode
-          dnsmasq
-          ebtables
-          cfg.qemuPackage # libvirtd requires qemu-img to manage disk images
-        ]
-        ++ optional vswitch.enable vswitch.package;
+      path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
+             ++ optional vswitch.enable vswitch.package;
 
       preStart = ''
         mkdir -p /var/log/libvirt/qemu -m 755
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index f411ea5c83e..493307d0d07 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, ocamlPackages }:
+{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "virt-top-${version}";
-  version = "1.0.8";
+  version = "2017-11-18-unstable";
 
-  src = fetchurl {
-    url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz";
-    sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w";
+  src = fetchgit {
+    url = git://git.annexia.org/git/virt-top.git;
+    rev = "18a751d8c26548bb090ff05e30ccda3092e3373b";
+    sha256 = "0c4whjvw7p3yvd476i4ppdhi8j821r5y6caqrj2v9dc181cnp01i";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ];
 
   buildPhase = "make opt";
diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch
deleted file mode 100644
index 830f0f30ff9..00000000000
--- a/pkgs/development/libraries/libvirt/build-on-bsd.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c
---- libvirt-1.3.0.orig/src/admin/admin_protocol.c	2015-12-02 16:17:07.000000000 +0100
-+++ libvirt-1.3.0/src/admin/admin_protocol.c	2016-01-04 17:57:10.043412857 +0100
-@@ -6,6 +6,25 @@
- 
- #include "admin_protocol.h"
- 
-+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
-+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
-+ */
-+#ifdef HAVE_XDR_U_INT64_T
-+# define xdr_uint64_t xdr_u_int64_t
-+#endif
-+#ifndef IXDR_PUT_INT32
-+# define IXDR_PUT_INT32 IXDR_PUT_LONG
-+#endif
-+#ifndef IXDR_GET_INT32
-+# define IXDR_GET_INT32 IXDR_GET_LONG
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-+#endif
-+
- bool_t
- xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp)
- {
-diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c
---- libvirt-1.3.0.orig/src/logging/log_protocol.c	2015-12-08 13:07:35.000000000 +0100
-+++ libvirt-1.3.0/src/logging/log_protocol.c	2016-01-04 17:56:50.673463563 +0100
-@@ -7,6 +7,25 @@
- #include "log_protocol.h"
- #include "internal.h"
- 
-+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
-+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
-+ */
-+#ifdef HAVE_XDR_U_INT64_T
-+# define xdr_uint64_t xdr_u_int64_t
-+#endif
-+#ifndef IXDR_PUT_INT32
-+# define IXDR_PUT_INT32 IXDR_PUT_LONG
-+#endif
-+#ifndef IXDR_GET_INT32
-+# define IXDR_GET_INT32 IXDR_GET_LONG
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-+#endif
-+
- bool_t
- xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp)
- {
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2dbf80e71f7..98af04a5ec2 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, fetchurl, fetchpatch
-, pkgconfig, makeWrapper
+{ stdenv, fetchurl, fetchgit
+, pkgconfig, makeWrapper, libtool, autoconf, automake
 , coreutils, libxml2, gnutls, devicemapper, perl, python2, attr
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, xen, zfs, parted
+, curl, libiconv, gmp, xen, zfs, parted, bridge-utils, dmidecode
 }:
 
 with stdenv.lib;
 
-# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> or it will break
-stdenv.mkDerivation rec {
+# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
+let
+  buildFromTarball = false;
+in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "3.10.0";
+  version = "4.1.0";
 
-  src = fetchurl {
-    url = "http://libvirt.org/sources/${name}.tar.xz";
-    sha256 = "03kb37iv3dvvdlslznlc0njvjpmq082lczmsslz5p4fcwb50kwfz";
-  };
-
-  patches = [ ./build-on-bsd.patch ];
+  src =
+    if buildFromTarball then
+      fetchurl {
+        url = "http://libvirt.org/sources/${name}.tar.xz";
+        sha256 = "0fb466mcma21hsxx3cckllbr9hhncpbwim5px1mr66iidy1a8bwa";
+      }
+    else
+      fetchgit {
+        url = git://libvirt.org/libvirt.git;
+        rev = "v${version}";
+        sha256 = "01021r7i71dw9w7ffp6ia8h70ns6bc0ps5np0hq9nipxs68finm6";
+        fetchSubmodules = true;
+      };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+  ] ++ optionals (!buildFromTarball) [
+    libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
@@ -34,17 +45,16 @@ stdenv.mkDerivation rec {
     libiconv gmp
   ];
 
-  preConfigure = optionalString stdenv.isLinux ''
-    PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH
-    substituteInPlace configure \
-      --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
+  preConfigure = ''
+    ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
+
+    PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd numad dnsmasq ]}:$PATH
 
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
       --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
-  '' + ''
-    PATH=${dnsmasq}/bin:$PATH
+
     patchShebangs . # fixes /usr/bin/python references
   '';
 
@@ -78,18 +88,19 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
     substituteInPlace $out/libexec/libvirt-guests.sh \
-      --replace "$out/bin" "${gettext}/bin" \
-      --replace "lock/subsys" "lock"
-    sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \
-        -i "$out/libexec/libvirt-guests.sh"
-
+      --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
+      --replace "$out/bin"            '${gettext}/bin' \
+      --replace 'lock/subsys'         'lock' \
+      --replace 'gettext.sh'          'gettext.sh
+  # Added in nixpkgs:
+  gettext() { "${gettext}/bin/gettext" "$@"; }
+  '
   '' + optionalString stdenv.isLinux ''
     substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
     rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
     wrapProgram $out/sbin/libvirtd \
-      --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl ]}
+      --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]}
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 0ad5d09d687..b789b133aaf 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml-libvirt-${version}";
-  rev = "3169af3";
-  version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4
+  rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
+  version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
 
   src = fetchgit {
     url = "git://git.annexia.org/git/ocaml-libvirt.git";
     rev = rev;
-    sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
+    sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw";
   };
 
   propagatedBuildInputs = [ libvirt ];
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 5dc33d2d93e..d120c38b02c 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, buildPythonPackage, fetchurl, python, pkgconfig, lxml, libvirt, nose }:
+{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "3.10.0";
+  version = "4.1.0";
 
-  src = assert version == libvirt.version; fetchurl {
-    url = "http://libvirt.org/sources/python/${pname}-python-${version}.tar.gz";
-    sha256 = "1l0fgqjnx76pzkhq540x9sf5fgzlrn0dpay90j2m4iq8nkclcbpw";
+  src = assert version == libvirt.version; fetchgit {
+    url = git://libvirt.org/libvirt-python.git;
+    rev = "v${version}";
+    sha256 = "0z87y6qr0ypdxfanphxl7yanisd7a0b0bwhg97kii68mig5dlw9r";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e97a4d38acb..6c52fde551b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17944,9 +17944,7 @@ with pkgs;
 
   virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
 
-  virt-top = callPackage ../applications/virtualization/virt-top {
-    ocamlPackages = ocamlPackages_4_01_0;
-  };
+  virt-top = callPackage ../applications/virtualization/virt-top { };
 
   virt-what = callPackage ../applications/virtualization/virt-what { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 834ead8575a..cf55d8147cf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13172,10 +13172,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   SysVirt = buildPerlPackage rec {
-    name = "Sys-Virt-1.2.19";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
-      sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4";
+    version = "4.1.0";
+    name = "Sys-Virt-${version}";
+    src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
+      url = git://libvirt.org/libvirt-perl.git;
+      rev = "v${version}";
+      sha256 = "0m0snv6gqh97nh1c31qvbm4sdzp49vixn7w3r69h6a5r71sn78x4";
     };
     propagatedBuildInputs = [XMLXPath];
     nativeBuildInputs = [ pkgs.pkgconfig ];

From 8b8ac8a4335ace19e923d2603b66176e6f0ee16e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 15:46:16 -0800
Subject: [PATCH 0529/2266] groovy: 2.4.12 -> 2.4.14

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/grape -h` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/grape --help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/grape help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/grape -v` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/grape --version` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/java2groovy -h` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/java2groovy --help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/java2groovy help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovy -h` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovy --help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovy -v` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovy --version` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovydoc --help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovydoc --version` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovyc -h` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovyc --help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovyc -v` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovyc --version` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovysh -h` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovysh --help` got 0 exit code
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovysh -V` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovysh --version` and found version 2.4.14
- ran `/nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14/bin/groovyConsole --help` got 0 exit code
- found 2.4.14 with grep in /nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14
- found 2.4.14 in filename of file in /nix/store/x26aa3454yhk91kncw7nnzl0pw4piwsy-groovy-2.4.14
---
 pkgs/development/interpreters/groovy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index e203a1d09f4..6c0a9c2d375 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.12";
+  version = "2.4.14";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1dm7m221pqbgh3lp1q1nvv6qc0fpja3cgsd0mx3ghahcfsfa3fck";
+    sha256 = "0an5ddfajg8jwdi1zdkpcz1g8ij1iyp0xh7zck2bl84j3pi4dj7r";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 2689ae1fec64457da3fc1b2996f2be88b000e829 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 16:05:03 -0800
Subject: [PATCH 0530/2266] grpc: 1.9.1 -> 1.10.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/check_epollexclusive -h` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/check_epollexclusive --help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/check_epollexclusive help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_hpack_tables -h` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_hpack_tables --help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_hpack_tables help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_legal_metadata_characters -h` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_legal_metadata_characters --help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_legal_metadata_characters help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_percent_encoding_tables -h` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_percent_encoding_tables --help` got 0 exit code
- ran `/nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0/bin/gen_percent_encoding_tables help` got 0 exit code
- found 1.10.0 with grep in /nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0
- found 1.10.0 in filename of file in /nix/store/f1darm5xs8ihd8bfkq1icsgcy2kz5cpa-grpc-1.10.0
---
 pkgs/development/libraries/grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index f33e52867c5..9f9166e43c9 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.9.1";
+  version = "1.10.0";
   name = "grpc-${version}";
   src = fetchurl {
     url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
-    sha256 = "0h2w0dckxydngva9kl7dpilif8k9zi2ajnlanscr7s5kkza3dhps";
+    sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr";
   };
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

From dd486d992c4851543015a02bf860e76452365c61 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 04:40:35 -0800
Subject: [PATCH 0531/2266] folly: 2017.11.06.00 -> 2018.02.26.00

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.02.26.00 with grep in /nix/store/a1f6l0wcn1cw5v7ycmpdd21kmka3bxpg-folly-2018.02.26.00
- found 2018.02.26.00 in filename of file in /nix/store/a1f6l0wcn1cw5v7ycmpdd21kmka3bxpg-folly-2018.02.26.00
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 45e3c964e99..88339e8a8bf 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2017.11.06.00";
+  version = "2018.02.26.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "11sn4gwqw94ygc2s4bzqy5k67v3rr20gy375brdcrl5rv0r2hhc0";
+    sha256 = "1pdb3nnly0x4x8yy1r13xgh9zhn34c9dq0b3nhxr8gwbzf643j1c";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From 2fa253cba1e7ced28f6dd56c6a3c63bf8e67deb3 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 9 Mar 2018 00:11:02 +0000
Subject: [PATCH 0532/2266] libvirt: fix darwin build

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 98af04a5ec2..f6262154df5 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
 
-    PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd numad dnsmasq ]}:$PATH
+    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH
 
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations

From f3bf2c9548094e415df40dfbb5020233c4b17b15 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 16:20:19 -0800
Subject: [PATCH 0533/2266] gsm: 1.0.14 -> 1.0.17

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17/bin/toast -h` got 0 exit code
- ran `/nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17/bin/toast help` got 0 exit code
- ran `/nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17/bin/tcat -h` got 0 exit code
- ran `/nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17/bin/tcat help` got 0 exit code
- ran `/nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17/bin/untoast -h` got 0 exit code
- ran `/nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17/bin/untoast help` got 0 exit code
- found 1.0.17 with grep in /nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17
- found 1.0.17 in filename of file in /nix/store/cikcvld2cd32if9qgc3ilvvb7iksds3c-gsm-1.0.17
---
 pkgs/development/libraries/gsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 42d36b8406e..57112e2825e 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gsm-${version}";
-  version = "1.0.14";
+  version = "1.0.17";
 
   src = fetchurl {
     url = "http://www.quut.com/gsm/${name}.tar.gz";
-    sha256 = "0b1mx69jq88wva3wk0hi6fcl5a52qhnq2f9p3f3jdh5k61ma252q";
+    sha256 = "00bns0d4wwrvc60lj2w7wz4yk49q1f6rpdrwqzrxsha9d78mfnl5";
   };
 
   patchPhase = ''

From eb0368554661385ae470e245e50bd0bc10693bf0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 16:51:28 -0800
Subject: [PATCH 0534/2266] gtk-doc: 1.25 -> 1.27

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27/bin/gtkdoc-depscan -h` got 0 exit code
- ran `/nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27/bin/gtkdoc-depscan --help` got 0 exit code
- ran `/nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27/bin/gtkdoc-depscan --version` and found version 1.27
- ran `/nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27/bin/gtkdocize --help` got 0 exit code
- ran `/nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27/bin/gtkdocize --version` and found version 1.27
- found 1.27 with grep in /nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27
- found 1.27 in filename of file in /nix/store/6i54qzjbf3645yavr53qbvm12ddr9y7b-gtk-doc-1.27
---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index a176c5cb764..6e7b45b97f6 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
-  version = "1.25";
+  version = "1.27";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
-    sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y";
+    sha256 = "0vwsdl61nvnmqswlz5j9m4hg7qirhazwcikcnqf9nx0c13vx6sz2";
   };
 
   patches = [

From c7abef4c5d724421e136b8d53e3fe18fc48451ed Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 8 Mar 2018 19:00:09 -0600
Subject: [PATCH 0535/2266] network_cmds: fix on darwin

---
 .../darwin/apple-source-releases/network_cmds/default.nix   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 357a87689a0..dc7edface9a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -7,11 +7,13 @@ appleDerivation rec {
 
   # "spray" requires some files that aren't compiling correctly in xcbuild.
   # "rtadvd" seems to fail with some missing constants.
-  # We disable spray and rtadvd here for now.
+  # "traceroute6" and "ping6" require ipsec which doesn't build correctly
   patchPhase = ''
     substituteInPlace network_cmds.xcodeproj/project.pbxproj \
       --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \
-      --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," ""
+      --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \
+      --replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \
+      --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," ""
   '';
 
   # temporary install phase until xcodebuild has "install" support

From e979e9cc65ae6eec96ff696f9ebaff00185aaadd Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 17:07:39 -0800
Subject: [PATCH 0536/2266] gtkdatabox: 0.9.2.0 -> 0.9.3.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.3.0 with grep in /nix/store/3axd91hc3vi45w0j8yw0qfgwip4cx9da-gtkdatabox-0.9.3.0
- found 0.9.3.0 in filename of file in /nix/store/3axd91hc3vi45w0j8yw0qfgwip4cx9da-gtkdatabox-0.9.3.0
---
 pkgs/development/libraries/gtkdatabox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix
index de5fd8343e3..d074f51d3ca 100644
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "gtkdatabox-0.9.2.0";
+  name = "gtkdatabox-0.9.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
-    sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl";
+    sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7844ae2366646b38973e89f2e3dab008e887257d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 17:24:39 -0800
Subject: [PATCH 0537/2266] gtkwave: 3.3.86 -> 3.3.87

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/shmidcat -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/shmidcat --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin -h` and found version 3.3.87
- found 3.3.87 with grep in /nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87
- found 3.3.87 in filename of file in /nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index e866b947fbc..4da7f0f608f 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.86";
+  version = "3.3.87";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx";
+    sha256 = "0yjvxvqdl276wv0y55bqxwna6lwc99hy6dkfiy6bij3nd1qm5rf6";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b5b908483e5e0564d1ab152cfa84476942c6dca9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 17:59:58 -0800
Subject: [PATCH 0538/2266] gzdoom: 3.1.0 -> 3.2.5

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.2.5 with grep in /nix/store/m0ms0fpwwi306zq5as89r1kb40bhba8n-gzdoom-3.2.5
- found 3.2.5 in filename of file in /nix/store/m0ms0fpwwi306zq5as89r1kb40bhba8n-gzdoom-3.2.5
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 459c75ac290..62ab349afa8 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.1.0";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "02287xvlk4a07ssm9y9h5vfsvdssshz13n5bbz13pfcani5d9flv";
+    sha256 = "1x4v3cv448wqx4cdhs28nxrv0lm2c2pd9i2hm92q9lg5yw8vv19q";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From 9b4ffd98a4b8246d466cbe9b740f0641b0ac3fcd Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 9 Mar 2018 02:53:18 +0100
Subject: [PATCH 0539/2266] chromium: 64.0.3282.186 -> 65.0.3325.146

see https://chromereleases.googleblog.com/2018/03/stable-channel-update-for-desktop.html

cc @aszlig @YorikSar

CVE-2017-11215
CVE-2017-11225
CVE-2018-6060
CVE-2018-6061
CVE-2018-6062
CVE-2018-6057
CVE-2018-6063
CVE-2018-6064
CVE-2018-6065
CVE-2018-6066
CVE-2018-6067
CVE-2018-6068
CVE-2018-6069
CVE-2018-6070
CVE-2018-6071
CVE-2018-6072
CVE-2018-6073
CVE-2018-6074
CVE-2018-6075
CVE-2018-6076
CVE-2018-6077
CVE-2018-6078
CVE-2018-6079
CVE-2018-6080
CVE-2018-6081
CVE-2018-6082
CVE-2018-6083
---
 .../networking/browsers/chromium/common.nix   | 28 +++++++++----------
 .../browsers/chromium/upstream-info.nix       | 18 ++++++------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 1291e5c4e91..8193f47104d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -12,7 +12,7 @@
 , utillinux, alsaLib
 , bison, gperf
 , glib, gtk2, gtk3, dbus-glib
-, libXScrnSaver, libXcursor, libXtst, libGLU_combined 
+, libXScrnSaver, libXcursor, libXtst, libGLU_combined
 , protobuf, speechd, libXdamage, cups
 , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
 
@@ -140,27 +140,27 @@ let
     patches = [
       ./patches/nix_plugin_paths_52.patch
       # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
-      # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
-      ./patches/fix_network_api_crash.patch
+      ## Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
+      ## TODO investigate build error
+      #./patches/fix_network_api_crash.patch
+
       # As major versions are added, you can trawl the gentoo and arch repos at
       # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
       # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
       # for updated patches and hints about build flags
 
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
-    ]  ++ optionals (versionRange "64" "65") [
-      (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl")
-      (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc")
-      # missing ninja dep https://github.com/NixOS/nixpkgs/issues/35296#issuecomment-368666833
-      (githubPatch "b1e3cfd4f9bfe43a1e08c5670b51c8c80d3e6372" "17vih86rpsy282r8ikrf2q5gfjdwqzvyn8859i75xzvl8agyhbaa")
     ]  ++ optionals (versionRange "65" "66") [
-      #(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8")
-      #(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5")
-      (gentooPatch "chromium-webrtc-r0.patch" "0qj5b4w9kav51ylpdf38vm5w7p2gx4qp8p45vrfggp7miicg9cmw")
-      #(gentooPatch "chromium-vulkan-r0.patch" "1wphsbc6kyck5qanbc4bv14iw2s67fvp1c0kwz29a2avzkz19s84")
-      #(gentooPatch "chromium-ffmpeg-r0.patch" "0j58g24j6n6vpy6v9wwv34x0dd43m52wg0xcrfkzp72km9wiahff")
+      (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8")
+      (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
+      (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x")
       #(gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
-    ]  ++ optional enableWideVine ./patches/widevine.patch;
+    ] ++ optionals (versionRange "66" "67") [
+      (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8")
+      (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
+      (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x")
+      (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4")
+    ] ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index bca9e1c9a1c..a714e5b47a1 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1kdv6r3cmy7lqynnk4ylkn81x91wkv2k3hqh41sb50h65s7h9b3y";
-    sha256bin64 = "18bralcc4frapglcfa5az3z8i74calrblf4zzavisvpkmnil7ypa";
-    version = "65.0.3325.88";
+    sha256 = "13n84ky5fr5by71jd9ivj3q7czd2gxrnvbj8msskb62zamjb8z80";
+    sha256bin64 = "16f2b9sxyljrmj2rcfzamf9ji01pkamnb6qv363lf67fshm37ky0";
+    version = "65.0.3325.124";
   };
   dev = {
-    sha256 = "1ykg5c3bayv6pwz74dglxcmbsalz6p04c3r0y15xkw2iyv5jjcam";
-    sha256bin64 = "1phw755ra3pckvhapm26amr6b3652k8f7sxanjyq118zkpga21w2";
-    version = "66.0.3350.0";
+    sha256 = "196k48qy97b7x25vv5gvqhnbkjb8vql42qi1h0x8y8sp216sdspg";
+    sha256bin64 = "13jq19jg1hy5w1bdf0wpv5qmr44161clsxjk01m0iysipkbldpn5";
+    version = "66.0.3355.0";
   };
   stable = {
-    sha256 = "0q0q1whspmzyln04gxhgl3jd2vrgb4imh8r9qw6c06i3b63j3l2z";
-    sha256bin64 = "1sq8mmdw32n00swm4q9q5q3vw6q5sp8yiaxag4rbzvxkfnr3vi4g";
-    version = "64.0.3282.186";
+    sha256 = "18w1mfsfd2yy7sf30d5wypv6mrdlsj3807xnab2gfi1kb8zjykyb";
+    sha256bin64 = "1g2i3cj6hgr4p0mfvv6xd8lvk217li7lrzgk4j6k563zpqhh863p";
+    version = "65.0.3325.146";
   };
 }

From 12d19f1fcd19d9224ff6648386b3751843a2e325 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 18:33:13 -0800
Subject: [PATCH 0540/2266] hivex: 1.3.14 -> 1.3.15

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.15 with grep in /nix/store/i73ksxx7rd6dfwiasx7xacm4pvskprpv-hivex-1.3.15
- found 1.3.15 in filename of file in /nix/store/i73ksxx7rd6dfwiasx7xacm4pvskprpv-hivex-1.3.15
---
 pkgs/development/libraries/hivex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 7b4b9866d04..b2e2dbd35a4 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "hivex-${version}";
-  version = "1.3.14";
+  version = "1.3.15";
 
   src = fetchurl {
     url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
-    sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b";
+    sha256 = "02vzipzrp1gr87rn7mkhyzr4zdjkp2dzcvvb223x7i0ch8ci7r4c";
   };
 
   patches = [ ./hivex-syms.patch ];

From 94f2cd8c450f59e726b1eae9ab44caf60b894b6d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 19:06:27 -0800
Subject: [PATCH 0541/2266] icoutils: 0.31.3 -> 0.32.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -V` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -v` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript help` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --help` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --help` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -V` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -v` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped help` and found version 0.32.2
- found 0.32.2 with grep in /nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2
- found 0.32.2 in filename of file in /nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2
---
 pkgs/tools/graphics/icoutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 720af4622c7..0941b3eabf9 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "icoutils-0.31.3";
+  name = "icoutils-0.32.2";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152";
+    sha256 = "1g8ihxw24gbiy189h36w16lbyfq7fn260qkbc85n9jqrvkxsz4p8";
   };
 
   buildInputs = [ makeWrapper libpng perl ];

From bd59d4c6c9f388a572cb44fa08bdc10b176b492d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 Mar 2018 18:34:21 -0600
Subject: [PATCH 0542/2266] icestorm: 2018.02.14 -> 2018.03.07

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 0307027faa2..b277957efa9 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2018.02.14";
+  version = "2018.03.07";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "edbf5fce90ff0e71922a54241a1aec914cc3e230";
-    sha256 = "01d6xv5c4x8w8lamc8n3vnqsyn7ykhh1ws7k96d6ij5fs52k94xb";
+    rev    = "535fde63613eccfeb7e5aad8ff97fbfb652a33b6";
+    sha256 = "1j2p961k1fsq1xq8fnrv0hpwrb948q12jkb479zmrfk61w6la0df";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ed6a4f47f87bf7926e13f82de60c76583e04bf3a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 Mar 2018 18:33:35 -0600
Subject: [PATCH 0543/2266] arachne-pnr: 2018.02.14 -> 2018.03.07

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/arachne-pnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 97eb8e8b642..70acb79dc7e 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -4,13 +4,13 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2018.02.14";
+  version = "2018.03.07";
 
   src = fetchFromGitHub {
     owner  = "cseed";
     repo   = "arachne-pnr";
-    rev    = "b54675413f9aac1d9a1fb0a8e9354bec2a2a8f3c";
-    sha256 = "06slsb239qk1r2g96n1g37yp8314cy7yi4g1yf86fr87fr11ml8l";
+    rev    = "6701132cbd5c7b31edd0ff18ca6727eb3691186b";
+    sha256 = "1c55k9gpq042mkyxrblwskbmr3v0baj4gkwm45v1gvmhdza6gfw8";
   };
 
   enableParallelBuilding = true;

From 679dfdb40d66f1445f0122dd7902a1de4883d441 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 Mar 2018 18:31:41 -0600
Subject: [PATCH 0544/2266] yosys: 2018.02.14 -> 2018.03.07

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 063fd71c043..b087eca30c0 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -6,14 +6,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.02.14";
+  version = "2018.03.07";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "c1abd3b02cab235334342f3520e2535eb74c5792";
-      sha256 = "0pzrplv4p0qzy115rg19lxv4w274iby337zfd7hhlinnpx3gzqvw";
+      rev    = "8b604004dae31f7f3120685dd05d16a4bace904a";
+      sha256 = "18i4l5rka3l9lg8cdpigprw80im293j3bmv0zab1gxf3rhbjpcb7";
       name   = "yosys";
     })
 

From de1cb85b20c27083cb1e1b141c0fb7ba71c9325d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 Mar 2018 18:32:28 -0600
Subject: [PATCH 0545/2266] symbiyosys: 2018.02.04 -> 2018.03.07

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index e8feaa0acc4..682f9282e6b 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2018.02.04";
+  version = "2018.03.07";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "symbiyosys";
-    rev    = "236f6412c1c1afe95d752eaf907f66f19c343134";
-    sha256 = "06bsvvkn9yhz9jvgf7a6pf407ab9m5qrr42niww666z967xdw4p0";
+    rev    = "2c13fbefe67adb3a4adb8a6f283b198abb8a43a0";
+    sha256 = "0v60530w5y4yj66zcp7lwa82158iw26mil1gj41lzyi2p651kc1k";
   };
 
   buildInputs = [ python3 yosys ];

From 03b23f00ca5b8f0cdd920753fa4597cdd56e30f8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 19:38:06 -0800
Subject: [PATCH 0546/2266] inadyn: 2.3 -> 2.3.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn -h` got 0 exit code
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn --help` got 0 exit code
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn help` got 0 exit code
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn -V` and found version 2.3.1
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn -v` and found version 2.3.1
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn --version` and found version 2.3.1
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn -h` and found version 2.3.1
- ran `/nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1/bin/inadyn --help` and found version 2.3.1
- found 2.3.1 with grep in /nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1
- found 2.3.1 in filename of file in /nix/store/zl5vf4sncl2rbf1n2h52fg86rc53q3q3-inadyn-2.3.1
---
 pkgs/tools/networking/inadyn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 99997eb927f..9d588f6fa5e 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "inadyn-${version}";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
     rev = "v${version}";
-    sha256 = "1nkrvd33mnj98m86g3xs27l88l2678qjzjhwpq1k9n8v9k255pd6";
+    sha256 = "0m2lkmvklhnggv1kim0rikq1gxxc984lsg4gpn8s6lzv6y0axbya";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 0373079efc339259e47d35d622abcfe78e37801c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 20:05:47 -0800
Subject: [PATCH 0547/2266] iosevka: 1.14.0 -> 1.14.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14.1 with grep in /nix/store/96pxdcrjsqsw3wy79kqpjj1lwwndq62j-iosevka-1.14.1
- found 1.14.1 in filename of file in /nix/store/96pxdcrjsqsw3wy79kqpjj1lwwndq62j-iosevka-1.14.1
---
 pkgs/data/fonts/iosevka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 7c1676ed8b6..ad2485dc4b8 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -26,13 +26,13 @@ in
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
 
 let
-  version = "1.14.0";
+  version = "1.14.1";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "be5invis";
     repo ="Iosevka";
     rev = "v${version}";
-    sha256 = "0mmdlrd9a0rhmmdqwkk6v7cdvbi23djr5kkiyv38llk11j3w0clp";
+    sha256 = "0m6kj1zfv9w6lyykhsfqdx2a951k8qa76licqikz5spm13n22z43";
   };
 in
 

From 0dccb8545182eef23f71f4202d825f2e3034be09 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 9 Mar 2018 05:07:29 +0100
Subject: [PATCH 0548/2266] =?UTF-8?q?phpPackages.php-cs-fixer:=202.10.3=20?=
 =?UTF-8?q?=E2=86=92=202.10.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 0e00783c61a..c36cf6f9215 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -383,11 +383,11 @@ let
 
   php-cs-fixer = pkgs.stdenv.mkDerivation rec {
     name = "php-cs-fixer-${version}";
-    version = "2.10.3";
+    version = "2.10.4";
 
     src = pkgs.fetchurl {
       url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-      sha256 = "0ir72sns8baz825dkvffr5rx1f261phhbc6d9v0ncc4xkhr5zjnh";
+      sha256 = "00i90cbd6lkq3wssp8z2b0l2q8ahajxlrzdrqcf2jnjdhv2xms4a";
     };
 
     phases = [ "installPhase" ];

From 5b98a269c6d14c1f52747cbcc560944eaedb883b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 20:22:29 -0800
Subject: [PATCH 0549/2266] jackett: 0.8.151 -> 0.8.716

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/j1arij5hyi6b28sg3hf08k4s81nz26bz-jackett-0.8.716/bin/Jackett -v` and found version 0.8.716
- found 0.8.716 with grep in /nix/store/j1arij5hyi6b28sg3hf08k4s81nz26bz-jackett-0.8.716
- found 0.8.716 in filename of file in /nix/store/j1arij5hyi6b28sg3hf08k4s81nz26bz-jackett-0.8.716
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 594bc8caf5b..fc43e949269 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.151";
+  version = "0.8.716";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "2df2b296b5b314ed035e8d370bf5708a8b5a23957353e2e1e0007ec08a2138a0";
+    sha256 = "0i770f4h06jf76977y3cp9l5n5csnb9wzpskndc7mgk0h02m7nrc";
   };
 
   buildInputs = [ makeWrapper ];

From b402f4fc59baaab4c55de49ca5d9d2aea9b3a8ad Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 20:38:10 -0800
Subject: [PATCH 0550/2266] jshon: 20140712 -> 20160111.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/pdxydl7lg0pbpcmh2332yygbb7b4vbq2-jshon-20160111.2/bin/jshon help` got 0 exit code
- found 20160111.2 in filename of file in /nix/store/pdxydl7lg0pbpcmh2332yygbb7b4vbq2-jshon-20160111.2
---
 pkgs/development/tools/parsing/jshon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix
index 5406b4e9a0e..359daad2d51 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/pkgs/development/tools/parsing/jshon/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, jansson }:
 
 stdenv.mkDerivation rec {
-  name = "jshon-20140712";
+  name = "jshon-20160111.2";
 
   rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7";
-  sha256 = "b0365e58553b9613a5636545c5bfd4ad05ab5024f192e1cb1d1824bae4e1a380";
+  sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh";
 
   src = fetchFromGitHub {
     inherit rev sha256;

From e562f9f9c623e72579fcf10cdb8bb7f664bcc967 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 21:19:06 -0800
Subject: [PATCH 0551/2266] libdigidocpp: 3.12.0.1317 -> 3.13.3.1365

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.13.3.1365 with grep in /nix/store/bh5cizakj0dkmmwqqg4bvmhyvqd8x28n-libdigidocpp-3.13.3.1365
- found 3.13.3.1365 in filename of file in /nix/store/bh5cizakj0dkmmwqqg4bvmhyvqd8x28n-libdigidocpp-3.13.3.1365
---
 pkgs/development/libraries/libdigidocpp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index a8b2e4b3420..6ff8a03175e 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "3.12.0.1317";
+  version = "3.13.3.1365";
   name = "libdigidocpp-${version}";
 
   src = fetchurl {
-    url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.12.0.1317.orig.tar.xz";
-    sha256 = "8059e1dbab99f062d070b9da0b1334b7226f1ab9badcd7fddea3100519d1f9a9";
+    url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz";
+    sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw";
   };
 
   unpackPhase = ''

From 4b6498afc2b47237eb7cff21a08688e6f1b47ad1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 22:16:57 -0800
Subject: [PATCH 0552/2266] libinput-gestures: 2.32 -> 2.33

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.33 with grep in /nix/store/axjjpwcbb3s56m0fk68y8w8vji56f2a5-libinput-gestures-2.33
- found 2.33 in filename of file in /nix/store/axjjpwcbb3s56m0fk68y8w8vji56f2a5-libinput-gestures-2.33
---
 pkgs/tools/inputmethods/libinput-gestures/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index e58cabc6791..31a7098e08d 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -5,14 +5,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libinput-gestures";
-  version = "2.32";
+  version = "2.33";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "bulletmark";
     repo = "libinput-gestures";
     rev = version;
-    sha256 = "1by6sabx0s8sd9w5675gc26q7yccxnxxsjg4dqlb6nbs0vcg81s7";
+    sha256 = "0a4zq880da1rn0mxn1sq4cp6zkw4bfslr0vjczkbj4immjrj422j";
   };
   patches = [
     ./0001-hardcode-name.patch

From 0ceb110197e06b0d8f4fa7d82f7ccdbfbfda0cd6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 8 Mar 2018 20:15:47 +0000
Subject: [PATCH 0553/2266] ocamlPackages.sawja: 1.5.2 -> 1.5.3

---
 pkgs/development/ocaml-modules/sawja/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index b6c66c82811..92d9cef351b 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 
 let
   pname = "sawja";
-  version = "1.5.2";
+  version = "1.5.3";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/36093/sawja-1.5.2.tar.bz2;
-    sha256 = "12046arkxiy4gf1s17hyc0yzydjzpzwqxn13sbkbxl8xzvmankx4";
+    url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2;
+    sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2";
   };
 
   buildInputs = [ which perl ocaml findlib camlp4 ];

From 8f9f6c7a22e23acee64415d97460b5b7c121caae Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 23:13:30 -0800
Subject: [PATCH 0554/2266] libstrophe: 0.9.1 -> 0.9.2

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/gc20iqfsfjj6c9ikgz06k3rk3597h22q-libstrophe-0.9.2
- found 0.9.2 in filename of file in /nix/store/gc20iqfsfjj6c9ikgz06k3rk3597h22q-libstrophe-0.9.2
---
 pkgs/development/libraries/libstrophe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index 0d014cb22a8..c1e6a1f7fb8 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libstrophe-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "strophe";
     repo = "libstrophe";
     rev = version;
-    sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml";
+    sha256 = "1milna92h8wzxax8ll362zvb70091nmfks5lmd105vk0478zraca";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b0f9c9e6cecb2303ec2af8b8021b7c6e6313de18 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 23:28:46 -0800
Subject: [PATCH 0555/2266] libsvm: 3.20 -> 3.22

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/97a1nnpdah29fs3v274lnzk0hcyhncg3-libsvm-3.22/bin/svm-scale help` got 0 exit code
- ran `/nix/store/97a1nnpdah29fs3v274lnzk0hcyhncg3-libsvm-3.22/bin/svm-train help` got 0 exit code
- found 3.22 in filename of file in /nix/store/97a1nnpdah29fs3v274lnzk0hcyhncg3-libsvm-3.22
---
 pkgs/development/libraries/libsvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 8d3d2f4c60c..aab0da90d39 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsvm-${version}";
-  version = "3.20";
+  version = "3.22";
 
   src = fetchurl {
     url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
-    sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg";
+    sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd";
   };
 
   buildPhase = ''

From b66892931e079610f99cf09bba662446167ec71a Mon Sep 17 00:00:00 2001
From: Reuben D'Netto <rdnetto@gmail.com>
Date: Fri, 9 Mar 2018 18:33:28 +1100
Subject: [PATCH 0556/2266] haskellPackages.cuda: Fixed broken dependency

---
 pkgs/development/haskell-modules/configuration-nix.nix | 5 ++---
 pkgs/development/haskell-modules/hackage-packages.nix  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 28ccb81f2dc..199b9c17654 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -58,9 +58,8 @@ self: super: builtins.intersectAttrs super {
   # CUDA needs help finding the SDK headers and libraries.
   cuda = overrideCabal super.cuda (drv: {
     extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11];
-    configureFlags = (drv.configureFlags or []) ++
-      pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
-      "--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.cudatoolkit.lib}/lib"
       "--extra-include-dirs=${pkgs.cudatoolkit}/include"
     ];
     preConfigure = ''
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 40f28fc4d8d..f5da1bef482 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -54803,8 +54803,8 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.9.0.1";
-       sha256 = "1ldn1jd12kisx6dgz5q50l6hx5aqakwj9vq2fbnx21ri309vlyq8";
+       version = "0.9.0.2";
+       sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];

From 833bf9937e83b551a69e2290418000d29f294baf Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 23:44:50 -0800
Subject: [PATCH 0557/2266] libzdb: 3.0 -> 3.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.1 with grep in /nix/store/zpsvgnphvh4h494h5ivifrvrb5fjzj0w-libzdb-3.1
- found 3.1 in filename of file in /nix/store/zpsvgnphvh4h494h5ivifrvrb5fjzj0w-libzdb-3.1
---
 pkgs/development/libraries/libzdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index a5799f79b56..9d9d8f54e14 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec
 {
-  version = "3.0";
+  version = "3.1";
   name = "libzdb-${version}";
 
   src = fetchurl
   {
     url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
-    sha256 = "e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8";
+    sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g";
   };
 
   buildInputs = [ sqlite ];

From 13e96c16e4ee745c6dacc21296f9e5be3a1367e2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 00:16:57 -0800
Subject: [PATCH 0558/2266] matio: 1.5.10 -> 1.5.11

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump --help` got 0 exit code
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump help` got 0 exit code
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump -V` and found version 1.5.11
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump --version` and found version 1.5.11
- found 1.5.11 with grep in /nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11
- found 1.5.11 in filename of file in /nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11
---
 pkgs/development/libraries/matio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 83ddcbf52e1..9fcc9c70a9b 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.10";
+  name = "matio-1.5.11";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "00dmg2f5k2xgakp7l0lganz122b1agazw5d899xci35xrqc9j821";
+    sha256 = "02ygr7bslzvn6mhxvapz57bh4d448xjf3ds82g1cvhn9al6fvk0c";
   };
 
   meta = with stdenv.lib; {

From 4f1d26288f1fd3c70e6a5ca4baaf8fab504652b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Fri, 9 Mar 2018 09:57:18 +0100
Subject: [PATCH 0559/2266] idrisPackages: fix errors

---
 pkgs/development/idris-modules/default.nix   | 2 --
 pkgs/development/idris-modules/wl-pprint.nix | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 35ee20e9622..4309039f498 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -50,8 +50,6 @@
 
     lightyear = callPackage ./lightyear.nix {};
 
-    optparse = callPackage ./optparse.nix {};
-
     wl-pprint = callPackage ./wl-pprint.nix {};
 
     specdris = callPackage ./specdris.nix {};
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 7e6d77a19a2..bb2476a2dec 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -6,7 +6,7 @@
 , idris
 }:
 build-idris-package {
-  pkName = "wl-pprint";
+  name = "wl-pprint";
   version = "2016-09-28";
 
   src = fetchFromGitHub {

From a28a2e382970fb94a4e07b09946aafe799b5f391 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 01:01:28 -0800
Subject: [PATCH 0560/2266] mosquitto: 1.4.14 -> 1.4.15

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.15 with grep in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15
- found 1.4.15 in filename of file in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15
---
 pkgs/servers/mqtt/mosquitto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index c157064fcb2..bce69370d2b 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.4.14";
+  version = "1.4.15";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
-    sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
+    sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx";
   };
 
   buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]

From 5037107026463e62cba65216469bace8743c1c75 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 21 Feb 2018 12:07:42 +0300
Subject: [PATCH 0561/2266] maintainers: add akru

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 12cbb38a24f..c84bbc54137 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -276,6 +276,11 @@
     github = "akc";
     name = "Anders Claesson";
   };
+  akru = {
+    email = "mail@akru.me";
+    github = "akru";
+    name = "Alexander Krupenkin ";
+  };
   alexvorobiev = {
     email = "alexander.vorobiev@gmail.com";
     github = "alexvorobiev";

From 5b3e44615bf65adc5d6498c1fe31784319722e74 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 21 Feb 2018 12:11:47 +0300
Subject: [PATCH 0562/2266] parity: init at 1.8.10

---
 pkgs/applications/altcoins/default.nix        |   2 +
 pkgs/applications/altcoins/parity/default.nix |   7 ++
 pkgs/applications/altcoins/parity/parity.nix  |  37 +++++++
 .../parity/patches/vendored-sources-1.8.patch | 100 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 148 insertions(+)
 create mode 100644 pkgs/applications/altcoins/parity/default.nix
 create mode 100644 pkgs/applications/altcoins/parity/parity.nix
 create mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index e7558539515..f9ede48ffa1 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -67,4 +67,6 @@ rec {
     withGui = false;
     openssl = openssl_1_1_0;
   };
+
+  parity = callPackage ./parity { };
 }
diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
new file mode 100644
index 00000000000..d7a5f7a0397
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -0,0 +1,7 @@
+let
+  version     = "1.8.10";
+  sha256      = "0slqfzyz11s6wjf77npgw4q6bcgkqmfm53daj47slxm6axkd954r";
+  cargoSha256 = "0k0vqvmz2jr0lfzm8bfrshapgvxjr617shsg5m479m3r02p8l9l3";
+  patches     = [ ./patches/vendored-sources-1.8.patch ];
+in
+  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix
new file mode 100644
index 00000000000..5c208aae147
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/parity.nix
@@ -0,0 +1,37 @@
+{ version
+, sha256
+, cargoSha256
+, patches
+}:
+
+{ stdenv
+, fetchFromGitHub
+, rustPlatform 
+, pkgconfig
+, openssl
+, systemd
+}:
+
+rustPlatform.buildRustPackage rec {
+  name = "parity-${version}";
+  inherit cargoSha256 patches;
+
+  src = fetchFromGitHub {
+    owner = "paritytech";
+    repo = "parity";
+    rev = "v${version}";
+    inherit sha256;
+  };
+
+  buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ]; 
+
+  # Some checks failed
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Fast, light, robust Ethereum implementation";
+    homepage = http://parity.io;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.akru ];
+  };
+}
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch
new file mode 100644
index 00000000000..3239df63de3
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch
@@ -0,0 +1,100 @@
+diff --git a/.cargo/config b/.cargo/config
+new file mode 100644
+index 000000000..8dddda426
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,94 @@
++[source."https://github.com/alexcrichton/mio-named-pipes"]
++git = "https://github.com/alexcrichton/mio-named-pipes"
++branch = "master" 
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/parity-tokio-ipc"]
++git = "https://github.com/nikvolf/parity-tokio-ipc"
++branch = "master" 
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/tokio-named-pipes"]
++git = "https://github.com/nikvolf/tokio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/bn"]
++git = "https://github.com/paritytech/bn"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hidapi-rs"]
++git = "https://github.com/paritytech/hidapi-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hyper"]
++git = "https://github.com/paritytech/hyper"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/js-precompiled.git"]
++git = "https://github.com/paritytech/js-precompiled.git"
++branch = "stable"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/jsonrpc.git"]
++git = "https://github.com/paritytech/jsonrpc.git"
++branch = "parity-1.8"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-rs"]
++git = "https://github.com/paritytech/libusb-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-sys"]
++git = "https://github.com/paritytech/libusb-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/nanomsg.rs.git"]
++git = "https://github.com/paritytech/nanomsg.rs.git"
++branch = "parity-1.7"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-ctrlc.git"]
++git = "https://github.com/paritytech/rust-ctrlc.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-rocksdb"]
++git = "https://github.com/paritytech/rust-rocksdb"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-secp256k1"]
++git = "https://github.com/paritytech/rust-secp256k1"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-snappy"]
++git = "https://github.com/paritytech/rust-snappy"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/trezor-sys"]
++git = "https://github.com/paritytech/trezor-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/wasm-utils"]
++git = "https://github.com/paritytech/wasm-utils"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tailhook/rotor"]
++git = "https://github.com/tailhook/rotor"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tomusdrw/ws-rs"]
++git = "https://github.com/tomusdrw/ws-rs"
++branch = "master"
++replace-with = "vendored-sources"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f4f07cbf0d..b8638131003 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14607,6 +14607,8 @@ with pkgs;
   dapp = self.altcoins.dapp;
   hevm = self.altcoins.hevm;
 
+  parity = self.altcoins.parity;
+
   stellar-core = self.altcoins.stellar-core;
 
   aumix = callPackage ../applications/audio/aumix {

From fb883eb8a15780361af8725d5fe17126d6b18729 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 21 Feb 2018 12:13:07 +0300
Subject: [PATCH 0563/2266] parity-beta: init at 1.9.3

---
 pkgs/applications/altcoins/default.nix        |   1 +
 pkgs/applications/altcoins/parity/beta.nix    |   7 ++
 .../parity/patches/vendored-sources-1.9.patch | 102 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 4 files changed, 111 insertions(+)
 create mode 100644 pkgs/applications/altcoins/parity/beta.nix
 create mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index f9ede48ffa1..599103e7114 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -69,4 +69,5 @@ rec {
   };
 
   parity = callPackage ./parity { };
+  parity-beta = callPackage ./parity/beta.nix { };
 }
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
new file mode 100644
index 00000000000..3936bde0dc0
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -0,0 +1,7 @@
+let
+  version     = "1.9.3";
+  sha256      = "19qyp6kafnnfhdnbq745v8zybnqizjzzc3k4701ly9hf0dvx53ka";
+  cargoSha256 = "1vdvqs6ligp5fkw5s7v44vwqwz5dqa0ipilx0piz6swz0drilima";
+  patches     = [ ./patches/vendored-sources-1.9.patch ];
+in
+  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
new file mode 100644
index 00000000000..faff474b8fe
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@@ -0,0 +1,102 @@
+diff --git a/.cargo/config b/.cargo/config
+new file mode 100644
+index 000000000..0efb69724
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,96 @@
++
++[source."https://github.com/alexcrichton/mio-named-pipes"]
++git = "https://github.com/alexcrichton/mio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"]
++git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"]
++git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/parity-tokio-ipc"]
++git = "https://github.com/nikvolf/parity-tokio-ipc"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/tokio-named-pipes"]
++git = "https://github.com/nikvolf/tokio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/bn"]
++git = "https://github.com/paritytech/bn"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hidapi-rs"]
++git = "https://github.com/paritytech/hidapi-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hyper"]
++git = "https://github.com/paritytech/hyper"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/jsonrpc.git"]
++git = "https://github.com/paritytech/jsonrpc.git"
++branch = "parity-1.9"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-rs"]
++git = "https://github.com/paritytech/libusb-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-sys"]
++git = "https://github.com/paritytech/libusb-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-ctrlc.git"]
++git = "https://github.com/paritytech/rust-ctrlc.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-rocksdb"]
++git = "https://github.com/paritytech/rust-rocksdb"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-secp256k1"]
++git = "https://github.com/paritytech/rust-secp256k1"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-snappy"]
++git = "https://github.com/paritytech/rust-snappy"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/trezor-sys"]
++git = "https://github.com/paritytech/trezor-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/wasm-utils"]
++git = "https://github.com/paritytech/wasm-utils"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tailhook/rotor"]
++git = "https://github.com/tailhook/rotor"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tomusdrw/ws-rs"]
++git = "https://github.com/tomusdrw/ws-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8638131003..c65cceb7109 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14608,6 +14608,7 @@ with pkgs;
   hevm = self.altcoins.hevm;
 
   parity = self.altcoins.parity;
+  parity-beta = self.altcoins.parity-beta;
 
   stellar-core = self.altcoins.stellar-core;
 

From 40ffdbf728019b5ed9e56e3a10fa2ba28c50c37a Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Thu, 1 Mar 2018 01:29:27 +0300
Subject: [PATCH 0564/2266] parity-beta: updated vendored sources

---
 pkgs/applications/altcoins/parity/beta.nix                 | 2 +-
 .../altcoins/parity/patches/vendored-sources-1.9.patch     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index 3936bde0dc0..aecc9b0bb73 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
   version     = "1.9.3";
   sha256      = "19qyp6kafnnfhdnbq745v8zybnqizjzzc3k4701ly9hf0dvx53ka";
-  cargoSha256 = "1vdvqs6ligp5fkw5s7v44vwqwz5dqa0ipilx0piz6swz0drilima";
+  cargoSha256 = "1f2rq96ci1pm29wlaahp4vq6wmmywq33a7svdi9nw5wqvbr1l1nk";
   patches     = [ ./patches/vendored-sources-1.9.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
index faff474b8fe..d1f6520d706 100644
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@@ -3,7 +3,7 @@ new file mode 100644
 index 000000000..0efb69724
 --- /dev/null
 +++ b/.cargo/config
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,100 @@
 +
 +[source."https://github.com/alexcrichton/mio-named-pipes"]
 +git = "https://github.com/alexcrichton/mio-named-pipes"
@@ -90,6 +90,11 @@ index 000000000..0efb69724
 +branch = "master"
 +replace-with = "vendored-sources"
 +
++[source."https://github.com/pepyakin/wasmi"]
++git = "https://github.com/pepyakin/wasmi"
++branch = "master"
++replace-with = "vendored-sources"
++
 +[source."https://github.com/tailhook/rotor"]
 +git = "https://github.com/tailhook/rotor"
 +branch = "master"

From 140ae896b2b6068bde3d048db428a2fc8049f716 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Thu, 1 Mar 2018 23:26:47 +0300
Subject: [PATCH 0565/2266] parity: set linux platforms

---
 pkgs/applications/altcoins/parity/parity.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix
index 5c208aae147..9c9d1d4293e 100644
--- a/pkgs/applications/altcoins/parity/parity.nix
+++ b/pkgs/applications/altcoins/parity/parity.nix
@@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec {
     homepage = http://parity.io;
     license = licenses.gpl3;
     maintainers = [ maintainers.akru ];
+    platforms = platforms.linux;
   };
 }

From c9dcbf45732456fe24b54add6790f0e2c8f29dd7 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Tue, 6 Mar 2018 14:59:43 +0300
Subject: [PATCH 0566/2266] parity: 1.8.10 -> 1.8.11

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

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index d7a5f7a0397..fe2c2c62827 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.8.10";
-  sha256      = "0slqfzyz11s6wjf77npgw4q6bcgkqmfm53daj47slxm6axkd954r";
-  cargoSha256 = "0k0vqvmz2jr0lfzm8bfrshapgvxjr617shsg5m479m3r02p8l9l3";
+  version     = "1.8.11";
+  sha256      = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k";
+  cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi";
   patches     = [ ./patches/vendored-sources-1.8.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 20a91aea71d66589a926cb4c6b601a32c380c52d Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Tue, 6 Mar 2018 17:28:26 +0300
Subject: [PATCH 0567/2266] parity-beta: 1.9.3 -> 1.9.4

fixes #35263
---
 pkgs/applications/altcoins/parity/beta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index aecc9b0bb73..ee4203fa88c 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.9.3";
-  sha256      = "19qyp6kafnnfhdnbq745v8zybnqizjzzc3k4701ly9hf0dvx53ka";
-  cargoSha256 = "1f2rq96ci1pm29wlaahp4vq6wmmywq33a7svdi9nw5wqvbr1l1nk";
+  version     = "1.9.4";
+  sha256      = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f";
+  cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3";
   patches     = [ ./patches/vendored-sources-1.9.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 4d4171d5f640212909360f892fc3405bd40217c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Fri, 9 Mar 2018 10:22:53 +0100
Subject: [PATCH 0568/2266] idrisPackages.wl-pprint: 2016-09-28 -> 2017-03-13

---
 pkgs/development/idris-modules/wl-pprint.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index bb2476a2dec..9ecf0591805 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -7,13 +7,13 @@
 }:
 build-idris-package {
   name = "wl-pprint";
-  version = "2016-09-28";
+  version = "2017-03-13";
 
   src = fetchFromGitHub {
     owner = "shayan-najd";
     repo = "wl-pprint";
-    rev = "4cc88a0865620a3b997863e4167d3b98e1a41b52";
-    sha256 = "1yxxh366k5njad75r0xci2q5c554cddvzgrwk43b0xn8rq0vm11x";
+    rev = "97590d1679b3db07bb430783988b4cba539e9947";
+    sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d";
   };
 
   # The tests for this package fail. We should attempt to enable them when

From 4593b294014045b36f1d3a2395d665ed826d1930 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 02:12:26 -0800
Subject: [PATCH 0569/2266] mypy: 0.560 -> 0.570

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.dmypy-wrapped -h` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.dmypy-wrapped --help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.dmypy-wrapped help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/dmypy -h` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/dmypy --help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/dmypy help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.mypy-wrapped -h` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.mypy-wrapped --help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.mypy-wrapped -V` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.mypy-wrapped --version` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/mypy -h` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/mypy --help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/mypy -V` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/mypy --version` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.stubgen-wrapped -h` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.stubgen-wrapped --help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.stubgen-wrapped help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.stubgen-wrapped version` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/.stubgen-wrapped help` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/stubgen -h` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/stubgen --help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/stubgen help` got 0 exit code
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/stubgen version` and found version 0.570
- ran `/nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570/bin/stubgen help` and found version 0.570
- found 0.570 with grep in /nix/store/ml19prlfk05s39z9252ppjs31ryjfn36-mypy-0.570
---
 pkgs/development/tools/mypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index f06f9c6828c..7e8725745c2 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonApplication rec {
   pname = "mypy";
-  version = "0.560";
+  version = "0.570";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1jja0xlwqajxzab8sabiycax8060zikg89dnl9a7lkqcrwprl35x";
+    sha256 = "09cz0h4d6xcdqlchw080nkjlwki3mgjrlvfnj5hxxwi3cgv9imw3";
   };
 
   propagatedBuildInputs = [ lxml typed-ast psutil ];

From f3809c6f4a739be24d2e29ae9badcbfc8530aa15 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 9 Mar 2018 11:32:19 +0100
Subject: [PATCH 0570/2266] libgroove: fix build

When compiling with GCC v7 and the `-Werror` flag several new warnings
caused the build to fail: https://hydra.nixos.org/build/70751457/nixlog/2

Note: I patched the CMake file manually as v4.3.0 is quite old, a v5 is
in progress, but isn't stable yet, so patching v4 seems to be the better
solution taking stability into account.

See tickets #31747 and #36453
---
 pkgs/development/libraries/libgroove/default.nix  |  4 +++-
 .../libgroove/no-warnings-as-errors.patch         | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libgroove/no-warnings-as-errors.patch

diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
index ac6c9d297cc..bd5a5f06851 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd";
   };
 
+  patches = [ ./no-warnings-as-errors.patch ];
+
   buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];
 
   meta = with stdenv.lib; {
@@ -18,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/andrewrk/libgroove;
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = [ maintainers.andrewrk ];
+    maintainers = with maintainers; [ andrewrk ma27 ];
   };
 }
diff --git a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch
new file mode 100644
index 00000000000..86a8a935769
--- /dev/null
+++ b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1e8541..6bc9c30 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -135,8 +135,8 @@ configure_file (
+   "${PROJECT_BINARY_DIR}/config.h"
+   )
+ 
+-set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L")
+-set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -g")
++set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L")
++set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -g")
+ set(EXAMPLE_INCLUDES "${PROJECT_SOURCE_DIR}")
+ 
+ add_library(groove SHARED ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS})

From 9e3690e87ca2eb39f0fb8960a08d27583192aae3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 02:55:13 -0800
Subject: [PATCH 0571/2266] ngspice: 26 -> 27

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 27 with grep in /nix/store/73sh9hf5c9fjgh962pd1ac16kr8dvzxg-ngspice-27
- found 27 in filename of file in /nix/store/73sh9hf5c9fjgh962pd1ac16kr8dvzxg-ngspice-27
---
 pkgs/applications/science/electronics/ngspice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index ee7c0a5844d..114a2eea85f 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
-  name = "ngspice-26";
+  name = "ngspice-27";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
-    sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+    url = "mirror://sourceforge/ngspice/ngspice-27.tar.gz";
+    sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
   };
 
   buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];

From ba4d57b529b26ea68ffe8fcf94c48c643a442c8c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 9 Mar 2018 11:53:15 +0100
Subject: [PATCH 0572/2266] bonfire: fix build

The requirement's constraint for `pythonPackages.keyring` didn't allow
keyring v11. However it has been bumped in 93a16a2ace93fd96866d98181a07a8c5a779acce
by @FRidh.

Current failure: https://nix-cache.s3.amazonaws.com/log/2nw5adfx86jwiax32mn11kqpc35xwhsh-bonfire-unstable-2017-01-19.drv
See ticket #36453
---
 pkgs/tools/misc/bonfire/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix
index 16b2169769f..0d6e93118d8 100644
--- a/pkgs/tools/misc/bonfire/default.nix
+++ b/pkgs/tools/misc/bonfire/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     # https://github.com/blue-yonder/bonfire/pull/24
     substituteInPlace requirements.txt \
       --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.13" \
-      --replace "keyring>=9,<10"    "keyring>=9,<11"
+      --replace "keyring>=9,<10"    "keyring>=9,<=11"
     # pip fails when encountering the git hash for the package version
     substituteInPlace setup.py \
       --replace "version=version," "version='${version}',"

From 6e5cd9cbfbfd9d6a0188ba909fec1c593706be88 Mon Sep 17 00:00:00 2001
From: Hugo Tavares Reis <hugo@linux.com>
Date: Fri, 9 Mar 2018 12:47:50 +0100
Subject: [PATCH 0573/2266] nixnote2: fix icon and version

---
 pkgs/applications/misc/nixnote2/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 971da8ba048..4ac152c2669 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -24,8 +24,14 @@ mkDerivation rec {
         --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>'
     done
 
+    substituteInPlace help/about.html --replace '__VERSION__' '${version}'
+
     substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
   '';
+  
+  postInstal = ''
+    cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
+  '';
 
   meta = with stdenv.lib; {
     description = "An unofficial client of Evernote";

From 6625fb8a67bada3d1c502ca9f48f2a4dad713343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 9 Mar 2018 11:58:15 +0000
Subject: [PATCH 0574/2266] libf2c: 20100903 -> 20160102

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

diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
index 78901e2f013..2de407e8f63 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "libf2c-20100903";
+  name = "libf2c-20160102";
 
   src = fetchurl {
     url = http://www.netlib.org/f2c/libf2c.zip;
-    sha256 = "1mcp1lh7gay7hm186dr0wvwd2bc05xydhnc1qy3dqs4n3r102g7i";
+    sha256 = "1q78y8j8xpl8zdzdxmn5ablss56hi5a7vz3idam9l2nfx5q40h6a";
   };
 
   unpackPhase = ''

From 905e6f357ce4d1de10cd9b375673fa793983fbff Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 03:59:23 -0800
Subject: [PATCH 0575/2266] obs-studio: 21.0.2 -> 21.0.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/obs -h` got 0 exit code
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/obs --help` got 0 exit code
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/.obs-wrapped -h` got 0 exit code
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/.obs-wrapped --help` got 0 exit code
- found 21.0.3 with grep in /nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 1c7a72d95ae..a3ed28c3fd0 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -29,13 +29,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "21.0.2";
+  version = "21.0.3";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "1yyvxqzxy9dz6rmjcrdn90nfaff4f38mfz2gsq535cr59sg3f8jc";
+    sha256 = "1mrihhzlsc66w5lr1lcm8c8jg6z0iwmmckr3pk3gk92z4s55969q";
   };
 
   patches = [ ./find-xcb.patch ];

From f28e94a17915582cf30d54aa1d25d33acfc8ff48 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 9 Mar 2018 12:36:45 +0000
Subject: [PATCH 0576/2266] mps: fix build with gcc7

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

diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index 5a841f165ca..aac9dc7f727 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ sqlite ];
 
+  # needed for 1.116.0 to build with gcc7
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-implicit-fallthrough"
+  ];
+
+
   meta = {
     description = "A flexible memory management and garbage collection library";
     homepage    = "https://www.ravenbrook.com/project/mps";

From ecc9946a81ea394d5d1b3c66fe95a76c89b01254 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 04:39:44 -0800
Subject: [PATCH 0577/2266] openfst: 1.6.3 -> 1.6.6

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/4yq76v4x9kkmwqmvrcxh89kh1lp96gg0-openfst-1.6.6/bin/fstcompile help` got 0 exit code
- found 1.6.6 with grep in /nix/store/4yq76v4x9kkmwqmvrcxh89kh1lp96gg0-openfst-1.6.6
- found 1.6.6 in filename of file in /nix/store/4yq76v4x9kkmwqmvrcxh89kh1lp96gg0-openfst-1.6.6
---
 pkgs/development/libraries/openfst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index 690261438ab..f8cbc867b2b 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "openfst";
-  version = "1.6.3";
+  version = "1.6.6";
 
   src = fetchurl {
     url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
-    sha256 = "5c28b6ccd017fc6ff94ebd0c73ed8ab37d48f563dab1c603856fb05bc9333d99";
+    sha256 = "1b13nzf9xh1iv0k8z7sdfs9ya2ykf0gzjiixpb1qn3bydck6ppdm";
   };
   meta = {
     description = "Library for working with finite-state transducers";

From 5664866973f201bcebd95eec27b2a5a9a1987fe8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 04:55:03 -0800
Subject: [PATCH 0578/2266] opengrok: 0.12.5 -> 1.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0 with grep in /nix/store/x8i9mf6wvwj3n7il5kixfyrn0gdshnsb-opengrok-1.0
- found 1.0 in filename of file in /nix/store/x8i9mf6wvwj3n7il5kixfyrn0gdshnsb-opengrok-1.0
---
 pkgs/development/tools/misc/opengrok/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index cdfa51d6f2b..a0434f2d0e7 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation rec {
   name = "opengrok-${version}";
-  version = "0.12.5";
+  version = "1.0";
 
-  # 0.12.5 is the latest distributed as a .tar.gz file.
+  # 1.0 is the latest distributed as a .tar.gz file.
   # Newer are distribued as .zip so a source build is required.
 
   # if builded from source
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # binary distribution
   src = fetchurl {
     url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz;
-    sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead";
+    sha256 = "1bafiq4s9sqldinl6fy931rm0x8zj2magfdlbi3nqlnidsghgkn3";
   };
 
   buildInputs = [ makeWrapper ];

From 724667fa3f4262e9385c661191493ff84921a25d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 05:10:28 -0800
Subject: [PATCH 0579/2266] openlibm: 0.5.4 -> 0.5.5

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.5.5 with grep in /nix/store/im5hsldagl6la2yf5s8rsnv2w57mb76m-openlibm-0.5.5
- found 0.5.5 in filename of file in /nix/store/im5hsldagl6la2yf5s8rsnv2w57mb76m-openlibm-0.5.5
---
 pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 6b229f31f16..195b90c86e1 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "openlibm-${version}";
-  version = "0.5.4";
+  version = "0.5.5";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
-    sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn";
+    sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From bcd11f6a05a9471f44bc382489dd58db08356f98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 Mar 2018 02:30:33 +0100
Subject: [PATCH 0580/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.8.2-10-g32cfe74 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ed3336e836fad64b0d37e90b3bdb234576e4bb5e.
---
 .../haskell-modules/hackage-packages.nix      | 1558 ++++++++++++++---
 1 file changed, 1293 insertions(+), 265 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f5da1bef482..e5a9c0784fc 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2491,24 +2491,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Cabal_2_0_1_1" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, pretty, process, QuickCheck, tagged
-     , tasty, tasty-hunit, tasty-quickcheck, time, unix
+  "Cabal_2_2_0_0" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, binary
+     , bytestring, containers, deepseq, Diff, directory, filepath
+     , integer-logarithms, mtl, optparse-applicative, parsec, pretty
+     , process, QuickCheck, tagged, tar, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, text, time, transformers
+     , tree-diff, unix
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "2.0.1.1";
-       sha256 = "06rx6jxikqrdf7k6pmam5cvhwnagq6njmb9qm5777nrz278ccaw0";
-       revision = "1";
-       editedCabalFile = "17ydppw8x5cx5whrs44yxirh7xgcaa6gzvxmlgqnbalcf8wkj23l";
+       version = "2.2.0.0";
+       sha256 = "0bq4zgfvwlqjgsnph61pllvwhfmn8z224ycplqziyxc3zmwb3a96";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
-         pretty process time unix
+         mtl parsec pretty process text time transformers unix
        ];
        testHaskellDepends = [
-         array base containers directory filepath pretty QuickCheck tagged
-         tasty tasty-hunit tasty-quickcheck
+         array base base-compat base-orphans bytestring containers deepseq
+         Diff directory filepath integer-logarithms optparse-applicative
+         pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit
+         tasty-quickcheck text tree-diff
        ];
        doCheck = false;
        homepage = "http://www.haskell.org/cabal/";
@@ -2973,6 +2976,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "ClustalParser_1_2_2" = callPackage
+    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "ClustalParser";
+       version = "1.2.2";
+       sha256 = "1x6ag9knvc18pwvm3cdj936pn8k2nbd54n3ii44r7b7kjcb7cgk6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec text vector ];
+       executableHaskellDepends = [ base cmdargs either-unwrap ];
+       testHaskellDepends = [ base hspec parsec text ];
+       description = "Libary for parsing Clustal tools output";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Coadjute" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-csv
      , containers, directory, fgl, filepath, mtl, old-time, pretty
@@ -10143,6 +10164,26 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_4_13" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+     , openssl, time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.13";
+       sha256 = "0izzgyjd0s9whqllwyg8gv2xnsfax9sf8j47zq1d2vmk7mpx2p0j";
+       setupHaskellDepends = [ base Cabal ];
+       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-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -10919,6 +10960,8 @@ self: {
        pname = "JuicyPixels-extra";
        version = "0.3.0";
        sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865";
+       revision = "1";
+       editedCabalFile = "17y0d11hgdnzcgv7q7zl3wic2w2xhqn123vzfsdivncgdgqlvy0c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
@@ -16628,8 +16671,8 @@ self: {
      }:
      mkDerivation {
        pname = "SelectSequencesFromMSA";
-       version = "1.0.3";
-       sha256 = "0i2nzwv0czg1igyfiyk5n748j15fcavn84dwxibiqf48wzjz9gsc";
+       version = "1.0.4";
+       sha256 = "0rr8gxkypjg347fna0q5aqjllvc95477n3xy63cvs0bn8v5vq9z5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16640,7 +16683,7 @@ self: {
        executableHaskellDepends = [
          base cmdargs directory either-unwrap
        ];
-       description = "SelectSequences is a tool for selection of a represenative subset of sequences from a multiple sequence alignment in clustal format";
+       description = "Selects a representative subset of sequences from multiple sequence alignment";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -16704,15 +16747,18 @@ self: {
      }) {};
 
   "ShellCheck" = callPackage
-    ({ mkDerivation, base, containers, directory, json, mtl, parsec
-     , process, QuickCheck, regex-tdfa
+    ({ mkDerivation, base, Cabal, containers, directory, json, mtl
+     , parsec, process, QuickCheck, regex-tdfa
      }:
      mkDerivation {
        pname = "ShellCheck";
        version = "0.4.7";
        sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q";
+       revision = "1";
+       editedCabalFile = "0fbrysx6wb9kmlzbfyjcb7107rnf0rjldlszaqnpib33vwd7l1hx";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
          base containers directory json mtl parsec process QuickCheck
          regex-tdfa
@@ -16723,7 +16769,7 @@ self: {
        testHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
        ];
-       homepage = "http://www.shellcheck.net/";
+       homepage = "https://www.shellcheck.net/";
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -21903,6 +21949,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson_1_3_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+     , base16-bytestring, bytestring, containers, deepseq, directory
+     , dlist, filepath, generic-deriving, ghc-prim, hashable
+     , hashable-time, HUnit, integer-logarithms, QuickCheck
+     , quickcheck-instances, scientific, tagged, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, th-abstraction, time, time-locale-compat
+     , unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.3.0.0";
+       sha256 = "1glrwccp5hi9zn8d34761zinvpmbd4dsbgzqg2qxk6glp928phna";
+       libraryHaskellDepends = [
+         attoparsec base base-compat bytestring containers deepseq dlist
+         ghc-prim hashable scientific tagged template-haskell text
+         th-abstraction time time-locale-compat unordered-containers
+         uuid-types vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers directory dlist filepath generic-deriving
+         ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
+         quickcheck-instances scientific tagged template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time time-locale-compat unordered-containers uuid-types vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-applicative" = callPackage
     ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
@@ -22274,8 +22354,8 @@ self: {
     ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
      mkDerivation {
        pname = "aeson-picker";
-       version = "0.1.0.2";
-       sha256 = "0m14ykp894s8nbg89v2f83yyb344ypxwchmyww0nq0mcpzk3v95b";
+       version = "0.1.0.3";
+       sha256 = "0ipkl5plyhbkld3i6jrlzy9y1kpvb69gy1nqb45rbnjbdxafslpk";
        libraryHaskellDepends = [ aeson base lens lens-aeson text ];
        testHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/ozzzzz/aeson-picker#readme";
@@ -29565,6 +29645,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "atomic-primops_0_8_2" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "atomic-primops";
+       version = "0.8.2";
+       sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
+       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
+       description = "A safe approach to CAS and other atomic ops in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "atomic-primops-foreign" = callPackage
     ({ mkDerivation, base, bits-atomic, HUnit, test-framework
      , test-framework-hunit, time
@@ -29707,8 +29800,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.7.0.22";
-       sha256 = "0cm5psp9k207yqzacdribjp7clk8a3b5vx9qfb7kq5va3fv7hh05";
+       version = "2.7.1.0";
+       sha256 = "0lpyvcj5cki19fs9022yb1wzwis6a89f3i4s03rcll0lvshmxd2q";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -32255,6 +32348,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-orphans_0_7" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
+     }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.7";
+       sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-prelude" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -36420,8 +36529,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6.2";
        sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84";
-       revision = "1";
-       editedCabalFile = "0zc84pjrmb2xpsvavvf950vrwyd6nlfj3x2hi930wq1kjm7pr4ps";
+       revision = "3";
+       editedCabalFile = "0fanap927iszy3vkymkjcmzd74gripbbp222zcmzl5gkn3l4g931";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
@@ -36563,6 +36672,8 @@ self: {
        pname = "blaze-builder";
        version = "0.4.0.2";
        sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws";
+       revision = "1";
+       editedCabalFile = "1n8z1zcvrslsa9dvflx8528hsialmnljl1zzdjf1azs24xdq2npm";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -39245,6 +39356,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bv-sized" = callPackage
+    ({ mkDerivation, base, parameterized-utils }:
+     mkDerivation {
+       pname = "bv-sized";
+       version = "0.1.0.0";
+       sha256 = "07na5cg1w0ybydsvm4i7gdz7ghas6j7a4n8gzpd4sywfvrbirp21";
+       libraryHaskellDepends = [ base parameterized-utils ];
+       homepage = "https://github.com/benjaminselfridge/bv-sized";
+       description = "a BitVector datatype that is parameterized by the vector width";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "byline" = callPackage
     ({ mkDerivation, ansi-terminal, base, colour, containers
      , exceptions, haskeline, mtl, terminfo-hs, text, transformers
@@ -39590,8 +39713,8 @@ self: {
     ({ mkDerivation, base, bytestring, terminal-progress-bar, time }:
      mkDerivation {
        pname = "bytestring-progress";
-       version = "1.0.8";
-       sha256 = "0zqb9aanlwq2ddcn7n8xar73fjb04xvfym7k5pjah2cs1lh3cv8l";
+       version = "1.0.9";
+       sha256 = "1gqcr15956zzldsc3rvds3ybd43907bv69cw3i7a1c0nfz60zg70";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring terminal-progress-bar time
@@ -39927,6 +40050,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mosquitto;};
 
+  "c-storable" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "c-storable";
+       version = "0.2";
+       sha256 = "03ynlm6nbm2hsqp0bpcqj3kp1hbg2pnif44zrgj8rda8dmsczm9j";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/elaforge/c-storable";
+       description = "CStorable class";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "c-storable-deriving" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -40296,6 +40432,8 @@ self: {
        pname = "cabal-doctest";
        version = "1.0.6";
        sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
+       revision = "1";
+       editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        homepage = "https://github.com/phadej/cabal-doctest";
        description = "A Setup.hs helper for doctests running";
@@ -42299,6 +42437,18 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
+  "caseof" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "caseof";
+       version = "0.0.1";
+       sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/chrisdone/caseof#readme";
+       description = "Combinators for casing on constructors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cases" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, criterion, HTF
      , HUnit, loch-th, mwc-random, placeholders, QuickCheck, rerebase
@@ -44129,6 +44279,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "chatwork_0_1_3_1" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
+     , data-default-class, hspec, http-api-data, http-client
+     , http-client-tls, http-types, req, servant-server, text, warp
+     }:
+     mkDerivation {
+       pname = "chatwork";
+       version = "0.1.3.1";
+       sha256 = "0wsr84yk8l9s8fpb6fg4vbjyzlvy0608qply1h12zi09b5zr149i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring connection data-default-class
+         http-api-data http-client http-client-tls http-types req text
+       ];
+       executableHaskellDepends = [
+         aeson aeson-casing base bytestring connection data-default-class
+         http-api-data http-client http-client-tls http-types req text
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring connection data-default-class
+         hspec http-api-data http-client http-client-tls http-types req
+         servant-server text warp
+       ];
+       homepage = "https://github.com/matsubara0507/chatwork#readme";
+       description = "The ChatWork API in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cheapskate" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize
@@ -45834,6 +46014,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "clay_0_13_0" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
+     mkDerivation {
+       pname = "clay";
+       version = "0.13.0";
+       sha256 = "0kyg5ifrjdvd7rxzsa6jjfyv9xx8amlfzbmrfwksrqla2nxqyljl";
+       libraryHaskellDepends = [ base mtl text ];
+       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
+       homepage = "http://fvisser.nl/clay";
+       description = "CSS preprocessor as embedded Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
@@ -50357,6 +50551,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "confide" = callPackage
+    ({ mkDerivation, base, deiko-config, exceptions, tasty, tasty-hunit
+     , text
+     }:
+     mkDerivation {
+       pname = "confide";
+       version = "0.1.0.3";
+       sha256 = "0agq5naldbs1lwpw9nf5jldzrqh6pbc1n5vn5cb3kk7rj7j1a8ik";
+       libraryHaskellDepends = [ base deiko-config exceptions text ];
+       testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
+       homepage = "https://github.com/amilkov3/confide";
+       description = "derive typeclass instances for decoding types from HOCON conf";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "config-ini" = callPackage
     ({ mkDerivation, base, containers, directory, hedgehog, ini
      , megaparsec, text, transformers, unordered-containers
@@ -50418,10 +50627,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "0.5.0.0";
-       sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli";
-       revision = "1";
-       editedCabalFile = "03py056v8wvabykx95h5z52g0a5sxglmvvk67wvr94ig8161gbjc";
+       version = "0.5.0.1";
+       sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -50452,8 +50659,8 @@ self: {
     ({ mkDerivation, alex, array, base, happy, pretty, text }:
      mkDerivation {
        pname = "config-value";
-       version = "0.6.3";
-       sha256 = "0c7ghasn06m4mlhk3lg5pxpssbsr4l88ibi6vzvp8ylbqha0b3gn";
+       version = "0.6.3.1";
+       sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -51293,8 +51500,8 @@ self: {
     ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.6";
-       sha256 = "04vv2qnpz2pfkizrx8layf3z9kfjkika15ha5kpm0av52d405fiz";
+       version = "0.1.0.7";
+       sha256 = "04cg0xb634c915mx83vx1vh3l898i27pz309nz6h4jikp99skcs9";
        libraryHaskellDepends = [ base recursion-schemes ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -52312,6 +52519,8 @@ self: {
        pname = "country";
        version = "0.1.4";
        sha256 = "027i4ncnsyii41wfndn369xmlbkp4vvcrx7m7cdb07n4wlcpz0bl";
+       revision = "1";
+       editedCabalFile = "0sjzrld5qa2wn66zgf25w5h41179mcmsjvndn1j8kl20bfsiwhvh";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring ghc-prim hashable primitive
          scientific text unordered-containers
@@ -54818,6 +55027,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cuda_0_9_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
+     , pretty, template-haskell
+     }:
+     mkDerivation {
+       pname = "cuda";
+       version = "0.9.0.2";
+       sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         base bytestring filepath template-haskell
+       ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base pretty ];
+       homepage = "https://github.com/tmcdonell/cuda";
+       description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cudd" = callPackage
     ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }:
      mkDerivation {
@@ -56034,27 +56265,28 @@ self: {
      }) {};
 
   "data-basic" = callPackage
-    ({ mkDerivation, aeson, base, basic, binary, bytestring, cases
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, cases
      , containers, hssqlppp, lens, lens-aeson, mtl, overload
-     , postgresql-simple, simple-effects, string-conv, template-haskell
-     , text, time
+     , postgresql-simple, scientific, simple-effects, simple-logging
+     , string-conv, template-haskell, text, time
      }:
      mkDerivation {
        pname = "data-basic";
-       version = "0.2.0.3";
-       sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k";
+       version = "0.3.0.0";
+       sha256 = "0ssixfnkgxd132pp6mlpgrkbwqbkrx5zn4ayd7br9ncjvpj2j0gr";
        libraryHaskellDepends = [
-         aeson base binary bytestring cases containers hssqlppp lens
-         lens-aeson mtl overload postgresql-simple simple-effects
-         string-conv template-haskell text time
+         aeson attoparsec base binary bytestring cases containers hssqlppp
+         lens lens-aeson mtl overload postgresql-simple scientific
+         simple-effects simple-logging string-conv template-haskell text
+         time
+       ];
+       testHaskellDepends = [
+         aeson base lens postgresql-simple string-conv time
        ];
-       testHaskellDepends = [ base basic lens postgresql-simple time ];
        homepage = "https://gitlab.com/haskell-hr/basic";
        description = "A database library with a focus on ease of use, type safety and useful error messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {basic = null;};
+     }) {};
 
   "data-binary-ieee754" = callPackage
     ({ mkDerivation, base, binary }:
@@ -57785,8 +58017,8 @@ self: {
      }:
      mkDerivation {
        pname = "datarobot";
-       version = "0.1.1";
-       sha256 = "1dcr0jnd7wgxplzfgbkbv79civ80iqzlz2nvp3s6hv5zyzbf2pm9";
+       version = "1.0.0";
+       sha256 = "0ia74i013drj1mwgpq2dv2ayscs2z4hd7amcbzgxrp1b1j2mkhvj";
        libraryHaskellDepends = [
          aeson base bytestring exceptions microlens network-uri safe
          scientific string-conversions text unordered-containers vector wreq
@@ -59319,14 +59551,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_1_0_2" = callPackage
+  "dejafu_1_3_0_1" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, profunctors, random, ref-fd, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.1.0.2";
-       sha256 = "11gkiy3dh7a9qjg53zilmll0hk61bq68j76s7b31ylwadv437jcm";
+       version = "1.3.0.1";
+       sha256 = "1qw5ab57fa3phidfzslymxxxi29vcbssc6g8rk9pv07ah6hpccn5";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
          profunctors random ref-fd transformers
@@ -61657,6 +61889,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dimensional_1_1" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob
+     , hspec, ieee754, numtype-dk, QuickCheck, semigroups
+     , template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "dimensional";
+       version = "1.1";
+       sha256 = "05jy0xs1nmxz7x3b589313hqk317838crhd974knm5k73jf8h99s";
+       libraryHaskellDepends = [
+         base deepseq exact-pi ieee754 numtype-dk semigroups vector
+       ];
+       testHaskellDepends = [
+         base doctest Glob hspec QuickCheck template-haskell
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       homepage = "https://github.com/bjornbm/dimensional/";
+       description = "Statically checked physical dimensions, using Type Families and Data Kinds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dimensional-codata" = callPackage
     ({ mkDerivation, base, dimensional, numtype-dk }:
      mkDerivation {
@@ -63359,6 +63613,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_3_0_2" = callPackage
+    ({ mkDerivation, async, attoparsec, auto-update, base
+     , base64-bytestring, binary, bytestring, conduit, conduit-extra
+     , containers, cryptonite, doctest, hspec, iproute, mtl, network
+     , psqueues, QuickCheck, safe, time, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "3.0.2";
+       sha256 = "193j67jnhxkih3gbfzdx9cpzvqryk4kzc3yhl1yagdg16shrba7i";
+       libraryHaskellDepends = [
+         async attoparsec auto-update base base64-bytestring binary
+         bytestring conduit conduit-extra containers cryptonite iproute mtl
+         network psqueues safe time
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec iproute QuickCheck word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -67559,6 +67837,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_2_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.2.3";
+       sha256 = "1alz5j2bz7x3cwlksdxdynzgcrbbf7jyxmgh61n0wmqnav509y96";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       homepage = "https://github.com/Porges/email-validate-hs";
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -68018,16 +68314,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "entropy_0_4" = callPackage
+  "entropy_0_4_1_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, unix
      }:
      mkDerivation {
        pname = "entropy";
-       version = "0.4";
-       sha256 = "0h8icprikafidq4x88crz5phfgp6zgmxq4awam2dhs0z2fswd9wc";
-       revision = "1";
-       editedCabalFile = "1hx5yxzypi708zlg1almqhfasfgmaisrv44fr0i8ldvvqxf5slza";
+       version = "0.4.1.1";
+       sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
@@ -69961,7 +70255,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventstore_1_1_1" = callPackage
+  "eventstore_1_1_2" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -69973,8 +70267,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "1.1.1";
-       sha256 = "1cvn53nf6igcg3a2sdvihd857vdrhrkcj1bzrbzaixkrxqcyhn9y";
+       version = "1.1.2";
+       sha256 = "1f2pqmsppln3p0zfw35hck5784np9hhs3f5f6h6j12k43gyj3847";
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring cereal clock connection
          containers dns dotnet-timespan ekg-core exceptions fast-logger
@@ -70971,7 +71265,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extensible_0_4_7_2" = callPackage
+  "extensible_0_4_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, comonad
      , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
      , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar
@@ -70980,8 +71274,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.4.7.2";
-       sha256 = "1qfnhgd7z2hn65gyn4vxn7fxrxzyqgh6j9vdwq8wbq6c8v6j413y";
+       version = "0.4.8";
+       sha256 = "1bm7yqshaknnd50yf6bgb6qxl2lv21pqxhb674v3ifpwx1swrkm2";
        libraryHaskellDepends = [
          aeson base bytestring cassava comonad constraints deepseq ghc-prim
          hashable monad-skeleton mtl primitive profunctors QuickCheck
@@ -72065,6 +72359,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fb_1_2_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , base64-bytestring, bytestring, cereal, conduit, conduit-extra
+     , containers, crypto-api, cryptohash, cryptohash-cryptoapi
+     , data-default, hspec, http-client, http-conduit, http-types, HUnit
+     , monad-logger, old-locale, QuickCheck, resourcet, text, time
+     , transformers, transformers-base, unliftio, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "fb";
+       version = "1.2.0";
+       sha256 = "04ppg1qhm93w5j6arv7ykp0vf85nfwhv6dkpyji34c0nalqzyx6l";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring base64-bytestring
+         bytestring cereal conduit conduit-extra crypto-api cryptohash
+         cryptohash-cryptoapi data-default http-client http-conduit
+         http-types monad-logger old-locale resourcet text time transformers
+         transformers-base unliftio unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit containers data-default hspec
+         http-conduit HUnit QuickCheck resourcet text time transformers
+         unliftio
+       ];
+       homepage = "https://github.com/psibi/fb";
+       description = "Bindings to Facebook's API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fb-persistent" = callPackage
     ({ mkDerivation, base, cereal, fb, persistent, text, time }:
      mkDerivation {
@@ -75769,6 +76094,8 @@ self: {
        pname = "forma";
        version = "0.2.0";
        sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00";
+       revision = "1";
+       editedCabalFile = "1hqay7gjhnlxya08qwmxnwriy958awafvyi7rws6wla5m1cq0wr6";
        libraryHaskellDepends = [
          aeson base containers data-default-class mtl text
          unordered-containers
@@ -76488,7 +76815,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "free_5" = callPackage
+  "free_5_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, profunctors, semigroupoids
      , semigroups, template-haskell, transformers, transformers-base
@@ -76496,10 +76823,8 @@ self: {
      }:
      mkDerivation {
        pname = "free";
-       version = "5";
-       sha256 = "1s4avwm4lnscmxv3fy0zws3vbg61sczgxm1m3cdnqxp95bd6p4c7";
-       revision = "1";
-       editedCabalFile = "13kxrs6097cwh80hawdmdrz4l5cqmrwkxh667spx8hx390102ddf";
+       version = "5.0.1";
+       sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p";
        libraryHaskellDepends = [
          base bifunctors comonad containers distributive exceptions mtl
          profunctors semigroupoids semigroups template-haskell transformers
@@ -77854,8 +78179,8 @@ self: {
        pname = "functor-classes-compat";
        version = "1";
        sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
-       revision = "1";
-       editedCabalFile = "04blby010250gyg0v7nwdr9hwzvkapmfy9xn5522h8jmb3yygh8l";
+       revision = "2";
+       editedCabalFile = "07ldwmqfwi2lgnmia5bb0885664a54g2q55f91swgafb11n0csqg";
        libraryHaskellDepends = [
          base containers hashable unordered-containers vector
        ];
@@ -82268,8 +82593,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.19";
-       sha256 = "1qcivdbwa3g05dzgzd3jnzha33j5jm06gp2ml9fma0d1160dqa2g";
+       version = "3.0.20";
+       sha256 = "0k3rbr8jajkhgmrdpv7fy4xk2kfx3b6cgm8wgfba8m8wkz1s1l7s";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -86738,6 +87063,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "google-server-api" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
+     , bytestring, HsOpenSSL, http-api-data, http-client
+     , http-client-tls, mime-mail, monad-control, monad-logger, mtl
+     , read-env-var, RSA, servant, servant-client, text, time
+     , transformers, transformers-base, unix-time, unordered-containers
+     , wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "google-server-api";
+       version = "0.1.0.0";
+       sha256 = "1pw7bmdq7c44zjpz3wz8x3iz05dlgs004mhbyxfmsfp8jaiqh7ap";
+       libraryHaskellDepends = [
+         aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
+         http-api-data http-client http-client-tls mime-mail monad-control
+         monad-logger mtl read-env-var RSA servant servant-client text time
+         transformers transformers-base unix-time unordered-containers wai
+         wai-extra warp
+       ];
+       homepage = "https://github.com/arowM/haskell-google-server-api#readme";
+       description = "Google APIs for server to server applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "google-static-maps" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytedump
      , bytestring, cryptonite, double-conversion, http-client
@@ -88432,6 +88781,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "groundhog-postgresql_0_8_0_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , containers, groundhog, monad-control, postgresql-libpq
+     , postgresql-simple, resource-pool, resourcet, text, time
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "groundhog-postgresql";
+       version = "0.8.0.2";
+       sha256 = "0fmqnlj39xxf219qfcxp3pmhw4b09amax3j3v4h1xlnz6sfv3qpi";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder bytestring containers groundhog
+         monad-control postgresql-libpq postgresql-simple resource-pool
+         resourcet text time transformers vector
+       ];
+       description = "PostgreSQL backend for the groundhog library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-sqlite" = callPackage
     ({ mkDerivation, base, bytestring, containers, direct-sqlite
      , groundhog, monad-control, resource-pool, resourcet, text
@@ -91010,8 +91379,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
-       version = "2.18.1";
-       sha256 = "1gg1nl38f2h93xci4pa4zgb5wvcpwv0mab0balmzzgnd4amk3jgv";
+       version = "2.19.0.1";
+       sha256 = "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -91095,16 +91464,18 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.18.1";
-       sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8";
-       revision = "1";
-       editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y";
+       version = "2.19.0.1";
+       sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
        ];
-       testHaskellDepends = [ base containers ghc hspec QuickCheck ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers deepseq directory filepath
+         ghc ghc-boot ghc-paths haddock-library hspec QuickCheck
+         transformers xhtml
+       ];
        testToolDepends = [ hspec-discover ];
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
@@ -91186,17 +91557,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haddock-library_1_4_5" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , hspec-discover, QuickCheck, transformers
+  "haddock-library_1_5_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+     , directory, filepath, hspec, hspec-discover, optparse-applicative
+     , QuickCheck, transformers, tree-diff
      }:
      mkDerivation {
        pname = "haddock-library";
-       version = "1.4.5";
-       sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
+       version = "1.5.0.1";
+       sha256 = "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq transformers
+       ];
        testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
+         base base-compat bytestring containers deepseq directory filepath
+         hspec optparse-applicative QuickCheck transformers tree-diff
        ];
        testToolDepends = [ hspec-discover ];
        homepage = "http://www.haskell.org/haddock/";
@@ -92718,6 +93093,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_5_3" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, stm, temporary, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.5.3";
+       sha256 = "04f7fiy4zdsl2pxb6yxq91lqgvyw0qwr9ky5sxsxj4nx40inv4d1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath formatting gitrev mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -93424,8 +93827,8 @@ self: {
        pname = "happy";
        version = "1.19.9";
        sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
-       revision = "1";
-       editedCabalFile = "1lm706nv64cvfi3ccg7hc3217642sg0z9f9xz2ivbpzvzwwn8gj6";
+       revision = "2";
+       editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -94010,6 +94413,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable_1_2_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+     , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, unix
+     }:
+     mkDerivation {
+       pname = "hashable";
+       version = "1.2.7.0";
+       sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim HUnit QuickCheck random test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim integer-gmp siphash text
+       ];
+       homepage = "http://github.com/tibbe/hashable";
+       description = "A class for types that can be converted to a hash value";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers, transformers-compat
@@ -94788,18 +95218,19 @@ self: {
   "haskell-docs" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
      , containers, cryptohash, directory, filepath, ghc, ghc-paths
-     , haddock-api, monad-loops, process, text, unordered-containers
+     , haddock-api, haddock-library, monad-loops, process, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-docs";
-       version = "4.2.7";
-       sha256 = "1mb32kxn7p7xsvs3l32bj0igrmc1563ay9v40da2fmxnx3v1aap8";
+       version = "4.2.8";
+       sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Cabal containers cryptohash
-         directory filepath ghc ghc-paths haddock-api monad-loops process
-         text unordered-containers
+         directory filepath ghc ghc-paths haddock-api haddock-library
+         monad-loops process text unordered-containers
        ];
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
@@ -95651,15 +96082,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-src-exts_1_20_1" = callPackage
+  "haskell-src-exts_1_20_2" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
      }:
      mkDerivation {
        pname = "haskell-src-exts";
-       version = "1.20.1";
-       sha256 = "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8";
+       version = "1.20.2";
+       sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -96817,8 +97248,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskelzinc";
-       version = "0.3.1.0";
-       sha256 = "0k3rsqassxjjwxn0cs2g8jl7hl3qmvdvrfdcclc3bf9pjf93jvwh";
+       version = "0.3.1.1";
+       sha256 = "0dz9sd2i6m4d2jj76zl6yfaynnzj8ihhfis6602cqh37ngxgkxqj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath parsec pretty process
@@ -101588,6 +102019,8 @@ self: {
        pname = "hgmp";
        version = "0.1.1";
        sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
+       revision = "1";
+       editedCabalFile = "14hbr8r0pjgjv2pv9any7yqrvw2qyg7z1fk89d4sh0wd6isvgjqj";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://code.mathr.co.uk/hgmp";
@@ -105426,6 +105859,8 @@ self: {
        pname = "hookup";
        version = "0.2";
        sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2";
+       revision = "1";
+       editedCabalFile = "1g4zijk8f4rff0g2y0m0308zmnwsbx0a3swbx8i8gvfd6v1g4cf6";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
        ];
@@ -108024,8 +108459,8 @@ self: {
     ({ mkDerivation, base, containers, directory, filepath, process }:
      mkDerivation {
        pname = "hsc2hs";
-       version = "0.68.2";
-       sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn";
+       version = "0.68.3";
+       sha256 = "0q46l4mvclw7lys53zljgrcj142rbwzk5zc2djk2qj956ah1i25h";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -111236,6 +111671,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsyslog-udp_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "hsyslog-udp";
+       version = "0.2.1";
+       sha256 = "0133yr6cg7z1ix6dqskjzi36d62803549vdbpg9a29lb49kl1yv3";
+       libraryHaskellDepends = [
+         base bytestring hsyslog network text time unix
+       ];
+       testHaskellDepends = [ base hspec time ];
+       homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
+       description = "Log to syslog over a network via UDP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hszephyr" = callPackage
     ({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }:
      mkDerivation {
@@ -111480,8 +111933,8 @@ self: {
        pname = "html-entity-map";
        version = "0.1.0.0";
        sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq";
-       revision = "1";
-       editedCabalFile = "1y2w3jmdxwa8lfj1gr4ln98v1474bw1cjsdfpmbaphcjj9bjg0sg";
+       revision = "2";
+       editedCabalFile = "1ycg39ys6zzfi6j88l03gdyyzwjpfzzlzy7dbs6i8p1l70ywizfr";
        libraryHaskellDepends = [ base text unordered-containers ];
        benchmarkHaskellDepends = [
          base criterion text unordered-containers
@@ -112472,18 +112925,18 @@ self: {
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , bytestring-lexing, case-insensitive, conduit, conduit-extra
      , connection, hspec, http-client, http-conduit, http-types, mtl
-     , network, QuickCheck, random, resourcet, text, tls, transformers
-     , vault, wai, wai-conduit, warp, warp-tls
+     , network, QuickCheck, random, resourcet, streaming-commons, text
+     , tls, transformers, vault, wai, wai-conduit, warp, warp-tls
      }:
      mkDerivation {
        pname = "http-proxy";
-       version = "0.1.0.5";
-       sha256 = "1n4l31vaq0ch4w7krycvbdycn7v6q0cnr9qm3ll4v3g0kbqy81j4";
+       version = "0.1.0.6";
+       sha256 = "0ixj9bcz8pw6rgdlzbp7p12v43vrkajbmr5b8fnsmzwcz6s3i3zg";
        libraryHaskellDepends = [
          async base blaze-builder bytestring bytestring-lexing
          case-insensitive conduit conduit-extra http-client http-conduit
-         http-types mtl network resourcet text tls transformers wai
-         wai-conduit warp warp-tls
+         http-types mtl network resourcet streaming-commons text tls
+         transformers wai wai-conduit warp warp-tls
        ];
        testHaskellDepends = [
          async base blaze-builder bytestring bytestring-lexing
@@ -113177,12 +113630,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_0_1_2" = callPackage
+  "hunit-dejafu_1_1_0_1" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.0.1.2";
-       sha256 = "1lnw8rr0lf43rzsv3c5knm96kpnsxmpijqh7njhrgbx9wzy81mg7";
+       version = "1.1.0.1";
+       sha256 = "16jaq5wxh2gzkj2kacb5zv9w8y7a75fm0acj7r2sspwg4d7kkmar";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -115681,8 +116134,8 @@ self: {
        pname = "identicon";
        version = "0.2.2";
        sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n";
-       revision = "2";
-       editedCabalFile = "0shj211pvba5cfgs1vy9f8jd84by8j4mprk4yvhv4ia1kl6dq4mr";
+       revision = "3";
+       editedCabalFile = "0vya6zm3nnbdv3wmj3dwqwwjgsagql8q17078knhjddv2lm8m49q";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring JuicyPixels ];
        testHaskellDepends = [
@@ -118259,6 +118712,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "integer-logarithms_1_0_2_1" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-logarithms";
+       version = "1.0.2.1";
+       sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j";
+       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
+       testHaskellDepends = [
+         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/phadej/integer-logarithms";
+       description = "Integer logarithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "integer-pure" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -118383,8 +118856,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.2.0.1";
-       sha256 = "0jrmxph2m0ql48k6l743dhk4hdjxpdm7qqflwk2n3pw58ffajsk8";
+       version = "0.3.0.0";
+       sha256 = "0aa26cgap70ji6qjy555039i8zrynibmfsxpdpkww6pqj3hwrc93";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -118501,6 +118974,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "interpolate_0_2_0" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta
+     , hspec, QuickCheck, quickcheck-instances, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "interpolate";
+       version = "0.2.0";
+       sha256 = "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf";
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
+       testHaskellDepends = [
+         base base-compat bytestring haskell-src-meta hspec QuickCheck
+         quickcheck-instances template-haskell text
+       ];
+       homepage = "https://github.com/sol/interpolate#readme";
+       description = "String interpolation done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "interpolatedstring-perl6" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta
      , template-haskell, text
@@ -118779,6 +119271,8 @@ self: {
        pname = "invariant";
        version = "0.5";
        sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0";
+       revision = "1";
+       editedCabalFile = "04sxa2jfv613ff3fxpnk0cn31f6fr80gzr7va47nrc0abp34vd7y";
        libraryHaskellDepends = [
          array base bifunctors comonad containers contravariant ghc-prim
          profunctors semigroups StateVar stm tagged template-haskell
@@ -119507,8 +120001,8 @@ self: {
        pname = "irc-core";
        version = "2.3.0";
        sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf";
-       revision = "1";
-       editedCabalFile = "1cqc9as84bckjh6yjcfh3pkj11sw35bkj848wzcv6qwjcn8kvcv9";
+       revision = "2";
+       editedCabalFile = "1pynqcahr66yq9h0ykdv1lz7jshn8zw0n9ggmycvsybw27ci10xn";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -122166,8 +122660,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
-       revision = "3";
-       editedCabalFile = "0hi2im3k7hpz3rasap90fvik3x5ibb7dd38sr1zsy7wsjkhk7zs4";
+       revision = "4";
+       editedCabalFile = "1vdfhhbk020bpdg6x8lx21w5aykzzfk9k119cd4px9hm6r77grcy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122214,8 +122708,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
-       revision = "2";
-       editedCabalFile = "1avwnzq355m14wbv76zqjp789nr3kgnk130m8m69r5icgmlal2w6";
+       revision = "3";
+       editedCabalFile = "1bn1w9vwif05hjdprc354if3mccaw9gari233x0l6p35188idmsc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123257,6 +123751,8 @@ self: {
        pname = "kanji";
        version = "3.1.0";
        sha256 = "0l1fbznzw6z8cpcrkmchabwf7zfhb3zj18s323xlxiq3537bxjz4";
+       revision = "2";
+       editedCabalFile = "0n88shf40v4jiqyj24dv1ha8m6s8mja4x5yrh8427byf2s80780c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123284,8 +123780,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz";
-       revision = "11";
-       editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z";
+       revision = "13";
+       editedCabalFile = "0qdj3giwfjic87xln1lkrfa9dw8yj31s7x3dsr7n1343jcap2m7n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
@@ -124219,8 +124715,8 @@ self: {
        pname = "keycode";
        version = "0.2.2";
        sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan";
-       revision = "1";
-       editedCabalFile = "0pyh8cadgw8pn9xdg8lbvsh108i84iaynia8j42qmgmls2zakvja";
+       revision = "2";
+       editedCabalFile = "0g19sjk2sh1w9ahn93dnvjkim4mqapq0plmdd37179qfgi49qnp8";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -125024,8 +125520,8 @@ self: {
      }:
      mkDerivation {
        pname = "labsat";
-       version = "0.0.1";
-       sha256 = "0pyxlnm30rp3clplwwkf1nxczk3zj2c7wksgg6pwjxgr02b25y03";
+       version = "0.0.4";
+       sha256 = "0dzl85m6ld9n896hj6psxqg79p95yki0cck4facaansqva4il2hb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125982,17 +126478,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, criterion, deepseq, happy, hspec
-     , hspec-dirstream, microlens, microlens-th, mtl, recursion-schemes
-     , system-filepath, transformers
+     , hspec-dirstream, lens, recursion-schemes, system-filepath
+     , transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.1";
-       sha256 = "000jhj5jjsccn7x6j76wl07y6ydszy3gcn4mg6bcg2p0spdvc0vr";
+       version = "1.2.0.2";
+       sha256 = "1hbngljls19a9mr6gz5qm80ibx8z75ky0s5gn57nmlsf8pazkfvz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         microlens microlens-th mtl recursion-schemes transformers
+         lens recursion-schemes transformers
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -126485,6 +126981,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-java_0_2_9" = callPackage
+    ({ mkDerivation, alex, array, base, directory, filepath, mtl
+     , parsec, pretty, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "language-java";
+       version = "0.2.9";
+       sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x";
+       libraryHaskellDepends = [ array base parsec pretty ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         base directory filepath mtl tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/language-java";
+       description = "Java source manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-java-classfile" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, data-flags, deepseq, language-java, LibZip
@@ -128190,8 +128705,8 @@ self: {
        pname = "lens";
        version = "4.16";
        sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z";
-       revision = "2";
-       editedCabalFile = "1iwp8shnis8gk01ys9bp3bn5khsi6mp0ji9b18qkg1mpp7nvggcq";
+       revision = "3";
+       editedCabalFile = "0zkjys731g07brc4ky29245jrdx1r8l468k5fh9hlwd0dx9d4996";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -128261,8 +128776,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.2";
        sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
-       revision = "2";
-       editedCabalFile = "1nynlx0jyn5hfsjmzdd9pdj95hnfc6r7gfb3isdqs05ma8dihaws";
+       revision = "3";
+       editedCabalFile = "160zpz85p8qfg6scqp2cbg3w9lbv89hkxcvmyk6la34v9d439lm0";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
@@ -129702,6 +130217,8 @@ self: {
        pname = "lift-generics";
        version = "0.1.2";
        sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf";
+       revision = "1";
+       editedCabalFile = "02hg33ikmwl81zsw8fgppix740rdc3h8fv6nr9b9h37vizhs50zw";
        libraryHaskellDepends = [
          base generic-deriving ghc-prim template-haskell
        ];
@@ -131658,6 +132175,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {llvm-config = null;};
 
+  "llvm-hs_6_0_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+     , containers, exceptions, llvm-config, llvm-hs-pure, mtl
+     , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, temporary, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "llvm-hs";
+       version = "6.0.0";
+       sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd";
+       setupHaskellDepends = [ base Cabal containers ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers exceptions llvm-hs-pure
+         mtl template-haskell transformers utf8-string
+       ];
+       libraryToolDepends = [ llvm-config ];
+       testHaskellDepends = [
+         base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
+         tasty tasty-hunit tasty-quickcheck temporary transformers
+       ];
+       homepage = "http://github.com/llvm-hs/llvm-hs/";
+       description = "General purpose LLVM bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {llvm-config = null;};
+
   "llvm-hs-pretty" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
      , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden
@@ -131702,6 +132245,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "llvm-hs-pure_6_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, fail
+     , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "llvm-hs-pure";
+       version = "6.0.0";
+       sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl";
+       revision = "1";
+       editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers fail mtl template-haskell
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec mtl tasty tasty-hunit
+         tasty-quickcheck text transformers unordered-containers
+       ];
+       homepage = "http://github.com/llvm-hs/llvm-hs/";
+       description = "Pure Haskell LLVM functionality (no FFI)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "llvm-ht" = callPackage
     ({ mkDerivation, base, bytestring, directory, mtl, process
      , type-level
@@ -132382,7 +132950,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "log-warper_1_8_10" = callPackage
+  "log-warper_1_8_10_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, containers
      , data-default, deepseq, directory, filepath, fmt, hspec
      , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens
@@ -132393,8 +132961,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.8.10";
-       sha256 = "0wl1i68xnvla6fzgxfkqbk6hhqx9h0yp4br30y0fzwyk8p5v4l37";
+       version = "1.8.10.1";
+       sha256 = "0chwqn8pdlfhlixl3z9a6gvx86vxmq92v325z0fsamwzb7hhcf52";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134458,19 +135026,20 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "4.0.0.4";
-       sha256 = "1rfax7s4sc63943izc1r0gk848ji0kxsjgsb81i2f6dc5860xkz9";
+       version = "4.0.1.0";
+       sha256 = "08nw11l8vpazyfny3f8alyb9r268wlh3q24032q34sk1n5d92pcl";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
          ansi-wl-pprint base binary composition-prelude containers directory
          file-embed http-client http-client-tls megaparsec MonadRandom mtl
-         optparse-applicative random-shuffle recursion-schemes
-         recursion-schemes-ext tar template-haskell text th-lift-instances
-         titlecase zip-archive zlib
+         random-shuffle recursion-schemes recursion-schemes-ext tar
+         template-haskell text th-lift-instances titlecase zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         base directory megaparsec optparse-applicative text
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-megaparsec text ];
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        homepage = "https://hub.darcs.net/vmchale/madlang";
@@ -135482,8 +136051,8 @@ self: {
        pname = "map-syntax";
        version = "0.2.0.2";
        sha256 = "12jdv9myffpkhhrwm5kzhbqzbxfb0rb4fvww33d0yq4s6sk9b3xi";
-       revision = "1";
-       editedCabalFile = "0k27w9bw4lri2nfm7s7v7gq49mr0him5g2dsc0wha5kzj4gmy87q";
+       revision = "2";
+       editedCabalFile = "12b3pbrd70xpx634ngl4dcvda5p9494wq6mc8s1wv4624hwlgja6";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -137232,6 +137801,8 @@ self: {
        pname = "megaparsec";
        version = "6.4.1";
        sha256 = "0w0kw8g7c6c3sp0fpgfqjc2w032dv9s7jnyn1dx71hk5mifh2h6y";
+       revision = "1";
+       editedCabalFile = "1r7isvrj7k34bsl7snd14wjvc64vx01dmbkm17ycik3lhllscfif";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -138201,6 +138772,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "microlens-aeson_2_3_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty
+     , tasty-hunit, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.3.0";
+       sha256 = "1iahlh505jrlpd9ndkr5asfnzdpp6m6m2lm44ds15461py485wpj";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring deepseq hashable microlens
+         scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring deepseq hashable microlens tasty tasty-hunit
+         text unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq hashable lens lens-aeson
+         microlens text unordered-containers vector
+       ];
+       homepage = "http://github.com/fosskers/microlens-aeson/";
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-contra" = callPackage
     ({ mkDerivation, base, contravariant, microlens }:
      mkDerivation {
@@ -139488,7 +140086,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mmark_0_0_5_5" = callPackage
+  "mmark_0_0_5_6" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, data-default-class, deepseq, dlist, email-validate
      , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
@@ -139498,8 +140096,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.5.5";
-       sha256 = "1j1ci1zwnp7q6bnk1cqz5g2zx4c02yr8s87v9wf8j898bky8cgwj";
+       version = "0.0.5.6";
+       sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -139527,6 +140125,8 @@ self: {
        pname = "mmark-cli";
        version = "0.0.3.0";
        sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp";
+       revision = "1";
+       editedCabalFile = "0rzz4m7z02m6rmigmmpgqhik1d7kc0i4mri0gpj1i3j7a59p7s1q";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139776,8 +140376,8 @@ self: {
        pname = "modern-uri";
        version = "0.2.1.0";
        sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
-       revision = "1";
-       editedCabalFile = "1rir55ccx5y377mdl7hfzk2n31nv18mdfxw6a0l2jjw7y0w5kpyi";
+       revision = "2";
+       editedCabalFile = "1xhm5vi9y9y0mzmyqac29d13pvm3d28glmqcd7ps9lf9fjrrpp6k";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -144150,8 +144750,8 @@ self: {
      }:
      mkDerivation {
        pname = "mxnet-nn";
-       version = "0.0.1.1";
-       sha256 = "16clpl3sn4cf106hjigsyhgh15l9269yg838qarvbpigppkgb2sv";
+       version = "0.0.1.2";
+       sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148470,8 +149070,8 @@ self: {
        pname = "normalization-insensitive";
        version = "2.0.1";
        sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v";
-       revision = "1";
-       editedCabalFile = "1zaqbgrfy33y2d9ix178mhyysyffsia0hbmg77gcjmvv32b44m6j";
+       revision = "2";
+       editedCabalFile = "0djclsv0vzd56139ddzhykbwb3ny9mf8k2pryp8w33h9i4hv7axc";
        libraryHaskellDepends = [
          base bytestring deepseq hashable text unicode-transforms
        ];
@@ -148882,8 +149482,8 @@ self: {
      }:
      mkDerivation {
        pname = "number-length";
-       version = "0.1.0.1";
-       sha256 = "1ig9d1rgd5k9fxqmrdxi7mq6fgnxla7ba1083di1lxcakanll0kc";
+       version = "0.2.0.0";
+       sha256 = "1jrlq7qdi7lcpkqqv9qafcgci2gc8rb3f3lv177s8narfdprx2hz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -149485,15 +150085,15 @@ self: {
   "o-clock" = callPackage
     ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
      , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
-     , tiempo, time-units, transformers, type-spec
+     , tiempo, time-units, type-spec
      }:
      mkDerivation {
        pname = "o-clock";
-       version = "0.1.0";
-       sha256 = "18rqy00hkqqqbhmsgkhza9blm2fl6kb29fs78ifkr2hqsya17fh6";
+       version = "0.1.1";
+       sha256 = "1adksq9s86gqxvn74qpa22w4fciq8k8j5v3qh0cas2rwabxqdr00";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ghc-prim transformers ];
+       libraryHaskellDepends = [ base ghc-prim ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
@@ -152353,8 +152953,8 @@ self: {
      }:
      mkDerivation {
        pname = "overload";
-       version = "0.1.0.4";
-       sha256 = "16sry2c4wrly3y3k47gry53klxf4kvbym6fybb8f7z9hqffx18a9";
+       version = "0.1.0.5";
+       sha256 = "046lxmcrk072l08rxbbzb883gd7cffxx76l3x29h78d10aai6cac";
        libraryHaskellDepends = [
          base simple-effects template-haskell th-expand-syns
        ];
@@ -152504,6 +153104,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packed" = callPackage
+    ({ mkDerivation, base, containers, gauge, ghc-prim, hedgehog
+     , primitive, tasty, tasty-hedgehog, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "packed";
+       version = "0.1.0";
+       sha256 = "1isacbh8w24awsh3nn7djcnmy8am4s4i5npsidnqm5qgcqikpfh8";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
+       testHaskellDepends = [
+         base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit
+       ];
+       benchmarkHaskellDepends = [ base gauge ];
+       homepage = "https://github.com/andrewthad/bytearray#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "packed-dawg" = callPackage
     ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -157036,6 +157653,31 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-template_2_5_4" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
+     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
+     , path-pieces, persistent, QuickCheck, tagged, template-haskell
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-template";
+       version = "2.5.4";
+       sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc";
+       libraryHaskellDepends = [
+         aeson aeson-compat base bytestring containers ghc-prim
+         http-api-data monad-control monad-logger path-pieces persistent
+         tagged template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec persistent QuickCheck text transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Type-safe, non-relational, multi-backend persistence";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-test" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base
      , base64-bytestring, blaze-builder, blaze-html, blaze-markup
@@ -161439,11 +162081,14 @@ self: {
      }) {};
 
   "postgresql-libpq" = callPackage
-    ({ mkDerivation, base, bytestring, postgresql, unix }:
+    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
      mkDerivation {
        pname = "postgresql-libpq";
        version = "0.9.4.0";
        sha256 = "15laa8m6i4girhr0i3xscgsl30iqj61mx5vbl67wasb8rwx0pi82";
+       revision = "1";
+       editedCabalFile = "0s1xyl25jn3miysc7i61wf2klm7blnczb0yhnf7hmv3ilpfsqghy";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
        homepage = "https://github.com/lpsmith/postgresql-libpq";
@@ -161973,15 +162618,17 @@ self: {
     ({ mkDerivation, attoparsec, base, base-prelude, bytestring
      , directory, foldl, hashable, potoki-core, profunctors, QuickCheck
      , quickcheck-instances, random, rerebase, tasty, tasty-hunit
-     , tasty-quickcheck, text, unagi-chan, unordered-containers, vector
+     , tasty-quickcheck, text, transformers, unagi-chan
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.9";
-       sha256 = "1sxzxg1dpm3280x5vp47pc6faik9dpfn7qp4pwvbkvwq90l32pv8";
+       version = "0.9.1";
+       sha256 = "1csnjvz3iwrd7rpw90ws1h6a9j0y4v1wxn07jnfw2qs1qrkcr0hn";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
-         potoki-core profunctors text unagi-chan unordered-containers vector
+         potoki-core profunctors text transformers unagi-chan
+         unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec QuickCheck quickcheck-instances random rerebase tasty
@@ -162958,6 +163605,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pretty-simple_2_1_0_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, containers, criterion
+     , doctest, Glob, mtl, parsec, text, transformers
+     }:
+     mkDerivation {
+       pname = "pretty-simple";
+       version = "2.1.0.0";
+       sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base containers mtl parsec text transformers
+       ];
+       testHaskellDepends = [ base doctest Glob ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/cdepillabout/pretty-simple";
+       description = "pretty printer for data types with a 'Show' instance";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pretty-sop" = callPackage
     ({ mkDerivation, base, generics-sop, pretty-show }:
      mkDerivation {
@@ -164073,6 +164741,8 @@ self: {
        pname = "profunctors";
        version = "5.2.2";
        sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9";
+       revision = "1";
+       editedCabalFile = "1g6fvxq2npnyi8wv9mvwy35an68lrm5bf7xmx9x61mbwdxb6d0cg";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad contravariant distributive
          semigroups tagged transformers
@@ -167281,6 +167951,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-instances_0_3_17" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring
+     , case-insensitive, containers, hashable, old-time, QuickCheck
+     , scientific, tagged, text, time, transformers, transformers-compat
+     , unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "quickcheck-instances";
+       version = "0.3.17";
+       sha256 = "0s6wi39k1vhr64lzsj1kyiaym7zi9qfhzdslxir2cb002ivj7jw3";
+       libraryHaskellDepends = [
+         array base base-compat bytestring case-insensitive containers
+         hashable old-time QuickCheck scientific tagged text time
+         transformers transformers-compat unordered-containers uuid-types
+         vector
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck tagged uuid-types
+       ];
+       homepage = "https://github.com/phadej/qc-instances";
+       description = "Common quickcheck instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-io" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
@@ -168341,6 +169036,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rakuten_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, constraints
+     , data-default-class, extensible, hspec, http-api-data, http-client
+     , http-client-tls, http-types, lens, req, servant-server, text
+     , warp
+     }:
+     mkDerivation {
+       pname = "rakuten";
+       version = "0.1.1.0";
+       sha256 = "13m8rg805aw5rj2a5j16yj06k5ws99ssl89r5s62xlq6lbzhc84c";
+       libraryHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible http-api-data http-client http-client-tls http-types
+         lens req text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible hspec http-api-data http-client http-client-tls
+         http-types lens req servant-server text warp
+       ];
+       homepage = "https://github.com/matsubara0507/rakuten#readme";
+       description = "The Rakuten API in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ralist" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hspec }:
      mkDerivation {
@@ -168645,6 +169366,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "random-string" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base58-bytestring
+     , base64-bytestring, bytestring, entropy
+     }:
+     mkDerivation {
+       pname = "random-string";
+       version = "0.1.0.1";
+       sha256 = "0gmb5i5sykwfr1l4b2isn9j92pzxgalbxkf9dnhs14pj3i6ygl80";
+       libraryHaskellDepends = [
+         base base16-bytestring base58-bytestring base64-bytestring
+         bytestring entropy
+       ];
+       description = "Generate a random base 16, 58, or 64 string";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "random-strings" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
      mkDerivation {
@@ -170575,8 +171312,8 @@ self: {
        pname = "recursion-schemes";
        version = "5.0.2";
        sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s";
-       revision = "1";
-       editedCabalFile = "1mmq9dx0dgws4dbmij76snj91dv6czigs1kchi0vy01hplsb0wks";
+       revision = "2";
+       editedCabalFile = "13l08kal330r1nln13q6qn60mcs0iwcz0hx23na743xllha76nnl";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad free semigroups
          template-haskell transformers transformers-compat
@@ -173361,8 +174098,8 @@ self: {
        pname = "req";
        version = "1.0.0";
        sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087";
-       revision = "1";
-       editedCabalFile = "18bs1mcr454dgczzv8ahxps5lhba8wgls34cccg5aqdfhglprphk";
+       revision = "2";
+       editedCabalFile = "08yr09gfpml94ny6jmps2hn13bsb7r37rdn92gr2kmbryb188d1l";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -177588,6 +178325,34 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "sbp_2_3_9" = callPackage
+    ({ mkDerivation, aeson, array, base, base64-bytestring
+     , basic-prelude, binary, binary-conduit, bytestring, conduit
+     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
+     , resourcet, tasty, tasty-hunit, template-haskell, text, yaml
+     }:
+     mkDerivation {
+       pname = "sbp";
+       version = "2.3.9";
+       sha256 = "180krzjl9p1apm54qnna9xkj9451kah1ndix7c7g0if492a75qd6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring basic-prelude binary bytestring
+         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+         text
+       ];
+       executableHaskellDepends = [
+         aeson base basic-prelude binary-conduit bytestring conduit
+         conduit-extra resourcet yaml
+       ];
+       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       homepage = "https://github.com/swift-nav/libsbp";
+       description = "SwiftNav's SBP Library";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbp2udp" = callPackage
     ({ mkDerivation, base, basic-prelude, binary, binary-conduit
      , bytestring, conduit, conduit-extra, network, optparse-generic
@@ -178418,8 +179183,8 @@ self: {
        pname = "scotty";
        version = "0.11.0";
        sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9";
-       revision = "9";
-       editedCabalFile = "0cdvv4qsda5rkdj93400i8n3lzkxmz9xci7i38pri9axmics28qa";
+       revision = "10";
+       editedCabalFile = "0y0ll3nn3n6n1ry2mvqm1g28a688hpba8kaw30m17p7fnv0m7368";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class fail http-types monad-control mtl nats network
@@ -181556,6 +182321,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servant-kotlin_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, formatting
+     , hspec, http-api-data, lens, servant, servant-foreign, shelly
+     , text, time, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "servant-kotlin";
+       version = "0.1.1.0";
+       sha256 = "14z1vf4mj041ydps7nyfs0bmdpq0vb18xfscsq3i1f5hfr9swj50";
+       libraryHaskellDepends = [
+         base containers directory formatting lens servant servant-foreign
+         text time wl-pprint-text
+       ];
+       testHaskellDepends = [
+         aeson base containers directory formatting hspec http-api-data lens
+         servant servant-foreign text time wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         aeson base containers directory formatting http-api-data lens
+         servant servant-foreign shelly text time wl-pprint-text
+       ];
+       homepage = "https://github.com/matsubara0507/servant-kotlin#readme";
+       description = "Automatically derive Kotlin class to query servant webservices";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
@@ -182233,6 +183025,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-static-th_0_2_0_0" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , directory, doctest, filepath, Glob, hspec-wai, http-media
+     , semigroups, servant, servant-blaze, servant-server, tasty
+     , tasty-hspec, tasty-hunit, template-haskell, text, wai
+     }:
+     mkDerivation {
+       pname = "servant-static-th";
+       version = "0.2.0.0";
+       sha256 = "04wa9lmygfllpvk1qqd0k3k7p997b5vn8xvbh82lwq46drsy4qbg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers directory filepath http-media
+         semigroups servant servant-blaze servant-server template-haskell
+         text
+       ];
+       testHaskellDepends = [
+         base blaze-html bytestring directory doctest filepath Glob
+         hspec-wai servant servant-blaze servant-server tasty tasty-hspec
+         tasty-hunit wai
+       ];
+       homepage = "https://github.com/cdepillabout/servant-static-th";
+       description = "Embed a directory of static files in your Servant server";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-subscriber" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, filepath
@@ -182386,13 +183206,15 @@ self: {
      }) {};
 
   "servant-xml" = callPackage
-    ({ mkDerivation, base, bytestring, http-media, servant, xmlbf }:
+    ({ mkDerivation, base, bytestring, http-media, servant, xmlbf
+     , xmlbf-xeno
+     }:
      mkDerivation {
        pname = "servant-xml";
-       version = "1.0.0";
-       sha256 = "1adgxfv6lhl1nxpqb47a6xh5zx6vi5ry4vi50ffh8p8xx6ckkizi";
+       version = "1.0.1";
+       sha256 = "09rxvrxxmj62rscvddza8rygx4zv06k975j99yz7ymggmimhwaig";
        libraryHaskellDepends = [
-         base bytestring http-media servant xmlbf
+         base bytestring http-media servant xmlbf xmlbf-xeno
        ];
        homepage = "https://github.com/fosskers/servant-xml";
        description = "Servant support for the XML Content-Type";
@@ -182808,6 +183630,8 @@ self: {
        pname = "sessiontypes";
        version = "0.1.2";
        sha256 = "1xjf3yjapz9ipjkqhm8fljgbj6fww3iyl1mx1kjwh18s6b9ymq5s";
+       revision = "1";
+       editedCabalFile = "0qd48i92nn5yhp1lzs5vvvcmq5db785nr736y2yxgi7z4pk80r84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182829,6 +183653,8 @@ self: {
        pname = "sessiontypes-distributed";
        version = "0.1.1";
        sha256 = "0fi263sdpshzjwc51h9rqgg0zj7f5a6igrfj9487lbdgaz1cb1ya";
+       revision = "1";
+       editedCabalFile = "0r4xn7p21xwdimzpdd5jqjawds9mhniqzmg84bfipcpm3mwhjq5x";
        libraryHaskellDepends = [
          base binary bytestring distributed-process distributed-static
          exceptions rank1dynamic sessiontypes
@@ -183609,8 +184435,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.41";
-       sha256 = "0djg61fv6g0xskk72a06kva70a6zvdwlsfhdnw6fsk69h0vlidrc";
+       version = "0.0.42";
+       sha256 = "020j1j5lpl5x0hxgscy1skx1fqw77w184h86rvgkq1kli7pp9kpk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184093,6 +184919,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shelly_1_7_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, HUnit
+     , lifted-async, lifted-base, monad-control, mtl, process
+     , system-fileio, system-filepath, text, time, transformers
+     , transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.7.1";
+       sha256 = "068gabny23r9qs2fnn5vjyy77zi59c323ypmnmd71w7qwyfa2pl8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec HUnit lifted-async lifted-base
+         monad-control mtl process system-fileio system-filepath text time
+         transformers transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -184971,17 +185828,17 @@ self: {
      }) {};
 
   "simple-effects" = callPackage
-    ({ mkDerivation, array, base, criterion, exceptions, list-t
-     , monad-control, MonadRandom, mtl, text, transformers
-     , transformers-base
+    ({ mkDerivation, array, async, base, bytestring, criterion
+     , exceptions, list-t, monad-control, MonadRandom, mtl, text
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.9.0.1";
-       sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx";
+       version = "0.10.0.0";
+       sha256 = "00hspcdh7si0bykfdyxclklv622izl8jm6nwic4z5j15rmqa62b7";
        libraryHaskellDepends = [
-         array base exceptions list-t monad-control MonadRandom mtl text
-         transformers transformers-base
+         array async base bytestring exceptions list-t monad-control
+         MonadRandom mtl text transformers transformers-base
        ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
@@ -185154,8 +186011,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-logging";
-       version = "0.2.0.2";
-       sha256 = "1a917vvwnzmv9jqrrmk6knv8wfrxwkbal6gxp24a2xkiqcjpgbjw";
+       version = "0.2.0.3";
+       sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1";
        libraryHaskellDepends = [
          aeson base bytestring directory exceptions filepath hscolour
          iso8601-time lens mtl simple-effects string-conv text time uuid
@@ -186335,7 +187192,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_7_0_1" = callPackage
+  "skylighting_0_7_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
@@ -186344,8 +187201,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.7.0.1";
-       sha256 = "0f1527pjfgmb9dxlgrs2wl0zq9vbxishjm7m3h4gyajk2nfw5dw3";
+       version = "0.7.0.2";
+       sha256 = "16l7sz5a5g0x9jh6v5v8has37lc29dz142zxkidd6ri25izs5bph";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186370,8 +187227,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.7.0.1";
-       sha256 = "06kfpb49wql0b11c2cqypccw75l5vj1a6dck333p6bds2xbk83qn";
+       version = "0.7.0.2";
+       sha256 = "0j35rsrbnmarhnwqyd8ap64h7yjkqyc1faj599hfyymmy1vqahyf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186550,8 +187407,8 @@ self: {
      }:
      mkDerivation {
        pname = "slate";
-       version = "0.8.0.0";
-       sha256 = "096v0aai5c7adpa5y15yscs6w8c7c0vz667a0ibr33m0rmnyiqlm";
+       version = "0.8.1.0";
+       sha256 = "1dzk9xcif3g14qqksj7h343ka3b19fcgijbnhmivpgjdgychkyk2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186739,8 +187596,8 @@ self: {
        pname = "slug";
        version = "0.1.7";
        sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
-       revision = "1";
-       editedCabalFile = "0xy0zcrnfpdbkhks15p1g2zxl7zmfb0b5511mfcsvzxl9q8salf6";
+       revision = "2";
+       editedCabalFile = "0kvx1igj6fs9wrwkh68m19f5pxw1x46d489zgj6f5ah5w8wfxp2h";
        libraryHaskellDepends = [
          aeson base exceptions http-api-data path-pieces persistent
          QuickCheck text
@@ -187051,6 +187908,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smoothie_0_4_2_8" = callPackage
+    ({ mkDerivation, aeson, base, linear, text, vector }:
+     mkDerivation {
+       pname = "smoothie";
+       version = "0.4.2.8";
+       sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ aeson base linear text vector ];
+       homepage = "https://github.com/phaazon/smoothie";
+       description = "Smooth curves via several interpolation modes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smsaero" = callPackage
     ({ mkDerivation, aeson, base, containers, http-api-data
      , http-client, servant, servant-client, servant-docs, text, time
@@ -191353,8 +192224,8 @@ self: {
        pname = "stache";
        version = "1.2.1";
        sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb";
-       revision = "1";
-       editedCabalFile = "18h31a8bd7v96lc9q0ai7sblnxg3y55s1053jqdixi3y7lz3jh79";
+       revision = "3";
+       editedCabalFile = "0r7qx7h3lz6v5fvfkky7crw5ms8vszx0d8xlkr94xa9n7mxbndh3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -192463,6 +193334,8 @@ self: {
        pname = "statistics";
        version = "0.14.0.2";
        sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l";
+       revision = "1";
+       editedCabalFile = "0gg7hq8qvbnhp7lnrykh401ggr51izffylgdmy6nip2a81q9dxi0";
        libraryHaskellDepends = [
          aeson base base-orphans binary deepseq erf math-functions monad-par
          mwc-random primitive vector vector-algorithms
@@ -192915,11 +193788,14 @@ self: {
      }) {};
 
   "stm-chans" = callPackage
-    ({ mkDerivation, base, stm }:
+    ({ mkDerivation, base, Cabal, stm }:
      mkDerivation {
        pname = "stm-chans";
        version = "3.0.0.4";
        sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
+       revision = "1";
+       editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
@@ -193557,15 +194433,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_17_0" = callPackage
+  "stratosphere_0_18_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.17.0";
-       sha256 = "1824fgv3jm25wa3sk53v7j76jpq8kqh9fm3jfpp8hlzwnb57zni9";
+       version = "0.18.0";
+       sha256 = "0av7ys8ysmcx51qzf9lw6pg8bn6jixm440ahds56ayxam57q4ix5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193775,6 +194651,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming_0_2_1_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl
+     , semigroups, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming";
+       version = "0.2.1.0";
+       sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1";
+       libraryHaskellDepends = [
+         base containers ghc-prim mmorph mtl semigroups transformers
+         transformers-base
+       ];
+       homepage = "https://github.com/haskell-streaming/streaming";
+       description = "an elementary streaming prelude and general stream type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, hspec, streaming
      , streaming-bytestring
@@ -194958,6 +195852,8 @@ self: {
        pname = "structs";
        version = "0.1.1";
        sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z";
+       revision = "1";
+       editedCabalFile = "16ws2j3bhwawf6z1ipraiz73yvg65dg5l7hvj1lgbrqvn5lqizj3";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base deepseq ghc-prim primitive template-haskell
@@ -195188,26 +196084,27 @@ self: {
      }) {};
 
   "stylish-cabal" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, Cabal, containers, deepseq
-     , hlint, hspec, hspec-core, hspec-expectations-pretty-diff
-     , optparse-applicative, split
+    ({ mkDerivation, ansi-wl-pprint, base, base-compat, Cabal
+     , containers, data-default, deepseq, haddock-library, hspec
+     , hspec-core, hspec-expectations-pretty-diff, microlens
+     , microlens-th, mtl, optparse-applicative, split, template-haskell
      }:
      mkDerivation {
        pname = "stylish-cabal";
-       version = "0.2.0.0";
-       sha256 = "1ldnr0bpl0iaflng2715j02wfk8ksigzms15v7118860wyw2mvyi";
+       version = "0.3.0.0";
+       sha256 = "15qw1w4z6p99w4x1xgvp3kaynyh0lh1g27krkarkhyhwjakj797w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base Cabal deepseq split
+         ansi-wl-pprint base base-compat Cabal containers data-default
+         deepseq haddock-library hspec hspec-core
+         hspec-expectations-pretty-diff microlens microlens-th mtl split
+         template-haskell
        ];
        executableHaskellDepends = [
-         ansi-wl-pprint base optparse-applicative
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base Cabal containers hlint hspec hspec-core
-         hspec-expectations-pretty-diff
+         base base-compat optparse-applicative
        ];
+       testHaskellDepends = [ base base-compat hspec ];
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196390,6 +197287,33 @@ self: {
        license = "LGPL";
      }) {};
 
+  "swish_0_9_2_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hashable
+     , HUnit, intern, mtl, network-uri, old-locale, polyparse
+     , semigroups, test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "swish";
+       version = "0.9.2.0";
+       sha256 = "0lgd71qa4fs9zzrapi0mkgsdlip5kxjkhz1v1xj6ifaaq8f2f8jp";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hashable intern mtl network-uri
+         old-locale polyparse semigroups text time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hashable HUnit network-uri old-locale semigroups
+         test-framework test-framework-hunit text time
+       ];
+       homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
+       description = "A semantic web toolkit";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sws" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, directory, filepath
      , hourglass, http-types, network, resourcet, transformers, wai
@@ -198843,14 +199767,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_1_0_1" = callPackage
+  "tasty_1_0_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.0.1";
-       sha256 = "1jf53dd7ilwqfj27ndx2dgs76a7s0saakqxm9cr6bb42a0jnzqij";
+       version = "1.0.1.1";
+       sha256 = "1czfvgm3wb9dlxccr7h49929m6rag7rc6q5hlj9yw0l4lm0hv4hs";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix
@@ -198913,12 +199837,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_0_1_1" = callPackage
+  "tasty-dejafu_1_1_0_1" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.0.1.1";
-       sha256 = "0khdm4v22n86vz3qgv9wi6yfd3yi61br089sxffhfwvr9g3fxjlf";
+       version = "1.1.0.1";
+       sha256 = "0yqaplhwdyfg2wddz0yhzy6c7akpkhi0nkm62171wxfapzpjbbrk";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -201842,8 +202766,8 @@ self: {
        pname = "text-metrics";
        version = "0.3.0";
        sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q";
-       revision = "1";
-       editedCabalFile = "0jl0vlx9y0n7x4j5zspx6zmbbnmlf5p2bg6v9k2afdfc02fmhasm";
+       revision = "2";
+       editedCabalFile = "1371qwwmq8w4p6zg0z43qnrpf9yb8yadnw97ka56mx4jlagrdm8n";
        libraryHaskellDepends = [ base containers text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
@@ -202069,8 +202993,8 @@ self: {
        pname = "text-show";
        version = "3.7.1";
        sha256 = "0gbf3cpxz92v4jphmwvz93il7m38qkwirfnk5453517k2s84s899";
-       revision = "1";
-       editedCabalFile = "1f30i7b45hq3m1hb7b6m8kc1fwz4i697m17wwiabjsyzbx4qiv98";
+       revision = "3";
+       editedCabalFile = "1bc2ja8yciymck9bhydwhxqvdscdvj584k25bvm6hgjqy847bz2c";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -209628,8 +210552,8 @@ self: {
      }:
      mkDerivation {
        pname = "udbus";
-       version = "0.2.1";
-       sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk";
+       version = "0.2.3";
+       sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -211244,6 +212168,8 @@ self: {
        pname = "unordered-containers";
        version = "0.2.8.0";
        sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4";
+       revision = "1";
+       editedCabalFile = "0bllj6rg1ab468ilxzhnafjx2qzqx1bshlf207rk9yhszw801awj";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck
@@ -211730,6 +212656,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring-aeson_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
+     mkDerivation {
+       pname = "uri-bytestring-aeson";
+       version = "0.1.0.5";
+       sha256 = "1rcy3afmm1faapnw5y4pbxn4m0h2bp2pa51g3r8lh6gffk1xi9x3";
+       libraryHaskellDepends = [
+         aeson base bytestring text uri-bytestring
+       ];
+       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
+       description = "Aeson instances for URI Bytestring";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, deepseq
      , failure, monad-control, network, system-fileio, system-filepath
@@ -213720,6 +214661,8 @@ self: {
        pname = "vector-binary-instances";
        version = "0.2.4";
        sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
+       revision = "1";
+       editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
        benchmarkHaskellDepends = [
@@ -214121,6 +215064,8 @@ self: {
        pname = "vectortiles";
        version = "1.3.0";
        sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0";
+       revision = "1";
+       editedCabalFile = "04h85s069i8sgh382h0j4vx6zlx15yi3q7xmb7pnq8vhfamszsaq";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable protocol-buffers
          protocol-buffers-descriptor text transformers unordered-containers
@@ -214268,8 +215213,8 @@ self: {
      }:
      mkDerivation {
        pname = "vgrep";
-       version = "0.2.1.0";
-       sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr";
+       version = "0.2.2.0";
+       sha256 = "11kcf59c1raqj4mwwjhr9435sqilgxgmryq1kimgra2j64ldyl3k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216979,6 +217924,8 @@ self: {
        pname = "warp";
        version = "3.2.13";
        sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj";
+       revision = "1";
+       editedCabalFile = "0i8x4hv5j5l3lz2m0abxik05xq1lzcilw8mhw5f5paiar6csqmg7";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          bytestring-builder case-insensitive containers ghc-prim hashable
@@ -217002,7 +217949,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_2_17" = callPackage
+  "warp_3_2_18" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -217012,8 +217959,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.17";
-       sha256 = "1frdwc7icadizbwlp0b1gxq95h9a6ds9cdq9rzqqsn4yq2jcbirb";
+       version = "3.2.18";
+       sha256 = "0xlwbch06q9mjv36ki79z06n49na48326bawgw1vsz5afcyrlj34";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -218206,6 +219153,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets-simple_0_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
+     , hspec, monad-control, profunctors, stm, tasty, tasty-hspec
+     , transformers, wai-transformers, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-simple";
+       version = "0.1.0";
+       sha256 = "0jxqgnrmchn3sabyz0f2733cgvay0ksasc9qnil9kvj0z3n2h4zz";
+       libraryHaskellDepends = [
+         aeson async base bytestring every exceptions monad-control
+         profunctors stm transformers wai-transformers websockets
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring every exceptions hspec monad-control
+         profunctors stm tasty tasty-hspec transformers wai-transformers
+         websockets
+       ];
+       homepage = "https://github.com/athanclark/websockets-simple#readme";
+       description = "Composable websockets clients";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets-snap" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets
@@ -219376,19 +220347,21 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.2.4";
-       sha256 = "1y36bkzy7msl0dn0zfji8wh38bark4hn68znichwmashpbaymm3r";
+       version = "0.1.2.6";
+       sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring Chart Chart-diagrams composition-prelude
-         containers directory Glob lens optparse-applicative pandoc
-         system-filepath text transformers
+         containers directory Glob lens pandoc system-filepath text
+         transformers
+       ];
+       executableHaskellDepends = [
+         base binary bytestring containers directory lens
+         optparse-applicative text
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion pandoc text ];
-       homepage = "https://github.com/githubuser/wordchoice#readme";
        description = "Get word counts and distributions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220028,8 +221001,8 @@ self: {
      }:
      mkDerivation {
        pname = "ws";
-       version = "0.0.2";
-       sha256 = "1wl6ap3kv90fwi03dd7vi2qmih4irqj2lc25y8x4s2h9ks38qy9w";
+       version = "0.0.3";
+       sha256 = "01awmbs6dmf9crhp6vvwzh8pjqyjpgjgxzcy62nh52s959snwc9m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -220653,8 +221626,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, pretty, xml }:
      mkDerivation {
        pname = "xcb-types";
-       version = "0.8.0";
-       sha256 = "02ym42r556ibzh7s937blgmkfpb6bqrgz100vwccyljwrwddzdbd";
+       version = "0.9.0";
+       sha256 = "14bxm6djq4571w313q0qj3v2mfrb2ji2cy0sgl5fh5bsbk2m5i3g";
        libraryHaskellDepends = [ base containers mtl pretty xml ];
        homepage = "http://community.haskell.org/~aslatter/code/xcb-types";
        description = "Parses XML files used by the XCB project";
@@ -220669,8 +221642,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.5.1";
-       sha256 = "13dpi3g53mj2la9n2igidcnb4376nqkv9z09nx0g2yq6hix7ng8x";
+       version = "0.6.0";
+       sha256 = "1cwwj68lfz51npkll4w024555rq9ra86xh4j9ksd1fqgadzf4rwn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -223175,8 +224148,8 @@ self: {
        pname = "yampa-canvas";
        version = "0.2.2";
        sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
-       revision = "2";
-       editedCabalFile = "1wl5g0mrxkpkdlhjizh7m9z33pdygb460zxjm6qrcy90naywchqj";
+       revision = "3";
+       editedCabalFile = "1vh3v5hrd1y1m491g4h9p3c767h7kg3ffgi20vrafrg8i0r7hg3w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -223224,18 +224197,18 @@ self: {
      }) {};
 
   "yampa-sdl2" = callPackage
-    ({ mkDerivation, base, colour, linear, sdl2, sdl2-gfx, StateVar
-     , stm, text, Yampa
+    ({ mkDerivation, base, colour, linear, memoize, sdl2, StateVar
+     , text, vector, Yampa
      }:
      mkDerivation {
        pname = "yampa-sdl2";
-       version = "0.0.3.1";
-       sha256 = "07wz2473i9z5rxpi6mb1m19fdps7fxl50hbp60b8ihbf2mck1br7";
+       version = "0.1.0.0";
+       sha256 = "0mfn8q9rvcd9s30ia78r60mivrxlv47136wcy7a23zga5r3jk4zn";
        libraryHaskellDepends = [
-         base colour linear sdl2 sdl2-gfx StateVar stm text Yampa
+         base colour linear memoize sdl2 StateVar text vector Yampa
        ];
        testHaskellDepends = [
-         base colour linear sdl2 sdl2-gfx StateVar stm text Yampa
+         base colour linear memoize sdl2 StateVar text vector Yampa
        ];
        homepage = "https://github.com/Simre1/YampaSDL2#readme";
        description = "Yampa and SDL2 made easy";
@@ -223864,6 +224837,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-auth-fb_1_9_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
+     , resourcet, shakespeare, text, time, transformers, unliftio, wai
+     , yesod-auth, yesod-core, yesod-fb
+     }:
+     mkDerivation {
+       pname = "yesod-auth-fb";
+       version = "1.9.0";
+       sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit fb http-conduit resourcet shakespeare
+         text time transformers unliftio wai yesod-auth yesod-core yesod-fb
+       ];
+       homepage = "https://github.com/psibi/yesod-auth-fb";
+       description = "Authentication backend for Yesod using Facebook";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-hashdb" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
@@ -224044,26 +225036,26 @@ self: {
      }) {};
 
   "yesod-auth-oauth2" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
-     , hspec, http-client, http-conduit, http-types, lifted-base
-     , microlens, network-uri, random, text, transformers
-     , uri-bytestring, vector, yesod-auth, yesod-core, yesod-form
+    ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec
+     , http-client, http-conduit, http-types, microlens, random
+     , safe-exceptions, text, transformers, uri-bytestring, yesod-auth
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.3.1";
-       sha256 = "0lgn72kvhvxr77243fikkvyd1gz7iw9lw7azvw2cdd6lwgn3p73i";
+       version = "0.4.0.0";
+       sha256 = "1v4y72bp0kyby3zl4lb7292m7mfynbgvlj5bkj1y5vmk16zrqr7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson authenticate base bytestring hoauth2 http-client http-conduit
-         http-types lifted-base microlens network-uri random text
-         transformers uri-bytestring vector yesod-auth yesod-core yesod-form
+         aeson base bytestring errors hoauth2 http-client http-conduit
+         http-types microlens random safe-exceptions text transformers
+         uri-bytestring yesod-auth yesod-core
        ];
        testHaskellDepends = [ base hspec uri-bytestring ];
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -224623,6 +225615,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-fb_0_5_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb
+     , http-client-tls, http-conduit, text, wai, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-fb";
+       version = "0.5.0";
+       sha256 = "1ns113f2ylim1b3r2dgwgc65yfy6qxjh9miqfz2fx29fq4250dyy";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit crypto-api fb http-client-tls
+         http-conduit text wai yesod-core
+       ];
+       homepage = "https://github.com/psibi/yesod-fb";
+       description = "Useful glue functions between the fb library and Yesod";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
@@ -224891,8 +225901,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.12.2";
-       sha256 = "0bakc1znfqpjmm2yw7sd1gsqkq47bpr3alz6d2fp280qdxjb7hsx";
+       version = "0.12.3";
+       sha256 = "10vnip7yifq3li4jwql5pzrdaqf1z2bb4h99rf1iqzvd3b8mqq30";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare text xss-sanitize yesod-core yesod-form
@@ -226535,8 +227545,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.6.0.1";
-       sha256 = "03x6f5zvmgppr1hkg0lxrapgnlk9s7i974d1gzscs1nvsi426bqb";
+       version = "0.7";
+       sha256 = "1dvny64v5v3qrahymn647jsjjdraa0mrkpvmqiwihh8n9xbnq1s7";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -227470,6 +228480,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
+  "zlib_0_6_2" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, zlib
+     }:
+     mkDerivation {
+       pname = "zlib";
+       version = "0.6.2";
+       sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Compression and decompression in the gzip and zlib formats";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zlib;};
+
   "zlib-bindings" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
      mkDerivation {

From 2a17cffbb2482a14a888bb1c3a390af978773746 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 09:04:55 +0100
Subject: [PATCH 0581/2266] haskell-src-exts: update overrides for version
 1.20.2

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index de6dcb9dd64..5826b875691 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -603,12 +603,12 @@ self: super: {
     '';
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
   })).override {
-    haskell-src-exts = self.haskell-src-exts_1_20_1;
+    haskell-src-exts = self.haskell-src-exts_1_20_2;
   };
 
   # Need newer versions of their dependencies than the ones we have in LTS-10.x.
   cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_27_0; };
-  hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; });
+  hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
@@ -847,14 +847,14 @@ self: super: {
   # Hoogle needs newer versions than lts-10 provides. lambdabot-haskell-plugins
   # depends on Hoogle and therefore needs to use the same version.
   hoogle = super.hoogle.override {
-    haskell-src-exts = self.haskell-src-exts_1_20_1;
+    haskell-src-exts = self.haskell-src-exts_1_20_2;
     http-conduit = self.http-conduit_2_3_0;
   };
   lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
     haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;
   };
   haskell-src-exts-simple_1_20_0_0 = super.haskell-src-exts-simple_1_20_0_0.override {
-    haskell-src-exts = self.haskell-src-exts_1_20_1;
+    haskell-src-exts = self.haskell-src-exts_1_20_2;
   };
 
   # These packages depend on each other, forming an infinite loop.

From 96b5bbd457bdefdf1ddbfc7d19d4f388ec77e88f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 09:28:34 +0100
Subject: [PATCH 0582/2266] haskell-free: update overrides for version 5.0.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index bad0d642b06..9cbdc646a26 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -64,7 +64,7 @@ self: super: {
   ##     • Could not deduce (Semigroup (IterT m a))
   ##         arising from the superclasses of an instance declaration
   ##       from the context: (Monad m, Monoid a)
-  free = super.free_5;
+  free = super.free_5_0_1;
 
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:

From 3eb7049c486d22eb10b232c261e57ed2916d9310 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 05:26:35 -0800
Subject: [PATCH 0583/2266] opensubdiv: 3.3.0 -> 3.3.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.1 with grep in /nix/store/68xswr0fs8b098ww8l832z2gljmfgpwd-opensubdiv-3.3.1
- found 3.3.1 in filename of file in /nix/store/68xswr0fs8b098ww8l832z2gljmfgpwd-opensubdiv-3.3.1
---
 pkgs/development/libraries/opensubdiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 712deff8444..2886ef2b6b0 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensubdiv-${version}";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
     rev = "v${lib.replaceChars ["."] ["_"] version}";
-    sha256 = "0wpjwfik4q9s4r30hndhzmfyzv968mmg5lgng0123l07mn47d2yl";
+    sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1";
   };
 
   outputs = [ "out" "dev" ];

From 8dcd7f0d85072dfbee958a31556383fc40854ea3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 14:29:13 +0100
Subject: [PATCH 0584/2266] multi-ghc-travis: update to latest git version

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

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index a259fd7d76b..2bcf13f1337 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "36b2ee58b9fd160d606608832625b2b6c32aec43";
-    sha256 = "16g99jh5bszvfvb7mmyhl95mkf1l3ydyax8d9py91hi3m8r0c2x0";
+    rev = "a4962f1478089654d138da7a3807dfcf2cef4284";
+    sha256 = "1qwknajabxcfz5w5g0yn30r8p0180wxp7pncr6nwfhszlhay0vb7";
   };
   isLibrary = true;
   isExecutable = true;

From e559fa19f319c0208fc27261faa479a8abec2d00 Mon Sep 17 00:00:00 2001
From: Yuri Aisaka <yuri.aisaka@gmail.com>
Date: Fri, 9 Mar 2018 22:32:42 +0900
Subject: [PATCH 0585/2266] fix compilation on gcc7

---
 .../libraries/science/math/caffe2/default.nix |  8 +++-
 .../math/caffe2/fix_compilation_on_gcc7.patch | 46 +++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch

diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index b055acba9f1..af7078599db 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, config, fetchFromGitHub
+{ stdenv, lib, config, fetchFromGitHub, fetchpatch
 , cmake
 , glog, google-gflags, gtest
 , protobuf, snappy
@@ -56,6 +56,8 @@ let
     };
     dst = "pybind11";
   };
+
+  ccVersion = (builtins.parseDrvName stdenv.cc.name).version;
 in
 
 stdenv.mkDerivation rec {
@@ -84,7 +86,9 @@ stdenv.mkDerivation rec {
   ;
   propagatedBuildInputs = [ numpy future six python-protobuf pydot ];
 
-  patches = lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];
+  patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [
+    ./fix_compilation_on_gcc7.patch
+  ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];
 
   cmakeFlags = [ ''-DBUILD_TEST=OFF''
                  ''-DBUILD_PYTHON=ON''
diff --git a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch
new file mode 100644
index 00000000000..f319f20233a
--- /dev/null
+++ b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch
@@ -0,0 +1,46 @@
+diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc
+index dd4fded..5995e8a 100644
+--- a/caffe2/operators/recurrent_network_op.cc
++++ b/caffe2/operators/recurrent_network_op.cc
+@@ -1,4 +1,4 @@
+-#include "recurrent_network_op.h"
++#include "caffe2/operators/recurrent_network_op.h"
+ #include "caffe2/core/workspace.h"
+ 
+ namespace caffe2 {
+diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h
+index 55328e5..ea898bc 100644
+--- a/caffe2/operators/recurrent_network_op.h
++++ b/caffe2/operators/recurrent_network_op.h
+@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator<Context> {
+   USE_OPERATOR_CONTEXT_FUNCTIONS;
+ 
+   bool RunOnDevice() override {
+-    const auto t =
+-        OperatorBase::Input<Tensor<CPUContext>>(0).template data<int32_t>()[0];
++    const auto& t0 = OperatorBase::Input<Tensor<CPUContext>>(0);
++    const auto t = t0.template data<int32_t>()[0];
+     auto& og = Input(1);
+     auto* g = Output(0);
+ 
+diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h
+index f2c0a33..642343f 100644
+--- a/caffe2/queue/queue_ops.h
++++ b/caffe2/queue/queue_ops.h
+@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator<Context> {
+         name(operator_def.output().Get(0)) {}
+ 
+   bool RunOnDevice() override {
+-    const auto capacity =
+-        OperatorBase::template GetSingleArgument<int>("capacity", 1);
+-    const auto numBlobs =
+-        OperatorBase::template GetSingleArgument<int>("num_blobs", 1);
++    const auto capacity = GetSingleArgument("capacity", 1);
++    const auto numBlobs = GetSingleArgument("num_blobs", 1);
+     const auto enforceUniqueName =
+-        OperatorBase::template GetSingleArgument<int>(
+-            "enforce_unique_name", false);
++        GetSingleArgument("enforce_unique_name", false);
+     const auto fieldNames =
+         OperatorBase::template GetRepeatedArgument<std::string>("field_names");
+     CAFFE_ENFORCE_EQ(this->OutputSize(), 1);

From 809297e59596bef9d1320cf7476d2b977b48b6a8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:19:35 +0300
Subject: [PATCH 0586/2266] the-powder-toy: disable on AArch64

Wants SSE.
---
 pkgs/games/the-powder-toy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index c70feca0860..ce5b0b26966 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A free 2D physics sandbox game";
     homepage = http://powdertoy.co.uk/;
-    platforms = platforms.unix;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];
   };

From c292489da00b60a16045e55506a4c9475d64f744 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:22:08 +0300
Subject: [PATCH 0587/2266] deadbeef: disable on AArch64

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

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index be70443fd4d..4dced0cfafa 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     description = "Ultimate Music Player for GNU/Linux";
     homepage = http://deadbeef.sourceforge.net/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = [ maintainers.abbradar ];
     repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef";
   };

From 986ea060361bc66932a2a87d9cd0875ab95b287d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:24:03 +0300
Subject: [PATCH 0588/2266] dwarf-fortress-packages.dwarf-therapist: disable on
 AArch64

The game works only on x86 anyway.
---
 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 8cdfc426d83..aaef90954b1 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
     maintainers = with maintainers; [ the-kenny abbradar bendlas ];
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist;
   };
 }

From 4c3c71fdd4bdb7dc3a8fe5b9fdfc8183058240b9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:26:59 +0300
Subject: [PATCH 0589/2266] tdesktop: disable on AArch64

Errors out with "please add support for your architecture".
---
 .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index bf564a6a192..74a477b537c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -126,7 +126,7 @@ mkDerivation rec {
   meta = {
     description = "Telegram Desktop messaging app";
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://desktop.telegram.org/;
     maintainers = with maintainers; [ abbradar garbas primeos ];
   };

From 9983c7004b18ccc612e31f7d6edc9fce48b554be Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:28:01 +0300
Subject: [PATCH 0590/2266] citra: disable on AArch64

Wants SSE2 instructions.
---
 pkgs/misc/emulators/citra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index db1de37da96..453114e3b7a 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://citra-emu.org/;
     description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
   };

From 1890fe359a520bbc246be53fbd7d60b6b58efe44 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:28:47 +0300
Subject: [PATCH 0591/2266] linuxPackages.bbswitch: disable on AArch64

It makes no sense on non-x86 platforms.
---
 pkgs/os-specific/linux/bbswitch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index ade9b8f750f..f5d3b4f5c4e 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A module for powering off hybrid GPUs";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://github.com/Bumblebee-Project/bbswitch;
     maintainers = with maintainers; [ abbradar ];
   };

From 325dece6a0a58e6eebd181aa714238bfe435648c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:30:55 +0300
Subject: [PATCH 0592/2266] slade: disable on AArch64

Wants SSE.
---
 pkgs/applications/misc/slade/default.nix | 2 +-
 pkgs/applications/misc/slade/git.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index 712b5a7e750..fc6be074a07 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Doom editor";
     homepage = http://slade.mancubus.net/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix
index 29e01da1b5b..9ee30d347b0 100644
--- a/pkgs/applications/misc/slade/git.nix
+++ b/pkgs/applications/misc/slade/git.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     description = "Doom editor";
     homepage = http://slade.mancubus.net/;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = with maintainers; [ ertes ];
   };
 }

From 948533180fdbfa18c8c2827900ac58fb1995c0a3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 9 Mar 2018 16:34:55 +0300
Subject: [PATCH 0593/2266] double-conversion: hopefully fix on Darwin

---
 pkgs/development/libraries/double-conversion/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index c656220f760..7a33559cbc7 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, lib, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "double-conversion-${version}";
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
+  # Case sensitivity issue
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    rm BUILD
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From 2dfeb6fc53788507c10c0738a85676d80ca6c970 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 9 Mar 2018 12:50:13 +0000
Subject: [PATCH 0594/2266] pingus: fix build with gcc7

---
 pkgs/games/pingus/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 68257fc9e9e..e8bac9571f8 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
-, libGLU_combined}:
+{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer
+, pkgconfig, libGLU_combined}:
 let
   s = # Generated upstream information
   rec {
@@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  patches = [
+    # fix build with gcc7
+    (fetchpatch {
+      url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch;
+      sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p";
+    })
+  ];
   makeFlags = '' PREFIX="$(out)" '';
   meta = {
     inherit (s) version;

From b0e306b1921ae5343da96b968a4547f9e8243664 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 05:42:34 -0800
Subject: [PATCH 0595/2266] openvpn: 2.4.4 -> 2.4.5

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.5 with grep in /nix/store/a2wdxd4c08b1gilnj2mcvkmvpnqxw942-openvpn-2.4.5
- found 2.4.5 in filename of file in /nix/store/a2wdxd4c08b1gilnj2mcvkmvpnqxw942-openvpn-2.4.5
---
 pkgs/tools/networking/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 272900e0e5b..31fccbffa79 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openvpn-${version}";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
-    sha256 = "102an395nv8l7qfx3syydzhmd9xfbycd6gvwy0h2kjz8w67ipkcn";
+    sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 5a3550ede656fd6564a3e482904e8c3d4896162c Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 9 Mar 2018 13:50:54 +0000
Subject: [PATCH 0596/2266] yate: patch shebangs in configure

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

diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index bd891ff8493..7d933f528fe 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   preConfigure =
     ''
       sed -i 's@,/dev/null@@' configure
+      patchShebangs configure
     '';
 
   # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?

From a90294afe4da78a3a2ed1ac836ff72b9db4da9bd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 9 Mar 2018 14:47:47 +0100
Subject: [PATCH 0597/2266] haskell.lib.haskellSrc2nix: add
 extraCabal2nixOptions

---
 pkgs/development/haskell-modules/make-package-set.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index c793c0e7086..33d56fa8e1c 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -107,7 +107,7 @@ let
     inherit packages;
   };
 
-  haskellSrc2nix = { name, src, sha256 ? null }:
+  haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
     let
       sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
     in pkgs.buildPackages.stdenv.mkDerivation {
@@ -120,7 +120,7 @@ let
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
-        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix"
+        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
       '';
   };
 

From bf5e8ce96b059b49c63a135066417aedbab25377 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 9 Mar 2018 13:29:36 +0000
Subject: [PATCH 0598/2266] libvirt: build from tarball

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index f6262154df5..7262ca541f0 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
 let
-  buildFromTarball = false;
+  buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
   version = "4.1.0";

From c1d8663ad561939d1b04464cc9030c2cccd8bd29 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 05:58:14 -0800
Subject: [PATCH 0599/2266] os-prober: 1.73 -> 1.76

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.linux-boot-prober-wrapped -h` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.linux-boot-prober-wrapped --help` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.linux-boot-prober-wrapped help` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.os-prober-wrapped -h` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.os-prober-wrapped --help` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.os-prober-wrapped help` got 0 exit code
- found 1.76 with grep in /nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76
- found 1.76 in filename of file in /nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76
---
 pkgs/tools/misc/os-prober/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 87659802e50..b879f621e14 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -11,11 +11,11 @@ ntfs3g ? null
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.73";
+  version = "1.76";
   name = "os-prober-${version}";
   src = fetchurl {
     url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
-    sha256 = "1prssbwdgj5c33zhl3ldgaxk7lab9qvs4zhyrhag88wiivirb0sq";
+    sha256 = "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk";
   };
 
   buildInputs = [ makeWrapper ];

From a4f53eae2ca649726478798aaad1a7616f22289f Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 9 Mar 2018 11:40:34 +0100
Subject: [PATCH 0600/2266] jfbview: mark as broken (upstream issue)

incompatible with current libmupdf:
https://github.com/jichu4n/JFBView/issues/17
does not appear actively maintained.
---
 pkgs/os-specific/linux/jfbview/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 89a220c85e2..fdec72dd09c 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -64,5 +64,7 @@ stdenv.mkDerivation rec {
     homepage = https://seasonofcode.com/pages/jfbview.html;
     license = licenses.asl20;
     platforms = platforms.linux;
+    # incompatible with latest mupdf, see https://github.com/jichu4n/JFBView/issues/17
+    broken = true;
   };
 }

From f497a393280d93b1981476b339f4948243187966 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 9 Mar 2018 14:54:07 +0000
Subject: [PATCH 0601/2266] yate: restrict platforms

doesn't build on aarch64-linux
---
 pkgs/applications/misc/yate/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 7d933f528fe..61c7b11f208 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     # OpenH323 and PWlib (licensed under MPL).
     license = ["GPL" "MPL"];
     maintainers = [ lib.maintainers.marcweber ];
-    platforms = lib.platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 
 }

From 5797ba9d4a2c235a2fb808a86f8a68ee85dce024 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 5 Mar 2018 21:01:06 +0000
Subject: [PATCH 0602/2266] pkgs: tiny OCD fix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 376ae6c1c40..e9d8730f7a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10326,8 +10326,8 @@ with pkgs;
 
   libxmi = callPackage ../development/libraries/libxmi { };
 
-  libxml2 = callPackage ../development/libraries/libxml2 {
-  };
+  libxml2 = callPackage ../development/libraries/libxml2 { };
+
   libxml2Python = pkgs.buildEnv { # slightly hacky
     name = "libxml2+py-${self.libxml2.version}";
     paths = with libxml2; [ dev bin py ];

From bf448029d9e81d4df2dee56ca8891094cf4788de Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Mar 2018 21:36:00 +0000
Subject: [PATCH 0603/2266] vpnc: fix url

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

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 86e483114a3..6a23c81569f 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "vpnc-0.5.3-post-r550";
   src = fetchsvn {
-    url = "http://svn.unix-ag.uni-kl.de/vpnc";
+    url = "https://svn.unix-ag.uni-kl.de/vpnc";
     rev = "550";
     sha256 = "0x4ckfv9lpykwmh28v1kyzz91y1j2v48fi8q5nsawrba4q0wlrls";
   };

From 46a5e72b89d63d1fb45b04c7f542e24010682a6e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 07:05:59 -0800
Subject: [PATCH 0604/2266] palemoon: 27.7.2 -> 27.8.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 27.8.0 with grep in /nix/store/vqardwl9d7s3wdgapj4ybzrgpw5w3671-palemoon-27.8.0
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index ae7165a867c..58aa0f477ed 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.7.2";
+  version = "27.8.0";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "19ki6gp6bhcvhjnclalviiyp93mqsgc22xjl0gm9x5y4sxdb5wlq";
+    sha256 = "0b08rzn50jg59rnjzx6dvsmj5dikfjipnmvhpkimvr38v8q7wdar";
   };
 
   desktopItem = makeDesktopItem {

From 49272f60dd63950611b445106be15259ac11ae20 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 07:22:27 -0800
Subject: [PATCH 0605/2266] paml: 4.9c -> 4.9g

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.9g in filename of file in /nix/store/70p59yxnlzhbj8ig1ax8lrrsdbcf37zp-paml-4.9g
---
 pkgs/applications/science/biology/paml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 589c2809a93..bfadf9e704a 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "4.9c";
+  version = "4.9g";
   name = "paml-${version}";
   src = fetchurl {
     url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
-    sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j";
+    sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h";
   };
 
   preBuild = ''

From 2af121e687ecc485f92fac4de4461e9002af9284 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 22 Feb 2018 22:09:07 +0000
Subject: [PATCH 0606/2266] libpressureaudio: better descriptions

---
 pkgs/misc/apulse/pressureaudio.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix
index 255fca842a7..142b7278457 100644
--- a/pkgs/misc/apulse/pressureaudio.nix
+++ b/pkgs/misc/apulse/pressureaudio.nix
@@ -60,22 +60,22 @@ stdenv.mkDerivation {
   '';
 
   meta = apulse.meta // {
-    description = "libpulseaudio without any sound daemons over pure ALSA";
+    description = "libpulse without any sound daemons over pure ALSA";
     longDescription = ''
-      apulse (${apulse.meta.homepage}) implements most of libpulseaudio
+      apulse (${apulse.meta.homepage}) implements most of libpulse
       API over pure ALSA in 5% LOC of the original PulseAudio.
 
       But apulse is made to be used as a wrapper that substitutes its
       replacement libs into LD_LIBRARY_PATH. The problem with that is
-      that you still have to link against the original libpulseaudio.
+      that you still have to link against the original libpulse.
 
       pressureaudio (http://git.r-36.net/pressureaudio/) wraps apulse
-      with everything you need to replace libpulseaudio completely.
+      with everything you need to replace libpulse completely.
 
       This derivation is a reimplementation of pressureaudio in pure
       nix.
 
-      You can simply override libpulseaudio with this and most
+      You can simply override libpulse with this and most
       packages would just work.
     '';
   };

From a1832cf63335cb0c10e63c0c891ee59e5a6ce286 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 8 Mar 2018 21:33:52 +0000
Subject: [PATCH 0607/2266] firefoxPackages.tor-browser: update meta

---
 .../networking/browsers/firefox/packages.nix             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 44f4b014d70..c21201a69db 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -93,15 +93,18 @@ rec {
         It will use your default Firefox profile if you're not careful
         even! Be careful!
 
-        It will clash with firefox binary if you install both. But its
-        not a problem since you should run browsers in separate
-        users/VMs anyway.
+        It will clash with firefox binary if you install both. But it
+        should not be a problem because you should run browsers in
+        separate users/VMs anyway.
 
         Create new profile by starting it as
 
         $ firefox -ProfileManager
 
         and then configure it to use your tor instance.
+
+        Or just use `tor-browser-bundle` package that packs this
+        `tor-browser` back into a sanely-built bundle.
       '';
       homepage = https://www.torproject.org/projects/torbrowser.html;
       platforms = lib.platforms.linux;

From 929bfa45102abf43d2b72afa4178795863f009e6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 07:40:37 -0800
Subject: [PATCH 0608/2266] parallel: 20180122 -> 20180222

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parallel -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parallel --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parallel -V` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parallel --version` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/sql -V` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/sql --version` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/niceload -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/niceload --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/niceload -V` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/niceload --version` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parcat -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parcat --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parcat help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parset -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parset --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/parset help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel.bash -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel.bash --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel.bash help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel.sh -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel.sh --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/env_parallel.sh help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/.parallel-wrapped -h` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/.parallel-wrapped --help` got 0 exit code
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/.parallel-wrapped -V` and found version 20180222
- ran `/nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222/bin/.parallel-wrapped --version` and found version 20180222
- found 20180222 with grep in /nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222
- found 20180222 in filename of file in /nix/store/yianx0n1hidxg0x1wkra3h6bi4gir88l-parallel-20180222
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index e85d26fb058..7287da2079a 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20180122";
+  name = "parallel-20180222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1wkbppb4mc56grl6jsp803sf0hm7mg5ff7qmxalp7sd0vxqw41p9";
+    sha256 = "1bwx1rcrqz04d8fajlllhrfkjqxg0mfvsd86wf6p067gmgdrf6g8";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From 08165b23af6eb35b9c988b80839517aaa5131dc4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 19:22:35 -0800
Subject: [PATCH 0609/2266] imlib2: 1.4.10 -> 1.5.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped help` got 0 exit code
- found 1.5.0 in filename of file in /nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2
---
 pkgs/development/libraries/imlib2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 54c70197af4..18b42ea4b4f 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "imlib2-1.4.10";
+  name = "imlib2-1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
-    sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z";
+    sha256 = "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m";
   };
 
   buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]

From 1fedf8907d50dbe04826d929e3ed5e54d8dbdc06 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 9 Mar 2018 16:18:03 +0000
Subject: [PATCH 0610/2266] hexcurse: fix build with gcc7

---
 pkgs/applications/editors/hexcurse/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 5c0f2ee18e1..22cc4d47e68 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ncurses }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "hexcurse-${version}";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
   };
   buildInputs = [ ncurses ];
+  patches = [
+    # gcc7 compat
+    (fetchpatch {
+      url = https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch;
+      sha256 = "0h8345blmc401c6bivf0imn4cwii67264yrzxg821r46wrnfvyi2";
+    })
+    # gcc7 compat
+    (fetchpatch {
+      url = https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch;
+      sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix";
+    })
+  ];
   
   meta = with lib; {
     description = "ncurses-based console hexeditor written in C";

From ed3ad74a4862f4c97be6f1ff01185416eecaea41 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 9 Mar 2018 17:19:51 +0100
Subject: [PATCH 0611/2266] spin: 6.4.7 -> 6.4.8

---
 .../tools/analysis/spin/default.nix           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 284bf26782f..1be5655b1e5 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper, yacc, gcc
+{ stdenv, lib, requireFile, makeWrapper, yacc, gcc
 , withISpin ? true, tk, swarm, graphviz }:
 
 let
@@ -7,12 +7,17 @@ let
 
 in stdenv.mkDerivation rec {
   name = "spin-${version}";
-  version = "6.4.7";
+  version = "6.4.8";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
-  src = fetchurl {
-    url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
-    sha256 = "17m2xaag0jns8hsa4466zxq35ylg9fnzynzvjjmx4ympbiil6mqv";
+  src = requireFile {
+    name = "spin${url-version}.tar.gz";
+    sha256 = "1rpazi5fj772121cn7r85fxypmaiv0x6x2l82b5y1xqzyf0fi4ph";
+    message = ''
+      reCAPTCHA is preventing us to download the file for you.
+      Please download it at http://spinroot.com/spin/Src/index.html
+      and add it to the nix-store using nix-prefetch-url.
+    '';
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -20,6 +25,12 @@ in stdenv.mkDerivation rec {
 
   sourceRoot = "Spin/Src${version}";
 
+  unpackPhase = ''
+    # The archive is compressed twice
+    gunzip -c $src > spin.tar.gz
+    tar -xzf spin.tar.gz
+  '';
+
   installPhase = ''
     install -Dm755 spin $out/bin/spin
     wrapProgram $out/bin/spin \

From 32d26952dd17901c0f889a6534b1cd391d1c25b1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 08:32:49 -0800
Subject: [PATCH 0612/2266] pig: 0.14.0 -> 0.16.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/vfr6b50xzj4rj0xhl83vfqqq127lx79s-pig-0.16.0/bin/pig --help` got 0 exit code
- ran `/nix/store/vfr6b50xzj4rj0xhl83vfqqq127lx79s-pig-0.16.0/bin/pig --version` and found version 0.16.0
- ran `/nix/store/vfr6b50xzj4rj0xhl83vfqqq127lx79s-pig-0.16.0/bin/pig -h` and found version 0.16.0
- found 0.16.0 with grep in /nix/store/vfr6b50xzj4rj0xhl83vfqqq127lx79s-pig-0.16.0
---
 pkgs/applications/networking/cluster/pig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index 49c57b47028..45dcfb1738c 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "pig-0.14.0";
+  name = "pig-0.16.0";
 
   src = fetchurl {
     url = "mirror://apache/pig/${name}/${name}.tar.gz";
-    sha256 = "183in34cj93ny3lhqyq76g9pjqgw1qlwakk5v6x847vrlkfndska";
+    sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508";
 
   };
 

From 1e2c9fa78f79530dc234205995999149219535b9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 09:05:51 -0800
Subject: [PATCH 0613/2266] pipelight: 0.2.8 -> 0.2.8.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/x1h0gya1nb2kxbvkcr8sivskx2kzycdr-pipelight-0.2.8.2/bin/pipelight-plugin --help` got 0 exit code
- ran `/nix/store/x1h0gya1nb2kxbvkcr8sivskx2kzycdr-pipelight-0.2.8.2/bin/pipelight-plugin --version` and found version 0.2.8.2
- found 0.2.8.2 with grep in /nix/store/x1h0gya1nb2kxbvkcr8sivskx2kzycdr-pipelight-0.2.8.2
- found 0.2.8.2 in filename of file in /nix/store/x1h0gya1nb2kxbvkcr8sivskx2kzycdr-pipelight-0.2.8.2
---
 pkgs/tools/misc/pipelight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index f5c15775777..f39ee734d81 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -9,13 +9,13 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "0.2.8";
+  version = "0.2.8.2";
 
   name = "pipelight-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz";
-    sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
+    sha256 = "1kyy6knkr42k34rs661r0f5sf6l1s2jdbphdg89n73ynijqmzjhk";
   };
 
   buildInputs = [ wine_custom libX11 libGLU_combined curl ];

From 4b00e5c1a9ac3491e65a93b7a23dc2f8266204f1 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Fri, 9 Mar 2018 18:09:39 +0100
Subject: [PATCH 0614/2266] teamviewer: 12.0.85001 -> 12.0.90041

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

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 4ff649dbf2a..041a8cf0741 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -16,13 +16,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "teamviewer-${version}";
-  version = "12.0.85001";
+  version = "12.0.90041";
 
   src = fetchurl {
     # There is a 64-bit package, but it has no differences apart from Debian dependencies.
     # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
     url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb";
-    sha256 = "01vzky22gisjxa4ihaygkb7jwhl4z9ldd9lli8fc863nxxbrawks";
+    sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg";
   };
 
   unpackPhase = ''

From 6f01885fbeaf9083a8ed26c97b74e1ceec51fbe7 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 9 Mar 2018 18:26:25 +0100
Subject: [PATCH 0615/2266] rename: fix build

failed since there is no 'devdoc' output
---
 pkgs/tools/misc/rename/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index e30c2e89349..450424d0f54 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -3,6 +3,7 @@
 buildPerlPackage rec {
   name = "rename-${version}";
   version = "1.9";
+  outputs = [ "out" ];
   src = fetchFromGitHub {
     owner = "pstray";
     repo = "rename";

From 7bb9d0bd87cdffd5f79458e4b6654e2d2c96607b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 09:26:34 -0800
Subject: [PATCH 0616/2266] postfix: 3.2.5 -> 3.3.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.0 with grep in /nix/store/8h882s0l773xiwgwf6flkig4yskagi3b-postfix-3.3.0
- found 3.3.0 in filename of file in /nix/store/8h882s0l773xiwgwf6flkig4yskagi3b-postfix-3.3.0
---
 pkgs/servers/mail/postfix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index f8b36e816e0..a5168ebd4df 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -25,11 +25,11 @@ in stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "3.2.5";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "0xpky04a5xnzbcizqj4y1gyxqjrzvpjlvk1g757wdrs678fq82vx";
+    sha256 = "0fggpbsc9jkrbaw9hy0zw9h32plmfvcv0x860pbih0g346byhhkr";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f5ac2dd6e25593fdac00c61f131f69a64bc86c4c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 9 Mar 2018 12:27:00 -0500
Subject: [PATCH 0617/2266] linux: 4.14.24 -> 4.14.25

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4b8515a86d3..e5ca1f6e96e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.24";
+  version = "4.14.25";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00cqhc8198f4gj6cpz7nblpgi5zh2145arjx1yp0p4gmswdjslds";
+    sha256 = "11z544zyq1k1x52a3wibhqgkbjn9vmccxcgd0qdirrb8q1wvzkvd";
   };
 } // (args.argsOverride or {}))

From 245dcb4a58f5059b0bbd643c38d3b3776b29af5c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 9 Mar 2018 12:27:22 -0500
Subject: [PATCH 0618/2266] linux: 4.15.7 -> 4.15.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 1c488989243..28e76fa3c38 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.7";
+  version = "4.15.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1in8gy82ccpri7xhbgim3jrh15lbfrfzjgg69g0yvq534d5xyi6d";
+    sha256 = "0nk0k6gywlvy88y0nvy55l5ivnrqs5c3r36rlrrpcvfdyz273h4a";
   };
 } // (args.argsOverride or {}))

From 72dede4203ae785f5cb27c6c811acafd1df51c6a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 9 Mar 2018 12:32:54 -0500
Subject: [PATCH 0619/2266] linux-copperhead: 4.15.7.a -> 4.15.8.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 85d31048ffc..d5660b9a99b 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.7";
+  version = "4.15.8";
   revision = "a";
-  sha256 = "19kgy1fa4flnqm3a50hilgjczqkscay10183cvkzy3vxrnf8fl0f";
+  sha256 = "0bkvg93r1j7shls29yz3zi34lx71i3ylcsdyhdc9plzwb3chnpqg";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 4d1f618b18fe3ca6d5f37068732af7d136f2cced Mon Sep 17 00:00:00 2001
From: Eli Flanagan <eflanagan@innovu.com>
Date: Fri, 9 Mar 2018 12:47:05 -0500
Subject: [PATCH 0620/2266] tmsu: disable for darwin

Disabling until a solution comes about for osxfuse.
---
 pkgs/tools/filesystems/tmsu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index 89e5c0f35f0..35965346505 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     description = "A tool for tagging your files using a virtual filesystem";
     maintainers = with maintainers; [ pSub ];
     license     = licenses.gpl3;
-    platforms   = platforms.all;
+    platforms   = platforms.linux;
   };
 }

From 7a871021c776d47fd70c4886d2d71a847245eabd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 9 Mar 2018 13:12:48 -0500
Subject: [PATCH 0621/2266] atom: 1.24.0 -> 1.24.1

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 2194ff226b5..aa3c92da1f7 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1yvwz4lkf7ya775h3fvrg1wkdc30321j666vfjlmax5mbcjrxkzf";
+    sha256 = "0llg2q1hn2wmhi80ddwwb2lir2xwwmrw19i2c1y3qmfb0apynhw3";
     name = "${name}.deb";
   };
 

From de93488d09e58374221389181145501a98444cd7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 9 Mar 2018 18:17:44 +0000
Subject: [PATCH 0622/2266] apvlv: fix build with gcc7

---
 pkgs/applications/misc/apvlv/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index f1d84a91972..b6ec5310072 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch";
       sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j";
     })
+    # fix build with gcc7
+    (fetchpatch {
+      url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch";
+      sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi";
+    })
   ];
 
   installPhase = ''

From c02fd49177450ed3f3a5c9fed12ca90ee00c9e66 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 10:23:15 -0800
Subject: [PATCH 0623/2266] redo-sh: 1.2.6 -> 2.0.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-dot -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-dot --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-dot help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-sources -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-sources --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-sources help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-targets -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-targets --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-targets help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-dot-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-dot-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-dot-wrapped help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-sources-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-sources-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-sources-wrapped help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-targets-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-targets-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-targets-wrapped help` got 0 exit code
- found 2.0.3 with grep in /nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3
- found 2.0.3 in filename of file in /nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3
---
 pkgs/development/tools/build-managers/redo-sh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index c888627cfce..3036ef23584 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.6";
+  version = "2.0.3";
   name = "redo-sh-${version}";
 
   src = fetchurl {
     url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
-    sha256 = "1cwrk4v22rb9410rzyb4py4ncg01n6850l80s74bk3sflbw974wp";
+    sha256 = "1ycx3hik7vnlbwxacn1dzr48fwsn2ials0sg6k9l3gcyrha5wf1n";
   };
 
   buildInputs = [ makeWrapper ];

From 3d88d7af0f90cb33505865a73f13323ea8228a5d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 9 Feb 2018 10:26:07 -0600
Subject: [PATCH 0624/2266] bash: 4.4p12 -> 4.4p19

---
 pkgs/shells/bash/bash-4.4-patches.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix
index 741fb675d61..2d512812029 100644
--- a/pkgs/shells/bash/bash-4.4-patches.nix
+++ b/pkgs/shells/bash/bash-4.4-patches.nix
@@ -13,4 +13,11 @@ patch: [
 (patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4")
 (patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx")
 (patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps")
+(patch "013" "1djkx0w9v62q78gz3jsvamj1jq53i6hbfrfhhsw86ihwpjnfy98v")
+(patch "014" "0z5ikcq9zyxw79d0z36r5p0mspnb5piavbv03jmlan1wnknmrxx7")
+(patch "015" "09n307fi1j257abhm295k6ksmnzw47ka2zhnr0i5lbdnpvn04xnk")
+(patch "016" "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh")
+(patch "017" "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp")
+(patch "018" "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v")
+(patch "019" "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7")
 ]

From 2f0ff59d892b786b075d686c5cbe885a472db141 Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Sun, 25 Feb 2018 21:15:00 +0000
Subject: [PATCH 0625/2266] luaPackages.std._debug: init at 1.0

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index a589ceb7e0c..776de6b9a9b 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -726,6 +726,34 @@ let
     };
   };
 
+  std._debug = buildLuaPackage rec {
+    name = "std._debug-${version}";
+    version = "1.0";
+
+    src = fetchFromGitHub {
+      owner = "lua-stdlib";
+      repo = "_debug";
+      rev = "v${version}";
+      sha256 = "01kfs6k9j9zy4bvk13jx18ssfsmhlciyrni1x32qmxxf4wxyi65n";
+    };
+
+    # No Makefile.
+    dontBuild = true;
+
+    installPhase = ''
+      mkdir -p $out/share/lua/${lua.luaversion}/std
+      cp -r lib/std/_debug $out/share/lua/${lua.luaversion}/std/
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Manage an overall debug state, and associated hint substates.";
+      homepage    = https://lua-stdlib.github.io/_debug;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ lblasc ];
+      platforms   = platforms.unix;
+    };
+  };
+
   vicious = stdenv.mkDerivation rec {
     name = "vicious-${version}";
     version = "2.3.1";

From 73ec2c29d46345126b26765b2bfd817f6558d562 Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Sun, 25 Feb 2018 21:15:19 +0000
Subject: [PATCH 0626/2266] luaPackages.std.normalize: init at 2.0.1

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 776de6b9a9b..249b5bdb646 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -754,6 +754,36 @@ let
     };
   };
 
+  std.normalize = buildLuaPackage rec {
+    name = "std.normalize-${version}";
+    version = "2.0.1";
+
+    src = fetchFromGitHub {
+      owner = "lua-stdlib";
+      repo = "normalize";
+      rev = "v${version}";
+      sha256 = "1yz96r28d2wcgky6by92a21755bf4wzpn65rdv2ps0fxywgw5rda";
+    };
+
+    propagatedBuildInputs = [ std._debug ];
+
+    # No Makefile.
+    dontBuild = true;
+
+    installPhase = ''
+      mkdir -p $out/share/lua/${lua.luaversion}/std
+      cp -r lib/std/normalize $out/share/lua/${lua.luaversion}/std/
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Normalized Lua Functions";
+      homepage    = https://lua-stdlib.github.io/normalize;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ lblasc ];
+      platforms   = platforms.unix;
+    };
+  };
+
   vicious = stdenv.mkDerivation rec {
     name = "vicious-${version}";
     version = "2.3.1";

From b86c7469a686bc87e168668abc8e28c0e37e1180 Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Sat, 24 Feb 2018 07:26:05 +0000
Subject: [PATCH 0627/2266] luaposix: 33.4.0 -> 34.0.4

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 249b5bdb646..b141287b53e 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -270,22 +270,34 @@ let
 
   luaposix = buildLuaPackage rec {
     name = "posix-${version}";
-    version = "33.4.0";
+    version = "34.0.4";
 
     src = fetchFromGitHub {
       owner = "luaposix";
       repo = "luaposix";
       rev = "release-v${version}";
-      sha256 = "0y531p54lx2yf243bcsyp6sv8fvbqidp20yry0xvb85p8zw9dlrq";
+      sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z";
     };
 
-    buildInputs = [ perl ];
+    propagatedBuildInputs = [ std.normalize bit32 ];
+
+    buildPhase = ''
+      ${lua}/bin/lua build-aux/luke \
+        package="luaposix" \
+        version="${version}"
+    '';
+
+    installPhase = ''
+      ${lua}/bin/lua build-aux/luke install --quiet \
+        INST_LIBDIR="$out/lib/lua/${lua.luaversion}" \
+        INST_LUADIR="$out/share/lua/${lua.luaversion}"
+    '';
 
     meta = with stdenv.lib; {
       description = "Lua bindings for POSIX API";
       homepage = "https://github.com/luaposix/luaposix";
       license = licenses.mit;
-      maintainers = with maintainers; [ vyp ];
+      maintainers = with maintainers; [ vyp lblasc ];
       platforms = platforms.unix;
     };
   };

From 13c8e0194d6f3d948332e564a68b275834152c25 Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Sun, 25 Feb 2018 21:12:31 +0000
Subject: [PATCH 0628/2266] luaPackages.bit32: init at 5.3.0

fixes #35581
---
 pkgs/top-level/lua-packages.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index b141287b53e..75f2ab9e582 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -43,6 +43,35 @@ let
     inherit lua;
   };
 
+  bit32 = buildLuaPackage rec {
+    version = "5.3.0";
+    name = "bit32-${version}";
+
+    src = fetchFromGitHub {
+      owner = "keplerproject";
+      repo = "lua-compat-5.2";
+      rev = "bitlib-${version}";
+      sha256 = "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj";
+    };
+
+    buildPhase = ''
+      cc ${if stdenv.isDarwin then "-bundle -undefined dynamic_lookup -all_load" else "-shared"} -Ic-api lbitlib.c -o bit32.so
+    '';
+
+    installPhase = ''
+      mkdir -p $out/lib/lua/${lua.luaversion}
+      install -p bit32.so $out/lib/lua/${lua.luaversion}
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Lua 5.2 bit manipulation library";
+      homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
+      license = licenses.mit;
+      maintainers = with maintainers; [ lblasc ];
+      platforms = platforms.unix;
+    };
+  };
+
   luabitop = buildLuaPackage rec {
     version = "1.0.2";
     name = "bitop-${version}";

From 58b7f17a0f9e21ac63d2b79736709d7a66701372 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 9 Mar 2018 17:12:10 +0100
Subject: [PATCH 0629/2266] codeblocks: 16.01 -> 17.12, fix build

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

diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 20c2623e034..72642cfbe63 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -6,12 +6,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
-  version = "16.01";
+  version = "17.12";
   pname = "codeblocks";
 
   src = fetchurl {
-    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz";
-    sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh";
+    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz";
+    sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ];
@@ -22,11 +22,7 @@ stdenv.mkDerivation rec {
   preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
   postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
   configureFlags = [ "--enable-pch=no" ]
-    ++ optional contribPlugins "--with-contrib-plugins";
-
-  # Fix boost 1.59 compat
-  # Try removing in the next version
-  #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+    ++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ];
 
   meta = {
     maintainers = [ maintainers.linquize ];

From 468c5f4e2ad1d72171701095b427f5f494ef87ec Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 9 Mar 2018 21:22:18 +0100
Subject: [PATCH 0630/2266] darling-dmg: fix build with gcc7

---
 pkgs/tools/filesystems/darling-dmg/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 9e640b18a92..e44d0d22905 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
 
 stdenv.mkDerivation rec {
   name = "darling-dmg-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch";
+    sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39";
+     })
+  ];
+
   buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
 
   meta = {

From 42cd03f6d7d77a2983e8828d09fc1765e5789a19 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 9 Mar 2018 16:50:08 +0000
Subject: [PATCH 0631/2266] perlPackages.LWPUserAgent: point to
 perlPackages.LWP

---
 pkgs/top-level/perl-packages.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 834ead8575a..cbf55be9801 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8319,18 +8319,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LWPUserAgent = buildPerlPackage {
-    name = "LWP-UserAgent-6.05";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.05.tar.gz;
-      sha256 = "08wgwyz7748pv5cyngxia0xl6nragfnhrp4p9s78xhgfyygpj9bv";
-    };
-    propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ];
-    meta = {
-      description = "The World-Wide Web library for Perl";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  LWPUserAgent = LWP;
 
   LWPUserAgentDetermined = buildPerlPackage {
     name = "LWP-UserAgent-Determined-1.06";

From 0883e1c3181223a487853ec82155bd6f2c08eb3d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 9 Mar 2018 16:44:00 +0000
Subject: [PATCH 0632/2266] perlPackages.libnet: 3.08 -> 3.11

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cbf55be9801..2a194be8da4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7770,11 +7770,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  libnet = buildPerlPackage rec {
-    name = "libnet-3.08";
+  libnet = buildPerlPackage {
+    name = "libnet-3.11";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz";
-      sha256 = "21ebae642b53336576c370989d238cbe74378944079aca6f97665158c9f1750b";
+      url = mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz;
+      sha256 = "1lsj3a2vbryh85mbb6yddyb2zjv5vs88fdj5x3v7fp2ndr6ixarg";
     };
     meta = {
       description = "Collection of network protocol modules";
@@ -10511,15 +10511,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  NetSMTP = buildPerlPackage {
-    name = "Net-SMTP-1.25";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHAY/libnet-1.25.tar.gz;
-      sha256 = "01f3l4aj3ynl8syyrl122k4bmfds77yw5q36aafrgaq22fnb3b2a";
-    };
-    patchPhase = "chmod a-x Configure";
-    doCheck = false; # The test suite fails, because it requires network access.
-  };
+  NetSMTP = libnet;
 
   NetSMTPSSL = buildPerlPackage {
     name = "Net-SMTP-SSL-1.03";

From b6cba53df339e8a56b677fd0a1972356fc78b43a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 12:42:42 -0800
Subject: [PATCH 0633/2266] softhsm: 2.3.0 -> 2.4.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --version` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --version` and found version 2.4.0
- found 2.4.0 with grep in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
- found 2.4.0 in filename of file in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
---
 pkgs/tools/security/softhsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index ff3871bfbd9..4a4b790181d 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "softhsm-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-    sha256 = "09y1ladg7j0j5n780b1hdzwd2g2b5j5c54pfs7bzjviskb409mjy";
+    sha256 = "01ysfmq0pzr3g9laq40xwq8vg8w135d4m8n05mr1bkdavqmw3ai6";
   };
 
   configureFlags = [

From 82c6426916f0640bb05f215b83a3f1bd889fd097 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 23 Feb 2018 06:41:51 +0000
Subject: [PATCH 0634/2266] apulse: 0.1.11 -> 0.1.11 git, enable tracing by
 default

This adds LOG_TO_STDERR support and uses it for tracing.
---
 pkgs/misc/apulse/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index 343dbecb22c..58e50a50f0f 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib }:
+{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib
+, tracingSupport ? true, logToStderr ? true }:
+
+let oz = x: if x then "1" else "0"; in
 
 stdenv.mkDerivation rec {
   name = "apulse-${version}";
-  version = "0.1.11";
+  version = "0.1.11.1";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "apulse";
-    rev = "v${version}";
-    sha256 = "16l278q0czca2794fj388ql6qn1zrw24a0p6k7bayrrf5h32fdzd";
+    rev = "602b3a02b4b459d4652a3a0a836fab6f892d4080";
+    sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8";
   };
 
   enableParallelBuilding = true;
@@ -17,6 +20,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ alsaLib glib ];
 
+  cmakeFlags = [
+    "-DWITH_TRACE=${oz tracingSupport}"
+    "-DLOG_TO_STDERR=${oz logToStderr}"
+  ];
+
   meta = with stdenv.lib; {
     description = "PulseAudio emulation for ALSA";
     homepage = https://github.com/i-rinat/apulse;

From 0b60cb93101bfeecc3786909c30341028c80574c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 24 Feb 2018 20:56:14 +0000
Subject: [PATCH 0635/2266] libcardiacarrest: init at 11.0-6

---
 pkgs/misc/libcardiacarrest/default.nix | 48 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/misc/libcardiacarrest/default.nix

diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
new file mode 100644
index 00000000000..186fcb263ca
--- /dev/null
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "libcardiacarrest-${version}";
+  version = "11.0-6"; # <PA API version>-<version>
+
+  src = fetchFromGitHub {
+    owner = "oxij";
+    repo = "libcardiacarrest";
+    rev = "1220b37b3de75238fedee1a66ca703fe1c8c71c3";
+    sha256 = "0fkfiixjybac3rwcd26621hh5dw4f5gnmm230cr4g8fl0i2ikmrz";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ glib ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    moveToOutput $out/include $dev
+    moveToOutput $out/lib/pkgconfig $dev
+    moveToOutput $out/lib/cmake $dev
+  '';
+
+  meta = src.meta // {
+    description = "A trivial implementation of libpulse PulseAudio library API";
+    longDescription = ''
+      libcardiacarrest is a trivial implementation of libpulse
+      PulseAudio library API that unconditionally (but gracefully)
+      fails to connect to the PulseAudio daemon and does nothing else.
+
+      apulse and pressureaudio (which uses apulse internally) are an
+      inspiration for this but unlike those two projects
+      libcardiacarrest is not an emulation layer, all it does is it
+      gracefully fails to provide the requested PulseAudio service
+      hoping the application would try something else (e.g. ALSA or
+      JACK).
+    '';
+    license = libpulseaudio.meta.license; # "same as PA headers"
+    maintainers = [ maintainers.oxij ]; # also the author
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9d8730f7a1..4c04b54faf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -502,6 +502,8 @@ with pkgs;
 
   libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { };
 
+  libcardiacarrest = callPackage ../misc/libcardiacarrest { };
+
   archivemount = callPackage ../tools/filesystems/archivemount { };
 
   arandr = callPackage ../tools/X11/arandr { };

From 0712a61ac1a4ea5a9ffb3721ef2754b3a390e759 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 22 Feb 2018 22:09:07 +0000
Subject: [PATCH 0636/2266] pkgs: reorganize things related to `libpulseaudio`

---
 pkgs/top-level/all-packages.nix | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c04b54faf9..46906ea2683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -498,12 +498,6 @@ with pkgs;
 
   aptly = callPackage ../tools/misc/aptly { };
 
-  apulse = callPackage ../misc/apulse { };
-
-  libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { };
-
-  libcardiacarrest = callPackage ../misc/libcardiacarrest { };
-
   archivemount = callPackage ../tools/filesystems/archivemount { };
 
   arandr = callPackage ../tools/X11/arandr { };
@@ -12392,10 +12386,7 @@ with pkgs;
 
   pshs = callPackage ../servers/http/pshs { };
 
-  libpulseaudio = callPackage ../servers/pulseaudio {
-    libOnly = true;
-    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
-  };
+  # PulseAudio daemons
 
   # Name is changed to prevent use in packages;
   # please use libpulseaudio instead.
@@ -12415,6 +12406,25 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };
 
+  # libpulse implementations
+
+  libpulseaudio-vanilla = callPackage ../servers/pulseaudio {
+    libOnly = true;
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
+  };
+
+  apulse = callPackage ../misc/apulse { };
+
+  libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix {
+    libpulseaudio = libpulseaudio-vanilla; # headers only
+  };
+
+  libcardiacarrest = callPackage ../misc/libcardiacarrest {
+    libpulseaudio = libpulseaudio-vanilla; # meta only
+  };
+
+  libpulseaudio = libpulseaudio-vanilla;
+
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
 
   pies = callPackage ../servers/pies { };

From 7cd02c8a4caa5a729076488e3caf86470274815e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 6 Mar 2018 13:26:09 +0000
Subject: [PATCH 0637/2266] pamixer: apply a patch to fix pulseaudio
 initialization bug

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

diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 3e159c84384..322a4e23846 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -1,15 +1,22 @@
-{ stdenv, fetchurl, boost, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-
   name = "pamixer-${version}";
   version = "1.3.1";
 
-  src = fetchurl {
-    url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz";
-    sha256 = "1lsvb4xk1dq762w9c0jn7xvj3v1lzppql9mj1b55fhzdypbrkm6x";
+  src = fetchFromGitHub {
+    owner = "cdemoulins";
+    repo = "pamixer";
+    rev = version;
+    sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw";
   };
 
+  # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed
+  patches = [(fetchpatch {
+    url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch";
+    sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb";
+  })];
+
   buildInputs = [ boost libpulseaudio ];
 
   installPhase = ''

From 1b103a1e242924daaf790bd4341a6420fa304400 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 12:59:04 -0800
Subject: [PATCH 0638/2266] sonarr: 2.0.0.5085 -> 2.0.0.5153

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.0.5153 with grep in /nix/store/w0qkw2a73gnidkkr5ggvy1bm15w7fhn6-sonarr-2.0.0.5153
- found 2.0.0.5153 in filename of file in /nix/store/w0qkw2a73gnidkkr5ggvy1bm15w7fhn6-sonarr-2.0.0.5153
---
 pkgs/servers/sonarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 635fd96b06f..04e6e97c54e 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.5085";
+  version = "2.0.0.5153";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "1m6gdgsxk1d50kf4wnq6zyhbyf6rc0ma86l8m65am08xb0pihldz";
+    sha256 = "1zdsba5bpi87dhsa62qbpj55wbakl6w380pijs8qxn80bvapv3xy";
   };
 
   buildInputs = [

From 23e2ea9cbabe43fe36c01380f59f406da65028c7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 6 Mar 2018 22:33:11 +0000
Subject: [PATCH 0639/2266] firefoxPackages: add a patch to fix pulseaudio
 initialization bug

This is optional (`libcardiacarrest` has a workaround for this bug
because there's `firefox-bin` that I can't fix), but with this applied things
are a bit smoother.
---
 .../fix-pa-context-connect-retval.patch       | 26 +++++++++++++++++++
 .../networking/browsers/firefox/packages.nix  | 26 ++++++++++++-------
 2 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch

diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
new file mode 100644
index 00000000000..1c3c3294894
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
@@ -0,0 +1,26 @@
+Yep, it's a "return code was ignored" bug.
+diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c
+index aaaaaaaaaaa..bbbbbbbbbbb 100644
+--- a/media/libcubeb/src/cubeb_pulse.c
++++ b/media/libcubeb/src/cubeb_pulse.c
+@@ -473,6 +473,8 @@
+ static int
+ pulse_context_init(cubeb * ctx)
+ {
++  int r;
++
+   if (ctx->context) {
+     assert(ctx->error == 1);
+     pulse_context_destroy(ctx);
+@@ -486,9 +488,9 @@
+   WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx);
+ 
+   WRAP(pa_threaded_mainloop_lock)(ctx->mainloop);
+-  WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
++  r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
+ 
+-  if (wait_until_context_ready(ctx) != 0) {
++  if (r < 0 || wait_until_context_ready(ctx) != 0) {
+     WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop);
+     pulse_context_destroy(ctx);
+     ctx->context = NULL;
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index c21201a69db..865bf4379d7 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,6 +1,18 @@
 { lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
 
-let common = opts: callPackage (import ./common.nix opts); in
+let
+
+  common = opts: callPackage (import ./common.nix opts);
+
+  nixpkgsPatches = [
+    ./env_var_for_system_dir.patch
+
+    # this one is actually an omnipresent bug
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
+    ./fix-pa-context-connect-retval.patch
+  ];
+
+in
 
 rec {
 
@@ -12,9 +24,8 @@ rec {
       sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f";
     };
 
-    patches = [
+    patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
-      ./env_var_for_system_dir.patch
 
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1430274
       # Scheduled for firefox 59
@@ -49,8 +60,7 @@ rec {
       sha512 = "cf583df34272b7ff8841c3b093ca0819118f9c36d23c6f9b3135db298e84ca022934bcd189add6473922b199b47330c0ecf14c303ab4177c03dbf26e64476fa4";
     };
 
-    patches =
-      [ ./env_var_for_system_dir.patch ];
+    patches = nixpkgsPatches;
 
     meta = firefox.meta // {
       description = "A web browser built from Firefox Extended Support Release source tree";
@@ -127,8 +137,7 @@ in rec {
       sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
     };
 
-    patches =
-      [ ./env_var_for_system_dir.patch ];
+    patches = nixpkgsPatches;
   } // commonAttrs) {};
 
   tor-browser-7-5 = common (rec {
@@ -145,8 +154,7 @@ in rec {
       sha256 = "0llbk7skh1n7yj137gv7rnxfasxsnvfjp4ss7h1fbdnw19yba115";
     };
 
-    patches =
-      [ ./env_var_for_system_dir.patch ];
+    patches = nixpkgsPatches;
   } // commonAttrs) {};
 
   tor-browser = tor-browser-7-5;

From 3b769eafac6e0e813394ad09f83c306078d4135e Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Fri, 9 Mar 2018 22:28:28 +0100
Subject: [PATCH 0640/2266] yarn2nix: init at 0.1.0 (#35340)

---
 .../tools/yarn2nix/bin/yarn2nix.js            | 144 +++++++++++++
 pkgs/development/tools/yarn2nix/default.nix   | 199 ++++++++++++++++++
 pkgs/development/tools/yarn2nix/fixup_bin.js  |  45 ++++
 pkgs/development/tools/yarn2nix/package.json  |  19 ++
 pkgs/development/tools/yarn2nix/yarn.lock     |  11 +
 pkgs/development/tools/yarn2nix/yarn.nix      |  23 ++
 pkgs/top-level/all-packages.nix               |   3 +
 7 files changed, 444 insertions(+)
 create mode 100755 pkgs/development/tools/yarn2nix/bin/yarn2nix.js
 create mode 100644 pkgs/development/tools/yarn2nix/default.nix
 create mode 100644 pkgs/development/tools/yarn2nix/fixup_bin.js
 create mode 100644 pkgs/development/tools/yarn2nix/package.json
 create mode 100644 pkgs/development/tools/yarn2nix/yarn.lock
 create mode 100644 pkgs/development/tools/yarn2nix/yarn.nix

diff --git a/pkgs/development/tools/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix/bin/yarn2nix.js
new file mode 100755
index 00000000000..3eadea55903
--- /dev/null
+++ b/pkgs/development/tools/yarn2nix/bin/yarn2nix.js
@@ -0,0 +1,144 @@
+#!/usr/bin/env node
+"use strict";
+
+const crypto = require('crypto');
+const fs = require("fs");
+const https = require("https");
+const path = require("path");
+const util = require("util");
+
+const lockfile = require("@yarnpkg/lockfile")
+const docopt = require("docopt").docopt;
+
+////////////////////////////////////////////////////////////////////////////////
+
+const USAGE = `
+Usage: yarn2nix [options]
+
+Options:
+  -h --help        Shows this help.
+  --no-nix         Hide the nix output
+  --no-patch       Don't patch the lockfile if hashes are missing
+  --lockfile=FILE  Specify path to the lockfile [default: ./yarn.lock].
+`
+
+const HEAD = `
+{fetchurl, linkFarm}: rec {
+  offline_cache = linkFarm "offline" packages;
+  packages = [
+`.trim();
+
+////////////////////////////////////////////////////////////////////////////////
+
+function generateNix(lockedDependencies) {
+  let found = {};
+
+  console.log(HEAD)
+
+  for (var depRange in lockedDependencies) {
+    let dep = lockedDependencies[depRange];
+
+    let depRangeParts = depRange.split('@');
+    let [url, sha1] = dep["resolved"].split("#");
+    let file_name = path.basename(url)
+
+    if (found.hasOwnProperty(file_name)) {
+      continue;
+    } else {
+      found[file_name] = null;
+    }
+
+
+    console.log(`
+    {
+      name = "${file_name}";
+      path = fetchurl {
+        name = "${file_name}";
+        url  = "${url}";
+        sha1 = "${sha1}";
+      };
+    }`)
+  }
+
+  console.log("  ];")
+  console.log("}")
+}
+
+
+function getSha1(url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, (res) => {
+      const { statusCode } = res;
+      const hash = crypto.createHash('sha1');
+      if (statusCode !== 200) {
+        const err = new Error('Request Failed.\n' +
+                          `Status Code: ${statusCode}`);
+        // consume response data to free up memory
+        res.resume();
+        reject(err);
+      }
+
+      res.on('data', (chunk) => { hash.update(chunk); });
+      res.on('end', () => { resolve(hash.digest('hex')) });
+      res.on('error', reject);
+    });
+  });
+};
+
+function updateResolvedSha1(pkg) {
+  // local dependency
+  if (!pkg.resolved) { return Promise.resolve(); }
+  let [url, sha1] = pkg.resolved.split("#", 2)
+  if (!sha1) {
+    return new Promise((resolve, reject) => {
+      getSha1(url).then(sha1 => {
+        pkg.resolved = `${url}#${sha1}`;
+        resolve();
+      }).catch(reject);
+    });
+  } else {
+    // nothing to do
+    return Promise.resolve();
+  };
+}
+
+function values(obj) {
+  var entries = [];
+  for (let key in obj) {
+    entries.push(obj[key]);
+  }
+  return entries;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Main
+////////////////////////////////////////////////////////////////////////////////
+
+var options = docopt(USAGE);
+
+let data = fs.readFileSync(options['--lockfile'], 'utf8')
+let json = lockfile.parse(data)
+if (json.type != "success") {
+  throw new Error("yarn.lock parse error")
+}
+
+// Check fore missing hashes in the yarn.lock and patch if necessary
+var pkgs = values(json.object);
+Promise.all(pkgs.map(updateResolvedSha1)).then(() => {
+  let newData = lockfile.stringify(json.object);
+
+  if (newData != data) {
+    console.error("found changes in the lockfile", options["--lockfile"]);
+
+    if (options["--no-patch"]) {
+      console.error("...aborting");
+      process.exit(1);
+    }
+
+    fs.writeFileSync(options['--lockfile'], newData);
+  }
+
+  if (!options['--no-nix']) {
+    generateNix(json.object);
+  }
+})
diff --git a/pkgs/development/tools/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix/default.nix
new file mode 100644
index 00000000000..e86c0aac2c9
--- /dev/null
+++ b/pkgs/development/tools/yarn2nix/default.nix
@@ -0,0 +1,199 @@
+{ stdenv, lib, fetchurl, linkFarm, runCommand, nodejs, yarn }:
+
+let
+  unlessNull = item: alt:
+    if item == null then alt else item;
+
+  yarn2nix = mkYarnPackage {
+    src = ./.;
+    yarnNix = ./yarn.nix;
+
+    passthru = {
+      inherit
+        defaultYarnFlags
+        linkNodeModulesHook
+        mkYarnModules
+        mkYarnNix
+        mkYarnPackage
+        # Export yarn again to make it easier to find out which yarn was used.
+        yarn
+        ;
+    };
+
+    meta = with lib; {
+      description = "generate nix expressions from a yarn.lock file";
+      homepage = "https://github.com/moretea/yarn2nix";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ manveru zimbatm ];
+    };
+  };
+
+  # Generates the yarn.nix from the yarn.lock file
+  mkYarnNix = yarnLock:
+    runCommand "yarn.nix" {}
+      "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out";
+
+  # Loads the generated offline cache. This will be used by yarn as
+  # the package source.
+  importOfflineCache = yarnNix:
+    let
+      pkg = import yarnNix { inherit fetchurl linkFarm; };
+    in
+      pkg.offline_cache;
+
+  defaultYarnFlags = [
+    "--offline"
+    "--frozen-lockfile"
+    "--ignore-engines"
+    "--ignore-scripts"
+  ];
+
+  mkYarnModules = {
+    name,
+    packageJSON,
+    yarnLock,
+    yarnNix ? mkYarnNix yarnLock,
+    yarnFlags ? defaultYarnFlags,
+    pkgConfig ? {},
+    preBuild ? "",
+  }:
+    let
+      offlineCache = importOfflineCache yarnNix;
+      extraBuildInputs = (lib.flatten (builtins.map (key:
+        pkgConfig.${key} . buildInputs or []
+      ) (builtins.attrNames pkgConfig)));
+      postInstall = (builtins.map (key:
+        if (pkgConfig.${key} ? postInstall) then
+          ''
+            for f in $(find -L -path '*/node_modules/${key}' -type d); do
+              (cd "$f" && (${pkgConfig.${key}.postInstall}))
+            done
+          ''
+        else
+          ""
+      ) (builtins.attrNames pkgConfig));
+    in
+    stdenv.mkDerivation {
+      inherit name preBuild;
+      phases = ["configurePhase" "buildPhase"];
+      buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
+
+      configurePhase = ''
+        # Yarn writes cache directories etc to $HOME.
+        export HOME=$PWD/yarn_home
+      '';
+
+      buildPhase = ''
+        runHook preBuild
+
+        cp ${packageJSON} ./package.json
+        cp ${yarnLock} ./yarn.lock
+        chmod +w ./yarn.lock
+
+        yarn config --offline set yarn-offline-mirror ${offlineCache}
+
+        # Do not look up in the registry, but in the offline cache.
+        # TODO: Ask upstream to fix this mess.
+        sed -i -E 's|^(\s*resolved\s*")https?://.*/|\1|' yarn.lock
+        yarn install ${lib.escapeShellArgs yarnFlags}
+
+        ${lib.concatStringsSep "\n" postInstall}
+
+        mkdir $out
+        mv node_modules $out/
+        patchShebangs $out
+      '';
+    };
+
+  # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
+  # the shell-hook environment.
+  linkNodeModulesHook = ''
+    if [[ -d node_modules || -L node_modules ]]; then
+      echo "./node_modules is present. Replacing."
+      rm -rf node_modules
+    fi
+
+    ln -s "$node_modules" node_modules
+  '';
+
+  mkYarnPackage = {
+    name ? null,
+    src,
+    packageJSON ? src + "/package.json",
+    yarnLock ? src + "/yarn.lock",
+    yarnNix ? mkYarnNix yarnLock,
+    yarnFlags ? defaultYarnFlags,
+    yarnPreBuild ? "",
+    pkgConfig ? {},
+    extraBuildInputs ? [],
+    publishBinsFor ? null,
+    ...
+  }@attrs:
+    let
+      package = lib.importJSON packageJSON;
+      pname = package.name;
+      version = package.version;
+      deps = mkYarnModules {
+        name = "${pname}-modules-${version}";
+        preBuild = yarnPreBuild;
+        inherit packageJSON yarnLock yarnNix yarnFlags pkgConfig;
+      };
+      publishBinsFor_ = unlessNull publishBinsFor [pname];
+    in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig"] // {
+      inherit src;
+
+      name = unlessNull name "${pname}-${version}";
+
+      buildInputs = [ yarn nodejs ] ++ extraBuildInputs;
+
+      node_modules = deps + "/node_modules";
+
+      configurePhase = attrs.configurePhase or ''
+        runHook preConfigure
+
+        if [ -d npm-packages-offline-cache ]; then
+          echo "npm-pacakges-offline-cache dir present. Removing."
+          rm -rf npm-packages-offline-cache
+        fi
+
+        if [[ -d node_modules || -L node_modules ]]; then
+          echo "./node_modules is present. Removing."
+          rm -rf node_modules
+        fi
+
+        mkdir -p node_modules
+        ln -s $node_modules/* node_modules/
+        ln -s $node_modules/.bin node_modules/
+
+        if [ -d node_modules/${pname} ]; then
+          echo "Error! There is already an ${pname} package in the top level node_modules dir!"
+          exit 1
+        fi
+
+        runHook postConfigure
+      '';
+
+      # Replace this phase on frontend packages where only the generated
+      # files are an interesting output.
+      installPhase = attrs.installPhase or ''
+        runHook preInstall
+
+        mkdir -p $out
+        cp -r node_modules $out/node_modules
+        cp -r . $out/node_modules/${pname}
+        rm -rf $out/node_modules/${pname}/node_modules
+
+        mkdir $out/bin
+        node ${./fixup_bin.js} $out ${lib.concatStringsSep " " publishBinsFor_}
+
+        runHook postInstall
+      '';
+
+      passthru = {
+        inherit package deps;
+      } // (attrs.passthru or {});
+
+      # TODO: populate meta automatically
+    });
+in
+  yarn2nix
diff --git a/pkgs/development/tools/yarn2nix/fixup_bin.js b/pkgs/development/tools/yarn2nix/fixup_bin.js
new file mode 100644
index 00000000000..dab1759c204
--- /dev/null
+++ b/pkgs/development/tools/yarn2nix/fixup_bin.js
@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+"use strict";
+
+/* Usage:
+ * node fixup_bin.js <output_dir> [<bin_pkg_1>, <bin_pkg_2> ... ]
+ */
+
+const fs = require("fs");
+const path = require("path");
+
+const output = process.argv[2];
+const packages_to_publish_bin = process.argv.slice(3);
+const derivation_bin_path = output + "/bin";
+
+function processPackage(name) {
+  console.log("Processing ", name);
+  const package_path = output + "/node_modules/" + name;
+  const package_json_path = package_path + "/package.json";
+  const package_json = JSON.parse(fs.readFileSync(package_json_path));
+
+  if (!package_json.bin) {
+    console.log("No binaries provided");
+    return;
+  }
+
+  // There are two alternative syntaxes for `bin`
+  // a) just a plain string, in which case the name of the package is the name of the binary.
+  // b) an object, where key is the name of the eventual binary, and the value the path to that binary.
+  if (typeof package_json.bin == "string") {
+    let bin_name = package_json.bin;
+    package_json.bin = { };
+    package_json.bin[package_json.name] = bin_name;
+  }
+
+  for (let binName in package_json.bin) {
+    const bin_path = package_json.bin[binName];
+    const full_bin_path = path.normalize(package_path + "/" + bin_path);
+    fs.symlinkSync(full_bin_path, derivation_bin_path + "/"+ binName);
+    console.log("Linked", binName);
+  }
+}
+
+packages_to_publish_bin.forEach((pkg) => {
+  processPackage(pkg);
+});
diff --git a/pkgs/development/tools/yarn2nix/package.json b/pkgs/development/tools/yarn2nix/package.json
new file mode 100644
index 00000000000..130eee67c56
--- /dev/null
+++ b/pkgs/development/tools/yarn2nix/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "yarn2nix",
+  "version": "1.0.0",
+  "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies",
+  "main": "index.js",
+  "repository": ".",
+  "author": "Maarten Hoogendoorn <maarten@moretea.nl>",
+  "license": "MIT",
+  "scripts": {
+    "yarn2nix": "bin/yarn2nix.js"
+  },
+  "bin": {
+    "yarn2nix": "bin/yarn2nix.js"
+  },
+  "dependencies": {
+    "@yarnpkg/lockfile": "^1.0.0",
+    "docopt": "^0.6.2"
+  }
+}
diff --git a/pkgs/development/tools/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix/yarn.lock
new file mode 100644
index 00000000000..976d2c530e1
--- /dev/null
+++ b/pkgs/development/tools/yarn2nix/yarn.lock
@@ -0,0 +1,11 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@yarnpkg/lockfile@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz#33d1dbb659a23b81f87f048762b35a446172add3"
+
+docopt@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11"
\ No newline at end of file
diff --git a/pkgs/development/tools/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix/yarn.nix
new file mode 100644
index 00000000000..a9e42e7d986
--- /dev/null
+++ b/pkgs/development/tools/yarn2nix/yarn.nix
@@ -0,0 +1,23 @@
+{fetchurl, linkFarm}: rec {
+  offline_cache = linkFarm "offline" packages;
+  packages = [
+
+    {
+      name = "lockfile-1.0.0.tgz";
+      path = fetchurl {
+        name = "lockfile-1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz";
+        sha1 = "33d1dbb659a23b81f87f048762b35a446172add3";
+      };
+    }
+
+    {
+      name = "docopt-0.6.2.tgz";
+      path = fetchurl {
+        name = "docopt-0.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz";
+        sha1 = "b28e9e2220da5ec49f7ea5bb24a47787405eeb11";
+      };
+    }
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39cc942bc7a..35ebbf4be77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5603,6 +5603,9 @@ with pkgs;
 
   yarn = callPackage ../development/tools/yarn  { };
 
+  yarn2nix = callPackage ../development/tools/yarn2nix { };
+  inherit (yarn2nix) mkYarnPackage;
+
   yasr = callPackage ../applications/audio/yasr { };
 
   yank = callPackage ../tools/misc/yank { };

From 2d7043155378e9a2bf5a2540bd0d2091251c64cb Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 9 Mar 2018 22:06:58 +0100
Subject: [PATCH 0641/2266] dislocker: 0.6.1 -> 0.7.1

---
 pkgs/tools/filesystems/dislocker/cmake_dirfix.patch | 13 -------------
 pkgs/tools/filesystems/dislocker/default.nix        |  6 ++----
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/dislocker/cmake_dirfix.patch

diff --git a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch b/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
deleted file mode 100644
index 829666bfe7a..00000000000
--- a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 365903a..f126ade 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -149,7 +149,7 @@ if(NOT DEFINED bindir)
- endif()
- 
- string (TOLOWER "${CMAKE_SYSTEM_NAME}" SYSNAME)
--set (DIS_MAN ../man/${SYSNAME})
-+set (DIS_MAN ${PROJECT_SOURCE_DIR}/man/${SYSNAME})
- 
- # RPATH handling
- if(POLICY CMP0042)
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 57676e7a89a..2e4ea88df7f 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -4,7 +4,7 @@
 }:
 with stdenv.lib;
 let
-  version = "0.6.1";
+  version = "0.7.1";
 in
 stdenv.mkDerivation rec {
   name = "dislocker-${version}";
@@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
     owner = "aorimn";
     repo = "dislocker";
     rev = "v${version}";
-    sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d";
+    sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
   };
 
   buildInputs = [ cmake fuse polarssl ];
 
-  patches = [ ./cmake_dirfix.patch ];
-
   meta = {
     description = "Read BitLocker encrypted partitions in Linux";
     homepage    = https://github.com/aorimn/dislocker;

From 6f8176ac4382781b4497cbb69ff6e0a1d798eedc Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Fri, 16 Feb 2018 15:44:18 +0100
Subject: [PATCH 0642/2266] squashfuse : init at 0.1.101-371e4be

---
 pkgs/tools/filesystems/squashfuse/default.nix | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/filesystems/squashfuse/default.nix

diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
new file mode 100644
index 00000000000..c3978e7a55c
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, fetchpatch, automake, autoreconfHook, libtool, fuse,
+  pkgconfig, pcre, lz4, xz, zlib, lzo, zstd }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+
+  pname = "squashfuse";
+  version = "0.1.101";
+  rev = "371e4bee9caa254d842913df9bdbcc795c5b342c";
+  short_rev = "${builtins.substring 0 7 rev}";
+  name = "${pname}-${version}-${short_rev}";
+
+  meta = {
+    description = "FUSE filesystem to mount squashfs archives";
+    homepage = https://github.com/vasi/squashfuse;
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+    license = "BSD-2-Clause";
+  };
+
+  # platforms.darwin should be supported : see PLATFORMS file in src.
+  # we could use a nix fuseProvider, and let the derivation choose the OS
+  # specific implementation.
+
+  src = fetchFromGitHub {
+    owner = "vasi";
+    repo  = "${pname}";
+    rev = "${rev}";
+    sha256 = "0i9p8r1c128hzy0cwmga1x7q8zk7kw68mh8li5ipfz8zba60d7vz";
+  };
+
+  patches = [
+	(fetchpatch {
+	  url = "https://github.com/vasi/squashfuse/commit/0c44cb2abe402d6e352dd47ac8b7e7495c7c2a6f.patch";
+	  sha256 = "0z53p7pi3ap05n0bxhmka4sz12cw2cjjvc7xn9jppbyynfzx32m0";
+	})
+  ];
+
+  nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
+  buildInputs = [ lz4 xz zlib lzo zstd fuse ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35ebbf4be77..24cbf6cedb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4827,6 +4827,8 @@ with pkgs;
 
   squashfsTools = callPackage ../tools/filesystems/squashfs { };
 
+  squashfuse = callPackage ../tools/filesystems/squashfuse { };
+
   srcml = callPackage ../applications/version-management/srcml { };
 
   sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };

From 5c2523272864e498f42485ce13231c7c266c7f0d Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Tue, 20 Feb 2018 13:06:26 +0100
Subject: [PATCH 0643/2266] squashfuse: init at unstable-2018-02-20

---
 pkgs/tools/filesystems/squashfuse/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index c3978e7a55c..341b025b079 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -6,10 +6,8 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "squashfuse";
-  version = "0.1.101";
-  rev = "371e4bee9caa254d842913df9bdbcc795c5b342c";
-  short_rev = "${builtins.substring 0 7 rev}";
-  name = "${pname}-${version}-${short_rev}";
+  version = "unstable-2018-02-20";
+  name = "${pname}-${version}";
 
   meta = {
     description = "FUSE filesystem to mount squashfs archives";
@@ -26,17 +24,10 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vasi";
     repo  = "${pname}";
-    rev = "${rev}";
-    sha256 = "0i9p8r1c128hzy0cwmga1x7q8zk7kw68mh8li5ipfz8zba60d7vz";
+    rev = "3f4a93f373796e88f7eee3a0c005ef60cb395d30";
+    sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq";
   };
 
-  patches = [
-	(fetchpatch {
-	  url = "https://github.com/vasi/squashfuse/commit/0c44cb2abe402d6e352dd47ac8b7e7495c7c2a6f.patch";
-	  sha256 = "0z53p7pi3ap05n0bxhmka4sz12cw2cjjvc7xn9jppbyynfzx32m0";
-	})
-  ];
-
   nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
   buildInputs = [ lz4 xz zlib lzo zstd fuse ];
 }

From 8643a32c8c7ad4d5c8a809a906ea5e6b7a56d976 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 13:50:56 -0800
Subject: [PATCH 0644/2266] syncplay: 1.5.0 -> 1.5.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped --help` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped -v` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped --version` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay --help` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay -v` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay --version` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-server-wrapped -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-server-wrapped --help` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay-server -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay-server --help` got 0 exit code
- found 1.5.2 with grep in /nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2
- found 1.5.2 in filename of file in /nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2
---
 pkgs/applications/networking/syncplay/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 80ad1a43332..e41671f2360 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -2,13 +2,13 @@
 
 python2Packages.buildPythonApplication rec {
   name = "syncplay-${version}";
-  version = "1.5.0";
+  version = "1.5.2";
 
   format = "other";
 
   src = fetchurl {
-    url = https://github.com/Syncplay/syncplay/archive/v1.5.0.tar.gz;
-    sha256 = "762e6318588e14aa02b1340baa18510e7de87771c62ca5b44d985b6d1289964d";
+    url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz;
+    sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla";
   };
 
   propagatedBuildInputs = with python2Packages; [ pyside twisted ];

From 38c589b5d0b66fd2d244ab8fa0d9fc135887bde5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Fri, 9 Mar 2018 23:01:31 +0100
Subject: [PATCH 0645/2266] mpv: fix darwin build

The optional video acceleration api (vaapi) is not supported on darwin.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24cbf6cedb2..38f4ec215ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16635,6 +16635,7 @@ with pkgs;
     dvdreadSupport     = !stdenv.isDarwin;
     dvdnavSupport      = !stdenv.isDarwin;
     drmSupport         = !stdenv.isDarwin;
+    vaapiSupport       = !stdenv.isDarwin;
     x11Support         = !stdenv.isDarwin;
     xineramaSupport    = !stdenv.isDarwin;
     xvSupport          = !stdenv.isDarwin;

From 5915f2dd0c34d8ae0aea97f89503810ef06f81d4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 9 Mar 2018 17:03:03 -0500
Subject: [PATCH 0646/2266] include-what-you-use: enable on darwin

---
 .../development/tools/analysis/include-what-you-use/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index f2481013fbb..ec4d19423e6 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://include-what-you-use.org;
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From b66d7dc0ce684197181a2a8ec0859470137507aa Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 9 Mar 2018 17:21:12 -0500
Subject: [PATCH 0647/2266] lib.isStorePath: Fix derivation detection

---
 lib/strings.nix    | 9 ++++++++-
 lib/tests/misc.nix | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 9cbd1494a2b..e6df7d99cb2 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -437,6 +437,13 @@ rec {
   */
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
 
+  /* Check whether a value can be coerced to a string */
+  isCoercibleToString = x:
+    builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] ||
+    (builtins.isList x && lib.all isCoercibleToString x) ||
+    x ? outPath ||
+    x ? __toString;
+
   /* Check whether a value is a store path.
 
      Example:
@@ -450,7 +457,7 @@ rec {
        => false
   */
   isStorePath = x:
-       builtins.isString x
+       isCoercibleToString x
     && builtins.substring 0 1 (toString x) == "/"
     && dirOf (builtins.toPath x) == builtins.storeDir;
 
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 1657ec33a46..e10aea48e48 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -93,6 +93,7 @@ runTests {
             "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
       in {
         storePath = isStorePath goodPath;
+        storePathDerivation = isStorePath (import ../.. {}).hello;
         storePathAppendix = isStorePath
           "${goodPath}/bin/python";
         nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
@@ -106,6 +107,7 @@ runTests {
       };
     expected = {
       storePath = true;
+      storePathDerivation = true;
       storePathAppendix = false;
       nonAbsolute = false;
       asPath = true;

From 28e31f1c07fc24356ad1e4c444138b736b2a9991 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 14:23:54 -0800
Subject: [PATCH 0648/2266] teyjus: 2.0b2 -> 2.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjcc --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjdepend --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjdis --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjlink --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjsim --help` got 0 exit code
- found 2.1 with grep in /nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1
- found 2.1 in filename of file in /nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1
---
 pkgs/development/compilers/teyjus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 222a22bf1cd..53ab4ec0e85 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, omake, ocaml, flex, bison }:
 
 stdenv.mkDerivation {
-  name = "teyjus-2.0b2";
+  name = "teyjus-2.1";
 
   src = fetchurl {
     url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz";
-    sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052";
+    sha256 = "0llhm5nrfyj7ihz2qq1q9ijrh6y4f8vl39mpfkkad5bh1m3gp2gm";
   };
 
   patches = [ ./fix-lex-to-flex.patch ];

From 6baeaa0e1bdd2f98340668348d5a89a3c668636c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 14:39:48 -0800
Subject: [PATCH 0649/2266] tini: 0.16.1 -> 0.17.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0/bin/tini -h` got 0 exit code
- ran `/nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0/bin/tini --version` and found version 0.17.0
- ran `/nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0/bin/tini -h` and found version 0.17.0
- found 0.17.0 with grep in /nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0
- found 0.17.0 in filename of file in /nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0
---
 pkgs/applications/virtualization/tini/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 0d4aa4783c6..c027541c01c 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, glibc }:
 
 stdenv.mkDerivation rec {
-  version = "0.16.1";
+  version = "0.17.0";
   name = "tini-${version}";
 
   src = fetchFromGitHub {
     owner = "krallin";
     repo = "tini";
     rev = "v${version}";
-    sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp";
+    sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0";
   };
 
   patchPhase = "sed -i /tini-static/d CMakeLists.txt";

From 99fbca02ff7a349a645c3a01da9424c3c0e3e144 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 15:20:31 -0800
Subject: [PATCH 0650/2266] umockdev: 0.11 -> 0.11.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-run -h` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-run --help` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-run --version` and found version 0.11.1
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-record -h` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-record --help` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-record --version` and found version 0.11.1
- found 0.11.1 with grep in /nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1
- found 0.11.1 in filename of file in /nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1
---
 pkgs/development/libraries/umockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index a0936310c42..e3ad65a86dd 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "umockdev-${version}";
-  version = "0.11";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = "umockdev";
     rev = version;
-    sha256 ="1gpk2f03nad4qv084hx7549d68cqc1xibxm0ncanafm5xjz1hp55";
+    sha256 ="0cmswac8m7zfvk6cb8k5iisqr7arnn1yhcmasri072yz0pmr6dr0";
   };
 
   buildInputs = [ glib systemd libgudev ];

From ebce42146f65b5238b628f22c2aa1e4e26d84f26 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Fri, 9 Mar 2018 15:27:20 +0400
Subject: [PATCH 0651/2266] chromium: fix GCC 7 related build issues

Also clean up unused patches.
---
 .../networking/browsers/chromium/common.nix   | 32 ++++--
 ...aybackImageProvider-copy-constructor.patch | 89 +++++++++++++++++
 .../chromium/patches/chromium-gcc5-r4.patch   | 98 -------------------
 .../chromium/patches/constexpr-fix.patch      | 98 -------------------
 .../patches/fix_network_api_crash.patch       | 77 ---------------
 .../patches/include-math-for-round.patch      | 34 -------
 6 files changed, 113 insertions(+), 315 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 8193f47104d..def771c2f72 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -139,27 +139,43 @@ let
 
     patches = [
       ./patches/nix_plugin_paths_52.patch
-      # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
-      ## Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
-      ## TODO investigate build error
-      #./patches/fix_network_api_crash.patch
-
       # As major versions are added, you can trawl the gentoo and arch repos at
       # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
       # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
       # for updated patches and hints about build flags
-
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
     ]  ++ optionals (versionRange "65" "66") [
       (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8")
       (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
       (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x")
+      # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
+      # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
+      (githubPatch "1517db71cccaec48a05cdf30208e0cba7ab9b9a8" "08ac502cwwb05ml3w4wzn66i5c2d1h22xs5rzszwlnhxckxfc0fk")
+      # GCC 7 fixes
+      (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv")
+      (githubPatch "4d8468a07f374c11425494271256151fb6fe0c34" "0kqqq8kj0zv5bi1n9mm0vnn8wsgi98mjmj7snpav21fh3pgiqjrm")
+      (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj")
+      (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj")
+      # Following commit doesn't apply cleanly to stable branch, replace with handcrafted one
+      #(githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
+      ./patches/PlaybackImageProvider-copy-constructor.patch
+      # * base/optional.h
+      (githubPatch "f1c8789c71dbdaeeef98ecd52c9715495824e6b0" "0w3d82s10cl10r6zq9vpsscmdhbdkcy0vbdiqy5pvbr031nfxw5w")
+      (githubPatch "5cae9645215d02cb1f986a181a208f8a4817fc86" "052y0f9nwq6y6jh2gvr1pm8qdcqghyi3jj5svvrp5aqirlkwb7ri")
+      # * ConfigurationPolicyProviders
+      (githubPatch "1ee888aed9f9a6291570ce360bcdd2d06bcc68cb" "1bm34p3bsny44sk60j842ghhhx8qaibwpqnfnyndfj96f7nb2az0")
+      (githubPatch "76da73abaeede740fc97479c09c92a52972bc477" "03rkf514ddj9d32d3zfcnf96kzzdk6cwxvrqj8acyv93vp1hvckr")
       #(gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
     ] ++ optionals (versionRange "66" "67") [
-      (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8")
       (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
-      (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x")
       (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4")
+      # GCC 7 fixes
+      (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv")
+      (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj")
+      (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj")
+      (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
+      (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
+      (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
     ] ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch b/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch
new file mode 100644
index 00000000000..a9b70ac5086
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch
@@ -0,0 +1,89 @@
+--- a/cc/raster/playback_image_provider.cc
++++ b/cc/raster/playback_image_provider.cc
+@@ -20,7 +20,7 @@
+ PlaybackImageProvider::PlaybackImageProvider(
+     ImageDecodeCache* cache,
+     const gfx::ColorSpace& target_color_space,
+-    base::Optional<Settings> settings)
++    base::Optional<Settings>&& settings)
+     : cache_(cache),
+       target_color_space_(target_color_space),
+       settings_(std::move(settings)) {
+@@ -70,7 +70,10 @@
+ }
+ 
+ PlaybackImageProvider::Settings::Settings() = default;
+-PlaybackImageProvider::Settings::Settings(const Settings& other) = default;
++PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) =
++    default;
+ PlaybackImageProvider::Settings::~Settings() = default;
++PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=(
++    PlaybackImageProvider::Settings&&) = default;
+ 
+ }  // namespace cc
+--- a/cc/raster/playback_image_provider.h
++++ b/cc/raster/playback_image_provider.h
+@@ -20,8 +20,10 @@
+  public:
+   struct CC_EXPORT Settings {
+     Settings();
+-    Settings(const Settings& other);
++    Settings(const Settings&) = delete;
++    Settings(Settings&&);
+     ~Settings();
++    Settings& operator=(Settings&&);
+ 
+     // The set of image ids to skip during raster.
+     PaintImageIdFlatSet images_to_skip;
+@@ -34,7 +36,7 @@
+   // If no settings are provided, all images are skipped during rasterization.
+   PlaybackImageProvider(ImageDecodeCache* cache,
+                         const gfx::ColorSpace& target_color_space,
+-                        base::Optional<Settings> settings);
++                        base::Optional<Settings>&& settings);
+   ~PlaybackImageProvider() override;
+ 
+   PlaybackImageProvider(PlaybackImageProvider&& other);
+--- a/cc/raster/playback_image_provider_unittest.cc
++++ b/cc/raster/playback_image_provider_unittest.cc
+@@ -84,7 +84,8 @@ TEST(PlaybackImageProviderTest, SkipsSomeImages) {
+   settings.emplace();
+   settings->images_to_skip = {skip_image.stable_id()};
+
+-  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++                                 std::move(settings));
+   provider.BeginRaster();
+
+   SkIRect rect = SkIRect::MakeWH(10, 10);
+@@ -100,7 +101,8 @@ TEST(PlaybackImageProviderTest, RefAndUnrefDecode) {
+
+   base::Optional<PlaybackImageProvider::Settings> settings;
+   settings.emplace();
+-  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++                                 std::move(settings));
+   provider.BeginRaster();
+
+   {
+@@ -133,7 +135,8 @@ TEST(PlaybackImageProviderTest, AtRasterImages) {
+   settings.emplace();
+   settings->at_raster_images = {draw_image1, draw_image2};
+
+-  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++                                 std::move(settings));
+
+   EXPECT_EQ(cache.refed_image_count(), 0);
+   provider.BeginRaster();
+@@ -158,7 +161,8 @@ TEST(PlaybackImageProviderTest, SwapsGivenFrames) {
+   settings.emplace();
+   settings->image_to_current_frame_index = image_to_frame;
+
+-  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
++  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
++                                 std::move(settings));
+   provider.BeginRaster();
+
+   SkIRect rect = SkIRect::MakeWH(10, 10);
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
deleted file mode 100644
index cb978d58a06..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig	2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
- 
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
- 
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
-   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
--    return mailbox.name;
-+    return base::make_span(mailbox.name);
-   }
-   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
-   static base::span<const float> matrix(const cc::FilterOperation& operation) {
-     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
-       return base::span<const float>();
--    return operation.matrix();
-+    return base::make_span(operation.matrix());
-   }
- 
-   static base::span<const gfx::Rect> shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
-   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
-     const viz::TextureDrawQuad* quad =
-         viz::TextureDrawQuad::MaterialCast(&input);
--    return quad->vertex_opacity;
-+    return base::make_span(quad->vertex_opacity);
-   }
-
-   static bool y_flipped(const viz::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
-     }
-     default:
-       NOTREACHED();
--      return "";
-+      return WebString();
-   }
- }
- 
diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
deleted file mode 100644
index 9f187752ea6..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001
-From: Tomas Popela <tomas.popela@gmail.com>
-Date: Fri, 20 Oct 2017 14:06:42 +0200
-Subject: [PATCH] Fix the build of base/numerics with GCC
-
-Initialize the uninitialized variables where the build is failing.
-
-BUG=776705
-
-Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad
----
- base/numerics/checked_math_impl.h |  6 +++---
- base/numerics/clamped_math_impl.h | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h
-index 2926b37b5e..e083389ebf 100644
---- a/base/numerics/checked_math_impl.h
-+++ b/base/numerics/checked_math_impl.h
-@@ -67,7 +67,7 @@ struct CheckedAddOp<T,
-       return false;
-     }
- 
--    Promotion presult;
-+    Promotion presult = {};
-     bool is_valid = true;
-     if (IsIntegerArithmeticSafe<Promotion, T, U>::value) {
-       presult = static_cast<Promotion>(x) + static_cast<Promotion>(y);
-@@ -127,7 +127,7 @@ struct CheckedSubOp<T,
-       return false;
-     }
- 
--    Promotion presult;
-+    Promotion presult = {};
-     bool is_valid = true;
-     if (IsIntegerArithmeticSafe<Promotion, T, U>::value) {
-       presult = static_cast<Promotion>(x) - static_cast<Promotion>(y);
-@@ -183,7 +183,7 @@ struct CheckedMulOp<T,
-       return false;
-     }
- 
--    Promotion presult;
-+    Promotion presult = {};
-     bool is_valid = true;
-     if (CheckedMulFastOp<Promotion, Promotion>::is_supported) {
-       // The fast op may be available with the promoted type.
-diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h
-index 7b5e4346f2..303a7e945a 100644
---- a/base/numerics/clamped_math_impl.h
-+++ b/base/numerics/clamped_math_impl.h
-@@ -87,7 +87,7 @@ struct ClampedAddOp<T,
-                   "The saturation result cannot be determined from the "
-                   "provided types.");
-     const V saturated = CommonMaxOrMin<V>(IsValueNegative(y));
--    V result;
-+    V result = {};
-     return BASE_NUMERICS_LIKELY((CheckedAddOp<T, U>::Do(x, y, &result)))
-                ? result
-                : saturated;
-@@ -114,7 +114,7 @@ struct ClampedSubOp<T,
-                   "The saturation result cannot be determined from the "
-                   "provided types.");
-     const V saturated = CommonMaxOrMin<V>(!IsValueNegative(y));
--    V result;
-+    V result = {};
-     return BASE_NUMERICS_LIKELY((CheckedSubOp<T, U>::Do(x, y, &result)))
-                ? result
-                : saturated;
-@@ -136,7 +136,7 @@ struct ClampedMulOp<T,
-     if (ClampedMulFastOp<T, U>::is_supported)
-       return ClampedMulFastOp<T, U>::template Do<V>(x, y);
- 
--    V result;
-+    V result = {};
-     const V saturated =
-         CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y));
-     return BASE_NUMERICS_LIKELY((CheckedMulOp<T, U>::Do(x, y, &result)))
-@@ -156,7 +156,7 @@ struct ClampedDivOp<T,
-   using result_type = typename MaxExponentPromotion<T, U>::type;
-   template <typename V = result_type>
-   static constexpr V Do(T x, U y) {
--    V result;
-+    V result = {};
-     if (BASE_NUMERICS_LIKELY((CheckedDivOp<T, U>::Do(x, y, &result))))
-       return result;
-     // Saturation goes to max, min, or NaN (if x is zero).
-@@ -176,7 +176,7 @@ struct ClampedModOp<T,
-   using result_type = typename MaxExponentPromotion<T, U>::type;
-   template <typename V = result_type>
-   static constexpr V Do(T x, U y) {
--    V result;
-+    V result = {};
-     return BASE_NUMERICS_LIKELY((CheckedModOp<T, U>::Do(x, y, &result)))
-                ? result
-                : x;
--- 
-2.14.2
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
deleted file mode 100644
index 093598465c4..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: extensions/browser/api/networking_private/networking_private_linux.cc
-===================================================================
---- a/extensions/browser/api/networking_private/networking_private_linux.cc.orig	2016-05-05 03:01:50.000000000 +0200
-+++ b/extensions/browser/api/networking_private/networking_private_linux.cc	2016-05-10 16:16:42.431052917 +0200
-@@ -215,12 +215,14 @@ void NetworkingPrivateLinux::GetState(
-   std::unique_ptr<base::DictionaryValue> network_properties(
-       new base::DictionaryValue);
- 
-+  std::string* erp = error.get();
-+  base::DictionaryValue* npp = network_properties.get();
-   // Runs GetCachedNetworkProperties on |dbus_thread|.
-   dbus_thread_.task_runner()->PostTaskAndReply(
-       FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetCachedNetworkProperties,
-                             base::Unretained(this), guid,
--                            base::Unretained(network_properties.get()),
--                            base::Unretained(error.get())),
-+                            base::Unretained(npp),
-+                            base::Unretained(erp)),
-       base::Bind(&GetCachedNetworkPropertiesCallback, base::Passed(&error),
-                  base::Passed(&network_properties), success_callback,
-                  failure_callback));
-@@ -301,11 +303,12 @@ void NetworkingPrivateLinux::GetNetworks
- 
-   // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the
-   // results back to OnAccessPointsFound where the callback is fired.
-+  NetworkMap* nmp = network_map.get();
-   dbus_thread_.task_runner()->PostTaskAndReply(
-       FROM_HERE,
-       base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints,
-                  base::Unretained(this), configured_only, visible_only, limit,
--                 base::Unretained(network_map.get())),
-+                 base::Unretained(nmp)),
-       base::Bind(&NetworkingPrivateLinux::OnAccessPointsFound,
-                  base::Unretained(this), base::Passed(&network_map),
-                  success_callback, failure_callback));
-@@ -321,11 +324,12 @@ bool NetworkingPrivateLinux::GetNetworks
-   // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the
-   // results back to SendNetworkListChangedEvent to fire the event. No
-   // callbacks are used in this case.
-+  NetworkMap* nmp = network_map.get();
-   dbus_thread_.task_runner()->PostTaskAndReply(
-       FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints,
-                             base::Unretained(this), false /* configured_only */,
-                             false /* visible_only */, 0 /* limit */,
--                            base::Unretained(network_map.get())),
-+                            base::Unretained(nmp)),
-       base::Bind(&NetworkingPrivateLinux::OnAccessPointsFoundViaScan,
-                  base::Unretained(this), base::Passed(&network_map)));
- 
-@@ -506,11 +510,12 @@ void NetworkingPrivateLinux::StartConnec
- 
-   std::unique_ptr<std::string> error(new std::string);
- 
-+  std::string* erp = error.get();
-   // Runs ConnectToNetwork on |dbus_thread|.
-   dbus_thread_.task_runner()->PostTaskAndReply(
-       FROM_HERE,
-       base::Bind(&NetworkingPrivateLinux::ConnectToNetwork,
--                 base::Unretained(this), guid, base::Unretained(error.get())),
-+                 base::Unretained(this), guid, base::Unretained(erp)),
-       base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error),
-                  success_callback, failure_callback));
- }
-@@ -524,11 +529,12 @@ void NetworkingPrivateLinux::StartDiscon
- 
-   std::unique_ptr<std::string> error(new std::string);
- 
-+  std::string* erp = error.get();
-   // Runs DisconnectFromNetwork on |dbus_thread|.
-   dbus_thread_.task_runner()->PostTaskAndReply(
-       FROM_HERE,
-       base::Bind(&NetworkingPrivateLinux::DisconnectFromNetwork,
--                 base::Unretained(this), guid, base::Unretained(error.get())),
-+                 base::Unretained(this), guid, base::Unretained(erp)),
-       base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error),
-                  success_callback, failure_callback));
- }
diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
deleted file mode 100644
index 530493dcd0f..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi <tommi@webrtc.org>
-Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#20292}
----
- p2p/base/port.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc
-index a1b478d11..81aa0aadb 100644
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
- 
- #include "p2p/base/port.h"
- 
-+#include <math.h>
-+
- #include <algorithm>
- #include <vector>
- 
--- 
-2.15.0
-

From 514accad2eb3e79f736f2605dc53dc4fdcc8a6d6 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 9 Mar 2018 23:48:33 +0000
Subject: [PATCH 0652/2266] Add platforms attribute to umockdev

See #36707 to observe that the build fails. It depends on linux specific packages such as systemd.
---
 pkgs/development/libraries/umockdev/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index a0936310c42..ccf5652b315 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     description = "Mock hardware devices for creating unit tests";
     license = licenses.lgpl2;
     maintainers = [ maintainers.ndowens ];
+    platforms = with platforms; linux;
   };
 }

From b7cb6fac4aa02bdebf7f18a9962725cef141591d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 15:52:32 -0800
Subject: [PATCH 0653/2266] valum: 0.3.14 -> 0.3.15

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.3.15 with grep in /nix/store/7w47g1l0qg7bzc1rrmllxxinjyg7zg5c-valum-0.3.15
- found 0.3.15 in filename of file in /nix/store/7w47g1l0qg7bzc1rrmllxxinjyg7zg5c-valum-0.3.15
---
 pkgs/development/web/valum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 90f2a8dcfed..266217d94e2 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "valum-${version}";
-  version = "0.3.14";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "valum-framework";
     repo = "valum";
     rev = "v${version}";
-    sha256 = "1w1mipczcfmrrxg369wvrj3wvf76rqn8rrkxbq88aial1bi23kd3";
+    sha256 = "1wk23aq5lxsqns58s4g9jrwx6wrk7k9hq9rg8jcs42rxn2pckaxw";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];

From 0c15e1d1eed6cc4798a8913b4ef78b30987e74e4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 10 Mar 2018 01:48:55 +0100
Subject: [PATCH 0654/2266] altcoins.btc1: 1.14.5 -> 1.15.1

---
 pkgs/applications/altcoins/btc1.nix    | 4 ++--
 pkgs/applications/altcoins/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
index 8ade6fb5251..95e03ee6a21 100644
--- a/pkgs/applications/altcoins/btc1.nix
+++ b/pkgs/applications/altcoins/btc1.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "1.14.5";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz";
-    sha256 = "1az6bbblh3adgcs16r9cjz8jacg6sbwfpg8zzfzkbp9h9j85ass5";
+    sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 599103e7114..e6f10cea338 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -19,8 +19,8 @@ rec {
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; };
 
-  btc1 = callPackage ./btc1.nix { withGui = true; };
-  btc1d = callPackage ./btc1.nix { withGui = false; };
+  btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; };
+  btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; };
 
   cryptop = python3.pkgs.callPackage ./cryptop { };
 

From def8f8757cc38f79ec457d9db49d4c2eb3d736ca Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 17:09:50 -0800
Subject: [PATCH 0655/2266] w_scan: 20161022 -> 20170107

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan -h` got 0 exit code
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan --help` got 0 exit code
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan -V` and found version 20170107
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan -h` and found version 20170107
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan --help` and found version 20170107
- found 20170107 in filename of file in /nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107
---
 pkgs/applications/video/w_scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 59ba63b32ee..2bf74da3d0f 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "w_scan-${version}";
-  version = "20161022";
+  version = "20170107";
 
   src = fetchurl {
     url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
-    sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0";
+    sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
   };
 
   meta = {

From 133310eeec79a25f79edcf0dbf6b36a1ba4bdc4e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 17:25:57 -0800
Subject: [PATCH 0656/2266] wcslib: 5.15 -> 5.18

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.18 with grep in /nix/store/pr88acrgc8w11q3p8407w7v0kwd2asq8-wcslib-5.18
- found 5.18 in filename of file in /nix/store/pr88acrgc8w11q3p8407w7v0kwd2asq8-wcslib-5.18
---
 pkgs/development/libraries/wcslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 64c5293fac7..5dd79980680 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "5.15";
+  version = "5.18";
   name = "wcslib-${version}";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
-    sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb";
+    sha256 ="16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn";
   };
 
   prePatch = ''

From 00c2008beecdbe19fa6b6c95f3c86e9f65bff4f6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 10 Mar 2018 02:28:53 +0100
Subject: [PATCH 0657/2266] altcoins.freicoin: fix hash

---
 pkgs/applications/altcoins/freicoin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index a44dbbd62ce..b753e2d48c9 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "freicoin";
     repo = "freicoin";
     rev = "v${version}";
-    sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z";
+    sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h";
   };
 
   qmakeFlags = ["USE_UPNP=-"];

From 54572276ecfe0fc11f91b5ec0888fbe2de75da6b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 10 Mar 2018 02:34:39 +0100
Subject: [PATCH 0658/2266] altcoins.dogecoin: use boost165

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

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 599103e7114..35fb808c6ee 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -31,8 +31,8 @@ rec {
 
   dero = callPackage ./dero.nix { };
 
-  dogecoin  = callPackage ./dogecoin.nix { withGui = true; };
-  dogecoind = callPackage ./dogecoin.nix { withGui = false; };
+  dogecoin  = callPackage ./dogecoin.nix { boost = boost165; withGui = true; };
+  dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; };
 
   ethsign = callPackage ./ethsign { };
 

From f8922862b742760dbbce1e664a3e117a2d6419ac Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 17:43:42 -0800
Subject: [PATCH 0659/2266] winswitch: 0.12.16 -> 0.12.23

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_applet-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_applet-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_applet-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_client-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_client-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_server-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_server-wrapped --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_server-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_Xnest-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_Xnest-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_Xnest-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_session-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_session-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_session-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -V` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -v` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_applet -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_applet --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_applet help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_client -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_client --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_server --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_server --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_server --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_Xnest -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_Xnest --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_Xnest help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_session -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_session --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_session help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -V` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -v` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp help` and found version 0.12.23
- found 0.12.23 with grep in /nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23
---
 pkgs/tools/X11/winswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index 90159d82c39..cd9d6aecdef 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -5,11 +5,11 @@ let
   base = pythonPackages.buildPythonApplication rec {
     name = "winswitch-${version}";
     namePrefix = "";
-    version = "0.12.16";
+    version = "0.12.23";
 
     src = fetchurl {
       url = "http://winswitch.org/src/${name}.src.tar.bz2";
-      sha256 = "0ix122d7rgzdkk70f2q3sd7a4pvyaqsyxkw93pc4zkcg1xh9z3y8";
+      sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9";
     };
 
     propagatedBuildInputs = with pythonPackages; [

From 3a40b899cf5163fbe95f214a64f4a09cb27fe65f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 09:49:45 -0800
Subject: [PATCH 0660/2266] qpdf: 7.1.1 -> 8.0.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0/bin/fix-qdf --version` and found version 8.0.0
- ran `/nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0/bin/qpdf --help` got 0 exit code
- ran `/nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0/bin/qpdf --version` and found version 8.0.0
- found 8.0.0 with grep in /nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0
- found 8.0.0 in filename of file in /nix/store/788zbmljyhaj8y93k7q5lqpah0c9pcz0-qpdf-8.0.0
---
 pkgs/development/libraries/qpdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 42c4b028aa8..7f6c47a9a7f 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libjpeg, zlib, perl }:
 
-let version = "7.1.1";
+let version = "8.0.0";
 in
 stdenv.mkDerivation rec {
   name = "qpdf-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "1ypjxm74dhn9c4mj027zzkh0z4kpw9xiqwh3pjmmghm502hby3ca";
+    sha256 = "01a1d5wyrj1m35d68yj0cyqfjyrwhxq2yqwaw5an1d1p4aaid8gz";
   };
 
   nativeBuildInputs = [ perl ];

From 14464b1dc5aa480e030ef8ba25da1899160e81fb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 15:36:50 -0800
Subject: [PATCH 0661/2266] uwsgi: 2.0.16 -> 2.0.17

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17/bin/uwsgi -h` got 0 exit code
- ran `/nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17/bin/uwsgi --help` got 0 exit code
- ran `/nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17/bin/uwsgi --version` and found version 2.0.17
- ran `/nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17/bin/uwsgi -h` and found version 2.0.17
- ran `/nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17/bin/uwsgi --help` and found version 2.0.17
- found 2.0.17 with grep in /nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17
- found 2.0.17 in filename of file in /nix/store/22q44dlwa34xal0mggf9vqy1clsvad65-uwsgi-2.0.17
---
 pkgs/servers/uwsgi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index b420c673850..bb3f7985533 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -49,11 +49,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uwsgi-${version}";
-  version = "2.0.16";
+  version = "2.0.17";
 
   src = fetchurl {
     url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "1x61vipgzhzb6flbbgl0hq96j9d330gh0kmwv8pwh6n57j7z84d9";
+    sha256 = "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];

From da6aefba6a6d70b4ae415cb6c957c5130caf4e82 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 18:02:00 -0800
Subject: [PATCH 0662/2266] wxSVG: 1.5.11 -> 1.5.13

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.5.13 with grep in /nix/store/hcf1ibw1hvrwic1zagy3cvi1fc73rfgk-wxSVG-1.5.13
- found 1.5.13 in filename of file in /nix/store/hcf1ibw1hvrwic1zagy3cvi1fc73rfgk-wxSVG-1.5.13
---
 pkgs/development/libraries/wxSVG/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index b991590924d..82b72a0fc7b 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
   name = "wxSVG-${version}";
   srcName = "wxsvg-${version}";
-  version = "1.5.11";
+  version = "1.5.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
-    sha256 = "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x";
+    sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 5630467283fd8c1c6c74b098a6c556dc117bc458 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 18:35:05 -0800
Subject: [PATCH 0663/2266] xfe: 1.37 -> 1.42

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfe -h` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfe --help` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfe -v` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfe --version` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfp -h` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfp --help` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfp -v` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfp --version` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfw -h` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfw --help` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfw -v` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfw --version` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfi -h` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfi --help` got 0 exit code
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfi -v` and found version 1.42
- ran `/nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42/bin/xfi --version` and found version 1.42
- found 1.42 with grep in /nix/store/b2qafj27yc2v401kgykcwvqy0gg3jz82-xfe-1.42
---
 pkgs/applications/misc/xfe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index 78e1d15481b..444ab802673 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "xfe-1.37";
+  name = "xfe-1.42";
 
   src = fetchurl {
     url = "mirror://sourceforge/xfe/${name}.tar.gz";
-    sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
+    sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 028e67abced1a1609fa336c7e5489ed7058909f1 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Sat, 10 Mar 2018 04:01:49 +0100
Subject: [PATCH 0664/2266] rPackages.mongolite: fix build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 62382a1f72d..cc0fdfc6fd9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -924,6 +924,13 @@ let
       NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION";
     });
 
+    mongolite = old.mongolite.overrideDerivation (attrs: {
+      preConfigure = ''
+        patchShebangs configure
+        '';
+      PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include -I${pkgs.cyrus_sasl.dev}/include -I${pkgs.zlib.dev}/include";
+      PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
+    });
   };
 in
   self

From 72742bae2cc8033fc0f604bcfd6560ceb0343d3c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 19:04:01 -0800
Subject: [PATCH 0665/2266] xpra: 2.1.3 -> 2.2.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra -h` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra --help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra --version` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra -h` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra --help` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/udev_product_version -h` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/udev_product_version --help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/udev_product_version help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra_launcher-wrapped -h` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra_launcher-wrapped --help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra_launcher-wrapped --version` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra_launcher-wrapped -h` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra_launcher-wrapped --help` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra_launcher -h` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra_launcher --help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra_launcher --version` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra_launcher -h` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/xpra_launcher --help` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/..xpra-wrapped-wrapped -h` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/..xpra-wrapped-wrapped --help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/..xpra-wrapped-wrapped --version` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/..xpra-wrapped-wrapped -h` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/..xpra-wrapped-wrapped --help` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra-wrapped -h` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra-wrapped --help` got 0 exit code
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra-wrapped --version` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra-wrapped -h` and found version 2.2.4
- ran `/nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4/bin/.xpra-wrapped --help` and found version 2.2.4
- found 2.2.4 with grep in /nix/store/sdb561gabzb04az1f9wq6190prqzv618-xpra-2.2.4
---
 pkgs/tools/X11/xpra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index a3aa7a0aa23..805e5c03816 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.1.3";
+  version = "2.2.4";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
+    sha256 = "0v8yflvisk94bfj0zg4ggdfwrig0f3ss9kjnws3zflsr33cb2hxy";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2cb01fb4ea5e6ccdc09bd048eecc73a5595ac3e3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 19:19:22 -0800
Subject: [PATCH 0666/2266] xvkbd: 3.8 -> 3.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.9 with grep in /nix/store/254qz2nmlqkyzn1hv598i5y9spx50wji-xvkbd-3.9
- found 3.9 in filename of file in /nix/store/254qz2nmlqkyzn1hv598i5y9spx50wji-xvkbd-3.9
---
 pkgs/tools/X11/xvkbd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 399531f71eb..7221555ed33 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
-  version = "3.8";
+  version = "3.9";
   src = fetchurl {
-    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz";
-    sha256 = "16r5wbb5za02ha0ilwswx37lrwa6j40px8c9gkpnmmpb5r7kv91c";
+    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
+    sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];

From 1aada58c2bd571718f8d2c20111516deeb1eac0d Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Sat, 10 Mar 2018 06:37:17 +0300
Subject: [PATCH 0667/2266] ghc841 | either:  pin to v5

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9cbdc646a26..fc0ff22ab7d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -60,6 +60,11 @@ self: super: {
     doCheck         = false;
   });
 
+  ## Needs bump to a versioned attribute
+  ## Setup: Encountered missing dependencies:
+  ## free >=4.9 && <5
+  either = super.either_5;
+
   ## Needs bump to a versioned attribute
   ##     • Could not deduce (Semigroup (IterT m a))
   ##         arising from the superclasses of an instance declaration

From acf77c38885b8af96ef0748414c9ffff003e9f06 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 19:41:31 -0800
Subject: [PATCH 0668/2266] yarp: 2.3.68 -> 2.3.70.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpidl_rosmsg -h` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpidl_rosmsg --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpidl_rosmsg help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpserver --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp version` and found version 2.3.70.2
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp-config --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp-config --version` and found version 2.3.70.2
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdev -h` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdev --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdev help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpmanager-console --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdatadumper --help` got 0 exit code
- found 2.3.70.2 with grep in /nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2
- found 2.3.70.2 in filename of file in /nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2
---
 pkgs/applications/science/robotics/yarp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 76b05c8a3a7..98576cfd091 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "yarp-${version}";
-  version = "2.3.68";
+  version = "2.3.70.2";
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "yarp";
     rev = "v${version}";
-    sha256 = "1ksz2kv4v14fqgz3fsvvmdk2sikhnxr11jhhf7c2547x6jbzhda6";
+    sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
   };
 
   buildInputs = [ cmake ace ];

From a4fedaa48121e03c5a2b23cd3436ec3cedc75de3 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Tue, 6 Mar 2018 03:56:38 +0300
Subject: [PATCH 0669/2266] ghc841 | turtle:  GHC 8.4 needs a fresh Turtle

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index fc0ff22ab7d..fb7ae612b7f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -130,6 +130,11 @@ self: super: {
     doCheck         = false;
   });
 
+  ## Needs bump to a versioned attribute
+  ## Setup: Encountered missing dependencies:
+  ## doctest >=0.7 && <0.14
+  turtle = super.turtle_1_5_4;
+
   ## Needs bump to a versioned attribute
   ##     Module ‘Data.Semigroup’ does not export ‘Monoid(..)’
   ##    |

From b29348257ae85bd9875b04d3cb2393a26ec4894d Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 09:12:12 +0100
Subject: [PATCH 0670/2266] proboscis: move to own file and fix homepage

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

diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix
new file mode 100644
index 00000000000..f2373e4702f
--- /dev/null
+++ b/pkgs/development/python-modules/proboscis/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  pname = "proboscis";
+  version = "1.2.6.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238";
+  };
+
+  propagatedBuildInputs = [ nose ];
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
+    homepage = https://pypi.python.org/pypi/proboscis;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..9c80f91421a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1623,23 +1623,7 @@ in {
 
   rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; };
 
-  proboscis = buildPythonPackage rec {
-    name = "proboscis-1.2.6.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/proboscis/proboscis-1.2.6.0.tar.gz";
-      sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238";
-    };
-
-    propagatedBuildInputs = with self; [ nose ];
-    doCheck = false;
-
-    meta = {
-      description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
-      homepage = https://github.com/rackspace/python-proboscis;
-      license = licenses.asl20;
-    };
-  };
+  proboscis = callPackage ../development/python-modules/proboscis {};
 
   pyechonest = self.buildPythonPackage rec {
     name = "pyechonest-8.0.2";

From 52383dbb6becba0f0540809aaf5c5acad71350bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 19:49:41 +0100
Subject: [PATCH 0671/2266] hackage2nix: always use latest version of
 jailbreak-cabal

---
 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 179578a0e64..37233781c7a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1337,7 +1337,6 @@ default-package-overrides:
   - ixset-typed ==0.3.1.1
   - ix-shapable ==0.1.0
   - jack ==0.7.1.3
-  - jailbreak-cabal ==1.3.2
   - javascript-extras ==0.3.2.0
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2

From 3134f6bf97f61bd2dbc41892a8e536dcd2f3efa0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 21:00:09 +0100
Subject: [PATCH 0672/2266] hackage2nix: disable failing Hydra builds

---
 .../configuration-hackage2nix.yaml            | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 37233781c7a..7e12bb03e8f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3125,6 +3125,7 @@ dont-distribute-packages:
   assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-combinators:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3141,6 +3142,7 @@ dont-distribute-packages:
   atp-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-format:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-pkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ats-storable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3502,6 +3504,7 @@ dont-distribute-packages:
   call:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   camfort:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  canon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3643,6 +3646,7 @@ dont-distribute-packages:
   clash-multisignal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Clash-Royale-Hack-Cheats:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-systemverilog:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-verilog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3729,6 +3733,7 @@ dont-distribute-packages:
   colorless-http-client:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   colorless-scotty:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   colorless:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3799,6 +3804,7 @@ dont-distribute-packages:
   conduit-zstd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  confide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3981,6 +3987,7 @@ dont-distribute-packages:
   data-accessor-monads-fd:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-tf:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-basic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-concurrent-queue:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-construction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4209,6 +4216,7 @@ dont-distribute-packages:
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-driver-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   docvim:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4389,6 +4397,8 @@ dont-distribute-packages:
   etc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eternity-timestamped:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eternity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4492,6 +4502,7 @@ dont-distribute-packages:
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fcache:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fcd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fcg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fckeditor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fclabels-monadlib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   FComp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5302,6 +5313,7 @@ dont-distribute-packages:
   haskus-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasmin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-backend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-class:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5671,6 +5683,7 @@ dont-distribute-packages:
   hPushover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpygments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6047,6 +6060,8 @@ dont-distribute-packages:
   introduction:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-hlist:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  invertible-hxt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  invertible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6179,7 +6194,9 @@ dont-distribute-packages:
   JunkDB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   JuPyTer-notebook:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   jupyter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm-batching:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm-streaming:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-glut:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6295,6 +6312,7 @@ dont-distribute-packages:
   lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-ats:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-bash:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-boogie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6606,6 +6624,8 @@ dont-distribute-packages:
   manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   map-exts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mapping:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6736,6 +6756,7 @@ dont-distribute-packages:
   mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Mobile-Legends-Hack-Cheats:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6909,6 +6930,7 @@ dont-distribute-packages:
   mystem:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  n-ary-functor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nakadi-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   namecoin-update:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7094,6 +7116,7 @@ dont-distribute-packages:
   ois-input-manager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   old-version:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   olwrapper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  om-elm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7150,6 +7173,7 @@ dont-distribute-packages:
   order-statistic-tree:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   orders:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ordinary:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ordrea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   organize-imports:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7165,6 +7189,7 @@ dont-distribute-packages:
   oso2pdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   otp-authenticator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  overload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   overloaded-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7172,6 +7197,7 @@ dont-distribute-packages:
   package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-dawg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-multikey-map:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  packed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   packunused:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7645,6 +7671,7 @@ dont-distribute-packages:
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-string:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7673,6 +7700,7 @@ dont-distribute-packages:
   raz:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   razom-text-util:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7708,6 +7736,7 @@ dont-distribute-packages:
   recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  redland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reenact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8007,6 +8036,7 @@ dont-distribute-packages:
   secrm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SelectSequencesFromMSA:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8067,6 +8097,7 @@ dont-distribute-packages:
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-swagger:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8147,6 +8178,7 @@ dont-distribute-packages:
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-download:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-effects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8209,6 +8241,7 @@ dont-distribute-packages:
   smartconstructor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   smartGroup:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   smartword:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smcdel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   smerdyakov:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   smiles:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8410,6 +8443,7 @@ dont-distribute-packages:
   stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-tensor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  static-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-fusion:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-hypergeometric-genvar:             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8456,6 +8490,7 @@ dont-distribute-packages:
   streaming-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-pcap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-postgresql-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   strelka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9071,6 +9106,7 @@ dont-distribute-packages:
   vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vulkan-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vulkan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wacom-daemon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   waddle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9129,6 +9165,7 @@ dont-distribute-packages:
   web-css:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]

From 8aa0e7b950aba1e069d7cb4349727d37ba1a0afa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 14:26:26 +0100
Subject: [PATCH 0673/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9-3-gae0d2f7 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/42026bde6277c50c2759c2223bdf3f4471be3ba2.
---
 .../haskell-modules/hackage-packages.nix      | 1114 ++++++++++++++---
 1 file changed, 951 insertions(+), 163 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5a9c0784fc..ee1132e952d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2817,6 +2817,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ChasingBottoms_1_3_1_4" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
+     , syb
+     }:
+     mkDerivation {
+       pname = "ChasingBottoms";
+       version = "1.3.1.4";
+       sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633";
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
+       description = "For testing partial and infinite values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "CheatSheet" = callPackage
     ({ mkDerivation, base, containers, directory }:
      mkDerivation {
@@ -2908,6 +2927,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ClassLaws" = callPackage
@@ -6088,17 +6108,18 @@ self: {
      }) {};
 
   "GLFW" = callPackage
-    ({ mkDerivation, base, libGL, libX11, OpenGL }:
+    ({ mkDerivation, base, libGL, libX11, libXext, libXfixes, OpenGL }:
      mkDerivation {
        pname = "GLFW";
        version = "0.5.2.5";
        sha256 = "029sw2sykr6plffkrmigv5mj2aklllmgi021is5ybsbqv0mxgh9p";
        libraryHaskellDepends = [ base OpenGL ];
-       librarySystemDepends = [ libGL libX11 ];
+       librarySystemDepends = [ libGL libX11 libXext libXfixes ];
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
 
   "GLFW-OGL" = callPackage
     ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }:
@@ -8790,6 +8811,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HTTP_4000_3_10" = 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.10";
+       sha256 = "12cy8yn06cm9xqcnvvk0s0yh6w67r6bxs8wn37q97y0b6fjiwdfj";
+       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 {
@@ -12615,6 +12660,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Modulo" = callPackage
@@ -14216,6 +14262,7 @@ self: {
        homepage = "https://github.com/MarisaKirisame/Ordinary#readme";
        description = "A Programming Language in Construction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PArrows" = callPackage
@@ -16685,6 +16732,7 @@ self: {
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Semantique" = callPackage
@@ -20621,6 +20669,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "accelerate-fourier_1_0_0_4" = callPackage
+    ({ mkDerivation, accelerate, accelerate-arithmetic
+     , accelerate-llvm-native, accelerate-utility, base, containers
+     , criterion, QuickCheck, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "accelerate-fourier";
+       version = "1.0.0.4";
+       sha256 = "1263ximbciszb6cij232vxsxfj5rj7n77l88fd7vh6ayx7rrr45m";
+       libraryHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-utility base containers
+         QuickCheck transformers utility-ht
+       ];
+       testHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-utility base QuickCheck
+         utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-llvm-native
+         accelerate-utility base criterion utility-ht
+       ];
+       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;
+     }) {};
+
   "accelerate-fourier-benchmark" = callPackage
     ({ mkDerivation, accelerate, accelerate-cuda, accelerate-cufft
      , accelerate-fftw, accelerate-fourier, base, criterion
@@ -22083,6 +22158,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.7.1";
        sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
+       revision = "1";
+       editedCabalFile = "0zm4i3n8n2xj53ymb8cd1d7bnsgna5064198ackj1xjh8zsaarz6";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-iso8601 base base-compat bytestring
          containers exceptions hashable scientific tagged text time
@@ -26692,8 +26769,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
-       revision = "3";
-       editedCabalFile = "046w5nybk8fyhicw5wy7qchbx9k4sib189afj2gysrsblj0ki864";
+       revision = "4";
+       editedCabalFile = "0yp5wihvl22vfcr0x22xdbvrk79hcahx1kyfpwpvv0jkahc5c03q";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -29188,6 +29265,7 @@ self: {
        homepage = "https://github.com/serokell/async-combinators";
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-dejafu" = callPackage
@@ -29855,6 +29933,7 @@ self: {
        homepage = "https://github.com//ats-generic#readme";
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attempt" = callPackage
@@ -32510,6 +32589,8 @@ self: {
        pname = "base64-bytestring-type";
        version = "1";
        sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl";
+       revision = "1";
+       editedCabalFile = "06glza5pqw1s3xpk8va36q1b1bfcirkkrcq9pfd8x12lhjjnsxxr";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring binary bytestring cereal
          deepseq hashable QuickCheck text
@@ -34147,8 +34228,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.8.0";
        sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi";
-       revision = "1";
-       editedCabalFile = "1zgp08sikp71k9llcplkdrfhh2gn43gk7hx81nslixl5s91a1j9q";
+       revision = "2";
+       editedCabalFile = "1kvrp3dfqx49lkvjvglv18r7yzb165wisg953yih9sgksm02pxf5";
        libraryHaskellDepends = [
          aeson base binary case-insensitive hashable scientific tagged text
          text-binary time unordered-containers vector
@@ -39609,8 +39690,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-encodings";
-       version = "0.1.0.0";
-       sha256 = "070n1203shbfkimkrxr5xs5znpljbb61v7npwp9lgfpj4h8gyaq7";
+       version = "0.1.0.1";
+       sha256 = "09lx8d92dhd4gicz8pbpj19k2iaig1yl4lksqpxiqgxzybwqn0rc";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring hedgehog ];
        benchmarkHaskellDepends = [ base bytestring gauge text ];
@@ -41117,8 +41198,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.8.2";
-       sha256 = "0m3k8prp13n6n74ghy2m05bj2c940nscjnv6h8g45ygxid8jvxc8";
+       version = "2.9";
+       sha256 = "1n6r27i4njiidij228r9fdb45pmsiidan6pxs2is2vsl8k9d65c7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41826,6 +41907,7 @@ self: {
        homepage = "https://github.com/grandpascorpion/canon";
        description = "Massive Number Arithmetic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -45553,6 +45635,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "clang-compilation-database_0_1_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text }:
+     mkDerivation {
+       pname = "clang-compilation-database";
+       version = "0.1.0.1";
+       sha256 = "1a0wvk82k65b5lscsvg5p41shpz98rahq44d5vyf8wclfshh2ihi";
+       libraryHaskellDepends = [ aeson base bytestring text ];
+       testHaskellDepends = [ aeson base bytestring ];
+       homepage = "https://github.com/lambdageek/clang-compilation-database";
+       description = "JSON Compilation Database Format encoding and decoding";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clang-pure" = callPackage
     ({ mkDerivation, base, bytestring, clang, containers, contravariant
      , inline-c, microlens, microlens-contra, singletons, stm
@@ -48226,6 +48322,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/colour-space";
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coltrane" = callPackage
@@ -50564,6 +50661,7 @@ self: {
        homepage = "https://github.com/amilkov3/confide";
        description = "derive typeclass instances for decoding types from HOCON conf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-ini" = callPackage
@@ -53457,6 +53555,8 @@ self: {
        pname = "critbit";
        version = "0.2.0.0";
        sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82";
+       revision = "1";
+       editedCabalFile = "0sfhyrdhnm3803v0yg4ch976nn19hpgwwrlmfdnxnc9agn8m1ja1";
        libraryHaskellDepends = [
          array base bytestring deepseq text vector
        ];
@@ -54294,6 +54394,8 @@ self: {
        pname = "cryptohash-sha256";
        version = "0.11.101.0";
        sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj";
+       revision = "1";
+       editedCabalFile = "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -55012,8 +55114,8 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.9.0.2";
-       sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc";
+       version = "0.9.0.1";
+       sha256 = "1ldn1jd12kisx6dgz5q50l6hx5aqakwj9vq2fbnx21ri309vlyq8";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -56286,6 +56388,7 @@ self: {
        homepage = "https://gitlab.com/haskell-hr/basic";
        description = "A database library with a focus on ease of use, type safety and useful error messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-binary-ieee754" = callPackage
@@ -57607,6 +57710,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-serializer_0_3_4" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, data-endian
+     , parsers, semigroups, split, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "data-serializer";
+       version = "0.3.4";
+       sha256 = "1ijy8l5lxmm8wpzx4h2vh9q21zz66xgh979s32aa4b16l9m1b4z7";
+       libraryHaskellDepends = [
+         base binary bytestring cereal data-endian parsers semigroups split
+       ];
+       testHaskellDepends = [
+         base binary bytestring cereal tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/mvv/data-serializer";
+       description = "Common API for serialization libraries";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-size" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, text }:
      mkDerivation {
@@ -60439,12 +60562,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_10_0" = callPackage
+  "dhall_1_11_0" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
      , base16-bytestring, bytestring, case-insensitive, containers
-     , contravariant, cryptohash, deepseq, directory, exceptions
+     , contravariant, cryptonite, deepseq, directory, exceptions
      , filepath, haskeline, http-client, http-client-tls
-     , insert-ordered-containers, lens-family-core, mtl
+     , insert-ordered-containers, lens-family-core, memory, mtl
      , optparse-generic, parsers, prettyprinter
      , prettyprinter-ansi-terminal, repline, scientific, tasty
      , tasty-hunit, text, text-format, transformers, trifecta
@@ -60452,17 +60575,17 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.10.0";
-       sha256 = "1z9z9f0qw0p7nywpgamkgfz3h3ikhkshrphsviz94vwhnrflq1wf";
+       version = "1.11.0";
+       sha256 = "1vfraj97vj6jc9ysz3svibadhwrd7q0p3wjlvp6vaackiprfbinf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring case-insensitive
-         containers contravariant cryptohash directory exceptions filepath
+         containers contravariant cryptonite directory exceptions filepath
          http-client http-client-tls insert-ordered-containers
-         lens-family-core parsers prettyprinter prettyprinter-ansi-terminal
-         scientific text text-format transformers trifecta
-         unordered-containers vector
+         lens-family-core memory parsers prettyprinter
+         prettyprinter-ansi-terminal scientific text text-format
+         transformers trifecta unordered-containers vector
        ];
        executableHaskellDepends = [
          ansi-terminal base haskeline mtl optparse-generic prettyprinter
@@ -60499,20 +60622,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash_1_0_9" = callPackage
+  "dhall-bash_1_0_10" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , insert-ordered-containers, neat-interpolation, optparse-generic
-     , shell-escape, text, text-format, trifecta, vector
+     , shell-escape, text, text-format, trifecta
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.9";
-       sha256 = "1knnljzh7gccma1xbj3ahrj6cyqfp7lisiv51nnwpxizb7vdfnx0";
+       version = "1.0.10";
+       sha256 = "0phi5z7rmbxjj83mps0lcpmcv320k8mrfpigls46smv7srmhsla1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers dhall insert-ordered-containers
-         neat-interpolation shell-escape text text-format vector
+         neat-interpolation shell-escape text text-format
        ];
        executableHaskellDepends = [
          base bytestring dhall optparse-generic text trifecta
@@ -60560,17 +60683,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_0_11" = callPackage
+  "dhall-json_1_0_12" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, trifecta, vector, yaml
+     , optparse-generic, text, trifecta, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.11";
-       sha256 = "14jkf3j9iwnhkyz4wl6lvvci8ad21s20rk9kr7hr3fcmzv39alwf";
+       version = "1.0.12";
+       sha256 = "174ssff7fcxgr13w8mcls7w4fy5xzywh8qb55zj9qragj4bkyjab";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ aeson base dhall text vector ];
+       libraryHaskellDepends = [ aeson base dhall text ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring dhall optparse-generic text
          trifecta yaml
@@ -60602,20 +60725,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-nix_1_1_0" = callPackage
+  "dhall-nix_1_1_1" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
      , insert-ordered-containers, neat-interpolation, optparse-generic
-     , scientific, text, text-format, trifecta, vector
+     , scientific, text, text-format, trifecta
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.0";
-       sha256 = "0g2wyr79krbfdv1z6c8w78kz3w1y0jbx8778qgxbjp70inkwq5gl";
+       version = "1.1.1";
+       sha256 = "01cdz8kjmm0ncdyq616mg6hjq7cwq5648cnrp6ggps5zc1d71176";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers data-fix dhall hnix insert-ordered-containers
-         neat-interpolation scientific text text-format vector
+         neat-interpolation scientific text text-format
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text trifecta
@@ -60638,12 +60761,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-text_1_0_6" = callPackage
+  "dhall-text_1_0_7" = callPackage
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.6";
-       sha256 = "0r08x1s75qsfmn6gnfm0ikh80cq3dbgj7bp4jb8f5pz7p2azh72v";
+       version = "1.0.7";
+       sha256 = "11jp5yz11f701phzz74zf3spqhgmrdiq8ldbi96xmfjqhwnc9kmj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -63261,18 +63384,17 @@ self: {
 
   "distribution-nixpkgs" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , deepseq, doctest, hspec, language-nix, lens, pretty, process
-     , split
+     , deepseq, hspec, language-nix, lens, pretty, process, split
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.1";
-       sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx";
+       version = "1.1.1";
+       sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
          pretty process split
        ];
-       testHaskellDepends = [ base deepseq doctest hspec lens ];
+       testHaskellDepends = [ base deepseq hspec lens ];
        homepage = "https://github.com/peti/distribution-nixpkgs#readme";
        description = "Types and functions to manipulate the Nixpkgs distribution";
        license = stdenv.lib.licenses.bsd3;
@@ -64053,6 +64175,7 @@ self: {
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -68818,16 +68941,16 @@ self: {
      }) {};
 
   "equational-reasoning" = callPackage
-    ({ mkDerivation, base, containers, singletons, template-haskell
-     , th-desugar, th-extras, void
+    ({ mkDerivation, base, containers, semigroups, singletons
+     , template-haskell, th-desugar, th-extras, void
      }:
      mkDerivation {
        pname = "equational-reasoning";
-       version = "0.5.0.0";
-       sha256 = "0qskw6dhnr6x7zpfaj246gyiml6w3196ci08i98cl8n2xkyn6n4c";
+       version = "0.5.1.0";
+       sha256 = "11203rdw4q9s5ramhmr2hdimgwin3zwjas8csxqxxldkv3x9a05l";
        libraryHaskellDepends = [
-         base containers singletons template-haskell th-desugar th-extras
-         void
+         base containers semigroups singletons template-haskell th-desugar
+         th-extras void
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
@@ -69410,8 +69533,8 @@ self: {
      }:
      mkDerivation {
        pname = "eternity";
-       version = "0.1";
-       sha256 = "04pcfnr1vl1s85gi2bqqca3frwjljw3307mw2psh8aa9h9qrf21b";
+       version = "0.1.1";
+       sha256 = "0vl5vyysshbrb4vcf4r85w0n46vlfgpspj6nk7jl054099vsv58f";
        libraryHaskellDepends = [
          attoparsec base cereal directory foldl potoki potoki-cereal text
        ];
@@ -69422,6 +69545,7 @@ self: {
        homepage = "https://github.com/metrix-ai/eternity";
        description = "Native event-sourcing database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eternity-timestamped" = callPackage
@@ -69430,8 +69554,8 @@ self: {
      }:
      mkDerivation {
        pname = "eternity-timestamped";
-       version = "0.2.2";
-       sha256 = "0lijphsgfjgpqxg5qfy50fds8vpjd9yywzlz5yqmi1q8q5yyh02f";
+       version = "0.2.3";
+       sha256 = "1c7qil02diisnpv5vihh76l32l4c912s806z8p7p1jhv4wb13f8z";
        libraryHaskellDepends = [
          attoparsec base cereal directory eternity foldl generic-random
          hashable potoki QuickCheck text time
@@ -69439,6 +69563,7 @@ self: {
        homepage = "https://github.com/metrix-ai/eternity-timestamped";
        description = "Automatic timestamping for Eternity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ether" = callPackage
@@ -72154,28 +72279,29 @@ self: {
      }) {};
 
   "fay" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , data-default, data-lens-light, directory, filepath, ghc-paths
-     , haskell-src-exts, language-ecmascript, mtl, mtl-compat
-     , optparse-applicative, process, safe, sourcemap, split, spoon, syb
-     , text, time, transformers, transformers-compat
+    ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal
+     , containers, data-default, data-lens-light, directory, filepath
+     , ghc-paths, haskell-src-exts, language-ecmascript, mtl, mtl-compat
+     , optparse-applicative, process, safe, shakespeare, sourcemap
+     , split, spoon, syb, text, time, transformers, transformers-compat
      , traverse-with-class, uniplate, unordered-containers, utf8-string
      , vector
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.2.0";
-       sha256 = "1fhdznpqyrgk2m239qdq6zxsdhx3qhciq8fi2ka7s6l7h9z277dw";
+       version = "0.24.0.0";
+       sha256 = "1my71a3cmd637ch5jwsdpyvfx6vsi2vnvshbrwmcx9ya1xm6x7z2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          aeson base base-compat bytestring containers data-default
          data-lens-light directory filepath ghc-paths haskell-src-exts
-         language-ecmascript mtl mtl-compat process safe sourcemap split
-         spoon syb text time transformers transformers-compat
-         traverse-with-class uniplate unordered-containers utf8-string
-         vector
+         language-ecmascript mtl mtl-compat process safe shakespeare
+         sourcemap split spoon syb text time transformers
+         transformers-compat traverse-with-class uniplate
+         unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        homepage = "https://github.com/faylang/fay/wiki";
@@ -72188,8 +72314,8 @@ self: {
     ({ mkDerivation, base, fay }:
      mkDerivation {
        pname = "fay-base";
-       version = "0.21.0.0";
-       sha256 = "1sj6baw63xzv6hcqmka29hvack00fal3zlp5b97qca56lbh7yhbf";
+       version = "0.21.1.0";
+       sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
@@ -72499,6 +72625,7 @@ self: {
        isExecutable = true;
        description = "TBA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fckeditor" = callPackage
@@ -72522,6 +72649,8 @@ self: {
        pname = "fclabels";
        version = "2.0.3.3";
        sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
+       revision = "1";
+       editedCabalFile = "0fs17vv85ybl3ws8k25sg758vq49l19vhn4asm8r6q5j9xic2kvl";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -80774,14 +80903,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot_8_2_2" = callPackage
+  "ghc-boot_8_4_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.2.2";
-       sha256 = "0fwpfsdx584mcvavj1m961rnaryif9a0yibhlw0b2i59g3ca8f6g";
+       version = "8.4.1";
+       sha256 = "0abgzvqra66hi61bn901dlk0r0n4s2fg6y7d8w2k2a6w437vgzdd";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -80790,12 +80919,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_2_2" = callPackage
+  "ghc-boot-th_8_4_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.2.2";
-       sha256 = "0pdgimqqn1w04qw504bgcji74wj5wmxpwgj5w3wdrid47sr2d3kc";
+       version = "8.4.1";
+       sha256 = "0l9fv1sp4dbq1ssw0l55riw9zpcii8fz75i0yj0vlihccf10lbj9";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
@@ -81693,15 +81822,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_2_2" = callPackage
+  "ghci_8_4_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
      , transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.2.2";
-       sha256 = "0j6aq2scjv0fpr5b60ac46r1n2hrcgbkrhv31yfnallwlwyqz5zn";
+       version = "8.4.1";
+       sha256 = "0jlnzkwj4xxs57c0zi3rcy96rksqakx65a7m8xq04055ip388sws";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
          ghc-boot-th template-haskell transformers unix
@@ -82363,7 +82492,7 @@ self: {
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -82857,7 +82986,7 @@ self: {
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libsecret;};
+     }) {inherit (pkgs.gnome3) libsecret;};
 
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -83911,8 +84040,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhooks";
-       version = "0.9.0";
-       sha256 = "1gzks7l39il0g9maj2hkfwpz8rnrnmc05fhcsr27a6c08962gn0f";
+       version = "0.9.1";
+       sha256 = "1h4wqix0rgsq7n3dv3nraqa3sbf5hgavq5k9dymfnw68qz5ii68b";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite deepseq
          deepseq-generics memory text time vector
@@ -87073,8 +87202,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-server-api";
-       version = "0.1.0.0";
-       sha256 = "1pw7bmdq7c44zjpz3wz8x3iz05dlgs004mhbyxfmsfp8jaiqh7ap";
+       version = "0.1.0.1";
+       sha256 = "1mnc8s2a13ax9y5f2044bq8wvgn2zbb7g5sy1rav60g3qia0dkpq";
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
          http-api-data http-client http-client-tls mime-mail monad-control
@@ -88702,6 +88831,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "groundhog_0_8_0_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, containers, monad-control, mtl
+     , resourcet, safe-exceptions, scientific, text, time, transformers
+     , transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "groundhog";
+       version = "0.8.0.1";
+       sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-builder bytestring
+         containers monad-control mtl resourcet safe-exceptions scientific
+         text time transformers transformers-base transformers-compat
+       ];
+       homepage = "http://github.com/lykahb/groundhog";
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-converters" = callPackage
     ({ mkDerivation, aeson, base, bimap, bytestring, containers
      , groundhog, groundhog-sqlite, groundhog-th, tasty, tasty-hunit
@@ -88762,6 +88912,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "groundhog-mysql_0_8_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, groundhog
+     , monad-control, monad-logger, mysql, mysql-simple, resource-pool
+     , resourcet, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "groundhog-mysql";
+       version = "0.8.0.1";
+       sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r";
+       libraryHaskellDepends = [
+         base bytestring containers groundhog monad-control monad-logger
+         mysql mysql-simple resource-pool resourcet text time transformers
+       ];
+       description = "MySQL backend for the groundhog library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-postgresql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
@@ -88781,7 +88949,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "groundhog-postgresql_0_8_0_2" = callPackage
+  "groundhog-postgresql_0_8_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -88789,8 +88957,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-postgresql";
-       version = "0.8.0.2";
-       sha256 = "0fmqnlj39xxf219qfcxp3pmhw4b09amax3j3v4h1xlnz6sfv3qpi";
+       version = "0.8.0.3";
+       sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers groundhog
          monad-control postgresql-libpq postgresql-simple resource-pool
@@ -88818,6 +88986,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "groundhog-sqlite_0_8_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, direct-sqlite
+     , groundhog, monad-control, resource-pool, resourcet, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "groundhog-sqlite";
+       version = "0.8.0.1";
+       sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp";
+       libraryHaskellDepends = [
+         base bytestring containers direct-sqlite groundhog monad-control
+         resource-pool resourcet text transformers unordered-containers
+       ];
+       description = "Sqlite3 backend for the groundhog library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-th" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, groundhog
      , template-haskell, text, time, unordered-containers, yaml
@@ -90862,6 +91048,8 @@ self: {
        pname = "hackage-db";
        version = "2.0";
        sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq";
+       revision = "1";
+       editedCabalFile = "1zsdy9c0gngl8k690311zchd3lhl7h64arab77p7v9j5bradziiq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90877,6 +91065,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hackage-db_2_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, filepath, tar, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "hackage-db";
+       version = "2.0.1";
+       sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers directory filepath tar time
+         utf8-string
+       ];
+       homepage = "https://github.com/peti/hackage-db#readme";
+       description = "Access Hackage's package database via Data.Map";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hackage-diff" = callPackage
     ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal
      , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process
@@ -95401,7 +95610,8 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) glib; 
+         inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "haskell-gi_0_21_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
@@ -95429,7 +95639,8 @@ self: {
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) glib; 
+         inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -96298,6 +96509,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-ast_1_0_1_1" = callPackage
+    ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references
+     , template-haskell, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-ast";
+       version = "1.0.1.1";
+       sha256 = "0ckszqvl843g1gywhc7sj2s4wr58ng2cqyxi0kihdbfq7xmk943b";
+       libraryHaskellDepends = [
+         base classyplate ghc mtl pretty references template-haskell
+         uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Haskell AST for efficient tooling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-ast-fromghc" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
@@ -96370,6 +96599,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-backend-ghc_1_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
+     , haskell-tools-ast, mtl, references, safe, split, template-haskell
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-backend-ghc";
+       version = "1.0.1.1";
+       sha256 = "05bn79ysb2bw42hid2ksqddqidimvqsx09nr771wf1ha7qapksmq";
+       libraryHaskellDepends = [
+         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
+         references safe split template-haskell transformers uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Creating the Haskell-Tools AST from GHC's representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-builtin-refactorings" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -96402,6 +96650,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-builtin-refactorings_1_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, Cabal, classyplate, containers
+     , deepseq, directory, either, filepath, ghc, ghc-paths
+     , haskell-tools-ast, haskell-tools-backend-ghc
+     , haskell-tools-prettyprint, haskell-tools-refactor
+     , haskell-tools-rewrite, minisat-solver, mtl, references, split
+     , tasty, tasty-hunit, template-haskell, time, transformers
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-builtin-refactorings";
+       version = "1.0.1.1";
+       sha256 = "00yp1gvfvg3c2fa9ndnqphxbnsrshifida3247yafd7q9hhgd7q8";
+       libraryHaskellDepends = [
+         aeson base Cabal classyplate containers deepseq directory filepath
+         ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-refactor
+         haskell-tools-rewrite minisat-solver mtl references split
+         template-haskell transformers uniplate
+       ];
+       testHaskellDepends = [
+         base Cabal containers directory either filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-refactor
+         haskell-tools-rewrite mtl references split tasty tasty-hunit
+         template-haskell time transformers uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Refactoring Tool for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, Glob
@@ -96439,6 +96720,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-cli_1_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , directory, filepath, ghc, ghc-paths, Glob
+     , haskell-tools-builtin-refactorings, haskell-tools-daemon
+     , haskell-tools-refactor, knob, mtl, optparse-applicative, process
+     , references, split, strict, tasty, tasty-hunit, time
+     }:
+     mkDerivation {
+       pname = "haskell-tools-cli";
+       version = "1.0.1.1";
+       sha256 = "1fr4hzhlbwxna326dkzc92x1scjrf2yjgx8rhn5r76afay5w0wj9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath ghc ghc-paths
+         haskell-tools-builtin-refactorings haskell-tools-daemon
+         haskell-tools-refactor mtl references split strict
+       ];
+       executableHaskellDepends = [
+         base directory filepath Glob haskell-tools-builtin-refactorings
+         haskell-tools-daemon mtl optparse-applicative process split
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath
+         haskell-tools-builtin-refactorings knob tasty tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion directory filepath
+         haskell-tools-builtin-refactorings haskell-tools-daemon knob split
+         time
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Command-line frontend for Haskell-tools Refact";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-daemon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
@@ -96474,6 +96792,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-daemon_1_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
+     , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
+     , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative
+     , pretty, process, references, split, strict, tasty, tasty-hunit
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "haskell-tools-daemon";
+       version = "1.0.1.1";
+       sha256 = "0r48z9vkkgzgvlryfri6dzivf090pkjv52k517z9wvis3jxhqi7i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers deepseq Diff directory
+         filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings
+         haskell-tools-prettyprint haskell-tools-refactor mtl network
+         optparse-applicative pretty process references split strict
+         template-haskell
+       ];
+       executableHaskellDepends = [
+         base directory filepath haskell-tools-builtin-refactorings
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath ghc Glob
+         haskell-tools-builtin-refactorings HUnit network process tasty
+         tasty-hunit
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Background process for Haskell-tools that editors can connect to";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-debug" = callPackage
     ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
@@ -96499,6 +96852,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-debug_1_0_1_1" = callPackage
+    ({ mkDerivation, base, classyplate, criterion, filepath, ghc
+     , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
+     , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
+     , haskell-tools-refactor, mtl, references, split, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-debug";
+       version = "1.0.1.1";
+       sha256 = "1ml4rbkcajgwssi1a0jgbbqnnci9f74w90zj9cxdxxkkck4fkypl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base classyplate criterion filepath ghc ghc-paths haskell-tools-ast
+         haskell-tools-backend-ghc haskell-tools-builtin-refactorings
+         haskell-tools-prettyprint haskell-tools-refactor mtl references
+         split template-haskell uniplate
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Debugging Tools for Haskell-tools";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-demo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -96531,6 +96910,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-demo_1_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
+     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
+     , HUnit, mtl, network, references, tasty, tasty-hunit, transformers
+     , wai, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "haskell-tools-demo";
+       version = "1.0.1.1";
+       sha256 = "01fkl2xkq7v3mkm5dzfpfz53i2js68xhc3gvkc1lv8mg92zymfbb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-builtin-refactorings haskell-tools-prettyprint
+         haskell-tools-refactor http-types mtl references transformers wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath HUnit network tasty
+         tasty-hunit websockets
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "A web-based demo for Haskell-tools Refactor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-experimental-refactorings" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -96541,8 +96952,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-experimental-refactorings";
-       version = "1.0.0.4";
-       sha256 = "0mzwvs33snv3a3dvhkd1mnidkifip21rj2y44k9dcwdhfzcz6xbl";
+       version = "1.0.1.1";
+       sha256 = "0dyiixq7rdzjczzfv57b7f2859r4nmxrk68vq0flkazjqh9w08yb";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -96579,6 +96990,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-prettyprint_1_0_1_1" = callPackage
+    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
+     , references, split, text, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-prettyprint";
+       version = "1.0.1.1";
+       sha256 = "0j1ral0azwgxj550yf1jyyxprv0wb0cgd7sfk3dh52caqfwchi2p";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast mtl references split text
+         uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Pretty printing of Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-refactor" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
@@ -96600,6 +97029,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-refactor_1_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-rewrite, mtl, old-time, polyparse, references
+     , split, tasty, tasty-hunit, template-haskell, time, transformers
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-refactor";
+       version = "1.0.1.1";
+       sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2";
+       libraryHaskellDepends = [
+         aeson base Cabal containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl references
+         split template-haskell transformers uniplate
+       ];
+       testHaskellDepends = [
+         base Cabal containers directory either filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
+         polyparse references split tasty tasty-hunit template-haskell time
+         transformers uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Refactoring Tool for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-rewrite" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
@@ -96622,6 +97082,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-rewrite_1_0_1_1" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "haskell-tools-rewrite";
+       version = "1.0.1.1";
+       sha256 = "11psrwb8hmxian29n9y9301mlkfhx3y2nb06ml9808yrzpbwg1m2";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
+         references
+       ];
+       testHaskellDepends = [
+         base directory filepath haskell-tools-ast haskell-tools-prettyprint
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Facilities for generating new parts of the Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tor" = callPackage
     ({ mkDerivation, array, asn1-encoding, asn1-types, async
      , attoparsec, base, base64-bytestring, binary, bytestring, cereal
@@ -97978,6 +98461,7 @@ self: {
        homepage = "https://github.com/contivero/hasmin#readme";
        description = "CSS Minifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasparql-client" = callPackage
@@ -104005,7 +104489,7 @@ self: {
        pname = "hlibsass";
        version = "0.1.6.1";
        sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy";
-       configureFlags = [ "-fexternallibsass" ];
+       configureFlags = [ "-fexternalLibsass" ];
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libsass ];
@@ -107357,6 +107841,7 @@ self: {
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hquery" = callPackage
@@ -109659,6 +110144,8 @@ self: {
        pname = "hslua-aeson";
        version = "0.3.0.1";
        sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w";
+       revision = "1";
+       editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp";
        libraryHaskellDepends = [
          aeson base hashable hslua scientific text unordered-containers
          vector
@@ -109678,6 +110165,8 @@ self: {
        pname = "hslua-module-text";
        version = "0.1.2.1";
        sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf";
+       revision = "1";
+       editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n";
        libraryHaskellDepends = [ base hslua text ];
        testHaskellDepends = [ base hslua tasty tasty-hunit text ];
        homepage = "https://github.com/hslua/hslua-module-test";
@@ -118406,8 +118895,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.1.0";
        sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
-       revision = "4";
-       editedCabalFile = "0ls5rm5hg2lqp2m6bfssa30y72x8xyyl7izvwr3w804dpa9fvwrm";
+       revision = "5";
+       editedCabalFile = "13m83jdnxxykkc8fi2fa5qmy2mpsg3w9yphbl8cxdhmj8566pr7c";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -119301,6 +119790,7 @@ self: {
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-hlist" = callPackage
@@ -119326,6 +119816,7 @@ self: {
        ];
        description = "invertible transformer instances for HXT Picklers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -119469,7 +119960,7 @@ self: {
        pname = "io-streams";
        version = "1.5.0.1";
        sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx";
-       configureFlags = [ "-fnointeractivetests" ];
+       configureFlags = [ "-fNoInteractiveTests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
          process text time transformers vector zlib-bindings
@@ -121211,13 +121702,13 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.3.2";
-       sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1";
+       version = "1.3.3";
+       sha256 = "076h7nbf94zfwvfijcpv03r3s2nyynb2y9v354m4bxqz3anhib3b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
        homepage = "https://github.com/peti/jailbreak-cabal#readme";
-       description = "Strip version restrictions from build dependencies in Cabal files";
+       description = "Strip version restrictions from Cabal files";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
@@ -123376,6 +123867,7 @@ self: {
        homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme";
        description = "Provides batched marshalling of values between Java and Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-binary" = callPackage
@@ -123438,6 +123930,7 @@ self: {
        homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jwt" = callPackage
@@ -124002,6 +124495,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-elasticsearch_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bloodhound, bytestring
+     , containers, criterion, deepseq, enclosed-exceptions, exceptions
+     , http-client, http-types, katip, lens, lens-aeson
+     , quickcheck-instances, random, retry, scientific, semigroups, stm
+     , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, transformers, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "katip-elasticsearch";
+       version = "0.4.1.0";
+       sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1";
+       libraryHaskellDepends = [
+         aeson async base bloodhound bytestring enclosed-exceptions
+         exceptions http-client http-types katip retry scientific semigroups
+         stm stm-chans text time transformers unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base bloodhound bytestring containers http-client http-types
+         katip lens lens-aeson quickcheck-instances scientific stm tagged
+         tasty tasty-hunit tasty-quickcheck text time transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bloodhound criterion deepseq random text
+         unordered-containers uuid
+       ];
+       homepage = "https://github.com/Soostone/katip";
+       description = "ElasticSearch scribe for the Katip logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katip-rollbar" = callPackage
     ({ mkDerivation, aeson, async, base, hostname, http-client, katip
      , rollbar-hs, stm-chans, text, time
@@ -125520,8 +126046,8 @@ self: {
      }:
      mkDerivation {
        pname = "labsat";
-       version = "0.0.4";
-       sha256 = "0dzl85m6ld9n896hj6psxqg79p95yki0cck4facaansqva4il2hb";
+       version = "0.0.5";
+       sha256 = "02c6bx1pwjcqni8nx7899mk3mzzfrpdpxjiwnkizzianrzmwz0mw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126459,6 +126985,7 @@ self: {
        homepage = "语.ml";
        description = "A Lisp";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-asn1" = callPackage
@@ -127861,6 +128388,8 @@ self: {
        pname = "lattices";
        version = "1.7.1";
        sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x";
+       revision = "1";
+       editedCabalFile = "1h68xxzy90i7nggyh67f4744zk9a4zv4lb5ag9dwp126acvg2c9n";
        libraryHaskellDepends = [
          base base-compat containers deepseq hashable semigroupoids tagged
          universe-base universe-reverse-instances unordered-containers
@@ -130252,15 +130781,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lifted-async_0_10_0" = callPackage
+  "lifted-async_0_10_0_1" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
      , tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.10.0";
-       sha256 = "0w6xgyw2d3mcv8n7wnnma5dx2slz2ngis5k45x68dh7nv1azzs37";
+       version = "0.10.0.1";
+       sha256 = "1cf44j2jr2svp8g03hzf3xfmjlh7xcd40ra1k7dv6vzyzwb5p4hd";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -133171,6 +133700,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "logging-effect-extra-handler_1_1_3" = callPackage
+    ({ mkDerivation, base, exceptions, logging-effect, time
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect-extra-handler";
+       version = "1.1.3";
+       sha256 = "0pxsnah1v2d0zk5x3w8whifb0f78shhn0kpg5iq00ggpwg6x686i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base exceptions logging-effect time wl-pprint-text
+       ];
+       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
+       homepage = "https://github.com/jship/logging-effect-extra#readme";
+       description = "Handy logging handler combinators";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade" = callPackage
     ({ mkDerivation, base, call-stack, hspec, transformers }:
      mkDerivation {
@@ -133596,6 +134145,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "long-double" = callPackage
+    ({ mkDerivation, base, integer-gmp }:
+     mkDerivation {
+       pname = "long-double";
+       version = "0.1";
+       sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j";
+       libraryHaskellDepends = [ base integer-gmp ];
+       homepage = "https://code.mathr.co.uk/long-double";
+       description = "FFI bindings for C long double";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "longboi" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -135986,6 +136547,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manifolds" = callPackage
@@ -136013,6 +136575,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manifolds-core" = callPackage
@@ -138750,6 +139313,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens_0_4_9" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.9";
+       sha256 = "1zsisv6vlkphqw8rdi6c6phm6k3izc0n6vj1z1b6my7r8zyshlia";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
@@ -138840,6 +139416,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc_0_4_9" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens
+     , transformers
+     }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.9";
+       sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens transformers
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens + array, bytestring, containers, transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-mtl" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
@@ -138873,6 +139466,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_3_10" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.3.10";
+       sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -138887,6 +139498,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_4_2" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell
+     , th-abstraction, transformers
+     }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.4.2";
+       sha256 = "16962h9qxjw6mv7nqn2xz7kclfgllla52illrzpri738wnf2nwsd";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell th-abstraction
+         transformers
+       ];
+       testHaskellDepends = [ base microlens ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "micrologger" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens
      , text, text-format, time, transformers
@@ -138944,6 +139574,8 @@ self: {
        pname = "microstache";
        version = "1.0.1.1";
        sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
+       revision = "1";
+       editedCabalFile = "1var5mgzvkxl9s78hbxylkvv67z7fnbs5rb1l9q0cqxyw85cbr6j";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath parsec
          text transformers unordered-containers vector
@@ -145177,6 +145809,7 @@ self: {
        homepage = "https://github.com/gelisam/n-ary-functor";
        description = "An n-ary version of Functor";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "n-m" = callPackage
@@ -146750,6 +147383,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "netwire-input_0_0_7" = callPackage
+    ({ mkDerivation, base, deepseq, netwire }:
+     mkDerivation {
+       pname = "netwire-input";
+       version = "0.0.7";
+       sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9";
+       libraryHaskellDepends = [ base deepseq netwire ];
+       homepage = "https://www.github.com/Mokosha/netwire-input";
+       description = "Input handling abstractions for netwire";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netwire-input-glfw" = callPackage
     ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm
      }:
@@ -150734,6 +151380,7 @@ self: {
        homepage = "https://github.com/owensmurray/om-elm";
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -150911,6 +151558,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "one-line-aeson-text" = callPackage
+    ({ mkDerivation, aeson, base, doctest, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "one-line-aeson-text";
+       version = "0.1.0.0";
+       sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn";
+       libraryHaskellDepends = [ aeson base text unordered-containers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/typeclasses/one-line-aeson-text";
+       description = "Pretty-printing short Aeson values as text";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "one-liner" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
      , profunctors, tagged, transformers
@@ -151090,8 +151751,8 @@ self: {
        pname = "opaleye";
        version = "0.6.0.0";
        sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q";
-       revision = "1";
-       editedCabalFile = "0hkgrksap5hn0xq86bq9rsm3h9a6vamh6la77z10fdxv7m3xjxf3";
+       revision = "2";
+       editedCabalFile = "1zhb7i4za87ixxwwh792drvydr0ln9krwkml1mmdz38a9s0zyhn6";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -152961,6 +153622,7 @@ self: {
        homepage = "https://gitlab.com/LukaHorvat/overload";
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "overloaded-records" = callPackage
@@ -153119,6 +153781,7 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        homepage = "https://github.com/andrewthad/bytearray#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packed-dawg" = callPackage
@@ -161836,8 +162499,8 @@ self: {
      }:
      mkDerivation {
        pname = "posix-socket";
-       version = "0.2";
-       sha256 = "0ivgvpdjwiwniw7xbmlab7myhy5a631liq4864plhkrkm3hcp44y";
+       version = "0.3";
+       sha256 = "0al0am4nnzaiknxhlfid1qafh5kh15vl13ba1w0bivcsiyfb62in";
        libraryHaskellDepends = [
          base bytestring data-default-class data-flags network-ip
          transformers-base unix
@@ -162623,8 +163286,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.9.1";
-       sha256 = "1csnjvz3iwrd7rpw90ws1h6a9j0y4v1wxn07jnfw2qs1qrkcr0hn";
+       version = "0.10";
+       sha256 = "19sym74az3fqh81pbkcqz6vjrwiglhf4n9042kf4x1naa0g4hz7k";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors text transformers unagi-chan
@@ -162646,8 +163309,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.1.4";
-       sha256 = "0502ipxxdlmk4akc2fpsij3y91fi6q3rhrlzm3bf4kl5jfddvz7s";
+       version = "0.1.5";
+       sha256 = "1p24iv5mymyrw8q8y4k6zhzq3qd8z62ai0sfx2mh29in4s1y508y";
        libraryHaskellDepends = [
          base base-prelude bytestring cereal potoki potoki-core text
        ];
@@ -164279,7 +164942,7 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring network unix
        ];
-       description = "Parse /proc/net/ tcp,tcp6,udp,udp6";
+       description = "Parse /proc/net/{tcp,tcp6,udp,udp6}";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -167951,7 +168614,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-instances_0_3_17" = callPackage
+  "quickcheck-instances_0_3_18" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
      , scientific, tagged, text, time, transformers, transformers-compat
@@ -167959,8 +168622,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.17";
-       sha256 = "0s6wi39k1vhr64lzsj1kyiaym7zi9qfhzdslxir2cb002ivj7jw3";
+       version = "0.3.18";
+       sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
        libraryHaskellDepends = [
          array base base-compat bytestring case-insensitive containers
          hashable old-time QuickCheck scientific tagged text time
@@ -169380,6 +170043,7 @@ self: {
        ];
        description = "Generate a random base 16, 58, or 64 string";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-strings" = callPackage
@@ -170291,6 +170955,7 @@ self: {
        homepage = "https://github.com/masterdezign/rc#readme";
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rclient" = callPackage
@@ -170698,7 +171363,7 @@ self: {
        pname = "reactive-banana-wx";
        version = "1.1.1.0";
        sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr";
-       configureFlags = [ "-f-buildexamples" ];
+       configureFlags = [ "-f-buildExamples" ];
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171542,6 +172207,7 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
@@ -177280,12 +177946,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "safe_0_3_16" = callPackage
+  "safe_0_3_17" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
-       version = "0.3.16";
-       sha256 = "0xar4gh32izxl2a102xpgjrhppin7hqa837pv3fswmlj51cfb2k8";
+       version = "0.3.17";
+       sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/ndmitchell/safe#readme";
@@ -180451,8 +181117,8 @@ self: {
        pname = "semigroupoids";
        version = "5.2.1";
        sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
-       revision = "3";
-       editedCabalFile = "0wzcnpz8pyjk823vqnq5s8krsb8i6cw573hcschpd9x5ynq4li70";
+       revision = "4";
+       editedCabalFile = "0izc33v2n2321hc4ssr1b8fj85i91ca6c99w1qhdqnnp1sank7sk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -183025,7 +183691,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-static-th_0_2_0_0" = callPackage
+  "servant-static-th_0_2_0_1" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, doctest, filepath, Glob, hspec-wai, http-media
      , semigroups, servant, servant-blaze, servant-server, tasty
@@ -183033,8 +183699,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-static-th";
-       version = "0.2.0.0";
-       sha256 = "04wa9lmygfllpvk1qqd0k3k7p997b5vn8xvbh82lwq46drsy4qbg";
+       version = "0.2.0.1";
+       sha256 = "1np3sh8jcil63kd56smlkcxqg25zsn01s4dx0d1i4cmc610nb33l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183219,6 +183885,7 @@ self: {
        homepage = "https://github.com/fosskers/servant-xml";
        description = "Servant support for the XML Content-Type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -183347,23 +184014,24 @@ self: {
      }) {};
 
   "serverless-haskell" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, amazonka-core
-     , amazonka-kinesis, amazonka-s3, base, bytestring, hspec
-     , hspec-discover, lens, raw-strings-qq, text, time, unix
+    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
+     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
+     , hspec, hspec-discover, lens, raw-strings-qq, text, time, unix
      , unordered-containers
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.4.1";
-       sha256 = "1r0amp80g3lz31l1hb138dyqfh29nb7f0yq20xzh4hccr600liw1";
+       version = "0.4.2";
+       sha256 = "1cdpcin060qz5wicf8jqxayi2vjrhapybg401m3rw914s452safw";
        libraryHaskellDepends = [
-         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
-         bytestring lens text time unix unordered-containers
+         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
+         amazonka-s3 base bytestring case-insensitive lens text time unix
+         unordered-containers
        ];
        testHaskellDepends = [
-         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
-         bytestring hspec hspec-discover lens raw-strings-qq text time unix
-         unordered-containers
+         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
+         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
+         lens raw-strings-qq text time unix unordered-containers
        ];
        homepage = "https://github.com/seek-oss/serverless-haskell#readme";
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
@@ -185845,6 +186513,7 @@ self: {
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-eval" = callPackage
@@ -186647,6 +187316,8 @@ self: {
        pname = "singleton-bool";
        version = "0.1.3";
        sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if";
+       revision = "1";
+       editedCabalFile = "0wpwwqgrfgzi6cf4j1jpxwi8b30s80zch2xzcgzcmjmaai7kgc1n";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/phadej/singleton-bool#readme";
        description = "Type level booleans";
@@ -187848,6 +188519,7 @@ self: {
        homepage = "https://github.com/jrclogic/SMCDEL";
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sme" = callPackage
@@ -193310,6 +193982,7 @@ self: {
        homepage = "https://github.com/dzhus/static-text#readme";
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "staticanalysis" = callPackage
@@ -193500,8 +194173,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.1.2";
-       sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35";
+       version = "0.2.1.3";
+       sha256 = "1sd36j3f7s8dlz2g6w1yir19yys4pn28arw4nlpknpm7dzm6vs1g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194901,6 +195574,7 @@ self: {
        homepage = "https://github.com/fosskers/streaming-pcap";
        description = "Stream packets via libpcap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-png" = callPackage
@@ -195398,12 +196072,15 @@ self: {
      }) {};
 
   "string-qq" = callPackage
-    ({ mkDerivation, base, template-haskell }:
+    ({ mkDerivation, base, Cabal, process, template-haskell }:
      mkDerivation {
        pname = "string-qq";
        version = "0.0.2";
        sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
+       revision = "1";
+       editedCabalFile = "1flc6mr1nnv8mx69cy1ilwk5gxsidcns82vjdg8dcs8z5axg95kp";
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.publicDomain;
@@ -196084,27 +196761,26 @@ self: {
      }) {};
 
   "stylish-cabal" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, base-compat, Cabal
-     , containers, data-default, deepseq, haddock-library, hspec
-     , hspec-core, hspec-expectations-pretty-diff, microlens
-     , microlens-th, mtl, optparse-applicative, split, template-haskell
+    ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
+     , Cabal, containers, data-default, deepseq, haddock-library, hspec
+     , hspec-core, microlens, microlens-th, mtl, optparse-applicative
+     , split, template-haskell, utf8-string
      }:
      mkDerivation {
        pname = "stylish-cabal";
-       version = "0.3.0.0";
-       sha256 = "15qw1w4z6p99w4x1xgvp3kaynyh0lh1g27krkarkhyhwjakj797w";
+       version = "0.4.0.0";
+       sha256 = "1357yrnzyc7rhd98dz33m84yckzs2djrlv8dmh5a2p97s31gcp03";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base base-compat Cabal containers data-default
-         deepseq haddock-library hspec hspec-core
-         hspec-expectations-pretty-diff microlens microlens-th mtl split
-         template-haskell
+         deepseq haddock-library hspec hspec-core microlens microlens-th mtl
+         split template-haskell utf8-string
        ];
        executableHaskellDepends = [
-         base base-compat optparse-applicative
+         base base-compat bytestring optparse-applicative
        ];
-       testHaskellDepends = [ base base-compat hspec ];
+       testHaskellDepends = [ base base-compat bytestring hspec ];
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197003,7 +197679,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) librsvg;};
+     }) {inherit (pkgs.gnome3) librsvg;};
 
   "svgutils" = callPackage
     ({ mkDerivation, base, filepath, xml }:
@@ -199557,6 +200233,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tar_0_5_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-handle
+     , containers, criterion, deepseq, directory, filepath, QuickCheck
+     , tasty, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "tar";
+       version = "0.5.1.0";
+       sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath time
+       ];
+       testHaskellDepends = [
+         array base bytestring bytestring-handle containers deepseq
+         directory filepath QuickCheck tasty tasty-quickcheck time
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq directory
+         filepath time
+       ];
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tar-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit-combinators }:
      mkDerivation {
@@ -200886,12 +201587,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "template-haskell_2_12_0_0" = callPackage
+  "template-haskell_2_13_0_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.12.0.0";
-       sha256 = "0lbmqagknkdrj9mwqdd5p12ay78wk0g509g75a243jrbm46i6dar";
+       version = "2.13.0.0";
+       sha256 = "0j61d0xnlsywgn33k72a6dmnp9i93zjn0gba1fhxs9qwdb1xcfk3";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -202650,6 +203351,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-latin1_0_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, data-checked
+     , hashable, semigroups, text
+     }:
+     mkDerivation {
+       pname = "text-latin1";
+       version = "0.3.1";
+       sha256 = "1wxbv6m567n3330baw2k0xxd50nhn2k6w3lgmpk6zq7x1jp84x3c";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive data-checked hashable semigroups
+         text
+       ];
+       homepage = "https://github.com/mvv/text-latin1";
+       description = "Latin-1 (including ASCII) utility functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-ldap" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
      , memory, QuickCheck, quickcheck-simple, random, transformers
@@ -203020,6 +203739,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show_3_7_2" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+     , bytestring, bytestring-builder, containers, contravariant
+     , criterion, deepseq, deriving-compat, generic-deriving
+     , ghc-boot-th, ghc-prim, hspec, hspec-discover, integer-gmp, nats
+     , QuickCheck, quickcheck-instances, semigroups, tagged
+     , template-haskell, text, th-abstraction, th-lift, transformers
+     , transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3.7.2";
+       sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s";
+       libraryHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant generic-deriving ghc-boot-th ghc-prim
+         integer-gmp nats semigroups tagged template-haskell text
+         th-abstraction th-lift transformers transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder containers contravariant deriving-compat
+         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
+         QuickCheck quickcheck-instances semigroups tagged template-haskell
+         text th-lift transformers transformers-compat void
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant criterion deepseq generic-deriving
+         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
+         template-haskell text th-lift transformers transformers-compat void
+       ];
+       homepage = "https://github.com/RyanGlScott/text-show";
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -204023,8 +204781,8 @@ self: {
        pname = "these";
        version = "0.7.4";
        sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
-       revision = "5";
-       editedCabalFile = "1jx0p6z91nz5dagw4bcvb7lr9a15ahjnx0nhyv8cmd8p056m5515";
+       revision = "6";
+       editedCabalFile = "16dglq7aj28ag4h11m4ym8lm3jjq5kx3y0bycbhqm4q9xpnwfvfb";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -210922,6 +211680,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unbound-generics_0_3_2" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant
+     , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "unbound-generics";
+       version = "0.3.2";
+       sha256 = "1g691ijcn7yxmn7w0zmd4h9w8nr578jifg3yhlyckka2jm97f20g";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base containers contravariant deepseq exceptions mtl
+         profunctors template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       homepage = "http://github.com/lambdageek/unbound-generics";
+       description = "Support for programming with names and binders using GHC Generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unbounded-delays" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215929,6 +216711,8 @@ self: {
        pname = "vty";
        version = "5.19.2";
        sha256 = "158afcgzcwq7ybjw7jk28q799xzpns47m1l4sivc3wrrfklqh7xz";
+       revision = "1";
+       editedCabalFile = "16xg3m7rfg9rf2z9q0ns7f3gyi1acyw21d3bvr6fy4b9v1ngxsdq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -215964,6 +216748,8 @@ self: {
        pname = "vty";
        version = "5.20";
        sha256 = "0l9xlk4z8xlkd7qzhzkj4l0qb2gwl27mabr2hhkpz3yfv7z6j0a3";
+       revision = "1";
+       editedCabalFile = "01awxbjxls9v9jh7d7mic7lzmaabsx8g9lqks8fbrjixhka321fl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216083,6 +216869,7 @@ self: {
        homepage = "https://github.com/achirkin/genvulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {vulkan = null;};
 
   "wacom-daemon" = callPackage
@@ -218380,6 +219167,7 @@ self: {
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing based on invertible invariants and bijections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -221929,12 +222717,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xhtml_3000_2_2" = callPackage
+  "xhtml_3000_2_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "xhtml";
-       version = "3000.2.2";
-       sha256 = "0z34m5jfvjyzqjr81kk6mp2dyf0iay5zl8xlzwl3k5zdfl5hsz74";
+       version = "3000.2.2.1";
+       sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
@@ -224197,18 +224985,18 @@ self: {
      }) {};
 
   "yampa-sdl2" = callPackage
-    ({ mkDerivation, base, colour, linear, memoize, sdl2, StateVar
+    ({ mkDerivation, base, data-memocombinators, linear, sdl2, StateVar
      , text, vector, Yampa
      }:
      mkDerivation {
        pname = "yampa-sdl2";
-       version = "0.1.0.0";
-       sha256 = "0mfn8q9rvcd9s30ia78r60mivrxlv47136wcy7a23zga5r3jk4zn";
+       version = "0.1.0.2";
+       sha256 = "17wcfb04dvdfcx8s21f36g4s3j3mvxgdfvm468gqqj3d3ks22zgp";
        libraryHaskellDepends = [
-         base colour linear memoize sdl2 StateVar text vector Yampa
+         base data-memocombinators linear sdl2 StateVar text vector Yampa
        ];
        testHaskellDepends = [
-         base colour linear memoize sdl2 StateVar text vector Yampa
+         base data-memocombinators linear sdl2 StateVar text vector Yampa
        ];
        homepage = "https://github.com/Simre1/YampaSDL2#readme";
        description = "Yampa and SDL2 made easy";
@@ -225043,8 +225831,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.4.0.0";
-       sha256 = "1v4y72bp0kyby3zl4lb7292m7mfynbgvlj5bkj1y5vmk16zrqr7c";
+       version = "0.4.0.1";
+       sha256 = "0gwl2inbjzwmxdwx51r30yd32xa17rivzmsdf6jnim5q0gyzdh4j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From deab46fdba6525ec6a56943dfd2da6994e890ebe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 15:35:49 +0100
Subject: [PATCH 0674/2266] Cabal-2.2.0.0: fix build with GHC 8.2.2

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 4538d8471c0..90b142a1f0e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -86,4 +86,9 @@ self: super: {
   # https://github.com/purescript/purescript/issues/3189
   purescript = doJailbreak (super.purescript);
 
+  # Needs text >=1.2.3.0 && <1.3, which is not the default yet.
+  Cabal_2_2_0_0 = super.Cabal_2_2_0_0.overrideScope (self: super: {
+    text = self.text_1_2_3_0;
+  });
+
 }

From 469a15d3865e50bc2cf97a8cbac43357137febf3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 15:40:16 +0100
Subject: [PATCH 0675/2266] distribution-nixpkgs: fix build with GHC 8.2.2

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 90b142a1f0e..44a08d585b4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -91,4 +91,10 @@ self: super: {
     text = self.text_1_2_3_0;
   });
 
+  # Needs Cabal 2.2.x, which is not the default.
+  distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: {
+    Cabal = self.Cabal_2_2_0_0;
+    text = self.text_1_2_3_0;
+  });
+
 }

From c5cf8dd57aad74fd97f9849c1ba4b94a56b77b03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 17:33:46 +0100
Subject: [PATCH 0676/2266] haskell-hackage-db: fix build with GHC 8.2.2

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 44a08d585b4..20bd3b0398c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -96,5 +96,9 @@ self: super: {
     Cabal = self.Cabal_2_2_0_0;
     text = self.text_1_2_3_0;
   });
+  hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: {
+    Cabal = self.Cabal_2_2_0_0;
+    text = self.text_1_2_3_0;
+  });
 
 }

From ee262b83ef77bad4194949d03992d0bc1549e8bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 17:39:51 +0100
Subject: [PATCH 0677/2266] cabal2nix: fix overrides for Cabal 2.2.x

---
 pkgs/development/haskell-modules/configuration-common.nix    | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5826b875691..4217b2d0357 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -607,7 +607,7 @@ self: super: {
   };
 
   # Need newer versions of their dependencies than the ones we have in LTS-10.x.
-  cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_27_0; };
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_27_0; hackage-db = self.hackage-db_2_0_1; });
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; });
 
   # https://github.com/bos/configurator/issues/22
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 20bd3b0398c..2531f05cfa9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -100,5 +100,9 @@ self: super: {
     Cabal = self.Cabal_2_2_0_0;
     text = self.text_1_2_3_0;
   });
+  cabal2nix = super.cabal2nix.overrideScope (self: super: {
+    Cabal = self.Cabal_2_2_0_0;
+    text = self.text_1_2_3_0;
+  });
 
 }

From b01a5ec5061899f034d39ac25509593d4e136e9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 19:43:11 +0100
Subject: [PATCH 0678/2266] haskell-regex-tdfa: update overrides for ghc 8.4.1

The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Generally speaking, it might be a good idea to use
https://github.com/ChrisKuklewicz/regex-tdfa/pull/16 instead of the old one,
because it looks much cleaner. (It might have the same problem w/r to base,
though).

Pinging our resident GHC 8.4.1 guru @deepfire.
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index fb7ae612b7f..6e5008fcc51 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -451,6 +451,7 @@ self: super: {
       rev    = "34f4593a520176a917b74b8c7fcbbfbd72fb8178";
       sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq";
     };
+    jailbreak = true;   # base >=4 && <4.11
   });
 
   ## Unmerged.  PR: https://github.com/vincenthz/hs-securemem/pull/12

From 3724b07e2e26dc5fa9184d6db7f8e319a04c6cd2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 19:46:14 +0100
Subject: [PATCH 0679/2266] haskell-blaze-builder: update overrides for ghc
 8.4.1

The pull request we use does not suffice any longer because it does not update
the version constraint on base in the Cabal file.

Cc: @deepfire
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 6e5008fcc51..f2b3185a993 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -333,6 +333,7 @@ self: super: {
       rev    = "b7195f160795a081adbb9013810d843f1ba5e062";
       sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00";
     };
+    jailbreak = true;   # https://github.com/lpsmith/blaze-builder/issues/12
   });
 
   ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3

From 99fba9e33556aa3d8f135a094c49d9da1332061e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 19:46:53 +0100
Subject: [PATCH 0680/2266] haskell-HTTP and haddock-library: add overrides for
 ghc 8.4.1

Cc: @deepfire
---
 .../haskell-modules/configuration-ghc-8.4.x.nix            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index f2b3185a993..74d1121e701 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -764,4 +764,11 @@ self: super: {
     jailbreak       = true;
   });
 
+  # https://github.com/haskell/HTTP/pull/114
+  HTTP = doJailbreak super.HTTP;
+
+  # Older versions don't compile.
+  haddock-library = self.haddock-library_1_5_0_1;
+  haddock-library_1_5_0_1 = dontHaddock (dontCheck super.haddock-library_1_5_0_1);
+
 }

From 7e040c87759f9caefb340d62c62743e17f74c8b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 20:02:56 +0100
Subject: [PATCH 0681/2266] haskell-hslua-module-text: add override to fix
 build with GHC 8.4.1

Cc: @deepfire
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 74d1121e701..a190d8e7413 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -771,4 +771,7 @@ self: super: {
   haddock-library = self.haddock-library_1_5_0_1;
   haddock-library_1_5_0_1 = dontHaddock (dontCheck super.haddock-library_1_5_0_1);
 
+  # https://github.com/hslua/hslua-module-text/issues/1
+  hslua-module-text = doJailbreak super.hslua-module-text;
+
 }

From 7011f3b66da61570adf087ada86d8dd1af9e53ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 20:12:34 +0100
Subject: [PATCH 0682/2266] haskell-tree-diff: add override to fix build with
 GHC 8.4.1

Cc: @deepfire
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index a190d8e7413..05675062aa6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -774,4 +774,7 @@ self: super: {
   # https://github.com/hslua/hslua-module-text/issues/1
   hslua-module-text = doJailbreak super.hslua-module-text;
 
+  # https://github.com/phadej/tree-diff/issues/15
+  tree-diff = doJailbreak super.tree-diff;
+
 }

From 842a5c40f707c3d51819d796a835374c83e00f56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 20:23:14 +0100
Subject: [PATCH 0683/2266] haskell: mark esqueleto and doctemplates as broken

Cc: @deepfire
---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 05675062aa6..78de4d8499b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -777,4 +777,10 @@ self: super: {
   # https://github.com/phadej/tree-diff/issues/15
   tree-diff = doJailbreak super.tree-diff;
 
+  # https://github.com/jgm/doctemplates/issues/2
+  doctemplates = markBrokenVersion "0.2.1" super.doctemplates;
+
+  # https://github.com/bitemyapp/esqueleto/issues/77
+  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
+
 }

From 668383c088ecfcab581e1475cab79cfb39327566 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2018 21:00:33 +0100
Subject: [PATCH 0684/2266] haskell-hackage-db: add override to fix build with
 GHC 8.4.1

Cc: @deepfire
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 78de4d8499b..84cf5ac6d72 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -783,4 +783,7 @@ self: super: {
   # https://github.com/bitemyapp/esqueleto/issues/77
   esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
 
+  # Older versions don't compile.
+  hackage-db = super.hackage-db_2_0_1;
+
 }

From 1bad82171069f507fd8adb46d11ac58b87702c2a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 10 Mar 2018 10:38:33 +0100
Subject: [PATCH 0685/2266] altcoins.litecoin: 0.14.2 -> 0.15.1

---
 pkgs/applications/altcoins/litecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index ac42caa8099..12cf5dcb71c 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.14.2";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "litecoin-project";
     repo = "litecoin";
     rev = "v${version}";
-    sha256 = "1smadd5d2mpz2v3pyk7wqm60vdp81zqr4m3z4wfvnlz62m1m800y";
+    sha256 = "01q0lj0grabyfh67ar984m9lv9xs0rakadkci8jpfbp8xw166r40";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 6fb73cc7991ac8a3d986cd95ecf6e1399b6749e3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 10 Mar 2018 11:39:11 +0100
Subject: [PATCH 0686/2266] gtk-doc: add missing runtime dependency on six

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 6e7b45b97f6..5414abff66a 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,6 +1,10 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
 , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:
 
+let
+  pythonEnv = python.withPackages (ps: with ps; [ six ]);
+in
+
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
   version = "1.27";
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
-   [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+   [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
      gnome-doc-utils dblatex gettext which itstool
    ];
 

From f1795e39575752f36df2115f1cdfc4d0b1b0eb8a Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 08:43:11 +0100
Subject: [PATCH 0687/2266] pychart: move to own file

Also update website and download of source.
---
 .../python-modules/pychart/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/pychart/default.nix

diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix
new file mode 100644
index 00000000000..259c87347d7
--- /dev/null
+++ b/pkgs/development/python-modules/pychart/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "pychart";
+  version = "1.39";
+
+  disabled = ! isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
+    homepage = https://pypi.python.org/pypi/PyChart;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..987400807a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19671,21 +19671,7 @@ EOF
     };
   };
 
-  pychart = buildPythonPackage rec {
-    name = "pychart-1.39";
-    disabled = ! isPy27;
-
-    src = pkgs.fetchurl {
-      url = "http://download.gna.org/pychart/PyChart-1.39.tar.gz";
-      sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
-    };
-
-    meta = {
-      description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
-      homepage = http://home.gna.org/pychart/;
-      license = licenses.gpl2;
-    };
-  };
+  pychart = callPackage ../development/python-modules/pychart {};
 
   parsimonious = buildPythonPackage rec {
     version = "0.7.0";

From 77330e18f4b19aa08e3389a0d22fddc3c3c62493 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 08:32:42 +0100
Subject: [PATCH 0688/2266] pyjade: move to own file and fix homepage

---
 .../python-modules/pyjade/default.nix         | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +----------------
 2 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyjade/default.nix

diff --git a/pkgs/development/python-modules/pyjade/default.nix b/pkgs/development/python-modules/pyjade/default.nix
new file mode 100644
index 00000000000..ad6742f5deb
--- /dev/null
+++ b/pkgs/development/python-modules/pyjade/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2
+, tornado, pyramid, Mako, six }:
+
+buildPythonPackage rec {
+  pname = "pyjade";
+  version = "4.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
+  };
+
+  buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
+  propagatedBuildInputs = [ six ];
+  postPatch = ''
+    sed -i 's/1.4.99/1.99/' setup.py
+  '';
+  checkPhase = ''
+    nosetests pyjade
+  '';
+  # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
+  doCheck = false;
+  meta = with stdenv.lib; {
+    description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
+    homepage    = "https://github.com/syrusakbary/pyjade";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..c88c15a3271 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3035,32 +3035,7 @@ in {
 
   pydub = callPackage ../development/python-modules/pydub {};
 
-  pyjade = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pyjade";
-    version = "4.0.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
-    };
-    buildInputs = with self; [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
-    propagatedBuildInputs = with self; [ six ];
-    patchPhase = ''
-      sed -i 's/1.4.99/1.99/' setup.py
-    '';
-    checkPhase = ''
-      nosetests pyjade
-    '';
-    # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
-    doCheck = false;
-    meta = {
-      description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
-      homepage    = "http://github.com/syrusakbary/pyjade";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ nand0p ];
-      platforms   = platforms.all;
-    };
-  };
+  pyjade = callPackage ../development/python-modules/pyjade {};
 
   PyLD = callPackage ../development/python-modules/PyLD { };
 

From 6c55f5479d65d99b8dc8f0bdc0ea2a5a8096e15d Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 08:58:27 +0100
Subject: [PATCH 0689/2266] progressbar: move to own file and fix homepage

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

diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix
new file mode 100644
index 00000000000..18dfa693f5b
--- /dev/null
+++ b/pkgs/development/python-modules/progressbar/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "progressbar";
+  version = "2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3";
+  };
+
+  # invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/progressbar;
+    description = "Text progressbar library for python";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ domenkozar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..6cc10a224e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13984,24 +13984,7 @@ in {
     };
   };
 
-  progressbar = buildPythonPackage (rec {
-    name = "progressbar-2.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/progressbar/${name}.tar.gz";
-      sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3";
-    };
-
-    # invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://code.google.com/p/python-progressbar/;
-      description = "Text progressbar library for python";
-      license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  });
+  progressbar = callPackage ../development/python-modules/progressbar {};
 
   progressbar2 = callPackage ../development/python-modules/progressbar2 { };
 

From 4398a9e9b9002cc27e4a07e0e918c2fd8df58270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 4 Mar 2018 22:57:22 -0300
Subject: [PATCH 0690/2266] gsettings-qt: init at 0.1.20170824

---
 .../libraries/gsettings-qt/default.nix        | 58 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/libraries/gsettings-qt/default.nix

diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
new file mode 100644
index 00000000000..9e893932a64
--- /dev/null
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gsettings-qt-${version}";
+  version = "0.1.20170824";
+
+  src = fetchbzr {
+    url = http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk;
+    rev = "85";
+    sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+    gobjectIntrospection
+  ];
+
+  buildInputs = [
+    glib
+    qtdeclarative
+  ];
+
+  patchPhase = ''
+    # force ordered build of subdirs
+    sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro
+
+    # It seems that there is a bug in qtdeclarative: qmlplugindump fails
+    # because it can not find or load the Qt platform plugin "minimal".
+    # A workaround is to set QT_PLUGIN_PATH and QML2_IMPORT_PATH explicitly.
+    export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
+    export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix}
+
+    substituteInPlace GSettings/gsettings-qt.pro \
+      --replace '$$[QT_INSTALL_QML]' "$out/$qtQmlPrefix" \
+      --replace '$$[QT_INSTALL_BINS]/qmlplugindump' "qmlplugindump"
+
+    substituteInPlace src/gsettings-qt.pro \
+      --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \
+      --replace '$$[QT_INSTALL_HEADERS]' "$out/include"
+  '';
+
+  preInstall = ''
+    # do not install tests
+    for f in tests/Makefile{,.cpptest}; do
+      substituteInPlace $f \
+        --replace "install: install_target" "install: "
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Qt/QML bindings for GSettings";
+    homepage = https://launchpad.net/gsettings-qt;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 970a6d4b18d..0a7f18325a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8986,6 +8986,8 @@ with pkgs;
 
   grpc = callPackage ../development/libraries/grpc { };
 
+  gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
+
   gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
     callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
   });

From 605a373468dcafc0ac4829e2705035efa2583951 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 08:50:21 +0100
Subject: [PATCH 0691/2266] publicsuffix: move to own file and fix homepage

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

diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix
new file mode 100644
index 00000000000..9c90161c6ea
--- /dev/null
+++ b/pkgs/development/python-modules/publicsuffix/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "publicsuffix";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf";
+  };
+
+
+  # fix the ASCII-mode LICENSE file read
+  # disable test_fetch and the doctests (which also invoke fetch)
+  patchPhase = stdenv.lib.optionalString isPy3k ''
+    sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py
+  '' + ''
+    sed -i -e "/def test_fetch/i\\
+    \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Allows to get the public suffix of a domain name";
+    homepage = "https://pypi.python.org/pypi/publicsuffix/";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..74fa914de1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12718,31 +12718,7 @@ in {
 
   ptpython = callPackage ../development/python-modules/ptpython {};
 
-  publicsuffix = buildPythonPackage rec {
-    name = "publicsuffix-${version}";
-    version = "1.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/publicsuffix/${name}.tar.gz";
-      sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf";
-    };
-
-    # fix the ASCII-mode LICENSE file read
-    # disable test_fetch and the doctests (which also invoke fetch)
-    patchPhase = optionalString isPy3k ''
-      sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py
-    '' + ''
-      sed -i -e "/def test_fetch/i\\
-      \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
-    '';
-
-    meta = {
-      description = "Allows to get the public suffix of a domain name";
-      homepage = "http://pypi.python.org/pypi/publicsuffix/";
-      license = licenses.mit;
-    };
-  };
-
+  publicsuffix = callPackage ../development/python-modules/publicsuffix {};
 
   py = callPackage ../development/python-modules/py { };
 

From b6fc08795efa6ee83a5e12ede416a63ff98be8a6 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 09:29:05 +0100
Subject: [PATCH 0692/2266] polib: move to own file and fix homepage

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

diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix
new file mode 100644
index 00000000000..3b2ee20c825
--- /dev/null
+++ b/pkgs/development/python-modules/polib/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "polib";
+  version = "1.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A library to manipulate gettext files (po and mo files)";
+    homepage = https://bitbucket.org/izi/polib/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f3495a1a76..c56e8642abb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12531,25 +12531,7 @@ in {
 
   plumbum = callPackage ../development/python-modules/plumbum { };
 
-
-  polib = buildPythonPackage rec {
-    name = "polib-${version}";
-    version = "1.0.4";
-
-    src = pkgs.fetchurl {
-      url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz";
-      sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      description = "A library to manipulate gettext files (po and mo files)";
-      homepage = "http://bitbucket.org/izi/polib/";
-      license = licenses.mit;
-    };
-  };
+  polib = callPackage ../development/python-modules/polib {};
 
   posix_ipc = buildPythonPackage rec {
     name = "posix_ipc-${version}";

From c995db085311ae580ccf190a0d829b4cd7941651 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 14:06:55 -0800
Subject: [PATCH 0693/2266] taktuk: 3.7.5 -> 3.7.7

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk -h` got 0 exit code
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk --help` got 0 exit code
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk help` got 0 exit code
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk -v` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk --version` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk version` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk -h` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk --help` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk help` and found version 3.7.7
- found 3.7.7 with grep in /nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7
- found 3.7.7 in filename of file in /nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7
---
 pkgs/applications/networking/cluster/taktuk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index 313e1af707b..1510dc575cc 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl , openssh}:
 
 stdenv.mkDerivation rec {
-  version = "3.7.5";
+  version = "3.7.7";
   name = "taktuk-${version}";
 
   buildInputs = [ perl ];
 
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
-    sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
+    sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr";
   };
 
   preBuild = ''

From 28a67ec16aa0b68dd4b11949df97186fab23c520 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Sat, 10 Mar 2018 22:21:36 +1100
Subject: [PATCH 0694/2266] nasc: init at 0.4.6

---
 .../science/math/nasc/default.nix             | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/science/math/nasc/default.nix

diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
new file mode 100644
index 00000000000..8efe8d9da94
--- /dev/null
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -0,0 +1,71 @@
+{ stdenv
+, bash
+, gnused
+, fetchFromGitHub
+, gettext
+, pkgconfig
+, gtk3
+, granite
+, gnome3
+, cmake
+, ninja
+, vala
+, libqalculate
+, elementary-cmake-modules
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "nasc-${version}";
+  version = "0.4.6";
+
+  src = fetchFromGitHub {
+    owner = "parnold-x";
+    repo = "nasc";
+    rev = version;
+    sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54";
+  };
+
+  XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
+    "${granite}/share"
+    "${gnome3.libgee}/share"
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    wrapGAppsHook
+    vala
+    cmake
+    gettext
+  ];
+  buildInputs = [
+    libqalculate
+    gtk3
+    granite
+    gnome3.libgee
+    gnome3.libsoup
+    gnome3.gtksourceview
+  ];
+
+  prePatch = ''
+    substituteInPlace ./libqalculatenasc/libtool \
+      --replace "/bin/bash" "${bash}/bin/bash" \
+      --replace "/bin/sed" "${gnused}/bin/sed"
+    substituteInPlace ./libqalculatenasc/configure.inc \
+      --replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Do maths like a normal person";
+    longDescription = ''
+      It’s an app where you do maths like a normal person. It lets you
+      type whatever you want and smartly figures out what is math and
+      spits out an answer on the right pane. Then you can plug those
+      answers in to future equations and if that answer changes, so does
+      the equations it’s used in.
+    '';
+    homepage = https://github.com/parnold-x/nasc;
+    maintainers = with maintainers; [ samdroid-apps ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a72fdd669a..864a7a6d785 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19553,6 +19553,8 @@ with pkgs;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
+  nasc = callPackage ../applications/science/math/nasc { };
+
   openblas = callPackage ../development/libraries/science/math/openblas { };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with

From 5c1c6a3071cbb7d9879f520510ccd2fc87d39969 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Mar 2018 12:29:43 +0100
Subject: [PATCH 0695/2266] python.pkgs.datashape: disable several tests

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

diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
index 9177e9f0ff4..4fcb38e7b36 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -31,8 +31,10 @@ in buildPythonPackage rec {
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ numpy multipledispatch dateutil ];
 
+  # Disable several tests
+  # https://github.com/blaze/datashape/issues/232
   checkPhase = ''
-    py.test datashape/tests
+    py.test -k "not test_validate and not test_nested_iteratables and not test_validate_dicts and not test_tuples_can_be_records_too" datashape/tests
   '';
 
   meta = {

From 2c406f63290f64550caa4f177ddfc22cc97f959d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Mar 2018 12:36:11 +0100
Subject: [PATCH 0696/2266] python.pkgs.odo: disable failing test

---
 .../python-modules/odo/default.nix            | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix
index 73b3f0be150..fc3747ac59a 100644
--- a/pkgs/development/python-modules/odo/default.nix
+++ b/pkgs/development/python-modules/odo/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , datashape
 , numpy
@@ -8,23 +8,28 @@
 , toolz
 , multipledispatch
 , networkx
+, dask
 }:
 
 buildPythonPackage rec {
   pname = "odo";
-  version= "0.5.0";
-  name = "${pname}-${version}";
+  version= "0.5.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8";
+
+  src = fetchFromGitHub {
+    owner = "blaze";
+    repo = pname;
+    rev = version;
+    sha256 = "142f4jvaqjn0dq6rvlk7d7mzcmc255a9z4nxc1b3a862hp4gvijs";
   };
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest dask ];
   propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ];
 
+  # Disable failing tests
+  # https://github.com/blaze/odo/issues/609
   checkPhase = ''
-    py.test odo/tests
+    py.test -k "not test_numpy_asserts_type_after_dataframe" odo/tests
   '';
 
   meta = {

From f92295abc34001b928453bba48e04ee23ca8db46 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 10:55:46 +0100
Subject: [PATCH 0697/2266] Python: fix update script for nix 2.0

---
 maintainers/scripts/update-python-libraries | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index ec2691ff617..4536662c842 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git
+#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
 
 """
 Update a Python package expression by passing in the `.nix` file, or the directory containing it.
@@ -358,4 +358,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

From 3387115364ecec926d45cdcc33290e48bf6416fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 21:01:21 +0100
Subject: [PATCH 0698/2266] pythonPackages.aiohttp: 3.0.1 -> 3.0.5

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 6f6da7ee0a6..5408fb7b2f2 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.0.1";
+  version = "3.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221";
+    sha256 = "bb873da531401416acb7045a8f0bdf6555e9c6866989cd977166fae3cbbb954b";
   };
 
   disabled = pythonOlder "3.5";

From 679580be35051d33887b9af626c3bc72420e0718 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 22 Feb 2018 10:03:02 +0100
Subject: [PATCH 0699/2266] errbot: fix build

Those version specs only exist to keep compat with python 3.3 which we
are not using anyway.

(cherry picked from commit 560b2bce6ce84628f97e242a3015201378a90eef)
---
 pkgs/applications/networking/errbot/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 8664e38a8ed..feb6a0ab126 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -15,7 +15,9 @@ pythonPackages.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace dnspython3 dnspython
+      --replace dnspython3 dnspython \
+      --replace 'cryptography<2.1.0' cryptography \
+      --replace 'pyOpenSSL<17.3.0' pyOpenSSL
   '';
 
   # tests folder is not included in release

From f2f7b0579b8aaf85f1afebb6346b1fe1d9a7b246 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 10 Mar 2018 12:56:27 +0100
Subject: [PATCH 0700/2266] mupdf: import upstream patches for CVEs:
 2017-17858, 2018-1000051, 2018-6187, 2018-6192

---
 pkgs/applications/misc/mupdf/default.nix | 42 ++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index b0d8ba3bb08..1b510221d12 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -39,6 +39,48 @@ in stdenv.mkDerivation rec {
       url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7";
       sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627";
     })
+    (fetchpatch {
+      # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit.
+      name = "CVE-2017-17858.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731";
+      sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv";
+    })
+    (fetchpatch {
+      # Bug 698825: Do not drop borrowed colorspaces.
+      name = "CVE-2018-1000051.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384";
+      sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm";
+    })
+    (fetchpatch {
+      # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family.
+      name = "CVE-2018-6187.0.1.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807";
+      sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728";
+    })
+    (fetchpatch {
+      # Bug 698908 precondition: Fix "being able to search for redacted text" bug.
+      name = "CVE-2018-6187.0.2.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6";
+      sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s";
+    })
+    (fetchpatch {
+      # Bug 698908: Resize object use and renumbering lists after repair.
+      name = "CVE-2018-6187.1.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec";
+      sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j";
+    })
+    (fetchpatch {
+      # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter.
+      name = "CVE-2018-6187.2.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2";
+      sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc";
+    })
+    (fetchpatch {
+      # Bug 698916: Indirect object numbers must be in range.
+      name = "CVE-2018-6192.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299";
+      sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj";
+    })
   ]
 
   # Use shared libraries to decrease size

From 43935736f6d5d8860f0c4e63b630eb945ca36490 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 12:57:55 +0100
Subject: [PATCH 0701/2266] alot: move to own module

---
 .../python-modules/alot/default.nix           | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 45 +----------------
 2 files changed, 49 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/development/python-modules/alot/default.nix

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
new file mode 100644
index 00000000000..67cd7eafd12
--- /dev/null
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
+, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme}:
+
+buildPythonPackage rec {
+  version = "0.5.1";
+  pname = "alot";
+
+  disabled = isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "pazz";
+    repo = pname;
+    rev = "version";
+    sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8";
+  };
+
+  postPatch = ''
+    substituteInPlace alot/defaults/alot.rc.spec \
+      --replace "themes_dir = string(default=None)" \
+                "themes_dir = string(default='$out/share/themes')"
+  '';
+
+  propagatedBuildInputs = [
+    notmuch
+    urwid
+    urwidtrees
+    twisted
+    python_magic
+    configobj
+    pygpgme
+    mock
+    file
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share
+    cp -r extra/themes $out/share
+    wrapProgram $out/bin/alot \
+      --prefix LD_LIBRARY_PATH : '${stdenv.lib.makeLibraryPath [ notmuch file gpgme ]}'
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pazz/alot;
+    description = "Terminal MUA using notmuch mail";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c56e8642abb..b5865d21252 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -468,50 +468,7 @@ in {
 
   python-sybase = callPackage ../development/python-modules/sybase {};
 
-  alot = buildPythonPackage rec {
-    rev = "0.5.1";
-    name = "alot-${rev}";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "pazz";
-      repo = "alot";
-      inherit rev;
-      sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8";
-    };
-
-    postPatch = ''
-      substituteInPlace alot/defaults/alot.rc.spec \
-        --replace "themes_dir = string(default=None)" \
-                  "themes_dir = string(default='$out/share/themes')"
-    '';
-
-    propagatedBuildInputs =
-      [ self.notmuch
-        self.urwid
-        self.urwidtrees
-        self.twisted
-        self.python_magic
-        self.configobj
-        self.pygpgme
-        self.mock
-      ];
-
-    postInstall = ''
-      mkdir -p $out/share
-      cp -r extra/themes $out/share
-      wrapProgram $out/bin/alot \
-        --prefix LD_LIBRARY_PATH : '${pkgs.lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}'
-    '';
-
-    meta = {
-      homepage = https://github.com/pazz/alot;
-      description = "Terminal MUA using notmuch mail";
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ garbas ];
-    };
-  };
+  alot = callPackage ../development/python-modules/alot {};
 
   anyjson = buildPythonPackage rec {
     name = "anyjson-0.3.3";

From 83ee88e70fee515f436d5fa248a15a3b166be7d3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 10 Mar 2018 12:59:06 +0100
Subject: [PATCH 0702/2266] rugged: fix build

---
 pkgs/development/ruby-modules/gem-config/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index ac0b2dd07f8..a442155a631 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -259,8 +259,9 @@ in
     ];
   };
   rugged = attrs: {
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ cmake openssl libssh2 zlib ];
+    dontUseCmakeConfigure = true;
   };
 
   scrypt = attrs:

From 865b21548f19362d2297d5a16b9bba57af1a6bc7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Mar 2018 13:01:01 +0100
Subject: [PATCH 0703/2266] Revert "Merge pull request #36743 from xeji/gtkdoc"

This reverts commit bb38918fda8f42c7e0112aca156f0da5dd7a13ad, reversing
changes made to 83ee88e70fee515f436d5fa248a15a3b166be7d3.

This change should go to staging instead.
---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 5414abff66a..6e7b45b97f6 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,10 +1,6 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
 , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:
 
-let
-  pythonEnv = python.withPackages (ps: with ps; [ six ]);
-in
-
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
   version = "1.27";
@@ -22,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
-   [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+   [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
      gnome-doc-utils dblatex gettext which itstool
    ];
 

From 4eec6bc9c9cafac55dbf774a2fd30da7e5a79cc4 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 10 Mar 2018 11:39:11 +0100
Subject: [PATCH 0704/2266] gtk-doc: add missing runtime dependency on six

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index a176c5cb764..429bbd3ae63 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,6 +1,10 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
 , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:
 
+let
+  pythonEnv = python.withPackages (ps: with ps; [ six ]);
+in
+
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
   version = "1.25";
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
-   [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+   [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
      gnome-doc-utils dblatex gettext which itstool
    ];
 

From 282778ccddcee722f427f6fd7b9f20a0cc000762 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 10 Mar 2018 13:17:00 +0100
Subject: [PATCH 0705/2266] anyjson: move to own directory

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

diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix
new file mode 100644
index 00000000000..ba32cf7ea69
--- /dev/null
+++ b/pkgs/development/python-modules/anyjson/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }:
+
+buildPythonPackage rec {
+  pname = "anyjson";
+  version = "0.3.3";
+
+  # The tests are written in a python2 syntax but anyjson is python3 valid
+  doCheck = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba";
+  };
+
+  buildInputs = [ nose ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/anyjson/;
+    description = "Wrapper that selects the best available JSON implementation";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c56e8642abb..96f8101b043 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -513,24 +513,7 @@ in {
     };
   };
 
-  anyjson = buildPythonPackage rec {
-    name = "anyjson-0.3.3";
-
-    # The tests are written in a python2 syntax but anyjson is python3 valid
-    doCheck = !isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/anyjson/${name}.tar.gz";
-      sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba";
-    };
-
-    buildInputs = with self; [ self.nose ];
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/anyjson/;
-      description = "Wrapper that selects the best available JSON implementation";
-    };
-  };
+  anyjson = callPackage ../development/python-modules/anyjson {};
 
   amqp = buildPythonPackage rec {
     name = "amqp-${version}";

From b3d2a87b53219589e0f3db57a3efe587eca9b299 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 10 Mar 2018 11:39:11 +0100
Subject: [PATCH 0706/2266] gtk-doc: add missing runtime dependency on six

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 6e7b45b97f6..5414abff66a 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,6 +1,10 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
 , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:
 
+let
+  pythonEnv = python.withPackages (ps: with ps; [ six ]);
+in
+
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
   version = "1.27";
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
-   [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+   [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
      gnome-doc-utils dblatex gettext which itstool
    ];
 

From b7569bfb386607d41305c9b497a2d4063e921e5e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 10 Mar 2018 13:31:11 +0100
Subject: [PATCH 0707/2266] Revert "spotify: 1.0.69 -> 1.0.72"

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 7b78ceddda2..9ac0c49ebc3 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
   # Be careful not to pick the testing version.
-  version = "1.0.72.117.g6bd7cc73-35";
+  version = "1.0.69.336.g7edcc575-39";
 
   deps = [
     alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap";
+    sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 2093d4781db54b7602dfb8b7a37f0493d254451d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 10 Mar 2018 13:49:49 +0100
Subject: [PATCH 0708/2266] sage: set platforms to the set where I can build
 it; Hydra ARM builds seem to fail

---
 pkgs/applications/science/math/sage/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index eed964e3fa5..b74bcc3d637 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
       Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab.
     '';
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = ["x86_64-linux" "i686-linux"];
     maintainers = with stdenv.lib.maintainers; [ timokau ];
   };
 }

From 1347f909535c5c468b932dd8f37f093112e0c6b6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Mar 2018 23:11:15 +0100
Subject: [PATCH 0709/2266] pythonPackages.asgi_ipc: drop

This wath used for django-channels-1.x. The current version (2) does
not use it anymore
---
 .../python-modules/asgi_ipc/default.nix       | 21 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/development/python-modules/asgi_ipc/default.nix

diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
deleted file mode 100644
index bdb12203de6..00000000000
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl,
-  asgiref, msgpack, posix_ipc
-}:
-buildPythonPackage rec {
-  version = "1.4.2";
-  pname = "asgi_ipc";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-    sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037";
-  };
-
-  propagatedBuildInputs = [ asgiref msgpack posix_ipc ];
-
-  meta = with stdenv.lib; {
-    description = "Posix IPC-backed ASGI channel layer implementation";
-    license = licenses.bsd3;
-    homepage = https://github.com/django/asgi_ipc/;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c56e8642abb..e08117cb32d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -456,8 +456,6 @@ in {
 
   asgiref = callPackage ../development/python-modules/asgiref { };
 
-  asgi_ipc = callPackage ../development/python-modules/asgi_ipc { };
-
   asgi_redis = callPackage ../development/python-modules/asgi_redis { };
 
   python-editor = callPackage ../development/python-modules/python-editor { };

From dadba1cce3b73594e226305812e8c697efd0ed71 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Mar 2018 23:12:36 +0100
Subject: [PATCH 0710/2266] pythonPackages.asgi_redis: drop

This was part of django-channel-1.x. The current version (2) does not
use it anymore
---
 .../python-modules/asgi_redis/default.nix     | 24 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/development/python-modules/asgi_redis/default.nix

diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
deleted file mode 100644
index d4c9388f1a7..00000000000
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi,
-  asgiref, asgi_ipc, msgpack, six, redis, cryptography
-}:
-buildPythonPackage rec {
-  version = "1.4.3";
-  pname = "asgi_redis";
-  name = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "10xk7k7mcd28nb3v93mc8xa7sa6p02jnbl8idk6scr6p75jaixzi";
-  };
-
-  # Requires a redis server available
-  doCheck = false;
-
-  propagatedBuildInputs = [ asgiref asgi_ipc msgpack six redis cryptography ];
-
-  meta = with stdenv.lib; {
-    description = "Redis-backed ASGI channel layer implementation";
-    license = licenses.bsd3;
-    homepage = https://github.com/django/asgi_redis/;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e08117cb32d..899865a5dcd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -456,8 +456,6 @@ in {
 
   asgiref = callPackage ../development/python-modules/asgiref { };
 
-  asgi_redis = callPackage ../development/python-modules/asgi_redis { };
-
   python-editor = callPackage ../development/python-modules/python-editor { };
 
   python-gnupg = callPackage ../development/python-modules/python-gnupg {};

From 38753d52bc34aa5494d2ecc619b39c6fbeab2702 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Mar 2018 23:45:05 +0100
Subject: [PATCH 0711/2266] pythonPackages.asgiref: 2.1.5 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 223f53698e9..f40adc91b4b 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchurl, six }:
+{ stdenv, buildPythonPackage, fetchurl, six, async-timeout }:
 buildPythonPackage rec {
-  version = "2.1.5";
+  version = "2.2.0";
   pname = "asgiref";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgiref/${name}.tar.gz";
-    sha256 = "1a46196df28c67e046a54cc537ce5a8f6a59eb68649f54680d7e4fc3b113ab1b";
+    sha256 = "1fmrd749hqxwicnivvgrcw812gbj2zm49zcnkghh9yxbkjfcvxcv";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [ six async-timeout ];
 
   meta = with stdenv.lib; {
     description = "Reference ASGI adapters and channel layers";

From ddddca5c2fe1c93369404979ac194a1bc5d5fbaf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Mar 2018 23:45:35 +0100
Subject: [PATCH 0712/2266] pythonPackages.daphne: 2.0.3 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 86b00ca7408..d90804733ba 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   pname = "daphne";
   name = "${pname}-${version}";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb2075ce35ca00f2e5440cc034dfebd5c00d346de62ea45f099db089b868c31f";
+    sha256 = "13jv8jn8nf522smwpqdy4lq6cpd06fcgwvgl67i622rid51fj5gb";
   };
 
   buildInputs = [ hypothesis ];

From 34b06b05e3a57a40f628547f4c2d676d87905896 Mon Sep 17 00:00:00 2001
From: Ivan Solyankin <vanzef@gmail.com>
Date: Tue, 30 Jan 2018 14:27:38 +0300
Subject: [PATCH 0713/2266] marisa-python: init at 1.3.40

---
 .../python-modules/marisa/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/marisa/default.nix

diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix
new file mode 100644
index 00000000000..1117ba958fa
--- /dev/null
+++ b/pkgs/development/python-modules/marisa/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig }:
+
+buildPythonPackage rec {
+  pname = "marisa";
+  version = "1.3.40";
+
+  src = fetchFromGitHub {
+    owner = "s-yata";
+    repo  = "marisa-trie";
+    rev   = "59e410597981475bae94d9d9eb252c1d9790dc2f";
+    sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb";
+  };
+
+  nativeBuildInputs = [ swig marisa ];
+  buildinputs = [ marisa ];
+
+  sourceRoot = "${src.name}/bindings/python";
+
+  meta = with stdenv.lib; {
+    description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)";
+    homepage    = https://github.com/s-yata/marisa-trie;
+    license     = with licenses; [ bsd2 lgpl2 ];
+    maintainers = with maintainers; [ vanzef ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 899865a5dcd..20647399f74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9553,6 +9553,10 @@ in {
   mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {};
   marionette-harness = callPackage ../development/python-modules/marionette-harness {};
 
+  marisa = callPackage ../development/python-modules/marisa {
+    marisa = pkgs.marisa;
+  };
+
   markupsafe = buildPythonPackage rec {
     name = "markupsafe-${version}";
     version = "1.0";

From fed464103f1f345d7ab173666879d579dfffb9c8 Mon Sep 17 00:00:00 2001
From: Ivan Solyankin <vanzef@gmail.com>
Date: Tue, 30 Jan 2018 14:29:42 +0300
Subject: [PATCH 0714/2266] libkkc-data: init at 0.2.7

---
 pkgs/data/misc/libkkc-data/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 ++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/data/misc/libkkc-data/default.nix

diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix
new file mode 100644
index 00000000000..343071fcf59
--- /dev/null
+++ b/pkgs/data/misc/libkkc-data/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, marisa, libkkc }:
+
+stdenv.mkDerivation rec {
+  pname = "libkkc-data";
+  version = "0.2.7";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz";
+    sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
+  };
+
+  nativeBuildInputs = [ marisa ];
+
+  meta = with stdenv.lib; {
+    description = "Language model data package for libkkc";
+    homepage    = https://github.com/ueno/libkkc;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vanzef ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da64164e61b..344ddc3792f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1657,6 +1657,10 @@ with pkgs;
   skktools = callPackage ../tools/inputmethods/skk/skktools { };
   skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { };
 
+  libkkc-data = callPackage ../data/misc/libkkc-data {
+    inherit (pythonPackages) marisa;
+  };
+
   ibus = callPackage ../tools/inputmethods/ibus {
     inherit (gnome3) dconf gconf glib;
   };

From 80df6205ede8f996023972334e52f50bd298f7da Mon Sep 17 00:00:00 2001
From: Ivan Solyankin <vanzef@gmail.com>
Date: Tue, 30 Jan 2018 14:47:16 +0300
Subject: [PATCH 0715/2266] libkkc: init at 0.3.5

---
 pkgs/tools/inputmethods/libkkc/default.nix | 39 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/libkkc/default.nix

diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
new file mode 100644
index 00000000000..0051be14ee7
--- /dev/null
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl
+, vala, gobjectIntrospection, intltool, python2Packages, glib
+, pkgconfig
+, libgee, json_glib, marisa, libkkc-data
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libkkc";
+  version = "0.3.5";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
+  };
+
+  nativeBuildInputs = [
+    vala gobjectIntrospection
+    python2Packages.python python2Packages.marisa
+    intltool glib pkgconfig
+  ];
+
+  buildInputs = [ marisa libkkc-data ];
+  enableParallelBuilding = true;
+
+  propagatedBuildInputs = [ libgee json_glib ];
+
+  postInstall = ''
+    ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Japanese Kana Kanji conversion input method library";
+    homepage    = https://github.com/ueno/libkkc;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vanzef ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 344ddc3792f..1817a41e952 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1661,6 +1661,10 @@ with pkgs;
     inherit (pythonPackages) marisa;
   };
 
+  libkkc = callPackage ../tools/inputmethods/libkkc {
+    inherit (gnome3) libgee;
+  };
+
   ibus = callPackage ../tools/inputmethods/ibus {
     inherit (gnome3) dconf gconf glib;
   };

From 504b91185826583f041108d9bfe9e91f7c9240b4 Mon Sep 17 00:00:00 2001
From: Ivan Solyankin <vanzef@gmail.com>
Date: Tue, 30 Jan 2018 14:51:55 +0300
Subject: [PATCH 0716/2266] ibus-kkc: init at 1.5.22

---
 .../ibus-engines/ibus-kkc/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
new file mode 100644
index 00000000000..19d862e0308
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl
+, vala, intltool, pkgconfig
+, libkkc, ibus, skk-dicts
+, gtk3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ibus-kkc";
+  version = "1.5.22";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
+  };
+
+  nativeBuildInputs = [
+    vala intltool pkgconfig
+  ];
+
+  buildInputs = [ libkkc ibus skk-dicts gtk3 ];
+
+  postInstall = ''
+    ln -s ${skk-dicts}/share $out/share/skk
+  '';
+
+  meta = with stdenv.lib; {
+    isIbusEngine = true;
+    description  = "libkkc (Japanese Kana Kanji input method) engine for ibus";
+    homepage     = https://github.com/ueno/ibus-kkc;
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ vanzef ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1817a41e952..2b4fcd186a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1676,6 +1676,8 @@ with pkgs;
 
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
 
+    kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { };
+
     libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
 
     m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };

From 6b53a7cd09e2c49259512287413cb22f3bd8425f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 10 Mar 2018 16:15:57 +0100
Subject: [PATCH 0717/2266] blackmagic: Revert to gcc6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b4fcd186a7..83bf32a428d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7478,7 +7478,9 @@ with pkgs;
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
   bison = bison3;
 
-  blackmagic = callPackage ../development/tools/misc/blackmagic { };
+  blackmagic = callPackage ../development/tools/misc/blackmagic {
+    stdenv = overrideCC stdenv gcc6;
+  };
 
   bloaty = callPackage ../development/tools/bloaty { };
 

From 08704aa2f71f1d368a0370efeba411a4a8cdeda2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 10 Mar 2018 16:16:56 +0100
Subject: [PATCH 0718/2266] nixos/network-interfaces: Fix 2 small typos

---
 nixos/modules/tasks/network-interfaces.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5036b701bd8..95641c03b14 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -142,7 +142,7 @@ let
         default = { };
         example = { mtu = "1492"; window = "524288"; };
         description = ''
-          Other route options. See the symbol <literal>OPTION</literal>
+          Other route options. See the symbol <literal>OPTIONS</literal>
           in the <literal>ip-route(8)</literal> manual page for the details.
         '';
       };
@@ -191,7 +191,7 @@ let
       preferTempAddress = mkOption {
         type = types.bool;
         default = cfg.enableIPv6;
-        defaultText = literalExample "config.networking.enableIpv6";
+        defaultText = literalExample "config.networking.enableIPv6";
         description = ''
           When using SLAAC prefer a temporary (IPv6) address over the EUI-64
           address for originating connections. This is used to reduce tracking.

From 672e808dd35c3a059f29cfa4285dc1b3b296d065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 10 Mar 2018 12:53:54 +0000
Subject: [PATCH 0719/2266] ht: fix gcc7 compilation

---
 pkgs/applications/editors/ht/default.nix |  2 ++
 pkgs/applications/editors/ht/gcc7.patch  | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/applications/editors/ht/gcc7.patch

diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 112eebfaf6f..63864bc581d 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  patches = [ ./gcc7.patch ];
+
   meta = with lib; {
     description = "File editor/viewer/analyzer for executables";
     homepage = http://hte.sourceforge.net;
diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/applications/editors/ht/gcc7.patch
new file mode 100644
index 00000000000..a90deaac698
--- /dev/null
+++ b/pkgs/applications/editors/ht/gcc7.patch
@@ -0,0 +1,11 @@
+--- ht-2.1.0.org/htapp.cc	2014-09-14 16:55:26.000000000 +0100
++++ ht-2.1.0/htapp.cc	2018-03-10 12:48:07.158533800 +0000
+@@ -3023,7 +3023,7 @@
+ {
+ 	uint a = 2;
+ 	uint b = u/a;
+-	while (abs(a - b) > 1) {
++	while (abs((int)(a - b)) > 1) {
+ 		a = (a+b)/2;
+ 		b = u/a;
+         }

From 41cdea68dae91aeba626a532a3ebd9d3ba91d861 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 10 Mar 2018 18:02:05 +0100
Subject: [PATCH 0720/2266] kore: fix build with gcc7

---
 pkgs/development/web/kore/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
index eac2046a233..9049376a1f6 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/pkgs/development/web/kore/default.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  # added to fix build w/gcc7
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From 95e88ad818c92a3d6a2e0ed2f0e69ebb8ad6c8d8 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 10 Mar 2018 18:06:35 +0100
Subject: [PATCH 0721/2266] bip: Fix build

---
 pkgs/applications/networking/irc/bip/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index a79df085e6b..7c40a4e12a6 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ];
 
   meta = {
     description = "An IRC proxy (bouncer)";

From d39cd7aad50b7fcce8e16ad25b20262dd9e30780 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 6 Mar 2018 11:15:11 -0500
Subject: [PATCH 0722/2266] kicad-unstable: 2017-12-11 -> 2018-03-10

This is much closer to what will become the final kicad 5 release.
---
 pkgs/applications/science/electronics/kicad/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index f954bf5b70c..517629f415b 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -10,13 +10,13 @@
 with lib;
 stdenv.mkDerivation rec {
   name = "kicad-unstable-${version}";
-  version = "2017-12-11";
+  version = "2018-03-10";
 
   src = fetchFromGitHub {
     owner = "KICad";
     repo = "kicad-source-mirror";
-    rev = "1955f252265c38a313f6c595d6c4c637f38fd316";
-    sha256 = "15cc81h7nh5dk6gj6mc4ylcgdznfriilhb43n1g3xwyq3s8iaibz";
+    rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862";
+    sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0";
   };
 
   postPatch = ''

From 8684de926c4565f8d4d36ac3b58c192731f56a19 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 10 Mar 2018 11:01:53 +0100
Subject: [PATCH 0723/2266] altcoins.memorycoin: use boost165

---
 pkgs/applications/altcoins/default.nix    | 4 ++--
 pkgs/applications/altcoins/memorycoin.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 599103e7114..c89e33c4c50 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -46,8 +46,8 @@ rec {
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
   litecoind = callPackage ./litecoin.nix { withGui = false; };
 
-  memorycoin  = callPackage ./memorycoin.nix { withGui = true; };
-  memorycoind = callPackage ./memorycoin.nix { withGui = false; };
+  memorycoin  = callPackage ./memorycoin.nix { boost = boost165; withGui = true; };
+  memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; };
 
   namecoin  = callPackage ./namecoin.nix  { withGui = true; };
   namecoind = callPackage ./namecoin.nix { withGui = false; };
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index a14276d4fa2..b9335dbabe5 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec{
     homepage = http://www.bitcoin.org/;
     maintainers = with maintainers; [ AndersonTorres ];
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = subtractLists [ "aarch64-linux" ] platforms.unix;
   };
 }

From 884a3178288ebd42d15c06886da1239a630a2b5b Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 10 Mar 2018 19:36:14 +0100
Subject: [PATCH 0724/2266] kore: fix darwin build

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

diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
index 9049376a1f6..3da932b6b17 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/pkgs/development/web/kore/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   # added to fix build w/gcc7
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ];
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isLinux [ "-Wno-error=pointer-compare" ];
 
   enableParallelBuilding = true;
 

From d289736defcde7db476bd7d88e66e9a098e0b5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sat, 10 Mar 2018 11:35:22 +0100
Subject: [PATCH 0725/2266] pythonPackages.regex: fix darwin build

The package works fine on darwin. We run some tests to prove this.
---
 pkgs/development/python-modules/regex/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 44650618f5f..dc7b91a54a8 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, python
 }:
 
 
@@ -13,11 +14,15 @@ buildPythonPackage rec {
     sha256 = "2353c0e983c4029caf32016f1dddef623c3117ac282a818468c6d2f5d541698d";
   };
 
+  postCheck = ''
+    echo "We now run tests ourselves, since the setuptools installer doesn't."
+    ${python.interpreter} -c 'import test_regex; test_regex.test_main();'
+  '';
+
   meta = {
     description = "Alternative regular expression module, to replace re";
     homepage = https://bitbucket.org/mrabarnett/mrab-regex;
     license = lib.licenses.psfl;
-    platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ abbradar ];
   };
 }

From 94f0ef6628b6069c2b4e15da7f2b53a4b9870d97 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 10 Mar 2018 23:53:53 +0300
Subject: [PATCH 0726/2266] buildFHSEnv: fix compiler search paths

Fixes OpenWrt compilation.
---
 pkgs/build-support/build-fhs-userenv/env.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index da8a86b68f5..9c91090dc5c 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -54,9 +54,11 @@ let
     export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
 
     # Force compilers and other tools to look in default search paths
+    unset NIX_ENFORCE_PURITY
     export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1
     export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
-    export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32'
+    export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'
+    export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32'
     export PKG_CONFIG_PATH=/usr/lib/pkgconfig
     export ACLOCAL_PATH=/usr/share/aclocal
 

From f7c2288cfc36d35df1e6769a3a6c8b0cd1bb6c89 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 5 Mar 2018 17:32:10 +0300
Subject: [PATCH 0727/2266] zandronum: sound improvements

* Update fmod version to one with PulseAudio support;
* Dynamically link FluidSynth instead of using LD_LIBRARY_PATH;
* Use system libgme.

Fixes sound on some machines.
---
 pkgs/games/zandronum/default.nix | 26 ++++++++++-------
 pkgs/games/zandronum/fmod.nix    | 49 +++++++++++---------------------
 2 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index 377741ef544..ce32e435608 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage
-, soundfont-fluid, SDL, libGLU_combined, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3
+, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme
 , serverOnly ? false
 }:
 
@@ -7,6 +7,7 @@ let
   suffix = lib.optionalString serverOnly "-server";
   fmod = callPackage ./fmod.nix { };
   sqlite = callPackage ./sqlite.nix { };
+  clientLibPath = lib.makeLibraryPath [ fluidsynth ];
 
 in stdenv.mkDerivation {
   name = "zandronum${suffix}-3.0";
@@ -27,8 +28,8 @@ in stdenv.mkDerivation {
 
   # I have no idea why would SDL and libjpeg be needed for the server part!
   # But they are.
-  buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite ]
-             ++ lib.optionals (!serverOnly) [ libGLU_combined glew fmod fluidsynth gtk2 ];
+  buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ]
+             ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ];
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ];
 
@@ -44,9 +45,10 @@ in stdenv.mkDerivation {
   '';
 
   cmakeFlags =
-    lib.optional (!serverOnly) "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so"
-    ++ lib.optional serverOnly "-DSERVERONLY=ON"
-    ;
+    [ "-DFORCE_INTERNAL_GME=OFF" ]
+    ++ (if serverOnly
+    then [ "-DSERVERONLY=ON" ]
+    else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
 
   enableParallelBuilding = true;
 
@@ -59,16 +61,18 @@ in stdenv.mkDerivation {
        *.pk3 \
        ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \
        $out/lib/zandronum
-  '' + (if (!serverOnly) then
-          ''makeWrapper $out/lib/zandronum/zandronum $out/bin/zandronum --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${fluidsynth}/lib"''
-        else
-          ''makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}'');
+    makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}
+  '';
 
   postFixup = lib.optionalString (!serverOnly) ''
-    patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum \
+    patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \
       $out/lib/zandronum/zandronum
   '';
 
+  passthru = {
+    inherit fmod sqlite;
+  };
+
   meta = with stdenv.lib; {
     homepage = http://zandronum.com/;
     description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index b45ec24ca6b..7f76101d8ce 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -1,52 +1,35 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl, alsaLib, libpulseaudio }:
 
-assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
 let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ];
 
-  libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64";
-  patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
-
-  src =
-    (if (bits == "64") then
-      fetchurl {
-        url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz";
-        sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y";
-      }
-    else
-      fetchurl {
-        url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz";
-        sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5";
-      }
-    );
 in
 stdenv.mkDerivation rec {
-  inherit src;
+  name = "fmod-${version}";
+  version = "4.44.64";
 
-  name    = "fmod-${version}";
-  version = "4.24.16";
+  src = fetchurl {
+    url = "https://zdoom.org/files/fmod/fmodapi44464linux.tar.gz";
+    sha256 = "047hk92xapwwqj281f4zwl0ih821rrliya70gfj82sdfjh9lz8i1";
+  };
 
   dontStrip = true;
   dontPatchELF = true;
   dontBuild = true;
 
-  makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ];
-
-  preInstall = ''
-    mkdir -p $out/lib
-  '';
-
-  postInstall = ''
-    mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so
-    mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so
+  installPhase = ''
+    install -Dm755 api/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex-${version}.so
+    ln -s libfmodex-${version}.so $out/lib/libfmodex.so
+    patchelf --set-rpath ${libPath} $out/lib/libfmodex.so
+    cp -r api/inc $out/include
   '';
 
   meta = with stdenv.lib; {
     description = "Programming library and toolkit for the creation and playback of interactive audio";
-    homepage    = "http://www.fmod.org/";
+    homepage    = http://www.fmod.org/;
     license     = licenses.unfreeRedistributable;
-    platforms   = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.lassulus ];
+    platforms   = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ maintainers.lassulus ];
   };
 }

From 3e3d72b95a2d991f07aa9a85b9d9792a6a60e806 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 10 Mar 2018 20:16:02 +0000
Subject: [PATCH 0728/2266] xenPackages: deprecate Xen 4.5, security support
 ended

---
 pkgs/applications/virtualization/xen/4.5.nix      | 4 ++++
 pkgs/applications/virtualization/xen/generic.nix  | 3 ++-
 pkgs/applications/virtualization/xen/packages.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                   | 7 ++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 48f74ce72e5..bb6209ce47f 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -39,6 +39,10 @@ in
 callPackage (import ./generic.nix (rec {
   version = "4.5.5";
 
+  meta = {
+    knownVulnerabilities = [ "Security support ended in January 2018" ];
+  };
+
   src = fetchurl {
     url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
     sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 20033276fc8..0cbf30bea74 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -221,6 +221,7 @@ stdenv.mkDerivation (rec {
     done
   '';
 
+  # TODO(@oxij): Stop referencing args here
   meta = {
     homepage = http://www.xen.org/;
     description = "Xen hypervisor and related components"
@@ -231,5 +232,5 @@ stdenv.mkDerivation (rec {
                     + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
     platforms = [ "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
-  };
+  } // (config.meta or {});
 } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 35f6febb712..791a3b91818 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -2,7 +2,7 @@
 , stdenv, overrideCC, gcc49
 }:
 
-# TODO on new Xen version: generalize this to generate [vanilla slim
+# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
 # light] for each ./<version>.nix.
 
 rec {
@@ -149,8 +149,8 @@ rec {
     };
   };
 
-  xen-vanilla = xen_4_5-vanilla;
-  xen-slim = xen_4_5-slim;
-  xen-light = xen_4_5-light;
+  xen-vanilla = xen_4_8-vanilla;
+  xen-slim = xen_4_8-slim;
+  xen-light = xen_4_8-light;
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da64164e61b..0e0e34e59ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18353,9 +18353,10 @@ with pkgs;
 
   xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
 
-  xen = xenPackages.xen_4_5-vanilla;
-  xen-slim = xenPackages.xen_4_5-slim;
-  xen-light = xenPackages.xen_4_5-light;
+  xen = xenPackages.xen-vanilla;
+  xen-slim = xenPackages.xen-slim;
+  xen-light = xenPackages.xen-light;
+
   xen_4_8 = xenPackages.xen_4_8-vanilla;
   xen_4_8-slim = xenPackages.xen_4_8-slim;
   xen_4_8-light = xenPackages.xen_4_8-light;

From 91a9453496767ef60baa6d22574136dc86ad3322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sat, 10 Mar 2018 23:36:00 +0100
Subject: [PATCH 0729/2266] pythonPackages.construct: Fix darwin build

The package runs fine on darwin. Using pytest as a test runner also
resolves the checkPhase issue on Python 3.5+.
---
 pkgs/development/python-modules/construct/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 78aa0aab5c0..afba2e17bf6 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "construct";
@@ -14,15 +14,16 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  # Tests fail with the following error on Python 3.5+
-  # TypeError: not all arguments converted during string formatting
-  doCheck = pythonOlder "3.5";
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test -k 'not test_numpy' tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Powerful declarative parser (and builder) for binary data";
     homepage = http://construct.readthedocs.org/;
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ];
   };
 }

From cc1820322a819fc98f1e87ec4f748887872b07f7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 10 Mar 2018 23:58:01 +0100
Subject: [PATCH 0730/2266] svtplay-dl: 1.9.9 -> 1.9.10

---
 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 3042dfb215f..dfd784b7248 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 requests mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9.9";
+  version = "1.9.10";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1iam2pdcrlpcgk2hx3m7zawznp2p939xdv8cpll6sd6n0l4hpdc9";
+    sha256 = "1qi5c9ii3qq5s1rk7vj6n0kxbfqanbl0151id79b2qs96bpvj7vi";
   };
 
   pythonPaths = [ pycrypto requests ];

From 9db2a3e63859532b0b395a9786f513bd1a78bf36 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 14 Feb 2018 15:03:59 +0300
Subject: [PATCH 0731/2266] buildFHSEnv: export TZDIR

This is needed since NixOS keeps tzdata in non-standard /etc/zoneinfo path.
---
 pkgs/build-support/build-fhs-userenv/env.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 9c91090dc5c..d951fb9ab06 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -52,6 +52,7 @@ let
     export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
     export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
     export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
+    export TZDIR='/etc/zoneinfo'
 
     # Force compilers and other tools to look in default search paths
     unset NIX_ENFORCE_PURITY

From 8332b7aef91fc390c2a82deacc857044f29a6935 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 14 Feb 2018 14:01:57 +0300
Subject: [PATCH 0732/2266] steam: don't add zoneinfo manually

We already have this done for FHS environments in general.
---
 pkgs/games/steam/chrootenv.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 49d786284da..8fd8c3d7d20 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -9,16 +9,7 @@
 
 let
   commonTargetPkgs = pkgs: with pkgs;
-    let
-      tzdir = "${pkgs.tzdata}/share/zoneinfo";
-      # I'm not sure if this is the best way to add things like this
-      # to an FHSUserEnv
-      etc-zoneinfo = pkgs.runCommand "zoneinfo" {} ''
-        mkdir -p $out/etc
-        ln -s ${tzdir} $out/etc/zoneinfo
-        ln -s ${tzdir}/UTC $out/etc/localtime
-      '';
-    in [
+    [
       steamPackages.steam-fonts
       # Errors in output without those
       pciutils
@@ -30,8 +21,6 @@ let
       perl
       # Open URLs
       xdg_utils
-      # Zoneinfo
-      etc-zoneinfo
       iana-etc
     ] ++ lib.optional withJava jdk
       ++ lib.optional withPrimus primus
@@ -103,7 +92,6 @@ in buildFHSUserEnv rec {
 
   profile = ''
     export STEAM_RUNTIME=/steamrt
-    export TZDIR=/etc/zoneinfo
   '';
 
   runScript = writeScript "steam-wrapper.sh" ''

From 57d862fecf6f69aa1786fcab202dce798e3b380c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 11 Mar 2018 00:15:41 +0100
Subject: [PATCH 0733/2266] pythonPackages.discid: fix darwin build

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

diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix
index d237f366fdf..f3d403d9f2c 100644
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -10,15 +10,17 @@ buildPythonPackage rec {
     sha256 = "78a3bf6c8377fdbe3d85e914a209ff97aa43e35605779639847b510ced31f7b9";
   };
 
-  patchPhase = ''
-    substituteInPlace discid/libdiscid.py \
-      --replace '_open_library(_LIB_NAME)' "_open_library('${libdiscid}/lib/libdiscid.so.0')"
-  '';
+  patchPhase =
+    let extension = stdenv.hostPlatform.extensions.sharedLibrary; in
+    ''
+      substituteInPlace discid/libdiscid.py \
+        --replace "_open_library(_LIB_NAME)" \
+                  "_open_library('${libdiscid}/lib/libdiscid${extension}')"
+    '';
 
   meta = with stdenv.lib; {
     description = "Python binding of libdiscid";
     homepage    = "https://python-discid.readthedocs.org/";
     license     = licenses.lgpl3Plus;
-    platforms   = platforms.linux;
   };
 }

From 94458721a7f7fa6c8d1fb645e9d3051d18279af1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 11 Mar 2018 00:20:17 +0100
Subject: [PATCH 0734/2266] pythonPackages.htmltreediff: fix build

- add `pythonPackages.nose` as `checkInput` to make the tests passing
- extract expression into its own file

See https://hydra.nixos.org/build/70680974/log
See ticket #36453
---
 .../python-modules/htmltreediff/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +-----------------
 2 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/htmltreediff/default.nix

diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix
new file mode 100644
index 00000000000..5e839e4ada9
--- /dev/null
+++ b/pkgs/development/python-modules/htmltreediff/default.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }:
+
+buildPythonPackage rec {
+  version = "v0.1.2";
+  pname = "htmltreediff";
+
+  disabled = isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "christian-oudard";
+    repo = pname;
+    rev = version;
+    sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
+  };
+
+  propagatedBuildInputs = [ lxml html5lib ];
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = " Structure-aware diff for html and xml documents";
+    homepage = https://github.com/christian-oudard/htmltreediff;
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..9cc1945d1c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20547,30 +20547,7 @@ EOF
     };
   };
 
-  htmltreediff = buildPythonPackage rec{
-    version = "0.1.2";
-    pname = "htmltreediff";
-    name = pname + "-${version}";
-
-    # Does not work with Py >= 3
-    disabled = !isPy27;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "christian-oudard";
-      repo = pname;
-      rev = "v" + version;
-      sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
-    };
-
-    propagatedBuildInputs = with self; [ lxml html5lib ];
-
-    meta = {
-      description = " Structure-aware diff for html and xml documents";
-      homepage = https://github.com/christian-oudard/htmltreediff;
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [];
-    };
-  };
+  htmltreediff = callPackage ../development/python-modules/htmltreediff { };
 
   repeated_test = buildPythonPackage rec {
     name = "repeated_test-${version}";

From 4feaaa7f0669bbe2b6442670d8afc5ebe36d4b4b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 11 Mar 2018 00:09:11 +0100
Subject: [PATCH 0735/2266] pythonPackages.gplaycli: 0.1.2 -> 3.21

Fix the broken package: https://hydra.nixos.org/build/70687256/log

The newer version requires two new dependencies that have been added as
well:

- gpapi (Unofficial Python API for Google Play) at version 0.4.2
- pyaxmlparser (Parser for Android's XML handler) at version 0.3.7

See ticket #36453
See https://hydra.nixos.org/build/70687256/log
---
 .../python-modules/gpapi/default.nix          | 20 ++++++++++++
 .../python-modules/gplaycli/default.nix       | 26 ++++++++++++++++
 .../python-modules/pyaxmlparser/default.nix   | 20 ++++++++++++
 pkgs/top-level/python-packages.nix            | 31 +++----------------
 4 files changed, 70 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/gpapi/default.nix
 create mode 100644 pkgs/development/python-modules/gplaycli/default.nix
 create mode 100644 pkgs/development/python-modules/pyaxmlparser/default.nix

diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
new file mode 100644
index 00000000000..da3bbcf28db
--- /dev/null
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }:
+
+buildPythonPackage rec {
+  version = "0.4.2";
+  pname = "gpapi";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "1fv2y3xbwn512fjxrdwgq6cz0xjd7mh54nq1f18wyz8w40vcznns";
+  };
+
+  propagatedBuildInputs = [ requests protobuf pycryptodome ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/NoMore201/googleplay-api;
+    license = licenses.gpl3;
+    description = "Google Play Unofficial Python API";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
new file mode 100644
index 00000000000..01827fc87f5
--- /dev/null
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
+, protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  version = "3.21";
+  name = "gplaycli-${version}";
+
+  src = fetchFromGitHub {
+    owner = "matlink";
+    repo = "gplaycli";
+    rev = version;
+    sha256 = "1r5nzi9yzswam0866gypjcvv3f1rw13jwx9s49chp8byxy1dyrs2";
+  };
+
+ disabled = !isPy3k;
+
+ propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/matlink/gplaycli;
+    description = "Google Play Downloader via Command line";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
new file mode 100644
index 00000000000..be82cc7bf02
--- /dev/null
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, stdenv, lxml, click, fetchPypi }:
+
+buildPythonPackage rec {
+  version = "0.3.7";
+  pname = "pyaxmlparser";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1spwr28sc6fc3cqdx2j2zq38qx889hixl4ahhf1nphpmrl39ypxr";
+  };
+
+  propagatedBuildInputs = [ lxml click ];
+
+  meta = with stdenv.lib; {
+    description = "Python3 Parser for Android XML file and get Application Name without using Androguard";
+    homepage = https://github.com/appknox/pyaxmlparser;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa741766315..bca62dd36b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -287,6 +287,8 @@ in {
 
   pyatspi = disabledIf (!isPy3k) (callPackage ../development/python-modules/pyatspi { });
 
+  pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
+
   pycairo = callPackage ../development/python-modules/pycairo { };
 
   pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { });
@@ -4807,33 +4809,8 @@ in {
 
   google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
 
-  gplaycli = buildPythonPackage rec {
-    version = "0.1.2";
-    name = "gplaycli-${version}";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "matlink";
-      repo = "gplaycli";
-      rev = "${version}";
-      sha256 = "0yc09inzs3aggj0gw4irlhlzw5q562fsp0sks352y6z0vx31hcp3";
-    };
-
-   disabled = ! isPy27;
-
-   propagatedBuildInputs = with self; [ pkgs.libffi pyasn1 clint ndg-httpsclient protobuf requests args ];
-
-   preBuild = ''
-     substituteInPlace setup.py --replace "/etc" "$out/etc"
-     substituteInPlace gplaycli/gplaycli.py --replace "/etc" "$out/etc"
-   '';
-
-    meta = {
-      homepage = https://github.com/matlink/gplaycli;
-      description = "Google Play Downloader via Command line";
-      license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ ];
-    };
-  };
+  gpapi = callPackage ../development/python-modules/gpapi { };
+  gplaycli = callPackage ../development/python-modules/gplaycli { };
 
   gpsoauth = buildPythonPackage rec {
     version = "0.2.0";

From 12a70fd57198ff9587ee028fd21e609aeb5eeeae Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sun, 11 Mar 2018 00:46:41 +0100
Subject: [PATCH 0736/2266] Remove myself as maintainer

---
 maintainers/maintainer-list.nix                         | 5 -----
 pkgs/applications/networking/seafile-client/default.nix | 2 +-
 pkgs/development/libraries/libsearpc/default.nix        | 2 +-
 pkgs/development/libraries/libyubikey/default.nix       | 2 +-
 pkgs/development/libraries/libzdb/default.nix           | 4 ++--
 pkgs/misc/seafile-shared/default.nix                    | 2 +-
 pkgs/tools/misc/yubikey-personalization/default.nix     | 2 +-
 pkgs/tools/networking/ccnet/default.nix                 | 2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c84bbc54137..4aee16313aa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -636,11 +636,6 @@
     github = "calbrecht";
     name = "Christian Albrecht";
   };
-  calrama = {
-    email = "moritz@ucworks.org";
-    github = "MoritzMaxeiner";
-    name = "Moritz Maxeiner";
-  };
   calvertvl = {
     email = "calvertvl@gmail.com";
     github = "calvertvl";
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index e47a6ba6be3..3e637fa0f1c 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = [ maintainers.calrama ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 3898071c858..fae6dc82fcf 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec
     description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.calrama ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
index aa2c8131392..5b10e62deee 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = http://opensource.yubico.com/yubico-c/;
     description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ calrama wkennington ];
+    maintainers = with maintainers; [ wkennington ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index 9d9d8f54e14..4a5aa057a5c 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec
     description = "A small, easy to use Open Source Database Connection Pool Library";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.calrama ];
+    maintainers = [ ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 537576ca63b..f1ab822c6f4 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.calrama ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index c3bb28bc1a5..462f8d8e99a 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "A library and command line tool to personalize YubiKeys";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington calrama ];
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 036819ea76e..d4a279bcc42 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "A framework for writing networked applications in C";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.calrama ];
+    maintainers = [ ];
   };
 }

From 78f50651f99ebdc566b843cfcde3408db023467d Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sun, 11 Mar 2018 01:08:34 +0100
Subject: [PATCH 0737/2266] prometheus: add 2.1.0

---
 .../servers/monitoring/prometheus/default.nix | 80 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  7 +-
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 46c02c6bb95..86218a57284 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,42 +1,56 @@
 { stdenv, go, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "prometheus-${version}";
-  version = "1.8.1";
-  rev = "v${version}";
-
+let
   goPackagePath = "github.com/prometheus/prometheus";
 
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "prometheus";
+  generic = { version, sha256, ... }@attrs:
+    let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
+      buildGoPackage ({
+        name = "prometheus-${version}";
+
+        inherit goPackagePath;
+
+        src = fetchFromGitHub {
+          rev = "v${version}";
+          owner = "prometheus";
+          repo = "prometheus";
+          inherit sha256;
+        };
+
+        docheck = true;
+
+        buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+          -ldflags=
+             -X ${t}.Version=${version}
+             -X ${t}.Revision=unknown
+             -X ${t}.Branch=unknown
+             -X ${t}.BuildUser=nix@nixpkgs
+             -X ${t}.BuildDate=unknown
+             -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+        '';
+
+        preInstall = ''
+          mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+          cp -a $src/documentation/* $bin/share/doc/prometheus
+          cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+        '';
+
+        meta = with stdenv.lib; {
+          description = "Service monitoring system and time series database";
+          homepage = https://prometheus.io;
+          license = licenses.asl20;
+          maintainers = with maintainers; [ benley fpletz ];
+          platforms = platforms.unix;
+        };
+    } // attrs');
+in rec {
+  prometheus_1 = generic {
+    version = "1.8.1";
     sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
   };
 
-  docheck = true;
-
-  buildFlagsArray = let t = "${goPackagePath}/version"; in ''
-    -ldflags=
-       -X ${t}.Version=${version}
-       -X ${t}.Revision=unknown
-       -X ${t}.Branch=unknown
-       -X ${t}.BuildUser=nix@nixpkgs
-       -X ${t}.BuildDate=unknown
-       -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-  '';
-
-  preInstall = ''
-    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
-    cp -a $src/documentation/* $bin/share/doc/prometheus
-    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Service monitoring system and time series database";
-    homepage = https://prometheus.io;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley fpletz ];
-    platforms = platforms.unix;
+  prometheus_2 = generic {
+    version = "2.1.0";
+    sha256 = "01pbqfp43qrqcgyidyg2lw9jnjdrv140vnmqmm49z0vhlkxkwlvw";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73572ba2afd..81e828e085d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12587,8 +12587,13 @@ with pkgs;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
+  inherit (callPackage ../servers/monitoring/prometheus {})
+      prometheus_1
+      prometheus_2
+      ;
+
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
-  prometheus = callPackage ../servers/monitoring/prometheus { };
+  prometheus = prometheus_1;
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };

From 86ca617948127236dfb38f6459a6e4926d11dee5 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 11 Mar 2018 01:18:34 +0100
Subject: [PATCH 0738/2266] resilio: Adjust option description to 3d17573

---
 nixos/modules/services/networking/resilio.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index d1c4101f80b..2956a5ecbc0 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -50,12 +50,7 @@ in
         description = ''
           If enabled, start the Resilio Sync daemon. Once enabled, you can
           interact with the service through the Web UI, or configure it in your
-          NixOS configuration. Enabling the <literal>resilio</literal> service
-          also installs a systemd user unit which can be used to start
-          user-specific copies of the daemon. Once installed, you can use
-          <literal>systemctl --user start resilio</literal> as your user to start
-          the daemon using the configuration file located at
-          <literal>$HOME/.config/resilio-sync/config.json</literal>.
+          NixOS configuration.
         '';
       };
 

From fb8a85f6312392ab2fbc2b541ce1c439fdb8dc96 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 11 Mar 2018 01:33:41 +0100
Subject: [PATCH 0739/2266] ntbtls: 0.1.1 -> 0.1.2

---
 pkgs/development/libraries/ntbtls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
index b095c0366ad..59c12e53ed2 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "ntbtls-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchurl {
     url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2";
-    sha256 = "0d322kgih43vr0gvy7kdj4baql1d6fa71vgpv0z63ira9pk4q9rd";
+    sha256 = "1rywgdyj7prmwdi5r1rpglakqpnjskgln1mqksqm28qcwn2dnh42";
   };
 
   outputs = [ "dev" "out" ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tiny TLS 1.2 only implementation";
-    homepage = https://www.gnupg.org/software/ntbtls/index.html;
+    homepage = "https://www.gnupg.org/software/ntbtls/";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ joachifm ];

From 3117ae6c4fdd110c7699b07367c8e03a8bd6c45e Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 11 Mar 2018 01:38:34 -0500
Subject: [PATCH 0740/2266] libtar: add darwin to supported platforms

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

diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index 992bad020ea..8123bf7ba84 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "C library for manipulating POSIX tar files";
     homepage = http://www.feep.net/libtar/;
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = [ maintainers.bjornfor ];
   };
 }

From ff0f112527b108d5890ef0244ded787b6b7390aa Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 11 Mar 2018 01:39:04 -0500
Subject: [PATCH 0741/2266] languagemachines: fix darwin build

---
 pkgs/development/libraries/languagemachines/frog.nix        | 4 ++--
 pkgs/development/libraries/languagemachines/libfolia.nix    | 4 ++--
 pkgs/development/libraries/languagemachines/mbt.nix         | 4 ++--
 pkgs/development/libraries/languagemachines/timbl.nix       | 4 ++--
 pkgs/development/libraries/languagemachines/timblserver.nix | 4 ++--
 pkgs/development/libraries/languagemachines/ucto.nix        | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 725bc714db2..1a73a46d287 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
 , libxml2, icu
 , languageMachines
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchurl { inherit (release) url sha256;
                    name = "frog-${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf libtool autoconf-archive
+  buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2 icu
                   languageMachines.ticcutils
                   languageMachines.timbl
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
index d5c232ae776..a6f5adb9559 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2, icu
+, libxml2, icu, bzip2, libtar
 , languageMachines }:
 
 let
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchurl { inherit (release) url sha256;
                    name = "libfolia-${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils ];
+  buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
   preConfigure = "sh bootstrap.sh";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
index 2ffabac1ede..3bc78a96a06 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
 , libxml2
 , languageMachines
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchurl { inherit (release) url sha256;
                    name = "mbt-${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf libtool autoconf-archive
+  buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2
                   languageMachines.ticcutils
                   languageMachines.timbl
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
index d12c970d4dc..3ab38a9e84a 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2
+, libxml2, bzip2, libtar
 , languageMachines
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchurl { inherit (release) url sha256;
                    name = "timbl-${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf libtool autoconf-archive
+  buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2
                   languageMachines.ticcutils
                 ];
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
index 7a07e9f33a8..ee1579540c3 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive
 , libxml2
 , languageMachines
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   src = fetchurl { inherit (release) url sha256;
                    name = "timblserver-${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf libtool autoconf-archive
+  buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2
                   languageMachines.ticcutils
                   languageMachines.timbl
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
index 5c12a2142cc..8f917c2265d 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2, icu
+, libxml2, icu, bzip2, libtar
 , languageMachines
 }:
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   src = fetchurl { inherit (release) url sha256;
                    name = "ucto-${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ automake autoconf libtool autoconf-archive
-                  icu libxml2
+  buildInputs = [ automake autoconf bzip2 libtool autoconf-archive
+                  icu libtar libxml2
                   languageMachines.ticcutils
                   languageMachines.libfolia
                   languageMachines.uctodata

From 8b369a15d2db202fd3c103833f0bcf4c3e0a06d2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 10:07:34 +0100
Subject: [PATCH 0742/2266] hackage2nix: update list of broken Hydra builds

---
 .../configuration-hackage2nix.yaml            | 357 +-----------------
 1 file changed, 20 insertions(+), 337 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7e12bb03e8f..4fb886a3c35 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2833,6 +2833,7 @@ dont-distribute-packages:
   cusparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-raster-accelerate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libnvvm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  matlab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Obsidian:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   patch-image:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2913,9 +2914,6 @@ dont-distribute-packages:
   AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-llvm-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-typelits:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2964,8 +2962,6 @@ dont-distribute-packages:
   AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aern2-mp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aern2-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-applicative:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2973,7 +2969,6 @@ dont-distribute-packages:
   aeson-flowtyped:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-prefix:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-quick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2984,7 +2979,6 @@ dont-distribute-packages:
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ag-pictgen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agda-executable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3026,7 +3020,6 @@ dont-distribute-packages:
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-s3-streaming:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3056,7 +3049,6 @@ dont-distribute-packages:
   anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-authenticate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-clientsession:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3082,13 +3074,10 @@ dont-distribute-packages:
   applicative-fail:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apply-refact:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3102,7 +3091,6 @@ dont-distribute-packages:
   ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arithmoi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3135,7 +3123,6 @@ dont-distribute-packages:
   atmos-dimensional-tf:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   atndapi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atomic-modify:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3147,12 +3134,10 @@ dont-distribute-packages:
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-ip:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-trans:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-uri:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   attosplit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atuin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3372,8 +3357,6 @@ dont-distribute-packages:
   blockhash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloodhound-amazonka-auth:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3384,7 +3367,6 @@ dont-distribute-packages:
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bno055-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bogocopy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bolt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3392,7 +3374,6 @@ dont-distribute-packages:
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bookkeeping-jp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3409,14 +3390,12 @@ dont-distribute-packages:
   bricks-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brittany:                                     [ 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 ]
   bson-generic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3435,11 +3414,8 @@ dont-distribute-packages:
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-plain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-progress:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-strict-builder:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3461,21 +3437,18 @@ dont-distribute-packages:
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-helper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cabal-ide-backend:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-info:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-lenses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-src:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3508,7 +3481,6 @@ dont-distribute-packages:
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  canteven-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3542,19 +3514,16 @@ dont-distribute-packages:
   casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-cql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassava-megaparsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassava-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cassava:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   castle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   casui:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  catamorphism:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Catana:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   catch-fd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  category:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3574,7 +3543,6 @@ dont-distribute-packages:
   cef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  celtchar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cerberus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3654,17 +3622,10 @@ dont-distribute-packages:
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-plugin-ircbot:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-plugin-mailinglist:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-plugin-media:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-plugin-page:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-theme-bootstrap:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-clckwrks:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cld2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3719,13 +3680,11 @@ dont-distribute-packages:
   cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coincident-root-loci:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   colada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   colchis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   collapse-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collection-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3737,8 +3696,6 @@ dont-distribute-packages:
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3771,7 +3728,6 @@ dont-distribute-packages:
   composite-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-opaleye:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   composition-tree:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compressed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compstrat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3785,9 +3741,7 @@ dont-distribute-packages:
   concurrent-buffer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrent-Cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-dns-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrent-machines:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrent-utilities:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3805,7 +3759,6 @@ dont-distribute-packages:
   conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   confide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3822,9 +3775,7 @@ dont-distribute-packages:
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constraint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3839,7 +3790,6 @@ dont-distribute-packages:
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Contract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-dotdotdot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-exception-monadsfd:             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3853,7 +3803,6 @@ dont-distribute-packages:
   convert:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coordinate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-language:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-libraries:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3876,7 +3825,6 @@ dont-distribute-packages:
   couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   countable-inflections:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  courier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cparsing:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3904,7 +3852,6 @@ dont-distribute-packages:
   craze:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   crc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crdt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   creatur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   credential-store:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   credentials-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3926,6 +3873,7 @@ dont-distribute-packages:
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptocompare:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3941,14 +3889,12 @@ dont-distribute-packages:
   cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csv-to-qif:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cube:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3957,7 +3903,6 @@ dont-distribute-packages:
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cyclotomic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4000,17 +3945,11 @@ dont-distribute-packages:
   data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-flagset:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-foldapp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-forest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-interval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-lens-fd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-list-zigzag:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-map-multikey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4020,8 +3959,8 @@ dont-distribute-packages:
   data-repr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-result:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rev:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rtuple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4117,10 +4056,7 @@ dont-distribute-packages:
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-graphviz:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-gtk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-html5:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4128,10 +4064,8 @@ dont-distribute-packages:
   diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-qrcode:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-rasterific:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice2tex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4140,17 +4074,9 @@ dont-distribute-packages:
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   difftodo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-bootstrap:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-foundation-lucid:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-aeson:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-blaze:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-happstack:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-heist:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-lucid:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-scotty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-snap:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4191,7 +4117,6 @@ dont-distribute-packages:
   distributed-process-extras:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-fsm:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-lifted:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-p2p:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4303,7 +4228,6 @@ dont-distribute-packages:
   eccrypto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecstasy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eddie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   edenmodules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4315,17 +4239,15 @@ dont-distribute-packages:
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  either-list-functions:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Eight-Ball-Pool-Hack-Cheats:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-elastic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg-elasticsearch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-influxdb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-prometheus-adapter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4333,12 +4255,10 @@ dont-distribute-packages:
   ekg-rrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  elm-bridge:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   elm-websocket:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4354,9 +4274,7 @@ dont-distribute-packages:
   encoding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-growler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-snap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4405,7 +4323,6 @@ dont-distribute-packages:
   ethereum-analyzer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-client-haskell:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-merkle-patricia-db:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ety:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   euphoria:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Euterpea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4419,7 +4336,6 @@ dont-distribute-packages:
   eventstore:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ex-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-cover:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real-positional:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4437,7 +4353,6 @@ dont-distribute-packages:
   exinst-bytes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-deepseq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-hashable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4450,17 +4365,14 @@ dont-distribute-packages:
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extended-reals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-effects:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   extract-dependencies:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extralife:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facts:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4477,7 +4389,6 @@ dont-distribute-packages:
   fast-arithmetic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-combinatorics:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-nats:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-tagsoup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastcgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4486,17 +4397,13 @@ dont-distribute-packages:
   FastxPipe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fathead-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-dom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-geoposition:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-jquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay-ref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay-uri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4517,7 +4424,6 @@ dont-distribute-packages:
   feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fenfire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   FermatsLastMargin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fernet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4538,10 +4444,7 @@ dont-distribute-packages:
   filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filepath-crypto:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FilePather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filepather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Files:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   filestore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4555,7 +4458,6 @@ dont-distribute-packages:
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   find-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  finite-field:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   FiniteMap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   firefly-example:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   first-and-last:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4574,7 +4476,6 @@ dont-distribute-packages:
   fixer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fizzbuzz-as-a-service:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fizzbuzz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4590,7 +4491,6 @@ dont-distribute-packages:
   Flippi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flock:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow-er:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4605,7 +4505,6 @@ dont-distribute-packages:
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4632,6 +4531,7 @@ dont-distribute-packages:
   formura:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForSyDe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   forth-hll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Fortnite-Hack-Cheats-Free-V-Bucks-Generator:  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fortytwo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foscam-directory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   foscam-filename:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4709,7 +4609,6 @@ dont-distribute-packages:
   gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   garepinoh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gargoyle-postgresql:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4792,13 +4691,11 @@ dont-distribute-packages:
   ghc-dup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-exactprint:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-generic-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-justdoit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-man-completion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-mod:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4845,8 +4742,8 @@ dont-distribute-packages:
   Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ginsu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-config:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4862,12 +4759,9 @@ dont-distribute-packages:
   git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitHUD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-cmdline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-libgit2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4880,7 +4774,6 @@ dont-distribute-packages:
   glazier-react:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-b-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GLFW-task:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4975,8 +4868,6 @@ dont-distribute-packages:
   graphics-formats-collada:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphmod:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphql-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5008,7 +4899,6 @@ dont-distribute-packages:
   gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gstorable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gstreamer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5069,7 +4959,6 @@ dont-distribute-packages:
   hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-whatsnew:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackager:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5085,7 +4974,6 @@ dont-distribute-packages:
   haddocset:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadolint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-formats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hadoop-rpc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haggressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5122,7 +5010,6 @@ dont-distribute-packages:
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamtsolo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   handa-gdata:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5143,7 +5030,6 @@ dont-distribute-packages:
   happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-authenticate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-clientsession:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5310,7 +5196,6 @@ dont-distribute-packages:
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-system-build:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskus-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasmin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5377,8 +5262,8 @@ dont-distribute-packages:
   hdaemonize-buildfix:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbc-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDBC-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbc-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDBC-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbc-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5495,13 +5380,11 @@ dont-distribute-packages:
   hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5586,11 +5469,10 @@ dont-distribute-packages:
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmep:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm-hmatrix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hMollom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmp3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hmpf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5605,7 +5487,6 @@ dont-distribute-packages:
   hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hocilib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hocker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hodatime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5615,7 +5496,6 @@ dont-distribute-packages:
   hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hold-em:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5666,10 +5546,8 @@ dont-distribute-packages:
   HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPhone:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hplaylist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPlot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpodder:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5780,7 +5658,6 @@ dont-distribute-packages:
   hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslibsvm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslinks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSlippyMap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogger-reader:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogstash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsluv-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5889,8 +5766,6 @@ dont-distribute-packages:
   hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  human-parse:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  human-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hums:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5899,7 +5774,6 @@ dont-distribute-packages:
   hunp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hup:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurriyet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   husky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5908,17 +5782,13 @@ dont-distribute-packages:
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-avro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-kafka-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-kafka-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hweblib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwhile:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5961,7 +5831,6 @@ dont-distribute-packages:
   iban:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   icon-fonts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iconv-typed:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5971,7 +5840,6 @@ dont-distribute-packages:
   identifiers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   idiii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   idna2008:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  idna:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   IDynamic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ieee-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   iException:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5984,29 +5852,16 @@ dont-distribute-packages:
   igrf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-basic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-blaze:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-charts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-display:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-gnuplot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-hatex:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-inline-r:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-juicypixels:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-magic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-plot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-rlangqq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-widgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imagemagick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagepaste:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   imap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6049,7 +5904,6 @@ dont-distribute-packages:
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interlude-l:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6071,7 +5925,6 @@ dont-distribute-packages:
   iothread:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip2location:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipopt-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6082,13 +5935,11 @@ dont-distribute-packages:
   irc-fun-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-color:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Irc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ircbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iri:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   iridium:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   irt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  is:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   isdicom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6152,7 +6003,6 @@ dont-distribute-packages:
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-json-encoder:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6161,14 +6011,12 @@ dont-distribute-packages:
   json-encoder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-feed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-incremental-decoder:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-litobj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-pointer-hasql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-python:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-tracer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6206,8 +6054,8 @@ dont-distribute-packages:
   kafka-device-vrpn:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kaleidoscope:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kangaroo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-cores:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6222,7 +6070,6 @@ dont-distribute-packages:
   kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-i18n:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-protectedmodel:         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6254,7 +6101,6 @@ dont-distribute-packages:
   kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kmeans-vector:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmp-dfa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   knead-arithmetic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   knead:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6285,9 +6131,7 @@ dont-distribute-packages:
   lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-bullet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6334,7 +6178,6 @@ dont-distribute-packages:
   language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-puppet:                              [ i686-linux, x86_64-darwin ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-python-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-python:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6353,7 +6196,6 @@ dont-distribute-packages:
   latex-formulae-hakyll:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-image:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-pandoc:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  latex-function-tables:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LATS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6367,7 +6209,6 @@ dont-distribute-packages:
   lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LazyVault:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LDAP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldapply:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6375,7 +6216,6 @@ dont-distribute-packages:
   leapseconds:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Learning:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   leetify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-discovery-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-discovery:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6384,7 +6224,6 @@ dont-distribute-packages:
   leksah-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lens-properties:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-text-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6416,7 +6255,6 @@ dont-distribute-packages:
   liblinear-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   libltdl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libmolude:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libmpd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboath-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboleg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6426,7 +6264,6 @@ dont-distribute-packages:
   libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6494,7 +6331,6 @@ dont-distribute-packages:
   llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-hs-pretty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-pkg-config:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6503,7 +6339,6 @@ dont-distribute-packages:
   lmdb-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  load-balancing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6522,7 +6357,6 @@ dont-distribute-packages:
   LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-processes:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  logict-state:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   logplex-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6546,7 +6380,6 @@ dont-distribute-packages:
   loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   loshadka:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6557,7 +6390,6 @@ dont-distribute-packages:
   lua-bc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   luachunk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   luautils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lucid-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lucid-svg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lucienne:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lucu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6626,7 +6458,6 @@ dont-distribute-packages:
   mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  map-exts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mapping:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mapquest-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6634,18 +6465,15 @@ dont-distribute-packages:
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marvin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MASMGen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   master-plan:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   matchers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mathblog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mathlink:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matlab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   matplotlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   matsuri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   matterhorn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6659,7 +6487,6 @@ dont-distribute-packages:
   MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MBot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mcl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6678,8 +6505,8 @@ dont-distribute-packages:
   mecab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mech:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mecha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-fdk-aac:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-rtp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6687,9 +6514,6 @@ dont-distribute-packages:
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mellon-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mellon-gpio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mellon-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcache-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcache-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6772,7 +6596,6 @@ dont-distribute-packages:
   monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-classes-logging:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-codec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6781,16 +6604,13 @@ dont-distribute-packages:
   monad-lgbt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-log:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-memo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-open:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-resumption:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ste:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-task:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-tx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-unify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-wrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6860,7 +6680,6 @@ dont-distribute-packages:
   mtgoxapi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtl-evil-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtl-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtl-tf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtlx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck-Hspec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6873,7 +6692,6 @@ dont-distribute-packages:
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multi-instance:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6907,7 +6725,6 @@ dont-distribute-packages:
   mutable-iter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MutationOrder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mute-unmute:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvar-lock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6915,6 +6732,8 @@ dont-distribute-packages:
   mxnet-nn:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nnvm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  my-package-testing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  my-test-docs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   myanimelist-export:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mybitcoin-sci:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6933,7 +6752,6 @@ dont-distribute-packages:
   n-ary-functor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nakadi-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  namecoin-update:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NameGenerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   namelist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6962,7 +6780,6 @@ dont-distribute-packages:
   neko-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Neks:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nemesis-titan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nemesis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7009,7 +6826,6 @@ dont-distribute-packages:
   network-voicetext:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  networked-game:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-blashs:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-hmatrix:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7024,15 +6840,12 @@ dont-distribute-packages:
   NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nice-html:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nicovideo-translator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nikepub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nimber:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nirum:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nix-deploy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nix-diff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nix-eval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7043,7 +6856,6 @@ dont-distribute-packages:
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   noether:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nofib-analyse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7053,7 +6865,6 @@ dont-distribute-packages:
   Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   non-empty-zipper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nonfree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization-ad:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7066,7 +6877,6 @@ dont-distribute-packages:
   notzero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ntha:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ntrip-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NTRU:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7109,7 +6919,6 @@ dont-distribute-packages:
   odpic-raw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   off-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ogmarkup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7118,8 +6927,8 @@ dont-distribute-packages:
   olwrapper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   om-elm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnifmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7158,9 +6967,7 @@ dont-distribute-packages:
   OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  optimization:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optional:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   optparse-applicative-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7205,12 +7012,9 @@ dont-distribute-packages:
   padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pagarme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pagure-hook-receiver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paillier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-crossref:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-csv2table:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-emphasize-code:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include-code:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7260,7 +7064,6 @@ dont-distribute-packages:
   pasta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pastis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pasty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  patat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   patches-vector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pathfinder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pathfindingcore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7296,9 +7099,8 @@ dont-distribute-packages:
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perfect-hash-generator:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7311,7 +7113,6 @@ dont-distribute-packages:
   persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-mysql-haskell:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-redis:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-test:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7362,7 +7163,6 @@ dont-distribute-packages:
   pipes-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-illumina:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-kafka:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-lzma:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7375,7 +7175,6 @@ dont-distribute-packages:
   pipes-sqlite-simple:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-zeromq4:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-zlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Piso:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7397,13 +7196,9 @@ dont-distribute-packages:
   plot-gtk-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Plot-ho-matic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plot-light:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ploton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plumbers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7411,7 +7206,6 @@ dont-distribute-packages:
   pocket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointfree-fancy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pointfree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7455,7 +7249,6 @@ dont-distribute-packages:
   postgresql-named:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-schema:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-bind:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-opts:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-queue:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7473,13 +7266,11 @@ dont-distribute-packages:
   potoki-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  powerqueue-distributed:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PPrinter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   praglude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  preamble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7502,9 +7293,7 @@ dont-distribute-packages:
   Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  private-hackage-uploader:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  probable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-iterio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7517,10 +7306,8 @@ dont-distribute-packages:
   procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   producer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  product:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progress-meter:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7543,7 +7330,6 @@ dont-distribute-packages:
   proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  protobuf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   protolude-lifted:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7553,7 +7339,6 @@ dont-distribute-packages:
   proxy-mapping:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   psc-ide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ptr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  publicsuffixlist:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   publicsuffixlistcreate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubnub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubsub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7572,14 +7357,11 @@ dont-distribute-packages:
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-apn:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pushbullet-types:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pusher-http-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7626,7 +7408,6 @@ dont-distribute-packages:
   quickcheck-relaxng:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-report:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-string-random:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7678,7 +7459,6 @@ dont-distribute-packages:
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rank2classes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rapid-term:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-cmd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7693,7 +7473,6 @@ dont-distribute-packages:
   rasa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rattletrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7701,7 +7480,6 @@ dont-distribute-packages:
   razom-text-util:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7732,9 +7510,7 @@ dont-distribute-packages:
   record:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  recursion-schemes-ext:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   redland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7755,7 +7531,6 @@ dont-distribute-packages:
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reformat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  refresht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   refurb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7786,7 +7561,6 @@ dont-distribute-packages:
   regular-xmlpickler:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rehoo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7841,7 +7615,6 @@ dont-distribute-packages:
   respond:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   restful-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restless-git:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   RESTng:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   restyle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7864,9 +7637,7 @@ dont-distribute-packages:
   RichConditional:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  riemann:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   riff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple-federation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7900,15 +7671,12 @@ dont-distribute-packages:
   roller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rosa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rose-trees:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rose-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   roshask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rosmsg-bin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rosmsg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rospkg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rosso:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rotating-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rounding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-xml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7923,7 +7691,6 @@ dont-distribute-packages:
   rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RtMidi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7941,7 +7708,6 @@ dont-distribute-packages:
   runtime-arbitrary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  s-cargot-letbind:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7950,7 +7716,6 @@ dont-distribute-packages:
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safecopy-migrate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   safepath:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7989,7 +7754,6 @@ dont-distribute-packages:
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  schedule-planner:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedyield:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-texmath:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8008,7 +7772,6 @@ dont-distribute-packages:
   scotty-fay:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-format:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-hastache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-resource:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-view:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8049,11 +7812,9 @@ dont-distribute-packages:
   semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sendgrid-v3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sensei:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentence-jp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  separated:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqid-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8069,31 +7830,23 @@ dont-distribute-packages:
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-acid:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-token-api:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-token-leveldb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-token-persistent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-rocksdb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-token:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-client-core:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-ekg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-match:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-mock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-proto-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-pushbullet-client:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-py:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-router:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-ruby:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8103,12 +7856,12 @@ dont-distribute-packages:
   servant-zeppelin-swagger:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serverless-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-frontend-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   services:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sessiontypes-distributed:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sets:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8135,10 +7888,8 @@ dont-distribute-packages:
   shake-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-minify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-pack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shake-path:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-persist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shaker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shakers:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-babel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-sass:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8150,9 +7901,6 @@ dont-distribute-packages:
   Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shelltestrunner:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shelly-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shelly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   shopify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8165,8 +7913,6 @@ dont-distribute-packages:
   sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sigma-ij:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sign:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   silvi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8210,7 +7956,6 @@ dont-distribute-packages:
   singnal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  siren-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sitepipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8231,7 +7976,6 @@ dont-distribute-packages:
   slot-lambda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallcaps:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-laws:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-series:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8261,13 +8005,11 @@ dont-distribute-packages:
   snap-auth-cli:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-blaze-clay:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-configuration-utilities:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-cors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-error-collector:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-templates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8322,14 +8064,12 @@ dont-distribute-packages:
   snmp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snorkels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snowball:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8366,7 +8106,6 @@ dont-distribute-packages:
   spelling-suggest:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphinx-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sphinx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphinxesc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   spice:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SpinCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8400,7 +8139,6 @@ dont-distribute-packages:
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   squeal-postgresql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  squeeze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscan:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8450,8 +8188,6 @@ dont-distribute-packages:
   stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  staversion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stb-image-redux:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8485,13 +8221,10 @@ dont-distribute-packages:
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-cassava:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-pcap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-postgresql-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   strelka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8499,14 +8232,12 @@ dont-distribute-packages:
   string-isos:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stringprep:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-induction:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-traversal:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   structured-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stunclient:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stutter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8514,7 +8245,6 @@ dont-distribute-packages:
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   submark:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  successors:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffix-array:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8534,8 +8264,9 @@ dont-distribute-packages:
   superrecord:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supplemented:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8551,9 +8282,7 @@ dont-distribute-packages:
   sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  symantic-grammar:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   symantic-lib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  symantic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync-mht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8570,10 +8299,8 @@ dont-distribute-packages:
   syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntaxnet-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sys-process:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8597,7 +8324,6 @@ dont-distribute-packages:
   Tablify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablize:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  taffybar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tag-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-exception-core:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8688,7 +8414,6 @@ dont-distribute-packages:
   test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8702,20 +8427,16 @@ dont-distribute-packages:
   text-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-icu-translit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-icu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-markup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-position:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-regex-replace:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-zipper-monad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text1:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   textocat-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8730,7 +8451,6 @@ dont-distribute-packages:
   th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-printf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8744,10 +8464,9 @@ dont-distribute-packages:
   thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tibetan-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8813,7 +8532,6 @@ dont-distribute-packages:
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-call:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8827,6 +8545,7 @@ dont-distribute-packages:
   trajectory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   transactional-events:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   transf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transfer-db:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   transformations:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   TransformeR:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   transformers-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8868,7 +8587,6 @@ dont-distribute-packages:
   tsparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsuntsun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tttool:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tup-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8877,9 +8595,7 @@ dont-distribute-packages:
   tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8915,7 +8631,6 @@ dont-distribute-packages:
   type-level-natural-number-induction:          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-list:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-map:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8943,8 +8658,6 @@ dont-distribute-packages:
   uber:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   uberlast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   udp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8971,12 +8684,8 @@ dont-distribute-packages:
   unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unique-logic-tf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unique-logic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  units-defs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  units:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-fcntl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9008,7 +8717,6 @@ dont-distribute-packages:
   urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urlpath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9022,15 +8730,9 @@ dont-distribute-packages:
   utc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uu-cco-examples:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uu-cco-hut-parsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uuagc-bootstrap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uuagc-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uuagc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuid-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uulib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9072,13 +8774,11 @@ dont-distribute-packages:
   vector-space-map:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-space-opengl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-static:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vectortiles:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Verba:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   verbalexpressions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vicinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9089,7 +8789,6 @@ dont-distribute-packages:
   vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-operational:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-vectors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   virthualenv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vision:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9112,7 +8811,6 @@ dont-distribute-packages:
   waddle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wahsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-devel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-digestive-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-dispatch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-frontend-monadcgi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-git-http:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9138,10 +8836,8 @@ dont-distribute-packages:
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-postgresql:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9150,7 +8846,6 @@ dont-distribute-packages:
   wai-throttler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   waitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   waldo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-dynamic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-tls-uid:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9186,7 +8881,6 @@ dont-distribute-packages:
   webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   webfinger-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9224,7 +8918,6 @@ dont-distribute-packages:
   WMSigner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   word2vec-model:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9313,14 +9006,11 @@ dont-distribute-packages:
   xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMMS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmobar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-bluetilebranch:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-bluetilebranch:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-gpl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-vanessa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-wallpaper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-windownames:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmpipe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMPP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9351,7 +9041,6 @@ dont-distribute-packages:
   yamlkeysdiff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-sdl2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yandex-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9373,7 +9062,6 @@ dont-distribute-packages:
   yesod-auth-deskcom:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hmac-keccak:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9394,7 +9082,6 @@ dont-distribute-packages:
   yesod-job-queue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-markdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-media-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9404,7 +9091,6 @@ dont-distribute-packages:
   yesod-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-purescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-raml-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-recaptcha:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9413,7 +9099,6 @@ dont-distribute-packages:
   yesod-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-sass:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-session-redis:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-tableview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-test-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-text-markdown:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9440,7 +9125,6 @@ dont-distribute-packages:
   yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yxdb-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   z3-encoding:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  z3:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   zabt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zampolit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   zasni-gerna:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9477,7 +9161,6 @@ dont-distribute-packages:
   zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-refs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Zora:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zstd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zuramaru:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]

From f62deb0f92d250744055b45f7224b2301757c783 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 10:09:42 +0100
Subject: [PATCH 0743/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9-5-g32974fc from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3efaeb24c3f48ef7f430beea9e9274c535a81c12.
---
 .../haskell-modules/hackage-packages.nix      | 718 +++++++++---------
 1 file changed, 353 insertions(+), 365 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ee1132e952d..03be23adbc5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1836,7 +1836,6 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -1857,7 +1856,6 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Blogdown" = callPackage
@@ -2503,6 +2501,8 @@ self: {
        pname = "Cabal";
        version = "2.2.0.0";
        sha256 = "0bq4zgfvwlqjgsnph61pllvwhfmn8z224ycplqziyxc3zmwb3a96";
+       revision = "1";
+       editedCabalFile = "1fa2lvwj1b0yj06k8pb3smdhdyl94dxy9ac9jqmmj9cdv8msrb8x";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          mtl parsec pretty process text time transformers unix
@@ -4849,6 +4849,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EitherT" = callPackage
@@ -5560,7 +5561,6 @@ self: {
        homepage = "https://github.com/tonymorris/filepather";
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileSystem" = callPackage
@@ -5901,6 +5901,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Foster" = callPackage
@@ -6182,7 +6183,6 @@ self: {
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLHUI" = callPackage
@@ -6422,7 +6422,6 @@ self: {
        ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -6594,6 +6593,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GenericPretty_1_2_2" = callPackage
+    ({ mkDerivation, base, ghc-prim, pretty }:
+     mkDerivation {
+       pname = "GenericPretty";
+       version = "1.2.2";
+       sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf";
+       libraryHaskellDepends = [ base ghc-prim pretty ];
+       homepage = "https://github.com/RazvanRanca/GenericPretty";
+       description = "A generic, derivable, haskell pretty printer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GenussFold" = callPackage
     ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
      , cmdargs, containers, data-default, FormalGrammars, lens, mtl
@@ -8648,7 +8660,6 @@ self: {
        homepage = "https://github.com/apeyroux/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSmarty" = callPackage
@@ -11378,7 +11389,6 @@ self: {
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openldap;};
 
   "LParse" = callPackage
@@ -11716,7 +11726,6 @@ self: {
        homepage = "https://github.com/masterdezign/Learning#readme";
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Level0" = callPackage
@@ -12184,7 +12193,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -20140,7 +20148,6 @@ self: {
        homepage = "http://github.com/bgwines/zora";
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Zwaluw" = callPackage
@@ -20666,7 +20673,6 @@ self: {
        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;
      }) {};
 
   "accelerate-fourier_1_0_0_4" = callPackage
@@ -20753,7 +20759,6 @@ self: {
        ];
        description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -20776,7 +20781,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Accelerate backend for multicore CPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -21934,7 +21938,6 @@ self: {
        homepage = "https://github.com/michalkonecny/aern2";
        description = "Multi-precision floats via MPFR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aern2-real" = callPackage
@@ -21959,7 +21962,6 @@ self: {
        homepage = "https://github.com/michalkonecny/aern2";
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -22543,7 +22545,6 @@ self: {
        homepage = "https://github.com/libscott/aeson-quick";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-schema" = callPackage
@@ -22854,7 +22855,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/ag-pictgen";
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agda-server" = callPackage
@@ -25834,7 +25834,6 @@ self: {
        homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -27145,7 +27144,6 @@ self: {
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -27819,7 +27817,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -27887,7 +27884,6 @@ self: {
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate-equality" = callPackage
@@ -27987,7 +27983,6 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arcgrid" = callPackage
@@ -28400,7 +28395,6 @@ self: {
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "armada" = callPackage
@@ -29708,7 +29702,6 @@ self: {
        homepage = "https://github.com/chris-martin/atomic-modify";
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops" = callPackage
@@ -30155,7 +30148,6 @@ self: {
        homepage = "https://github.com/athanclark/attoparsec-ip#readme";
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -30293,7 +30285,6 @@ self: {
        homepage = "https://github.com/athanclark/attoparsec-uri#readme";
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-uri_0_0_4" = callPackage
@@ -33364,6 +33355,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bench_1_0_9" = callPackage
+    ({ mkDerivation, base, criterion, optparse-applicative, process
+     , silently, text, turtle
+     }:
+     mkDerivation {
+       pname = "bench";
+       version = "1.0.9";
+       sha256 = "0c58m6w0xci76h97p7dkzcnxn8l9drsl9gz5gihhfzdxiardahrw";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base criterion optparse-applicative process silently text turtle
+       ];
+       homepage = "http://github.com/Gabriel439/bench";
+       description = "Command-line benchmark tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "benchmark-function" = callPackage
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
@@ -37524,7 +37534,6 @@ self: {
        homepage = "https://github.com/phlummox/bogocopy";
        description = "Copy a directory tree, making zero-size sparse copies of big files";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bogre-banana" = callPackage
@@ -37744,7 +37753,6 @@ self: {
        homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme";
        description = "Helper functions for Japanese bookkeeping";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -38181,12 +38189,27 @@ self: {
        pname = "boxes";
        version = "0.1.4";
        sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf";
+       revision = "1";
+       editedCabalFile = "073kkci1pm6rci7mnq9v006679jk41bfzc0jfi7my4c7idwd1ijd";
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "boxes_0_1_5" = callPackage
+    ({ mkDerivation, base, QuickCheck, split }:
+     mkDerivation {
+       pname = "boxes";
+       version = "0.1.5";
+       sha256 = "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q";
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [ base QuickCheck split ];
+       description = "2D text pretty-printing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bpann" = callPackage
     ({ mkDerivation, base, random, split }:
      mkDerivation {
@@ -38608,7 +38631,6 @@ self: {
        homepage = "https://github.com/lspitzner/brittany/";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brittany_0_9_0_1" = callPackage
@@ -38924,7 +38946,6 @@ self: {
        homepage = "http://johannesgerer.com/buchhaltung";
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer" = callPackage
@@ -39606,7 +39627,6 @@ self: {
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -39787,7 +39807,6 @@ self: {
        homepage = "https://github.com/hvr/bytestring-plain";
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -39803,7 +39822,6 @@ self: {
        homepage = "http://github.com/acw/bytestring-progress";
        description = "A library for tracking the consumption of a lazy ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-read" = callPackage
@@ -40619,7 +40637,6 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-info" = callPackage
@@ -40811,7 +40828,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-mon" = callPackage
@@ -41012,7 +41028,6 @@ self: {
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-test" = callPackage
@@ -41983,7 +41998,6 @@ self: {
        homepage = "https://github.com/SumAll/haskell-canteven-log";
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canteven-parsedate" = callPackage
@@ -42905,7 +42919,6 @@ self: {
        homepage = "https://github.com/stackbuilders/cassava-megaparsec";
        description = "Megaparsec parser of CSV files that plays nicely with Cassava";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-records" = callPackage
@@ -43054,7 +43067,6 @@ self: {
        homepage = "https://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "catch-fd" = callPackage
@@ -43103,7 +43115,6 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Categorical types and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "category-extras" = callPackage
@@ -43501,7 +43512,6 @@ self: {
        homepage = "https://nest.pijul.com/lthms/celtchar";
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cerberus" = callPackage
@@ -46156,7 +46166,6 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -46175,7 +46184,6 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-dot-com" = callPackage
@@ -46250,7 +46258,6 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-mailinglist" = callPackage
@@ -46276,7 +46283,6 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -46301,7 +46307,6 @@ self: {
        homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-page" = callPackage
@@ -46327,7 +46332,6 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -46346,7 +46350,6 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
@@ -47932,7 +47935,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colada" = callPackage
@@ -48064,7 +48066,6 @@ self: {
        homepage = "https://github.com/alunduil/collection-json.hs";
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections" = callPackage
@@ -48472,7 +48473,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -48490,7 +48490,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -49416,7 +49415,6 @@ self: {
        homepage = "http://github.com/ekmett/compressed/";
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compression" = callPackage
@@ -49906,7 +49904,6 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-output" = callPackage
@@ -50009,7 +50006,6 @@ self: {
        homepage = "-";
        description = "More utilities and broad-used datastructures for concurrency";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrentoutput" = callPackage
@@ -50716,7 +50712,6 @@ self: {
        homepage = "https://github.com/protoben/config-parser";
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-schema" = callPackage
@@ -51245,7 +51240,6 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Reified constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constraint-classes" = callPackage
@@ -51322,7 +51316,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -51706,7 +51699,6 @@ self: {
        homepage = "https://github.com/erisco/control-dotdotdot";
        description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-event" = callPackage
@@ -52160,7 +52152,6 @@ self: {
        homepage = "https://github.com/NICTA/coordinate";
        description = "A representation of latitude and longitude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot" = callPackage
@@ -52667,7 +52658,6 @@ self: {
        homepage = "http://github.com/hargettp/courier";
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "court" = callPackage
@@ -53369,7 +53359,6 @@ self: {
        homepage = "https://github.com/cblp/crdt#readme";
        description = "Conflict-free replicated data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "creatur" = callPackage
@@ -54045,6 +54034,7 @@ self: {
        homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash";
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -54942,7 +54932,6 @@ self: {
        homepage = "http://mrvandalo.github.io/csv-to-qif/";
        description = "A small program that will read csv files and create qif files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ctemplate" = callPackage
@@ -55370,7 +55359,6 @@ self: {
        homepage = "http://curry-language.org";
        description = "Functions for manipulating Curry programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curry-frontend" = callPackage
@@ -55587,7 +55575,6 @@ self: {
        ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cypher" = callPackage
@@ -57082,7 +57069,6 @@ self: {
        homepage = "https://github.com/erisco/data-foldapp";
        description = "Fold function applications. Framework for variadic functions.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-forest" = callPackage
@@ -57096,7 +57082,6 @@ self: {
        homepage = "https://github.com/chris-martin/data-forest";
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-fresh" = callPackage
@@ -57183,7 +57168,6 @@ self: {
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-inttrie" = callPackage
@@ -57282,7 +57266,6 @@ self: {
        homepage = "http://github.com/roconnor/data-lens/";
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -57297,7 +57280,6 @@ self: {
        homepage = "http://github.com/roconnor/data-lens-fd/";
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -57361,7 +57343,6 @@ self: {
        homepage = "https://github.com/erisco/data-list-zigzag";
        description = "A list but with a balanced enumeration of Cartesian product";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-map-multikey" = callPackage
@@ -60900,7 +60881,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -60945,7 +60925,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -61056,7 +61035,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -61287,7 +61265,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -61434,7 +61411,6 @@ self: {
        ];
        description = "A simple, forward build system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dice" = callPackage
@@ -61741,7 +61717,6 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -61781,7 +61756,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-aeson" = callPackage
@@ -61804,7 +61778,6 @@ self: {
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -61821,7 +61794,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Blaze frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-happstack" = callPackage
@@ -61838,7 +61810,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -61883,7 +61854,6 @@ self: {
        homepage = "https://github.com/athanclark/digestive-functors-lucid";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-scotty" = callPackage
@@ -61903,7 +61873,6 @@ self: {
        homepage = "https://github.com/mmartin/digestive-functors-scotty";
        description = "Scotty backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -61921,7 +61890,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Snap backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digit" = callPackage
@@ -63113,7 +63081,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -64096,6 +64063,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "doctemplates_0_2_2" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, hspec, parsec, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "doctemplates";
+       version = "0.2.2";
+       sha256 = "1bfi33r48ifgrnj2iyx9d39vadzaq4ssqmf1k3cal5q0ywiw2srz";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers parsec
+         scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec text ];
+       homepage = "https://github.com/jgm/doctemplates#readme";
+       description = "Pandoc-style document templates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
@@ -66385,7 +66373,6 @@ self: {
        homepage = "http://github.com/isovector/ecstasy/";
        description = "A GHC.Generics based entity component system.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecu" = callPackage
@@ -66722,7 +66709,6 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects" = callPackage
@@ -67005,7 +66991,6 @@ self: {
        homepage = "https://github.com/chris-martin/either-list-functions#readme";
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either-unwrap" = callPackage
@@ -67156,7 +67141,6 @@ self: {
        homepage = "https://github.com/cdodev/ekg-elasticsearch";
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-influxdb" = callPackage
@@ -67464,7 +67448,6 @@ self: {
        homepage = "https://github.com/agrafix/elm-bridge";
        description = "Derive Elm types and Json code from Haskell types, using aeson's options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -67924,7 +67907,6 @@ self: {
        homepage = "http://github.com/knrafto/email-header";
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-postmark" = callPackage
@@ -68316,7 +68298,6 @@ self: {
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -68374,7 +68355,6 @@ self: {
        homepage = "http://github.com/ocharles/engine.io";
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-yesod" = callPackage
@@ -69800,7 +69780,6 @@ self: {
        ];
        description = "Random etymology online entry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "euler" = callPackage
@@ -70475,7 +70454,6 @@ self: {
        homepage = "https://github.com/kim/ex-pool";
        description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exact-combinatorics" = callPackage
@@ -70874,7 +70852,6 @@ self: {
        homepage = "https://github.com/k0001/exinst";
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -71292,7 +71269,6 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extcore" = callPackage
@@ -71366,7 +71342,6 @@ self: {
        homepage = "https://github.com/msakai/extended-reals/";
        description = "Extension of real numbers with positive/negative infinities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible" = callPackage
@@ -71597,7 +71572,6 @@ self: {
        homepage = "https://github.com/wuest/haskell-extralife-api";
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extrapolate" = callPackage
@@ -72109,7 +72083,6 @@ self: {
        homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-tagsoup-utf8-only" = callPackage
@@ -72307,7 +72280,6 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base" = callPackage
@@ -72321,7 +72293,6 @@ self: {
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-builder" = callPackage
@@ -72409,7 +72380,6 @@ self: {
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -72451,7 +72421,6 @@ self: {
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb" = callPackage
@@ -73081,7 +73050,6 @@ self: {
        homepage = "http://feldspar.github.com";
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -73767,7 +73735,6 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as filepaths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filepath-io-access" = callPackage
@@ -73797,7 +73764,6 @@ self: {
        homepage = "https://github.com/tonymorris/filepather";
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fileplow" = callPackage
@@ -74127,7 +74093,6 @@ self: {
        ];
        description = "Finite Fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "finite-typelits" = callPackage
@@ -74734,7 +74699,6 @@ self: {
        homepage = "https://github.com/chris-martin/fizzbuzz-as-a-service";
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flac" = callPackage
@@ -75152,7 +75116,6 @@ self: {
        homepage = "http://github.com/hesselink/flock";
        description = "Wrapper for flock(2)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow" = callPackage
@@ -75801,7 +75764,6 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -81156,7 +81118,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -81432,7 +81393,6 @@ self: {
        homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -83747,7 +83707,6 @@ self: {
        homepage = "http://github.com/gbataille/gitHUD#readme";
        description = "More efficient replacement to the great git-radar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitcache" = callPackage
@@ -84154,7 +84113,6 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -84202,7 +84160,6 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -87195,21 +87152,20 @@ self: {
   "google-server-api" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
      , bytestring, HsOpenSSL, http-api-data, http-client
-     , http-client-tls, mime-mail, monad-control, monad-logger, mtl
-     , read-env-var, RSA, servant, servant-client, text, time
-     , transformers, transformers-base, unix-time, unordered-containers
-     , wai, wai-extra, warp
+     , http-client-tls, mime-mail, monad-control, monad-logger, mtl, RSA
+     , servant, servant-client, text, time, transformers
+     , transformers-base, unix-time, unordered-containers, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "google-server-api";
-       version = "0.1.0.1";
-       sha256 = "1mnc8s2a13ax9y5f2044bq8wvgn2zbb7g5sy1rav60g3qia0dkpq";
+       version = "0.2.0.0";
+       sha256 = "1hwaxvmz3x4dhdzsfz1gjnp34jyln875bjwapvj885v1vis5jyk1";
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
          http-api-data http-client http-client-tls mime-mail monad-control
-         monad-logger mtl read-env-var RSA servant servant-client text time
-         transformers transformers-base unix-time unordered-containers wai
-         wai-extra warp
+         monad-logger mtl RSA servant servant-client text time transformers
+         transformers-base unix-time unordered-containers wai wai-extra warp
        ];
        homepage = "https://github.com/arowM/haskell-google-server-api#readme";
        description = "Google APIs for server to server applications";
@@ -88313,7 +88269,6 @@ self: {
        homepage = "http://github.com/yav/graphmod/wiki";
        description = "Present the module dependencies of a program as a \"dot\" graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphql" = callPackage
@@ -88354,7 +88309,6 @@ self: {
        homepage = "https://github.com/haskell-graphql/graphql-api#readme";
        description = "GraphQL API";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphs" = callPackage
@@ -89091,6 +89045,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grouped-list_0_2_1_5" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, pointed
+     , QuickCheck, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "grouped-list";
+       version = "0.2.1.5";
+       sha256 = "18y3v4jjrj1vrf3q8ki3yamb1n2sm8azp0cnaylpd6xslyr08yv5";
+       libraryHaskellDepends = [ base containers deepseq pointed ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groupoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -89329,7 +89300,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -91342,7 +91312,6 @@ self: {
        homepage = "https://github.com/stepcut/hackage-whatsnew";
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -91896,7 +91865,6 @@ self: {
        homepage = "http://github.com/jystic/hadoop-rpc";
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -93008,7 +92976,6 @@ self: {
        homepage = "https://github.com/tfc/hamtsolo#readme";
        description = "Intel AMT serial-over-lan (SOL) client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamusic" = callPackage
@@ -93499,7 +93466,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -98363,7 +98329,6 @@ self: {
        homepage = "http://www.haskus.org/system";
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskyapi" = callPackage
@@ -102428,7 +102393,6 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgis" = callPackage
@@ -102565,7 +102529,6 @@ self: {
        homepage = "https://github.com/thumphries/hgrep";
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgrev" = callPackage
@@ -105052,7 +105015,6 @@ self: {
        homepage = "https://github.com/masterdezign/hmep#readme";
        description = "HMEP Multi Expression Programming – a genetic programming variant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmidi" = callPackage
@@ -105587,7 +105549,6 @@ self: {
        homepage = "https://github.com/awakesecurity/hocker#readme";
        description = "Interact with the docker registry and generate nix build instructions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hodatime" = callPackage
@@ -105797,7 +105758,6 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hold-em" = callPackage
@@ -107453,7 +107413,6 @@ self: {
        homepage = "https://darcs.alokat.org/hpg";
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpio" = callPackage
@@ -107484,7 +107443,6 @@ self: {
        homepage = "https://github.com/quixoftic/hpio#readme";
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplayground" = callPackage
@@ -114028,7 +113986,6 @@ self: {
        homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "human-readable-duration" = callPackage
@@ -114055,7 +114012,6 @@ self: {
        homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hums" = callPackage
@@ -114307,7 +114263,6 @@ self: {
        homepage = "https://github.com/phlummox/hup";
        description = "Upload packages or documentation to a hackage server";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hurdle" = callPackage
@@ -114781,7 +114736,6 @@ self: {
        homepage = "https://github.com/haskell-works/hw-kafka-client";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rdkafka;};
 
   "hw-kafka-conduit" = callPackage
@@ -114806,7 +114760,6 @@ self: {
        homepage = "https://github.com/haskell-works/hw-kafka-conduit";
        description = "Conduit bindings for hw-kafka-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-mquery" = callPackage
@@ -115031,6 +114984,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -115175,7 +115129,6 @@ self: {
        homepage = "https://github.com/srijs/hwsl2";
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwsl2-bytevector" = callPackage
@@ -115188,7 +115141,6 @@ self: {
        homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwsl2-reducers" = callPackage
@@ -115203,7 +115155,6 @@ self: {
        homepage = "https://github.com/srijs/hwsl2-reducers";
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hx" = callPackage
@@ -116452,7 +116403,6 @@ self: {
        homepage = "https://github.com/adinapoli/iconv-typed#readme";
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend" = callPackage
@@ -116717,7 +116667,6 @@ self: {
        libraryHaskellDepends = [ base punycode stringprep text ];
        description = "Implements IDNA (RFC 3490)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idna2008" = callPackage
@@ -117065,7 +117014,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -117108,7 +117056,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -117126,7 +117073,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -117144,7 +117090,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -117170,7 +117115,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -117183,7 +117127,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-inline-r" = callPackage
@@ -117202,7 +117145,6 @@ self: {
        homepage = "https://tweag.github.io/HaskellR/";
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -117218,7 +117160,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -117236,7 +117177,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -117266,7 +117206,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -117303,7 +117242,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihs" = callPackage
@@ -117427,7 +117365,6 @@ self: {
        testPkgconfigDepends = [ imagemagick ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -117680,7 +117617,6 @@ self: {
        homepage = "https://github.com/k0ral/imm";
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -119353,7 +119289,6 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intern" = callPackage
@@ -120148,7 +120083,6 @@ self: {
        homepage = "https://github.com/andrewthad/haskell-ip#readme";
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip-quoter" = callPackage
@@ -120412,7 +120346,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "irc-client_1_1_0_1" = callPackage
+  "irc-client_1_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, containers
      , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
      , network-conduit-tls, old-locale, profunctors, stm, stm-chans
@@ -120420,8 +120354,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.1";
-       sha256 = "01p3p6x1ww5hcwq25nr7czm5z8xiz3sr998krdwfj94nl6z4n2ag";
+       version = "1.1.0.2";
+       sha256 = "1y9camx7vwpgr2qvqnkzk7rz9k0wkxrb35wflar4g9k0q6xqp2mi";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -120648,7 +120582,6 @@ self: {
        homepage = "https://github.com/stepcut/ircbot";
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -120788,7 +120721,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Generic pattern predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isdicom" = callPackage
@@ -122747,7 +122679,6 @@ self: {
        homepage = "http://github.com/ocharles/json-assertions.git";
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-ast" = callPackage
@@ -122968,7 +122899,6 @@ self: {
        homepage = "https://github.com/tfausak/json-feed#readme";
        description = "JSON Feed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-fu" = callPackage
@@ -123255,7 +123185,6 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-state" = callPackage
@@ -124847,7 +124776,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -125617,7 +125545,6 @@ self: {
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmp-dfa" = callPackage
@@ -126416,7 +126343,6 @@ self: {
        homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -126470,7 +126396,6 @@ self: {
        homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -127852,7 +127777,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -128347,7 +128271,6 @@ self: {
        homepage = "https://github.com/unitb/latex-function-tables";
        description = "Function table specifications in latex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lattices" = callPackage
@@ -129428,7 +129351,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-regex" = callPackage
@@ -130310,7 +130232,6 @@ self: {
        homepage = "http://github.com/vimus/libmpd-haskell#readme";
        description = "An MPD client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -130639,7 +130560,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
@@ -132701,7 +132621,6 @@ self: {
        homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {llvm-config = null;};
 
   "llvm-hs_6_0_0" = callPackage
@@ -133025,7 +132944,6 @@ self: {
        homepage = "https://github.com/SumAll/haskell-load-balancing";
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "load-env" = callPackage
@@ -133840,7 +133758,6 @@ self: {
        homepage = "https://github.com/atzedijkstra/logict-state";
        description = "Library for logic programming based on haskell package logict";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logplex-parse" = callPackage
@@ -134395,7 +134312,6 @@ self: {
        homepage = "https://github.com/swift-nav/loup";
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lowgl" = callPackage
@@ -134764,7 +134680,6 @@ self: {
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using lucid with colonnade";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lucid-extras" = callPackage
@@ -136472,6 +136387,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mandrill_0_5_3_3" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
+     , bytestring, containers, email-validate, http-client
+     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
+     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mandrill";
+       version = "0.5.3.3";
+       sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-html bytestring containers
+         email-validate http-client http-client-tls http-types lens mtl
+         old-locale QuickCheck text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "Library for interfacing with the Mandrill JSON API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mandulia" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, GLUT, hslua, time
@@ -136603,7 +136543,6 @@ self: {
        homepage = "http://github.com/charles-cooper/map-exts#readme";
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-syntax" = callPackage
@@ -136874,7 +136813,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup_4_0_4" = callPackage
@@ -137031,7 +136969,6 @@ self: {
        homepage = "https://marvin.readthedocs.io";
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -138412,7 +138349,6 @@ self: {
        homepage = "https://github.com/quixoftic/mellon#readme";
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -138425,7 +138361,6 @@ self: {
        homepage = "https://github.com/quixoftic/mellon#readme";
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mellon-web" = callPackage
@@ -138465,7 +138400,6 @@ self: {
        homepage = "https://github.com/quixoftic/mellon#readme";
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "melody" = callPackage
@@ -141418,7 +141352,6 @@ self: {
        homepage = "https://github.com/kawu/monad-codec";
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-connect" = callPackage
@@ -141542,8 +141475,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-finally";
-       version = "0.1.0.1";
-       sha256 = "0qam9qsm3cqk2r9x4jhmgg6c9kshf3aja765x0apgc0j9rk8zpyq";
+       version = "0.1.1";
+       sha256 = "0f2bb8l00vqsswsckc6zgnzl372jg1w7c1zgpcj8fq8bnvia23hb";
        libraryHaskellDepends = [
          base monad-abort-fd monad-control transformers transformers-abort
          transformers-base transformers-compat
@@ -141858,7 +141791,6 @@ self: {
        homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -142126,7 +142058,6 @@ self: {
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-skeleton" = callPackage
@@ -142260,7 +142191,6 @@ self: {
        homepage = "http://github.com/ninegua/monad-task";
        description = "A monad transformer that turns event processing into co-routine programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-time" = callPackage
@@ -143310,6 +143240,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_16" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, http-client, http-client-tls
+     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.16";
+       sha256 = "1k7j9dvl3m8l77r9m8d02nm9dxkr17y57d58x49icvk7bq0ij29x";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page optparse-applicative text text-format
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -144018,7 +143981,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -144263,7 +144225,6 @@ self: {
        homepage = "https://github.com/chris-martin/multi-instance#readme";
        description = "Typeclasses augmented with a phantom type parameter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multi-trie" = callPackage
@@ -145216,7 +145177,6 @@ self: {
        homepage = "https://github.com/chris-martin/mvar-lock";
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mvc" = callPackage
@@ -145437,6 +145397,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "my-test-docs" = callPackage
@@ -145461,6 +145422,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "myTestlll" = callPackage
@@ -145983,7 +145945,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Tool to keep namecoin names updated and well";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named" = callPackage
@@ -146812,7 +146773,6 @@ self: {
        homepage = "http://github.com/nfjinjing/nemesis";
        description = "a task management tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nemesis-titan" = callPackage
@@ -146935,10 +146895,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "8.0.1";
-       sha256 = "19m1aqhyzs86gdskv93lgr1rfgqy3spxz4sv21ych1mw719q0lzl";
-       isLibrary = true;
-       isExecutable = true;
+       version = "8.1.0";
+       sha256 = "1cd88ma1naw998ask0pc1whnyczrc5b9dp6n1maanc027f7rfn66";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring errors exceptions
          extractable-singleton hashable hashtables monad-control-aligned mtl
@@ -146947,12 +146905,14 @@ self: {
          wai-middleware-verbs wai-transformers
        ];
        testHaskellDepends = [
-         attoparsec base bytestring composition-extra errors exceptions
-         hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity
-         pred-set pred-trie regex-compat semigroups tasty tasty-hspec text
+         attoparsec base bifunctors bytestring composition-extra errors
+         exceptions extractable-singleton hashable hashtables HSet hspec
+         hspec-wai http-types monad-control-aligned mtl poly-arity pred-set
+         pred-trie regex-compat semigroups tasty tasty-hspec text
          transformers tries unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
+       homepage = "https://github.com/athanclark/nested-routes#readme";
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148479,7 +148439,6 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neural" = callPackage
@@ -148849,7 +148808,6 @@ self: {
        homepage = "https://github.com/mikeplus64/nice-html#readme";
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nicify" = callPackage
@@ -149038,7 +148996,6 @@ self: {
        homepage = "https://github.com/awakesecurity/nix-deploy#readme";
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-derivation" = callPackage
@@ -149081,7 +149038,6 @@ self: {
        homepage = "https://github.com/Gabriel439/nix-diff";
        description = "Explain why two Nix derivations differ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-eval" = callPackage
@@ -149341,7 +149297,6 @@ self: {
        homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib";
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nofib-analyze" = callPackage
@@ -149610,6 +149565,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonce_1_0_6" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
+     , transformers, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "nonce";
+       version = "1.0.6";
+       sha256 = "0nnx295vvkq0yygq8g5n6l167zaj0rdflf71hwph4clr4isk9dwn";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring entropy text transformers
+         unliftio unliftio-core
+       ];
+       homepage = "https://github.com/prowdsponsor/nonce";
+       description = "Generate cryptographic nonces";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nondeterminism" = callPackage
     ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
      mkDerivation {
@@ -149643,7 +149616,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonlinear-optimization" = callPackage
@@ -150009,7 +149981,6 @@ self: {
        homepage = "https://github.com/zjhmale/ntha";
        description = "A tiny statically typed functional programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nthable" = callPackage
@@ -151217,7 +151188,6 @@ self: {
        homepage = "https://nest.pijul.com/lthms/ogmarkup";
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -152775,7 +152745,6 @@ self: {
        homepage = "http://github.com/akc/opn";
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -152818,7 +152787,6 @@ self: {
        homepage = "http://github.com/bgamari/optimization";
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimusprime" = callPackage
@@ -154049,7 +154017,6 @@ self: {
        homepage = "https://pagure.io/pagure-hook-receiver";
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paint" = callPackage
@@ -154350,7 +154317,6 @@ self: {
        homepage = "https://github.com/lierdakil/pandoc-crossref#readme";
        description = "Pandoc filter for cross-references";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -154393,7 +154359,6 @@ self: {
        homepage = "https://github.com/owickstrom/pandoc-emphasize-code";
        description = "A Pandoc filter for emphasizing code in fenced blocks";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-filter-graphviz" = callPackage
@@ -156236,7 +156201,6 @@ self: {
        homepage = "http://github.com/jaspervdj/patat";
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -157572,7 +157536,6 @@ self: {
        homepage = "https://github.com/kostmo/perfect-hash-generator#readme";
        description = "Perfect minimal hashing implementation in native Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "perfecthash" = callPackage
@@ -157743,6 +157706,8 @@ self: {
        pname = "persistent";
        version = "2.7.1";
        sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2";
+       revision = "1";
+       editedCabalFile = "0ag2fd1iaiwiviskr5qzhgq7a0vr5x7vjq9zi75j25lahrqxxfm1";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger http-api-data
@@ -158196,7 +158161,6 @@ self: {
        ];
        description = "Backend for persistent library using Redis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-refs" = callPackage
@@ -159346,6 +159310,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinboard_0_9_12_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, monad-logger, mtl
+     , network, profunctors, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pinboard";
+       version = "0.9.12.9";
+       sha256 = "0h2w2ah7cqv0blb2pcdlzd4ww1f92x5ixr5ksqdqdcyzij2pbmbn";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types monad-logger mtl network profunctors random
+         safe-exceptions text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec mtl QuickCheck
+         safe-exceptions semigroups text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/jonschoning/pinboard";
+       description = "Access to the Pinboard API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
@@ -160118,7 +160109,6 @@ self: {
        homepage = "https://github.com/boothead/pipes-kafka";
        description = "Kafka in the Pipes ecosystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-key-value-csv" = callPackage
@@ -160584,7 +160574,6 @@ self: {
        homepage = "https://github.com/k0001/pipes-zlib";
        description = "Zlib and GZip compression and decompression for Pipes streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pisigma" = callPackage
@@ -161121,7 +161110,6 @@ self: {
        homepage = "https://github.com/ocramz/plot-light";
        description = "A lightweight plotting library, exporting to SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotfont" = callPackage
@@ -161171,7 +161159,6 @@ self: {
        homepage = "https://github.com/ishiy1993/ploton#readme";
        description = "A useful cli tool to draw figures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plots" = callPackage
@@ -161226,7 +161213,6 @@ self: {
        homepage = "https://github.com/stepcut/plugins";
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plugins-auto" = callPackage
@@ -161274,7 +161260,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ply-loader" = callPackage
@@ -161490,7 +161475,6 @@ self: {
        ];
        description = "Tool for refactoring expressions into pointfree form";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointfree-fancy" = callPackage
@@ -162858,7 +162842,6 @@ self: {
        homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple" = callPackage
@@ -163286,8 +163269,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.10";
-       sha256 = "19sym74az3fqh81pbkcqz6vjrwiglhf4n9042kf4x1naa0g4hz7k";
+       version = "0.10.3";
+       sha256 = "0q4pdmikv395gk9ahiild76g3gh9sa924w57dmlc2ly6gqk01mhh";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors text transformers unagi-chan
@@ -163429,7 +163412,6 @@ self: {
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A distributed worker backend for powerqueu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powerqueue-levelmem" = callPackage
@@ -163642,7 +163624,6 @@ self: {
        homepage = "https://github.com/swift-nav/preamble";
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "precis" = callPackage
@@ -164841,7 +164822,6 @@ self: {
        executableHaskellDepends = [ base directory shelly text ];
        description = "Upload a package to the public or private hackage, building its docs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "privileged-concurrency" = callPackage
@@ -164911,7 +164891,6 @@ self: {
        homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proc" = callPackage
@@ -165255,7 +165234,6 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Product category";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "product-isomorphic" = callPackage
@@ -165437,7 +165415,6 @@ self: {
        homepage = "https://github.com/esoeylemez/progress-meter";
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progress-reporting" = callPackage
@@ -166141,7 +166118,6 @@ self: {
        homepage = "https://github.com/alphaHeavy/protobuf";
        description = "Google Protocol Buffers via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf-native" = callPackage
@@ -166705,7 +166681,6 @@ self: {
        homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Is a given string a domain suffix?";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlistcreate" = callPackage
@@ -167176,7 +167151,6 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -167380,7 +167354,6 @@ self: {
        ];
        description = "Datatypes used by the Pushbullet APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -167424,7 +167397,6 @@ self: {
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -168844,7 +168816,6 @@ self: {
        homepage = "https://github.com/hiratara/hs-string-random#readme";
        description = "Helper to build generators with Text.StringRandom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-text" = callPackage
@@ -170298,7 +170269,6 @@ self: {
        homepage = "https://github.com/esoeylemez/rapid-term";
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa" = callPackage
@@ -170703,7 +170673,6 @@ self: {
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rattletrap_4_0_5" = callPackage
@@ -171000,7 +170969,6 @@ self: {
        homepage = "http://github.com/ekmett/rcu/";
        description = "Read-Copy-Update for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdf" = callPackage
@@ -172007,7 +171975,6 @@ self: {
        homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme";
        description = "Amateur addenda to recursion-schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -172095,7 +172062,6 @@ self: {
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis" = callPackage
@@ -172855,7 +172821,6 @@ self: {
        homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refty" = callPackage
@@ -173245,6 +173210,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-tdfa_1_2_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
+     , parsec, regex-base
+     }:
+     mkDerivation {
+       pname = "regex-tdfa";
+       version = "1.2.3";
+       sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9";
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim mtl parsec regex-base
+       ];
+       homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
+       description = "Replaces/Enhances Text.Regex";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-tdfa-pipes" = callPackage
     ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
      , regex-tdfa
@@ -173691,7 +173673,6 @@ self: {
        homepage = "https://github.com/jwiegley/rehoo";
        description = "Rebuild default.hoo from many .hoo files in the current directory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rei" = callPackage
@@ -175434,7 +175415,6 @@ self: {
        homepage = "https://github.com/lessrest/restless-git";
        description = "Easy Git repository serialization";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restricted-workers" = callPackage
@@ -176077,7 +176057,6 @@ self: {
        homepage = "https://github.com/tel/riemann-hs";
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riff" = callPackage
@@ -176138,7 +176117,6 @@ self: {
        homepage = "https://github.com/commercialhaskell/rio#readme";
        description = "A standard library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riot" = callPackage
@@ -176891,7 +176869,6 @@ self: {
        ];
        description = "Query the namecoin blockchain";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rose-trees" = callPackage
@@ -177042,7 +177019,6 @@ self: {
        homepage = "https://github.com/RoboticsHS/rospkg#readme";
        description = "ROS package system information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rosso" = callPackage
@@ -177088,7 +177064,6 @@ self: {
        homepage = "http://github.com/Soostone/rotating-log";
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundRobin" = callPackage
@@ -177452,7 +177427,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -177899,7 +177873,6 @@ self: {
        homepage = "https://github.com/GaloisInc/s-cargot-letbind";
        description = "Enables let-binding and let-expansion for s-cargot defined S-expressions";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "s-expression" = callPackage
@@ -178230,7 +178203,6 @@ self: {
        homepage = "https://github.com/NCrashed/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safeint" = callPackage
@@ -179446,7 +179418,6 @@ self: {
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedyield" = callPackage
@@ -180010,7 +179981,6 @@ self: {
        homepage = "https://github.com/taphu/scotty-resource";
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-rest" = callPackage
@@ -180348,6 +180318,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
+     , StateVar, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.4.0";
+       sha256 = "1wnkr4p58yrhzfkn2f2x4km4pnnwb9rmj0r0m0fflx4407cb1hf4";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, sdl2 }:
      mkDerivation {
@@ -181363,7 +181354,6 @@ self: {
        homepage = "https://github.com/hspec/sensei#readme";
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sensenet" = callPackage
@@ -181473,7 +181463,6 @@ self: {
        homepage = "https://github.com/qfpl/separated";
        description = "A data type with elements separated by values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqaid" = callPackage
@@ -182235,7 +182224,6 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -182276,7 +182264,6 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token-api#readme";
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -182300,7 +182287,6 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -182322,7 +182308,6 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -182868,7 +182853,6 @@ self: {
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -183111,7 +183095,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-mock_0_8_4" = callPackage
@@ -183352,7 +183335,6 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-py" = callPackage
@@ -183483,7 +183465,6 @@ self: {
        homepage = "https://github.com/joneshf/servant-ruby#readme";
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ruby_0_7_0_0" = callPackage
@@ -184036,6 +184017,7 @@ self: {
        homepage = "https://github.com/seek-oss/serverless-haskell#readme";
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession" = callPackage
@@ -184333,7 +184315,6 @@ self: {
        homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme";
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-cover" = callPackage
@@ -185045,7 +185026,6 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-persist" = callPackage
@@ -185114,7 +185094,6 @@ self: {
        homepage = "https://github.com/swift-nav/shakers";
        description = "Shake helpers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shakespeare" = callPackage
@@ -185553,7 +185532,6 @@ self: {
        homepage = "https://github.com/simonmichael/shelltestrunner";
        description = "Easy, repeatable testing of CLI programs/commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly" = callPackage
@@ -185584,7 +185562,6 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly_1_7_1" = callPackage
@@ -185633,7 +185610,6 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shelly features that require extra dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shentong" = callPackage
@@ -186177,7 +186153,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sign" = callPackage
@@ -186200,7 +186175,6 @@ self: {
        ];
        description = "Arithmetic over signs and sets of signs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "signal" = callPackage
@@ -187498,7 +187472,6 @@ self: {
        homepage = "https://github.com/alunduil/siren-json.hs";
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sirkel" = callPackage
@@ -188314,7 +188287,6 @@ self: {
        ];
        description = "Flatten camel case text in LaTeX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcheck" = callPackage
@@ -188993,7 +188965,6 @@ self: {
        homepage = "https://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-elm" = callPackage
@@ -189217,7 +189188,6 @@ self: {
        homepage = "http://snapframework.com/";
        description = "Scaffolding CLI for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-testing" = callPackage
@@ -190317,7 +190287,6 @@ self: {
        homepage = "http://hub.darcs.net/dag/snowball";
        description = "Bindings to the Snowball library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snowflake" = callPackage
@@ -190539,7 +190508,6 @@ self: {
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-sctp" = callPackage
@@ -191623,7 +191591,6 @@ self: {
        homepage = "https://github.com/gregwebs/haskell-sphinx-client";
        description = "Haskell bindings to the Sphinx full-text searching daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sphinx-cli" = callPackage
@@ -192332,24 +192299,24 @@ self: {
      }) {inherit (pkgs) openssl;};
 
   "sqlcli" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, logging, text, transformers }:
      mkDerivation {
        pname = "sqlcli";
-       version = "0.1.0.0";
-       sha256 = "1xkq7pjvmhb4gc85val4fnd6jsbx7dmybq842r40vdbbxj8swh5v";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.2.0.0";
+       sha256 = "164p1frqcazzhcwd1b5n1y890nigai79s1qg8vkailfvnzdxffvq";
+       libraryHaskellDepends = [ base logging text transformers ];
        homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli";
        description = "Sql Call-Level Interface bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "sqlcli-odbc" = callPackage
-    ({ mkDerivation, base, sqlcli }:
+    ({ mkDerivation, base, logging, sqlcli }:
      mkDerivation {
        pname = "sqlcli-odbc";
-       version = "0.1.0.1";
-       sha256 = "176jz0y435rdg1cg03a9aa2jd1a26gi5id9d3fbm91wv6fyjj6lm";
-       libraryHaskellDepends = [ base sqlcli ];
+       version = "0.2.0.0";
+       sha256 = "1zq1rgj32w72arhplqfiygflg8gablpm1alppd3y03wki1gnrd95";
+       libraryHaskellDepends = [ base logging sqlcli ];
        homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc";
        description = "Specific ODBC definitions to be used by SQL CLI clients";
        license = stdenv.lib.licenses.bsd3;
@@ -192510,7 +192477,6 @@ self: {
        homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -194190,7 +194156,6 @@ self: {
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-image" = callPackage
@@ -194216,7 +194181,6 @@ self: {
        homepage = "https://github.com/typedrat/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-truetype" = callPackage
@@ -194427,8 +194391,8 @@ self: {
      }:
      mkDerivation {
        pname = "stitch";
-       version = "0.4.0.0";
-       sha256 = "0xxdj4k4ci0gkvnnvb1rl0v31pjv209yyz88dzpdpr5x58i19hbj";
+       version = "0.5.0.0";
+       sha256 = "0dk9h9arldzwsfg8cad374w7lipi4w43ady7dsmima4jyg4724h9";
        libraryHaskellDepends = [ base containers text transformers ];
        testHaskellDepends = [ base Cabal hspec text ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -195402,7 +195366,6 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-commons" = callPackage
@@ -195489,7 +195452,6 @@ self: {
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-eversion" = callPackage
@@ -195613,7 +195575,6 @@ self: {
        ];
        description = "Stream postgresql-query results using the streaming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-utils" = callPackage
@@ -196244,7 +196205,6 @@ self: {
        ];
        description = "Implements the \"StringPrep\" algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strings" = callPackage
@@ -196707,7 +196667,6 @@ self: {
        ];
        description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stunts" = callPackage
@@ -197074,7 +197033,6 @@ self: {
        homepage = "https://github.com/nomeata/haskell-successors";
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suffix-array" = callPackage
@@ -197592,6 +197550,7 @@ self: {
        homepage = "https://github.com/qfpl/sv";
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg-builder" = callPackage
@@ -198169,7 +198128,6 @@ self: {
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symantic-document" = callPackage
@@ -198197,7 +198155,6 @@ self: {
        ];
        description = "Library for symantic grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symantic-lib" = callPackage
@@ -198655,7 +198612,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-core" = callPackage
@@ -198806,7 +198762,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sys-auth-smbclient" = callPackage
@@ -199538,7 +199493,6 @@ self: {
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "tag-bits" = callPackage
@@ -202819,7 +202773,6 @@ self: {
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-feat" = callPackage
@@ -203078,6 +203031,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-all_0_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, text, text-format, utf8-string
+     }:
+     mkDerivation {
+       pname = "text-all";
+       version = "0.4.2";
+       sha256 = "0mh2dwd0b732jcg2bak04iwrb34cy28hq2dppb8pp5r5a0g4925g";
+       libraryHaskellDepends = [
+         base bytestring text text-format utf8-string
+       ];
+       homepage = "http://github.com/aelve/text-all";
+       description = "Everything Data.Text related in one package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-and-plots" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, markdown
      , text, unordered-containers
@@ -203271,7 +203240,6 @@ self: {
        homepage = "https://github.com/bos/text-icu";
        description = "Bindings to the ICU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-icu-normalized" = callPackage
@@ -203315,7 +203283,6 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -203596,7 +203563,6 @@ self: {
        ];
        description = "Easy replacement when using text-icu regexes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-region" = callPackage
@@ -203953,7 +203919,6 @@ self: {
        homepage = "https://github.com/qfpl/text1";
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "textPlot" = callPackage
@@ -204495,7 +204460,6 @@ self: {
        homepage = "https://github.com/pikajude/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-compat" = callPackage
@@ -205014,7 +204978,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -207436,8 +207399,8 @@ self: {
      }:
      mkDerivation {
        pname = "toxiproxy-haskell";
-       version = "0.1.0.0";
-       sha256 = "19ls808f24in0c8swgv7iqwja9f126zvcc0a7ix615i0a9hp3ks6";
+       version = "0.2.1.0";
+       sha256 = "0c0xrl2ynk3b31ja4bh2pfmf8zhb4fxlazj7l07477f1yws7vqla";
        libraryHaskellDepends = [
          aeson base containers http-client servant servant-client text
        ];
@@ -207500,7 +207463,6 @@ self: {
        homepage = "https://github.com/msakai/toysolver/";
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tpar" = callPackage
@@ -207683,6 +207645,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "trackit" = callPackage
+    ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic
+     , process, process-extras, stm, text, time, vty
+     }:
+     mkDerivation {
+       pname = "trackit";
+       version = "0.1";
+       sha256 = "0dcf3h140pwvyrfb0x6b4brp9bpr2p1krd1pvl014jvqak4q2q7d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick fsnotify mtl optparse-generic process process-extras stm
+         text time vty
+       ];
+       description = "A command-line tool for live monitoring";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tracy" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -207774,6 +207754,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transfer-db" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, clock
+     , console-program, containers, cpu, hspec, logging, monad-control
+     , QuickCheck, sqlcli, sqlcli-odbc, stm, store, store-core
+     , temporary, text, th-utilities, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "transfer-db";
+       version = "0.3.1.0";
+       sha256 = "0gmgn78p0gfpm8iqkziz50yrx59lkj6m11lnawyfi55dxjjcwqgf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring clock containers logging monad-control sqlcli
+         sqlcli-odbc stm store store-core temporary text th-utilities time
+         transformers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cassava clock console-program containers
+         logging monad-control sqlcli sqlcli-odbc stm time transformers yaml
+       ];
+       testHaskellDepends = [
+         base bytestring cpu hspec QuickCheck sqlcli store time transformers
+       ];
+       homepage = "http://hub.darcs.net/mihaigiurgeanu/transfer-db";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transformations" = callPackage
     ({ mkDerivation, base, containers, criterion, mtl, multirec, parsec
      , QuickCheck, regular, template-haskell
@@ -207973,6 +207982,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-fix" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "transformers-fix";
+       version = "1.0";
+       sha256 = "02aapq88k81q9r6wmvmg9zjyrmz9qzi4gss75p18lkc4dgrzzlb5";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/thumphries/transformers-fix";
+       description = "Monad transformer for evaluating to a fixpoint";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "transformers-free" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -209073,7 +209094,6 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tubes" = callPackage
@@ -209312,7 +209332,6 @@ self: {
        homepage = "https://github.com/sanjorgek/turingMachine";
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -209451,7 +209470,6 @@ self: {
        homepage = "http://github.com/nick8325/twee";
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twee-lib" = callPackage
@@ -210354,9 +210372,10 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.0.1";
-       sha256 = "0i16636dncb3k3564m5gjjgbpcvmlwnjg12wq4ndhcy5rwjp7w6b";
+       version = "0.1.0";
+       sha256 = "1s9w9sml4crnd40vly0fvfbf2n0cgyv0fdqfsh66n2x5ymsvqp4x";
        libraryHaskellDepends = [ base containers template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210525,7 +210544,6 @@ self: {
        homepage = "https://github.com/Lysxia/type-map";
        description = "Type-indexed maps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-natural" = callPackage
@@ -211322,7 +211340,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Small DBus implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udbus-model" = callPackage
@@ -211337,7 +211354,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udcode" = callPackage
@@ -211467,8 +211483,8 @@ self: {
        pname = "uhttpc";
        version = "0.1.1.0";
        sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
-       revision = "2";
-       editedCabalFile = "02fzrhc3599am6nm9prm6q4anmwlgzjc2wx3hqf027z9i65zfhdq";
+       revision = "3";
+       editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212292,7 +212308,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/unique-logic/";
        description = "Solve simple simultaneous equations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unique-logic-tf" = callPackage
@@ -212312,7 +212327,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/unique-logic-tf/";
        description = "Solve simple simultaneous equations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uniqueid" = callPackage
@@ -212390,7 +212404,6 @@ self: {
        homepage = "https://github.com/goldfirere/units";
        description = "A domain-specific type system for dimensional analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "units-attoparsec" = callPackage
@@ -212420,7 +212433,6 @@ self: {
        homepage = "http://github.com/goldfirere/units-defs";
        description = "Definitions for use with the units package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "units-parser" = callPackage
@@ -213709,7 +213721,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath_8_0_1" = callPackage
@@ -214127,7 +214138,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-cco-hut-parsing" = callPackage
@@ -214140,7 +214150,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-cco-uu-parsinglib" = callPackage
@@ -214226,7 +214235,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc-bootstrap" = callPackage
@@ -214250,7 +214258,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc-cabal" = callPackage
@@ -214267,7 +214274,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uuagc";
        description = "Cabal plugin for UUAGC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc-diagrams" = callPackage
@@ -214431,7 +214437,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uvector" = callPackage
@@ -215833,7 +215838,6 @@ self: {
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vectortiles_1_3_0" = callPackage
@@ -216014,7 +216018,6 @@ self: {
        homepage = "http://github.com/fmthoma/vgrep#readme";
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vhd" = callPackage
@@ -216347,7 +216350,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-vectors" = callPackage
@@ -217152,7 +217154,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-digestive-functors";
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-dispatch" = callPackage
@@ -218135,7 +218136,6 @@ self: {
        ];
        description = "Route different middleware responses based on the incoming HTTP verb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -218248,7 +218248,6 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -218695,7 +218694,6 @@ self: {
        homepage = "http://github.com/bgamari/warc";
        description = "A parser for the Web Archive (WARC) format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp" = callPackage
@@ -219718,7 +219716,6 @@ self: {
        homepage = "http://github.com/ananthakumaran/webify";
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkit" = callPackage
@@ -221009,7 +221006,6 @@ self: {
        homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woot" = callPackage
@@ -223892,7 +223888,7 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
 
@@ -224053,7 +224049,6 @@ self: {
        homepage = "https://github.com/xmonad/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-screenshot" = callPackage
@@ -224112,7 +224107,6 @@ self: {
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-windownames" = callPackage
@@ -224981,7 +224975,6 @@ self: {
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-sdl2" = callPackage
@@ -225766,7 +225759,6 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage
@@ -226699,7 +226691,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -227054,7 +227045,6 @@ self: {
        ];
        description = "A html documentation generator library for RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml-mock" = callPackage
@@ -227404,7 +227394,6 @@ self: {
        libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test" = callPackage
@@ -228526,7 +228515,6 @@ self: {
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gomp = null; inherit (pkgs) z3;};
 
   "z3-encoding" = callPackage

From 86bfcc89b8e8e2346157fbc4430d3ddc94701241 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:12:19 +0100
Subject: [PATCH 0744/2266] haskell-HTTP: use the latest version when compiling
 with GHC 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 84cf5ac6d72..32cecf134f9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -765,7 +765,8 @@ self: super: {
   });
 
   # https://github.com/haskell/HTTP/pull/114
-  HTTP = doJailbreak super.HTTP;
+  HTTP = self.HTTP_4000_3_10;
+  HTTP_4000_3_10 = dontCheck super.HTTP_4000_3_10;
 
   # Older versions don't compile.
   haddock-library = self.haddock-library_1_5_0_1;

From 70aa779445ba91cf2bebb0488867587558e66c29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:13:05 +0100
Subject: [PATCH 0745/2266] haskell-doctemplate: apply upstream patch to fix
 the build with ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 32cecf134f9..5114708b6d2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -779,7 +779,10 @@ self: super: {
   tree-diff = doJailbreak super.tree-diff;
 
   # https://github.com/jgm/doctemplates/issues/2
-  doctemplates = markBrokenVersion "0.2.1" super.doctemplates;
+  doctemplates = appendPatch super.doctemplates (pkgs.fetchpatch
+    { url = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch;
+      sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d";
+    });
 
   # https://github.com/bitemyapp/esqueleto/issues/77
   esqueleto = markBrokenVersion "2.5.3" super.esqueleto;

From 0ff88fb2abda84d54560d2421bfd70082bec65d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:13:37 +0100
Subject: [PATCH 0746/2266] haskell-GenericPretty: apply upstream patch to fix
 the build with ghc 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5114708b6d2..a8d79dcddc2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -790,4 +790,11 @@ self: super: {
   # Older versions don't compile.
   hackage-db = super.hackage-db_2_0_1;
 
+  # https://github.com/RazvanRanca/GenericPretty/issues/2
+  GenericPretty = appendPatch super.GenericPretty (pkgs.fetchpatch
+    { url = https://github.com/RazvanRanca/GenericPretty/pull/3.patch;
+      sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k";
+    }
+  );
+
 }

From dba20cb1b1b60a57bd4b3088483fd43b41c61912 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:32:07 +0100
Subject: [PATCH 0747/2266] haskell-ChasingBottoms: move jailbreak to common to
 allow building with QuickCheck 2.11

---
 pkgs/development/haskell-modules/configuration-common.nix   | 5 +++--
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4217b2d0357..7c4ba04f1b6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -946,8 +946,9 @@ self: super: {
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
-  # Sporadically OOMs even with 16G
-  ChasingBottoms = dontCheck super.ChasingBottoms;
+  # Disable test suite because it sporadically OOMs even with 16G.
+  # Jailbreak for QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11.
+  ChasingBottoms = doJailbreak (dontCheck super.ChasingBottoms);
 
   # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
   multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index a8d79dcddc2..5a75e15af19 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -588,12 +588,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  ChasingBottoms = overrideCabal super.ChasingBottoms (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11
-    jailbreak       = true;
-  });
-
   deepseq-generics = overrideCabal super.deepseq-generics (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.5 && <4.11

From b4707d9e6575af5422a7763b0153c7f80cc0fe17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:35:58 +0100
Subject: [PATCH 0748/2266] haskell-src: mark broken for GHC 8.4.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5a75e15af19..92b4b057321 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -781,6 +781,9 @@ self: super: {
   # https://github.com/bitemyapp/esqueleto/issues/77
   esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
 
+  # https://github.com/haskell-pkg-janitors/haskell-src/issues/5
+  haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src;
+
   # Older versions don't compile.
   hackage-db = super.hackage-db_2_0_1;
 

From 77e974b394ecb0bff7a5a86bc5819f43c011bbe1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:36:39 +0100
Subject: [PATCH 0749/2266] haskell-hackage-security: jailbreak to fix build
 with ghc 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 92b4b057321..e69165d3c80 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -794,4 +794,7 @@ self: super: {
     }
   );
 
+  # https://github.com/haskell/hackage-security/issues/211
+  hackage-security = doJailbreak super.hackage-security;
+
 }

From 3c104572a0635156519ff867cef347d9660fa5b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:45:10 +0100
Subject: [PATCH 0750/2266] haskell-stylish-cabal: fix build with ghc 8.2.x and
 8.4.x

---
 .../haskell-modules/configuration-ghc-8.2.x.nix            | 7 ++++++-
 .../haskell-modules/configuration-ghc-8.4.x.nix            | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 2531f05cfa9..f14f0b0ebd1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -91,7 +91,7 @@ self: super: {
     text = self.text_1_2_3_0;
   });
 
-  # Needs Cabal 2.2.x, which is not the default.
+  # These packages need Cabal 2.2.x, which is not the default.
   distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: {
     Cabal = self.Cabal_2_2_0_0;
     text = self.text_1_2_3_0;
@@ -104,5 +104,10 @@ self: super: {
     Cabal = self.Cabal_2_2_0_0;
     text = self.text_1_2_3_0;
   });
+  stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: {
+    Cabal = self.Cabal_2_2_0_0;
+    text = self.text_1_2_3_0;
+    haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
+  })));
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e69165d3c80..9b799cb562e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -797,4 +797,7 @@ self: super: {
   # https://github.com/haskell/hackage-security/issues/211
   hackage-security = doJailbreak super.hackage-security;
 
+  # https://github.com/pikajude/stylish-cabal/issues/6
+  stylish-cabal = dontHaddock super.stylish-cabal;
+
 }

From 8d0b0095dbcbe8866647237aae5ec5846937362d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 13:48:30 +0100
Subject: [PATCH 0751/2266] haskell-jailbreak-cabal: clean up overrides

---
 pkgs/development/haskell-modules/configuration-common.nix    | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7c4ba04f1b6..17d071832b2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -37,7 +37,7 @@ self: super: {
   hackage-security = dontCheck super.hackage-security;
 
   # Link statically to avoid runtime dependency on GHC.
-  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
+  jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
 
   # enable using a local hoogle with extra packagages in the database
   # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 30be6a031d4..757c1d8c32d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -35,9 +35,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
-
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";

From 797c272b66cdd48e50a8af97bdc2a5568611a98e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 15:06:18 +0100
Subject: [PATCH 0752/2266] haskell-hslua-module-text: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9b799cb562e..30d5384e018 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -766,9 +766,6 @@ self: super: {
   haddock-library = self.haddock-library_1_5_0_1;
   haddock-library_1_5_0_1 = dontHaddock (dontCheck super.haddock-library_1_5_0_1);
 
-  # https://github.com/hslua/hslua-module-text/issues/1
-  hslua-module-text = doJailbreak super.hslua-module-text;
-
   # https://github.com/phadej/tree-diff/issues/15
   tree-diff = doJailbreak super.tree-diff;
 

From 4e63fcec1b0ce64a43a7280da0e2207b9d12d088 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 15:17:29 +0100
Subject: [PATCH 0753/2266] haskell-ChasingBottoms: add override that uses the
 latest version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 17d071832b2..1579347c31e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -946,9 +946,8 @@ self: super: {
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
-  # Disable test suite because it sporadically OOMs even with 16G.
-  # Jailbreak for QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11.
-  ChasingBottoms = doJailbreak (dontCheck super.ChasingBottoms);
+  # Use latest version to support newer QuickCheck and base libraries.
+  ChasingBottoms = self.ChasingBottoms_1_3_1_4;
 
   # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
   multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};

From 73982726b0620577c55d30824fbe51615f2cc390 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 19:53:18 +0100
Subject: [PATCH 0754/2266] haskell-boxes: apply patch to fix build with GHC
 8.4.1

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 30d5384e018..dbb3c0ac600 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -797,4 +797,10 @@ self: super: {
   # https://github.com/pikajude/stylish-cabal/issues/6
   stylish-cabal = dontHaddock super.stylish-cabal;
 
+  # https://github.com/treeowl/boxes/issues/29
+  boxes = appendPatch super.boxes (pkgs.fetchpatch
+    { url = https://github.com/asr/boxes/commit/f03e16cb8677a9d85687c641fe27a87e6fd94d54.patch;
+      sha256 = "179vkn6jimiy64dwyam04x8v981l3pfrq3ig97600vnkns3v8i6a";
+    });
+
 }

From 379eb750149a0b014f5aaae3dccaa01835f8bd2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Mar 2018 20:03:28 +0100
Subject: [PATCH 0755/2266] haskell-setlocale: jailbreak to fix ghc 8.4.1 build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index dbb3c0ac600..5aa62342b77 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -803,4 +803,7 @@ self: super: {
       sha256 = "179vkn6jimiy64dwyam04x8v981l3pfrq3ig97600vnkns3v8i6a";
     });
 
+  # https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
+  setlocale = doJailbreak super.setlocale;
+
 }

From b24eccc23055df3b8225a722f0bf5b55ce5097f6 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 11 Mar 2018 10:40:56 +0100
Subject: [PATCH 0756/2266] urlscan: 0.8.6 -> 0.8.7

---
 pkgs/applications/misc/urlscan/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 7c4def95210..c3071647c40 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,20 +1,23 @@
 { stdenv, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
-  name = "urlscan-${version}";
-  version = "0.8.6";
+  pname = "urlscan";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "firecat53";
-    repo = "urlscan";
+    repo = pname;
     rev = version;
-    sha256 = "1v26fni64n0lbv37m35plh2bsrvhpb4ibgmg2mv05qfc3df721s5";
+    sha256 = "1jxjcq869jimsq1ihk2fbjhp5lj7yga0hbp0msskxyz92afl1kz8";
   };
 
   propagatedBuildInputs = [ python3Packages.urwid ];
 
+  doCheck = false; # No tests available
+
   meta = with stdenv.lib; {
     description = "Mutt and terminal url selector (similar to urlview)";
+    homepage = https://github.com/firecat53/urlscan;
     license = licenses.gpl2;
     maintainers = with maintainers; [ dpaetzel jfrankenau ];
   };

From 8f9e814132cd06a4b83535c40e6bec5d4098bc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 11 Mar 2018 00:28:59 +0100
Subject: [PATCH 0757/2266] pythonPackages.robotframework: fix darwin build

---
 pkgs/development/python-modules/robotframework/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
index 6a4a8867025..22f35121119 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -15,7 +15,6 @@ buildPythonPackage rec {
     description = "Generic test automation framework";
     homepage = http://robotframework.org/;
     license = licenses.asl20;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ];
   };
 }

From cdca39253698f61050041d14f0e781aad6facd89 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Mar 2018 12:52:40 +0100
Subject: [PATCH 0758/2266] stupidterm: 2017-03-15 -> 2018-03-10

Fix transparency issues in GnomeShell/Mutter
---
 pkgs/applications/misc/stupidterm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index 5701997fd29..f6286bfece3 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "stupidterm-2017-03-15";
+  name = "stupidterm-2018-03-10";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "esmil";
     repo = "stupidterm";
-    rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6";
-    sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv";
+    rev = "0463519a96c9e4f9ce9fdc99d8e776499346ccba";
+    sha256 = "1vbk53xyjn33myb3fix6y7sxb1x3rndrkk5l9qa60qaw2ivkr965";
   };
 
   makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";

From 2394753282cecfa78f8fa74a8d37ee9eb10b36a4 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 11 Mar 2018 15:08:47 +0100
Subject: [PATCH 0759/2266] doctl: 1.5.0 -> 1.7.2

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/doctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index a28e4a32168..14c5eab8cd6 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -4,8 +4,8 @@ buildGoPackage rec {
   name = "doctl-${version}";
   version = "${major}.${minor}.${patch}";
   major = "1";
-  minor = "5";
-  patch = "0";
+  minor = "7";
+  patch = "2";
   goPackagePath = "github.com/digitalocean/doctl";
 
   excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -21,7 +21,7 @@ buildGoPackage rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2";
+    sha256 = "1nkyl5274mbdf4j60f2sj0kvvppcpccf7xws11c9vj9c3zxs7r97";
   };
 
   meta = {

From 24dd67dbf9e7671383d7103909b63f43469f9d9b Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 11 Mar 2018 15:12:33 +0100
Subject: [PATCH 0760/2266] docker-machine: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index cc69be36e37..d67d9d5851c 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "machine-${version}";
-  version = "0.13.0";
+  version = "0.14.0";
 
   goPackagePath = "github.com/docker/machine";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "docker";
     repo = "machine";
-    sha256 = "1bqblgz2avrvp9xv6rlvgl0xh2ghpml3a00xhq3mmzkznayw6chq";
+    sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff";
   };
 
   postInstall = ''

From ef4790cfd4c9ff937612ff631f622674dc59919d Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 11 Mar 2018 15:16:24 +0100
Subject: [PATCH 0761/2266] notary: 0.5.1 -> 0.6.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/tools/security/notary/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 36685b1d1e4..4a42c9162e1 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -2,22 +2,22 @@
 
 buildGoPackage rec {
   name = "notary-${version}";
-  version = "0.5.1";
-  gitcommit = "9211198";
+  version = "0.6.0";
+  gitcommit = "34f53ad";
 
   src = fetchFromGitHub {
     owner = "theupdateframework";
     repo = "notary";
     rev = "v${version}";
-    sha256 = "0z9nsb1mrl0q5j02jkyzbc6xqsm83qzacsckypsxcrijhw935rs5";
+    sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a";
   };
 
   buildInputs = [ libtool ];
 
-  goPackagePath = "github.com/docker/notary";
+  goPackagePath = "github.com/theupdateframework/notary";
 
   buildPhase = ''
-    cd go/src/github.com/docker/notary
+    cd go/src/github.com/theupdateframework/notary
     make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client
   '';
 

From 35b7632bdb2fb725dbf35957f91947c09289cbe5 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 11 Mar 2018 15:22:06 +0100
Subject: [PATCH 0762/2266] gauge: 0.9.6 -> 0.9.7

Also removes the unecessary binary from the package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/gauge/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index f1533f551b2..58bc24e1ec6 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -2,15 +2,16 @@
 
 buildGoPackage rec {
   name = "gauge-${version}";
-  version = "0.9.6";
+  version = "0.9.7";
 
   goPackagePath = "github.com/getgauge/gauge";
+  excludedPackages = ''\(build\|man\)'';
 
   src = fetchFromGitHub {
     owner = "getgauge";
     repo = "gauge";
     rev = "v${version}";
-    sha256 = "0p2bnrzgx616jbyr9h4h9azaq7ry63z4qkwgy0ivwrpmhfqfqwmh";
+    sha256 = "09afsi97yxlqwmrxvihravqvz17m7y402gbw4hvdk0iixa6jpq6a";
   };
 
   meta = with stdenv.lib; {

From b14bd1803554a1750e8a96a393f48690337e1bb4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 11 Mar 2018 15:36:26 +0100
Subject: [PATCH 0763/2266] pythonPackages.mt-940: fix build (#36784)

- added missing `enum34` dependency
- enabled tests
- moved expression into its own file

See ticket #36453
See https://hydra.nixos.org/build/70677609/log

/cc @the-kenny
---
 .../python-modules/mt-940/default.nix         | 35 +++++++++++++++++++
 .../python-modules/mt-940/no-coverage.patch   | 26 ++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------
 3 files changed, 62 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/mt-940/default.nix
 create mode 100644 pkgs/development/python-modules/mt-940/no-coverage.patch

diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
new file mode 100644
index 00000000000..5e2ad1d5aa2
--- /dev/null
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage, stdenv, pytestrunner, pyyaml, pytest, enum34
+, pytestpep8, pytestflakes,fetchFromGitHub, isPy3k, lib, glibcLocales
+}:
+
+buildPythonPackage rec {
+  version = "v4.10.0";
+  pname = "mt940";
+
+  src = fetchFromGitHub {
+    owner = "WoLpH";
+    repo = pname;
+    rev = version;
+    sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65";
+  };
+
+  patches = [
+    ./no-coverage.patch
+  ];
+
+  propagatedBuildInputs = [ pyyaml pytestrunner ]
+    ++ lib.optional (!isPy3k) enum34;
+
+  LC_ALL="en_US.UTF-8";
+
+  checkInputs = [ pytestpep8 pytestflakes pytest glibcLocales ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
+    homepage = "http://pythonhosted.org/mt-940/";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/mt-940/no-coverage.patch b/pkgs/development/python-modules/mt-940/no-coverage.patch
new file mode 100644
index 00000000000..1617e6dd394
--- /dev/null
+++ b/pkgs/development/python-modules/mt-940/no-coverage.patch
@@ -0,0 +1,26 @@
+diff --git a/pytest.ini b/pytest.ini
+index fef28f5..f366331 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -4,10 +4,6 @@ python_files =
+     tests/*.py
+ 
+ addopts =
+-    --cov mt940
+-    --cov-report term-missing
+-    --cov-report html
+-    --no-cov-on-fail
+     --doctest-modules
+     --pep8
+     --flakes
+diff --git a/tests/requirements.txt b/tests/requirements.txt
+index fc55572..e52cc28 100644
+--- a/tests/requirements.txt
++++ b/tests/requirements.txt
+@@ -3,6 +3,5 @@
+ -r ../docs/requirements.txt
+ pytest
+ pytest-cache
+-pytest-cover
+ pytest-flakes
+ pytest-pep8
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0adbb05477..4529f7febd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5446,24 +5446,7 @@ in {
     };
   };
 
-  mt-940 = buildPythonPackage rec {
-    version = "4.10.0";
-    name = "mt-940-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mt-940/mt-940-${version}.tar.gz";
-      sha256 = "1gyqf1k2r2ml45x08bk69ws865yrpcph514mn4xvjz779mlgh67j";
-    };
-
-    buildInputs = with self; [ pytestrunner pyyaml pytest ];
-    doCheck = false; # Can't find data files
-
-    meta = {
-      description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
-      homepage = "http://pythonhosted.org/mt-940/";
-      license = licenses.bsd3;
-    };
-  };
+  mt-940 = callPackage ../development/python-modules/mt-940 { };
 
   mwlib = let
     pyparsing = buildPythonPackage rec {

From ec2981ae3dcb63fc1f5a65f1f8b512d27d85a3bb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 11 Mar 2018 15:44:20 +0100
Subject: [PATCH 0764/2266] fmbt: init at 0.39

---
 pkgs/development/tools/fmbt/default.nix | 53 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 ++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/tools/fmbt/default.nix

diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
new file mode 100644
index 00000000000..11880213bad
--- /dev/null
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper
+, flex
+, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
+, tesseract, gts, libXtst
+}:
+stdenv.mkDerivation rec {
+  version = "0.39";
+  name = "fMBT-${version}";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "fMBT";
+    rev = "v${version}";
+    sha256 = "15sxwdcsjybq50vkla4md2ay8m67ndc4vwcsl5vwsjkim5qlxslb";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper
+    python.pkgs.wrapPython ];
+
+  buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
+    gnuplot graphviz tesseract gts 
+    ];
+
+  propagatedBuildInputs = with python.pkgs; [
+    pyside pydbus pexpect pysideShiboken
+  ];
+
+  preBuild = ''
+    export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages"
+    export PATH="$PATH:$out/bin"
+    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}"
+  '';
+
+  postInstall = ''
+    echo -e '#! ${stdenv.shell}\npython "$@"' > "$out/bin/fmbt-python"
+    chmod a+x "$out/bin/fmbt-python"
+    patchShebangs "$out/bin"
+    for i in "$out"/bin/*; do
+      wrapProgram "$i" --suffix "PATH" ":" "$PATH" \
+        --suffix "PYTHONPATH" ":" "$PYTHONPATH" \
+        --suffix "LD_LIBRARY_PATH" ":" "$LD_LIBRARY_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Free Model-Based Testing tool";
+    homepage = "https://github.com/intel/fMBT";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1914ec7a09..ffada189f20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2290,6 +2290,10 @@ with pkgs;
   flameGraph = flamegraph;
 
   flvtool2 = callPackage ../tools/video/flvtool2 { };
+  
+  fmbt = callPackage ../development/tools/fmbt {
+    python = python2;
+  };
 
   fontforge = lowPrio (callPackage ../tools/misc/fontforge {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

From a758ae44cfd0c097073b1dff008baf96d9ad94b3 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Sun, 11 Mar 2018 15:58:26 +0100
Subject: [PATCH 0765/2266] fcgiwrap: don't error on implicit fallthrough

This errored since ca8aa5d, but should be safe.
Warning is left on (instead of completely disabled),
to not hide potential other fallthroughs if someone
was to make changes to fcgiwrap with this package.
---
 pkgs/servers/fcgiwrap/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 84c24e68478..a1ec3a7deb0 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
   configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 1c99ffcb213ba543599f455747a45f911560b130 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sun, 11 Mar 2018 22:56:09 +0800
Subject: [PATCH 0766/2266] librime: 1.2.9 -> 1.3.0

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

diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index a8877bdb2da..1384b3e7a74 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "librime-${version}";
-  version = "1.2.9";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
-    rev = "rime-${version}";
-    sha256 = "14jgnfm61ynm086x9v7wfmv2p14h0qp8lq4d2jqm21n821jsraj6";
+    rev = "${version}";
+    sha256 = "1sxxxliqjjsfblx9n6ijw9gx40xqw71v352b28aw51gg3k201v0j";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "Rime Input Method Engine, the core library";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ sifmelcara ];
-    platforms   = platforms.all;
+    platforms   = platforms.linux;
   };
 }

From 859db89a8f56dff96db3b1060feb0b575c08b589 Mon Sep 17 00:00:00 2001
From: Michael Bishop <cleverca22@gmail.com>
Date: Sun, 11 Mar 2018 12:41:57 -0300
Subject: [PATCH 0767/2266] rocksdb: use split outputs

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 562942f230f..cd17bb8499d 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
   version = "5.10.3";
 
+  outputs = [ "dev" "out" "static" ];
+
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
@@ -65,6 +67,8 @@ stdenv.mkDerivation rec {
     # Might eventually remove this when we are confident in the build process
     echo "BUILD CONFIGURATION FOR SANITY CHECKING"
     cat make_config.mk
+    mkdir -pv $static/lib/
+    mv -vi $out/lib/librocksdb.a $static/lib/
   '';
 
   enableParallelBuilding = true;

From cbf735e3f15ccbac3545a629b31f6b600f1012d5 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sun, 11 Mar 2018 23:46:05 +0800
Subject: [PATCH 0768/2266] brise: change platforms to linux only

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

diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix
index 8b27f4fbf72..6c59a0faf04 100644
--- a/pkgs/data/misc/brise/default.nix
+++ b/pkgs/data/misc/brise/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     # Note that individual packages in this collection
     # may be released under different licenses
     license = licenses.gpl3;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = [ maintainers.sifmelcara ];
   };
 }

From 82644c15e572e3f2739c5f78d05bf2f69e992e58 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 11 Mar 2018 10:53:31 -0500
Subject: [PATCH 0769/2266] glibc: patch to fix building w/musl-based stdenv

See:
https://sourceware.org/bugzilla/show_bug.cgi?id=21604
---
 pkgs/development/libraries/glibc/common-2.27.nix | 10 ++++++++--
 pkgs/development/libraries/glibc/common.nix      | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix
index 6c443ebbb93..9748d837938 100644
--- a/pkgs/development/libraries/glibc/common-2.27.nix
+++ b/pkgs/development/libraries/glibc/common-2.27.nix
@@ -4,7 +4,7 @@
 { stdenv, lib
 , buildPlatform, hostPlatform
 , buildPackages
-, fetchurl
+, fetchurl, fetchpatch
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 , bison
@@ -78,7 +78,13 @@ stdenv.mkDerivation ({
        */
       ./allow-kernel-2.6.32.patch
     ]
-    ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch;
+    ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl
+      (fetchpatch {
+        name = "fix-with-musl.patch";
+        url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw";
+        sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2";
+      });
 
   postPatch =
     ''
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d40733adf87..90cea5b7396 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -4,7 +4,7 @@
 { stdenv, lib
 , buildPlatform, hostPlatform
 , buildPackages
-, fetchurl
+, fetchurl, fetchpatch
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 }:
@@ -88,7 +88,13 @@ stdenv.mkDerivation ({
        */
       ./allow-kernel-2.6.32.patch
     ]
-    ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch;
+    ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
+    ++ lib.optional stdenv.hostPlatform.isMusl
+      (fetchpatch {
+        name = "fix-with-musl.patch";
+        url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw";
+        sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2";
+      });
 
   postPatch =
     # Needed for glibc to build with the gnumake 3.82

From 54c4c183dd999776e6274d95a18a94f542687f02 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 11 Mar 2018 11:16:53 -0500
Subject: [PATCH 0770/2266] glibc: make fetchpatch optional ("? null"), just in
 case.

---
 pkgs/development/libraries/glibc/common-2.27.nix | 2 +-
 pkgs/development/libraries/glibc/common.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix
index 9748d837938..4a5b31245c1 100644
--- a/pkgs/development/libraries/glibc/common-2.27.nix
+++ b/pkgs/development/libraries/glibc/common-2.27.nix
@@ -4,7 +4,7 @@
 { stdenv, lib
 , buildPlatform, hostPlatform
 , buildPackages
-, fetchurl, fetchpatch
+, fetchurl, fetchpatch ? null
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 , bison
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 90cea5b7396..c8e5b456285 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -4,7 +4,7 @@
 { stdenv, lib
 , buildPlatform, hostPlatform
 , buildPackages
-, fetchurl, fetchpatch
+, fetchurl, fetchpatch ? null
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 }:

From fa60f04a196da7da917e4ada8b3da30474cef189 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 11 Mar 2018 17:52:07 +0100
Subject: [PATCH 0771/2266] mergerfs: 2.23.1 -> 2.24.0

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

diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index a97f67b1b9e..6f239bfa127 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mergerfs-${version}";
-  version = "2.23.1";
+  version = "2.24.0";
 
   # not using fetchFromGitHub because of changelog being built with git log
   src = fetchgit {
     url = "https://github.com/trapexit/mergerfs";
     rev = "refs/tags/${version}";
-    sha256 = "0kbw64fkp3pjc7qm3y1q0ja20v3lhxi0nsq6gd19rq3m7ch9hcgl";
+    sha256 = "12ci1i5zkarl1rz0pq1ldw0fpp4yfj8vz36jij63am7w7gp7qly2";
     deepClone = true;
     leaveDotGit = true;
   };

From 817cd00bb9911ab3956590930bb745c2e6d3164d Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 11 Mar 2018 18:13:52 +0100
Subject: [PATCH 0772/2266] ufraw: fix build by using gcc6

doesn't build with gcc7 due to ill-formed upstream code,
see https://gcc.gnu.org/gcc-7/porting_to.html#cmath
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73572ba2afd..5c7f468a999 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5154,7 +5154,9 @@ with pkgs;
 
   udptunnel = callPackage ../tools/networking/udptunnel { };
 
-  ufraw = callPackage ../applications/graphics/ufraw { };
+  ufraw = callPackage ../applications/graphics/ufraw {
+    stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7
+  };
 
   uget = callPackage ../tools/networking/uget { };
 

From 7c4886d6859f328acd1646bc4e9432dc64419aeb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:24:08 -0400
Subject: [PATCH 0773/2266] rofi: 1.4.2 -> 1.5.0

---
 pkgs/applications/misc/rofi/config.patch | 18 +++++++++++
 pkgs/applications/misc/rofi/default.nix  | 14 ++++++--
 pkgs/applications/misc/rofi/nix.patch    | 41 ++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/misc/rofi/config.patch
 create mode 100644 pkgs/applications/misc/rofi/nix.patch

diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch
new file mode 100644
index 00000000000..c42c647e697
--- /dev/null
+++ b/pkgs/applications/misc/rofi/config.patch
@@ -0,0 +1,18 @@
+diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
+index 0646e4bc..a19ec706 100755
+--- a/script/rofi-theme-selector
++++ b/script/rofi-theme-selector
+@@ -164,7 +164,12 @@ Current theme: <b>${CUR}</b>"""
+ ###
+ function set_theme()
+ {
+-    CDIR="${HOME}/.config/rofi/"
++    if [ -d "${XDG_CONFIG_HOME}" ]; then
++      CDIR="${XDG_CONFIG_HOME}/rofi/"
++    else
++      CDIR="${HOME}/.config/rofi/"
++    fi
++
+     if [ ! -d "${CDIR}" ]
+     then
+         mkdir -p ${CDIR}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index bdf14c03bcc..707cdd42206 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -4,25 +4,33 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.5.0";
   name = "rofi-${version}";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx";
+    sha256 = "0h068wqf0n6gmil2g3lh263pm7spkp4k5rxbnfp52n8izqgyf7al";
   };
 
+  # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
+  patches = [ ./nix.patch ./config.patch ];
+
   preConfigure = ''
     patchShebangs "script"
     # root not present in build /etc/passwd
     sed -i 's/~root/~nobody/g' test/helper-expand.c
   '';
 
+  postFixup = ''
+    substituteInPlace "$out"/bin/rofi-theme-selector \
+        --replace "%ROFIOUT%" "$out/share"
+  '';
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
     libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
   ];
-  doCheck = true;
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Window switcher, run dialog and dmenu replacement";
diff --git a/pkgs/applications/misc/rofi/nix.patch b/pkgs/applications/misc/rofi/nix.patch
new file mode 100644
index 00000000000..2e91f81b0f2
--- /dev/null
+++ b/pkgs/applications/misc/rofi/nix.patch
@@ -0,0 +1,41 @@
+diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
+index 0646e4bc..f82e5ad9 100755
+--- a/script/rofi-theme-selector
++++ b/script/rofi-theme-selector
+@@ -42,34 +42,8 @@ function find_themes()
+     DIRS=${XDG_DATA_DIRS}
+     OLDIFS=${IFS}
+     IFS=:
+-    if [ -z "${XDG_DATA_DIRS}" ]
+-    then
+-        echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
+-        echo -n "Using dirs from \$PATH: "
+-        DIRS=
+-        # Iterate over items in $PATH
+-        for p in ${PATH}; do
+-            # Remove trailing / if exists.
+-            x=${p%/}
+-            # remove both /bin and /sbin and /games from end
+-            x=${x%/bin}
+-            x=${x%/sbin}
+-            x=${x%/games}
+-            # Add /share
+-            x=${x}/share
+-            # Check if entry exists Prepend : so :${x}: matches nicely
+-            case ":${DIRS}" in
+-                *$x:*);;
+-                *) DIRS+="$x:";;
+-            esac
+-        done
+-        # Remove trailing :
+-        DIRS=${DIRS%:}
+-        echo "${DIRS}"
+-    fi
+-    # Add user dir.
+-    DIRS+=":${HOME}/.local/share/"
+-    DIRS+=":${HOME}/.config/"
++
++    DIRS+=":%ROFIOUT%/"
+     for p in ${DIRS}; do
+	p=${p%/}
+         TD=${p}/rofi/themes

From 46037503f69e25cf61870c84d2ccc48328020feb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:35:13 -0400
Subject: [PATCH 0774/2266] vscode: 1.20.1 -> 1.21.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 4c825cc9891..612932e20c6 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.20.1";
+  version = "1.21.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0gycz857bl9ikfrylim970qgmyw7rcy3gbg2zsjddp9cgdk9basn";
-    "x86_64-linux" = "0rx0qyxv173s9wjw97f94h61f12lh42grnmabgsvwd87b8zx4qim";
-    "x86_64-darwin" = "0mqxmmkp3bsmy1g35prsgan61zzq5368gp720v37cwx1rskl0bfg";
+    "i686-linux" = "0gib1ljf1zm432cgv9i59dq7n9fblcgy6diy2qy4g1ichi92s2i3";
+    "x86_64-linux" = "08md8q325z8q3afzxbpzvjfwdjw7phqd7cpq2vadwnd2ixvga2nk";
+    "x86_64-darwin" = "0jmlhza48k5amb4phwy8k6xyznvivzd7gjsmsn4lmnasrxj5lask";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -79,7 +79,7 @@ in
 
       patchelf \
         --set-rpath "${rpath}" \
-        $out/lib/vscode/resources/app/node_modules/keytar/build/Release/keytar.node
+        $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
 
       ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
     '';

From fa9950c0ae51db39315e364b9e0edc99c0c8e935 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 11 Mar 2018 17:07:33 +0100
Subject: [PATCH 0775/2266] gitea: 1.3.2 -> 1.3.3

---
 pkgs/applications/version-management/gitea/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index f09d02ab022..8fcc3e7e927 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "11gzb6x8zixmkm57x8hdncmdbbvppzld3yf7p7m0abigg8zyybsj";
+    sha256 = "0ikkpvarp6mzsqk56ihw72fbv7r98g5v5i83rxq8dk709fdqplm6";
   };
 
   patches = [ ./static-root-path.patch ];
@@ -43,7 +43,7 @@ buildGoPackage rec {
 
   meta = {
     description = "Git with a cup of tea";
-    homepage = http://gitea.io;
+    homepage = https://gitea.io;
     license = licenses.mit;
     maintainers = [ maintainers.disassembler ];
   };

From 22df7410454b8041f9604c068662efddd2f08c9f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Mar 2018 19:44:22 +0200
Subject: [PATCH 0776/2266] nix: Fix build on ARMv6

---
 pkgs/tools/package-management/nix/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a768ff84802..5140ddd0283 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -39,6 +39,9 @@ let
 
     propagatedBuildInputs = [ boehmgc ];
 
+    # Seems to be required when using std::atomic with 64-bit types
+    NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic";
+
     configureFlags =
       [ "--with-store-dir=${storeDir}"
         "--localstatedir=${stateDir}"

From 0367a6235c4ab960ed65a3e80a2a5eab43a5ec71 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 11 Mar 2018 18:42:24 +0100
Subject: [PATCH 0777/2266] vxl: fix build by using gcc6

upstream code incompatible w/gcc7. no newer version available.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73572ba2afd..7660c3afc55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11667,6 +11667,7 @@ with pkgs;
 
   vxl = callPackage ../development/libraries/vxl {
     libpng = libpng12;
+    stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7
   };
 
   wavpack = callPackage ../development/libraries/wavpack {

From cc18de181f2f1a1c275729e039b1e3808c77f867 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:44:47 -0400
Subject: [PATCH 0778/2266] linux: 4.15.8 -> 4.15.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 28e76fa3c38..d7034e9c790 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.8";
+  version = "4.15.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0nk0k6gywlvy88y0nvy55l5ivnrqs5c3r36rlrrpcvfdyz273h4a";
+    sha256 = "14j4dpg1qx3bqw040lc6qkm544nz8qw5bpjnvz8ccw9f0jr1b86x";
   };
 } // (args.argsOverride or {}))

From 68294bb272771873cbd9d28ac9bc5565e63e27ae Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:45:02 -0400
Subject: [PATCH 0779/2266] linux: 4.14.25 -> 4.14.26

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index e5ca1f6e96e..cb292092f60 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.25";
+  version = "4.14.26";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "11z544zyq1k1x52a3wibhqgkbjn9vmccxcgd0qdirrb8q1wvzkvd";
+    sha256 = "0n3ckh77n81jfgrivhxz17fm2l3mi5yicjg19sc7n0318b2nd94r";
   };
 } // (args.argsOverride or {}))

From daded89d95a3b0dd9873a146e09441ae80573570 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:45:34 -0400
Subject: [PATCH 0780/2266] linux: 4.4.120 -> 4.4.121

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 4f42f7b81c7..7980f7c212e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.120";
+  version = "4.4.121";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0y7li4vcvv04aqkrgl01i98pgwm9njzrb8y8wdvwaq9658vhfpx2";
+    sha256 = "0ad7djpbwapk126jddrnnq0a5a9mmhrr36qcnckc7388nml85a24";
   };
 } // (args.argsOverride or {}))

From 5fc213349354c753fbdab40521c33b938ae229b3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:45:54 -0400
Subject: [PATCH 0781/2266] linux: 4.9.86 -> 4.9.87

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index d1bf5fb5c62..cb2650a5a68 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.86";
+  version = "4.9.87";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "11bf1jcxn5gwd1g99ml2kn65vkpciq8hdz7xc0bjy66gxysnxkx7";
+    sha256 = "05y9wjmshd3pr3ymfpx80hjv5973i6l3zk1mpww7wnnwd6pzdjbs";
   };
 } // (args.argsOverride or {}))

From 6c5aa934dda006825d467c4a5ac5c7e20e2a0030 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 13:48:23 -0400
Subject: [PATCH 0782/2266] linux-copperhead: 4.15.8.a -> 4.15.9.a

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

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

From a0cc592c3e7acc2b5a941c5c0f466a5af5b37416 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 11 Mar 2018 18:49:38 +0100
Subject: [PATCH 0783/2266] wireguard: 0.0.20180218 -> 0.0.20180304

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 0029353ba20..0650bfd36f3 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20180218";
+  version = "0.0.20180304";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "4ac4c4e4ad4dc2cf9dcb831b0cf347567ccea675ca524528cf5a4d9dccb2fe52";
+    sha256 = "11vp6aiqxrnwqlaslxy13cpmw2l2pdm9nhs021rv4zx61lpnbcgg";
   };
 
   meta = with stdenv.lib; {

From db2b306747e426d85c52d7fd8d378f9740d233bb Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 11 Mar 2018 19:00:58 +0100
Subject: [PATCH 0784/2266] torque: fix build w/gcc7

---
 pkgs/servers/computing/torque/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 9c4bc4bda73..35c830dff8a 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # added to fix build with gcc7
+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+
   preConfigure = ''
    substituteInPlace ./configure \
      --replace '/usr/bin/file' '${file}/bin/file'

From edec57043ed966f07ddd2b4606a2cd0b189b2096 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Mar 2018 14:21:29 -0400
Subject: [PATCH 0785/2266] rofi: Fix patches

---
 pkgs/applications/misc/rofi/config.patch | 40 +++++++++++++++++++++--
 pkgs/applications/misc/rofi/default.nix  |  2 +-
 pkgs/applications/misc/rofi/nix.patch    | 41 ------------------------
 3 files changed, 39 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/applications/misc/rofi/nix.patch

diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch
index c42c647e697..46982d51e00 100644
--- a/pkgs/applications/misc/rofi/config.patch
+++ b/pkgs/applications/misc/rofi/config.patch
@@ -1,8 +1,44 @@
 diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
-index 0646e4bc..a19ec706 100755
+index 0646e4bc..f827dbfe 100755
 --- a/script/rofi-theme-selector
 +++ b/script/rofi-theme-selector
-@@ -164,7 +164,12 @@ Current theme: <b>${CUR}</b>"""
+@@ -42,34 +42,7 @@ function find_themes()
+     DIRS=${XDG_DATA_DIRS}
+     OLDIFS=${IFS}
+     IFS=:
+-    if [ -z "${XDG_DATA_DIRS}" ]
+-    then
+-        echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
+-        echo -n "Using dirs from \$PATH: "
+-        DIRS=
+-        # Iterate over items in $PATH
+-        for p in ${PATH}; do
+-            # Remove trailing / if exists.
+-            x=${p%/}
+-            # remove both /bin and /sbin and /games from end
+-            x=${x%/bin}
+-            x=${x%/sbin}
+-            x=${x%/games}
+-            # Add /share
+-            x=${x}/share
+-            # Check if entry exists Prepend : so :${x}: matches nicely
+-            case ":${DIRS}" in
+-                *$x:*);;
+-                *) DIRS+="$x:";;
+-            esac
+-        done
+-        # Remove trailing :
+-        DIRS=${DIRS%:}
+-        echo "${DIRS}"
+-    fi
+-    # Add user dir.
+-    DIRS+=":${HOME}/.local/share/"
+-    DIRS+=":${HOME}/.config/"
++    DIRS+=":%ROFIOUT%/"
+     for p in ${DIRS}; do 
+     	p=${p%/}
+         TD=${p}/rofi/themes
+@@ -164,7 +137,12 @@ Current theme: <b>${CUR}</b>"""
  ###
  function set_theme()
  {
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 707cdd42206..734adf3eb58 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
-  patches = [ ./nix.patch ./config.patch ];
+  patches = [ ./config.patch ];
 
   preConfigure = ''
     patchShebangs "script"
diff --git a/pkgs/applications/misc/rofi/nix.patch b/pkgs/applications/misc/rofi/nix.patch
deleted file mode 100644
index 2e91f81b0f2..00000000000
--- a/pkgs/applications/misc/rofi/nix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
-index 0646e4bc..f82e5ad9 100755
---- a/script/rofi-theme-selector
-+++ b/script/rofi-theme-selector
-@@ -42,34 +42,8 @@ function find_themes()
-     DIRS=${XDG_DATA_DIRS}
-     OLDIFS=${IFS}
-     IFS=:
--    if [ -z "${XDG_DATA_DIRS}" ]
--    then
--        echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
--        echo -n "Using dirs from \$PATH: "
--        DIRS=
--        # Iterate over items in $PATH
--        for p in ${PATH}; do
--            # Remove trailing / if exists.
--            x=${p%/}
--            # remove both /bin and /sbin and /games from end
--            x=${x%/bin}
--            x=${x%/sbin}
--            x=${x%/games}
--            # Add /share
--            x=${x}/share
--            # Check if entry exists Prepend : so :${x}: matches nicely
--            case ":${DIRS}" in
--                *$x:*);;
--                *) DIRS+="$x:";;
--            esac
--        done
--        # Remove trailing :
--        DIRS=${DIRS%:}
--        echo "${DIRS}"
--    fi
--    # Add user dir.
--    DIRS+=":${HOME}/.local/share/"
--    DIRS+=":${HOME}/.config/"
-+
-+    DIRS+=":%ROFIOUT%/"
-     for p in ${DIRS}; do
-	p=${p%/}
-         TD=${p}/rofi/themes

From d13c1f06ce58a329f9c6d2541797f8c90de17b71 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.scorpio@gmail.com>
Date: Sun, 11 Mar 2018 17:53:40 +0000
Subject: [PATCH 0786/2266] houdini 16.0.671->16.5.405

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

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index e58ff06b29c..097386547f5 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -29,11 +29,11 @@ let
   license_dir = "~/.config/houdini";
 in
 stdenv.mkDerivation rec {
-  version = "16.0.671";
+  version = "16.5.405";
   name = "houdini-runtime-${version}";
   src = requireFile rec {
     name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
-    sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r";
+    sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6";
     message = ''
       This nix expression requires that ${name} is already part of the store.
       Download it from https://sidefx.com and add it to the nix store with:

From 37f6b0ff9cc05a80a5f1f31de9779ad7865bc4ac Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 11 Mar 2018 19:28:48 +0100
Subject: [PATCH 0787/2266] josm: 13478 -> 13500

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index b536dffb708..a73e4820e6c 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "13478";
+  version = "13500";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1mc1zdcnlm14ky820cj61sid6aiq9k11kj6vzlqskvgqazc60xj4";
+    sha256 = "1dyys4y859dazjqpn3f7vd0cpyglk82y3igrdca293y0n0hrmi7v";
   };
 
   buildInputs = [ jre8 makeWrapper ];

From 8e478f8fe194a6e1622f55a9d1d5fe5ce5166e79 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Fri, 19 Jan 2018 22:35:45 -0500
Subject: [PATCH 0788/2266] gnuclad: init at 0.2.4

---
 .../applications/graphics/gnuclad/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/graphics/gnuclad/default.nix

diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
new file mode 100644
index 00000000000..2b391710907
--- /dev/null
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnuclad";
+  version = "0.2.4";
+
+  src = fetchurl {
+    url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz";
+    sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/gnuclad;
+    description = "gnuclad tries to help the environment by creating trees.  It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project.";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ mog ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0d310984ff..4b0dde3bfc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2371,6 +2371,8 @@ with pkgs;
 
   gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
 
+  gnuclad = callPackage ../applications/graphics/gnuclad { };
+
   gnufdisk = callPackage ../tools/system/fdisk {
     guile = guile_1_8;
   };

From 3abce29a9203b6bdf384373b447e571b724d520f Mon Sep 17 00:00:00 2001
From: dupgit <olivier.delhomme@free.fr>
Date: Sun, 11 Mar 2018 20:29:38 +0100
Subject: [PATCH 0789/2266] Remove myself as a maintainer

---
 maintainers/maintainer-list.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4aee16313aa..74b9f23af79 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1033,11 +1033,6 @@
     github = "dtzWill";
     name = "Will Dietz";
   };
-  dupgit = {
-    email = "olivier.delhomme@free.fr";
-    github = "dupgit";
-    name = "Olivier Delhomme";
-  };
   dywedir = {
     email = "dywedir@protonmail.ch";
     github = "dywedir";

From c2c9d393a88b8a5470ba70d77cd3ea17544e98ee Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Mar 2018 15:59:13 -0600
Subject: [PATCH 0790/2266] runc: 1.0.0rc4 -> 1.0.0rc5

https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc5
---
 pkgs/applications/virtualization/runc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 4fdb7421c3c..b0fd42f4efb 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "runc-${version}";
-  version = "1.0.0-rc4";
+  version = "1.0.0-rc5";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    sha256 = "0dh24x0zw90hs7618pnqvjhd2nx8dpz3b5jwc1vbs8dawj8prir2";
+    sha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
   };
 
   outputs = [ "out" "man" ];

From a180a52dd330388d489ae8100d188ffc0e82b3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Sun, 11 Mar 2018 21:55:21 +0100
Subject: [PATCH 0791/2266] gnomeExtensions.system-monitor: do not need global
 sessionPath modification

---
 .../gnome-3/extensions/system-monitor/default.nix  | 12 ++++++++----
 ...unts.patch => paths_and_nonexisting_dirs.patch} | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)
 rename pkgs/desktops/gnome-3/extensions/system-monitor/{remove_nonexisting_mounts.patch => paths_and_nonexisting_dirs.patch} (52%)

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 01b3fbad7c2..eed34ae523d 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,6 +1,4 @@
-# This package needs the following configuration in configuration.nix:
-# services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.libgtop pkgs.glib_networking ];
-{ config, stdenv, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
+{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
@@ -19,7 +17,13 @@ stdenv.mkDerivation rec {
     libgtop
   ];
 
-  patches = [ ./remove_nonexisting_mounts.patch ];
+  patches = [
+    (substituteAll {
+      src = ./paths_and_nonexisting_dirs.patch;
+      gtop_path = "${libgtop}/lib/girepository-1.0";
+      glib_net_path = "${glib_networking}/lib/girepository-1.0";
+    })
+  ];
 
   buildPhase = ''
     ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
similarity index 52%
rename from pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
rename to pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
index 8bff7fbe24f..82e3d7c541b 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
@@ -1,8 +1,18 @@
 diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js
-index b4b7f15..d645654 100644
+index b4b7f15..d139135 100644
 --- a/system-monitor@paradoxxx.zero.gmail.com/extension.js
 +++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js
-@@ -386,7 +386,7 @@ const smMountsMonitor = new Lang.Class({
+@@ -18,6 +18,9 @@
+ 
+ // Author: Florian Mounier aka paradoxxxzero
+ 
++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
++imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@');
++
+ /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily
+  * by loading the new libnm.so. Should go away eventually */
+ const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0");
+@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({
      connected: false,
      _init: function () {
          this._volumeMonitor = Gio.VolumeMonitor.get();

From 55ff6caf5e77aa46a91b496bacd275ef3ddc662a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 06:15:40 -0800
Subject: [PATCH 0792/2266] p11-kit: 0.23.9 -> 0.23.10

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.23.10 with grep in /nix/store/ghdcsrmkzpszvhi5dvfcwmm8ysjhsmrq-p11-kit-0.23.10
- found 0.23.10 in filename of file in /nix/store/ghdcsrmkzpszvhi5dvfcwmm8ysjhsmrq-p11-kit-0.23.10
---
 pkgs/development/libraries/p11-kit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index c5c14ed3b85..a3d4857d57a 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "p11-kit-${version}";
-  version = "0.23.9";
+  version = "0.23.10";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     rev = version;
-    sha256 = "0lyv6m2jflvs23m0i6l64d470p5a315lz6vs4bflsqv8i1zrrcsh";
+    sha256 = "0n0wqv028flzvnxllqv8i6x9nv705csl7ddzi0fzvppc9fp2yinp";
   };
 
   outputs = [ "out" "dev"];

From 7ba5a94e359ba96f89eb5687d44ca208dbf0f0a8 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 11 Mar 2018 22:48:45 +0100
Subject: [PATCH 0793/2266] ssr: fix build

ssr uses the deprecated get_generic_category() in ./configure
pass the flag enabling that to boost
---
 pkgs/applications/audio/soundscape-renderer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index 44c3bd70d3d..b38c629fa82 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
 
   # Without it doesn't find all of the boost libraries.
   BOOST_LIB_DIR="${boost}/lib";
+  # uses the deprecated get_generic_category() in boost_system
+  NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
 
   LC_ALL = "en_US.UTF-8";
 

From bb9704ca82266613af92476ffcb94f0492e64f87 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 01:29:43 +0300
Subject: [PATCH 0794/2266] ghc841:  intern changes to PKGDB, except manual:
 esqueleto haskell-src

---
 .../configuration-ghc-8.4.x.nix               | 178 +++++++++++-------
 1 file changed, 105 insertions(+), 73 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5aa62342b77..8bede50097e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -42,6 +42,11 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # https://github.com/bitemyapp/esqueleto/issues/77
+  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
+
+  # https://github.com/haskell-pkg-janitors/haskell-src/issues/5
+  haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src;
   ## Shadowed:
 
   ## Needs bump to a versioned attribute
@@ -56,7 +61,8 @@ self: super: {
     ## Setup: Encountered missing dependencies:
     ## ghc >=7.0 && <8.4
     ##
-    ##        uncaught exception: IOException of type NoSuchThing (cabal: rawSystem: runInteractiveProcess: exec: does not exist (No such file or directory))
+    ## Setup: Encountered missing dependencies:
+    ## QuickCheck >=2.11.3
     doCheck         = false;
   });
 
@@ -77,13 +83,25 @@ self: super: {
   ## Needed for (<>) in prelude
   funcmp = super.funcmp_1_9;
 
+  ## Needs bump to a versioned attribute
+  ## Setup: Encountered missing dependencies:
+  ## Cabal <2.2
+  ## Older versions don't compile.
+  hackage-db = super.hackage-db_2_0_1;
+
+  ## Needs bump to a versioned attribute
+  ## Setup: Encountered missing dependencies:
+  ## base >=4.5 && <4.11
+  ## Older versions don't compile
+  haddock-library = super.haddock-library_1_5_0_1;
+
   ## Needs bump to a versioned attribute
   hspec = overrideCabal super.hspec_2_4_8 (drv: {
     ## Setup: Encountered missing dependencies:
     ## hspec-core ==2.4.4, hspec-discover ==2.4.4
     ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
     ## infinite recursion encountered, at undefined position
     ## test suite causes an infinite loop
     doCheck         = false;
@@ -91,14 +109,15 @@ self: super: {
 
   ## Needs bump to a versioned attribute
   hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.5.1 && <2.11
+    ##     • No instance for (Semigroup Summary)
+    ##         arising from the superclasses of an instance declaration
+    ##     • In the instance declaration for ‘Monoid Summary’
     ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
+    ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
     ## infinite recursion encountered, at undefined position
     doCheck         = false;
   });
@@ -108,6 +127,13 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_4_8;
 
+  ## Needs bump to a versioned attribute
+  HTTP = overrideCabal super.HTTP_4000_3_10 (drv: {
+    ##
+    ## https://github.com/haskell/HTTP/pull/114
+    doCheck         = false;
+  });
+
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## free ==4.*, template-haskell >=2.4 && <2.13
@@ -136,9 +162,8 @@ self: super: {
   turtle = super.turtle_1_5_4;
 
   ## Needs bump to a versioned attribute
-  ##     Module ‘Data.Semigroup’ does not export ‘Monoid(..)’
-  ##    |
-  ## 80 | import Data.Semigroup (Semigroup(..), Monoid(..))
+  ## Setup: Encountered missing dependencies:
+  ## base >=4 && <4.11
   unordered-containers = super.unordered-containers_0_2_9_0;
 
 
@@ -168,7 +193,7 @@ self: super: {
     };
     ## Setup: Encountered missing dependencies:
     ## th-abstraction >=0.2.2 && <1
-    libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ th-abstraction ]);
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ th-abstraction ]);
   });
 
   ## Upstreamed, awaiting a Hackage release
@@ -187,7 +212,6 @@ self: super: {
   haskell-gi-base = overrideCabal super.haskell-gi-base (drv: {
     ## Setup: Encountered missing dependencies:
     ## haskell-gi-base ==0.21.*
-    ## cannot build derivation ‘/nix/store/qvnrni6j2sz8z26kmjz1hgxfxvggkvjl-gi-cairo-1.0.14.drv’: 1 dependencies couldn't be built
     src = pkgs.fetchFromGitHub {
       owner  = "haskell-gi";
       repo   = "haskell-gi";
@@ -323,6 +347,7 @@ self: super: {
   ## Unmerged
 
   ## Unmerged.  PR: https://github.com/lpsmith/blaze-builder/pull/10
+  ## Issue: https://github.com/lpsmith/blaze-builder/issues/12
   blaze-builder = overrideCabal super.blaze-builder (drv: {
     ##     • No instance for (Semigroup Poke)
     ##         arising from the superclasses of an instance declaration
@@ -333,7 +358,9 @@ self: super: {
       rev    = "b7195f160795a081adbb9013810d843f1ba5e062";
       sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00";
     };
-    jailbreak = true;   # https://github.com/lpsmith/blaze-builder/issues/12
+    ## Setup: Encountered missing dependencies:
+    ## base >=4 && <4.11
+    jailbreak       = true;
   });
 
   ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3
@@ -355,7 +382,7 @@ self: super: {
     doCheck         = false;
     ## Setup: Encountered missing dependencies:
     ## data-or ==1.0.*
-    libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ data-or ]);
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
   });
 
   ## Unmerged.  PR: https://github.com/gtk2hs/gtk2hs/pull/233
@@ -398,7 +425,7 @@ self: super: {
     };
     ## Setup: Encountered missing dependencies:
     ## http-client -any, http-client-tls -any, http-types -any
-    libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ http-client http-client-tls http-types ]);
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]);
   });
 
   ## Unmerged.  PR: https://github.com/hanshoglund/monadplus/pull/3
@@ -427,7 +454,7 @@ self: super: {
     };
     ## haddock: internal error: internal: extractDecl (ClsInstD)
     ## CallStack (from HasCallStack):
-    ##   error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1058:16 in main:Haddock.Interface.Create
+    ##   error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1067:16 in main:Haddock.Interface.Create
     doHaddock       = false;
     ## Setup: Encountered missing dependencies:
     ## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5
@@ -438,7 +465,7 @@ self: super: {
     ## monad-control -any,
     ## prim-uniq -any,
     ## reflection -any,
-    libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]);
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]);
   });
 
   ## Unmerged.  PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13
@@ -452,7 +479,7 @@ self: super: {
       rev    = "34f4593a520176a917b74b8c7fcbbfbd72fb8178";
       sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq";
     };
-    jailbreak = true;   # base >=4 && <4.11
+    jailbreak       = true;
   });
 
   ## Unmerged.  PR: https://github.com/vincenthz/hs-securemem/pull/12
@@ -575,6 +602,16 @@ self: super: {
     jailbreak       = true;
   });
 
+  boxes = overrideCabal super.boxes (drv: {
+    ## https://github.com/treeowl/boxes/issues/29
+    patches = (drv.patches or []) ++ [
+      (pkgs.fetchpatch
+       { url    = https://github.com/asr/boxes/commit/f03e16cb8677a9d85687c641fe27a87e6fd94d54.patch;
+         sha256 = "179vkn6jimiy64dwyam04x8v981l3pfrq3ig97600vnkns3v8i6a";
+       })
+    ];
+  });
+
   cabal2nix = super.cabal2nix.override {
     ##     • No instance for (Semigroup (List a))
     ##         arising from the 'deriving' clause of a data type declaration
@@ -595,12 +632,44 @@ self: super: {
     jailbreak       = true;
   });
 
+  ## Issue: https://github.com/jgm/doctemplates/issues/2
+  doctemplates = overrideCabal super.doctemplates (drv: {
+    patches = (drv.patches or []) ++ [
+      (pkgs.fetchpatch
+       { url    = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch;
+         sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d";
+       })
+    ];
+  });
+
   exception-transformers = overrideCabal super.exception-transformers (drv: {
     ## Setup: Encountered missing dependencies:
     ## HUnit >=1.2 && <1.6
     jailbreak       = true;
   });
 
+  GenericPretty = overrideCabal super.GenericPretty (drv: {
+    ## https://github.com/RazvanRanca/GenericPretty/issues/2
+    patches = (drv.patches or []) ++ [
+      (pkgs.fetchpatch
+       { url    = https://github.com/RazvanRanca/GenericPretty/pull/3.patch;
+         sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k";
+       })
+    ];
+  });
+
+  hackage-security = overrideCabal super.hackage-security (drv: {
+    ## https://github.com/haskell/hackage-security/issues/211
+    jailbreak       = true;
+  });
+
+  haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## QuickCheck ==2.11.*
+    doCheck         = false;
+    doHaddock       = false;
+  });
+
   hashable = overrideCabal super.hashable (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.4 && <4.11
@@ -700,6 +769,16 @@ self: super: {
     doCheck         = false;
   });
 
+  setlocale = overrideCabal super.setlocale (drv: {
+    ## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
+    jailbreak       = true;
+  });
+
+  stylish-cabal = overrideCabal super.stylish-cabal (drv: {
+    ## https://github.com/pikajude/stylish-cabal/issues/6
+    doHaddock       = false;
+  });
+
   tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.5 && <4.11
@@ -727,17 +806,18 @@ self: super: {
     ##        uncaught exception: ErrorCall (Data.Text.Array.new: size overflow
     ##        CallStack (from HasCallStack):
     ##          error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array)
-    ## Randomized with seed 2114194349
-    ## Finished in 0.0017 seconds
+    ## Randomized with seed 1899912238
+    ## Finished in 0.0027 seconds
     doCheck         = false;
     ## Setup: Encountered missing dependencies:
     ## extra >=1.4.10 && <1.5, lens ==4.14.*
     jailbreak       = true;
   });
 
-  these = overrideCabal super.these (drv: {
+  ## Issue: https://github.com/phadej/tree-diff/issues/15
+  tree-diff = overrideCabal super.tree-diff (drv: {
     ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
+    ## base >=4.7 && <4.11
     jailbreak       = true;
   });
 
@@ -758,52 +838,4 @@ self: super: {
     jailbreak       = true;
   });
 
-  # https://github.com/haskell/HTTP/pull/114
-  HTTP = self.HTTP_4000_3_10;
-  HTTP_4000_3_10 = dontCheck super.HTTP_4000_3_10;
-
-  # Older versions don't compile.
-  haddock-library = self.haddock-library_1_5_0_1;
-  haddock-library_1_5_0_1 = dontHaddock (dontCheck super.haddock-library_1_5_0_1);
-
-  # https://github.com/phadej/tree-diff/issues/15
-  tree-diff = doJailbreak super.tree-diff;
-
-  # https://github.com/jgm/doctemplates/issues/2
-  doctemplates = appendPatch super.doctemplates (pkgs.fetchpatch
-    { url = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch;
-      sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d";
-    });
-
-  # https://github.com/bitemyapp/esqueleto/issues/77
-  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
-
-  # https://github.com/haskell-pkg-janitors/haskell-src/issues/5
-  haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src;
-
-  # Older versions don't compile.
-  hackage-db = super.hackage-db_2_0_1;
-
-  # https://github.com/RazvanRanca/GenericPretty/issues/2
-  GenericPretty = appendPatch super.GenericPretty (pkgs.fetchpatch
-    { url = https://github.com/RazvanRanca/GenericPretty/pull/3.patch;
-      sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k";
-    }
-  );
-
-  # https://github.com/haskell/hackage-security/issues/211
-  hackage-security = doJailbreak super.hackage-security;
-
-  # https://github.com/pikajude/stylish-cabal/issues/6
-  stylish-cabal = dontHaddock super.stylish-cabal;
-
-  # https://github.com/treeowl/boxes/issues/29
-  boxes = appendPatch super.boxes (pkgs.fetchpatch
-    { url = https://github.com/asr/boxes/commit/f03e16cb8677a9d85687c641fe27a87e6fd94d54.patch;
-      sha256 = "179vkn6jimiy64dwyam04x8v981l3pfrq3ig97600vnkns3v8i6a";
-    });
-
-  # https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
-  setlocale = doJailbreak super.setlocale;
-
 }

From edef34445833e69ffcd0a9e1557bba3c61929b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Mon, 12 Mar 2018 00:20:18 +0100
Subject: [PATCH 0795/2266] petsc: fix darwin build

---
 pkgs/development/libraries/science/math/petsc/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index efedbe725af..e1ce4b49747 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ];
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace config/install.py \
+      --replace /usr/bin/install_name_tool install_name_tool
+  '';
+
   preConfigure = ''
     patchShebangs .
     configureFlagsArray=(

From 532bd714bac656e38c3ef5f6d447efb9ffd6792d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 12 Mar 2018 01:41:18 +0200
Subject: [PATCH 0796/2266] nano: 2.9.3 -> 2.9.4

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

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index a4dd39b8f76..9ff1c44dceb 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.9.3";
+  version = "2.9.4";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "04j05nbnp8vjjwja90d83p4s6ywyl6qhggflcjzw0p9d9gyvr0vp";
+    sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 06a19792633c2c3a3119358df7c79a77b193662e Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 01:51:51 +0300
Subject: [PATCH 0797/2266] ghc841:  gc outdated overrides

---
 .../configuration-ghc-8.4.x.nix               | 111 ------------------
 1 file changed, 111 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8bede50097e..04ec7505f45 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -482,19 +482,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  ## Unmerged.  PR: https://github.com/vincenthz/hs-securemem/pull/12
-  securemem = overrideCabal super.securemem (drv: {
-    ##     • No instance for (Semigroup SecureMem)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid SecureMem’
-    src = pkgs.fetchFromGitHub {
-      owner  = "shlevy";
-      repo   = "hs-securemem";
-      rev    = "6168d90b00bfc6a559d3b9160732343644ef60fb";
-      sha256 = "06dhx1z44j5gshpdlsb4aryr3g4was3x4c2sgv1px8j57zrvlypx";
-    };
-  });
-
   ## Unmerged.  PR: https://github.com/bos/text-format/pull/21
   text-format = overrideCabal super.text-format (drv: {
     ##     • No instance for (Semigroup Format)
@@ -508,32 +495,6 @@ self: super: {
     };
   });
 
-  ## Unmerged.  PR: https://github.com/vincenthz/hs-tls/pull/270
-  tls = overrideCabal super.tls (drv: {
-    ##     • No instance for (Semigroup Credentials)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Credentials’
-    src = pkgs.fetchFromGitHub {
-      owner  = "ocheron";
-      repo   = "hs-tls";
-      rev    = "763656fbc6c2edabb43fc63d8717960f4b26e6e7";
-      sha256 = "0v7f9b78w6prkbscdx5ggjixll9z1zfqzm5x0ap4wvynnflkspqb";
-    };
-    prePatch        = "cd core; ";
-  });
-
-  ## Unmerged.  PR: https://github.com/Soostone/uri-bytestring/pull/0
-  uri-bytestring = overrideCabal super.uri-bytestring (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## template-haskell >=2.9 && <2.13
-    src = pkgs.fetchFromGitHub {
-      owner  = "koenigmaximilian";
-      repo   = "uri-bytestring";
-      rev    = "105d5855bbf9c78d1e48394677b42a058e242fc9";
-      sha256 = "144hr12k0d61zpgxv62vwlzy6bfs01fqh7qr4qsbv457sznmbb9d";
-    };
-  });
-
   ## Unmerged.  PR: https://github.com/ivan-m/wl-pprint-text/pull/17
   wl-pprint-text = overrideCabal super.wl-pprint-text (drv: {
     ##     Ambiguous occurrence ‘<>’
@@ -547,34 +508,6 @@ self: super: {
     };
   });
 
-  ## Unmerged.  PR: https://github.com/vincenthz/hs-certificate/pull/89
-  x509 = overrideCabal super.x509 (drv: {
-    ##     • No instance for (Semigroup DistinguishedName)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid DistinguishedName’
-    src = pkgs.fetchFromGitHub {
-      owner  = "bgamari";
-      repo   = "hs-certificate";
-      rev    = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9";
-      sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf";
-    };
-    prePatch        = "cd x509; ";
-  });
-
-  ## Unmerged.  PR: https://github.com/vincenthz/hs-certificate/pull/89
-  x509-store = overrideCabal super.x509-store (drv: {
-    ##     • No instance for (Semigroup CertificateStore)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid CertificateStore’
-    src = pkgs.fetchFromGitHub {
-      owner  = "bgamari";
-      repo   = "hs-certificate";
-      rev    = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9";
-      sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf";
-    };
-    prePatch        = "cd x509-store; ";
-  });
-
 
   ## Non-code, configuration-only change
 
@@ -590,12 +523,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  bifunctors = overrideCabal super.bifunctors (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## template-haskell >=2.4 && <2.13
-    jailbreak       = true;
-  });
-
   bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
     ## Setup: Encountered missing dependencies:
     ## template-haskell >=2.10 && <2.13
@@ -619,12 +546,6 @@ self: super: {
     hpack = self.hpack;
   };
 
-  cabal-doctest = overrideCabal super.cabal-doctest (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## Cabal >=1.10 && <2.1, base >=4.3 && <4.11
-    jailbreak       = true;
-  });
-
   deepseq-generics = overrideCabal super.deepseq-generics (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.5 && <4.11
@@ -688,13 +609,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  here = overrideCabal super.here (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    ## https://github.com/tmhedberg/here/pull/22
-    jailbreak       = true;
-  });
-
   hnix = overrideCabal super.hnix (drv: {
     ## Setup: Encountered missing dependencies:
     ## deriving-compat ==0.3.*
@@ -739,12 +653,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  megaparsec = overrideCabal super.megaparsec (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.7 && <2.11
-    doCheck         = false;
-  });
-
   newtype-generics = overrideCabal super.newtype-generics (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.6 && <4.11
@@ -763,12 +671,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  scientific = overrideCabal super.scientific (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.5 && <2.11
-    doCheck         = false;
-  });
-
   setlocale = overrideCabal super.setlocale (drv: {
     ## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
     jailbreak       = true;
@@ -791,13 +693,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  ## Issue: https://github.com/haskell/test-framework/issues/35
-  test-framework-quickcheck2 = overrideCabal super.test-framework-quickcheck2 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.4 && <2.11
-    jailbreak       = true;
-  });
-
   ## Issue: https://github.com/ChrisPenner/rasa/issues/54
   text-lens = overrideCabal super.text-lens (drv: {
     ## Failures:
@@ -821,12 +716,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  unliftio-core = overrideCabal super.unliftio-core (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
   vector-algorithms = overrideCabal super.vector-algorithms (drv: {
     ##     • Ambiguous type variable ‘mv0’
     doCheck         = false;

From e31f49f6719b24e0e5000a36a5c958bc25bf066c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 12 Mar 2018 01:47:07 +0200
Subject: [PATCH 0798/2266] sssd: 1.16.0 -> 1.16.1

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

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 516f0b92df6..3d89fdfdc28 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "sssd-${version}";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchurl {
     url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
-    sha256 = "03wllgbxxz2zv14dcqr8d2xssppi7ibckh0rlky8gvsw6vjsd0f5";
+    sha256 = "0vjh1c5960wh86zjsamdjhljls7bb5fz5jpcazgzrpmga5w6ggrd";
   };
 
   # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>

From b77b9d56f333196eff8a88bdadea929a113509cd Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:46:52 +0300
Subject: [PATCH 0799/2266] ghc841:  deriving-compat released [1/2]

---
 .../haskell-modules/configuration-ghc-8.4.x.nix   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 04ec7505f45..96bde55897d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -181,21 +181,6 @@ self: super: {
 
   ## Upstreamed
 
-  ## Upstreamed, awaiting a Hackage release
-  deriving-compat = overrideCabal super.deriving-compat (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## template-haskell >=2.5 && <2.13
-    src = pkgs.fetchFromGitHub {
-      owner  = "haskell-compat";
-      repo   = "deriving-compat";
-      rev    = "e592c6f8af53866dcf6f5700175a3b02bb4f77d3";
-      sha256 = "0h4qadk7fmz5v3lbdsxfbf3ha81f73xn7v0s6wia16ika5yvfggs";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## th-abstraction >=0.2.2 && <1
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ th-abstraction ]);
-  });
-
   ## Upstreamed, awaiting a Hackage release
   haskell-gi = overrideCabal super.haskell-gi (drv: {
     ## Setup: Encountered missing dependencies:

From b69eb4af28c133f167dde927aa856d531befbb30 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 01:58:09 +0300
Subject: [PATCH 0800/2266] ghc841:  jailbreak protolude

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 96bde55897d..37cbda8919b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -644,6 +644,12 @@ self: super: {
     jailbreak       = true;
   });
 
+  protolude = overrideCabal super.protolude (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## base >=4.6 && <4.11
+    jailbreak       = true;
+  });
+
   quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.5 && <4.11

From 9c58744f3ec8a8c2384a5197d5f0a27d26a8980c Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 01:58:21 +0300
Subject: [PATCH 0801/2266] ghc841:  dontCheck resolv

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 37cbda8919b..0071a02e295 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -662,6 +662,12 @@ self: super: {
     jailbreak       = true;
   });
 
+  resolv = overrideCabal super.resolv (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## tasty >=0.11.2 && <0.12
+    doCheck         = false;
+  });
+
   setlocale = overrideCabal super.setlocale (drv: {
     ## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
     jailbreak       = true;

From d7365851fbb556e07a3b1e13970949c0e690cd20 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 01:58:49 +0300
Subject: [PATCH 0802/2266] ghc841:  dhall fix

---
 .../configuration-ghc-8.4.x.nix               | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 0071a02e295..bca1e1c1b48 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -370,6 +370,28 @@ self: super: {
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
   });
 
+  ## Unmerged.  PR: https://github.com/dhall-lang/dhall-haskell/pull/321
+  dhall = overrideCabal super.dhall (drv: {
+    ##     • No instance for (Semigroup (Parser Builder))
+    ##         arising from a use of ‘<>’
+    ##       There are instances for similar types:
+    src = pkgs.fetchFromGitHub {
+      owner  = "deepfire";
+      repo   = "dhall-haskell";
+      rev    = "38f3d8c861e137da6d8ac8eab88aec1c359efcac";
+      sha256 = "1pya7lhdjsygk622k1g3whj0a7jqwyym26ikxbn1anxypnb0n2wy";
+    };
+    ## Setup: Encountered missing dependencies:
+    ## prettyprinter >=1.2.0.1 && <1.3
+    jailbreak       = true;
+    ## Setup: Encountered missing dependencies:
+    ## insert-ordered-containers -any,
+    ## lens-family-core -any,
+    ## prettyprinter-ansi-terminal -any,
+    ## repline -any
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]);
+  });
+
   ## Unmerged.  PR: https://github.com/gtk2hs/gtk2hs/pull/233
   gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: {
     ## Setup: Encountered missing dependencies:

From 8f72b8a5c0c1e16b8538642da9d0b6f9148e8b26 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:23:06 +0300
Subject: [PATCH 0803/2266] ghc841:  bv fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index bca1e1c1b48..1582dfe8612 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -182,6 +182,18 @@ self: super: {
   ## Upstreamed
 
   ## Upstreamed, awaiting a Hackage release
+  bv = overrideCabal super.bv (drv: {
+    ##     • No instance for (GHC.Base.Semigroup BV)
+    ##         arising from the superclasses of an instance declaration
+    ##     • In the instance declaration for ‘Monoid BV’
+    src = pkgs.fetchFromGitHub {
+      owner  = "iagoabal";
+      repo   = "haskell-bv";
+      rev    = "92932a75719020d6a8ac55c455e5c03a4304043f";
+      sha256 = "0fi4v9mpw5y9q1pm7lqhm2zazfyy921wpaa28125misix0frasfw";
+    };
+  });
+
   haskell-gi = overrideCabal super.haskell-gi (drv: {
     ## Setup: Encountered missing dependencies:
     ## haskell-gi-base ==0.20.*

From 662bc073b2579e29caad1d40aaed7b0b91f91888 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:23:23 +0300
Subject: [PATCH 0804/2266] ghc841:  cabal2nix fixed upstream

---
 .../configuration-ghc-8.4.x.nix               | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 1582dfe8612..d4c884a5f61 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -194,6 +194,24 @@ self: super: {
     };
   });
 
+  ## Upstreamed, awaiting a Hackage release
+  cabal2nix = (overrideCabal super.cabal2nix (drv: {
+    ##     Ambiguous occurrence ‘<>’
+    ##     It could refer to either ‘Prelude.<>’,
+    ##                              imported from ‘Prelude’ at src/Distribution/Nixpkgs/Haskell/Derivation.hs:6:8-46
+    src = pkgs.fetchFromGitHub {
+      owner  = "nixos";
+      repo   = "cabal2nix";
+      rev    = "32974fcc3d9b485bd35167d9ae90941a5b3d06df";
+      sha256 = "1racp49z5922rvrc62clslzdkxh4axj2i0k83w5y6w5chl83abyd";
+    };
+  })).override {
+    ##     • No instance for (Semigroup (List a))
+    ##         arising from the 'deriving' clause of a data type declaration
+    ##       Possible fix:
+    hpack = self.hpack;
+  };
+
   haskell-gi = overrideCabal super.haskell-gi (drv: {
     ## Setup: Encountered missing dependencies:
     ## haskell-gi-base ==0.20.*
@@ -558,13 +576,6 @@ self: super: {
     ];
   });
 
-  cabal2nix = super.cabal2nix.override {
-    ##     • No instance for (Semigroup (List a))
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       Possible fix:
-    hpack = self.hpack;
-  };
-
   deepseq-generics = overrideCabal super.deepseq-generics (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.5 && <4.11

From b2cfe1ce644b1814e387b75c277879803bab8c05 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:23:56 +0300
Subject: [PATCH 0805/2266] ghc841:  cabal-install fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d4c884a5f61..b727657f42b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -212,6 +212,22 @@ self: super: {
     hpack = self.hpack;
   };
 
+  ## Upstreamed, awaiting a Hackage release
+  cabal-install = overrideCabal super.cabal-install (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## Cabal >=2.0.1.0 && <2.1, base >=4.5 && <4.11
+    src = pkgs.fetchFromGitHub {
+      owner  = "haskell";
+      repo   = "cabal";
+      rev    = "728ad1a1e066da453ae13ee479629c00d8c2f32d";
+      sha256 = "0943xpva0fjlx8fanqvb6bg7myim2pki7q8hz3q0ijnf73bgzf7p";
+    };
+    prePatch        = "cd cabal-install; ";
+    ## Setup: Encountered missing dependencies:
+    ## network >=2.4 && <2.6, resolv >=0.1.1 && <0.2
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ network resolv ]);
+  });
+
   haskell-gi = overrideCabal super.haskell-gi (drv: {
     ## Setup: Encountered missing dependencies:
     ## haskell-gi-base ==0.20.*

From 98f5efd872a196411f550ea657f3f540341b0def Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:24:52 +0300
Subject: [PATCH 0806/2266] ghc841:  haskell-src-exts fix released

---
 .../configuration-ghc-8.4.x.nix               | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b727657f42b..514ebfd7728 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -95,6 +95,12 @@ self: super: {
   ## Older versions don't compile
   haddock-library = super.haddock-library_1_5_0_1;
 
+  ## Needs bump to a versioned attribute
+  ##     • Could not deduce (Semigroup (ParseResult m))
+  ##         arising from the superclasses of an instance declaration
+  ##       from the context: Monoid m
+  haskell-src-exts = super.haskell-src-exts_1_20_2;
+
   ## Needs bump to a versioned attribute
   hspec = overrideCabal super.hspec_2_4_8 (drv: {
     ## Setup: Encountered missing dependencies:
@@ -252,19 +258,6 @@ self: super: {
     prePatch        = "cd base; ";
   });
 
-  ## Upstreamed, awaiting a Hackage release
-  haskell-src-exts = overrideCabal super.haskell-src-exts (drv: {
-    ##     • Could not deduce (Semigroup (ParseResult m))
-    ##         arising from the superclasses of an instance declaration
-    ##       from the context: Monoid m
-    src = pkgs.fetchFromGitHub {
-      owner  = "haskell-suite";
-      repo   = "haskell-src-exts";
-      rev    = "935f6f0915e89c314b686bdbdc6980c72335ba3c";
-      sha256 = "1v3c1bd5q07qncqfbikvs8h3r4dr500blm5xv3b4jqqv69f0iam9";
-    };
-  });
-
   ## Upstreamed, awaiting a Hackage release
   http-api-data = overrideCabal super.http-api-data (drv: {
     ##     • No instance for (Semigroup Form)

From 1a451a36cbea25490ebf68679de98f7f4b051315 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:25:19 +0300
Subject: [PATCH 0807/2266] ghc841:  SMP-compatible regex-tdfa now on hackage

---
 .../configuration-ghc-8.4.x.nix               | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 514ebfd7728..92d49f71a78 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -145,6 +145,16 @@ self: super: {
   ## free ==4.*, template-haskell >=2.4 && <2.13
   lens = super.lens_4_16;
 
+  ## Needs bump to a versioned attribute
+  regex-tdfa = overrideCabal super.regex-tdfa_1_2_3 (drv: {
+    ##     • No instance for (Semigroup (CharMap a))
+    ##         arising from the superclasses of an instance declaration
+    ##     • In the instance declaration for ‘Monoid (CharMap a)’
+    ##
+    ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:188:16:
+    editedCabalFile = null;
+  });
+
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.11.1 && <0.14
@@ -514,20 +524,6 @@ self: super: {
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]);
   });
 
-  ## Unmerged.  PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13
-  regex-tdfa = overrideCabal super.regex-tdfa (drv: {
-    ##     • No instance for (Semigroup (CharMap a))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (CharMap a)’
-    src = pkgs.fetchFromGitHub {
-      owner  = "bgamari";
-      repo   = "regex-tdfa";
-      rev    = "34f4593a520176a917b74b8c7fcbbfbd72fb8178";
-      sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq";
-    };
-    jailbreak       = true;
-  });
-
   ## Unmerged.  PR: https://github.com/bos/text-format/pull/21
   text-format = overrideCabal super.text-format (drv: {
     ##     • No instance for (Semigroup Format)

From d799cc8b23b8049cca74f7c5bffa567799beb5bf Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:26:03 +0300
Subject: [PATCH 0808/2266] ghc841:  haddock-library needs dontCheck and
 dontHaddock

---
 .../haskell-modules/configuration-ghc-8.4.x.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 92d49f71a78..24032e97a62 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -90,10 +90,19 @@ self: super: {
   hackage-db = super.hackage-db_2_0_1;
 
   ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## base >=4.5 && <4.11
-  ## Older versions don't compile
-  haddock-library = super.haddock-library_1_5_0_1;
+  haddock-library = overrideCabal super.haddock-library_1_5_0_1 (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## base >=4.5 && <4.11
+    ## Older versions don't compile
+    ##
+    ## Setup: Encountered missing dependencies:
+    ## QuickCheck ==2.11.*
+    doCheck         = false;
+    ## Running Haddock on library for haddock-library-1.5.0.1..
+    ## Setup: internal error when calculating transitive package dependencies.
+    ## Debug info: []
+    doHaddock       = false;
+  });
 
   ## Needs bump to a versioned attribute
   ##     • Could not deduce (Semigroup (ParseResult m))

From 663934aec8fa29c4ba25a078cd8a82430b2666b6 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:26:41 +0300
Subject: [PATCH 0809/2266] ghc841:  fixed deriving-compat now on hackage

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 24032e97a62..2db02918e01 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -55,6 +55,11 @@ self: super: {
   ##       from the context: a
   constraints = super.constraints_0_10;
 
+  ## Needs bump to a versioned attribute
+  ## Setup: Encountered missing dependencies:
+  ## template-haskell >=2.5 && <2.13
+  deriving-compat = super.deriving-compat_0_4_1;
+
   ## Needs bump to a versioned attribute
   ## Issue: https://github.com/sol/doctest/issues/189
   doctest = overrideCabal super.doctest_0_14_1 (drv: {

From c5160c62e3436b102f71bcdfe7795f1d2b0a0151 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:29:20 +0300
Subject: [PATCH 0810/2266] ghc841:  hackage-security fixed upstream

---
 .../configuration-ghc-8.4.x.nix               | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 2db02918e01..c5a1a71e45e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -258,6 +258,26 @@ self: super: {
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ network resolv ]);
   });
 
+  ## Upstreamed, awaiting a Hackage release
+  hackage-security = overrideCabal super.hackage-security (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## Cabal >=1.14 && <1.26,
+    ## directory >=1.1.0.2 && <1.3,
+    ## time >=1.2 && <1.7
+    src = pkgs.fetchFromGitHub {
+      owner  = "haskell";
+      repo   = "hackage-security";
+      rev    = "21519f4f572b9547485285ebe44c152e1230fd76";
+      sha256 = "1ijwmps4pzyhsxfhc8mrnc3ldjvpisnmr457vvhgymwhdrr95k0z";
+    };
+    prePatch        = "cd hackage-security; ";
+    ## https://github.com/haskell/hackage-security/issues/211
+    jailbreak       = true;
+    ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:217:22:
+    editedCabalFile = null;
+  });
+
+  ## Upstreamed, awaiting a Hackage release
   haskell-gi = overrideCabal super.haskell-gi (drv: {
     ## Setup: Encountered missing dependencies:
     ## haskell-gi-base ==0.20.*
@@ -628,11 +648,6 @@ self: super: {
     ];
   });
 
-  hackage-security = overrideCabal super.hackage-security (drv: {
-    ## https://github.com/haskell/hackage-security/issues/211
-    jailbreak       = true;
-  });
-
   haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: {
     ## Setup: Encountered missing dependencies:
     ## QuickCheck ==2.11.*

From 86b554a589c6b3c8e25323cd143c0ca1a4314a81 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 02:29:57 +0300
Subject: [PATCH 0811/2266] ghc841:  github needs a jailbreak

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index c5a1a71e45e..db531f4795d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -648,6 +648,12 @@ self: super: {
     ];
   });
 
+  github = overrideCabal super.github (drv: {
+    ## Setup: Encountered missing dependencies:
+    ## base >=4.7 && <4.11
+    jailbreak       = true;
+  });
+
   haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: {
     ## Setup: Encountered missing dependencies:
     ## QuickCheck ==2.11.*

From b619881ae055297c5cc966006e7ea64f20ffc6a5 Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 11 Mar 2018 01:01:25 -0500
Subject: [PATCH 0812/2266] nextcloud-client: restrict platform to linux

Some dependencies fail to build on darwin.
---
 pkgs/applications/networking/nextcloud-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index f61b887cd87..6ed5e63cd0f 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = https://nextcloud.com;
     license = licenses.gpl2;
     maintainers = with maintainers; [ caugner ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 876420f04e4d29ed16c2e43774fab6e000526dfa Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Mon, 12 Mar 2018 04:06:06 +0400
Subject: [PATCH 0813/2266] bitcoin-unlimited: fix build with boost 1.66

Use part of fix for mainline bitcoin:
https://github.com/bitcoin/bitcoin/commit/1ec0c0a01c316146434642ab2f14a7367306dbec

Also enable parallel builds for speed.
---
 .../bitcoin-unlimited-const-comparators.patch | 38 +++++++++++++++++++
 .../altcoins/bitcoin-unlimited.nix            |  5 +++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch

diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
new file mode 100644
index 00000000000..1b74a48a84a
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
@@ -0,0 +1,38 @@
+--- a/src/txmempool.h
++++ b/src/txmempool.h
+@@ -204,7 +204,7 @@
+ class CompareTxMemPoolEntryByDescendantScore
+ {
+ public:
+-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+     {
+         bool fUseADescendants = UseDescendantScore(a);
+         bool fUseBDescendants = UseDescendantScore(b);
+@@ -226,7 +226,7 @@
+     }
+ 
+     // Calculate which score to use for an entry (avoiding division).
+-    bool UseDescendantScore(const CTxMemPoolEntry &a)
++    bool UseDescendantScore(const CTxMemPoolEntry &a) const
+     {
+         double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
+         double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
+@@ -241,7 +241,7 @@
+ class CompareTxMemPoolEntryByScore
+ {
+ public:
+-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+     {
+         double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
+         double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
+@@ -255,7 +255,7 @@
+ class CompareTxMemPoolEntryByEntryTime
+ {
+ public:
+-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+     {
+         return a.GetTime() < b.GetTime();
+     }
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 9eb1e54b909..23d9e63459a 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -21,8 +21,13 @@ stdenv.mkDerivation rec {
                   miniupnpc utillinux protobuf libevent ]
                   ++ optionals withGui [ qt4 qrencode ];
 
+  patches = [
+    ./bitcoin-unlimited-const-comparators.patch
+  ];
+
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
+  enableParallelBuilding = true;
 
   meta = {
     description = "Peer-to-peer electronic cash system (Unlimited client)";

From 74b81ea91c7796ad68e54677e3ca4728b4b06e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Mon, 12 Mar 2018 01:29:44 +0100
Subject: [PATCH 0814/2266] pythonPackages.shapely: fix darwin build

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

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 7246205619f..6f10cfdf3ba 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -30,10 +30,9 @@ buildPythonPackage rec {
     sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py
   '';
 
-  # tests/test_voctorized fails because the vectorized extension is not
-  # available in when running tests
+  # Disable the tests that improperly try to use the built extensions
   checkPhase = ''
-    py.test --ignore tests/test_vectorized.py
+    py.test -k 'not test_vectorized and not test_fallbacks' tests
   '';
 
   meta = with stdenv.lib; {

From a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 11 Mar 2018 17:56:26 -0700
Subject: [PATCH 0815/2266] texmaker: 4.5 -> 5.0.2

---
 pkgs/applications/editors/texmaker/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix                |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 76c8e4ae0e4..c5f691e95c2 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -1,23 +1,26 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }:
+{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
 
 stdenv.mkDerivation rec {
   pname = "texmaker";
-  version = "4.5";
+  version = "5.0.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
-    sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c";
+    sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9";
   };
 
-  buildInputs = [ qt4 poppler_qt4 zlib ];
-  nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
+  buildInputs = [ qtbase qtscript poppler zlib ];
+  nativeBuildInputs = [ pkgconfig poppler qmake ];
   NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"
+    qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo"
   '';
 
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "TeX and LaTeX editor";
     longDescription=''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffada189f20..1016db1b6a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2290,7 +2290,7 @@ with pkgs;
   flameGraph = flamegraph;
 
   flvtool2 = callPackage ../tools/video/flvtool2 { };
-  
+
   fmbt = callPackage ../development/tools/fmbt {
     python = python2;
   };
@@ -4997,7 +4997,7 @@ with pkgs;
     extraFonts = true;
   };
 
-  texmaker = callPackage ../applications/editors/texmaker { };
+  texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
 
   texstudio = callPackage ../applications/editors/texstudio { };
 

From 68f60bcc895e1620fa2640ac3ebd2d7661deaf28 Mon Sep 17 00:00:00 2001
From: pjan vandaele <pjan@pjan.io>
Date: Mon, 12 Mar 2018 09:56:47 +0900
Subject: [PATCH 0816/2266] updates gist to 4.6.2

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

diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index cf4b90643d7..f5dcbb9191c 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "gist";
-  version = "4.6.1";
-  source.sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff";
+  version = "4.6.2";
+  source.sha256 = "0zrw84k2982aiansmv2aj3101d3giwa58221n6aisvg5jq5kmiib";
 
   buildInputs = [ makeWrapper ];
 

From f34e136a049f15f6610fe4238f44ae013686e4c0 Mon Sep 17 00:00:00 2001
From: Ken Micklas <ken.micklas@obsidian.systems>
Date: Sun, 11 Mar 2018 22:02:32 -0400
Subject: [PATCH 0817/2266] callCabal2nix: Use host platform rather than build
 platform for evaluation of Cabal files

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

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 33d56fa8e1c..9912d1bcde2 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -120,7 +120,7 @@ let
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
-        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
+        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
       '';
   };
 

From 66998084c99021a664bfcf39337ea11df6e10f15 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 11 Mar 2018 21:55:19 -0500
Subject: [PATCH 0818/2266] maintainers: add marsam

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 74b9f23af79..65bdc9dd3e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2134,6 +2134,11 @@
     github = "markuskowa";
     name = "Markus Kowalewski";
   };
+  marsam = {
+    email = "marsam@users.noreply.github.com";
+    github = "marsam";
+    name = "Mario Rodas";
+  };
   martijnvermaat = {
     email = "martijn@vermaat.name";
     github = "martijnvermaat";

From bde912b48bc6b3fc216cad09d46acae222239100 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 10 Mar 2018 17:28:02 -0500
Subject: [PATCH 0819/2266] vale: init at 0.10.1

---
 pkgs/tools/text/vale/default.nix |  25 +++
 pkgs/tools/text/vale/deps.nix    | 275 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |   2 +
 3 files changed, 302 insertions(+)
 create mode 100644 pkgs/tools/text/vale/default.nix
 create mode 100644 pkgs/tools/text/vale/deps.nix

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
new file mode 100644
index 00000000000..057f1c48a1f
--- /dev/null
+++ b/pkgs/tools/text/vale/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "vale-${version}";
+  version = "0.10.1";
+  rev    = "${version}";
+
+  goPackagePath = "github.com/ValeLint/vale";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "ValeLint";
+    repo   = "vale";
+    sha256 = "1iyc9mny3nb6j3allj3szkiygc2v3gi7l7syq9ifjrm1wknk8wrf";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Vale is an open source linter for prose";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix
new file mode 100644
index 00000000000..7bf61f433ce
--- /dev/null
+++ b/pkgs/tools/text/vale/deps.nix
@@ -0,0 +1,275 @@
+
+  # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
+  [
+
+    {
+      goPackagePath  = "github.com/ValeLint/gospell";
+      fetch = {
+        type = "git";
+        url = "https://github.com/ValeLint/gospell";
+        rev =  "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
+        sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/client9/gospell";
+      fetch = {
+        type = "git";
+        url = "https://github.com/client9/gospell";
+        rev =  "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
+        sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/davecgh/go-spew";
+      fetch = {
+        type = "git";
+        url = "https://github.com/davecgh/go-spew";
+        rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+        sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/fatih/color";
+      fetch = {
+        type = "git";
+        url = "https://github.com/fatih/color";
+        rev =  "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
+        sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/gobwas/glob";
+      fetch = {
+        type = "git";
+        url = "https://github.com/gobwas/glob";
+        rev =  "bea32b9cd2d6f55753d94a28e959b13f0244797a";
+        sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/jdkato/prose";
+      fetch = {
+        type = "git";
+        url = "https://github.com/jdkato/prose";
+        rev =  "4d68d1b77f66e36b6897a79f59f434d558e5e0c2";
+        sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/jdkato/regexp";
+      fetch = {
+        type = "git";
+        url = "https://github.com/jdkato/regexp";
+        rev =  "38ab2f7842bf2a539528aa7d0014b37421b886e1";
+        sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/mattn/go-colorable";
+      fetch = {
+        type = "git";
+        url = "https://github.com/mattn/go-colorable";
+        rev =  "941b50ebc6efddf4c41c8e4537a5f68a4e686b24";
+        sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/mattn/go-isatty";
+      fetch = {
+        type = "git";
+        url = "https://github.com/mattn/go-isatty";
+        rev =  "fc9e8d8ef48496124e79ae0df75490096eccf6fe";
+        sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/mattn/go-runewidth";
+      fetch = {
+        type = "git";
+        url = "https://github.com/mattn/go-runewidth";
+        rev =  "9e777a8366cce605130a531d2cd6363d07ad7317";
+        sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/mitchellh/go-homedir";
+      fetch = {
+        type = "git";
+        url = "https://github.com/mitchellh/go-homedir";
+        rev =  "b8bc1bf767474819792c23f32d8286a45736f1c6";
+        sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/mitchellh/mapstructure";
+      fetch = {
+        type = "git";
+        url = "https://github.com/mitchellh/mapstructure";
+        rev =  "d0303fe809921458f417bcf828397a65db30a7e4";
+        sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/montanaflynn/stats";
+      fetch = {
+        type = "git";
+        url = "https://github.com/montanaflynn/stats";
+        rev =  "eeaced052adbcfeea372c749c281099ed7fdaa38";
+        sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/olekukonko/tablewriter";
+      fetch = {
+        type = "git";
+        url = "https://github.com/olekukonko/tablewriter";
+        rev =  "be5337e7b39e64e5f91445ce7e721888dbab7387";
+        sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/pmezard/go-difflib";
+      fetch = {
+        type = "git";
+        url = "https://github.com/pmezard/go-difflib";
+        rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+        sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/remeh/sizedwaitgroup";
+      fetch = {
+        type = "git";
+        url = "https://github.com/remeh/sizedwaitgroup";
+        rev =  "4b44541c93591ee0e73747d6081e61bd8c58b5c7";
+        sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/russross/blackfriday";
+      fetch = {
+        type = "git";
+        url = "https://github.com/russross/blackfriday";
+        rev =  "0b647d0506a698cca42caca173e55559b12a69f2";
+        sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/shogo82148/go-shuffle";
+      fetch = {
+        type = "git";
+        url = "https://github.com/shogo82148/go-shuffle";
+        rev =  "4789c7c401f229b3ae1673acbccca451480660cd";
+        sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/shurcooL/sanitized_anchor_name";
+      fetch = {
+        type = "git";
+        url = "https://github.com/shurcooL/sanitized_anchor_name";
+        rev =  "541ff5ee47f1dddf6a5281af78307d921524bcb5";
+        sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/stretchr/testify";
+      fetch = {
+        type = "git";
+        url = "https://github.com/stretchr/testify";
+        rev =  "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
+        sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/urfave/cli";
+      fetch = {
+        type = "git";
+        url = "https://github.com/urfave/cli";
+        rev =  "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+        sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
+      };
+    }
+
+    {
+      goPackagePath  = "github.com/xrash/smetrics";
+      fetch = {
+        type = "git";
+        url = "https://github.com/xrash/smetrics";
+        rev =  "a3153f7040e90324c58c6287535e26a0ac5c1cc1";
+        sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6";
+      };
+    }
+
+    {
+      goPackagePath  = "golang.org/x/net";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/net";
+        rev =  "ab5485076ff3407ad2d02db054635913f017b0ed";
+        sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7";
+      };
+    }
+
+    {
+      goPackagePath  = "golang.org/x/sys";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/sys";
+        rev =  "14ac33bf8474b62c65cae263af2e4d3b543cc699";
+        sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3";
+      };
+    }
+
+    {
+      goPackagePath  = "gopkg.in/ini.v1";
+      fetch = {
+        type = "git";
+        url = "https://gopkg.in/ini.v1";
+        rev =  "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
+        sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
+      };
+    }
+
+    {
+      goPackagePath  = "gopkg.in/neurosnap/sentences.v1";
+      fetch = {
+        type = "git";
+        url = "https://gopkg.in/neurosnap/sentences.v1";
+        rev =  "a7f18ead1433a139742a8b42ce7a059cfb484d60";
+        sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7";
+      };
+    }
+
+    {
+      goPackagePath  = "gopkg.in/yaml.v2";
+      fetch = {
+        type = "git";
+        url = "https://gopkg.in/yaml.v2";
+        rev =  "25c4ec802a7d637f88d584ab26798e94ad14c13b";
+        sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
+      };
+    }
+
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b3d29ce57e..4cbca11802c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11635,6 +11635,8 @@ with pkgs;
     libva = libva-full; # needs libva-{x11,glx}
   };
 
+  vale = callPackage ../tools/text/vale { };
+
   vamp = callPackage ../development/libraries/audio/vamp { };
 
   vc = callPackage ../development/libraries/vc { };

From 47c7ad14ef03863cf07bc9e8d0ddc5c16a26ad9a Mon Sep 17 00:00:00 2001
From: Lloyd Hazlett <lloydhazlett@users.noreply.github.com>
Date: Mon, 12 Mar 2018 13:56:27 +1100
Subject: [PATCH 0820/2266] spideroak: 6.1.9 -> 7.0.1

---
 pkgs/applications/networking/spideroak/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index d6fe0d9114c..4f91a2b24e9 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -4,16 +4,16 @@
 }:
 
 let
-  arch = if stdenv.system == "x86_64-linux" then "x86_64"
-    else if stdenv.system == "i686-linux" then "i386"
+  arch = if stdenv.system == "x86_64-linux" then "x64"
+    else if stdenv.system == "i686-linux" then "x86"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
   interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "0k87rn4aj0v79rz9jvwspnwzmh031ih0y74ra88nc8kl8j6b6gjm"
-    else if stdenv.system == "i686-linux" then "1wbxfikj8f7rx26asswqrfp9vpk8w5941s21y1pnaff2gcac8m3z"
+  sha256 = if stdenv.system == "x86_64-linux" then "993e01986e3657d6fa979b8d0f45ac25b8223c18f75555016a9f92e651e91b1f"
+    else if stdenv.system == "i686-linux" then "d12c09c3a01bfa48bdecc8763bbf2c7f10b71cea5bcecc177dad031ba79bc83d"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
   ldpath = stdenv.lib.makeLibraryPath [
@@ -21,14 +21,14 @@ let
     libX11 libXext libXrender zlib
   ];
 
-  version = "6.1.9";
+  version = "7.0.1";
 
 in stdenv.mkDerivation {
   name = "spideroak-${version}";
 
   src = fetchurl {
-    name = "spideroak-${version}-${arch}";
-    url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}";
+    name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz";
+    url = "https://spideroak.com/release/spideroak/slack_tar_${arch}";
     inherit sha256;
   };
 

From 5c1e42276d0620736a45e70632580c1fd7c37894 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 12 Mar 2018 15:13:31 +1100
Subject: [PATCH 0821/2266] singularity: 2.4 -> 2.4.2

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/singularity.nix        | 20 +++++++++++++++++++
 .../virtualization/singularity/default.nix    |  7 +++++--
 .../singularity-tools/default.nix             |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/programs/singularity.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7f28c670be..74ed92de0c0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -104,6 +104,7 @@
   ./programs/shadow.nix
   ./programs/shell.nix
   ./programs/spacefm.nix
+  ./programs/singularity.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./programs/sysdig.nix
diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix
new file mode 100644
index 00000000000..86153d93385
--- /dev/null
+++ b/nixos/modules/programs/singularity.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.programs.singularity;
+in {
+  options.programs.singularity = {
+    enable = mkEnableOption "Singularity";
+  };
+
+  config = mkIf cfg.enable {
+      environment.systemPackages = [ pkgs.singularity ];
+      systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -"
+                                 "d /var/singularity/mnt/final 0770 root root -"
+                                 "d /var/singularity/mnt/overlay 0770 root root -"
+                                 "d /var/singularity/mnt/container 0770 root root -"
+                                 "d /var/singularity/mnt/source 0770 root root -"];
+  };
+
+}
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 236cb8f31e6..66280543895 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.4";
+  version = "2.4.2";
 
   enableParallelBuilding = true;
 
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  configureFlags = "--localstatedir=/var";
+  installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy";
+
   fixupPhase = ''
     patchShebangs $out
     for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do
@@ -42,7 +45,7 @@ stdenv.mkDerivation rec {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "1hi1ag1lb2x4djbz4x34wix83ymx0g9mzn2md6yrpiflc1d85rjz";
+    sha256 = "0cpa2yp82g9j64mgr90p75ddk85kbj1qi1r6hy0sz17grqdlaxl4";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 62cf13e5202..60271e592a2 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -96,6 +96,7 @@ rec {
             echo creating
             singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
             echo importing
+            mkdir -p /var/singularity/mnt/container
             tar -c . | singularity image.import $out
           '');
 

From f48ff649fe9c63359deaac8e15dd22d4be7956c7 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 12 Mar 2018 16:03:44 +1100
Subject: [PATCH 0822/2266] snpeff: 4.3t -> 4.3q

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

diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index e1add2e1483..9c2d273b088 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "snpeff-${version}";
-  version = "4.3t";
+  version = "4.3q";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/snpeff/snpEff_v4_3t_core.zip";
-    sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
+    url = "mirror://sourceforge/project/snpeff/snpEff_v4_3q_core.zip";
+    sha256 = "0sxz8zy8wrzcy01hyb1cirwbxqyjw30a2x3q6p4l7zmw2szi7mn1";
   };
 
   buildInputs = [ unzip jre makeWrapper ];

From 833851cd6e00221c69d166f752ee7b300dd57455 Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Mon, 12 Mar 2018 02:04:28 -0400
Subject: [PATCH 0823/2266] qtlocation: fix darwin build

A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.
---
 pkgs/development/libraries/qt-5/modules/qtlocation.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index 008583ebaf9..e8952e29cba 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -1,4 +1,4 @@
-{ qtModule, qtbase, qtmultimedia }:
+{ stdenv, qtModule, qtbase, qtmultimedia }:
 
 qtModule {
   name = "qtlocation";
@@ -6,4 +6,11 @@ qtModule {
   outputs = [ "bin" "out" "dev" ];
   # Linking with -lclipper fails with parallel build enabled
   enableParallelBuilding = false;
+  qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
+     # boost uses std::auto_ptr which has been disabled in clang with libcxx
+     # This flag re-enables this feature
+     # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
+     "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
+  ];
+
 }

From 29ea34c6db348570f05c2e87c2d5de31fd4c2702 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 11:31:16 -0800
Subject: [PATCH 0824/2266] sdcc: 3.6.0 -> 3.7.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/as2gbmap -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/as2gbmap --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcdb -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcdb --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/s51 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/s51 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sz80 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sz80 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/stlcs -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/stlcs -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/shc08 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/shc08 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sstm8 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sstm8 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/packihx -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/packihx --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/makebin -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcpp --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc --version` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc --help` and found version 3.7.0
- found 3.7.0 with grep in /nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0
---
 pkgs/development/compilers/sdcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 7383f39f6cb..ec93ba79d44 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }:
 
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "3.7.0";
   name = "sdcc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
-    sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8";
+    sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5";
   };
 
   # TODO: remove this comment when gputils != null is tested

From c10b7a7d27ce60ed8ce43996bb8b84db9d6ca68b Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Mon, 12 Mar 2018 11:05:19 +0300
Subject: [PATCH 0825/2266] nftables: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 7edc7b58c6c..be52cbc2029 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -2,11 +2,12 @@
 , flex, bison, libmnl, libnftnl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  name = "nftables-0.8.2";
+  version = "0.8.3";
+  name = "nftables-${version}";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
-    sha256 = "1v370wzh3fzby0cdb9iykkhdj1yjcp5qkp33xyn7w7pii2phlpv7";
+    sha256 = "0f2yv7as1ybkfvn75f72x0z9y1ydibw4s3hbzhlmvsc8vgsy2syi";
   };
 
   configureFlags = [

From 86f96237eec19636c8b0d3f539f0fbd60cbdb0d3 Mon Sep 17 00:00:00 2001
From: pjan vandaele <pjan@pjan.io>
Date: Mon, 12 Mar 2018 11:18:59 +0900
Subject: [PATCH 0826/2266] youtube-dl: 2018.03.03 -> 2018.03.10

Fixes #36843
---
 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 03a83de11b4..bd041d8645d 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2018.03.03";
+  version = "2018.03.10";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1x0m5whrcs7589z8rildgy0zmxfvzbnx89pag7013qvfrpb63858";
+    sha256 = "1ibmz91anli1vzkgw2i3h4wf1i8arzd74730ylwcwyg3375xryjb";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b7a2333ebe7a0916c9791f3b7a839e8095c39f7f Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 12 Mar 2018 17:27:43 +0900
Subject: [PATCH 0827/2266] qemu-vm: removes warning when running build-vm

get rid of deprecated qemu commands
---
 nixos/modules/virtualisation/qemu-vm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 13d0eb7de5c..3270f1507f9 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -319,8 +319,8 @@ in
       networkingOptions =
         mkOption {
           default = [
-            "-net nic,vlan=0,model=virtio"
-            "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+            "-net nic,netdev=user.0,model=virtio"
+            "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
           ];
           type = types.listOf types.str;
           description = ''
@@ -436,7 +436,7 @@ in
 
     # FIXME: Figure out how to make this work on non-x86
     virtualisation.qemu.options =
-      mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usbdevice tablet" ];
+      mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ];
 
     # Mount the host filesystem via 9P, and bind-mount the Nix store
     # of the host into our own filesystem.  We use mkVMOverride to

From 7b7860ff8958efa70d164f2e8d7477fb6aadfe39 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 9 Mar 2018 17:36:57 +0900
Subject: [PATCH 0828/2266] build-vm: remove trailing dot from script path

Allow to double click/middle click paste path a bit quicker.
---
 nixos/modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 9ede74a54cd..2af73519bc5 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -382,6 +382,6 @@ fi
 if [ "$action" = build-vm ]; then
     cat >&2 <<EOF
 
-Done.  The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm).
+Done.  The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm)
 EOF
 fi

From c476d2f592f5fc4ccca10da4d8f45c7d15eb8c5a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 26 Dec 2017 16:58:04 +0900
Subject: [PATCH 0829/2266] grub-install.pl: more details on blkid failure

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index cc03e54ead6..8bd203106f5 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -182,7 +182,7 @@ sub GrubFs {
                 # Based on the type pull in the identifier from the system
                 my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}");
                 if ($status != 0) {
-                    die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
+                    die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}";
                 }
                 my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
                 if ($#matches != 0) {

From 3bca698db33898f8c95e227db435cf1e281cd4ba Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Mon, 12 Mar 2018 12:39:47 +0300
Subject: [PATCH 0830/2266] dar 2.5.14: fix build on Darwin

---
 pkgs/tools/archivers/dar/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index f2ba1d70fca..315ef727283 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -3,11 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "dar-2.5.14";
+  version = "2.5.14";
+  name = "dar-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "1if50d3cby30id18jh7bzy9mn2jjb89lsgpynjflyaibdcb4kq7s";
+    url = "mirror://sourceforge/dar/${name}-bis.tar.gz";
+    sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From 3bff46e3527efb7d7a26f4fd1336eba44626d874 Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Mon, 12 Mar 2018 10:48:19 +0100
Subject: [PATCH 0831/2266] chromedriver: 2.35 -> 2.36

---
 pkgs/development/tools/selenium/chromedriver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 554a5585f15..39f26ed97cc 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,12 +6,12 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "13iyz6579yw4fk9dr4nf2pdj55v1iflj8yf9a4zz7qw5996d5yk7";
+      sha256 = "1m119kbsr6gm8a37q92rflp5mp3fjzw8cy4r5j4bnihkai7khq94";
     };
 
     "x86_64-darwin" = {
       system = "mac64";
-      sha256 = "11xa31bxhrq0p7kd3j76dihp73abdbmbwdng5454m1wir6yj25f1";
+      sha256 = "11hs4mmlvxjaanq41h0dljj4sff0lfwk31svvdmzfg91idlikpsz";
     };
   };
 
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.35";
+  version = "2.36";
 
   src = fetchurl {
     url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From bbf69b7301a5e67b1af28e8e36bc2d12994eb4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 12 Mar 2018 10:47:17 +0000
Subject: [PATCH 0832/2266] travis: add update instructions (#36855)

---
 pkgs/development/tools/misc/travis/Gemfile      |  2 +-
 pkgs/development/tools/misc/travis/Gemfile.lock |  4 ++--
 pkgs/development/tools/misc/travis/default.nix  |  5 +++++
 pkgs/development/tools/misc/travis/gemset.nix   |  8 ++++++++
 pkgs/development/tools/misc/travis/shell.nix    | 11 +++++++++++
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/misc/travis/shell.nix

diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile
index d52f576be24..788341de3fa 100644
--- a/pkgs/development/tools/misc/travis/Gemfile
+++ b/pkgs/development/tools/misc/travis/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "travis"
+gem "travis", "1.8.8"
diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock
index 529be079360..a1c8332a3d4 100644
--- a/pkgs/development/tools/misc/travis/Gemfile.lock
+++ b/pkgs/development/tools/misc/travis/Gemfile.lock
@@ -45,7 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  travis
+  travis (= 1.8.8)
 
 BUNDLED WITH
-   1.14.4
+   1.14.6
diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix
index a520c4deb34..b5c5740e80f 100644
--- a/pkgs/development/tools/misc/travis/default.nix
+++ b/pkgs/development/tools/misc/travis/default.nix
@@ -1,5 +1,10 @@
 { lib, bundlerEnv, ruby }:
 
+# Maintainer notes for updating
+# 1. increment version number in Gemfile
+# 2. run $ nix-shell --command "bundler install && bundix"
+#    in the travis directory in nixpkgs
+
 bundlerEnv {
   inherit ruby;
   pname = "travis";
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
index 148923848be..c9a54bd324c 100644
--- a/pkgs/development/tools/misc/travis/gemset.nix
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -16,6 +16,7 @@
     version = "3.6.8";
   };
   ethon = {
+    dependencies = ["ffi"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl";
@@ -24,6 +25,7 @@
     version = "0.10.1";
   };
   faraday = {
+    dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr";
@@ -32,6 +34,7 @@
     version = "0.11.0";
   };
   faraday_middleware = {
+    dependencies = ["faraday"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00";
@@ -48,6 +51,7 @@
     version = "1.9.18";
   };
   gh = {
+    dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg";
@@ -72,6 +76,7 @@
     version = "2.0.3";
   };
   launchy = {
+    dependencies = ["addressable"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
@@ -112,6 +117,7 @@
     version = "1.0.1";
   };
   pusher-client = {
+    dependencies = ["json" "websocket"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "18ymxz34gmg7jff3h0nyzp5vdg5i06dbdxlrdl2nq4hf14qwj1f4";
@@ -120,6 +126,7 @@
     version = "0.6.2";
   };
   travis = {
+    dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936";
@@ -128,6 +135,7 @@
     version = "1.8.8";
   };
   typhoeus = {
+    dependencies = ["ethon"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8";
diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/development/tools/misc/travis/shell.nix
new file mode 100644
index 00000000000..ddcf493bb46
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/shell.nix
@@ -0,0 +1,11 @@
+# Env to update Gemfile.lock / gemset.nix
+
+with import <nixpkgs> {};
+stdenv.mkDerivation {
+  name = "env";
+  buildInputs = [
+    ruby.devEnv
+    gnumake
+    bundix
+  ];
+}

From 634cbfa8f2796ad9ddf151ab639e6ca68b80aaa1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 12 Mar 2018 12:16:17 +0100
Subject: [PATCH 0833/2266] nodejs: patch bundled node-gyp module to not invoke
 xcodebuild on macOS causing modules with native dependencies to fail

---
 pkgs/development/web/nodejs/no-xcodebuild.patch | 13 +++++++++++++
 pkgs/development/web/nodejs/v6.nix              |  2 +-
 pkgs/development/web/nodejs/v8.nix              |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/no-xcodebuild.patch

diff --git a/pkgs/development/web/nodejs/no-xcodebuild.patch b/pkgs/development/web/nodejs/no-xcodebuild.patch
new file mode 100644
index 00000000000..94184152a03
--- /dev/null
+++ b/pkgs/development/web/nodejs/no-xcodebuild.patch
@@ -0,0 +1,13 @@
+diff -Naur node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+--- node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2018-01-03 03:34:44.000000000 +0100
++++ node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2018-03-12 11:15:37.972537585 +0100
+@@ -1251,7 +1251,8 @@
+   if XCODE_VERSION_CACHE:
+     return XCODE_VERSION_CACHE
+   try:
+-    version_list = GetStdout(['xcodebuild', '-version']).splitlines()
++    #version_list = GetStdout(['xcodebuild', '-version']).splitlines()
++    version_list = ['Xcode 9.2', 'Build version 9C40b']
+     # In some circumstances xcodebuild exits 0 but doesn't return
+     # the right results; for example, a user on 10.7 or 10.8 with
+     # a bogus path set via xcode-select
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index c2ca341751b..491c0674a70 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -7,5 +7,5 @@ in
     inherit enableNpm;
     version = "6.13.0";
     sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp";
-    patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
   }
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index fa5f10e8f7b..662999225bf 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -7,5 +7,5 @@ in
     inherit enableNpm;
     version = "8.9.4";
     sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c";
-    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }

From 1b01d49340b54f3a56baed17d6a052028a2e8c21 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Mon, 12 Mar 2018 07:55:48 -0400
Subject: [PATCH 0834/2266] perlPackages.FileFnMatch: init at 0.02

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2a194be8da4..5f3c6de1512 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5551,6 +5551,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileFnMatch = buildPerlPackage rec {
+    name = "File-FnMatch-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MJ/MJP/File-FnMatch-0.02.tar.gz";
+      sha256 = "05p9m7kpmjv8bmmbs5chb5fqyshcgmskbbzq5c9qpskbx2w5894n";
+    };
+    buildInputs = [ ];
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "simple filename and pathname matching";
+      license = stdenv.lib.licenses.free; # Same as Perl
+    };
+  };
+
   FileHandleUnget = buildPerlPackage rec {
     name = "FileHandle-Unget-0.1628";
     src = fetchurl {

From 31db03ea14d15615ca1f8af5e23814255bc30e79 Mon Sep 17 00:00:00 2001
From: John Children <john@infosum.com>
Date: Sun, 11 Mar 2018 22:00:49 +0000
Subject: [PATCH 0835/2266] LanguageClient-neovim: 2017-12-05 -> 2018-03-06

Following up from issue #33391, building LanguageClient-neovim now
requires some rust dependencies. This patch makes the plugin now longer
listed in vim-plugin-names file so that it will not be automatically
generated and instead lists it in non-generated plugins.

Also adds rustPlatform to arguments for vim plugins set.
---
 pkgs/misc/vim-plugins/default.nix      | 38 ++++++++++++++++++--------
 pkgs/misc/vim-plugins/vim-plugin-names |  1 -
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 78aed2aa833..f9fc937d2c6 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,6 +1,6 @@
 # TODO check that no license information gets lost
 { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
-, which, fetchgit, llvmPackages
+, which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, rustracerd, fzf, skim
 , python3, boost, icu
 , ycmd, makeWrapper, rake
@@ -148,6 +148,31 @@ rec {
     dependencies = [];
   };
 
+  LanguageClient-neovim = let
+    LanguageClient-neovim-src = fetchgit {
+      url = "https://github.com/autozimu/LanguageClient-neovim";
+      rev = "fbc46862af7fa254f74f1108149fd0669c46f1ad";
+      sha256 = "1wrrmikriyw8an8hn7240igcaca9a0ykh1j0dfy45kslxkmqkk3r";
+    };
+    LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
+      name = "LanguageClient-neovim-bin";
+      src = LanguageClient-neovim-src;
+
+      cargoSha256 = "0c2sklpvab63a1f1mhcq9abq5m2srkj52ypq7dq44g8ngn2a05ka";
+    };
+  in buildVimPluginFrom2Nix {
+    name = "LanguageClient-neovim-2018-03-06";
+    src = LanguageClient-neovim-src;
+
+    dependencies = [];
+    propogatedBuildInputs = [ LanguageClient-neovim-bin ];
+
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \
+        --replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']"
+    '';
+  };
+
   # --- generated packages bellow this line ---
 
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -598,17 +623,6 @@ rec {
 
   };
 
-  LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "LanguageClient-neovim-2017-12-05";
-    src = fetchgit {
-      url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "eac16849eb5cb5592cf043fa222282a7082f257b";
-      sha256 = "07j7zm8xbvsanr9ghwxaw88m0kfr0ih262g299n5rr972s93wpg6";
-    };
-    dependencies = [];
-
-  };
-
   vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-bazel-2018-01-10";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 04ccbb2a99d..c41dd33eeed 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -37,7 +37,6 @@
 "github:andsild/peskcolor.vim.git"
 "github:andviro/flake8-vim"
 "github:ap/vim-css-color"
-"github:autozimu/LanguageClient-neovim"
 "github:bazelbuild/vim-bazel"
 "github:bbchung/clighter8"
 "github:benekastah/neomake"

From bf25a02027c5aae13b7e7944a32f28cefffc2b9e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 12 Mar 2018 11:45:03 +0100
Subject: [PATCH 0836/2266] vimPlugins: updating all vim plugings

---
 pkgs/misc/vim-plugins/default.nix | 719 +++++++++++++++---------------
 1 file changed, 349 insertions(+), 370 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f9fc937d2c6..911961e9c53 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2,7 +2,7 @@
 { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, rustracerd, fzf, skim
-, python3, boost, icu
+, python3, boost, icu, ncurses
 , ycmd, makeWrapper, rake
 , pythonPackages, python3Packages
 , substituteAll
@@ -198,11 +198,11 @@ rec {
   };
 
   Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Cosco-2017-07-26";
+    name = "Cosco-2018-02-15";
     src = fetchgit {
       url = "git://github.com/lfilho/cosco.vim";
-      rev = "4a2a080415860196c936a32679d9032f41ba21e4";
-      sha256 = "0gljxy6shr7kmm8vvj6rm4c0lr0ydbny9lrsp64c3d4d0b2wnmig";
+      rev = "434dc68b93b8f42babe1887a269145ce39c97edf";
+      sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv";
     };
     dependencies = [];
 
@@ -220,11 +220,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2017-11-04";
+    name = "Hoogle-2018-03-04";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "14256fa4f482bb40f55311a6d8037103549c7844";
-      sha256 = "1dhfy9s6q11cb424x595anj17sgsqywdyrcw3ynmk3949iiwaqhb";
+      rev = "871d104c92e33cb238506f2805f1652561978cc8";
+      sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n";
     };
     dependencies = [];
 
@@ -253,22 +253,22 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2018-01-12";
+    name = "Syntastic-2018-02-20";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "937d77d1f3ba8de08ad275e052e38d0e680a175b";
-      sha256 = "10qrq1fs53srp4inxmcm8zq5kjdl56hh1lwh2jhda9mfwrbhg3fp";
+      rev = "b7b473b2688827dcd7d8c801197b8bfc31b20dc4";
+      sha256 = "11nwzgb5s75z348px81mmxh681rs25ccls9x5z8f36i7ykq46j1x";
     };
     dependencies = [];
 
   };
 
   SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "SyntaxRange-2017-07-03";
+    name = "SyntaxRange-2018-03-09";
     src = fetchgit {
       url = "git://github.com/inkarkat/vim-SyntaxRange";
-      rev = "213cfda0a0f11505665dbfe1e58c803f498761a6";
-      sha256 = "1dg9n3zll3a79lv96kdlxxs141binb8w79zdisj7djxc5y2k48qs";
+      rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3";
+      sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr";
     };
     dependencies = [];
 
@@ -286,33 +286,33 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-12-03";
+    name = "Tagbar-2017-12-17";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "c004652797185121bbf264138d57eb2a0199b6db";
-      sha256 = "0aj319iz3g9b1xs8g2k7ikjhjy6y94i0hyk0a9km7swglairld06";
+      rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70";
+      sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2017-11-07";
+    name = "The_NERD_Commenter-2018-03-03";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "fd61bc71f64c8accf86f06c633fd19b205efa85b";
-      sha256 = "07196j5bp3k4ckapyrp3366h0nyvqq5r26hqqihgfa62s1n8rjsl";
+      rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1";
+      sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-12-06";
+    name = "The_NERD_tree-2018-03-06";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "8cbea5109e8c7ed682da25bb488267d781db0bd4";
-      sha256 = "0n4shpdl33yghkqk0vllrmmb74dflf39liyclkbpqmcymx9rw2qj";
+      rev = "ed446e5cbe0733a8f98befc88d33e42edebb67d2";
+      sha256 = "0i5qy8lb8w5ri30905i7411754g2vzj4jlccak5lj852vyzgdp56";
     };
     dependencies = [];
 
@@ -330,22 +330,22 @@ rec {
   };
 
   VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2017-08-02";
+    name = "VimOutliner-2018-02-17";
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
-      rev = "c13141d604959d84225c3a53dc4b0ef5ae8b2bfe";
-      sha256 = "1bg45cnpvnk2k7r6l2n3sz0cw2lhrglphak10yp11yqf4q1rxl7x";
+      rev = "ec4dc9bd932a0cce476a3f8f0a78ca61ff94188c";
+      sha256 = "0fj3ya7n9wfbnkcdwp9kggm8c3p5jm3iwzbk4gdqjmhqkvdfz5rk";
     };
     dependencies = [];
 
   };
 
   WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2017-04-26";
+    name = "WebAPI-2018-02-08";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
-      rev = "e76f2da9a8f292a999a95ae688534f76c2dca9bd";
-      sha256 = "02970g7blj478vid88gayba39rdcm9236nigkrijapyf5rd24zhh";
+      rev = "6459fbdd7fd38c4630fb49e9c687946633b58849";
+      sha256 = "0ndskj9rw526kgl1y645w1gqmsdw3268ps1armccadjj9d8flkdi";
     };
     dependencies = [];
 
@@ -379,11 +379,11 @@ rec {
   };
 
   clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2017-09-25";
+    name = "clang_complete-2018-01-18";
     src = fetchgit {
       url = "git://github.com/Rip-Rip/clang_complete";
-      rev = "fb8f4f25ab808bc83bc7c704f23171cb6b020737";
-      sha256 = "0y80ds4l5gqqdm56ymkgsfpizpx96kzrr0ivx29q7ahd4ry847xa";
+      rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275";
+      sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p";
     };
     dependencies = [];
     # In addition to the arguments you pass to your compiler, you also need to
@@ -480,12 +480,23 @@ rec {
 
   };
 
+  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "forms-2012-11-28";
+    src = fetchgit {
+      url = "git://github.com/megaannum/forms";
+      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
+      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
+    };
+    dependencies = ["self"];
+
+  };
+
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-12-16";
+    name = "fugitive-2018-01-25";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "f3ccb0c12ee4985b8808f83059830a24cc92821c";
-      sha256 = "1ry67wi5dci4jy54jyf3lsf0yq13a42z9w5qh39rwv5w9wiab2fb";
+      rev = "b82abd5bd583cfb90be63ae12adc36a84577bd45";
+      sha256 = "0y3fkw7f5gqb339qlby19f444085c929gjbmbibmgig7hrarqrz4";
     };
     dependencies = [];
 
@@ -514,11 +525,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-12-06";
+    name = "vim-autoformat-2018-03-02";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "27f0e48a9b60ab8a45178d6104fa819a99ead2ee";
-      sha256 = "0na5qwgpafnxz7lbscs9y0ffbd01b1ab2q1kqrr78a3gqz37ga0s";
+      rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79";
+      sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf";
     };
     dependencies = [];
 
@@ -536,22 +547,22 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-11-10";
+    name = "tsuquyomi-2018-03-02";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "8a647de888e1d823718f717d47678a97b5012196";
-      sha256 = "0zvcr15g6m17736a7nwr9aa7c3sd25ad39v7dban0jiz6asd7nn1";
+      rev = "064f5a2ccaf642681634cf06b8ce45751e1d0475";
+      sha256 = "12pik378p5c2w219yg8pb8lrdkhxvk0mvkji9dhh0h5v9yzk5x4z";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-01-14";
+    name = "deoplete-nvim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "b164eb8c36ddbb8835434e013358de29b9c8f1f2";
-      sha256 = "0k3zmpdlg4y4f0y3pgfcqmglrrs1iagw8iaaz131nyswz0m2pf6x";
+      rev = "642f9e9b0ed9457734d974aeb9417192077b7551";
+      sha256 = "1si07fw1ckgdl74xx0bq6hhd0nyi67gkjanqz4v317zpmzhcvi76";
     };
     dependencies = [];
 
@@ -580,11 +591,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-11-01";
+    name = "vim-closetag-2018-03-09";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "277e21d04c417112da6ecd3485373c6d3ff93b90";
-      sha256 = "1wx9qqas0gd301pn9zabbl4b9v41i1hwbnd8fyy8kxxf0cbpdwaf";
+      rev = "aa14c2c1e7da4112e46ef6b287cacdd7af96da6f";
+      sha256 = "058z8dzqki3idv7r5654xd91wplhhnsa2l533rszmkzji3hj2why";
     };
     dependencies = [];
 
@@ -613,11 +624,11 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2017-11-03";
+    name = "vim-css-color-2018-03-06";
     src = fetchgit {
       url = "https://github.com/ap/vim-css-color";
-      rev = "fcf5829daa7817994fb856dbaa905e6fd8beb50c";
-      sha256 = "1a617ji11395zimqjgpcq2qciyjzq5ixm85vc8rkj8jda0qgm91c";
+      rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032";
+      sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx";
     };
     dependencies = [];
 
@@ -635,11 +646,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-11-30";
+    name = "clighter8-2018-01-24";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "909f2162a3dfa3d4089533e42af01b4411ef6a78";
-      sha256 = "0hi1v8ww4yzwpdr25zzdr4ccwvs5d3pa02gj5y6qfc5ddz1krdml";
+      rev = "314ab6887cfe785146b86d754441904a927f7999";
+      sha256 = "1j2lfx10r978348nycw5mpg2ahwiqcgqml2g2vps5yy9x891fzya";
     };
     dependencies = [];
     preFixup = ''
@@ -649,11 +660,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-12-06";
+    name = "neomake-2018-03-07";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "22bcbd560820d387b61ae285b1d1a74f338e3e13";
-      sha256 = "1hp99fpbvi72m51m2ivn4rg64awlr9zqkvhjh99rl7ax8y0zw8ap";
+      rev = "666e20797f8e8c9d2fdab906d313a5b9714543f0";
+      sha256 = "0wx82bal16jfq1kk2rxrpl79brqfhpdmwbx55wggh7rc893ll4v4";
     };
     dependencies = [];
 
@@ -682,11 +693,11 @@ rec {
   };
 
   vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-toml-2017-12-10";
+    name = "vim-toml-2018-03-06";
     src = fetchgit {
       url = "https://github.com/cespare/vim-toml";
-      rev = "b531aac0d45aaa373070c4cc30d7ead91960f5a7";
-      sha256 = "14g3zvyfvhilr5ka3jhja4jxjn99957sk6hlv13yfkg349f57dvg";
+      rev = "624f02475080ea26d9430b8d31d7c3199b0ec939";
+      sha256 = "0frjdv50rhd3awrddq25x4l22ca15i5587pgcmvwxz92y52484lx";
     };
     dependencies = [];
 
@@ -726,11 +737,11 @@ rec {
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2017-10-03";
+    name = "vim-sort-motion-2018-03-05";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "7384f20d829b4abde28ced40975f0beb319dce27";
-      sha256 = "1x4hxa7dijb5g7vmrbgs2zi8aiqc759ljmh8qqwk6lafc016plnj";
+      rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4";
+      sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik";
     };
     dependencies = [];
 
@@ -759,11 +770,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-08-30";
+    name = "ctrlp-vim-2018-02-10";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "bde7a2950adaa82e894d7bdf69e3e7383e40d229";
-      sha256 = "19q3cfs3rd3q1xfhyz55r1c3750nrjvwz7jxnhqqn751zgimnsyl";
+      rev = "35c9b961c916e4370f97cb74a0ba57435a3dbc25";
+      sha256 = "08g1w7lfxpp0b175fkyyb8njpz7jwysfba0s20873f2frj6c77rc";
     };
     dependencies = [];
 
@@ -814,11 +825,11 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2017-05-24";
+    name = "vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6";
-      sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1";
+      rev = "1f44625290f0f1488f7056e166f69ee6f171d273";
+      sha256 = "0xs5mbqgs5nvymiiwgbycb278v9mmjm3pxybqlyg5r09ri6ncfkq";
     };
     dependencies = [];
 
@@ -880,11 +891,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2018-02-01";
+    name = "vim-elixir-2018-02-28";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "8ca41c1f02208dd5ca68c7bcb6c71b3b92f46af6";
-      sha256 = "0dp9cqflbwc3h1hzgn9fyaxhcn6q9bclgfy9kkgywp8zk5kwzb7p";
+      rev = "bd75abb934c97a3d6d753f019e0f3aef3c132c2e";
+      sha256 = "1qic3av5avf50dvxkz1iq98impdabflk64xj5wmzr9iag1p0qwz9";
     };
     dependencies = [];
 
@@ -913,11 +924,11 @@ rec {
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2018-01-04";
+    name = "vim-localvimrc-2018-03-04";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "b915ce29c619fb367ed41d4c95d57eaaaed31b39";
-      sha256 = "13bc3davmw2pms663yniiha8bayzy1m08xjhyrnlqqb2dz77m5gy";
+      rev = "632d27c6c29bb2f05131c4bd2c804b9bf6068d57";
+      sha256 = "1xj9qvpvhzi31wj0wp0i67j233vzaj3zpplpacszki31bsai263f";
     };
     dependencies = [];
 
@@ -957,11 +968,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-12-06";
+    name = "vim-go-2018-03-07";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "7f4673573d67aacec0ac35d37eb3123abe4fcf70";
-      sha256 = "074097m1xd7j97zkkhrkfnj8d4ndms20gp8zas2vha1h48yy5a70";
+      rev = "d2b0a234ffb5441a3488c78fe8e5f551ddbdd454";
+      sha256 = "1qcy1w9p23gxrii4ddg6mn8kn4i9d0q3rmkrblvxhbk7snxbh7n8";
     };
     dependencies = [];
 
@@ -990,11 +1001,11 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-10-24";
+    name = "psc-ide-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "23bf302de91181d409fb988ce372ab703b119bc5";
-      sha256 = "1yjnc6173zdxbcbszrv7184rk5jax6d187c1klsm8b6lx4j1jv4d";
+      rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
+      sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
     };
     dependencies = [];
 
@@ -1022,12 +1033,34 @@ rec {
 
   };
 
+  vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-maktaba-2017-12-29";
+    src = fetchgit {
+      url = "https://github.com/google/vim-maktaba";
+      rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982";
+      sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm";
+    };
+    dependencies = [];
+
+  };
+
+  gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gitv-2017-11-26";
+    src = fetchgit {
+      url = "https://github.com/gregsexton/gitv";
+      rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
+      sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
+    };
+    dependencies = ["fugitive"];
+
+  };
+
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2017-02-11";
+    name = "vim-jsdoc-2017-12-18";
     src = fetchgit {
       url = "https://github.com/heavenshell/vim-jsdoc";
-      rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
-      sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
+      rev = "a164cb4c14b9063e82b6ccba96b4bc8b3a6d8f73";
+      sha256 = "0f4hj2vd4l4rprizkg64q6dmm86f5yc9gk554a6f4kpagw2w9y76";
     };
     dependencies = [];
 
@@ -1056,22 +1089,22 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-07-08";
+    name = "calendar-vim-2017-12-14";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "6d6be26b2ad1870658525e2a42046429c845516c";
-      sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz";
+      rev = "25009a8eeae8ecca0c0d74f06f62ad82d2557c1c";
+      sha256 = "0kswc92frzsgsd2qzajxdndkyd2yxh8gmcxib5a3by8sg27qvi8p";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2017-12-05";
+    name = "lightline-vim-2018-01-31";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "b19faca129f7921766c0a32a7c378dc89a61e590";
-      sha256 = "1sif7wspivpakm4nlhsq1v93s6s18q5kx8s5zqq97chhv626l8c7";
+      rev = "78c43c144643e49c529a93b9eaa4eda12614f923";
+      sha256 = "1g1s8bi6pzjc9kbqd1mn1d2ym6c90xf22dv2wfli0nyp6dsja2v2";
     };
     dependencies = [];
 
@@ -1111,11 +1144,11 @@ rec {
   };
 
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-test-git-2018-01-16";
+    name = "vim-test-git-2018-03-08";
     src = fetchgit {
       url = "https://github.com/janko-m/vim-test.git";
-      rev = "731ad6942f9449d2ed22f6d9ccc8d1ce613b1f19";
-      sha256 = "14xwsc23zmkfl6ydvqiqf7l0gn5nxqdm62rvgiky5j5ii9iqj3hr";
+      rev = "3760d79934bb95c782611601187067730e108a26";
+      sha256 = "06l4h66vzk4h628q45g3z529m3db28d5qfiabwr6l6x9sph5ha82";
     };
     dependencies = [];
 
@@ -1232,11 +1265,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-01-09";
+    name = "fzf-vim-2018-03-09";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "c0a5fee7071ed89602b9b59fb67e83d6cd23addc";
-      sha256 = "0biqq9g116zziv9k0axgn8wasgwb57fwaxwjj8vsajrmq5phdl4z";
+      rev = "a362bc58f1fbbfbbbef749851006e46155979c7d";
+      sha256 = "187d7aw5g7nr6cg5la86kdplb32zy58w1mfm3npb47qm9sydgql6";
     };
     dependencies = [];
 
@@ -1275,23 +1308,12 @@ rec {
 
   };
 
-  vim-clang = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-clang-2016-10-17";
-    src = fetchgit {
-      url = "https://github.com/justmao945/vim-clang";
-      rev = "0076e0c64baa71c1c1f404e6a500e45190cdad5c";
-      sha256 = "04fbmlrvgl278hlrnhlxppy1dz5fdilj9rzrc1vvxrw9ih3knvr3";
-    };
-    dependencies = [];
-
-  };
-
   vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-niceblock-2015-08-22";
+    name = "vim-niceblock-2018-01-30";
     src = fetchgit {
       url = "https://github.com/kana/vim-niceblock";
-      rev = "03c59f648fcadd415fc91d7b100cf48bd0a55fac";
-      sha256 = "05p3xr61v3infi07r9ahr30190kamgdjxkjjlawbqnrn8pv9fws4";
+      rev = "178629a8b81da2fa614bd6c19e7797e325ee9153";
+      sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0";
     };
     dependencies = [];
 
@@ -1319,17 +1341,6 @@ rec {
 
   };
 
-  vim-textobj-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-textobj-user-2017-09-28";
-    src = fetchgit {
-      url = "https://github.com/kana/vim-textobj-user";
-      rev = "e231b65797b5765b3ee862d71077e9bd56f3ca3e";
-      sha256 = "0zsgr2cn8s42d7jllnxw2cvqkl27lc921d1mkph7ny7jgnghaay9";
-    };
-    dependencies = [];
-
-  };
-
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
@@ -1342,11 +1353,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2017-10-24";
+    name = "typescript-vim-2018-03-08";
     src = fetchgit {
       url = "https://github.com/leafgarland/typescript-vim";
-      rev = "fbd0e9e508535f7d89778f7280dc76505348dcc6";
-      sha256 = "1psxdkr35m1x6lpsrn2v482sn9n4pysw1i0j9nr1g7r4nh1058fk";
+      rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5";
+      sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4";
     };
     dependencies = [];
 
@@ -1364,11 +1375,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-12-07";
+    name = "vimtex-2018-03-10";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "9851656a0c280d394f8e0f0fac61988613ea392e";
-      sha256 = "1mwhj6nk00srlmvsdbpcnqcpwsr87ciwzxgdr1v489bb8l4rw9na";
+      rev = "38a434a38a11d10da43dea1aac8f1143404c3eaf";
+      sha256 = "0hz807i3byhrvbv98rl8k4r3n6dyninaqlr1kga95dllg6xr0k5p";
     };
     dependencies = [];
 
@@ -1423,38 +1434,27 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-12-06";
+    name = "vim-highlightedyank-2018-03-08";
     src = fetchgit {
       url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "7e072d62e79b68a548dfd0c18f7b739dca4cae74";
-      sha256 = "1kkngy28nlbyb4dz010hjb8dxih1zlzwsr0yjkhqyvpz0k5vvyq9";
+      rev = "775326f9cf63098a347cea842bb6069590771371";
+      sha256 = "1414acj3ma7iydkr8vgysblmbcizflm9ivwhikanj1klyj0jm2rl";
     };
     dependencies = [];
 
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Jenkinsfile-vim-syntax-2017-08-29";
+    name = "Jenkinsfile-vim-syntax-2018-03-05";
     src = fetchgit {
       url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
-      rev = "e3d2e19ad1c8f79872380901c0392c2671757831";
-      sha256 = "18bfyjsxgqg562n8kkcnyd05pp17ipap7ray9az92fapzhw5q4x9";
+      rev = "6d8957428ef53620f00c1ec74d08712f41515085";
+      sha256 = "1pn33lvv5cls45vd8g1cm2fi0cm1lzwnsqcacgxcv67l25mg5979";
     };
     dependencies = [];
 
   };
 
-  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "forms-2012-11-28";
-    src = fetchgit {
-      url = "https://github.com/megaannum/forms";
-      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
-      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
-    };
-    dependencies = ["self"];
-
-  };
-
   self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "self-2014-05-28";
     src = fetchgit {
@@ -1478,22 +1478,22 @@ rec {
   };
 
   vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grepper-git-2018-01-16";
+    name = "vim-grepper-git-2018-03-06";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-grepper.git";
-      rev = "4fd6260c56ffa0642095143f802d1cbfceb7437d";
-      sha256 = "11rhj6m85hxd4kf8yms4mab8553dcgl0yxm9r7nhdqpz6mljsir9";
+      rev = "46d78f293b12d8ba743f68ce4fb69881a64d30b2";
+      sha256 = "19pbsv8i58r2z5a2yvn8f8v7gjz82nn8mw0hhfzwg5nlj0nn5kx3";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-12-20";
+    name = "vim-startify-2018-02-28";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "5e476d8e00da70bc33c54a174fd8cb18ed991868";
-      sha256 = "07k7ddjqc2jisk0sh9k8w6r5xhh47cbzbxdnbkjz7bdskkwsdsay";
+      rev = "226cafe0a0e42339919577c7388f7acdc554127b";
+      sha256 = "1w6ycxha9mcrf5q9f5zr627fg70gmabbd5b4yd8pnhbrsfjyvrf8";
     };
     dependencies = [];
 
@@ -1511,11 +1511,11 @@ rec {
   };
 
   ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ack-vim-2017-11-05";
+    name = "ack-vim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/mileszs/ack.vim";
-      rev = "6e04746a63dd2453601ae36c83d53fe2021a45f4";
-      sha256 = "0453ghmaaqwv6z8a3sncd3jxs9j050sp9ymiw2aqpc1a28kdlrv8";
+      rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042";
+      sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm";
     };
     dependencies = [];
 
@@ -1580,22 +1580,22 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-10-16";
+    name = "haskell-vim-2018-01-25";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "d877d5cd5f2f5747fa835d4b639499187fa4ae9e";
-      sha256 = "16iihz0jy61s5dyzzf5dbvd6ii1zna98pckqkjlpxcqqx636sm5c";
+      rev = "430b529224c5f9ae53b148f814b7b1fc82b8b525";
+      sha256 = "15z259b9b3wbklc8rndsq2rlhgccvxhfgd76yy80jqjmfmzib8kg";
     };
     dependencies = [];
 
   };
 
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2017-10-30";
+    name = "cpsm-2018-02-01";
     src = fetchgit {
       url = "https://github.com/nixprime/cpsm";
-      rev = "3744240ca48f98eea064f3cbc1a62b3f25f44030";
-      sha256 = "0x5jac7x85bqdh38vggi1fvxjw2z29b2227n471f3cxy8arvylrw";
+      rev = "8a4a0a05162762b857b656d51b59a5bf01850877";
+      sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b";
     };
     dependencies = [];
     buildInputs = [
@@ -1604,6 +1604,7 @@ rec {
       cmake
       boost
       icu
+      ncurses
     ];
     buildPhase = ''
       patchShebangs .
@@ -1646,22 +1647,22 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2017-05-10";
+    name = "vim-markdown-2018-01-20";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "3fcde7215e22913f004c2836fd46ff61746be6db";
-      sha256 = "0ymbs7235zi5hwyzc0vaikb3n6jwj6xarmgjj4lpf4wbsa1212yy";
+      rev = "861e84fc0bc97be8387e92ac2fc180599dc2b5a3";
+      sha256 = "1lfcl6rsjqyzny5rvipm1wd4qxnv96ff8anjaba0rv4m7b99yv6z";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2017-12-01";
+    name = "python-mode-2018-02-19";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "2ae7a2323d7632eaa5fc5170c287608ecf8d25c5";
-      sha256 = "1qd7akvqlmrcxiknv1fxqb37vimlicidibxzc4jm9i05cvk1z68p";
+      rev = "d5e7be11a74e8bda57388415d07d0faa0bcf9c5c";
+      sha256 = "13863z80dwzmyi2adjc3hywqqd14w43nkhzy7lqarqiv7ks207kv";
     };
     dependencies = [];
 
@@ -1679,44 +1680,44 @@ rec {
   };
 
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2017-10-19";
+    name = "purescript-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/raichoo/purescript-vim";
-      rev = "ece34d9782a075761f31854a33eccd932eb2cf57";
-      sha256 = "0x6hpibmhgw5aqq25rcpvgz2a60jh7i8x23gigakmmrxv51cjcrj";
+      rev = "bd19dedebc7420565b8aec111e59217da838db59";
+      sha256 = "1h7fh5kfs4s735gj2nc7dvsir5fzvg49ajvcg35filwlx13r9nvj";
     };
     dependencies = [];
 
   };
 
   vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wordy-2016-11-07";
+    name = "vim-wordy-2018-03-10";
     src = fetchgit {
       url = "https://github.com/reedes/vim-wordy";
-      rev = "bd37684a041fce85c34bb56c41c5a12c04a376ca";
-      sha256 = "0lv3ff1yfqdz2vj6lwaygslds1ccidbb09f4x1cdwlawxdgh3w2v";
+      rev = "14b9dbf76a82e29273a74768573900361200467f";
+      sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk";
     };
     dependencies = [];
 
   };
 
   committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "committia-vim-git-2017-12-04";
+    name = "committia-vim-git-2018-03-01";
     src = fetchgit {
       url = "https://github.com/rhysd/committia.vim.git";
-      rev = "51aec02e5ab07c89fa5d5445cfe3a8e0098bec27";
-      sha256 = "08nqncgnmbvhnn850s6hhp6p6scqg2iiwrl9air952yh9pl91h84";
+      rev = "78d5aceaeed3ba7d6ed503df7ae54a5e7505eed0";
+      sha256 = "1wpvjkb62vb70yg7x3k84rk6fv0ykxms7bpn511z8dbs5v8xzzjg";
     };
     dependencies = [];
 
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-08-25";
+    name = "vim-grammarous-2018-02-24";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "51ef5190813c0d9d8aaebd5191f183cff767f805";
-      sha256 = "1mm8hd39q2sl4hi83c4zvrl27a8djr1pv35ch0pivg84ad9p7qq5";
+      rev = "c039e40bc9124a2467376da2434a46cd216c49c6";
+      sha256 = "1mg3nqm4klimnljd642cd3z7nvhbrg1va09d7bnxcp6flyabpbfh";
     };
     dependencies = [];
     # use `:GrammarousCheck` to initialize checking
@@ -1743,11 +1744,11 @@ rec {
   };
 
   vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-puppet-2017-08-25";
+    name = "vim-puppet-2018-03-03";
     src = fetchgit {
       url = "https://github.com/rodjek/vim-puppet";
-      rev = "0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3";
-      sha256 = "1jgn9vahyn80zz0wfzx9abamsahh9wrrq1nf9qghljm4si3fq766";
+      rev = "921ccf81b5e11b40a49c458469ffa46c0d0560f8";
+      sha256 = "0c1lnxn2ja68p8vhvv5gzg3m79aiazpfagmjnydfndv1dvbww39a";
     };
     dependencies = [];
 
@@ -1765,44 +1766,44 @@ rec {
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-completion-manager-2017-11-09";
+    name = "nvim-completion-manager-2017-12-28";
     src = fetchgit {
       url = "https://github.com/roxma/nvim-completion-manager";
-      rev = "21c4b617419c4de782a533c07afcf6cbc453a94a";
-      sha256 = "0rdjp1qis96d83g967h73jlhlg27danrvvndljfq2ncgpg3b2x16";
+      rev = "e724a442072261993ca503e969d2cb25722ab1d2";
+      sha256 = "00q52vl06hgcinclszm21a3rx7ivc147p52w1p29icksc26yxhjb";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-09-20";
+    name = "rust-vim-2018-01-15";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "b6d88adcf9867aa69f4d20d45d49bb54979842a4";
-      sha256 = "0n0hiqlv3amnzn69wyyq6z3r8zr0gcg86hw6flk7z39cxjhjv3vr";
+      rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6";
+      sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq";
     };
     dependencies = [];
 
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2017-10-13";
+    name = "vim-devicons-2018-03-10";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
-      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
+      rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48";
+      sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-12-04";
+    name = "neoformat-2018-03-03";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "81d2d19e6bb65432b95f930af38ca6dab89d0434";
-      sha256 = "13ivv4ymkxk5rl5hkrlb4r328vhhpw6il0zdsynp9j41d4qq198s";
+      rev = "c042511faa57fbe9c0c55ca30c710c1605345cf5";
+      sha256 = "0rdd4jsk1l7yfbfd7v9z9rb6k0darlms2hxsy602v7j485n4ayd9";
     };
     dependencies = [];
 
@@ -1820,44 +1821,44 @@ rec {
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2017-12-06";
+    name = "vim-polyglot-2018-02-06";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "11f53253ad9fd0cd3e7a44ed9f8c80a4f265b46e";
-      sha256 = "1p1h0flhzcaivrpsxb1xc1lc0kc901aq80p32j15ia3g2ib8vl4y";
+      rev = "96c5c20e418fa95b7137b6ef418946f25de91b1b";
+      sha256 = "0izqrl6rgfy9rva6qlyib9w3vwdva290cajnyblmxff3gfql1vrj";
     };
     dependencies = [];
 
   };
 
   context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "context_filetype-vim-2017-11-15";
+    name = "context_filetype-vim-2018-02-06";
     src = fetchgit {
       url = "https://github.com/shougo/context_filetype.vim";
-      rev = "6856503cd938d018c2d42277ee6ca896fd63f5a2";
-      sha256 = "1s4nimpvc5ps602h8xb231nvmk9jbzs981an5kxr3idmmk44j5ms";
+      rev = "514b50f812904f063736cda3c787db7d9b290151";
+      sha256 = "1xb7lcvriyadrzz93vps9hsa2x8vi8lbwfzk2gm2l3i90mf9xddq";
     };
     dependencies = [];
 
   };
 
   denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-01-16";
+    name = "denite-nvim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/shougo/denite.nvim";
-      rev = "0d48d8d498d410a5ea4403648d528e7267d87461";
-      sha256 = "1npag0da8s3jv4jm8waqvsdfg0gnqhkc07r3m17zp2r2bh3b9bjc";
+      rev = "b16579be4431a7eb708deb17d73ec641a8c89a54";
+      sha256 = "0kabnbqc4j2mgf5m5h0i3yy9pbpk3igrmcwmpq1vs4c4nb1bgkiy";
     };
     dependencies = [];
 
   };
 
   echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "echodoc-vim-2018-01-12";
+    name = "echodoc-vim-2018-02-18";
     src = fetchgit {
       url = "https://github.com/shougo/echodoc.vim";
-      rev = "410ead5a9fa4400b51771cba3b7599722c9e65b1";
-      sha256 = "01czpvn5rs37x0ml8bc5vwyhklm6fk3wl339smc3jvyr1w73rrf5";
+      rev = "ba85a728a6628fa22f1e4088637a005f21338cd5";
+      sha256 = "119azfkrplr6a14wypaw27rff332ji1rhnw1lfrzq9nir7kfd4p6";
     };
     dependencies = [];
 
@@ -1886,22 +1887,22 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-10-22";
+    name = "neocomplete-vim-2018-01-28";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "46791e7692e07384a089d125c5c536246698d04c";
-      sha256 = "1iqd6fqlkm8bvibsapcvqqmyklzjad2l0c745lppdgdb959v016a";
+      rev = "1401a1c6ab56546c55804ba09e6c9fe87654e954";
+      sha256 = "01s2cx1cd4j16pb6ixrx9z8h4dsj2dvlxfly2gzm9khpsgsx454h";
     };
     dependencies = [];
 
   };
 
   neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoinclude-vim-2017-10-01";
+    name = "neoinclude-vim-2018-02-12";
     src = fetchgit {
       url = "https://github.com/shougo/neoinclude.vim";
-      rev = "b5956ac824fdd60d6eacaa597c8d329252972d8b";
-      sha256 = "07x7hxqhklcr5y8zkw9939cwx7rpiicjlc65bn526fkmhcc2hng6";
+      rev = "b63757822e0c31db04b32f0ca6bab01a560c2498";
+      sha256 = "1q2pbvl0xspjzwnisnrmv6w9wq289avzz2248hnm0v20rxvy5lwj";
     };
     dependencies = [];
 
@@ -1919,22 +1920,22 @@ rec {
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-09-26";
+    name = "neosnippet-snippets-2018-01-28";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "8dbb78599984140c50418d3dd23d0de4c8f13e74";
-      sha256 = "1hs4xvr9x03ccrcczhly4qlvr5bfxfvdk3ir4821mlg1gsgclkwh";
+      rev = "5902053e0202248f0855d7a2b4f562425447493e";
+      sha256 = "12a89hlpz0gydl7wpqnanybmrl88r6pqznm0p76y6ir9m460gxw6";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-11-23";
+    name = "neosnippet-vim-2018-02-22";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "9ee1b4e059d4ffcc02312da13ee36315dacbffe4";
-      sha256 = "0c4pk02hnvzgj6pwy4lx481n7gj2fjwlsmcy7vxfps9h8h9qd6kw";
+      rev = "e38afeab494bbc66be15e181bc96b78df3654a88";
+      sha256 = "1pm2drwq3hmbibai03pn6qh373kwfqf49npv1gq8d566wfmg0qrq";
     };
     dependencies = [];
 
@@ -1963,22 +1964,22 @@ rec {
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2017-12-06";
+    name = "unite-vim-2018-01-12";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "49fe0efad7a838a5bec9e653fb80504c94744ff9";
-      sha256 = "0vlpk053vdd5iqx2hmg9kvhg4270gq437smawdwjh88vriix3f1d";
+      rev = "cc0af4798f91e1c3a4a78ae028a3ac3e61d25eb3";
+      sha256 = "1vj3bpdyv7wq0xnk9ladacy1giz5x92a62akasbd84bkd79gaxwv";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2017-11-21";
+    name = "vimproc-vim-2018-01-07";
     src = fetchgit {
       url = "https://github.com/shougo/vimproc.vim";
-      rev = "81f4fa5239705724a49fbecd3299ced843f4972f";
-      sha256 = "03pkp37d07nx857kqz2h6q2z13ca2944zq2lcqdcc97s9nnjnzha";
+      rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
+      sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -2014,11 +2015,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-11-22";
+    name = "alchemist-vim-2018-02-03";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "1e08668e844ef5c6cb552e83bb842285a6ba4228";
-      sha256 = "05viwrvakxnc4fajscn7chvldc9vvjssbz4c81vdw8wgwxv8qay7";
+      rev = "1bc6ac4405f0b7bbf5dd963313f103f1416f27cb";
+      sha256 = "0ff83xknlkb2rdhvpp75nclilb4mlmkr86lp9jwb52dc0a6l2g8i";
     };
     dependencies = [];
 
@@ -2069,11 +2070,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2017-11-25";
+    name = "vim-quickrun-2018-02-21";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "1170ba086f8e27c123add196675ddab64a59ce70";
-      sha256 = "1vpllpinqf46ymsr7n1ywip4y7ibm3i8cidh271a57cvac0hig6d";
+      rev = "8d864e7feb7ac9dded84808f76fcb3fcd3ed8ae3";
+      sha256 = "0m2l1ajgagryaff3gaw91930y5p5ni1s2s4gnahwvqyiq3jdxaxh";
     };
     dependencies = [];
 
@@ -2102,33 +2103,33 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-10-10";
+    name = "vim-dispatch-2018-03-02";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "be7b194f47bdee6baa4460ccd030b860ada548dd";
-      sha256 = "0lxhk6y1lf625i8hnsl44wzh8mfxi2h1hswrmisbmm2dbmyy84hd";
+      rev = "e83ac42fefa4bcf2b4197bec2b4d917e15225815";
+      sha256 = "1mkhygh5pgp9z6gn2chn8kvj6fgfvg9gnym9icfdlm0hl2ldig1w";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2017-06-08";
+    name = "vim-eunuch-2018-02-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "b536b887072ff3cc382842ce9f675ec222302f4f";
-      sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p";
+      rev = "b62f7d4d4dcb6bdb840441c11435aa4361ec0454";
+      sha256 = "0h6q4jjqb9b0cdbg0ymm5kfw1a2b4m83fqdfw61637rd6i0ganks";
     };
     dependencies = [];
 
   };
 
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2017-04-21";
+    name = "vim-repeat-2018-01-30";
     src = fetchgit {
       url = "https://github.com/tpope/vim-repeat";
-      rev = "070ee903245999b2b79f7386631ffd29ce9b8e9f";
-      sha256 = "1grsaaar2ng1049gc3r8wbbp5imp31z1lcg399vhh3k36y34q213";
+      rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357";
+      sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc";
     };
     dependencies = [];
 
@@ -2179,22 +2180,22 @@ rec {
   };
 
   open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "open-browser-vim-2017-12-15";
+    name = "open-browser-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/tyru/open-browser.vim";
-      rev = "ee8decb2b26020320128eecd7a96383d995c8804";
-      sha256 = "1a9j13h174lkp1gqd80idwdb8d74gdkyfgvb2l153jcqyvwpzcl2";
+      rev = "43b08d6642f26af5a875b0d0bdb3aa9a6d12e7eb";
+      sha256 = "162dv172n16jpjr812d561yyj9rz9xn4qrfx18wlpyixj3qf2bda";
     };
     dependencies = [];
 
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-12-03";
+    name = "youcompleteme-2018-03-09";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "290dd94721d1bc97fab4f2e975a0cf6258abfbac";
-      sha256 = "0jhaixhx9lxqwb8ncxkafn478cc4dkh7ss6qjn29lcn9qdy9bvd7";
+      rev = "3a760212cb306655780a2c3be6412890ba5cf89b";
+      sha256 = "0q0gjlsb0l3k7a1fiz4lqa75r146y4myr42kwri0rm8y4fgpbc12";
     };
     dependencies = [];
     buildPhase = ''
@@ -2208,7 +2209,7 @@ rec {
 
     meta = {
       description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = https://github.com/Valloric/YouCompleteMe;
+      homepage = http://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
       platforms = stdenv.lib.platforms.unix;
@@ -2216,22 +2217,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-11-18";
+    name = "vim-airline-themes-2018-01-05";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "52dfa2b6c0dc2fd7a0e92954030893de3d173105";
-      sha256 = "0m65xmg259781r1wk8dz0d0diiayqyl1wahsb2fdqs369wwx4irr";
+      rev = "4b7f77e770a2165726072a2b6f109f2457783080";
+      sha256 = "02wbch9mbj0slafd5jrklmyawrxpisf8c3f5c72gq30j8hlyb86n";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-11-22";
+    name = "vim-pandoc-2018-01-11";
     src = fetchgit {
       url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "6ab0e8ed4dd3325d6b304e8f97f2cba80e3269ae";
-      sha256 = "07zdkp7g9y2vp3f9j2f12acap4ykgjp85in5qnhmg4dw8l8r07x5";
+      rev = "3a686781ab5ea622616798475deb394e48d3cc48";
+      sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3";
     };
     dependencies = [];
 
@@ -2392,33 +2393,44 @@ rec {
   };
 
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-02-25";
+    name = "ale-2018-03-10";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "7ec684206c1395a940d8ad2d26d59773a432115c";
-      sha256 = "1hvybsvs2i01q3s9wpydyxgsvg59r2valk61vl4jh2mrrh0bfi9i";
+      rev = "05d39bc1a9eb79ff6f36b190b4612ff052812e7e";
+      sha256 = "0p8pllh93bd43051rjcw9jamkmldb0rc3x8llw010m05jgrkngda";
     };
     dependencies = [];
 
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-11-24";
+    name = "vim-wakatime-2018-01-28";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "48b4e59dcd75890eb56d7ceb2d57ff63ed17c373";
-      sha256 = "0aspkigh08cdnv2mq425dapklxizir134zksrm608q02qpf0m7hg";
+      rev = "dadf0bc9697a3eea043190e9ccfe4fb2e53a20ca";
+      sha256 = "0fimkkkxii0g12xfbq8vs0i50ffincsbpz96x55q0j7gnlxbhwfr";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "targets-vim-2017-12-03";
+    name = "targets-vim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/wellle/targets.vim";
-      rev = "6f809397526797f8f419a5d2b86d90e5aff68e66";
-      sha256 = "0djjm7b41kgrkz447br7qi3w96ayz9lyxd164gyp082qqxxpz63q";
+      rev = "c1732189c9ec29cc3320094304019ffcafadafc4";
+      sha256 = "12ryicmb29qhmn216xdv9g8rl170mz5zrbfnmqja3wdlwkj3g83j";
+    };
+    dependencies = [];
+
+  };
+
+  vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dirdiff-2018-01-30";
+    src = fetchgit {
+      url = "https://github.com/will133/vim-dirdiff";
+      rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c";
+      sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1";
     };
     dependencies = [];
 
@@ -2462,25 +2474,25 @@ rec {
   };
 
   nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nim-vim-2017-11-29";
+    name = "nim-vim-2018-02-27";
     src = fetchgit {
       url = "https://github.com/zah/nim.vim";
-      rev = "8167c50bd421c921b198001387e60d4728868010";
-      sha256 = "0yk6qmxns3jzb7riwyrddmlszy89s0ihii0462rfa4b8wlmpan1l";
+      rev = "bdc19809d22190d9b8e85377252a24d930cd25f8";
+      sha256 = "08abwnzim767jvin6jsp2a580hpxzb2w5hbf8w5dhkvxv2pgk0vz";
     };
     dependencies = [];
 
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-11-14";
+    name = "deoplete-go-2018-02-04";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "844a0dce554f92cbd9938baf34f1801b5d872e58";
-      sha256 = "15sf8ssb85va6b0si07nyh5c5xdikdl99fihgprqk1wxi9mp28cj";
+      rev = "513ae17f1bd33954da80059a21c128a315726a81";
+      sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -2490,22 +2502,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-12-05";
+    name = "deoplete-jedi-2018-02-25";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "715acf2847b8fa8d436a10a4c3dfd7187d53b72f";
-      sha256 = "12d16z4mvc6aln5vnrdf275ci1w7v454zl9x54khqfikc0pwyjg8";
+      rev = "0410de74239b79d9fc21fe1076e46a97aa0d44cc";
+      sha256 = "0bp4d5q5y72bhmrwcczz6g1z53n372qydbsxjl7r2amaiy0l3yl0";
     };
     dependencies = [];
 
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2017-10-17";
+    name = "zig-vim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "6059db59f61b517f5d65303b61f03324e01fdc2f";
-      sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z";
+      rev = "1ce1b03ace88c447733cd5f398f09ff1d83d6831";
+      sha256 = "0y96dwfh1291gn7ia749nc8r03ndq7f29lgqag4dcs59x0pk4f5w";
     };
     dependencies = [];
 
@@ -2523,39 +2535,27 @@ rec {
   };
 
   gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gruvbox-2017-10-01";
+    name = "gruvbox-2018-02-25";
     src = fetchgit {
       url = "git://github.com/morhetz/gruvbox";
-      rev = "16504d394e145e0372d2491e02769d241350399a";
-      sha256 = "0yhas9lnsn9lfld37lvm5msmmkj6c7d8ajgarazc5rykbl8bw8rg";
+      rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
+      sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
     };
     dependencies = [];
 
   };
 
   maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "maktaba-2017-05-07";
+    name = "maktaba-2017-12-29";
     src = fetchgit {
       url = "git://github.com/google/vim-maktaba";
-      rev = "2ae8b4478ea9bc2c6c8106acb55ddfb935754fb9";
-      sha256 = "1w8paqn0qyk4j5wfx48rc2za7kzhgdaggikklmjr1vsv2y0b8fzc";
+      rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982";
+      sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm";
     };
     dependencies = [];
 
   };
 
-  gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gitv-2017-11-26";
-    src = fetchgit {
-      url = "https://github.com/gregsexton/gitv";
-      rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
-      sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
-    };
-    dependencies = ["fugitive"];
-
-  };
-
-
   matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "matchit-zip";
     src = fetchurl {
@@ -2579,11 +2579,11 @@ rec {
   };
 
   neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-look-2018-01-07";
+    name = "neco-look-2018-01-21";
     src = fetchgit {
       url = "git://github.com/ujihisa/neco-look";
-      rev = "ff3de2731177694d0e85f1227b6cfd51c8e2bc8d";
-      sha256 = "0zpny9sj7alzsbrjbph71b44zf575hij1ky8pwgba0ygp2p2fxd4";
+      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
+      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
     };
     dependencies = [];
 
@@ -2634,22 +2634,22 @@ rec {
   };
 
   riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "riv-2017-02-07";
+    name = "riv-2018-01-21";
     src = fetchgit {
       url = "git://github.com/Rykka/riv.vim";
-      rev = "d1efdd92fbb51dc452c61eec54a0ec084f011b4b";
-      sha256 = "18qcglbrixgqk05x34dy2cksaw0dg7n51p48i6zkh5sqspv98zz3";
+      rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09";
+      sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j";
     };
     dependencies = [];
 
   };
 
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2017-05-09";
+    name = "sensible-2018-01-22";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "49ee364222dc2a5a00dddf89fd61880e3e39d46a";
-      sha256 = "0x9zn547hzzxjzplr2rkzhydh2y0a4fdkrwmdvw2yp203msyhcjx";
+      rev = "2d60332fa5b2b1ea346864245569df426052865a";
+      sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb";
     };
     dependencies = [];
 
@@ -2711,11 +2711,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2018-01-04";
+    name = "table-mode-2018-02-13";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "b25fe6f9f0f0b704d05ebd05edbbf0be3038cef9";
-      sha256 = "14ykj2yrwi8k6mkzg0vi4favwg88l8c7zf7m6qzvndpjqw8jggdy";
+      rev = "c35fd9b104fb75017f3866a28a77cf38f61b7801";
+      sha256 = "0l52ipl7a1g3js6lfig4xjw17nmmjvpv7gsrpn166kwgrxgis802";
     };
     dependencies = [];
 
@@ -2776,11 +2776,11 @@ rec {
   };
 
   vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2017-09-23";
+    name = "vim-addon-actions-2018-01-18";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
-      rev = "7f48bea57fd9dfb06498422bc1cbe9f7553efa6e";
-      sha256 = "0q9w2x49zd3a43cm4ikgpwrqiz0k9a6pss0zrvskaxhh6mifpxpg";
+      rev = "540cae09832ba6abf9fc63c55781bf86584c33ac";
+      sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -2886,11 +2886,11 @@ rec {
   };
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mw-utils-2012-11-05";
+    name = "vim-addon-mw-utils-2018-03-09";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
-      rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "147s1k4n45d3x281vj35l26sv4waxjlpqdn83z3k9n51556h1d45";
+      rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2";
+      sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f";
     };
     dependencies = [];
 
@@ -2985,22 +2985,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-11-27";
+    name = "vim-airline-2018-03-06";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "6c8d0f5e6af878db71b2dc44ccf1d1417381d6a0";
-      sha256 = "0azrapbb3w84c62kcbrycm75qmwdfz38852sv7cccwb7v1xgj9ab";
+      rev = "958f78335eafe419ee002ad58d358854323de33a";
+      sha256 = "1h0a0rsnbbwhw55r2hcpfkxqamnx62jzqb451lh3ipvfs0ral6w7";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2017-12-04";
+    name = "vim-coffee-script-2018-02-27";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "de6b6327b4e738ea5dbf0ef97d06d39217e4e6fc";
-      sha256 = "0rvvsqlc3vrfpvh25a8kykwnf5dwx7blbnl5by1ja0l77l1hnrz4";
+      rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb";
+      sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x";
     };
     dependencies = [];
 
@@ -3017,17 +3017,6 @@ rec {
 
   };
 
-  vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dirdiff-2017-01-19";
-    src = fetchgit {
-      url = "https://github.com/will133/vim-dirdiff";
-      rev = "db1fe77dcefa7a5b1089c8a84d1b401a4bd780bc";
-      sha256 = "1540h5skh8rcpzj0vp8sr53hg9jmmknj155pxs4z5w6gvzk7nx0p";
-    };
-    dependencies = [];
-
-  };
-
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easy-align-2017-06-03";
     src = fetchgit {
@@ -3062,11 +3051,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-02-26";
+    name = "vim-gitgutter-2018-03-08";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "e512d3a6fc80900c24ef293b475715f49ec6ded8";
-      sha256 = "0wd6x3fb5jbqlvismp3f59ycid49gn3qvd16cj8x87v6l3anmp4s";
+      rev = "380e7935b7b4cac10d3bc3031d492deaf5008495";
+      sha256 = "0c1dh3rkhgrp1sala1y5y2wn7b94c75y7h3j3dsl8lmbl64y2vl8";
     };
     dependencies = [];
 
@@ -3095,22 +3084,22 @@ rec {
   };
 
   vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-javascript-2018-01-10";
+    name = "vim-javascript-2018-03-04";
     src = fetchgit {
       url = "git://github.com/pangloss/vim-javascript";
-      rev = "4c0a554423df72ecb8d13b143afa7a4cfcb994ec";
-      sha256 = "01lbkcfjqwrn2pbxz1jj8g2vxasc2i7s6nc7665s1warn066ykjr";
+      rev = "3e0b1af8c2b2b613add52d782b29f325c6a414e3";
+      sha256 = "1rxds6sswnm7xyy39ljwhykb3r6jd9jsm1lbhhw2r226d56pj15w";
     };
     dependencies = [];
 
   };
 
   vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsbeautify-2017-05-20";
+    name = "vim-jsbeautify-2018-01-31";
     src = fetchgit {
       url = "git://github.com/maksimr/vim-jsbeautify";
-      rev = "e83f749c3de7e958e7bc285e80e484707b6f1e12";
-      sha256 = "0dy9ljqp6shac406xgawzrqcapm80rjxmbzwy93ypzlhi8b67w0a";
+      rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624";
+      sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq";
     };
     dependencies = [];
 
@@ -3139,11 +3128,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2017-08-04";
+    name = "vim-multiple-cursors-2018-03-02";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "a97dab5bc440bf0a7b62bb2de4479963a888f4ff";
-      sha256 = "1ac5l5h138ns9z9ni4qbcykkg9yfpjjalk0g9wrra4rp0nlakaqk";
+      rev = "c9b95e49a48937903c9fc41d87d9b4c9aded10d7";
+      sha256 = "1r8xlfydarvaags541xn1mc5ry97ikyvjhkrpyngzfw48jlc0aaa";
     };
     dependencies = [];
 
@@ -3160,23 +3149,12 @@ rec {
 
   };
 
-  vim-rooter = buildVimPluginFrom2Nix {
-    name = "vim-rooter-2017-11-20";
-    src = fetchgit {
-      url = "git://github.com/airblade/vim-rooter";
-      rev = "3509dfb80d0076270a04049548738daeedf6dfb9";
-      sha256 = "03j26fw0dcvcc81fn8hx1prdwlgnd3g340pbxrzgbgxxq5kr0bwl";
-    };
-    dependencies = [];
-
-  };
-
   vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ruby-2017-06-22";
+    name = "vim-ruby-2018-03-02";
     src = fetchgit {
       url = "git://github.com/vim-ruby/vim-ruby";
-      rev = "074200ffa39b19baf9d9750d399d53d97f21ee07";
-      sha256 = "1w2d12cl40nf73f3hcpqc4sqma8h1a557fy8kds2x143gq7s5vx6";
+      rev = "15e32500f58c3bb66eb6b1eb4af57d86263895c0";
+      sha256 = "15lhg4wdrx7989rbawpa2jlfrfnhf5km76g8ld5b2c2gqixxy4aj";
     };
     dependencies = [];
 
@@ -3194,44 +3172,44 @@ rec {
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2017-09-24";
+    name = "vim-signature-2018-02-28";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "eaa8af20ac4d46f911a083298d7a19e27be180e0";
-      sha256 = "1vha52bmbs88lnwjfvkbx2jb74k8gqjky0c9gv8gqy74lypcdas5";
+      rev = "21b03ff51d08775a44417db14bf6dee690723d06";
+      sha256 = "1v36zkr8jkhhfsdli6rvrz3akcr8bmfqyrkxb2izb0c250b9swrg";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-08-19";
+    name = "vim-signify-2018-02-21";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "1a8a15d835d8f2da56cd793a0222227af6c89839";
-      sha256 = "13yvwy2vw64g4v08k83svhp26nmmir0qd21wpp89qclbzwb2q2k2";
+      rev = "26ed57e0fe7a28c8763920e946b2225ec577df3f";
+      sha256 = "0xkmyzm79gay1cga9znlsdk3mwc6smavv7xg5x6gr8a17wjipmlm";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-12-05";
+    name = "vim-snippets-2018-03-05";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "e116db735e54a8e428f8b2c08c842ee52b7230fe";
-      sha256 = "05zn4z40awqab8fz9z49wkry6hww89la33vj552cf6lhzfkbbsvv";
+      rev = "f02955d40b64c9db6f6bdeee40d0f44a00c58865";
+      sha256 = "0ylbvr88xh1lw4lbiiwg617wp4r25d32wl4rsb7s2c5isy6aimki";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2017-10-13";
+    name = "vim-webdevicons-2018-03-10";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
-      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
+      rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48";
+      sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc";
     };
     dependencies = [];
 
@@ -3249,33 +3227,33 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-12-04";
+    name = "vimwiki-2018-02-26";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "75fe1d4f003f77a33955f436e023a4ce9548cb69";
-      sha256 = "1a4918jsxjvlzj4qqariygwjjcs2lflykgq5k5l3ar3jvwlw0n7p";
+      rev = "4bacbe00005f23d72d247fdde3a9e857d690b44b";
+      sha256 = "1kbblgzl311ksgyy4q44cngzacn3i2sfmfgmv441vzc7lq0fpmd6";
     };
     dependencies = [];
 
   };
 
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vinegar-2017-06-27";
+    name = "vinegar-2017-12-28";
     src = fetchgit {
       url = "git://github.com/tpope/vim-vinegar";
-      rev = "c795cb739347cbddeeb288c3c35da9f140a513c9";
-      sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3";
+      rev = "44bc76a6abf6aeafa4d0808288bb4fcc9a2e98f8";
+      sha256 = "1h612j0w0kz2f8575r63dzdi65fhq77dp7rhziixs3pkq54pqcsg";
     };
     dependencies = [];
 
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2017-11-10";
+    name = "vundle-2018-02-02";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "fcc204205e3305c4f86f07e09cd756c7d06f0f00";
-      sha256 = "1wpxp59rh1l6i4mvavqsh1xxqj3fmqiggl92h6chj4lc8anssydy";
+      rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
+      sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
     };
     dependencies = [];
 
@@ -3302,4 +3280,5 @@ rec {
     dependencies = [];
 
   };
+
 }

From 669cbb63d089917c089b17a8bd39791375782e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <mail@maximedenes.fr>
Date: Mon, 12 Mar 2018 12:39:23 +0100
Subject: [PATCH 0837/2266] pythonPackages.sphinx_rtd_theme: 0.1.9 -> 0.2.5b2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4529f7febd4..dcbaabdc334 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16086,20 +16086,15 @@ in {
   hieroglyph = callPackage ../development/python-modules/hieroglyph { };
 
   sphinx_rtd_theme = buildPythonPackage (rec {
-    name = "sphinx_rtd_theme-0.1.9";
+    name = "sphinx_rtd_theme-0.2.5b2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sphinx_rtd_theme/${name}.tar.gz";
-      sha256 = "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17";
+      sha256 = "0grf16fi4g0p3dfh11b1624ic34iqkjhf5i1g6hvsh4nlm0ll00q";
     };
 
-    postPatch = ''
-      rm requirements.txt
-      touch requirements.txt
-    '';
-
     meta = {
-      description = "ReadTheDocs.org theme for Sphinx, 2013 version";
+      description = "ReadTheDocs.org theme for Sphinx";
       homepage = https://github.com/snide/sphinx_rtd_theme/;
       license = licenses.bsd3;
       platforms = platforms.unix;

From a5a90aed1ac0e197d9d5a36c46ba4e254f3db599 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 12 Mar 2018 09:04:31 -0400
Subject: [PATCH 0838/2266] linux: 4.16-rc4 -> 4.16-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 5286ecaf34c..48aaeebc4d2 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc4";
-  modDirVersion = "4.16.0-rc4";
+  version = "4.16-rc5";
+  modDirVersion = "4.16.0-rc5";
   extraMeta.branch = "4.16";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0fxs3i7rdw5mybmim0npmzqpp7i3ppy1f6f72q2w3qdbjmbqm7w6";
+    sha256 = "0yfa0qrs6fwh88xgn252j7nc8q4x5qhf20dlax9hcnza0ai6nk3z";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 83de07c6b4a1fb14854433a8a0629971ac1813b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Mar 2018 15:45:57 +0100
Subject: [PATCH 0839/2266] LTS Haskell 10.9

This includes an automatic update of hackage-packages.nix, generated by
hackage2nix v2.9-5-g32974fc from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ed783e7c6ec0c6e76da1874b575faa247da26fa5.
---
 .../configuration-hackage2nix.yaml            |  121 +-
 .../haskell-modules/hackage-packages.nix      | 1898 ++++++-----------
 2 files changed, 712 insertions(+), 1307 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4fb886a3c35..3139a15039f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 10.8
+  # LTS Haskell 10.9
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -49,7 +49,7 @@ default-package-overrides:
   - accelerate-examples ==1.1.0.0
   - accelerate-fft ==1.1.0.0
   - accelerate-fftw ==1.0
-  - accelerate-fourier ==1.0.0.3
+  - accelerate-fourier ==1.0.0.4
   - accelerate-io ==1.0.0.1
   - accelerate-llvm ==1.1.0.0
   - accelerate-llvm-native ==1.1.0.1
@@ -72,6 +72,7 @@ default-package-overrides:
   - aeson-extra ==0.4.1.0
   - aeson-generic-compat ==0.0.1.1
   - aeson-injector ==1.1.0.0
+  - aeson-picker ==0.1.0.3
   - aeson-pretty ==0.8.5
   - aeson-qq ==0.8.2
   - aeson-typescript ==0.1.0.3
@@ -213,7 +214,7 @@ default-package-overrides:
   - async-timer ==0.1.4.1
   - atom-basic ==0.2.5
   - atom-conduit ==0.5.0.1
-  - atomic-primops ==0.8.1.1
+  - atomic-primops ==0.8.2
   - atomic-write ==0.2.0.5
   - attoparsec ==0.13.2.2
   - attoparsec-binary ==0.2
@@ -252,7 +253,7 @@ default-package-overrides:
   - basic-prelude ==0.7.0
   - bbdb ==0.8
   - bcrypt ==0.0.11
-  - bench ==1.0.8
+  - bench ==1.0.9
   - benchpress ==0.2.2.10
   - bencode ==0.6.0.0
   - bento ==0.1.0
@@ -368,7 +369,7 @@ default-package-overrides:
   - cassava-conduit ==0.4.0.1
   - cassette ==0.1.0
   - cast ==0.1.0.2
-  - cayley-client ==0.4.3
+  - cayley-client ==0.4.4
   - cereal ==0.5.5.0
   - cereal-conduit ==0.7.3
   - cereal-text ==0.1.0.2
@@ -382,8 +383,8 @@ default-package-overrides:
   - Chart-diagrams ==1.8.3
   - chart-unit ==0.5.5.0
   - chaselev-deque ==0.5.0.5
-  - ChasingBottoms ==1.3.1.3
-  - chatwork ==0.1.3.0
+  - ChasingBottoms ==1.3.1.4
+  - chatwork ==0.1.3.1
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -399,7 +400,7 @@ default-package-overrides:
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
   - cisco-spark-api ==0.1.0.0
-  - clang-compilation-database ==0.1.0.0
+  - clang-compilation-database ==0.1.0.1
   - classy-prelude ==1.3.1
   - classy-prelude-conduit ==1.3.1
   - classy-prelude-yesod ==1.3.1
@@ -413,7 +414,7 @@ default-package-overrides:
   - clr-inline ==0.2.0.1
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
-  - ClustalParser ==1.2.1
+  - ClustalParser ==1.2.2
   - cmark ==0.5.6
   - cmark-gfm ==0.1.3
   - cmark-highlight ==0.2.0.0
@@ -462,7 +463,7 @@ default-package-overrides:
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.8
-  - connection-pool ==0.2.1
+  - connection-pool ==0.2.2
   - console-style ==0.0.2.1
   - constraints ==0.9.1
   - consul-haskell ==0.4.2
@@ -517,7 +518,7 @@ default-package-overrides:
   - cubicbezier ==0.6.0.5
   - cubicspline ==0.1.2
   - cublas ==0.4.0.0
-  - cuda ==0.9.0.1
+  - cuda ==0.9.0.2
   - cue-sheet ==1.0.1
   - cufft ==0.8.0.0
   - curl ==1.3.8
@@ -557,7 +558,7 @@ default-package-overrides:
   - data-ordlist ==0.4.7.0
   - data-ref ==0.0.1.1
   - data-reify ==0.6.1
-  - data-serializer ==0.3.2
+  - data-serializer ==0.3.4
   - datasets ==0.2.5
   - data-textual ==0.3.0.2
   - data-tree-print ==0.1.0.0
@@ -622,14 +623,14 @@ default-package-overrides:
   - dlist ==0.8.0.4
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
-  - dns ==3.0.1
+  - dns ==3.0.2
   - docker ==0.4.1.1
   - docker-build-cacher ==1.8.2
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.2.1
   - doctest ==0.13.0
-  - doctest-discover ==0.1.0.8
+  - doctest-discover ==0.1.0.9
   - doctest-driver-gen ==0.1.0.1
   - do-list ==1.0.1
   - dom-parser ==3.0.0
@@ -674,7 +675,7 @@ default-package-overrides:
   - elm-export ==0.6.0.1
   - elm-export-persistent ==0.1.2
   - emailaddress ==0.2.0.0
-  - email-validate ==2.3.2.2
+  - email-validate ==2.3.2.3
   - enclosed-exceptions ==1.0.2
   - EntrezHTTP ==1.0.4
   - entropy ==0.3.8
@@ -722,7 +723,7 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.5.2
-  - extensible ==0.4.7.1
+  - extensible ==0.4.8
   - extensible-effects ==2.1.0.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.4
@@ -1003,14 +1004,14 @@ default-package-overrides:
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
   - groom ==0.1.2.1
-  - groundhog ==0.8
+  - groundhog ==0.8.0.1
   - groundhog-inspector ==0.8.0.2
-  - groundhog-mysql ==0.8
-  - groundhog-postgresql ==0.8.0.1
-  - groundhog-sqlite ==0.8
+  - groundhog-mysql ==0.8.0.1
+  - groundhog-postgresql ==0.8.0.3
+  - groundhog-sqlite ==0.8.0.1
   - groundhog-th ==0.8.0.2
   - group-by-date ==0.1.0.2
-  - grouped-list ==0.2.1.4
+  - grouped-list ==0.2.1.5
   - groupoids ==4.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.3.1
@@ -1029,7 +1030,7 @@ default-package-overrides:
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.2
+  - hapistrano ==0.3.5.3
   - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.0.1
@@ -1037,7 +1038,7 @@ default-package-overrides:
   - happy ==1.19.9
   - harp ==0.4.3
   - hasbolt ==0.1.3.0
-  - hashable ==1.2.6.1
+  - hashable ==1.2.7.0
   - hashable-time ==0.2.0.1
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
@@ -1155,7 +1156,7 @@ default-package-overrides:
   - hpio ==0.9.0.5
   - hpp ==0.5.1
   - hpqtypes ==1.5.1.1
-  - hprotoc ==2.4.7
+  - hprotoc ==2.4.8
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
@@ -1168,8 +1169,8 @@ default-package-overrides:
   - hsebaysdk ==0.4.0.0
   - hse-cpp ==0.2
   - hsemail ==2
-  - hset ==2.2.0
   - HSet ==0.0.1
+  - hset ==2.2.0
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1180,7 +1181,7 @@ default-package-overrides:
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.12
+  - HsOpenSSL ==0.11.4.13
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.4
@@ -1208,7 +1209,7 @@ default-package-overrides:
   - hsx2hs ==0.14.1.2
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
-  - hsyslog-udp ==0.2.0
+  - hsyslog-udp ==0.2.1
   - htaglib ==1.1.1
   - HTF ==0.13.2.2
   - html ==1.0.1.2
@@ -1216,7 +1217,7 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.9
+  - HTTP ==4000.3.10
   - http2 ==1.6.3
   - http-api-data ==0.3.7.2
   - http-client ==0.5.10
@@ -1297,7 +1298,7 @@ default-package-overrides:
   - insert-ordered-containers ==0.2.1.0
   - inspection-testing ==0.1.2
   - instance-control ==0.1.2.0
-  - integer-logarithms ==1.0.2
+  - integer-logarithms ==1.0.2.1
   - integration ==0.2.1
   - intern ==0.9.2
   - interpolate ==0.1.1
@@ -1365,7 +1366,7 @@ default-package-overrides:
   - kanji ==3.0.2
   - kansas-comet ==0.4
   - katip ==0.5.3.0
-  - katip-elasticsearch ==0.4.0.4
+  - katip-elasticsearch ==0.4.1.0
   - katydid ==0.1.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
@@ -1385,7 +1386,7 @@ default-package-overrides:
   - language-fortran ==0.5.1
   - language-glsl ==0.2.1
   - language-haskell-extract ==0.2.4
-  - language-java ==0.2.8
+  - language-java ==0.2.9
   - language-javascript ==0.6.0.10
   - language-puppet ==1.3.16
   - lapack-carray ==0.0
@@ -1452,7 +1453,7 @@ default-package-overrides:
   - logging-effect ==1.2.4
   - logging-effect-extra ==1.2.2
   - logging-effect-extra-file ==1.1.2
-  - logging-effect-extra-handler ==1.1.2
+  - logging-effect-extra-handler ==1.1.3
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
@@ -1586,7 +1587,7 @@ default-package-overrides:
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.15
+  - morte ==1.6.16
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.2
@@ -1625,7 +1626,7 @@ default-package-overrides:
   - netpbm ==1.0.2
   - nettle ==0.2.0
   - netwire ==5.0.2
-  - netwire-input ==0.0.6
+  - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.8
   - network ==2.6.3.4
   - network-anonymous-i2p ==0.10.0
@@ -1761,7 +1762,7 @@ default-package-overrides:
   - persistent-postgresql ==2.6.3
   - persistent-refs ==0.4
   - persistent-sqlite ==2.6.4
-  - persistent-template ==2.5.3.1
+  - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
@@ -1858,8 +1859,8 @@ default-package-overrides:
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.5
-  - protocol-buffers ==2.4.7
-  - protocol-buffers-descriptor ==2.4.7
+  - protocol-buffers ==2.4.8
+  - protocol-buffers-descriptor ==2.4.8
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-combinators ==0.1.0.8
@@ -1888,7 +1889,7 @@ default-package-overrides:
   - quickcheck-assertions ==0.3.0
   - quickcheck-classes ==0.3.3
   - quickcheck-combinators ==0.0.2
-  - quickcheck-instances ==0.3.16.1
+  - quickcheck-instances ==0.3.18
   - quickcheck-io ==0.2.0
   - quickcheck-properties ==0.1
   - quickcheck-simple ==0.1.0.2
@@ -1900,7 +1901,7 @@ default-package-overrides:
   - raaz ==0.2.0
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
-  - rakuten ==0.1.0.5
+  - rakuten ==0.1.1.0
   - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
@@ -2007,10 +2008,10 @@ default-package-overrides:
   - sandi ==0.4.1
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbp ==2.3.6
+  - sbp ==2.3.9
   - sbv ==7.4
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -2052,7 +2053,7 @@ default-package-overrides:
   - servant-generic ==0.1.0.1
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
-  - servant-kotlin ==0.1.0.3
+  - servant-kotlin ==0.1.1.0
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.3
   - servant-pandoc ==0.4.1.4
@@ -2084,7 +2085,7 @@ default-package-overrides:
   - shakespeare ==2.0.15
   - shell-conduit ==4.6.1
   - shell-escape ==0.2.0
-  - shelly ==1.7.0.1
+  - shelly ==1.7.1
   - shikensu ==0.3.8
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
@@ -2108,7 +2109,7 @@ default-package-overrides:
   - slave-thread ==1.0.2
   - slug ==0.1.7
   - smallcheck ==1.1.3.1
-  - smoothie ==0.4.2.7
+  - smoothie ==0.4.2.8
   - smtp-mail ==0.1.4.6
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.3.1
@@ -2179,7 +2180,7 @@ default-package-overrides:
   - Strafunski-StrategyLib ==5.0.0.10
   - stratosphere ==0.14.0
   - Stream ==0.4.7.2
-  - streaming ==0.2.0.0
+  - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
   - streamly ==0.1.0
@@ -2197,7 +2198,7 @@ default-package-overrides:
   - string-conversions ==0.4.0.1
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
-  - string-transform ==0.1.0
+  - string-transform ==0.1.1
   - stripe-core ==2.2.3
   - stripe-haskell ==2.2.3
   - stripe-http-streams ==2.2.3
@@ -2214,7 +2215,7 @@ default-package-overrides:
   - swagger ==0.3.0
   - swagger2 ==2.2
   - swagger-petstore ==0.0.1.8
-  - swish ==0.9.1.10
+  - swish ==0.9.2.0
   - syb ==0.7
   - syb-with-class ==0.6.1.8
   - symbol ==0.2.4
@@ -2231,7 +2232,7 @@ default-package-overrides:
   - tagged-identity ==0.1.2
   - tagsoup ==0.14.6
   - tagstream-conduit ==0.5.5.3
-  - tar ==0.5.0.3
+  - tar ==0.5.1.0
   - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
   - tasty ==0.11.3
@@ -2239,7 +2240,7 @@ default-package-overrides:
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==0.7.1.1
   - tasty-discover ==4.1.5
-  - tasty-expected-failure ==0.11.0.4
+  - tasty-expected-failure ==0.11.1
   - tasty-fail-fast ==0.0.3
   - tasty-golden ==2.3.1.2
   - tasty-hedgehog ==0.1.0.2
@@ -2283,7 +2284,7 @@ default-package-overrides:
   - text-format ==0.3.1.1
   - text-generic-pretty ==1.2.1
   - text-icu ==0.7.0.1
-  - text-latin1 ==0.3
+  - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.11
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
@@ -2291,8 +2292,8 @@ default-package-overrides:
   - text-postgresql ==0.0.2.3
   - text-printer ==0.5
   - text-region ==0.3.0.0
-  - text-short ==0.1.1
-  - text-show ==3.7.1
+  - text-short ==0.1.2
+  - text-show ==3.7.2
   - text-show-instances ==3.6.2
   - text-zipper ==0.10.1
   - tfp ==1.0.0.2
@@ -2370,7 +2371,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.4.5
+  - turtle ==1.4.6
   - turtle-options ==0.1.0.4
   - twitter-conduit ==0.2.3
   - twitter-types ==0.7.2.2
@@ -2397,7 +2398,7 @@ default-package-overrides:
   - uglymemo ==0.1.0.1
   - unagi-chan ==0.4.1.0
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.3.1
+  - unbound-generics ==0.3.2
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
@@ -2411,8 +2412,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - Unique ==0.4.7.2
   - unique ==0
+  - Unique ==0.4.7.2
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2432,11 +2433,11 @@ default-package-overrides:
   - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
   - uri-bytestring ==0.3.1.1
-  - uri-bytestring-aeson ==0.1.0.4
+  - uri-bytestring-aeson ==0.1.0.5
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
   - url ==2.1.3
-  - urlpath ==7.0.1
+  - urlpath ==7.0.2
   - userid ==0.1.3.1
   - users ==0.5.0.0
   - users-persistent ==0.5.0.2
@@ -2482,7 +2483,7 @@ default-package-overrides:
   - versions ==3.3.1
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.13
+  - viewprof ==0.0.0.14
   - vinyl ==0.7.0
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2517,7 +2518,7 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
-  - warp ==3.2.13
+  - warp ==3.2.18
   - warp-tls ==3.2.4
   - wave ==0.1.5
   - wavefront ==0.7.1.1
@@ -2663,7 +2664,7 @@ default-package-overrides:
   - zippers ==0.2.5
   - ziptastic-client ==0.3.0.3
   - ziptastic-core ==0.2.0.3
-  - zlib ==0.6.1.2
+  - zlib ==0.6.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
   - zm ==0.3.2
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 03be23adbc5..c8707f3aa08 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2800,24 +2800,6 @@ self: {
      }) {};
 
   "ChasingBottoms" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
-     , syb
-     }:
-     mkDerivation {
-       pname = "ChasingBottoms";
-       version = "1.3.1.3";
-       sha256 = "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q";
-       libraryHaskellDepends = [
-         base containers mtl QuickCheck random syb
-       ];
-       testHaskellDepends = [
-         array base containers mtl QuickCheck random syb
-       ];
-       description = "For testing partial and infinite values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ChasingBottoms_1_3_1_4" = callPackage
     ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
      , syb
      }:
@@ -2833,7 +2815,6 @@ self: {
        ];
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CheatSheet" = callPackage
@@ -2980,23 +2961,6 @@ self: {
      }) {};
 
   "ClustalParser" = callPackage
-    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "ClustalParser";
-       version = "1.2.1";
-       sha256 = "17c7fp6vz64521kjq6xbq3z65cdcwip56qdrxmqcnjryrbysjd00";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec text vector ];
-       executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec text ];
-       description = "Libary for parsing Clustal tools output";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "ClustalParser_1_2_2" = callPackage
     ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
      , vector
      }:
@@ -3011,7 +2975,6 @@ self: {
        testHaskellDepends = [ base hspec parsec text ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Coadjute" = callPackage
@@ -8800,29 +8763,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.9";
-       sha256 = "1zv38sjr1kv6vm35a8w5659ap9jpxpq5b9zjgablils8ca52p5h5";
-       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_10" = 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
@@ -8843,7 +8783,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
@@ -10202,25 +10141,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
-     , openssl, time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.12";
-       sha256 = "18hmbjg15rlpnqq95z2d2xskj5l0hcv5mp9hb16jb26rcdi54sim";
-       setupHaskellDepends = [ base Cabal ];
-       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;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_13" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
      , openssl, time
      }:
@@ -10237,7 +10157,6 @@ self: {
        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-x509-system" = callPackage
@@ -17682,6 +17601,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Strafunski-StrategyLib_5_0_1_0" = callPackage
+    ({ mkDerivation, base, directory, mtl, syb, transformers }:
+     mkDerivation {
+       pname = "Strafunski-StrategyLib";
+       version = "5.0.1.0";
+       sha256 = "15d2m7ahb3jwriariaff0yz93mmrhpv579wink9838w9091cf650";
+       libraryHaskellDepends = [ base directory mtl syb transformers ];
+       description = "Library for strategic programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "StrappedTemplates" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , filemanip, filepath, hspec, mtl, parsec, text, transformers
@@ -20650,32 +20581,6 @@ self: {
      }) {};
 
   "accelerate-fourier" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic
-     , accelerate-llvm-native, accelerate-utility, base, containers
-     , criterion, QuickCheck, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "accelerate-fourier";
-       version = "1.0.0.3";
-       sha256 = "1xh6anashsvj5mfkwbl3as9gjgwl69q0qz3js0xbii8vdmhbbbnb";
-       libraryHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-utility base containers
-         QuickCheck transformers utility-ht
-       ];
-       testHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-utility base QuickCheck
-         utility-ht
-       ];
-       benchmarkHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-llvm-native
-         accelerate-utility base criterion utility-ht
-       ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
-       description = "Fast Fourier transform and convolution using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-fourier_1_0_0_4" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic
      , accelerate-llvm-native, accelerate-utility, base, containers
      , criterion, QuickCheck, transformers, utility-ht
@@ -20699,7 +20604,6 @@ self: {
        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;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -23621,8 +23525,8 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.9";
-       sha256 = "1q850c0kaycvqw7gv0qhnssy84qh1z8avyh4kswx6n5n4swc4z4z";
+       version = "0.9.1";
+       sha256 = "129s5690wc4w92sg246pcmnradzgfdddqpv961a53k2cx9ynmvc6";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
@@ -29705,18 +29609,6 @@ self: {
      }) {};
 
   "atomic-primops" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive }:
-     mkDerivation {
-       pname = "atomic-primops";
-       version = "0.8.1.1";
-       sha256 = "0wi18i3k5mjmyd13n1kly7021084rjm4wfpcf70zzzss1z37kxch";
-       libraryHaskellDepends = [ base ghc-prim primitive ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-       description = "A safe approach to CAS and other atomic ops in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "atomic-primops_0_8_2" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
        pname = "atomic-primops";
@@ -29726,7 +29618,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops-foreign" = callPackage
@@ -30600,6 +30491,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_1_4" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.1.4";
+       sha256 = "08jkmh4zlgzp5wc6qivriqqf4n0ddh4wqffk3dpg8rsvj299648l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/autoexporter#readme";
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autom" = callPackage
     ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
      , JuicyPixels, random, vector
@@ -31750,6 +31657,8 @@ self: {
        pname = "b-tree";
        version = "0.1.3";
        sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
+       revision = "1";
+       editedCabalFile = "0y569gdl9b79c98lkd2zff71svi0b1i64dihc5dmsjlmzkwfzzhw";
        libraryHaskellDepends = [
          base binary bytestring containers directory errors exceptions
          filepath lens mmap mtl pipes pipes-interleave transformers vector
@@ -33338,24 +33247,6 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, optparse-applicative, process
-     , silently, text, turtle
-     }:
-     mkDerivation {
-       pname = "bench";
-       version = "1.0.8";
-       sha256 = "18lyjkyz1yynnln92ihn9g28w2s2xmahaqg1lr1cr2v3kpv8ilvl";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base criterion optparse-applicative process silently text turtle
-       ];
-       homepage = "http://github.com/Gabriel439/bench";
-       description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bench_1_0_9" = callPackage
     ({ mkDerivation, base, criterion, optparse-applicative, process
      , silently, text, turtle
      }:
@@ -33371,7 +33262,6 @@ self: {
        homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -36669,6 +36559,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blas-carray_0_0_1" = callPackage
+    ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi
+     , storable-complex, transformers
+     }:
+     mkDerivation {
+       pname = "blas-carray";
+       version = "0.0.1";
+       sha256 = "02gljz0bmjrq6fwi4jikzqmqiydkyxvlk429y3my67zfkcvzr0sg";
+       libraryHaskellDepends = [
+         base blas-ffi carray netlib-carray netlib-ffi storable-complex
+         transformers
+       ];
+       homepage = "http://hub.darcs.net/thielema/blas-carray/";
+       description = "Auto-generated interface to Fortran BLAS via CArrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blas-ffi" = callPackage
     ({ mkDerivation, base, blas, netlib-ffi }:
      mkDerivation {
@@ -36683,6 +36591,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas;};
 
+  "blas-ffi_0_0_1" = callPackage
+    ({ mkDerivation, base, blas, netlib-ffi }:
+     mkDerivation {
+       pname = "blas-ffi";
+       version = "0.0.1";
+       sha256 = "09glhrs7q2wpm0sm66vkdr28nhsz41js8ziny578db2ys2dpwbxz";
+       libraryHaskellDepends = [ base netlib-ffi ];
+       libraryPkgconfigDepends = [ blas ];
+       homepage = "http://hub.darcs.net/thielema/blas-ffi/";
+       description = "Auto-generated interface to Fortran BLAS";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) blas;};
+
   "blas-hs" = callPackage
     ({ mkDerivation, base, blas, storable-complex, vector }:
      mkDerivation {
@@ -39435,6 +39357,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bv_0_5" = callPackage
+    ({ mkDerivation, base, ghc-prim, integer-gmp }:
+     mkDerivation {
+       pname = "bv";
+       version = "0.5";
+       sha256 = "1nkvqwqcjl57p6ir0sllb54vbj6q0l3s3w7z3z2svxjq2ymqk884";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
+       homepage = "https://github.com/iagoabal/haskell-bv";
+       description = "Bit-vector arithmetic library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bv-little" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
      , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit
@@ -39459,12 +39396,14 @@ self: {
      }) {};
 
   "bv-sized" = callPackage
-    ({ mkDerivation, base, parameterized-utils }:
+    ({ mkDerivation, base, containers, lens, parameterized-utils }:
      mkDerivation {
        pname = "bv-sized";
-       version = "0.1.0.0";
-       sha256 = "07na5cg1w0ybydsvm4i7gdz7ghas6j7a4n8gzpd4sywfvrbirp21";
-       libraryHaskellDepends = [ base parameterized-utils ];
+       version = "0.1.1.1";
+       sha256 = "127vg7759gnwlg91dbhgqaxb62mffhvq40sjixylxyz1f3lzhqmn";
+       libraryHaskellDepends = [
+         base containers lens parameterized-utils
+       ];
        homepage = "https://github.com/benjaminselfridge/bv-sized";
        description = "a BitVector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
@@ -43206,27 +43145,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.3";
-       sha256 = "119jihcnrv197a8v6xciav7dlkq6lagwhp3bw2aviyz49bhsq1j6";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -44343,35 +44261,6 @@ self: {
      }) {};
 
   "chatwork" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
-     , data-default-class, hspec, http-api-data, http-client
-     , http-client-tls, http-types, req, servant-server, text, warp
-     }:
-     mkDerivation {
-       pname = "chatwork";
-       version = "0.1.3.0";
-       sha256 = "1b6s5f2v4qc19l2psbpwlx6nyq0285mpfl25gfv4p9xrsdmqcyr4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         http-api-data http-client http-client-tls http-types req text
-       ];
-       executableHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         http-api-data http-client http-client-tls http-types req text
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         hspec http-api-data http-client http-client-tls http-types req
-         servant-server text warp
-       ];
-       homepage = "https://github.com/matsubara0507/chatwork#readme";
-       description = "The ChatWork API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "chatwork_0_1_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
      , data-default-class, hspec, http-api-data, http-client
      , http-client-tls, http-types, req, servant-server, text, warp
@@ -44398,7 +44287,6 @@ self: {
        homepage = "https://github.com/matsubara0507/chatwork#readme";
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
@@ -45634,18 +45522,6 @@ self: {
      }) {};
 
   "clang-compilation-database" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, text }:
-     mkDerivation {
-       pname = "clang-compilation-database";
-       version = "0.1.0.0";
-       sha256 = "1nnbcx9450kppm1qsqspdj4ywjgcmfg2zicgs309hdb7kvszpdla";
-       libraryHaskellDepends = [ aeson base bytestring text ];
-       homepage = "https://github.com/lambdageek/clang-compilation-database";
-       description = "JSON Compilation Database Format encoding and decoding";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "clang-compilation-database_0_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text }:
      mkDerivation {
        pname = "clang-compilation-database";
@@ -45656,7 +45532,6 @@ self: {
        homepage = "https://github.com/lambdageek/clang-compilation-database";
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clang-pure" = callPackage
@@ -48602,6 +48477,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "comfort-array" = callPackage
+    ({ mkDerivation, base, utility-ht }:
+     mkDerivation {
+       pname = "comfort-array";
+       version = "0.0";
+       sha256 = "0mkfw2f56idh1nnmgamgazwzip6c4pmxsiaijs8k69ggzi2fb8bx";
+       libraryHaskellDepends = [ base utility-ht ];
+       homepage = "http://hub.darcs.net/thielema/comfort-array/";
+       description = "Arrays where the index type is a function of the shape type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "comfort-graph" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, semigroups
      , transformers, utility-ht
@@ -49791,14 +49678,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "concurrency_1_4_0_1" = callPackage
+  "concurrency_1_4_0_2" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.4.0.1";
-       sha256 = "17i50sxfir5nf6ldc14h6wfa03ap7z4lmihd8qpl2mb0px5ak7b9";
+       version = "1.4.0.2";
+       sha256 = "07wj25nlmry0hqxksdqrvpbg0b4r4fwzf66vfvbap9cxaqkrlxij";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -51027,24 +50914,6 @@ self: {
      }) {};
 
   "connection-pool" = callPackage
-    ({ mkDerivation, base, between, data-default-class, monad-control
-     , network, resource-pool, streaming-commons, time
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "connection-pool";
-       version = "0.2.1";
-       sha256 = "1p44p266zrcy59m74kp1hvxry0db4zjs8w408w0fpnyhnnkwar13";
-       libraryHaskellDepends = [
-         base between data-default-class monad-control network resource-pool
-         streaming-commons time transformers-base
-       ];
-       homepage = "https://github.com/trskop/connection-pool";
-       description = "Connection pool built on top of resource-pool and streaming-commons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "connection-pool_0_2_2" = callPackage
     ({ mkDerivation, base, between, data-default-class, monad-control
      , network, resource-pool, streaming-commons, time
      , transformers-base
@@ -51060,7 +50929,6 @@ self: {
        homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "connection-string" = callPackage
@@ -52137,6 +52005,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cookie_0_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, deepseq
+     , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+     , time
+     }:
+     mkDerivation {
+       pname = "cookie";
+       version = "0.4.4";
+       sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq text time
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+         text time
+       ];
+       homepage = "http://github.com/snoyberg/cookie";
+       description = "HTTP cookie parsing and rendering";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "coordinate" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, lens
      , QuickCheck, template-haskell, transformers
@@ -53577,8 +53467,8 @@ self: {
        pname = "criterion";
        version = "1.2.6.0";
        sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc";
-       revision = "1";
-       editedCabalFile = "094z5gbgnsbfwwn5qsila3bfg0dqg63zq6rmhsf973dca00b8syz";
+       revision = "2";
+       editedCabalFile = "0i5fb4g9qpar9fkbkgrd9v7ifl4277cp88qmcwxzqak4knxifba8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -53612,6 +53502,8 @@ self: {
        pname = "criterion";
        version = "1.4.0.0";
        sha256 = "0shsqq36z1q8ckic3nfb3rdbxhlb0faxl5d7ly5a4wlka4fcfrfc";
+       revision = "1";
+       editedCabalFile = "056p7d95ynrpsm5jr479r9xk7ksniqkz4bza0zdn9a8vmrx591qh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -54430,8 +54322,8 @@ self: {
        pname = "cryptoids";
        version = "0.5.0.0";
        sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2";
-       revision = "3";
-       editedCabalFile = "0px43xzijabkf727gfza6nm3p8v8higa9nl71vvadvyp7jm4hbnl";
+       revision = "4";
+       editedCabalFile = "1lghn17a367cvljsc8kddn11qd30nz6a6dl4128xbc6p0bf41pzj";
        libraryHaskellDepends = [
          base binary bytestring cryptoids-class cryptoids-types cryptonite
          directory exceptions filepath memory
@@ -54446,8 +54338,8 @@ self: {
        pname = "cryptoids-class";
        version = "0.0.0";
        sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy";
-       revision = "2";
-       editedCabalFile = "1y2qav6izihivhxzv8fn4d7vrp0cvbfv84k8l4x6av6iwfbak5s8";
+       revision = "3";
+       editedCabalFile = "1hcdhmksd81sylfjyx0wb4yhrswdwbjlaarq8fbmwcl7fjm4sxfy";
        libraryHaskellDepends = [ base cryptoids-types exceptions ];
        description = "Typeclass-based interface to cryptoids";
        license = stdenv.lib.licenses.bsd3;
@@ -55098,27 +54990,6 @@ self: {
      }) {};
 
   "cuda" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
-     , pretty, template-haskell
-     }:
-     mkDerivation {
-       pname = "cuda";
-       version = "0.9.0.1";
-       sha256 = "1ldn1jd12kisx6dgz5q50l6hx5aqakwj9vq2fbnx21ri309vlyq8";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         base bytestring filepath template-haskell
-       ];
-       libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/tmcdonell/cuda";
-       description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cuda_0_9_0_2" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
      , pretty, template-haskell
      }:
@@ -55137,7 +55008,6 @@ self: {
        homepage = "https://github.com/tmcdonell/cuda";
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cudd" = callPackage
@@ -57673,25 +57543,6 @@ self: {
      }) {};
 
   "data-serializer" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cereal, data-endian
-     , parsers, semigroups, split, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "data-serializer";
-       version = "0.3.2";
-       sha256 = "055a4kqwg6cqx9a58i7m59jp70s4mmm2q73wa78jzp87lnh2646l";
-       libraryHaskellDepends = [
-         base binary bytestring cereal data-endian parsers semigroups split
-       ];
-       testHaskellDepends = [
-         base binary bytestring cereal tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/mvv/data-serializer";
-       description = "Common API for serialization libraries";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-serializer_0_3_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, data-endian
      , parsers, semigroups, split, tasty, tasty-quickcheck
      }:
@@ -57708,7 +57559,6 @@ self: {
        homepage = "https://github.com/mvv/data-serializer";
        description = "Common API for serialization libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-size" = callPackage
@@ -59655,14 +59505,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_3_0_1" = callPackage
+  "dejafu_1_3_1_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, profunctors, random, ref-fd, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.0.1";
-       sha256 = "1qw5ab57fa3phidfzslymxxxi29vcbssc6g8rk9pv07ah6hpccn5";
+       version = "1.3.1.0";
+       sha256 = "09c2gsgqxnr9kpkhbz4g1wrl66qy02vp3sckp8vsg194r5xx4s1b";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
          profunctors random ref-fd transformers
@@ -63680,29 +63530,6 @@ self: {
      }) {};
 
   "dns" = callPackage
-    ({ mkDerivation, async, attoparsec, auto-update, base
-     , base64-bytestring, binary, bytestring, conduit, conduit-extra
-     , containers, cryptonite, doctest, hspec, iproute, mtl, network
-     , psqueues, QuickCheck, safe, time, word8
-     }:
-     mkDerivation {
-       pname = "dns";
-       version = "3.0.1";
-       sha256 = "1aq8n0qglvx134fl8ry1liw7kpw7flm631s9qb7is7bw510wgdd6";
-       libraryHaskellDepends = [
-         async attoparsec auto-update base base64-bytestring binary
-         bytestring conduit conduit-extra containers cryptonite iproute mtl
-         network psqueues safe time
-       ];
-       testHaskellDepends = [
-         base bytestring doctest hspec iproute QuickCheck word8
-       ];
-       testTarget = "spec";
-       description = "DNS library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dns_3_0_2" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base
      , base64-bytestring, binary, bytestring, conduit, conduit-extra
      , containers, cryptonite, doctest, hspec, iproute, mtl, network
@@ -63723,7 +63550,6 @@ self: {
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnscache" = callPackage
@@ -64121,6 +63947,8 @@ self: {
        pname = "doctest";
        version = "0.14.1";
        sha256 = "1phnrsh2gjls54mlpqhfjs0x003jbrsz1sijy107mbg2gnck9cfj";
+       revision = "1";
+       editedCabalFile = "12ypn6bk87kmqfsyy8950zpyl4h45rnkyxsh2i5sbyx4rjq3kwk6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64142,7 +63970,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover" = callPackage
+  "doctest-discover_0_1_0_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
@@ -64166,6 +63994,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doctest-discover" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
+     , filepath
+     }:
+     mkDerivation {
+       pname = "doctest-discover";
+       version = "0.1.0.9";
+       sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring directory doctest filepath
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring directory doctest filepath
+       ];
+       testHaskellDepends = [ base doctest ];
+       doHaddock = false;
+       homepage = "http://github.com/karun012/doctest-discover";
+       description = "Easy way to run doctests via cabal";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover-configurator" = callPackage
     ({ mkDerivation, base, bytestring, configurator, directory, doctest
      , filepath
@@ -67926,23 +67778,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.3.2.2";
-       sha256 = "1nwa97cnf04mapk6r5fr3bjzjb5gyfn0nmhz4a2x0p2ci01hrida";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       homepage = "https://github.com/Porges/email-validate-hs";
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_2_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -67957,7 +67792,6 @@ self: {
        homepage = "https://github.com/Porges/email-validate-hs";
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -70656,15 +70490,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "exceptions_0_9_0" = callPackage
+  "exceptions_0_10_0" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "exceptions";
-       version = "0.9.0";
-       sha256 = "1k66qq82srx62hmfqis5x7p2cjyq218rg9xks2sl960x5p4jvl8g";
+       version = "0.10.0";
+       sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
        libraryHaskellDepends = [
          base mtl stm template-haskell transformers transformers-compat
        ];
@@ -71345,27 +71179,6 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim
-     , hashable, lens, monad-skeleton, mtl, primitive, profunctors
-     , QuickCheck, semigroups, StateVar, tagged, template-haskell
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "extensible";
-       version = "0.4.7.1";
-       sha256 = "04gb1havami26mkwdr9vbqs28r1rc9ggd9xxcaf6zw9s5z2hvr5a";
-       libraryHaskellDepends = [
-         base comonad constraints deepseq ghc-prim hashable monad-skeleton
-         mtl primitive profunctors QuickCheck semigroups StateVar tagged
-         template-haskell transformers vector
-       ];
-       testHaskellDepends = [ base lens QuickCheck template-haskell ];
-       homepage = "https://github.com/fumieval/extensible";
-       description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extensible_0_4_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, comonad
      , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
      , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar
@@ -71386,7 +71199,6 @@ self: {
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-data" = callPackage
@@ -73727,8 +73539,8 @@ self: {
        pname = "filepath-crypto";
        version = "0.1.0.0";
        sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
-       revision = "2";
-       editedCabalFile = "00wjrwssdz98v2hafq271132bs766npgycqd5v2b5k0cd3mdk9lv";
+       revision = "4";
+       editedCabalFile = "11ch90kp5qlbhswjf7px1n0rhffn1hwsx7l0p7vpcdnwdkixb414";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive cryptoids cryptoids-class
          cryptoids-types exceptions filepath sandi template-haskell
@@ -74413,12 +74225,27 @@ self: {
        pname = "fixed-vector";
        version = "1.0.0.0";
        sha256 = "1y2250frzbx750jpp9qslmhfjdx9bn8aariwng3py3kz392p7x3g";
+       revision = "1";
+       editedCabalFile = "02ig2q9jn2lnf9w2cap5fjjslix928zg5dc40pab8pjb7qzlb6wy";
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed-vector_1_1_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
+     mkDerivation {
+       pname = "fixed-vector";
+       version = "1.1.0.0";
+       sha256 = "1iclmv1xkyr1wdszrahzdim6ilqvpxrhpsiammcxishg9gwvxl0y";
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [ base doctest filemanip primitive ];
+       description = "Generic vectors with statically known size";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-vector-binary" = callPackage
     ({ mkDerivation, base, binary, fixed-vector, tasty
      , tasty-quickcheck
@@ -76896,6 +76723,8 @@ self: {
        pname = "free";
        version = "4.12.4";
        sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9";
+       revision = "1";
+       editedCabalFile = "17ymahpfjf3ychrl9f6vhqy5637sc9k019v8b7wp0ydg6b61znmg";
        libraryHaskellDepends = [
          base bifunctors comonad containers distributive exceptions mtl
          prelude-extras profunctors semigroupoids semigroups
@@ -76916,6 +76745,8 @@ self: {
        pname = "free";
        version = "5.0.1";
        sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p";
+       revision = "1";
+       editedCabalFile = "0d6wzbazlw9yamka4p01scqypl6kcg2kzh00amim40wx6f4sdyqj";
        libraryHaskellDepends = [
          base bifunctors comonad containers distributive exceptions mtl
          profunctors semigroupoids semigroups template-haskell transformers
@@ -76962,8 +76793,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.8.3";
-       sha256 = "01qf4bbmp86c5i429fa440brb62py51afg74xrh31yzddw1iwszp";
+       version = "0.8.4";
+       sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -81120,6 +80951,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint_0_5_6_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.5.6.1";
+       sha256 = "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath free ghc ghc-boot
+         ghc-paths mtl syb
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -81728,19 +81583,17 @@ self: {
      }) {};
 
   "ghc-typelits-presburger" = callPackage
-    ({ mkDerivation, base, equational-reasoning, ghc
-     , ghc-tcplugins-extra, presburger, reflection
+    ({ mkDerivation, base, containers, equational-reasoning, ghc
+     , ghc-tcplugins-extra, pretty, reflection
      }:
      mkDerivation {
        pname = "ghc-typelits-presburger";
-       version = "0.1.1.1";
-       sha256 = "0h02yim6qif49f3z853mzhmrgj9g6wik07qm3ddjcgn96sp7pylw";
-       revision = "1";
-       editedCabalFile = "1ilb7z5ci960qbxi26a03v80ply6qdgh3jzk20ipsykn5nf05in8";
+       version = "0.2.0.0";
+       sha256 = "0wxcvi71hkjyjlnpwnfph04jffy595qwlqgwylqp377glyz1vgs7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base equational-reasoning ghc ghc-tcplugins-extra presburger
+         base containers equational-reasoning ghc ghc-tcplugins-extra pretty
          reflection
        ];
        homepage = "https://github.com/konn/ghc-typelits-presburger#readme";
@@ -83905,6 +83758,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_1_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.1.5";
+       sha256 = "04248cgs4wi348c9v6qdn6yhyrg8mmdq75nib4rpr795sk1gvdfb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -87159,8 +87034,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-server-api";
-       version = "0.2.0.0";
-       sha256 = "1hwaxvmz3x4dhdzsfz1gjnp34jyln875bjwapvj885v1vis5jyk1";
+       version = "0.2.0.1";
+       sha256 = "0d07flz3vpdyq4ifldp466zhj19ll7zlcnwn0ns47d72r79wghiw";
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
          http-api-data http-client http-client-tls mime-mail monad-control
@@ -88766,26 +88641,6 @@ self: {
      }) {};
 
   "groundhog" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, containers, monad-control, mtl
-     , resourcet, scientific, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "groundhog";
-       version = "0.8";
-       sha256 = "075ga5yiyrd0if1v9j4nw8c76gpgnkidkk0s1d082x3k8vz5v58n";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         containers monad-control mtl resourcet scientific text time
-         transformers transformers-base
-       ];
-       homepage = "http://github.com/lykahb/groundhog";
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, containers, monad-control, mtl
      , resourcet, safe-exceptions, scientific, text, time, transformers
@@ -88803,7 +88658,6 @@ self: {
        homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -88850,23 +88704,6 @@ self: {
      }) {};
 
   "groundhog-mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, groundhog
-     , monad-control, monad-logger, mysql, mysql-simple, resource-pool
-     , resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "groundhog-mysql";
-       version = "0.8";
-       sha256 = "0rjn91ncl3mwhb4y8ws6bjrwayjyncrfafikykzq200i2gjqpbai";
-       libraryHaskellDepends = [
-         base bytestring containers groundhog monad-control monad-logger
-         mysql mysql-simple resource-pool resourcet text time transformers
-       ];
-       description = "MySQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-mysql_0_8_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, groundhog
      , monad-control, monad-logger, mysql, mysql-simple, resource-pool
      , resourcet, text, time, transformers
@@ -88881,29 +88718,9 @@ self: {
        ];
        description = "MySQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-postgresql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
-     , containers, groundhog, monad-control, postgresql-libpq
-     , postgresql-simple, resource-pool, resourcet, text, time
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "groundhog-postgresql";
-       version = "0.8.0.1";
-       sha256 = "1s4m1g14jv88qxb2ynj92agjf3z2sa8xibgjgvwn7p3hn4zz73md";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder bytestring containers groundhog
-         monad-control postgresql-libpq postgresql-simple resource-pool
-         resourcet text time transformers vector
-       ];
-       description = "PostgreSQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-postgresql_0_8_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -88920,27 +88737,9 @@ self: {
        ];
        description = "PostgreSQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-sqlite" = callPackage
-    ({ mkDerivation, base, bytestring, containers, direct-sqlite
-     , groundhog, monad-control, resource-pool, resourcet, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "groundhog-sqlite";
-       version = "0.8";
-       sha256 = "14ih528kqq22qf890r74j1achddml8aaa24nqa5l0f4vrx5vvjvx";
-       libraryHaskellDepends = [
-         base bytestring containers direct-sqlite groundhog monad-control
-         resource-pool resourcet text transformers unordered-containers
-       ];
-       description = "Sqlite3 backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-sqlite_0_8_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, direct-sqlite
      , groundhog, monad-control, resource-pool, resourcet, text
      , transformers, unordered-containers
@@ -88955,7 +88754,6 @@ self: {
        ];
        description = "Sqlite3 backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-th" = callPackage
@@ -89030,22 +88828,6 @@ self: {
      }) {};
 
   "grouped-list" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, pointed
-     , QuickCheck, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "grouped-list";
-       version = "0.2.1.4";
-       sha256 = "171n9mc7y3sxkcg1yx02c3snag13rkzf8n06fbc5ny7g15a8p79h";
-       libraryHaskellDepends = [ base containers deepseq pointed ];
-       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "grouped-list_0_2_1_5" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, pointed
      , QuickCheck, tasty, tasty-quickcheck
      }:
@@ -89059,7 +88841,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -93243,33 +93024,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.2";
-       sha256 = "0qabrvx93l8wmir4a0rg2iddsal455fx34vvdxj1ngbya25fspw4";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_3" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -93294,7 +93048,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -94561,34 +94314,6 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
-     , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, unix
-     }:
-     mkDerivation {
-       pname = "hashable";
-       version = "1.2.6.1";
-       sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
-       revision = "2";
-       editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim integer-gmp text
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim HUnit QuickCheck random test-framework
-         test-framework-hunit test-framework-quickcheck2 text unix
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion ghc-prim integer-gmp siphash text
-       ];
-       homepage = "http://github.com/tibbe/hashable";
-       description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashable_1_2_7_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
      , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, unix
@@ -94612,7 +94337,6 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -101402,8 +101126,8 @@ self: {
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.8.1.2";
-       sha256 = "1avyf8xz4wkv6xijg3wrj0398wy5jcwlp50iil1z8jdlfwh72f18";
+       version = "1.8.1.3";
+       sha256 = "17ix7j2q1iawf152lips74pp9qb0j412k8zdliv588xz2a9hijk0";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -107577,34 +107301,6 @@ self: {
      }) {};
 
   "hprotoc" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, filepath, haskell-src-exts, mtl, parsec
-     , protocol-buffers, protocol-buffers-descriptor, utf8-string
-     }:
-     mkDerivation {
-       pname = "hprotoc";
-       version = "2.4.7";
-       sha256 = "0rbifp2n2vb2bhk8wgdkmp0q2dqv7vlcwsqgpl8b7xhkfn706ps5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         haskell-src-exts mtl parsec protocol-buffers
-         protocol-buffers-descriptor utf8-string
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         haskell-src-exts mtl parsec protocol-buffers
-         protocol-buffers-descriptor utf8-string
-       ];
-       executableToolDepends = [ alex ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hprotoc_2_4_8" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, filepath, haskell-src-exts, mtl, parsec
      , protocol-buffers, protocol-buffers-descriptor, utf8-string
@@ -107630,7 +107326,6 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -112102,23 +111797,6 @@ self: {
      }) {};
 
   "hsyslog-udp" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "hsyslog-udp";
-       version = "0.2.0";
-       sha256 = "0z4jpgdp5brfpzw5xawwxx7i239xjxgr1rjvrv2fyd6d6ixg3gwl";
-       libraryHaskellDepends = [
-         base bytestring hsyslog network text time unix
-       ];
-       testHaskellDepends = [ base hspec time ];
-       homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
-       description = "Log to syslog over a network via UDP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsyslog-udp_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
      , time, unix
      }:
@@ -112133,7 +111811,6 @@ self: {
        homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hszephyr" = callPackage
@@ -114075,12 +113752,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_1_0_1" = callPackage
+  "hunit-dejafu_1_1_0_2" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.1.0.1";
-       sha256 = "16jaq5wxh2gzkj2kacb5zv9w8y7a75fm0acj7r2sspwg4d7kkmar";
+       version = "1.1.0.2";
+       sha256 = "1r6i135dj3kn2sx49asy2k0i88vfb13z7giyzj1qs8m8cfx2pi89";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -119117,27 +118794,6 @@ self: {
      }) {};
 
   "integer-logarithms" = callPackage
-    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
-     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "integer-logarithms";
-       version = "1.0.2";
-       sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii";
-       revision = "1";
-       editedCabalFile = "0sccd0d6qrcm3a7nni5lqv40g5m5knf965z4skkgbyyhb3z6qsq8";
-       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
-       testHaskellDepends = [
-         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       homepage = "https://github.com/phadej/integer-logarithms";
-       description = "Integer logarithms";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "integer-logarithms_1_0_2_1" = callPackage
     ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck
@@ -119154,7 +118810,6 @@ self: {
        homepage = "https://github.com/phadej/integer-logarithms";
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-pure" = callPackage
@@ -120460,8 +120115,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234";
-       revision = "6";
-       editedCabalFile = "0fcgif6mcmp97plvvf1daiizwg2h9bniya50ldfd6ya932yh8b3c";
+       revision = "7";
+       editedCabalFile = "01mvdqabbxa68abq49s2kwpl0y8gb6lf258jjg7w098f5v0p4m36";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -123224,6 +122879,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-stream_0_4_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, hspec
+     , QuickCheck, quickcheck-unicode, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-stream";
+       version = "0.4.2.0";
+       sha256 = "06y8q95vyavcbvq5z4zh50jn3djhlj1xq7yv8dns7gxfc5fvdndy";
+       libraryHaskellDepends = [
+         aeson base bytestring scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
+         scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/ondrap/json-stream";
+       description = "Incremental applicative JSON parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-togo" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base
      , bytestring, scientific, text, transformers, unordered-containers
@@ -124392,39 +124069,6 @@ self: {
      }) {};
 
   "katip-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, async, base, bloodhound, bytestring
-     , containers, criterion, deepseq, enclosed-exceptions, exceptions
-     , http-client, http-types, katip, lens, lens-aeson
-     , quickcheck-instances, random, retry, scientific, stm, stm-chans
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "katip-elasticsearch";
-       version = "0.4.0.4";
-       sha256 = "0zg0f5czqff9zd0rnkj68bmxmizrl01q4wbvz43hj5j8mj0jzybj";
-       libraryHaskellDepends = [
-         aeson async base bloodhound bytestring enclosed-exceptions
-         exceptions http-client http-types katip retry scientific stm
-         stm-chans text time transformers unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base bloodhound bytestring containers http-client http-types
-         katip lens lens-aeson quickcheck-instances scientific stm tagged
-         tasty tasty-hunit tasty-quickcheck text time transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bloodhound criterion deepseq random text
-         unordered-containers uuid
-       ];
-       homepage = "https://github.com/Soostone/katip";
-       description = "ElasticSearch scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "katip-elasticsearch_0_4_1_0" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, bytestring
      , containers, criterion, deepseq, enclosed-exceptions, exceptions
      , http-client, http-types, katip, lens, lens-aeson
@@ -127414,26 +127058,6 @@ self: {
      }) {};
 
   "language-java" = callPackage
-    ({ mkDerivation, alex, array, base, cpphs, directory, filepath
-     , HUnit, mtl, parsec, pretty, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "language-java";
-       version = "0.2.8";
-       sha256 = "0ry3x4riqyjr2bwrk64992aw2g7jxzrsk8f291iby62bkq49wy0b";
-       libraryHaskellDepends = [ array base cpphs parsec pretty ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         base directory filepath HUnit mtl QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://github.com/vincenthz/language-java";
-       description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-java_0_2_9" = callPackage
     ({ mkDerivation, alex, array, base, directory, filepath, mtl
      , parsec, pretty, tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -127449,7 +127073,6 @@ self: {
        homepage = "http://github.com/vincenthz/language-java";
        description = "Java source manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-java-classfile" = callPackage
@@ -128025,6 +127648,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lapack" = callPackage
+    ({ mkDerivation, base, blas-ffi, comfort-array, lapack-ffi
+     , netlib-ffi, non-empty, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "lapack";
+       version = "0.0";
+       sha256 = "04g5w3gdq4x7vkaw6x36xad7hjmah3iynqnp6xncac31ykkmbwgl";
+       libraryHaskellDepends = [
+         base blas-ffi comfort-array lapack-ffi netlib-ffi non-empty
+         transformers utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/lapack/";
+       description = "Numerical Linear Algebra using LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lapack-carray" = callPackage
     ({ mkDerivation, base, carray, lapack-ffi, netlib-carray
      , netlib-ffi, storable-complex, transformers
@@ -128043,6 +127683,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lapack-carray_0_0_1" = callPackage
+    ({ mkDerivation, base, carray, lapack-ffi, netlib-carray
+     , netlib-ffi, storable-complex, transformers
+     }:
+     mkDerivation {
+       pname = "lapack-carray";
+       version = "0.0.1";
+       sha256 = "0f6d9g69a64wwyanwdq2ny3ga2ci0g2hingxv3w52w0xisx00apj";
+       libraryHaskellDepends = [
+         base carray lapack-ffi netlib-carray netlib-ffi storable-complex
+         transformers
+       ];
+       homepage = "http://hub.darcs.net/thielema/lapack-carray/";
+       description = "Auto-generated interface to Fortran LAPACK via CArrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lapack-ffi" = callPackage
     ({ mkDerivation, base, liblapack, netlib-ffi }:
      mkDerivation {
@@ -128057,6 +127715,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) liblapack;};
 
+  "lapack-ffi_0_0_1" = callPackage
+    ({ mkDerivation, base, liblapack, netlib-ffi }:
+     mkDerivation {
+       pname = "lapack-ffi";
+       version = "0.0.1";
+       sha256 = "1bxp1lb0nwbc8xswxd2p0l30mfjq5xa1bwy9pkgpp3anww84l0bh";
+       libraryHaskellDepends = [ base netlib-ffi ];
+       libraryPkgconfigDepends = [ liblapack ];
+       homepage = "http://hub.darcs.net/thielema/lapack-ffi/";
+       description = "Auto-generated interface to Fortran LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) liblapack;};
+
   "lapack-ffi-tools" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers
      , explicit-exception, filepath, non-empty, optparse-applicative
@@ -128080,6 +127752,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lapack-ffi-tools_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers
+     , explicit-exception, filepath, non-empty, optparse-applicative
+     , parsec, pathtype, transformers, unordered-containers, utility-ht
+     , vector
+     }:
+     mkDerivation {
+       pname = "lapack-ffi-tools";
+       version = "0.1";
+       sha256 = "1x5sv2b4rkglqqgpl44mprwxkkycnv48d5s526m3wmvxzdgz7adz";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base bytestring cassava containers explicit-exception filepath
+         non-empty optparse-applicative parsec pathtype transformers
+         unordered-containers utility-ht vector
+       ];
+       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
+       description = "Generator for Haskell interface to Fortran LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "large-hashable" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
      , bytestring, cereal, containers, cryptohash, deepseq, hashable
@@ -130234,6 +129930,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "libmpd_0_9_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, filepath, hspec, mtl, network, old-locale
+     , QuickCheck, text, time, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "libmpd";
+       version = "0.9.0.8";
+       sha256 = "0kpdj4ciwrfd6vmr60y7c276h5z2r40avs26a0x8s51rbr00lasq";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class filepath
+         mtl network old-locale text time utf8-string
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers data-default-class filepath
+         hspec mtl network old-locale QuickCheck text time unix utf8-string
+       ];
+       homepage = "http://github.com/vimus/libmpd-haskell#readme";
+       description = "An MPD client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "libnotify" = callPackage
     ({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
      mkDerivation {
@@ -133600,25 +133319,6 @@ self: {
      }) {};
 
   "logging-effect-extra-handler" = callPackage
-    ({ mkDerivation, base, exceptions, logging-effect, time
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect-extra-handler";
-       version = "1.1.2";
-       sha256 = "1688vdlzyy8ikz2r96czyk0ganpv6h37x02sp930fmrj2qlwbvql";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base exceptions logging-effect time wl-pprint-text
-       ];
-       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
-       description = "Handy logging handler combinators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-effect-extra-handler_1_1_3" = callPackage
     ({ mkDerivation, base, exceptions, logging-effect, time
      , wl-pprint-text
      }:
@@ -133635,7 +133335,6 @@ self: {
        homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -143209,38 +142908,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, http-client, http-client-tls
-     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
-     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.15";
-       sha256 = "04s58nb4ycfp679saj50wmxgszjrp479dp378wd982534jrglxyh";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page optparse-applicative text text-format
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_16" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, http-client, http-client-tls
      , microlens, microlens-mtl, mtl, optparse-applicative, pipes
@@ -143270,7 +142937,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -147072,6 +146738,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "netlib-carray_0_0_1" = callPackage
+    ({ mkDerivation, base, carray, netlib-ffi, transformers }:
+     mkDerivation {
+       pname = "netlib-carray";
+       version = "0.0.1";
+       sha256 = "061cn2k8in7j0izbar7xj86ksls8a1zxyf3ngkg19dwwjwfvn4yh";
+       libraryHaskellDepends = [ base carray netlib-ffi transformers ];
+       homepage = "http://hub.darcs.net/thielema/netlib-carray/";
+       description = "Helper modules for CArray wrappers to BLAS and LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netlib-ffi" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -147084,6 +146763,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "netlib-ffi_0_0_1" = callPackage
+    ({ mkDerivation, base, storable-complex, transformers }:
+     mkDerivation {
+       pname = "netlib-ffi";
+       version = "0.0.1";
+       sha256 = "1v973ibi6jsv09q3n9bmyavv9wqvnljzr9nrvf4pbi6p5l2kyjnw";
+       libraryHaskellDepends = [ base storable-complex transformers ];
+       homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
+       description = "Helper modules for FFI to BLAS and LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netlines" = callPackage
     ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF
      , random, text, time
@@ -147332,18 +147024,6 @@ self: {
      }) {};
 
   "netwire-input" = callPackage
-    ({ mkDerivation, base, netwire }:
-     mkDerivation {
-       pname = "netwire-input";
-       version = "0.0.6";
-       sha256 = "13mq1pxp844brqi6pkgjprcgwdgc8xsx6zhjxzm7311mf4iwa12a";
-       libraryHaskellDepends = [ base netwire ];
-       homepage = "https://www.github.com/Mokosha/netwire-input";
-       description = "Input handling abstractions for netwire";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "netwire-input_0_0_7" = callPackage
     ({ mkDerivation, base, deepseq, netwire }:
      mkDerivation {
        pname = "netwire-input";
@@ -147353,7 +147033,6 @@ self: {
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire-input-glfw" = callPackage
@@ -149565,14 +149244,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "nonce_1_0_6" = callPackage
+  "nonce_1_0_7" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
      , transformers, unliftio, unliftio-core
      }:
      mkDerivation {
        pname = "nonce";
-       version = "1.0.6";
-       sha256 = "0nnx295vvkq0yygq8g5n6l167zaj0rdflf71hwph4clr4isk9dwn";
+       version = "1.0.7";
+       sha256 = "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb";
        libraryHaskellDepends = [
          base base64-bytestring bytestring entropy text transformers
          unliftio unliftio-core
@@ -154161,6 +153840,8 @@ self: {
        pname = "pandoc";
        version = "2.1.2";
        sha256 = "0rgba2vfh2n7kh2g75hmxa6pbjk6p73a4zwj00pfsvhwyvpjc2yw";
+       revision = "1";
+       editedCabalFile = "1vk5g5dbk7q8w9pncqgkn4wbdj83p20ca6ipb5vca532x2294x5b";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -156745,8 +156426,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcg-random";
-       version = "0.1.3.4";
-       sha256 = "1bl9dp7p0pxy886z36flh6f3a3w48f44k8iwci1v37x3fl4cbzj1";
+       version = "0.1.3.5";
+       sha256 = "1920g1babivacds27m0gbjs9mylwiknjykvbrpagzq7r0n4gyhyy";
        libraryHaskellDepends = [
          base bytestring entropy primitive random
        ];
@@ -158257,30 +157938,6 @@ self: {
      }) {};
 
   "persistent-template" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.5.3.1";
-       sha256 = "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-template_2_5_4" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
      , path-pieces, persistent, QuickCheck, tagged, template-haskell
@@ -158290,6 +157947,8 @@ self: {
        pname = "persistent-template";
        version = "2.5.4";
        sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc";
+       revision = "1";
+       editedCabalFile = "18mjv4z29cbrqjrsk2gm4bbc988437v8zxc5dynhj99fzjxzs9yr";
        libraryHaskellDepends = [
          aeson aeson-compat base bytestring containers ghc-prim
          http-api-data monad-control monad-logger path-pieces persistent
@@ -158301,7 +157960,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -159935,6 +159593,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-extras_1_0_13" = callPackage
+    ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework
+     , test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-extras";
+       version = "1.0.13";
+       sha256 = "04adszpz02a72zz8kjj9lcw62n296p74rq4xds3b8g345m6c51g1";
+       libraryHaskellDepends = [ base foldl lens pipes transformers ];
+       testHaskellDepends = [
+         base HUnit pipes test-framework test-framework-hunit transformers
+       ];
+       description = "Extra utilities for pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-fastx" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring
@@ -160376,8 +160051,8 @@ self: {
        pname = "pipes-s3";
        version = "0.3.0.3";
        sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
-       revision = "1";
-       editedCabalFile = "1hm2wwz8qz67hpwp5gfpp1rnz864z8pnn4ii5n35phhy9vg67dlz";
+       revision = "2";
+       editedCabalFile = "1sm1s8paqyh4d05179lfbjix5irc6j7ryrir5s29xpjxslanl01x";
        libraryHaskellDepends = [
          aws base bytestring http-client http-client-tls http-types pipes
          pipes-bytestring pipes-safe resourcet text transformers
@@ -166172,23 +165847,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.7";
-       sha256 = "1db2r961qmrcvcqs53imjw16cawn7hjcicxhygszk0mg538v7rh9";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_8" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
      }:
@@ -166203,25 +165861,9 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
-    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
-     mkDerivation {
-       pname = "protocol-buffers-descriptor";
-       version = "2.4.7";
-       sha256 = "1k11bgwg2345y4a7ib6h3410y6088whlxc6s9iy0whpbkhwi7lq0";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers protocol-buffers
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers-descriptor_2_4_8" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
@@ -166234,7 +165876,6 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -168563,30 +168204,6 @@ self: {
      }) {};
 
   "quickcheck-instances" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring
-     , case-insensitive, containers, hashable, old-time, QuickCheck
-     , scientific, tagged, text, time, transformers, transformers-compat
-     , unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "quickcheck-instances";
-       version = "0.3.16.1";
-       sha256 = "01v5bs7r9yvhkvb4yc9bqnacy8r6cy2gr9lnmwx40n5apgi0gcbz";
-       libraryHaskellDepends = [
-         array base base-compat bytestring case-insensitive containers
-         hashable old-time QuickCheck scientific tagged text time
-         transformers transformers-compat unordered-containers uuid-types
-         vector
-       ];
-       testHaskellDepends = [
-         base containers QuickCheck tagged uuid-types
-       ];
-       homepage = "https://github.com/phadej/qc-instances";
-       description = "Common quickcheck instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-instances_0_3_18" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
      , scientific, tagged, text, time, transformers, transformers-compat
@@ -168608,7 +168225,6 @@ self: {
        homepage = "https://github.com/phadej/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-io" = callPackage
@@ -169646,31 +169262,6 @@ self: {
      }) {};
 
   "rakuten" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, constraints
-     , data-default-class, extensible, hspec, http-api-data, http-client
-     , http-client-tls, http-types, lens, req, servant-server, text
-     , unordered-containers, warp
-     }:
-     mkDerivation {
-       pname = "rakuten";
-       version = "0.1.0.5";
-       sha256 = "1197vkml0pvrdqvh55bvsb52rzqfj6p6vrpihr5ci7flp4h9wkp1";
-       libraryHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible http-api-data http-client http-client-tls http-types
-         lens req text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible hspec http-api-data http-client http-client-tls
-         http-types lens req servant-server text unordered-containers warp
-       ];
-       homepage = "https://github.com/matsubara0507/rakuten#readme";
-       description = "The Rakuten API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rakuten_0_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, constraints
      , data-default-class, extensible, hspec, http-api-data, http-client
      , http-client-tls, http-types, lens, req, servant-server, text
@@ -169693,7 +169284,6 @@ self: {
        homepage = "https://github.com/matsubara0507/rakuten#readme";
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -170566,15 +170156,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "ratel_1_0_1" = callPackage
+  "ratel_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
      }:
      mkDerivation {
        pname = "ratel";
-       version = "1.0.1";
-       sha256 = "1cspvwnq7v0ngxlc0w0f2fv14m3ndi8nkvcglygbac454nlka12s";
+       version = "1.0.2";
+       sha256 = "0mwgnz8s0xpyggdxpakij66fmkdhvc6ra00h451pwy3f3m3g6vpy";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers http-client
          http-client-tls http-types text uuid
@@ -178163,6 +177753,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy_0_9_4" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
+     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
+     , tasty-quickcheck, template-haskell, text, time, vector
+     }:
+     mkDerivation {
+       pname = "safecopy";
+       version = "0.9.4";
+       sha256 = "1zss1k1yxa8gky9vx1w8bb8lkbz0nrwzq5n0rhmxary49nhp31n1";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers old-time template-haskell
+         text time vector
+       ];
+       testHaskellDepends = [
+         array base cereal containers lens lens-action QuickCheck
+         quickcheck-instances tasty tasty-quickcheck template-haskell time
+         vector
+       ];
+       homepage = "https://github.com/acid-state/safecopy";
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safecopy-migrate" = callPackage
     ({ mkDerivation, base, base-prelude, cereal, containers, extra
      , haskell-src-meta, microlens, safecopy, template-haskell, uniplate
@@ -178937,33 +178551,6 @@ self: {
      }) {};
 
   "sbp" = callPackage
-    ({ mkDerivation, aeson, array, base, base64-bytestring
-     , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , resourcet, tasty, tasty-hunit, template-haskell, text, yaml
-     }:
-     mkDerivation {
-       pname = "sbp";
-       version = "2.3.6";
-       sha256 = "05n81l73r1w39cwrjyapwddhq9fcgj22cpn2y5ccjk7mj72jknhk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
-         text
-       ];
-       executableHaskellDepends = [
-         aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet yaml
-       ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       homepage = "https://github.com/swift-nav/libsbp";
-       description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "sbp_2_3_9" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -178988,7 +178575,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -180318,14 +179904,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
-  "sdl2_2_4_0" = callPackage
+  "sdl2_2_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
      , StateVar, text, transformers, vector
      }:
      mkDerivation {
        pname = "sdl2";
-       version = "2.4.0";
-       sha256 = "1wnkr4p58yrhzfkn2f2x4km4pnnwb9rmj0r0m0fflx4407cb1hf4";
+       version = "2.4.0.1";
+       sha256 = "0kb4nl653b0p7bcv9h4b2bhpgdb49v2d49ri3cs4yykdrl58v2cs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -182946,32 +182532,6 @@ self: {
      }) {};
 
   "servant-kotlin" = callPackage
-    ({ mkDerivation, aeson, base, containers, directory, formatting
-     , hspec, http-api-data, lens, servant, servant-foreign, shelly
-     , text, time, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-kotlin";
-       version = "0.1.0.3";
-       sha256 = "1idki7vf2yph8sndpl8r9a5cngix3163yxb73l5l5fm9a78pk5gd";
-       libraryHaskellDepends = [
-         base containers directory formatting lens servant servant-foreign
-         text time wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base containers directory formatting hspec http-api-data lens
-         servant servant-foreign text time wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base containers directory formatting http-api-data lens
-         servant servant-foreign shelly text time wl-pprint-text
-       ];
-       homepage = "https://github.com/matsubara0507/servant-kotlin#readme";
-       description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-kotlin_0_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, formatting
      , hspec, http-api-data, lens, servant, servant-foreign, shelly
      , text, time, wl-pprint-text
@@ -182995,7 +182555,6 @@ self: {
        homepage = "https://github.com/matsubara0507/servant-kotlin#readme";
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -185535,36 +185094,6 @@ self: {
      }) {};
 
   "shelly" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , enclosed-exceptions, exceptions, filepath, hspec, HUnit
-     , lifted-async, lifted-base, monad-control, mtl, process
-     , system-fileio, system-filepath, text, time, transformers
-     , transformers-base, unix-compat
-     }:
-     mkDerivation {
-       pname = "shelly";
-       version = "1.7.0.1";
-       sha256 = "0a4ngy8jqcscqhimgiyz7f9kqm23is7x7gyjxr0j6iq1dy57ahq3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions lifted-async lifted-base monad-control mtl process
-         system-fileio system-filepath text time transformers
-         transformers-base unix-compat
-       ];
-       testHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions filepath hspec HUnit lifted-async lifted-base
-         monad-control mtl process system-fileio system-filepath text time
-         transformers transformers-base unix-compat
-       ];
-       homepage = "https://github.com/yesodweb/Shelly.hs";
-       description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shelly_1_7_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, filepath, hspec, HUnit
      , lifted-async, lifted-base, monad-control, mtl, process
@@ -185592,7 +185121,6 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly-extra" = callPackage
@@ -188540,19 +188068,6 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
-       version = "0.4.2.7";
-       sha256 = "1cnyckmwqj0caw2vcbmvzha8hs1207pq11mlmwpk2w6qccs1qml4";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ aeson base linear text vector ];
-       homepage = "https://github.com/phaazon/smoothie";
-       description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smoothie_0_4_2_8" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -188563,7 +188078,6 @@ self: {
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smsaero" = callPackage
@@ -193300,6 +192814,52 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-curator_0_16_0_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+     , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
+     , conduit, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default-class, directory, exceptions
+     , filepath, hashable, hspec, html-conduit, http-client
+     , http-client-tls, http-conduit, lucid, memory, mime-types
+     , monad-unlift, monad-unlift-ref, mono-traversable, mtl, old-locale
+     , optparse-applicative, optparse-simple, process, QuickCheck
+     , resourcet, safe, semigroups, stm, store, streaming-commons, syb
+     , system-fileio, system-filepath, tar, temporary, text, time
+     , transformers, unix-compat, unordered-containers, utf8-string
+     , vector, xml-conduit, xml-types, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stackage-curator";
+       version = "0.16.0.0";
+       sha256 = "17mnrxnnb70fd0h571i049pfkmpmsxrgpr970z6w6jli6mp1721j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 async base blaze-html
+         bytestring Cabal classy-prelude-conduit conduit conduit-extra
+         containers cryptonite cryptonite-conduit data-default-class
+         directory exceptions filepath hashable html-conduit http-client
+         http-client-tls http-conduit lucid memory mime-types monad-unlift
+         monad-unlift-ref mono-traversable mtl old-locale process resourcet
+         safe semigroups stm store streaming-commons syb system-fileio
+         system-filepath tar temporary text time transformers unix-compat
+         unordered-containers utf8-string vector xml-conduit xml-types yaml
+         zlib
+       ];
+       executableHaskellDepends = [
+         aeson base http-client http-client-tls optparse-applicative
+         optparse-simple system-filepath text
+       ];
+       testHaskellDepends = [
+         base Cabal classy-prelude-conduit containers directory hspec
+         http-client http-client-tls QuickCheck text yaml
+       ];
+       homepage = "https://github.com/fpco/stackage-curator";
+       description = "Tools for curating Stackage bundles";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage-install" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , cryptohash, directory, filepath, http-client, http-client-tls
@@ -195070,15 +194630,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_18_0" = callPackage
+  "stratosphere_0_19_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.18.0";
-       sha256 = "0av7ys8ysmcx51qzf9lw6pg8bn6jixm440ahds56ayxam57q4ix5";
+       version = "0.19.0";
+       sha256 = "0j43znxgsxm8g7vk74hfqyn30ay6371ndmq11xf6qxdnpxn65fgf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195272,23 +194832,6 @@ self: {
      }) {};
 
   "streaming" = callPackage
-    ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph
-     , mtl, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streaming";
-       version = "0.2.0.0";
-       sha256 = "08l7x3cbska45pv754nnkms1m6jmgi0qv4apsvdmc2mni4cb5jkn";
-       libraryHaskellDepends = [
-         base containers exceptions ghc-prim mmorph mtl transformers
-         transformers-base
-       ];
-       homepage = "https://github.com/haskell-streaming/streaming";
-       description = "an elementary streaming prelude and general stream type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streaming_0_2_1_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl
      , semigroups, transformers, transformers-base
      }:
@@ -195303,7 +194846,6 @@ self: {
        homepage = "https://github.com/haskell-streaming/streaming";
        description = "an elementary streaming prelude and general stream type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-binary" = callPackage
@@ -196102,8 +195644,8 @@ self: {
      }:
      mkDerivation {
        pname = "string-transform";
-       version = "0.1.0";
-       sha256 = "1hcb1mx2n01gxlfh3ndgsi8phjl1n04xxmhpr6175p9mxc61rsb4";
+       version = "0.1.1";
+       sha256 = "0qg9db46hbpgwndg1n7h6dfz5kx8372fqbs02nw8p9l6fsigiks8";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
@@ -196449,15 +195991,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "strive_5_0_2" = callPackage
+  "strive_5_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "strive";
-       version = "5.0.2";
-       sha256 = "1dx93rda40nv87amgk885bg4dn96qhmnq4mmfiqwb09mp6g1a0m5";
+       version = "5.0.3";
+       sha256 = "1ins8aqxknnz9a00lb074f79ifd1r9lkkwdbx4ksy9cnnd3rnyl1";
        libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-client
          http-client-tls http-types template-haskell text time transformers
@@ -197416,8 +196958,8 @@ self: {
      }:
      mkDerivation {
        pname = "supermonad";
-       version = "0.2.0";
-       sha256 = "1k1ysyjgnq5wic8hifrhpcmbi267inllqrh1dij234xykrkifd1m";
+       version = "0.2.0.1";
+       sha256 = "15hw8bzafvg492zcdj5f0r67fmrqay5kj9jwfm9wd3qv7k8iszrk";
        libraryHaskellDepends = [
          base containers fgl ghc mtl transformers
        ];
@@ -197897,32 +197439,6 @@ self: {
      }) {};
 
   "swish" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hashable
-     , HUnit, intern, mtl, network-uri, old-locale, polyparse
-     , semigroups, test-framework, test-framework-hunit, text, time
-     }:
-     mkDerivation {
-       pname = "swish";
-       version = "0.9.1.10";
-       sha256 = "10nx8vx6vprsdchqd726vx3cfzxy0jkz9ylw4p2mkcam9s72dd7c";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers directory filepath hashable intern mtl network-uri
-         old-locale polyparse semigroups text time
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers hashable HUnit network-uri old-locale semigroups
-         test-framework test-framework-hunit text time
-       ];
-       homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
-       description = "A semantic web toolkit";
-       license = "LGPL";
-     }) {};
-
-  "swish_0_9_2_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hashable
      , HUnit, intern, mtl, network-uri, old-locale, polyparse
      , semigroups, test-framework, test-framework-hunit, text, time
@@ -197946,7 +197462,6 @@ self: {
        homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
        description = "A semantic web toolkit";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sws" = callPackage
@@ -200164,30 +199679,6 @@ self: {
      }) {};
 
   "tar" = callPackage
-    ({ mkDerivation, array, base, bytestring, bytestring-handle
-     , containers, criterion, deepseq, directory, filepath, old-time
-     , QuickCheck, tasty, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "tar";
-       version = "0.5.0.3";
-       sha256 = "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath time
-       ];
-       testHaskellDepends = [
-         array base bytestring bytestring-handle containers deepseq
-         directory filepath QuickCheck tasty tasty-quickcheck time
-       ];
-       benchmarkHaskellDepends = [
-         array base bytestring containers criterion deepseq directory
-         filepath old-time time
-       ];
-       description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tar_0_5_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, criterion, deepseq, directory, filepath, QuickCheck
      , tasty, tasty-quickcheck, time
@@ -200209,7 +199700,6 @@ self: {
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tar-conduit" = callPackage
@@ -200561,20 +200051,6 @@ self: {
      }) {};
 
   "tasty-expected-failure" = callPackage
-    ({ mkDerivation, base, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-expected-failure";
-       version = "0.11.0.4";
-       sha256 = "0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1";
-       revision = "1";
-       editedCabalFile = "07sz28vm5rllp9yj1ibhz015s6c4gcq1vzxlphhqam1ah096jc42";
-       libraryHaskellDepends = [ base tagged tasty ];
-       homepage = "http://github.com/nomeata/tasty-expected-failure";
-       description = "Mark tasty tests as failure expected";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-expected-failure_0_11_1" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
        pname = "tasty-expected-failure";
@@ -200584,7 +200060,6 @@ self: {
        homepage = "http://github.com/nomeata/tasty-expected-failure";
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-fail-fast" = callPackage
@@ -202465,6 +201940,8 @@ self: {
        pname = "test-framework-quickcheck2";
        version = "0.3.0.4";
        sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
+       revision = "1";
+       editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff";
        libraryHaskellDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
@@ -203303,22 +202780,6 @@ self: {
      }) {};
 
   "text-latin1" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, data-checked
-     , hashable, text
-     }:
-     mkDerivation {
-       pname = "text-latin1";
-       version = "0.3";
-       sha256 = "1cs09qwkcljbnckakzr1wnpclkzjb0in3nnz6fpjyl4mxp5bqaw9";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive data-checked hashable text
-       ];
-       homepage = "https://github.com/mvv/text-latin1";
-       description = "Latin-1 (including ASCII) utility functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-latin1_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, data-checked
      , hashable, semigroups, text
      }:
@@ -203333,7 +202794,6 @@ self: {
        homepage = "https://github.com/mvv/text-latin1";
        description = "Latin-1 (including ASCII) utility functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-ldap" = callPackage
@@ -203626,25 +203086,6 @@ self: {
      }) {};
 
   "text-short" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, hashable
-     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "text-short";
-       version = "0.1.1";
-       sha256 = "1c912nn1xqqvg27rndb8qvqwhw4iivhr19qjkgy3nfbi6krzkvsm";
-       libraryHaskellDepends = [
-         base binary bytestring deepseq hashable text
-       ];
-       testHaskellDepends = [
-         base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck
-         text
-       ];
-       description = "Memory-efficient representation of Unicode text strings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-short_0_1_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim
      , hashable, quickcheck-instances, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -203662,50 +203103,9 @@ self: {
        ];
        description = "Memory-efficient representation of Unicode text strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
-     , bytestring, bytestring-builder, containers, contravariant
-     , criterion, deepseq, deriving-compat, generic-deriving
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, integer-gmp, nats
-     , QuickCheck, quickcheck-instances, semigroups, tagged
-     , template-haskell, text, th-abstraction, th-lift, transformers
-     , transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.7.1";
-       sha256 = "0gbf3cpxz92v4jphmwvz93il7m38qkwirfnk5453517k2s84s899";
-       revision = "3";
-       editedCabalFile = "1bc2ja8yciymck9bhydwhxqvdscdvj584k25bvm6hgjqy847bz2c";
-       libraryHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text
-         th-abstraction th-lift transformers transformers-compat void
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans bifunctors bytestring
-         bytestring-builder containers contravariant deriving-compat
-         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
-         QuickCheck quickcheck-instances semigroups tagged template-haskell
-         text th-lift transformers transformers-compat void
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant criterion deepseq generic-deriving
-         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
-         template-haskell text th-lift transformers transformers-compat void
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show";
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_7_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
      , criterion, deepseq, deriving-compat, generic-deriving
@@ -203741,7 +203141,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -204412,6 +203811,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-nowq" = callPackage
+    ({ mkDerivation, base, template-haskell, time }:
+     mkDerivation {
+       pname = "th-nowq";
+       version = "0.1.0.0";
+       sha256 = "06ajyk1a1kdxa0cva4lym2jf52bkkz8dxgk8753k2m035czm2w26";
+       libraryHaskellDepends = [ base template-haskell time ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/dzhus/th-nowq#readme";
+       description = "Template Haskell splice that expands to current time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-orphans" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell
      , th-lift, th-lift-instances, th-reify-many
@@ -207988,6 +207400,8 @@ self: {
        pname = "transformers-fix";
        version = "1.0";
        sha256 = "02aapq88k81q9r6wmvmg9zjyrmz9qzi4gss75p18lkc4dgrzzlb5";
+       revision = "1";
+       editedCabalFile = "126gyjr8jp42md6nblx7c0kan97jgsakvsf2vzv2pj828ax1icrs";
        libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/thumphries/transformers-fix";
        description = "Monad transformer for evaluating to a fixpoint";
@@ -209373,8 +208787,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.4.5";
-       sha256 = "082svk0bcf1vvqrzfmb6r5rridgch0c15423fwcb57cfc8xzm8kx";
+       version = "1.4.6";
+       sha256 = "02qayazjr2b2g6ksmpwn9v5z3kibrf5kf9f1whfw83sq6vqa7ixx";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          foldl hostname managed optional-args optparse-applicative process
@@ -209387,7 +208801,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "turtle_1_5_4" = callPackage
+  "turtle_1_5_5" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -209396,8 +208810,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.5.4";
-       sha256 = "17ik8k5mp9ipkai4fn57c93ajf9ydnxcb7r8xm8pq6xaza5qh5di";
+       version = "1.5.5";
+       sha256 = "0iv87zlb5pzn5ljvkf0440gia3mkhn7m35falm3yvyn9d8pz8ym1";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -209460,8 +208874,8 @@ self: {
      }:
      mkDerivation {
        pname = "twee";
-       version = "2.1.3";
-       sha256 = "08grsv9x9a289lh5w9vx401zshs6fa31756mdzmac0w9nk92229k";
+       version = "2.1.4";
+       sha256 = "0anln0il67j8xhz1m73r8b02560mc8yd1rzmc03p4f7vmgxqaphv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -209478,8 +208892,8 @@ self: {
      }:
      mkDerivation {
        pname = "twee-lib";
-       version = "2.1.3";
-       sha256 = "0yp6qdm189jhapx9y80yq9r97bv2v2w3n7q070i7hzczmg55rjqi";
+       version = "2.1.4";
+       sha256 = "0fapi6g8f6fp90hvff1g606wzi7jaacf1mnq1h801yzzi4sj3yms";
        libraryHaskellDepends = [
          base containers dlist ghc-prim pretty primitive transformers vector
        ];
@@ -210369,12 +209783,12 @@ self: {
      }) {};
 
   "type-interpreter" = callPackage
-    ({ mkDerivation, base, containers, template-haskell }:
+    ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.1.0";
-       sha256 = "1s9w9sml4crnd40vly0fvfbf2n0cgyv0fdqfsh66n2x5ymsvqp4x";
-       libraryHaskellDepends = [ base containers template-haskell ];
+       version = "0.1.1";
+       sha256 = "02v4y8limn1kdh27w8bq3d0q1ffnalpj9bqp7km1amfqwp2ljsij";
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
@@ -210811,8 +210225,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-spreadsheet";
-       version = "1.1.1";
-       sha256 = "1ypnyny0dznq6nxjdr5v5lsk93pd2ly71plw0xpjbwa5jv3iwb1g";
+       version = "1.1.2";
+       sha256 = "10bbgyj6spc3c11fwgcrgk8yba97ijzkz82pabpf64r3xzr3pv2y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211672,31 +211086,6 @@ self: {
      }) {};
 
   "unbound-generics" = callPackage
-    ({ mkDerivation, base, containers, contravariant, criterion
-     , deepseq, deepseq-generics, mtl, profunctors, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "unbound-generics";
-       version = "0.3.1";
-       sha256 = "0h34gaxzk86vwrcwnxq18xwlv4q4kpig3jwbcgmcpj6ziqn6g18z";
-       libraryHaskellDepends = [
-         base containers contravariant deepseq mtl profunctors
-         template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq deepseq-generics
-       ];
-       homepage = "http://github.com/lambdageek/unbound-generics";
-       description = "Support for programming with names and binders using GHC Generics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unbound-generics_0_3_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant
      , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -211717,7 +211106,6 @@ self: {
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays" = callPackage
@@ -211848,6 +211236,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unfoldable_0_9_6" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
+     , random, transformers
+     }:
+     mkDerivation {
+       pname = "unfoldable";
+       version = "0.9.6";
+       sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d";
+       libraryHaskellDepends = [
+         base containers ghc-prim one-liner QuickCheck random transformers
+       ];
+       homepage = "https://github.com/sjoerdvisscher/unfoldable";
+       description = "Class of data structures that can be unfolded";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unfoldable-restricted" = callPackage
     ({ mkDerivation, base, constraints, containers, hashable
      , transformers, unfoldable, unit-constraint, unordered-containers
@@ -213437,20 +212842,6 @@ self: {
      }) {};
 
   "uri-bytestring-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
-     mkDerivation {
-       pname = "uri-bytestring-aeson";
-       version = "0.1.0.4";
-       sha256 = "1nm9d3xq56rrjggky28q72n8afk5nh6m1bbi6j5z538qwccyg348";
-       libraryHaskellDepends = [
-         aeson base bytestring text uri-bytestring
-       ];
-       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
-       description = "Aeson instances for URI Bytestring";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring-aeson_0_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
        pname = "uri-bytestring-aeson";
@@ -213462,7 +212853,6 @@ self: {
        homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
        description = "Aeson instances for URI Bytestring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -213712,8 +213102,8 @@ self: {
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "7.0.1";
-       sha256 = "05n1lmd8dd71l2ghgrb3i7jsrh541nappwps5vqqppq2hvv90rpz";
+       version = "7.0.2";
+       sha256 = "0q8kxgvlm6wf5xwq8a61c7vwbv3ghbbhid516ril677r5y6l7vv3";
        libraryHaskellDepends = [
          attoparsec-uri base exceptions mmorph monad-control
          monad-control-aligned monad-logger mtl path-extra resourcet split
@@ -214354,8 +213744,8 @@ self: {
        pname = "uuid-crypto";
        version = "1.4.0.0";
        sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn";
-       revision = "2";
-       editedCabalFile = "0kw54wnzzxw6hjmj52735x9pya18ccmry2nf4nmlcv89ipb1vmly";
+       revision = "3";
+       editedCabalFile = "0av141dwy2hf9288nhz59jw8jp38rpbvbqfq3k5ifrzqsap9gr2x";
        libraryHaskellDepends = [
          base binary bytestring cryptoids cryptoids-class cryptoids-types
          exceptions uuid
@@ -215078,8 +214468,8 @@ self: {
      }:
      mkDerivation {
        pname = "vault-tool";
-       version = "0.0.0.3";
-       sha256 = "0gs6qjahb3xl59cpbwcaqxsbzg28yw80fjyziqfd0s3vca4c9abm";
+       version = "0.1.0.0";
+       sha256 = "00hnbd34chi7nm8vwq80vhl0629gklfkyfwic80q7i17kzsdvx90";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types text
          unordered-containers
@@ -215095,8 +214485,8 @@ self: {
      }:
      mkDerivation {
        pname = "vault-tool-server";
-       version = "0.0.0.3";
-       sha256 = "07j25ksqk5fnyp3gnp79jj4l3ax3y5wf29s2kwkq9r2pjb8577g4";
+       version = "0.1.0.0";
+       sha256 = "06h4cslkb54p3yydcnkzlzysn54cy801i5fwc02hc4gi3kvia84k";
        libraryHaskellDepends = [
          aeson async base bytestring filepath http-client process temporary
          text vault-tool
@@ -216075,25 +215465,6 @@ self: {
      }) {};
 
   "viewprof" = callPackage
-    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
-       version = "0.0.0.13";
-       sha256 = "1ichcff012k1f9cqk01sixv3yx52krnhjfnw73yw06kacpd7i74z";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers directory ghc-prof lens scientific text
-         vector vector-algorithms vty
-       ];
-       homepage = "https://github.com/maoe/viewprof";
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_14" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -216110,7 +215481,6 @@ self: {
        homepage = "https://github.com/maoe/viewprof";
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -218697,44 +218067,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , criterion, 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.13";
-       sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj";
-       revision = "1";
-       editedCabalFile = "0i8x4hv5j5l3lz2m0abxik05xq1lzcilw8mhw5f5paiar6csqmg7";
-       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
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers criterion hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_18" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -218767,6 +218099,41 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "warp_3_2_18_1" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, case-insensitive, containers, directory, doctest
+     , gauge, ghc-prim, hashable, hspec, http-client, 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.18.1";
+       sha256 = "15narz2dawzqmc8sys9cigg2dnn4a681cn07cgnpbvlyadwi5bpn";
+       libraryHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         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
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec http-client 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
+       ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers gauge hashable http-date
+         http-types network unix unix-compat
+       ];
+       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;
      }) {};
 
@@ -221361,6 +220728,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "world-peace" = callPackage
+    ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors
+     , tagged
+     }:
+     mkDerivation {
+       pname = "world-peace";
+       version = "0.1.0.0";
+       sha256 = "19anwyh9n9agpcdhzfbh0l28nm0mdn8616klihbw55yxkiwqaxkk";
+       libraryHaskellDepends = [ aeson base deepseq profunctors tagged ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/cdepillabout/world-peace";
+       description = "Open Union and Open Product Types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wp-archivebot" = callPackage
     ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }:
      mkDerivation {
@@ -221576,6 +220958,46 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wreq_0_5_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec
+     , authenticate-oauth, base, base16-bytestring, base64-bytestring
+     , bytestring, Cabal, cabal-doctest, case-insensitive, containers
+     , cryptonite, directory, doctest, exceptions, filepath, ghc-prim
+     , hashable, http-client, http-client-tls, http-types, HUnit, lens
+     , lens-aeson, memory, mime-types, network-info, psqueues
+     , QuickCheck, snap-core, snap-server, template-haskell, temporary
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, time-locale-compat, transformers, unix-compat
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "wreq";
+       version = "0.5.2.1";
+       sha256 = "0dqj94lky93jwrkq65pn4nfl2cv8yjgqaxdwbvfyr6vhinrnkl5k";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base base16-bytestring
+         bytestring case-insensitive containers cryptonite exceptions
+         ghc-prim hashable http-client http-client-tls http-types lens
+         lens-aeson memory mime-types psqueues template-haskell text time
+         time-locale-compat unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring
+         case-insensitive containers directory doctest filepath hashable
+         http-client http-types HUnit lens lens-aeson network-info
+         QuickCheck snap-core snap-server temporary test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers unix-compat unordered-containers uuid vector
+       ];
+       homepage = "http://www.serpentine.com/wreq";
+       description = "An easy-to-use HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wreq-sb" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
@@ -229240,23 +228662,6 @@ self: {
      }) {};
 
   "zlib" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, zlib
-     }:
-     mkDerivation {
-       pname = "zlib";
-       version = "0.6.1.2";
-       sha256 = "1fx2k2qmgm2dj3fkxx2ry945fpdn02d4dkihjxma21xgdiilxsz4";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       testHaskellDepends = [
-         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zlib;};
-
-  "zlib_0_6_2" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, zlib
      }:
@@ -229271,7 +228676,6 @@ self: {
        ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage

From 86058acb2fa8a8392a84183599044ce9640cabd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Mar 2018 16:01:43 +0100
Subject: [PATCH 0840/2266] haskell-ChasingBottoms: drop obsolete override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1579347c31e..6bbd3d97f44 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -946,9 +946,6 @@ self: super: {
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
-  # Use latest version to support newer QuickCheck and base libraries.
-  ChasingBottoms = self.ChasingBottoms_1_3_1_4;
-
   # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
   multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};
 

From 1278dba2bc5b12ceb47e3b7ec2629b4bc188c3fb Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 04:56:05 +0300
Subject: [PATCH 0841/2266] ghc841:  bv fix released

---
 .../configuration-ghc-8.4.x.nix               | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index db531f4795d..ea0af92460a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -50,9 +50,12 @@ self: super: {
   ## Shadowed:
 
   ## Needs bump to a versioned attribute
-  ##     • Could not deduce (Semigroup (Dict a))
+  ##     • No instance for (GHC.Base.Semigroup BV)
   ##         arising from the superclasses of an instance declaration
-  ##       from the context: a
+  ##     • In the instance declaration for ‘Monoid BV’
+  bv = super.bv_0_5;
+
+  ## Needs bump to a versioned attribute
   constraints = super.constraints_0_10;
 
   ## Needs bump to a versioned attribute
@@ -209,20 +212,8 @@ self: super: {
   });
 
 
-  ## Upstreamed
 
-  ## Upstreamed, awaiting a Hackage release
-  bv = overrideCabal super.bv (drv: {
-    ##     • No instance for (GHC.Base.Semigroup BV)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid BV’
-    src = pkgs.fetchFromGitHub {
-      owner  = "iagoabal";
-      repo   = "haskell-bv";
-      rev    = "92932a75719020d6a8ac55c455e5c03a4304043f";
-      sha256 = "0fi4v9mpw5y9q1pm7lqhm2zazfyy921wpaa28125misix0frasfw";
-    };
-  });
+  ## Upstreamed
 
   ## Upstreamed, awaiting a Hackage release
   cabal2nix = (overrideCabal super.cabal2nix (drv: {

From c373b26f9c73149905fea8089d029dc036d0a487 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Mon, 12 Mar 2018 05:01:35 +0300
Subject: [PATCH 0842/2266] ghc841:  boxes fix released

---
 .../haskell-modules/configuration-ghc-8.4.x.nix   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index ea0af92460a..9b04bb016ab 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -49,6 +49,11 @@ self: super: {
   haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src;
   ## Shadowed:
 
+  ## Needs bump to a versioned attribute
+  ## Setup: Encountered missing dependencies:
+  ## base >=3 && <4.11
+  boxes = super.boxes_0_1_5;
+
   ## Needs bump to a versioned attribute
   ##     • No instance for (GHC.Base.Semigroup BV)
   ##         arising from the superclasses of an instance declaration
@@ -596,16 +601,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  boxes = overrideCabal super.boxes (drv: {
-    ## https://github.com/treeowl/boxes/issues/29
-    patches = (drv.patches or []) ++ [
-      (pkgs.fetchpatch
-       { url    = https://github.com/asr/boxes/commit/f03e16cb8677a9d85687c641fe27a87e6fd94d54.patch;
-         sha256 = "179vkn6jimiy64dwyam04x8v981l3pfrq3ig97600vnkns3v8i6a";
-       })
-    ];
-  });
-
   deepseq-generics = overrideCabal super.deepseq-generics (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.5 && <4.11

From d531e09696f1aa45e90473a8f8ee80e85f1b116a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 09:40:13 +0100
Subject: [PATCH 0843/2266] haskell-changelogged: update override for new
 turtle version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6bbd3d97f44..b1e52ff2fe0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1003,7 +1003,7 @@ self: super: {
   # Needs older hlint
   hpio = dontCheck super.hpio;
 
-  # Needs turtle >=1.5.0, which we use by default in lts-10.x.
-  changelogged = super.changelogged.override { turtle = self.turtle_1_5_4; };
+  # Needs turtle >=1.5.0, which we don't have by default in lts-10.x.
+  changelogged = super.changelogged.override { turtle = self.turtle_1_5_5; };
 
 }

From 74e40b0671fa2aee66198fb8dd32bdce16b1b2d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 09:41:57 +0100
Subject: [PATCH 0844/2266] haskell-HTTP: drop obsolete override for GHC 8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9b04bb016ab..18fc916a2b1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -155,13 +155,6 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_4_8;
 
-  ## Needs bump to a versioned attribute
-  HTTP = overrideCabal super.HTTP_4000_3_10 (drv: {
-    ##
-    ## https://github.com/haskell/HTTP/pull/114
-    doCheck         = false;
-  });
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## free ==4.*, template-haskell >=2.4 && <2.13

From 7337a20f64eb38cb42b4ca648dce65db7fa711a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 09:51:49 +0100
Subject: [PATCH 0845/2266] haskell-inline-c: disable test suite to avoid
 around quickcheck failure

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b1e52ff2fe0..69a8bf1e8f2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1006,4 +1006,7 @@ self: super: {
   # Needs turtle >=1.5.0, which we don't have by default in lts-10.x.
   changelogged = super.changelogged.override { turtle = self.turtle_1_5_5; };
 
+  # https://github.com/fpco/inline-c/issues/72
+  inline-c = dontCheck super.inline-c;
+
 }

From c575724782b4132bb4c0119c9da1a5c48c8ba95c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 10:07:18 +0100
Subject: [PATCH 0846/2266] haskell-tar: fix build with ghc-7.10.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index c63ec7b70f7..7459c5b28cc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -201,6 +201,7 @@ self: super: {
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   reflection = addBuildDepend super.reflection self.semigroups;
   semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);
+  tar = addBuildDepend super.tar self.semigroups;
   texmath = addBuildDepend super.texmath self.network-uri;
   yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
 

From d9ed7a264282910e05e0011553f9714670baa306 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 10:26:54 +0100
Subject: [PATCH 0847/2266] haskell-cmdargs: fix build with GHC 7.10.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 7459c5b28cc..4635fdc5281 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -186,6 +186,7 @@ self: super: {
   attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
   bytes = addBuildDepend super.bytes self.doctest;
   case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
+  cmdargs = addBuildDepend super.cmdargs self.semigroups;
   contravariant = addBuildDepend super.contravariant self.semigroups;
   dependent-map = addBuildDepend super.dependent-map self.semigroups;
   distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;

From 729a26d8756a1d9d7cac73f355342bfc706885fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 10:30:47 +0100
Subject: [PATCH 0848/2266] haskell-parser-combinators: fix build with GHC
 7.10.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 4635fdc5281..eb849733543 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -199,6 +199,7 @@ self: super: {
   natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
   optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
   parsec = addBuildDepends super.parsec [self.fail self.semigroups];
+  parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   reflection = addBuildDepend super.reflection self.semigroups;
   semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);

From 6c837058a4965d68b1c48ee9500aed5b7935f1b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 10:36:01 +0100
Subject: [PATCH 0849/2266] haskell-megaparsec: fix build with GHC 7.10.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index eb849733543..a071a6aa866 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -41,7 +41,8 @@ self: super: {
 
   gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; };
 
-  megaparsec = addBuildDepend super.megaparsec self.fail;
+  # https://github.com/mrkkrp/megaparsec/issues/282
+  megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
 
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";

From aed9401abc4e5c23ee41c079b00a93cdeefc7ef6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 10:49:43 +0100
Subject: [PATCH 0850/2266] hledger-lib: add override fix build with ghc 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 18fc916a2b1..9d4b632edba 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -788,4 +788,11 @@ self: super: {
     jailbreak       = true;
   });
 
+  # Fix missing semigroup instance for Journal.
+  hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch
+    { url = https://github.com/simonmichael/hledger/pull/718.patch;
+      sha256 = "1gcs9j934wvk9hbn27zm42dnvf4x1gxr54li4kdw3zi3160y2l5c";
+      stripLen = 1;
+    });
+
 }

From bd46cb180d24637b95b06f5bbce7c467f71dcd92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 11:06:29 +0100
Subject: [PATCH 0851/2266] haskell-vty: use latest version when compiling with
 GHC 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9d4b632edba..d216e8a41a0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -795,4 +795,7 @@ self: super: {
       stripLen = 1;
     });
 
+  # Old versions don't compile.
+  vty = self.vty_5_20;
+
 }

From 79f4548aa2c46d82115324a14dd15f413b22b79e Mon Sep 17 00:00:00 2001
From: John Children <john@infosum.com>
Date: Mon, 12 Mar 2018 13:46:13 +0000
Subject: [PATCH 0852/2266] go-langserver: init at unstable-2018-03-05

---
 maintainers/maintainer-list.nix               |  5 ++++
 .../tools/go-langserver/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/tools/go-langserver/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 74b9f23af79..807b5e07201 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1720,6 +1720,11 @@
     github = "johnazoidberg";
     name = "Daniel Schäfer";
   };
+  johnchildren = {
+    email = "john.a.children@gmail.com";
+    github = "johnchildren";
+    name = "John Children";
+  };
   johnmh = {
     email = "johnmh@openblox.org";
     github = "johnmh";
diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix
new file mode 100644
index 00000000000..84efaf2a4b6
--- /dev/null
+++ b/pkgs/development/tools/go-langserver/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "go-langserver-${version}";
+  version = "unstable-2018-03-05";
+  rev = "5d7a5dd74738978d635f709669241f164c120ebd";
+
+  goPackagePath = "github.com/sourcegraph/go-langserver";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "sourcegraph";
+    repo = "go-langserver";
+    sha256 = "0aih0akk3wk3332znkhr2bzxcc3parijq7n089mdahnf20k69xyz";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Go language server protocol server";
+    homepage = https://github.com/sourcegraph/go-langserver;
+    license = licenses.mit;
+    maintainers = with maintainers; [ johnchildren ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b3d29ce57e..6f0df09bb14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13650,6 +13650,8 @@ with pkgs;
 
   gomodifytags = callPackage ../development/tools/gomodifytags { };
 
+  go-langserver = callPackage ../development/tools/go-langserver { };
+
   gotests = callPackage ../development/tools/gotests { };
 
   gogoclient = callPackage ../os-specific/linux/gogoclient { };

From 46f9e1063618679e8370d22ffe236f59ae99cb65 Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Sun, 11 Mar 2018 15:21:37 +0000
Subject: [PATCH 0853/2266] Add name to maintainers' list

---
 maintainers/maintainer-list.nix                 | 5 +++++
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4aee16313aa..d08eea3fdff 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1548,6 +1548,11 @@
     github = "iblech";
     name = "Ingo Blechschmidt";
   };
+  idontgetoutmuch = {
+    email = "dominic@steinitz.org";
+    github = "idontgetoutmuch";
+    name = "Dominic Steinitz";
+  };
   igsha = {
     email = "igor.sharonov@gmail.com";
     github = "igsha";
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index f06618e3788..41f7267fdca 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
     description = "Suite of nonlinear differential/algebraic equation solvers";
     homepage    = https://computation.llnl.gov/casc/sundials/main.html;
     platforms   = platforms.all;
-    maintainers = [ idontgetoutmuch ];
-    licencse    = { url = https://computation.llnl.gov/projects/sundials/license; };
+    maintainers = [ maintainers.idontgetoutmuch ];
+    license     = licenses.bsd3;
   };
 
 }

From 1beda3fc6cd378c2fe1165343aceccabec55fa9a Mon Sep 17 00:00:00 2001
From: Mathis Antony <sveitser@gmail.com>
Date: Mon, 12 Mar 2018 23:17:03 +0800
Subject: [PATCH 0854/2266] vim-solidity: init at 2018-02-11

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 911961e9c53..bce13612fd6 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -104,6 +104,7 @@ rec {
   repeat              = vim-repeat;
   rhubarb             = vim-rhubarb;
   signature           = vim-signature;
+  solidity            = vim-solidity;
   stylish-haskell     = vim-stylish-haskell;
   stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
   supertab            = Supertab;
@@ -2102,6 +2103,17 @@ rec {
 
   };
 
+  vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-solidity-2018-02-11";
+    src = fetchgit {
+      url = "https://github.com/tomlion/vim-solidity";
+      rev = "46b87988e196abe646516932427253a838f7fff8";
+      sha256 = "0djqqxlh314n6yhn5m2min3nl435n4qcjgsyca7qbz4wvgmbwnlk";
+    };
+    dependencies = [];
+
+  };
+
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-dispatch-2018-03-02";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c41dd33eeed..577b30bf7b2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -168,6 +168,7 @@
 "github:thinca/vim-quickrun"
 "github:thinca/vim-themis"
 "github:tomasr/molokai"
+"github:tomlion/vim-solidity"
 "github:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
 "github:tpope/vim-repeat"

From 29c33ba5af01fbce3aa255dac2328c50a4a1a745 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 15 Dec 2017 14:34:28 +0100
Subject: [PATCH 0855/2266] lumail: 2.9 -> 3.1

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

diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index 2c1678e994f..ff85c98d970 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -2,14 +2,14 @@
 , perl, perlPackages }:
 
 let
-  version = "2.9";
+  version = "3.1";
 in
 stdenv.mkDerivation {
   name = "lumail-${version}";
 
   src = fetchurl {
     url = "https://lumail.org/download/lumail-${version}.tar.gz";
-    sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc";
+    sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From bb8e1c4512e6556dfc46fc9af10d005599b84b7f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 11 Mar 2018 13:43:50 +0100
Subject: [PATCH 0856/2266] lumail: Fix package definition

Includes:

* Package gets a flag to use the debug build
* install phase installs all lua scripts from the package and makes
  lumail find them
* global configuration which is shipped with the package can be
  overridden, if desired
* parallel building enabled
---
 .../networking/mailreaders/lumail/default.nix | 46 ++++++++++++++++---
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index ff85c98d970..5a333c8d982 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -1,8 +1,28 @@
 { stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp
-, perl, perlPackages }:
+, perl, perlPackages
+, debugBuild ? false
+, alternativeGlobalConfigFilePath ? null
+}:
 
 let
-  version = "3.1";
+  version    = "3.1";
+  binaryName = if debugBuild then "lumail2-debug" else "lumail2";
+  alternativeConfig = builtins.toFile "lumail2.lua"
+    (builtins.readFile alternativeGlobalConfigFilePath);
+
+  globalConfig = if isNull alternativeGlobalConfigFilePath then ''
+    mkdir -p $out/etc/lumail2
+    cp global.config.lua $out/etc/lumail2.lua
+    for n in ./lib/*.lua; do
+      cp "$n" $out/etc/lumail2/
+    done
+  '' else ''
+    ln -s ${alternativeConfig} $out/etc/lumail2.lua
+  '';
+
+  getPath  = type : "${lua}/lib/?.${type};";
+  luaPath  = getPath "lua";
+  luaCPath = getPath "so";
 in
 stdenv.mkDerivation {
   name = "lumail-${version}";
@@ -12,7 +32,9 @@ stdenv.mkDerivation {
     sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [
     lua5_2 file ncurses gmime pcre-cpp
     perl perlPackages.JSON perlPackages.NetIMAPClient
@@ -29,16 +51,26 @@ stdenv.mkDerivation {
     sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy
   '';
 
+  buildFlags = if debugBuild then "lumail2-debug" else "";
+
+  installPhase = ''
+    mkdir -p $out/bin || true
+    install -m755 ${binaryName} $out/bin/
+  ''
+  + globalConfig
+  + ''
+    wrapProgram $out/bin/${binaryName} \
+        --prefix LUA_PATH : "${luaPath}" \
+        --prefix LUA_CPATH : "${luaCPath}"
+  '';
+
   makeFlags = [
     "LVER=lua"
     "PREFIX=$(out)"
     "SYSCONFDIR=$(out)/etc"
+    "LUMAIL_LIBS=$(out)/etc/lumail2"
   ];
 
-  postInstall = ''
-    cp lumail2.user.lua $out/etc/lumail2/
-  '';
-
   meta = with stdenv.lib; {
     description = "Console-based email client";
     homepage = https://lumail.org/;

From 13e95f33db894f7d7a46f1ffe054fe56ba83b030 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 11 Mar 2018 16:59:29 +0100
Subject: [PATCH 0857/2266] lumail: Use lua5.1

This is necessary because the standard library which is distributed with
lumail (the lumail core configuration so to speak) is written for lua5.1
apparently.

The website states 5.1 or 5.2 or 5.3, but 5.2 fails because "loadstring"
was deprecated in lua 5.2.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/networking/mailreaders/lumail/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index 5a333c8d982..79deab46912 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp
-, perl, perlPackages
+{ stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp
+, perl, perlPackages, makeWrapper
 , debugBuild ? false
 , alternativeGlobalConfigFilePath ? null
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [
-    lua5_2 file ncurses gmime pcre-cpp
+    lua file ncurses gmime pcre-cpp
     perl perlPackages.JSON perlPackages.NetIMAPClient
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b3d29ce57e..3bca52f729c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16440,7 +16440,9 @@ with pkgs;
 
   looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };
 
-  lumail = callPackage ../applications/networking/mailreaders/lumail { };
+  lumail = callPackage ../applications/networking/mailreaders/lumail {
+    lua = lua5_1;
+  };
 
   lv2bm = callPackage ../applications/audio/lv2bm { };
 

From c65f0ddb904c4f6a93d10adeb6ff2bc8f99cbdd2 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 10 Mar 2015 20:11:22 +0000
Subject: [PATCH 0858/2266] clangUnwrapped: Removed unused abstraction

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a72fdd669a..64c61e6caac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5799,8 +5799,6 @@ with pkgs;
 
   clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { };
 
-  clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; };
-
   clangSelf = clangWrapSelf llvmPackagesSelf.clang;
 
   clangWrapSelf = build: ccWrapperFun {

From fafeac185bfb9f02d9e7eb6d78c1b032b5e749a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 12 Mar 2018 16:49:34 +0100
Subject: [PATCH 0859/2266] tptp: 7.0.0 -> 7.1.0

---
 pkgs/applications/science/logic/tptp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 16ef277e930..a1d613e6295 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "TPTP-${version}";
-  version = "7.0.0";
+  version = "7.1.0";
 
   src = fetchurl {
     url = [
       "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
       "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz"
     ];
-    sha256 = "13rm76lqlgbv15p8as0dpc74z2dfv5xydkhnd0hm3hhi3mn39dk9";
+    sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d";
   };
 
   buildInputs = [ tcsh yap perl patchelf ];

From dd3c6f377019c17442395bee0e32d0d37993e1e8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 11 Mar 2018 21:23:27 +0000
Subject: [PATCH 0860/2266] perlPackages.ClassAccessorFast: alias of
 perlPackages.ClassAccessor

---
 pkgs/top-level/perl-packages.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5f3c6de1512..459b6c6a950 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1832,18 +1832,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ClassAccessor];
   };
 
-  ClassAccessorFast = buildPerlPackage {
-    name = "Class-Accessor-Fast-0.34";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz;
-      sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd";
-    };
-    meta = {
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ];
-      platforms   = stdenv.lib.platforms.unix;
-    };
-  };
+  ClassAccessorFast = ClassAccessor;
 
   ClassAccessorGrouped = buildPerlPackage {
     name = "Class-Accessor-Grouped-0.10012";

From 8d9e54006dde0cb976af6df2fb5a263885b8c68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 12 Mar 2018 17:34:12 +0100
Subject: [PATCH 0861/2266] kde-applications: 17.12.2 -> 17.12.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1688 ++++++++++++++++----------------
 2 files changed, 845 insertions(+), 845 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 724f252907c..9ad488f63ab 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.12.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index ff6b1803e13..d61784805e4 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1691 +3,1691 @@
 
 {
   akonadi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-17.12.2.tar.xz";
-      sha256 = "03cz5jl5qywc39krjrzby7yxcrx4iaf94pkvzbkagx1c7bfgajkf";
-      name = "akonadi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz";
+      sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi";
+      name = "akonadi-17.12.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-17.12.2.tar.xz";
-      sha256 = "1j2bs3ybl2lz3yr862kz4jnkiksawbyv96lsjvzgkalmri3y2jv9";
-      name = "akonadi-calendar-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz";
+      sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a";
+      name = "akonadi-calendar-17.12.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-tools-17.12.2.tar.xz";
-      sha256 = "0fh7zsf4ckmikqqwa3zqdd97i80s53r56bx8q0aj1dyxa5kzrid6";
-      name = "akonadi-calendar-tools-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz";
+      sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9";
+      name = "akonadi-calendar-tools-17.12.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadiconsole-17.12.2.tar.xz";
-      sha256 = "00w21nxbq9a9h1cs4wl0641hj82i3w63r9ab5hb9kw33gi9ijali";
-      name = "akonadiconsole-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz";
+      sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b";
+      name = "akonadiconsole-17.12.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-contacts-17.12.2.tar.xz";
-      sha256 = "1v8082walg47bl8rj6zcp2br4wr0mhrw82l0aw41gmcwi2vr4pr7";
-      name = "akonadi-contacts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz";
+      sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v";
+      name = "akonadi-contacts-17.12.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-import-wizard-17.12.2.tar.xz";
-      sha256 = "1yflksmvvysl3p3s37i0qc712cdzkzi501x74mk3c7sy1pw097g4";
-      name = "akonadi-import-wizard-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz";
+      sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4";
+      name = "akonadi-import-wizard-17.12.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-mime-17.12.2.tar.xz";
-      sha256 = "0xsm87nph967293ixwnh1450qwrn0ghfcw34444fj8f4ciwbv0iv";
-      name = "akonadi-mime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz";
+      sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2";
+      name = "akonadi-mime-17.12.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-notes-17.12.2.tar.xz";
-      sha256 = "06ac7b1n3aaad7y1cbby44jaq748xnxfjd51c1jh0p257q22qj85";
-      name = "akonadi-notes-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz";
+      sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g";
+      name = "akonadi-notes-17.12.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-search-17.12.2.tar.xz";
-      sha256 = "0g03z7xcbl25ylrflgkycfgyvny5hr8i38flirw9jidwy5zf1pny";
-      name = "akonadi-search-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz";
+      sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x";
+      name = "akonadi-search-17.12.3.tar.xz";
     };
   };
   akregator = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akregator-17.12.2.tar.xz";
-      sha256 = "19grppwmspn7x84ygxscch3ydr5i6nanshi1pk4wr5z34g8qcxrc";
-      name = "akregator-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz";
+      sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp";
+      name = "akregator-17.12.3.tar.xz";
     };
   };
   analitza = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/analitza-17.12.2.tar.xz";
-      sha256 = "128qcnzizcvrc1mknb5qdzricymxai2mxlrxb5h93cc14jwiivg1";
-      name = "analitza-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz";
+      sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw";
+      name = "analitza-17.12.3.tar.xz";
     };
   };
   ark = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ark-17.12.2.tar.xz";
-      sha256 = "0xh60mf1ygyhcc06w8g4nnrhqyjf88ji3kf8d5vfpdijq8m6gg8b";
-      name = "ark-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz";
+      sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi";
+      name = "ark-17.12.3.tar.xz";
     };
   };
   artikulate = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/artikulate-17.12.2.tar.xz";
-      sha256 = "0plc81c7sc47392x183q30x39ksjr1wnjhlwy0ixngj2q9nhi6nn";
-      name = "artikulate-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz";
+      sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx";
+      name = "artikulate-17.12.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/audiocd-kio-17.12.2.tar.xz";
-      sha256 = "1n3n3ylwdm5yjv0hh43rmn3bn0q32xsbrl5wlbwgiijhpqd0ahkw";
-      name = "audiocd-kio-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz";
+      sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26";
+      name = "audiocd-kio-17.12.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/baloo-widgets-17.12.2.tar.xz";
-      sha256 = "0pw153cy606dggkq2njk6fs5yp6a9jlkwpp7vckd9jl5s6pbsqd2";
-      name = "baloo-widgets-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz";
+      sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h";
+      name = "baloo-widgets-17.12.3.tar.xz";
     };
   };
   blinken = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/blinken-17.12.2.tar.xz";
-      sha256 = "008pmr3g553xd4mcdmby0fqzp8vk651dji3c8zkad94560xysm71";
-      name = "blinken-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz";
+      sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0";
+      name = "blinken-17.12.3.tar.xz";
     };
   };
   bomber = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/bomber-17.12.2.tar.xz";
-      sha256 = "1rdxr7w2p3r1gviqsmshx6n07gzsc3ymz6drhqk3kacqwgnnr72y";
-      name = "bomber-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz";
+      sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s";
+      name = "bomber-17.12.3.tar.xz";
     };
   };
   bovo = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/bovo-17.12.2.tar.xz";
-      sha256 = "0rhj0w7li1rsfjmrivr6g6z9ja408v59pk5rpci4344piaqglrqm";
-      name = "bovo-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz";
+      sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9";
+      name = "bovo-17.12.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/calendarsupport-17.12.2.tar.xz";
-      sha256 = "0c6i8gqjdgc9s3mz351qjxwv6fsk3098i7ni6x4bhh5shg863vnr";
-      name = "calendarsupport-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz";
+      sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84";
+      name = "calendarsupport-17.12.3.tar.xz";
     };
   };
   cantor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/cantor-17.12.2.tar.xz";
-      sha256 = "1b055fcbpqs4fwwyj0pywv5y8pfpg3ha5382d4hhrpvpc8xwjn6c";
-      name = "cantor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz";
+      sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w";
+      name = "cantor-17.12.3.tar.xz";
     };
   };
   cervisia = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/cervisia-17.12.2.tar.xz";
-      sha256 = "1iqkp7d3wkmi0wfxsx2k20qblkmk6m1ndh472bxn6vvfaii2dqmm";
-      name = "cervisia-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz";
+      sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr";
+      name = "cervisia-17.12.3.tar.xz";
     };
   };
   dolphin = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/dolphin-17.12.2.tar.xz";
-      sha256 = "1pmfix569996minfc8rrjdbfvybm1a5bnljk0gxybahlainxwjp4";
-      name = "dolphin-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz";
+      sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20";
+      name = "dolphin-17.12.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/dolphin-plugins-17.12.2.tar.xz";
-      sha256 = "03637pxjf0kjbw831vvdj3lk3msvn6y3gkildsr1490v60cl2f2c";
-      name = "dolphin-plugins-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz";
+      sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf";
+      name = "dolphin-plugins-17.12.3.tar.xz";
     };
   };
   dragon = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/dragon-17.12.2.tar.xz";
-      sha256 = "03z263agwrkpqf1l3xpfmgxjzqs6icwxv22bp5shzlyiq5dvmq0d";
-      name = "dragon-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz";
+      sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4";
+      name = "dragon-17.12.3.tar.xz";
     };
   };
   eventviews = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/eventviews-17.12.2.tar.xz";
-      sha256 = "1y1d8flzmi3mm15gc2q2925f1z17lcm5b8difd65z7rji4ra9rg6";
-      name = "eventviews-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz";
+      sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc";
+      name = "eventviews-17.12.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ffmpegthumbs-17.12.2.tar.xz";
-      sha256 = "098w62hvjqkq9iixbipg1wl0091d0fnb49jm874k4d68mpvlmmf2";
-      name = "ffmpegthumbs-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz";
+      sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5";
+      name = "ffmpegthumbs-17.12.3.tar.xz";
     };
   };
   filelight = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/filelight-17.12.2.tar.xz";
-      sha256 = "1ysh5rb9irgha62iw1yiw5f4fxanym9swgc8sd9cdlmkqm6km27m";
-      name = "filelight-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz";
+      sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf";
+      name = "filelight-17.12.3.tar.xz";
     };
   };
   granatier = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/granatier-17.12.2.tar.xz";
-      sha256 = "1c86vh6jx991ig1n6n591r9va8rs029gd83m6y9appavi43aylkv";
-      name = "granatier-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz";
+      sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x";
+      name = "granatier-17.12.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/grantlee-editor-17.12.2.tar.xz";
-      sha256 = "1x4rn8liz083y8h3in743xrmk3caqcn75ba97f8ymaap0f48nly6";
-      name = "grantlee-editor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz";
+      sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4";
+      name = "grantlee-editor-17.12.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/grantleetheme-17.12.2.tar.xz";
-      sha256 = "0cpmd8glpjpg62h2qcngaks6adahfcbf9aikm9y4gwqbsmglqjkx";
-      name = "grantleetheme-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz";
+      sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx";
+      name = "grantleetheme-17.12.3.tar.xz";
     };
   };
   gwenview = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/gwenview-17.12.2.tar.xz";
-      sha256 = "0cpv7wlbkm20vch1d4m49kxk02by9zh9lbdcli5p6bgp8mnvpxgr";
-      name = "gwenview-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz";
+      sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr";
+      name = "gwenview-17.12.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/incidenceeditor-17.12.2.tar.xz";
-      sha256 = "1qlghzfc4lg69p5014f3zj6k0lgy57n0lg063b804nqy0378xra2";
-      name = "incidenceeditor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz";
+      sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka";
+      name = "incidenceeditor-17.12.3.tar.xz";
     };
   };
   juk = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/juk-17.12.2.tar.xz";
-      sha256 = "1wa52sysy3hr7n5r59vb9qqnac73fcy2dc3zl51ba9da8lz8q0lj";
-      name = "juk-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz";
+      sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6";
+      name = "juk-17.12.3.tar.xz";
     };
   };
   k3b = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/k3b-17.12.2.tar.xz";
-      sha256 = "0ryzchkk37yzihfhra5xh5sj2k46bdlspi9i2zfs63q3n32jyfww";
-      name = "k3b-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz";
+      sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l";
+      name = "k3b-17.12.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kaccounts-integration-17.12.2.tar.xz";
-      sha256 = "14mipln6ppg88yipwvyc6ainj250ss6xynh9smxbji533wyg72c5";
-      name = "kaccounts-integration-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz";
+      sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9";
+      name = "kaccounts-integration-17.12.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kaccounts-providers-17.12.2.tar.xz";
-      sha256 = "1lapgxlgzymrdl8swn2prrlrmz5xgmkhmv7hx8fpxpc3cpfyvfsd";
-      name = "kaccounts-providers-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz";
+      sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5";
+      name = "kaccounts-providers-17.12.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kaddressbook-17.12.2.tar.xz";
-      sha256 = "1b5a5ypmf0jr9si5cx01h52aql26v6cv16wzrrb6vhxqzksmwriw";
-      name = "kaddressbook-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz";
+      sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq";
+      name = "kaddressbook-17.12.3.tar.xz";
     };
   };
   kajongg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kajongg-17.12.2.tar.xz";
-      sha256 = "15vnin2rg63c60injxqkx0jp5sy1hjmh5rys3qq40wy0bm41pwai";
-      name = "kajongg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz";
+      sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa";
+      name = "kajongg-17.12.3.tar.xz";
     };
   };
   kalarm = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalarm-17.12.2.tar.xz";
-      sha256 = "1vvayib91mh73kqc0linzqlwa1l9jlc2wsih80bzzglaaxbi4l7z";
-      name = "kalarm-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz";
+      sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7";
+      name = "kalarm-17.12.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalarmcal-17.12.2.tar.xz";
-      sha256 = "04js601j477jwa5lhqdxq9gaacd7bf5ladgy3k64dwns5mx1j762";
-      name = "kalarmcal-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz";
+      sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km";
+      name = "kalarmcal-17.12.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalgebra-17.12.2.tar.xz";
-      sha256 = "10vfzwmz0l7yvmy8gjwcb3dnpqyfngj47knb5knvkibqzij6p4w4";
-      name = "kalgebra-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz";
+      sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7";
+      name = "kalgebra-17.12.3.tar.xz";
     };
   };
   kalzium = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalzium-17.12.2.tar.xz";
-      sha256 = "0rdq2cpq5mzl3qrj3ll1d0qixaiygl5x277wlr5fg9cngi51v58x";
-      name = "kalzium-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz";
+      sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h";
+      name = "kalzium-17.12.3.tar.xz";
     };
   };
   kamera = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kamera-17.12.2.tar.xz";
-      sha256 = "070kvaij5chk8nkap9nm1rrilq3sc32q7ysnrld9bssbfi9m73v7";
-      name = "kamera-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz";
+      sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9";
+      name = "kamera-17.12.3.tar.xz";
     };
   };
   kanagram = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kanagram-17.12.2.tar.xz";
-      sha256 = "1300wg5k6x6s1wgmavywcwyqgv68xv0qv6hkqawvzsd61zfhxcr3";
-      name = "kanagram-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz";
+      sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k";
+      name = "kanagram-17.12.3.tar.xz";
     };
   };
   kapman = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kapman-17.12.2.tar.xz";
-      sha256 = "0njf1017dnf4xl801xinfgfmqqpjf3ifnpwchg35zm2qlrlwhmyi";
-      name = "kapman-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz";
+      sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z";
+      name = "kapman-17.12.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kapptemplate-17.12.2.tar.xz";
-      sha256 = "16p63zil3vaa5q2q01010gshn6a58kbmayks27kdgvsfdavgdh51";
-      name = "kapptemplate-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz";
+      sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3";
+      name = "kapptemplate-17.12.3.tar.xz";
     };
   };
   kate = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kate-17.12.2.tar.xz";
-      sha256 = "1w3pswd3gpjpa55xy98yq39nck775mfv5i9lcvm8y15x1233rr6p";
-      name = "kate-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz";
+      sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5";
+      name = "kate-17.12.3.tar.xz";
     };
   };
   katomic = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/katomic-17.12.2.tar.xz";
-      sha256 = "0jhmszbq0rslwg8b8aq0vjynjlkg491di661k2b6yrsfqr4vmngw";
-      name = "katomic-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz";
+      sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl";
+      name = "katomic-17.12.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kblackbox-17.12.2.tar.xz";
-      sha256 = "07bvmcfm3r4dj41dvsaba4rig2i9yilshrzl3wwprsjajmx4j6rf";
-      name = "kblackbox-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz";
+      sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm";
+      name = "kblackbox-17.12.3.tar.xz";
     };
   };
   kblocks = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kblocks-17.12.2.tar.xz";
-      sha256 = "019h8rxv9p1ynby7bshr2yzrcn415magwlzmyrwvh5hzjjp0bmm9";
-      name = "kblocks-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz";
+      sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2";
+      name = "kblocks-17.12.3.tar.xz";
     };
   };
   kblog = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kblog-17.12.2.tar.xz";
-      sha256 = "1s2py5ll879zxcl6l7y2jryy1z29wljwm8hrgr52f8xr22vspbjc";
-      name = "kblog-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz";
+      sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb";
+      name = "kblog-17.12.3.tar.xz";
     };
   };
   kbounce = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kbounce-17.12.2.tar.xz";
-      sha256 = "0rb9p8q0zwwfx70cxfcdbr9h3i8gag0da8nql6nnd37v2wcr4i82";
-      name = "kbounce-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz";
+      sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw";
+      name = "kbounce-17.12.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kbreakout-17.12.2.tar.xz";
-      sha256 = "1j9gfzgdjhfd4jz2x3qgbd4jwfix0m1qx5lnlbkbxnff5jkw68sh";
-      name = "kbreakout-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz";
+      sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c";
+      name = "kbreakout-17.12.3.tar.xz";
     };
   };
   kbruch = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kbruch-17.12.2.tar.xz";
-      sha256 = "0q95i474lgbl6phshbw7f89kik8hk9k8j8vpbzy3cchwn7dmg3p3";
-      name = "kbruch-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz";
+      sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r";
+      name = "kbruch-17.12.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcachegrind-17.12.2.tar.xz";
-      sha256 = "02nx8vqvl62vdm311r4akcckzl1w4c47phl3ybswygrakik7vf2a";
-      name = "kcachegrind-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz";
+      sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd";
+      name = "kcachegrind-17.12.3.tar.xz";
     };
   };
   kcalc = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcalc-17.12.2.tar.xz";
-      sha256 = "13h4c97qz8g7z4r5kb4js6sjzdgr3s4mabzr16qkwmmg4lwvzcp8";
-      name = "kcalc-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz";
+      sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j";
+      name = "kcalc-17.12.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcalcore-17.12.2.tar.xz";
-      sha256 = "06z7xd0a8pz75zx1l2hcban39rc6dmxhhwhgidfglkj3l2xzw927";
-      name = "kcalcore-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz";
+      sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z";
+      name = "kcalcore-17.12.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcalutils-17.12.2.tar.xz";
-      sha256 = "11vp32f53by2gc7zv08zq0z591rw4srmmjmiafds8hvx76ry3dsl";
-      name = "kcalutils-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz";
+      sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb";
+      name = "kcalutils-17.12.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcharselect-17.12.2.tar.xz";
-      sha256 = "1gbr6gvp2vwgvns83pmg5idhwhixyw9yqyr6nn61qf43f97nkdiy";
-      name = "kcharselect-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz";
+      sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4";
+      name = "kcharselect-17.12.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcolorchooser-17.12.2.tar.xz";
-      sha256 = "0jjzpm82jy9f4qf5sf5v24vk50y4qq2sj42zn057v0kwlpwzvrr9";
-      name = "kcolorchooser-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz";
+      sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl";
+      name = "kcolorchooser-17.12.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcontacts-17.12.2.tar.xz";
-      sha256 = "0hg442jg0rb7fsy67fg44551c02gx3i7znwl6cgr9nzlxj5srhyq";
-      name = "kcontacts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz";
+      sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl";
+      name = "kcontacts-17.12.3.tar.xz";
     };
   };
   kcron = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcron-17.12.2.tar.xz";
-      sha256 = "1h1bkicvfbz7s0n36iw5pilqrv2vfzl3rwqx6r0wa10341sx8wc3";
-      name = "kcron-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz";
+      sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf";
+      name = "kcron-17.12.3.tar.xz";
     };
   };
   kdav = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdav-17.12.2.tar.xz";
-      sha256 = "1jlw2l6jd2rhf7swl7bwlsphp1xddb0f9xzkpa6dxw4cimfz4r7l";
-      name = "kdav-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz";
+      sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4";
+      name = "kdav-17.12.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdebugsettings-17.12.2.tar.xz";
-      sha256 = "1a9yy42x16maj60wh7x19248gp1x4diybj9k2gkmlf7hd8g82m4b";
-      name = "kdebugsettings-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz";
+      sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr";
+      name = "kdebugsettings-17.12.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kde-dev-scripts-17.12.2.tar.xz";
-      sha256 = "181s9cf1kqx35w9cza40svgzbqvhz48f858r0rxvl6klzm7rrqmn";
-      name = "kde-dev-scripts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz";
+      sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554";
+      name = "kde-dev-scripts-17.12.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kde-dev-utils-17.12.2.tar.xz";
-      sha256 = "044w9az0jnc7lhlgyiqxsl5lgfzbnrfrdvsr2918idy2niif7cjq";
-      name = "kde-dev-utils-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz";
+      sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6";
+      name = "kde-dev-utils-17.12.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdeedu-data-17.12.2.tar.xz";
-      sha256 = "1sdldx357ifv4sqwa8yrcjxyricb0kk21gvj9472bi28rcgyxqgv";
-      name = "kdeedu-data-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz";
+      sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr";
+      name = "kdeedu-data-17.12.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-mobipocket-17.12.2.tar.xz";
-      sha256 = "1jx5ir1q12s939m0nndhxwiarfr6r7ma79dy9fn5bbhdjgjqf7fq";
-      name = "kdegraphics-mobipocket-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz";
+      sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j";
+      name = "kdegraphics-mobipocket-17.12.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-thumbnailers-17.12.2.tar.xz";
-      sha256 = "0d6cf2mhblxgnhv432x9rgk5k73fhpa20xajn6nfawxkmpkzngsy";
-      name = "kdegraphics-thumbnailers-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz";
+      sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4";
+      name = "kdegraphics-thumbnailers-17.12.3.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdenetwork-filesharing-17.12.2.tar.xz";
-      sha256 = "1ghdskmc0ynjb1a4qid9vjjcl8nmyqvr5x6aryzz9g1rmm6vv8l5";
-      name = "kdenetwork-filesharing-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz";
+      sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh";
+      name = "kdenetwork-filesharing-17.12.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdenlive-17.12.2.tar.xz";
-      sha256 = "1l2sv78wwfwrya486sm4iszkm1hsj473a5gpkgay66h4qb968w70";
-      name = "kdenlive-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz";
+      sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp";
+      name = "kdenlive-17.12.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdepim-addons-17.12.2.tar.xz";
-      sha256 = "185qargpzlmphq5afzvw0pcmas8ska2cnnbv5rpicmg8q01ixnm7";
-      name = "kdepim-addons-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz";
+      sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h";
+      name = "kdepim-addons-17.12.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdepim-apps-libs-17.12.2.tar.xz";
-      sha256 = "0zn620bv551lgl6sx9g4f8ncpv5hs231jbrzkiwqw6y74xw5qq7g";
-      name = "kdepim-apps-libs-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz";
+      sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24";
+      name = "kdepim-apps-libs-17.12.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdepim-runtime-17.12.2.tar.xz";
-      sha256 = "1z11ac0l4n80nybsnfk716c88ah2l7g1fsz5xmzvv6pcmhm2q94j";
-      name = "kdepim-runtime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz";
+      sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn";
+      name = "kdepim-runtime-17.12.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdesdk-kioslaves-17.12.2.tar.xz";
-      sha256 = "09r7iqqvil2sjfzdnq64075gmm7wxd705j00qxfch99ja3nf4961";
-      name = "kdesdk-kioslaves-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz";
+      sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa";
+      name = "kdesdk-kioslaves-17.12.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdesdk-thumbnailers-17.12.2.tar.xz";
-      sha256 = "1j8gqwcs65cfpaqvny29yqzsgjbjmxrafnf4ggc1bjaz2p63blni";
-      name = "kdesdk-thumbnailers-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz";
+      sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci";
+      name = "kdesdk-thumbnailers-17.12.3.tar.xz";
     };
   };
   kdf = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdf-17.12.2.tar.xz";
-      sha256 = "07379lagrl7hhh05dixd4ldqiy9pwmw0yai8sgcbfi3kgcns9c6a";
-      name = "kdf-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz";
+      sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp";
+      name = "kdf-17.12.3.tar.xz";
     };
   };
   kdialog = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdialog-17.12.2.tar.xz";
-      sha256 = "1pwicn5jsg3jwqqkrjhaxbcd9762k9fj4w51ahglby04c4cca38a";
-      name = "kdialog-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz";
+      sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4";
+      name = "kdialog-17.12.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdiamond-17.12.2.tar.xz";
-      sha256 = "03m91x6rgh3wd8mim41d08x1c06ndg9vkciyl6nkj4iyflwwy0rp";
-      name = "kdiamond-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz";
+      sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc";
+      name = "kdiamond-17.12.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/keditbookmarks-17.12.2.tar.xz";
-      sha256 = "1aqqd2lvdbqhnzz28axv9j84s7i7cxrs39zyaia7cwzbbgymkal1";
-      name = "keditbookmarks-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz";
+      sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya";
+      name = "keditbookmarks-17.12.3.tar.xz";
     };
   };
   kfind = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kfind-17.12.2.tar.xz";
-      sha256 = "0zxm5fjf6xzl871gjbs5nzp6h5j4qm47ygfq644jqbi9f3z2in74";
-      name = "kfind-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz";
+      sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s";
+      name = "kfind-17.12.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kfloppy-17.12.2.tar.xz";
-      sha256 = "0s25jbngh6zipxm16kffvwyd1ircnf0xjsh20lm08i9kh4jcicgq";
-      name = "kfloppy-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz";
+      sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p";
+      name = "kfloppy-17.12.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kfourinline-17.12.2.tar.xz";
-      sha256 = "0cqlqab9sazhvvsdyvwzdzrjccvlbxwq2p1n6ki8g8i6707mx3hc";
-      name = "kfourinline-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz";
+      sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw";
+      name = "kfourinline-17.12.3.tar.xz";
     };
   };
   kgeography = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kgeography-17.12.2.tar.xz";
-      sha256 = "1mf5zr4cwnnrvsad4mq0mr6p3v38payajagc2whfl1lmcg82f2wl";
-      name = "kgeography-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz";
+      sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih";
+      name = "kgeography-17.12.3.tar.xz";
     };
   };
   kget = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kget-17.12.2.tar.xz";
-      sha256 = "1fm5yzxxg7lihzgnl7207gfn9gz33ydk1axf8lmdhwwld14q25f9";
-      name = "kget-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz";
+      sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww";
+      name = "kget-17.12.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kgoldrunner-17.12.2.tar.xz";
-      sha256 = "0dddzimh41xm6fvz1spl58gwff9vlx12h52kbfxdb2wz60zkg8wb";
-      name = "kgoldrunner-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz";
+      sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx";
+      name = "kgoldrunner-17.12.3.tar.xz";
     };
   };
   kgpg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kgpg-17.12.2.tar.xz";
-      sha256 = "0r604acqm255xqjqg4islk30g62f8p9mj6haqp0iyw82239hbkp0";
-      name = "kgpg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz";
+      sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp";
+      name = "kgpg-17.12.3.tar.xz";
     };
   };
   khangman = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/khangman-17.12.2.tar.xz";
-      sha256 = "1wk0k4lbskgxrbv91032yg6n64ghir25128pphsy61m4v00jysg3";
-      name = "khangman-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz";
+      sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk";
+      name = "khangman-17.12.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/khelpcenter-17.12.2.tar.xz";
-      sha256 = "0871xxril7dllks46f4a31dkiwmgjc8ajm2jpn5hfm3g2cbawlsd";
-      name = "khelpcenter-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz";
+      sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n";
+      name = "khelpcenter-17.12.3.tar.xz";
     };
   };
   kholidays = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kholidays-17.12.2.tar.xz";
-      sha256 = "0mn2bmjiy5k99g4yv0n61jklyp1105kmnvkf4ay28ha55zy95bbk";
-      name = "kholidays-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz";
+      sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di";
+      name = "kholidays-17.12.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kidentitymanagement-17.12.2.tar.xz";
-      sha256 = "1s5xjgbp7vdww8k59s8h2mypi1d94n4kkphkgiybdq2gxpfq73pb";
-      name = "kidentitymanagement-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz";
+      sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y";
+      name = "kidentitymanagement-17.12.3.tar.xz";
     };
   };
   kig = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kig-17.12.2.tar.xz";
-      sha256 = "1cphrji1l3c32j8wdr88y40fzkr9s20q79hlk4c4rhzkym7jgzhp";
-      name = "kig-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz";
+      sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid";
+      name = "kig-17.12.3.tar.xz";
     };
   };
   kigo = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kigo-17.12.2.tar.xz";
-      sha256 = "0xz8nmhgx8iadwmqkm6469vw8vn9n74mk2fhmciqn8xn66r11g9d";
-      name = "kigo-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz";
+      sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh";
+      name = "kigo-17.12.3.tar.xz";
     };
   };
   killbots = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/killbots-17.12.2.tar.xz";
-      sha256 = "140v8mwbkhv9fkqi0781mrk51fk00q5p1ad3p1rqgmhy0pzfvkg4";
-      name = "killbots-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz";
+      sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an";
+      name = "killbots-17.12.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kimagemapeditor-17.12.2.tar.xz";
-      sha256 = "16wyb80al1vp3macr2lrkh0f1l42jzm126mv2l5gbhd5qiwj6yag";
-      name = "kimagemapeditor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz";
+      sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn";
+      name = "kimagemapeditor-17.12.3.tar.xz";
     };
   };
   kimap = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kimap-17.12.2.tar.xz";
-      sha256 = "15nbnjckmqa4kka012lvaziimgnr6vs5k361sjhdykvrvk4fhz13";
-      name = "kimap-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz";
+      sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw";
+      name = "kimap-17.12.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kio-extras-17.12.2.tar.xz";
-      sha256 = "0vc8wwx9cqs48hn1hf49fmz99xa4c8vhcqq58wmpq3bg62vfipyp";
-      name = "kio-extras-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz";
+      sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks";
+      name = "kio-extras-17.12.3.tar.xz";
     };
   };
   kiriki = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kiriki-17.12.2.tar.xz";
-      sha256 = "1a427gja7y2s37a29jl1n4bx1xa2piqm7wwv7g7agaxm5j15qvx8";
-      name = "kiriki-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz";
+      sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q";
+      name = "kiriki-17.12.3.tar.xz";
     };
   };
   kiten = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kiten-17.12.2.tar.xz";
-      sha256 = "0bcb65pcs3xv5pmr78zlxcbicxknvbf30h83i4f4qjxrq6iw8sf4";
-      name = "kiten-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz";
+      sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5";
+      name = "kiten-17.12.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kjumpingcube-17.12.2.tar.xz";
-      sha256 = "0d2gdvjd0fxxdnpxfplw9gp69b1qx35w165srd79qcx17c2r7cdv";
-      name = "kjumpingcube-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz";
+      sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l";
+      name = "kjumpingcube-17.12.3.tar.xz";
     };
   };
   kldap = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kldap-17.12.2.tar.xz";
-      sha256 = "177xg8ng4636gnppf4jf0m2amadlrz0n9bdmc7f6xnijchmda2p4";
-      name = "kldap-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz";
+      sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy";
+      name = "kldap-17.12.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kleopatra-17.12.2.tar.xz";
-      sha256 = "04c1w1la826dwjam19m12jg8l5c8641l7ad6injrbig1kja819v4";
-      name = "kleopatra-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz";
+      sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd";
+      name = "kleopatra-17.12.3.tar.xz";
     };
   };
   klettres = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/klettres-17.12.2.tar.xz";
-      sha256 = "16pi5r4s67j6pq5jjbyap7jrxxx5wrg7dr77391yk06s955rcfr1";
-      name = "klettres-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz";
+      sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0";
+      name = "klettres-17.12.3.tar.xz";
     };
   };
   klickety = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/klickety-17.12.2.tar.xz";
-      sha256 = "0rwmswrmwjizv9vw3bivh75wisy09icbykvwsi43zsapar9hs89l";
-      name = "klickety-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz";
+      sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8";
+      name = "klickety-17.12.3.tar.xz";
     };
   };
   klines = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/klines-17.12.2.tar.xz";
-      sha256 = "0nl5w65m7c46hjh0hvd76x7zf5c9qlqxqn8b96dzgrab6s9f96wf";
-      name = "klines-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz";
+      sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0";
+      name = "klines-17.12.3.tar.xz";
     };
   };
   kmag = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmag-17.12.2.tar.xz";
-      sha256 = "0yxh4y5l6l528j2nz4wl0w8zmydayrgh1aracy1lymv65ww8qax2";
-      name = "kmag-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz";
+      sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w";
+      name = "kmag-17.12.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmahjongg-17.12.2.tar.xz";
-      sha256 = "06skr41bs29q19dm6j79h0x1l2szbr6gz9kn6s47s23wmyjkqdqr";
-      name = "kmahjongg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz";
+      sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a";
+      name = "kmahjongg-17.12.3.tar.xz";
     };
   };
   kmail = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmail-17.12.2.tar.xz";
-      sha256 = "0kanmbb09x6cyswq7ws6cw7j117lqwqp3hvs9hipx7nyr38mhrlc";
-      name = "kmail-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz";
+      sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs";
+      name = "kmail-17.12.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmail-account-wizard-17.12.2.tar.xz";
-      sha256 = "1l7szmbhxrqj93cqvpaywgyql319n1wmw8acnca1aym9l79pns0s";
-      name = "kmail-account-wizard-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz";
+      sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx";
+      name = "kmail-account-wizard-17.12.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmailtransport-17.12.2.tar.xz";
-      sha256 = "1prrw61vz52wp8yb587xz1kd5rm6s6dry8i9zcs66aha5g7r0wj8";
-      name = "kmailtransport-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz";
+      sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0";
+      name = "kmailtransport-17.12.3.tar.xz";
     };
   };
   kmbox = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmbox-17.12.2.tar.xz";
-      sha256 = "0q6217br3cpdwns6hiw5klnvkwwx7sd8gbl003clf4wkfnxpgqsb";
-      name = "kmbox-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz";
+      sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm";
+      name = "kmbox-17.12.3.tar.xz";
     };
   };
   kmime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz";
-      sha256 = "097xzsd7lld01iz1nziy8b9vv97xaz6vsl52d5809h0kxfpixw99";
-      name = "kmime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz";
+      sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm";
+      name = "kmime-17.12.3.tar.xz";
     };
   };
   kmines = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmines-17.12.2.tar.xz";
-      sha256 = "00apcafaxh18rxk8d3r333mzjd0b6f7946kp6ffr1ps9c93mm3ab";
-      name = "kmines-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz";
+      sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9";
+      name = "kmines-17.12.3.tar.xz";
     };
   };
   kmix = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmix-17.12.2.tar.xz";
-      sha256 = "096dbmywdhgcjzvm473sm0vjrmgfmb19cjx82066ws8pvn9fybdj";
-      name = "kmix-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz";
+      sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp";
+      name = "kmix-17.12.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmousetool-17.12.2.tar.xz";
-      sha256 = "08kv4j6r18wrl7n4j7apffyj52w77l8rkksvmdzlfg2nk87vaafj";
-      name = "kmousetool-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz";
+      sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z";
+      name = "kmousetool-17.12.3.tar.xz";
     };
   };
   kmouth = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmouth-17.12.2.tar.xz";
-      sha256 = "12kdrwz3mxwz9y4srq5jjrrn0wg3905qhg1qbj8p583gk1n03g20";
-      name = "kmouth-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz";
+      sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n";
+      name = "kmouth-17.12.3.tar.xz";
     };
   };
   kmplot = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmplot-17.12.2.tar.xz";
-      sha256 = "1pws8lajpjm4nfichd0949lmsn975ivxh2b001gsif3vvadmp48l";
-      name = "kmplot-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz";
+      sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9";
+      name = "kmplot-17.12.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/knavalbattle-17.12.2.tar.xz";
-      sha256 = "0iil9kw7xhjq8ll93hcvcm9apigrys89nj7j2bpvs00208dcyv9c";
-      name = "knavalbattle-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz";
+      sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f";
+      name = "knavalbattle-17.12.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/knetwalk-17.12.2.tar.xz";
-      sha256 = "0l98h7grhgddawbn9apm0zifxpdssdkp29cdrcyv025h72dhj5ih";
-      name = "knetwalk-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz";
+      sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k";
+      name = "knetwalk-17.12.3.tar.xz";
     };
   };
   knotes = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/knotes-17.12.2.tar.xz";
-      sha256 = "009mia832fxll0a5kl5n16zsy54jvvm9gr2zp4qy5xmimci48llj";
-      name = "knotes-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz";
+      sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3";
+      name = "knotes-17.12.3.tar.xz";
     };
   };
   kolf = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kolf-17.12.2.tar.xz";
-      sha256 = "12zxqa88jsg4zf68ndw32gw7l6sjjzq6pkkj0a55wcwsdph59666";
-      name = "kolf-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz";
+      sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj";
+      name = "kolf-17.12.3.tar.xz";
     };
   };
   kollision = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kollision-17.12.2.tar.xz";
-      sha256 = "1lzc0gih4lcw5dbrkkz0411al1xsjnqi1xzdwa2cijlka1py028g";
-      name = "kollision-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz";
+      sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz";
+      name = "kollision-17.12.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kolourpaint-17.12.2.tar.xz";
-      sha256 = "0jd2r9jv0g1wrqvx7dwniv8an4miv3wjl3ym4rkczpdsjh3smc7c";
-      name = "kolourpaint-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz";
+      sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w";
+      name = "kolourpaint-17.12.3.tar.xz";
     };
   };
   kompare = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kompare-17.12.2.tar.xz";
-      sha256 = "0cww2zhvf97zya2wpmc9hyk1vp3za8r8xvxc0l4whcm33w0fwgc9";
-      name = "kompare-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz";
+      sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl";
+      name = "kompare-17.12.3.tar.xz";
     };
   };
   konqueror = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/konqueror-17.12.2.tar.xz";
-      sha256 = "08yyxkrc4rx8y166p8r871rs3b6gxq6fkrnfbg9j4n3387rpg64f";
-      name = "konqueror-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz";
+      sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw";
+      name = "konqueror-17.12.3.tar.xz";
     };
   };
   konquest = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/konquest-17.12.2.tar.xz";
-      sha256 = "18c30b1z0jalkwcgdg6w5y4nl1j2iapp7588qk1zip3nfvgbdpky";
-      name = "konquest-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz";
+      sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli";
+      name = "konquest-17.12.3.tar.xz";
     };
   };
   konsole = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/konsole-17.12.2.tar.xz";
-      sha256 = "1dbsmfqw0d1f0nhmhz61rhy6spcfvv54j7v05axjhh870wyfmrpc";
-      name = "konsole-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz";
+      sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs";
+      name = "konsole-17.12.3.tar.xz";
     };
   };
   kontact = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kontact-17.12.2.tar.xz";
-      sha256 = "0qn1iha7g6i85va7bvcagxjx3qk0g9lpaqikn2fvlz22sgv45a2q";
-      name = "kontact-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz";
+      sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas";
+      name = "kontact-17.12.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kontactinterface-17.12.2.tar.xz";
-      sha256 = "044dys074cgahspx9h3bz8a807r5975b25pwjxwimr9vg4ln37d3";
-      name = "kontactinterface-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz";
+      sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks";
+      name = "kontactinterface-17.12.3.tar.xz";
     };
   };
   korganizer = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/korganizer-17.12.2.tar.xz";
-      sha256 = "0ijw3dq0c21c11a4bhdpgd1ailamrhknim4bs4ix1fgriycwpz31";
-      name = "korganizer-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz";
+      sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40";
+      name = "korganizer-17.12.3.tar.xz";
     };
   };
   kpat = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kpat-17.12.2.tar.xz";
-      sha256 = "1yy81rv29wfym74709hrz67ms6af408ni5dbnpwjniz86fx2jnxs";
-      name = "kpat-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz";
+      sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh";
+      name = "kpat-17.12.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kpimtextedit-17.12.2.tar.xz";
-      sha256 = "1bj3ccvccwg1x5px080w7c3adkjsl1z886bxdimdf84pdxj2fm65";
-      name = "kpimtextedit-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz";
+      sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c";
+      name = "kpimtextedit-17.12.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kqtquickcharts-17.12.2.tar.xz";
-      sha256 = "05xsvc4ppncpjj0w5j7m5075ydxjnln8kjfd002c1m2a755brv5j";
-      name = "kqtquickcharts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz";
+      sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0";
+      name = "kqtquickcharts-17.12.3.tar.xz";
     };
   };
   krdc = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/krdc-17.12.2.tar.xz";
-      sha256 = "0m9ij015cs8qb1sbiysy27jrz070x9dkrbkrsqy3a2n9dkv7jjz0";
-      name = "krdc-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz";
+      sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps";
+      name = "krdc-17.12.3.tar.xz";
     };
   };
   kreversi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kreversi-17.12.2.tar.xz";
-      sha256 = "1qx0lv85pn98wbaskk0ihg3zywwfj9p0l30jjq67my254qlbaqpk";
-      name = "kreversi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz";
+      sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg";
+      name = "kreversi-17.12.3.tar.xz";
     };
   };
   krfb = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/krfb-17.12.2.tar.xz";
-      sha256 = "1ggi0rmb0jx9pkqcvml5q6gxzzng5mdpyj8m9knknhmdx0y19k1b";
-      name = "krfb-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz";
+      sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv";
+      name = "krfb-17.12.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kross-interpreters-17.12.2.tar.xz";
-      sha256 = "05fd5cbgh81qmffbkmn3zanlrdjdqcgyafcw4jxsfvqb556wdvzv";
-      name = "kross-interpreters-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz";
+      sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s";
+      name = "kross-interpreters-17.12.3.tar.xz";
     };
   };
   kruler = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kruler-17.12.2.tar.xz";
-      sha256 = "1j39vrd98p3bxa5kggmg3ccx4wrn8hvd100p0njkd54wagm9r2m7";
-      name = "kruler-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz";
+      sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa";
+      name = "kruler-17.12.3.tar.xz";
     };
   };
   kshisen = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kshisen-17.12.2.tar.xz";
-      sha256 = "02ihwa8zhaig97z14l3jx6c7swsm8aq5107n41h0z0lzf7sir47g";
-      name = "kshisen-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz";
+      sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0";
+      name = "kshisen-17.12.3.tar.xz";
     };
   };
   ksirk = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksirk-17.12.2.tar.xz";
-      sha256 = "049za390509m4gsmjybhidbq3p2qss47whwfmzcj6lpcxf0fsrja";
-      name = "ksirk-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz";
+      sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz";
+      name = "ksirk-17.12.3.tar.xz";
     };
   };
   ksmtp = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksmtp-17.12.2.tar.xz";
-      sha256 = "0g6sjn5vkkwcdqjhpws86l5dhwilxrqqif50dndc2fyiak6x796n";
-      name = "ksmtp-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz";
+      sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b";
+      name = "ksmtp-17.12.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksnakeduel-17.12.2.tar.xz";
-      sha256 = "1gqgw47im2sifxskhbgmg5rr6clvswcz81sinqffmjmpwgrabif7";
-      name = "ksnakeduel-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz";
+      sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy";
+      name = "ksnakeduel-17.12.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kspaceduel-17.12.2.tar.xz";
-      sha256 = "13636n466yna04wga7f206gw1scnjr3w3x59hwi4mdr0sghz9a7i";
-      name = "kspaceduel-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz";
+      sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6";
+      name = "kspaceduel-17.12.3.tar.xz";
     };
   };
   ksquares = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksquares-17.12.2.tar.xz";
-      sha256 = "1csw9kns4b258k1hwcshw01bxbzfa1kclbd4w5fail1qp5xs7x7d";
-      name = "ksquares-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz";
+      sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667";
+      name = "ksquares-17.12.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksudoku-17.12.2.tar.xz";
-      sha256 = "0rwgzg0i8s4b7af2dhzccaklbg3rj0khyjsiawijw66p9gs9cczy";
-      name = "ksudoku-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz";
+      sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n";
+      name = "ksudoku-17.12.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksystemlog-17.12.2.tar.xz";
-      sha256 = "1aw1m1kv3si3qqzhs5mdynmf2b8s2dpsjnb7h0c1l39kq7mbgc9i";
-      name = "ksystemlog-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz";
+      sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr";
+      name = "ksystemlog-17.12.3.tar.xz";
     };
   };
   kteatime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kteatime-17.12.2.tar.xz";
-      sha256 = "13p1v7ic64rfff7md7f33xv9pl89sgjig35q78q31h5q42k6qzv9";
-      name = "kteatime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz";
+      sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz";
+      name = "kteatime-17.12.3.tar.xz";
     };
   };
   ktimer = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktimer-17.12.2.tar.xz";
-      sha256 = "1263bsqz23064v7qnrz51nbbckld3d2vz80cm6z43vcis236bvh2";
-      name = "ktimer-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz";
+      sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x";
+      name = "ktimer-17.12.3.tar.xz";
     };
   };
   ktnef = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktnef-17.12.2.tar.xz";
-      sha256 = "05cj5lghqj8js0bd14w6kbpl29wslyh36yn57sdf5dfbgpnn9a7v";
-      name = "ktnef-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz";
+      sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n";
+      name = "ktnef-17.12.3.tar.xz";
     };
   };
   ktouch = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktouch-17.12.2.tar.xz";
-      sha256 = "1jqc0i6n70vjy6ipgv4swnd8xp404d8frax6nfd4rv3gmn68l5q4";
-      name = "ktouch-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz";
+      sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795";
+      name = "ktouch-17.12.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-accounts-kcm-17.12.2.tar.xz";
-      sha256 = "1qfq2sg2pzv2gkr87yb3r5j0xy0f1j56cxys8c1zijpglfy6a41z";
-      name = "ktp-accounts-kcm-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz";
+      sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm";
+      name = "ktp-accounts-kcm-17.12.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-approver-17.12.2.tar.xz";
-      sha256 = "0jhzazj42qigdbzjidpnkqlsndv3ias80ik033hzks6m22c20bz6";
-      name = "ktp-approver-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz";
+      sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp";
+      name = "ktp-approver-17.12.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-auth-handler-17.12.2.tar.xz";
-      sha256 = "0h81j79285k872wfyflabk6j4s3y7fi0nv41c9n6rnsdv91yvwpk";
-      name = "ktp-auth-handler-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz";
+      sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21";
+      name = "ktp-auth-handler-17.12.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-call-ui-17.12.2.tar.xz";
-      sha256 = "1nh6a7gf3qp3vgw32rbh196ik5pzgad4z6lgrn59x36ssvcpmmd2";
-      name = "ktp-call-ui-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz";
+      sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m";
+      name = "ktp-call-ui-17.12.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-common-internals-17.12.2.tar.xz";
-      sha256 = "18i311hnyd7lwvv6c08dk674w77q1sk3bggj5mp94r987507kns4";
-      name = "ktp-common-internals-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz";
+      sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80";
+      name = "ktp-common-internals-17.12.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-list-17.12.2.tar.xz";
-      sha256 = "1fzw7mqk65ry16bpbrh9zp7rpcbdgjabcsw23xdz08dzl86gji24";
-      name = "ktp-contact-list-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz";
+      sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb";
+      name = "ktp-contact-list-17.12.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-runner-17.12.2.tar.xz";
-      sha256 = "0qmwajxqhd2m2p9jnyqq5c8i1a02r8mc20limrikvg2m25cg8ii9";
-      name = "ktp-contact-runner-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz";
+      sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq";
+      name = "ktp-contact-runner-17.12.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-desktop-applets-17.12.2.tar.xz";
-      sha256 = "02s5b2lgcsslr2zavijp457kngmdall03li9wlgg31kxyqwrycwc";
-      name = "ktp-desktop-applets-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz";
+      sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj";
+      name = "ktp-desktop-applets-17.12.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-filetransfer-handler-17.12.2.tar.xz";
-      sha256 = "1vc8w0aq16rfcwf48s3178y2qmz6r03bsdrgn2mkxscj8z4rv8j5";
-      name = "ktp-filetransfer-handler-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz";
+      sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8";
+      name = "ktp-filetransfer-handler-17.12.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-kded-module-17.12.2.tar.xz";
-      sha256 = "1is5l0ammvqqp4cz9hk9ra63rv5kphy58b1b1qh1vwdhbc74cdx6";
-      name = "ktp-kded-module-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz";
+      sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp";
+      name = "ktp-kded-module-17.12.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-send-file-17.12.2.tar.xz";
-      sha256 = "13xq1slbr6qhjq135kxcxmv9lk5w68i6zkc47ffj76x40hdryh34";
-      name = "ktp-send-file-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz";
+      sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch";
+      name = "ktp-send-file-17.12.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-text-ui-17.12.2.tar.xz";
-      sha256 = "166ya2nggpljf591rvscd2gqbi8fbr2zq06v512clraawfzgbrqa";
-      name = "ktp-text-ui-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz";
+      sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v";
+      name = "ktp-text-ui-17.12.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktuberling-17.12.2.tar.xz";
-      sha256 = "05h47my9f167gi811nzpdn6sdn0k7bdbr582rrm6j1gpjgay2d16";
-      name = "ktuberling-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz";
+      sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4";
+      name = "ktuberling-17.12.3.tar.xz";
     };
   };
   kturtle = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kturtle-17.12.2.tar.xz";
-      sha256 = "0xk3dpnld7f58b9p1hgcv6afvay1yhcm285jq22qa29wi2ckhk6m";
-      name = "kturtle-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz";
+      sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8";
+      name = "kturtle-17.12.3.tar.xz";
     };
   };
   kubrick = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kubrick-17.12.2.tar.xz";
-      sha256 = "0f5b3z91w4g8kl11wv43xn7n92dcfpmga51nw20wk4vsfmrwgpc9";
-      name = "kubrick-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz";
+      sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp";
+      name = "kubrick-17.12.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kwalletmanager-17.12.2.tar.xz";
-      sha256 = "0aqdlm87hxw8d28jr9hhvpjcjs939595vxhg8p5bw5dzanj48zkv";
-      name = "kwalletmanager-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz";
+      sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1";
+      name = "kwalletmanager-17.12.3.tar.xz";
     };
   };
   kwave = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kwave-17.12.2.tar.xz";
-      sha256 = "1l5mdy1qdzw3lmrmvylcjj4wc9xg6brcd7qd20fsanzfv7w8if6k";
-      name = "kwave-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz";
+      sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng";
+      name = "kwave-17.12.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kwordquiz-17.12.2.tar.xz";
-      sha256 = "175cf0qvw7qiifbqbgsg036n125gqpbpw7v1qq81hfg8nl0zpy2h";
-      name = "kwordquiz-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz";
+      sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx";
+      name = "kwordquiz-17.12.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libgravatar-17.12.2.tar.xz";
-      sha256 = "1vps67mbjh31y7q19wr1km0n35drimc7gi4xyhfx17l8k87nrx7a";
-      name = "libgravatar-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz";
+      sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm";
+      name = "libgravatar-17.12.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkcddb-17.12.2.tar.xz";
-      sha256 = "1hqrpnfy5gzknvvcfmbp2axx4qbk0qkl47rmhr8gmpdvlkh33cny";
-      name = "libkcddb-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz";
+      sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi";
+      name = "libkcddb-17.12.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkcompactdisc-17.12.2.tar.xz";
-      sha256 = "12dcyxjr6b6i8zfk3i17ah0kc3x0d9ixy65wj3zw1gf4mmdzgpbk";
-      name = "libkcompactdisc-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz";
+      sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v";
+      name = "libkcompactdisc-17.12.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkdcraw-17.12.2.tar.xz";
-      sha256 = "1qfzyy4952b2lc3619bbzqffvrphqsq16z89bxb4pn1ad796zn62";
-      name = "libkdcraw-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz";
+      sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc";
+      name = "libkdcraw-17.12.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkdegames-17.12.2.tar.xz";
-      sha256 = "1v3a9240crfpjdwpbz0bdwv06572s99h80l53vf3zwmqw5yk05z4";
-      name = "libkdegames-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz";
+      sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd";
+      name = "libkdegames-17.12.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkdepim-17.12.2.tar.xz";
-      sha256 = "069x28ia6d95rm1g3mr339v7rdvlmiz20y4kddp2acja53b0sagg";
-      name = "libkdepim-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz";
+      sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q";
+      name = "libkdepim-17.12.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkeduvocdocument-17.12.2.tar.xz";
-      sha256 = "1g4zldr9ys7ddxqfkkhlyqgq623q303011ifaraid5zpiql092qd";
-      name = "libkeduvocdocument-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz";
+      sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v";
+      name = "libkeduvocdocument-17.12.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkexiv2-17.12.2.tar.xz";
-      sha256 = "0jr9wpnl80xala60yz4zd5j9nd1bv56y688fldr5dxx25ljavn24";
-      name = "libkexiv2-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz";
+      sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg";
+      name = "libkexiv2-17.12.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkgapi-17.12.2.tar.xz";
-      sha256 = "1vki4sxb7dzg202waqqyvjwsx8yhx8cfp2wk4b6p81hfaq8a1syd";
-      name = "libkgapi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz";
+      sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y";
+      name = "libkgapi-17.12.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkgeomap-17.12.2.tar.xz";
-      sha256 = "1spq6g56ih6wlc2qasf3fkpkn7m4gsbn14p6ja60cr1gvf4p9j79";
-      name = "libkgeomap-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz";
+      sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi";
+      name = "libkgeomap-17.12.3.tar.xz";
     };
   };
   libkipi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkipi-17.12.2.tar.xz";
-      sha256 = "180yg24iqh02nkcv7jbvm10lr7z7qagapjh8zarpmh6r2s3c0nh5";
-      name = "libkipi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz";
+      sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq";
+      name = "libkipi-17.12.3.tar.xz";
     };
   };
   libkleo = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkleo-17.12.2.tar.xz";
-      sha256 = "00nlspwnh9nvxarm34y9hdis3af2zkjf2flla4qwks5nhl7fgi8g";
-      name = "libkleo-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz";
+      sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k";
+      name = "libkleo-17.12.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkmahjongg-17.12.2.tar.xz";
-      sha256 = "0l8krpiyzlsn9awp8za10n9qhbac8nf98jiz7dxzn4qpniv45px5";
-      name = "libkmahjongg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz";
+      sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd";
+      name = "libkmahjongg-17.12.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkomparediff2-17.12.2.tar.xz";
-      sha256 = "07is7vn9wrivxpyd4s19371ffylj2x3s5zi14y8zr778nq68wrzq";
-      name = "libkomparediff2-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz";
+      sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l";
+      name = "libkomparediff2-17.12.3.tar.xz";
     };
   };
   libksane = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libksane-17.12.2.tar.xz";
-      sha256 = "01d182hnrj6n8qmh85pkwmjdyhfy0n946zp40r9r6avh9ajrx5nd";
-      name = "libksane-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz";
+      sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2";
+      name = "libksane-17.12.3.tar.xz";
     };
   };
   libksieve = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libksieve-17.12.2.tar.xz";
-      sha256 = "1nfy96ykaxdm5h67bhykgdcmlidsjgvbsf52qs5f7j7iyl3w4nhr";
-      name = "libksieve-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz";
+      sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433";
+      name = "libksieve-17.12.3.tar.xz";
     };
   };
   lokalize = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/lokalize-17.12.2.tar.xz";
-      sha256 = "18nama2dafhp5v1lvxibm92cxwdldkxs778s948qnb7xh65mxvsb";
-      name = "lokalize-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz";
+      sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9";
+      name = "lokalize-17.12.3.tar.xz";
     };
   };
   lskat = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/lskat-17.12.2.tar.xz";
-      sha256 = "0a4gch1krd7xpvxkscy7prsfb72dcg78alk4vz2z70nfn11zrzv3";
-      name = "lskat-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz";
+      sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0";
+      name = "lskat-17.12.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/mailcommon-17.12.2.tar.xz";
-      sha256 = "0ikmbg91f4p7d4qb7nx05n5mlbmmcdwzgw0xvdsib7vkj5cfrxp2";
-      name = "mailcommon-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz";
+      sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f";
+      name = "mailcommon-17.12.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/mailimporter-17.12.2.tar.xz";
-      sha256 = "1p4dc7xwk6wx1j6xk3h5w5cnzm665pzrmc70v8l5898025i94ml5";
-      name = "mailimporter-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz";
+      sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc";
+      name = "mailimporter-17.12.3.tar.xz";
     };
   };
   marble = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/marble-17.12.2.tar.xz";
-      sha256 = "1y6wbh571g2d8gzg9pwdbsc4a4bl67fmvnkf65acs182zfc2x7jy";
-      name = "marble-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz";
+      sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i";
+      name = "marble-17.12.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/mbox-importer-17.12.2.tar.xz";
-      sha256 = "0f1zvp31m6i20jd7xi9hxks8759mvbsj57r2nciwhc47r3m9wi3l";
-      name = "mbox-importer-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz";
+      sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp";
+      name = "mbox-importer-17.12.3.tar.xz";
     };
   };
   messagelib = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/messagelib-17.12.2.tar.xz";
-      sha256 = "17fayacl3m7p0w0rf724fhdm287dz8n03pyliapsxybldgp2rlaz";
-      name = "messagelib-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz";
+      sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald";
+      name = "messagelib-17.12.3.tar.xz";
     };
   };
   minuet = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/minuet-17.12.2.tar.xz";
-      sha256 = "17gwnh0bd2a7fvxbjhwadh0gvb0zly71lwv8znkb18dwsyd38v3r";
-      name = "minuet-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz";
+      sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b";
+      name = "minuet-17.12.3.tar.xz";
     };
   };
   okteta = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/okteta-17.12.2.tar.xz";
-      sha256 = "1k4b2m5pvrv1zxvm6pwmkl0ahh0ynkssa8z1v51a3hxlvw593b4d";
-      name = "okteta-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz";
+      sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
+      name = "okteta-17.12.3.tar.xz";
     };
   };
   okular = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/okular-17.12.2.tar.xz";
-      sha256 = "10rkrwp3rwccvqsw7njcmggw3jkj84fb90vkvqp8k2lmhnrz1ypx";
-      name = "okular-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz";
+      sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha";
+      name = "okular-17.12.3.tar.xz";
     };
   };
   palapeli = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/palapeli-17.12.2.tar.xz";
-      sha256 = "0j9b4a6x3bp9bki2p79ksn86l16niixa2x8xx24vdnd9y71lp2yb";
-      name = "palapeli-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz";
+      sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln";
+      name = "palapeli-17.12.3.tar.xz";
     };
   };
   parley = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/parley-17.12.2.tar.xz";
-      sha256 = "0kqvj1gwsv9kdac0zsv6cda34h8qx8xr43mgwk343c8pcwm1r2r5";
-      name = "parley-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz";
+      sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6";
+      name = "parley-17.12.3.tar.xz";
     };
   };
   picmi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/picmi-17.12.2.tar.xz";
-      sha256 = "0ry4vvspa2mdvxrxvbqihkdh7qvsxhl9v7i07ycx3qs7sybf1rx4";
-      name = "picmi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz";
+      sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn";
+      name = "picmi-17.12.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/pimcommon-17.12.2.tar.xz";
-      sha256 = "0frgn2shd2qzf4rbix9k4psy81b2yzsyy0sisy0ngc68gk5mdj8a";
-      name = "pimcommon-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz";
+      sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq";
+      name = "pimcommon-17.12.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/pim-data-exporter-17.12.2.tar.xz";
-      sha256 = "1fbpz4sw4gn01yc7vzlj9v15wp3b6acbcd6xs9nsp3bfpb9mqd16";
-      name = "pim-data-exporter-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz";
+      sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b";
+      name = "pim-data-exporter-17.12.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/pim-sieve-editor-17.12.2.tar.xz";
-      sha256 = "1jwjgywqp23c17g08c18ajbl2dzq3h9vm94bmbjcan64isd03jr4";
-      name = "pim-sieve-editor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz";
+      sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp";
+      name = "pim-sieve-editor-17.12.3.tar.xz";
     };
   };
   poxml = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/poxml-17.12.2.tar.xz";
-      sha256 = "0amb095qjv8d22ny86rs6wj280b2ag2zpk7bzs5834m75wlmpg6w";
-      name = "poxml-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz";
+      sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp";
+      name = "poxml-17.12.3.tar.xz";
     };
   };
   print-manager = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/print-manager-17.12.2.tar.xz";
-      sha256 = "0sz7xqcjc5ddxkc7gbl1h673ywp3ffhmx985jzpd296n6sjppc2v";
-      name = "print-manager-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz";
+      sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7";
+      name = "print-manager-17.12.3.tar.xz";
     };
   };
   rocs = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/rocs-17.12.2.tar.xz";
-      sha256 = "08flyrla2kqkdc94hd8w2inzmnmzvczcgwl9hzqxxzf3fsjnnfdl";
-      name = "rocs-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz";
+      sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46";
+      name = "rocs-17.12.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/signon-kwallet-extension-17.12.2.tar.xz";
-      sha256 = "06l1mynl7wp1r3gmy5919dm0p19p23harsh6qwdvbi9lffy7ascp";
-      name = "signon-kwallet-extension-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz";
+      sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m";
+      name = "signon-kwallet-extension-17.12.3.tar.xz";
     };
   };
   spectacle = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/spectacle-17.12.2.tar.xz";
-      sha256 = "0qhhnpdk4rqzpg3npj183nl7k1n4mvhcb97hydwaq51yh51r4gvj";
-      name = "spectacle-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz";
+      sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr";
+      name = "spectacle-17.12.3.tar.xz";
     };
   };
   step = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/step-17.12.2.tar.xz";
-      sha256 = "1n9gd2sq2lvfmgvjdb8yn5g25j58jcb24qh8l41k1y0hgcbaxly7";
-      name = "step-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz";
+      sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v";
+      name = "step-17.12.3.tar.xz";
     };
   };
   svgpart = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/svgpart-17.12.2.tar.xz";
-      sha256 = "1d7yrpnxc3sm3381fd9m3fiipi664vl8cz2li8dlw2y4pbgpx28g";
-      name = "svgpart-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz";
+      sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5";
+      name = "svgpart-17.12.3.tar.xz";
     };
   };
   sweeper = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/sweeper-17.12.2.tar.xz";
-      sha256 = "1qi4kfd4p8xnykv3zn3sqkx4b605mwbnr6m9l6cr0v26c01yjq3k";
-      name = "sweeper-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz";
+      sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x";
+      name = "sweeper-17.12.3.tar.xz";
     };
   };
   syndication = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/syndication-17.12.2.tar.xz";
-      sha256 = "1hcdk0apdrppfrjyfjm4cn0iyb1yrf7zq2wb2ipmxzca1hfgw4c0";
-      name = "syndication-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz";
+      sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808";
+      name = "syndication-17.12.3.tar.xz";
     };
   };
   umbrello = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/umbrello-17.12.2.tar.xz";
-      sha256 = "1sm0drfsyyslls5n66mvjy2knbwykws34g74c6rn1mmmdpyp7b94";
-      name = "umbrello-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz";
+      sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0";
+      name = "umbrello-17.12.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/zeroconf-ioslave-17.12.2.tar.xz";
-      sha256 = "09p55dmrsi8jyvs793ya2xzfbhm6f6gwg8ldri15v9n3if7crpzx";
-      name = "zeroconf-ioslave-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz";
+      sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i";
+      name = "zeroconf-ioslave-17.12.3.tar.xz";
     };
   };
 }

From 334538e72b7ab68129e895efee00e8ebc231504f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 12 Mar 2018 17:36:33 +0100
Subject: [PATCH 0862/2266] plasma5: 5.12.2 -> 5.12.3

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index ba1cf9ed993..20fdddfe46c 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 8d959478a0d..14b5f3a39ad 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/bluedevil-5.12.2.tar.xz";
-      sha256 = "11xwyawcfkxhdzcgj4nkj1vlp6zn53k9dl3c4llpj1z08jc2vdpj";
-      name = "bluedevil-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz";
+      sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk";
+      name = "bluedevil-5.12.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/breeze-5.12.2.tar.xz";
-      sha256 = "1vx03wi4m6ly6sw7cznhzg96rkxbn2mxsn9719pra616axl6c00s";
-      name = "breeze-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz";
+      sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw";
+      name = "breeze-5.12.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/breeze-grub-5.12.2.tar.xz";
-      sha256 = "1a76xbnrbd18cd6p0n94fixc7jmd8vdnzqbi9pbi3wj82cpp95xq";
-      name = "breeze-grub-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz";
+      sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b";
+      name = "breeze-grub-5.12.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/breeze-gtk-5.12.2.tar.xz";
-      sha256 = "1811r8gqhrdf5b4a1k94cid1whcd8g6h2mrms6qm40brzj8qn9w0";
-      name = "breeze-gtk-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz";
+      sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x";
+      name = "breeze-gtk-5.12.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/breeze-plymouth-5.12.2.tar.xz";
-      sha256 = "1n96iysljakhhkw9wavhbvj29zlkkajgwpxs6v5ny4iifv9gn3cv";
-      name = "breeze-plymouth-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz";
+      sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn";
+      name = "breeze-plymouth-5.12.3.tar.xz";
     };
   };
   discover = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/discover-5.12.2.tar.xz";
-      sha256 = "1hkbannyrw1c6h45c8s669d4hg6irc991hjlg0mm31lnpa8lb51v";
-      name = "discover-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz";
+      sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd";
+      name = "discover-5.12.3.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/drkonqi-5.12.2.tar.xz";
-      sha256 = "0dw9axkhp0cgw276cpfp4ddf5g9s2ccz6q43pk68fvphbz7m2wqm";
-      name = "drkonqi-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz";
+      sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m";
+      name = "drkonqi-5.12.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kactivitymanagerd-5.12.2.tar.xz";
-      sha256 = "1l6ar094y272fjxzj6qpapz4g5mfbf82z80zygmrs0cizpz1xv84";
-      name = "kactivitymanagerd-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz";
+      sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1";
+      name = "kactivitymanagerd-5.12.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kde-cli-tools-5.12.2.tar.xz";
-      sha256 = "1jd7r49i24psrx59n0djbbxbv8c3wchiabgrv4x4dq6nsqygh6vc";
-      name = "kde-cli-tools-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kde-cli-tools-5.12.3.tar.xz";
+      sha256 = "0d2mkrpy2pib0za75m2mg6pvkklbwizh14cqi3zabqi384fys1j3";
+      name = "kde-cli-tools-5.12.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kdecoration-5.12.2.tar.xz";
-      sha256 = "1whngfld0nlw3mbf70khvqiqqskfglnn3dzx5zg0l14xv0kips79";
-      name = "kdecoration-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz";
+      sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy";
+      name = "kdecoration-5.12.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kde-gtk-config-5.12.2.tar.xz";
-      sha256 = "1ncyj665hra8bj4nk2idpjq0lm72dr3r467ddx6k0n63arvfmxm4";
-      name = "kde-gtk-config-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kde-gtk-config-5.12.3.tar.xz";
+      sha256 = "0wsxz5v585srkn8qbb4b82ci1wgrpzg87krixzsxzd3k0wc0c71q";
+      name = "kde-gtk-config-5.12.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kdeplasma-addons-5.12.2.tar.xz";
-      sha256 = "00x0jd8jw77fh5qy5z9xldw3m27il9mamq0fl8f4vmny7y8hqg2k";
-      name = "kdeplasma-addons-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz";
+      sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p";
+      name = "kdeplasma-addons-5.12.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kgamma5-5.12.2.tar.xz";
-      sha256 = "1xhn8dw0595f48qbvj304agkg34y2pr0czvkpl1ahhzsndgjkxjs";
-      name = "kgamma5-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz";
+      sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm";
+      name = "kgamma5-5.12.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/khotkeys-5.12.2.tar.xz";
-      sha256 = "1hsnasx67vf0jdxnmlvhm86ykvjc89zbr8rdgr1ixq6iy543c1ry";
-      name = "khotkeys-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz";
+      sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa";
+      name = "khotkeys-5.12.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kinfocenter-5.12.2.tar.xz";
-      sha256 = "0sagy72x94nv1zxvllkzgmln2j04bh8cib4fx3zsqfn572wncjqi";
-      name = "kinfocenter-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz";
+      sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr";
+      name = "kinfocenter-5.12.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kmenuedit-5.12.2.tar.xz";
-      sha256 = "1ygwv1s9zgd6qh3gd7537dgjil8h3i21i5wwn99wynbifq0w6ikv";
-      name = "kmenuedit-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz";
+      sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4";
+      name = "kmenuedit-5.12.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kscreen-5.12.2.tar.xz";
-      sha256 = "1scmaydn4fypjizfm7l71vszx725vgbgsg7hpnv2dgwqrf98kl9v";
-      name = "kscreen-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz";
+      sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9";
+      name = "kscreen-5.12.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kscreenlocker-5.12.2.tar.xz";
-      sha256 = "0v8qyjkmaxq711dw1iw12j38aswfr4qccvzkm3qc1gvfjs1vl0gn";
-      name = "kscreenlocker-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz";
+      sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm";
+      name = "kscreenlocker-5.12.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/ksshaskpass-5.12.2.tar.xz";
-      sha256 = "1b70jbdm3c4agk66v5yvzvzdlwp0xn8lmxn3zyk1n280xgqr2z1m";
-      name = "ksshaskpass-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz";
+      sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h";
+      name = "ksshaskpass-5.12.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/ksysguard-5.12.2.tar.xz";
-      sha256 = "0k8ziqbvm8igczij3a26jyc0i7hwiqfv0072kywz76m9pfsd3lp7";
-      name = "ksysguard-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz";
+      sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc";
+      name = "ksysguard-5.12.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kwallet-pam-5.12.2.tar.xz";
-      sha256 = "0xg01iianf0ygpjf971i3fln0gn44gw83gxhplwjv3q5dn79plrd";
-      name = "kwallet-pam-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz";
+      sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz";
+      name = "kwallet-pam-5.12.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kwayland-integration-5.12.2.tar.xz";
-      sha256 = "1s4vdsv8s72nplmk9395zfsp4fars14n2rkgqfp95b7ii76519nn";
-      name = "kwayland-integration-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz";
+      sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi";
+      name = "kwayland-integration-5.12.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kwin-5.12.2.tar.xz";
-      sha256 = "0lnyikmjsxjjbz7mrf421y1lw0vjqsri66dsjv2wldlbgifp94kw";
-      name = "kwin-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz";
+      sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71";
+      name = "kwin-5.12.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/kwrited-5.12.2.tar.xz";
-      sha256 = "1n20g92h2hgcgp9qdxifp55acbkgh09chqz0p8qrj39vw5w5abv4";
-      name = "kwrited-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz";
+      sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1";
+      name = "kwrited-5.12.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/libkscreen-5.12.2.tar.xz";
-      sha256 = "1hv180ac97m1i47c2bapv5bz149i8p55qyfxrka7fivhzszsa8x0";
-      name = "libkscreen-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz";
+      sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4";
+      name = "libkscreen-5.12.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/libksysguard-5.12.2.tar.xz";
-      sha256 = "1nf847lwx88f8g0bknaxzn0q6cvs2xn1cz6ch7qrblg0a8v3ig19";
-      name = "libksysguard-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz";
+      sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l";
+      name = "libksysguard-5.12.3.tar.xz";
     };
   };
   milou = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/milou-5.12.2.tar.xz";
-      sha256 = "1sick71qd04shs34nlsplln3zpgvrbal4jlklm4k094w487fvcc8";
-      name = "milou-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz";
+      sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq";
+      name = "milou-5.12.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/oxygen-5.12.2.tar.xz";
-      sha256 = "03g0pwk5n6idgrrm0g4hfvyls7h8by6lz6rp7h1i9ibpaph3czmy";
-      name = "oxygen-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz";
+      sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856";
+      name = "oxygen-5.12.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-desktop-5.12.2.tar.xz";
-      sha256 = "0wymhk1wzvx3ihq7gn4zkisp5x1n5m62fk1vmg5il75hn69qw4g5";
-      name = "plasma-desktop-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz";
+      sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8";
+      name = "plasma-desktop-5.12.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-integration-5.12.2.tar.xz";
-      sha256 = "0hyxn51vjdbkw9kj5nqp7lr1myjpnlp5ri01jwg43v5h44mq6k08";
-      name = "plasma-integration-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz";
+      sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww";
+      name = "plasma-integration-5.12.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-nm-5.12.2.tar.xz";
-      sha256 = "0wlp0wqbcbnmclfvhii50sds1ij4la3wni9987xym7qrc8bxm43x";
-      name = "plasma-nm-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz";
+      sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w";
+      name = "plasma-nm-5.12.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-pa-5.12.2.tar.xz";
-      sha256 = "119gcgx8rrihhmxzfp7wj3v8q4vwzk989w9qn5b2y72vyvllbln7";
-      name = "plasma-pa-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz";
+      sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l";
+      name = "plasma-pa-5.12.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-sdk-5.12.2.tar.xz";
-      sha256 = "0as3718rkcal8va6w1ip2prsvrp6b218r33hmhdkdbbshnx40csv";
-      name = "plasma-sdk-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz";
+      sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli";
+      name = "plasma-sdk-5.12.3.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-tests-5.12.2.tar.xz";
-      sha256 = "1336kj277hrbgi5dx6z19dp8fgxhifnapd0jas4lq8z06gn6dh40";
-      name = "plasma-tests-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz";
+      sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7";
+      name = "plasma-tests-5.12.3.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-vault-5.12.2.tar.xz";
-      sha256 = "1hkdaxlr00s00ax0xm2zmfk9pwl4nrs1x2dna248s6dd06cjmapk";
-      name = "plasma-vault-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz";
+      sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h";
+      name = "plasma-vault-5.12.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-workspace-5.12.2.tar.xz";
-      sha256 = "1v4xaviby76c833gx02s1bf0hk9smv4m2s8sp75yxirh2xv4azid";
-      name = "plasma-workspace-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz";
+      sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy";
+      name = "plasma-workspace-5.12.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plasma-workspace-wallpapers-5.12.2.tar.xz";
-      sha256 = "1x6qi0cpr461vc7gn4fzz9dh9wfwz6hcgb8dsz82wdxpwssck7i7";
-      name = "plasma-workspace-wallpapers-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-wallpapers-5.12.3.tar.xz";
+      sha256 = "0gmpf0d7dzpnmm9lzgjqmr201mjkvjwbf0qlg5n87w7j9j4c580v";
+      name = "plasma-workspace-wallpapers-5.12.3.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/plymouth-kcm-5.12.2.tar.xz";
-      sha256 = "11kaprbcsd7j1kamsr9m9c27rj1ry8gxp1m6r1ibf9agimsmdfcb";
-      name = "plymouth-kcm-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz";
+      sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk";
+      name = "plymouth-kcm-5.12.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.2";
+    version = "1-5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/polkit-kde-agent-1-5.12.2.tar.xz";
-      sha256 = "176wb8sh9r4f1ij604x52w4q5nbhmnqwxid3w107cqwpydnh0dm9";
-      name = "polkit-kde-agent-1-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/polkit-kde-agent-1-5.12.3.tar.xz";
+      sha256 = "0kb2ijjfqncrw02lrkh6jw2g2rps7aqs7v20gjdam9sacmnwy5j0";
+      name = "polkit-kde-agent-1-5.12.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/powerdevil-5.12.2.tar.xz";
-      sha256 = "0b9m3jm0ar84b2ln1ml5lk26nryrrlis7kj46whzqicwpdi7dpxw";
-      name = "powerdevil-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz";
+      sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484";
+      name = "powerdevil-5.12.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/sddm-kcm-5.12.2.tar.xz";
-      sha256 = "0nh8kviqn43zh6kdqzfcqksp48k1brd8bg4kni2cbmzif6md3ay3";
-      name = "sddm-kcm-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz";
+      sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2";
+      name = "sddm-kcm-5.12.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/systemsettings-5.12.2.tar.xz";
-      sha256 = "06cfxydpcnzi5g6ipi7sgiswgrzhnksgyhsp56zgqdswbilanp4n";
-      name = "systemsettings-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz";
+      sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali";
+      name = "systemsettings-5.12.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/user-manager-5.12.2.tar.xz";
-      sha256 = "047bssxfs8z1lhg25f263fq05w6m22mdk5i16ji5i11n26v8hdwa";
-      name = "user-manager-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz";
+      sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh";
+      name = "user-manager-5.12.3.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.2";
+    version = "5.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.2/xdg-desktop-portal-kde-5.12.2.tar.xz";
-      sha256 = "1gr07p281icc2v7cv3n6rzi1c70ddkwiw12n9klk3sxprjxmc0pm";
-      name = "xdg-desktop-portal-kde-5.12.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.3/xdg-desktop-portal-kde-5.12.3.tar.xz";
+      sha256 = "0swy8kcczvs2ariyjrkln6mvc0xqrjznpkhw5gzyh61v3hpddgk9";
+      name = "xdg-desktop-portal-kde-5.12.3.tar.xz";
     };
   };
 }

From eedc173276dc6f5018d8d5b4a5e1b42a82ec2075 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 12 Mar 2018 16:51:54 +0000
Subject: [PATCH 0863/2266] clingo: fix URL

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

diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index a73feba97b6..dda4963b26e 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -1,12 +1,13 @@
-{stdenv, fetchurl, cmake}:
+{ stdenv, fetchzip, cmake }:
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "clingo";
   version = "5.2.2";
 
-  src = fetchurl {
-    url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz";
-    sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns";
+  src = fetchzip {
+    url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
+    sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm";
   };
 
   buildInputs = [];
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "ASP system to ground and solve logic programs";
     license = stdenv.lib.licenses.mit;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     homepage = "https://potassco.org/";
     downloadPage = "https://github.com/potassco/clingo/releases/";
   };

From 903f4dd3d45a519e41dac6f4f65b7de6005fdde5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 12 Mar 2018 17:07:18 +0000
Subject: [PATCH 0864/2266] clingo: fix build on non-sandboxed darwin

---
 pkgs/applications/science/logic/potassco/clingo.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index dda4963b26e..6bf19a2a2f4 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [];
   nativeBuildInputs = [cmake];
 
+  cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
+
   meta = {
     inherit version;
     description = "ASP system to ground and solve logic programs";

From e11f0aee7c47f871b8ad632d9b2a1ae94d2ccb6e Mon Sep 17 00:00:00 2001
From: Lenz Weber <lenz.weber@mayflower.de>
Date: Mon, 12 Mar 2018 18:34:46 +0100
Subject: [PATCH 0865/2266] gitkraken: 3.3.4 -> 3.4.0

---
 .../version-management/gitkraken/default.nix             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index ba525bacbc9..1e29b458a31 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -7,18 +7,21 @@
 
 with stdenv.lib;
 
+let
+  curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
+in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1djrbpm1f258cicf65ddvndpxi1izmnc12253k1zwl77z4jjbwls";
+    sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1";
   };
 
   libPath = makeLibraryPath [
     stdenv.cc.cc.lib
-    curl
+    curlWithGnuTls
     udev
     libX11
     libXext

From 59cc47d802f434627707a7dc94189ce3a90b5178 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 21 Feb 2018 13:41:12 +0100
Subject: [PATCH 0866/2266] bcal: 1.7 -> 1.8

The tests failed for a good reason on Darwin and should not have been
disabled. The issue has been resolved upstream with version 1.8 which
now also supports AArch64.
---
 pkgs/applications/science/math/bcal/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix                 | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
index 9a0a084a1f0..8db4bd157df 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -4,30 +4,29 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "bcal-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "bcal";
     rev = "v${version}";
-    sha256 = "08cqp2jysvy743gmwpzkbqhybsb49n65r63z3if53m3y59qg4aw8";
+    sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r";
   };
 
   nativeBuildInputs = [ python3Packages.pytest ];
 
-  doCheck = !stdenv.isDarwin;
+  doCheck = true;
   checkPhase = ''
     python3 -m pytest test.py
   '';
 
-  makeFlags = [ "CC=cc" ];
   installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
 
   meta = {
     description = "Storage conversion and expression calculator";
     homepage = https://github.com/jarun/bcal;
     license = licenses.gpl3;
-    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+    platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
     maintainers = with maintainers; [ jfrankenau ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b3d29ce57e..60c8421d846 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19945,9 +19945,7 @@ with pkgs;
 
   pcalc = callPackage ../applications/science/math/pcalc { };
 
-  bcal = callPackage ../applications/science/math/bcal {
-    stdenv = gccStdenv;
-  };
+  bcal = callPackage ../applications/science/math/bcal { };
 
   pspp = callPackage ../applications/science/math/pspp {
     inherit (gnome3) gtksourceview;

From 338985772a309d63912db951045c4508967be835 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 18:42:05 -0800
Subject: [PATCH 0867/2266] bibutils: 5.6 -> 6.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/bib2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/bib2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/bib2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/bib2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/bib2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/bib2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/biblatex2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/biblatex2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/biblatex2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/biblatex2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/biblatex2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/biblatex2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/copac2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/copac2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/copac2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/copac2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/copac2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/copac2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/end2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/end2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/end2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/end2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/end2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/end2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/endx2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/isi2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/isi2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/isi2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/isi2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/isi2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/isi2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/med2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/med2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/med2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/med2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/med2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/med2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/nbib2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/nbib2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/nbib2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/nbib2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/nbib2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/nbib2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ris2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ris2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ris2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ris2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ris2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ris2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ebi2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ebi2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ebi2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ebi2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ebi2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/ebi2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/wordbib2xml -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/wordbib2xml --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/wordbib2xml -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/wordbib2xml --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/wordbib2xml -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/wordbib2xml --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ads -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ads --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ads -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ads --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ads -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ads --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2bib -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2bib --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2bib -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2bib --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2bib -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2bib --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2end -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2end --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2end -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2end --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2end -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2end --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2isi -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2isi --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2isi -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2isi --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2isi -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2isi --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ris -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ris --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ris -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ris --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ris -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2ris --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2wordbib -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2wordbib --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2wordbib -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2wordbib --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2wordbib -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/xml2wordbib --help` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/modsclean -h` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/modsclean --help` got 0 exit code
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/modsclean -v` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/modsclean --version` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/modsclean -h` and found version 6.2
- ran `/nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2/bin/modsclean --help` and found version 6.2
- found 6.2 with grep in /nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2
- found 6.2 in filename of file in /nix/store/9ara0dz7v6alr1rxwqi3ikxd45xzsk8s-bibutils-6.2
---
 pkgs/tools/misc/bibutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index eaa2c6e4942..b720ac22f27 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bibutils-${version}";
-  version = "5.6";
+  version = "6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
-    sha256 = "08vlaf1rs881v61hb0dnab5brbpbwbv2hqlxmw0yaycknqwbmiwz";
+    sha256 = "07wgzk01kfdrjl6g3qlxg9qbi3kyrxxmxyy49qmcfq24fpmf9mrr";
   };
 
   configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];

From 1993ebf0c7294f371f3988f1bb2b4db932dc7024 Mon Sep 17 00:00:00 2001
From: pukkamustard <pukkamustard@posteo.net>
Date: Wed, 7 Mar 2018 17:01:02 +0100
Subject: [PATCH 0868/2266] flyway: refactor supported platforms

Other Unix platforms are supported (not only Linux).
---
 pkgs/development/tools/flyway/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 11e2c6d2c5a..43026e55e7f 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -23,7 +23,7 @@
         description = "Evolve your Database Schema easily and reliably across all your instances";
         homepage = "https://flywaydb.org/";
         license = licenses.asl20;
-        platforms = platforms.linux;
+        platforms = platforms.unix;
         maintainers = [ maintainers.cmcdragonkai ];
       };
     }

From 97fff8d8065e79e89972bc644d88787d7d37edf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 12 Mar 2018 18:49:37 +0000
Subject: [PATCH 0869/2266] Revert "bundler: 1.14.6 -> 1.16.1"

This reverts commit 0aa95d73bd213211258c6431914cd1c289f69cfd.

revert because of gitlab
---
 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 894c9df558e..6ba1d5f10ec 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.16.1";
-  source.sha256 = "1s2nq4qnffxg3kwrk7cnwxcvfihlhxm9absl2l6d3qckf3sy1f22";
+  version = "1.14.6";
+  source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
   dontPatchShebangs = true;
 
   postFixup = ''

From 0c74665bad3699cb3b2f4c0121101b94aa6fed49 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 22 Dec 2017 01:14:47 +0100
Subject: [PATCH 0870/2266] luaevent: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 75f2ab9e582..6731c02568f 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -167,15 +167,14 @@ let
   };
 
   luaevent = buildLuaPackage rec {
-    version = "0.4.3";
+    version = "0.4.4";
     name = "luaevent-${version}";
-    disabled = isLua52;
 
     src = fetchFromGitHub {
       owner = "harningt";
       repo = "luaevent";
       rev = "v${version}";
-      sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik";
+      sha256 = "1krzxr0jkv3gmhpckp02byhdd9s5dd0hpyqc8irc8i79dd8x0p53";
     };
 
     preBuild = ''

From 226965da67c25bbad0c6c0cc6d21b64a647beed8 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 22 Dec 2017 01:17:48 +0100
Subject: [PATCH 0871/2266] prosody: 0.9.12 -> 0.10.0 updating config options,
 removing luazlib as mod_compression was removed for security reasons.

---
 nixos/doc/manual/release-notes/rl-1803.xml    |  27 +++
 nixos/modules/services/networking/prosody.nix | 212 ++++++++++++++++--
 pkgs/servers/xmpp/prosody/default.nix         |   9 +-
 pkgs/top-level/all-packages.nix               |   5 +-
 4 files changed, 221 insertions(+), 32 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index b755245a69f..20f23261b60 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -322,6 +322,33 @@ following incompatible changes:</para>
       <link xlink:href="https://github.com/rvl/pump.io-nixos">external module</link>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The Prosody XMPP server has received a major update. The following modules were renamed:
+      <itemizedlist>
+        <listitem>
+          <para>
+            <option>services.prosody.modules.httpserver</option> is now <option>services.prosody.modules.http_files</option>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <option>services.prosody.modules.console</option> is now <option>services.prosody.modules.admin_telnet</option>
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    <para>
+      Many new modules are now core modules, most notably <option>services.prosody.modules.carbons</option>
+      and <option>services.prosody.modules.mam</option>.
+    </para>
+
+    <para>
+      The better-performing <literal>libevent</literal> backend is now enabled by default.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 9d7e6d6018a..a7b43fb78a9 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -15,6 +15,7 @@ let
         description = "Path to the key file.";
       };
 
+      # TODO: rename to certificate to match the prosody config
       cert = mkOption {
         type = types.path;
         description = "Path to the certificate file.";
@@ -30,7 +31,7 @@ let
   };
 
   moduleOpts = {
-
+    # Generally required
     roster = mkOption {
       type = types.bool;
       default = true;
@@ -61,12 +62,38 @@ let
       description = "Service discovery";
     };
 
-    legacyauth = mkOption {
+    # Not essential, but recommended
+    carbons = mkOption {
       type = types.bool;
       default = true;
-      description = "Legacy authentication. Only used by some old clients and bots";
+      description = "Keep multiple clients in sync";
     };
 
+    pep = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enables users to publish their mood, activity, playing music and more";
+    };
+
+    private = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Private XML storage (for room bookmarks, etc.)";
+    };
+
+    blocklist = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allow users to block communications with other users";
+    };
+
+    vcard = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allow users to set vCards";
+    };
+
+    # Nice to have
     version = mkOption {
       type = types.bool;
       default = true;
@@ -91,36 +118,112 @@ let
       description = "Replies to XMPP pings with pongs";
     };
 
-    console = mkOption {
+    register = mkOption {
       type = types.bool;
-      default = false;
-      description = "telnet to port 5582";
+      default = true;
+      description = "Allow users to register on this server using a client and change passwords";
     };
 
+    mam = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Store messages in an archive and allow users to access it";
+    };
+
+    # Admin interfaces
+    admin_adhoc = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Allows administration via an XMPP client that supports ad-hoc commands";
+    };
+
+    admin_telnet = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Opens telnet console interface on localhost port 5582";
+    };
+
+    # HTTP modules
     bosh = mkOption {
       type = types.bool;
       default = false;
       description = "Enable BOSH clients, aka 'Jabber over HTTP'";
     };
 
-    httpserver = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Serve static files from a directory over HTTP";
-    };
-
     websocket = mkOption {
       type = types.bool;
       default = false;
       description = "Enable WebSocket support";
     };
 
+    http_files = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Serve static files from a directory over HTTP";
+    };
+
+    # Other specific functionality
+    limits = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable bandwidth limiting for XMPP connections";
+    };
+
+    groups = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Shared roster support";
+    };
+
+    server_contact_info = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Publish contact information for this service";
+    };
+
+    announce = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Send announcement to all online users";
+    };
+
+    welcome = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Welcome users who register accounts";
+    };
+
+    watchregistrations = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Alert admins of registrations";
+    };
+
+    motd = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Send a message to users when they log in";
+    };
+
+    legacyauth = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Legacy authentication. Only used by some old clients and bots";
+    };
+
+    proxy65 = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enables a file transfer proxy service which clients behind NAT can use";
+    };
+
   };
 
   toLua = x:
     if builtins.isString x then ''"${x}"''
-    else if builtins.isBool x then toString x
+    else if builtins.isBool x then (if x == true then "true" else "false")
     else if builtins.isInt x then toString x
+    else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }''
     else throw "Invalid Lua value";
 
   createSSLOptsStr = o: ''
@@ -198,6 +301,59 @@ in
         description = "Allow account creation";
       };
 
+      c2sRequireEncryption = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Force clients to use encrypted connections? This option will
+          prevent clients from authenticating unless they are using encryption.
+        '';
+      };
+
+      s2sRequireEncryption = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Force servers to use encrypted connections? This option will
+          prevent servers from authenticating unless they are using encryption.
+          Note that this is different from authentication.
+        '';
+      };
+
+      s2sSecureAuth = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Force certificate authentication for server-to-server connections?
+          This provides ideal security, but requires servers you communicate
+          with to support encryption AND present valid, trusted certificates.
+          For more information see https://prosody.im/doc/s2s#security
+        '';
+      };
+
+      s2sInsecureDomains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "insecure.example.com" ];
+        description = ''
+          Some servers have invalid or self-signed certificates. You can list
+          remote domains here that will not be required to authenticate using
+          certificates. They will be authenticated using DNS instead, even
+          when s2s_secure_auth is enabled.
+        '';
+      };
+
+      s2sSecureDomains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "jabber.org" ];
+        description = ''
+          Even if you leave s2s_secure_auth disabled, you can still require valid
+          certificates for some domains by specifying a list here.
+        '';
+      };
+
+
       modules = moduleOpts;
 
       extraModules = mkOption {
@@ -266,27 +422,35 @@ in
 
       data_path = "/var/lib/prosody"
 
-      allow_registration = ${boolToString cfg.allowRegistration};
-
-      ${ optionalString cfg.modules.console "console_enabled = true;" }
-
       ${ optionalString  (cfg.ssl != null) (createSSLOptsStr cfg.ssl) }
 
-      admins = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.admins) } };
+      admins = ${toLua cfg.admins}
+
+      -- we already build with libevent, so we can just enable it for a more performant server
+      use_libevent = true
 
       modules_enabled = {
 
         ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
-          (name: val: optionalString val ''"${name}";'')
+          (name: val: optionalString val "${toLua name};")
         cfg.modules) }
 
-        ${ optionalString cfg.allowRegistration "\"register\"\;" }
-
-        ${ lib.concatStringsSep "\n" (map (x: "\"${x}\";") cfg.extraModules)}
-
-        "posix";
+        ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)}
       };
 
+      allow_registration = ${toLua cfg.allowRegistration}
+
+      c2s_require_encryption = ${toLua cfg.c2sRequireEncryption}
+
+      s2s_require_encryption = ${toLua cfg.s2sRequireEncryption}
+
+      s2s_secure_auth = ${toLua cfg.s2sSecureAuth}
+
+      s2s_insecure_domains = ${toLua cfg.s2sInsecureDomains}
+
+      s2s_secure_domains = ${toLua cfg.s2sSecureDomains}
+
+
       ${ cfg.extraConfig }
 
       ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index b0e3492c0da..eb3e858ac4d 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
 , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop
 , withLibevent ? true, luaevent ? null
-, withZlib ? true, luazlib ? null
 , withDBI ? true, luadbi ? null
 # use withExtraLibs to add additional dependencies of community modules
 , withExtraLibs ? [ ]
 , withCommunityModules ? [ ] }:
 
 assert withLibevent -> luaevent != null;
-assert withZlib -> luazlib != null;
 assert withDBI -> luadbi != null;
 
 with stdenv.lib;
@@ -16,7 +14,6 @@ with stdenv.lib;
 let
   libs        = [ luasocket luasec luaexpat luafilesystem luabitop ]
                 ++ optional withLibevent luaevent
-                ++ optional withZlib luazlib
                 ++ optional withDBI luadbi
                 ++ withExtraLibs;
   getPath     = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
@@ -27,12 +24,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.12";
+  version = "0.10.0";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s";
+    sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l";
   };
 
   communityModules = fetchhg {
@@ -65,7 +62,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
-    homepage = http://www.prosody.im;
+    homepage = https://prosody.im;
     platforms = platforms.linux;
     maintainers = [ ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e267a460d0d..924058cc091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12225,8 +12225,9 @@ with pkgs;
   hyp = callPackage ../servers/http/hyp/default.nix { };
 
   prosody = callPackage ../servers/xmpp/prosody {
-    lua5 = lua5_1;
-    inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib luadbi;
+    # _compat can probably be removed on next minor version after 0.10.0
+    lua5 = lua5_2_compat;
+    inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi;
   };
 
   biboumi = callPackage ../servers/xmpp/biboumi { };

From 2c0b230330b3292e31f1de2392a293db6bede69e Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 22 Dec 2017 01:20:01 +0100
Subject: [PATCH 0872/2266] prosody: update community modules

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

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index eb3e858ac4d..1567a4a6b30 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
 
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "9a3e51f348fe";
-    sha256 = "09g4vi52rv0r3jzcm0bsgp4ngqq6iapfbxfh0l7qj36qnajp4vm6";
+    rev = "150a7bd59043";
+    sha256 = "0nfx3lngcy88nd81gb7v4kh3nz1bzsm67bxgpd2lprk54diqcrz1";
   };
 
   buildInputs = [ lua5 makeWrapper libidn openssl ];

From c5d531ddfb5f26c7224503d31331b2e779e9d7be Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 12 Mar 2018 20:31:10 +0100
Subject: [PATCH 0873/2266] xarchiver: fix darwion build

/cc ZHF #36454
---
 pkgs/tools/archivers/xarchiver/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 189035a8c8b..d8c4175e776 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, fetchpatch, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   version = "0.5.4.12";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi";
   };
 
+  patches = [
+    # Fixes darwin build, remove with next update.
+    (fetchpatch {
+      url = https://github.com/ib/xarchiver/commit/8c69d066a827419feafd0bd047d19207ceadc7df.patch;
+      sha256 = "1ch1409hx1ynkm0mz93zy8h7wvcrsn56sz7lczsf6hznc8yzl0qg";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ];
 

From be6d9e1e69c25d4f43b4e935ada1d89236f8e333 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Mon, 12 Mar 2018 21:48:45 +0200
Subject: [PATCH 0874/2266] hplip: 3.17.10 -> 3.17.11

---
 pkgs/misc/drivers/hplip/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index f8f8d16d142..ed29ee1575c 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -11,16 +11,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.17.10";
+  version = "3.17.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg";
+    sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g";
   };
 
   plugin = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig";
+    url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w";
   };
 
   hplipState = substituteAll {
@@ -57,6 +57,7 @@ pythonPackages.buildPythonApplication {
     dbus
     net_snmp
     openssl
+    zlib
   ];
 
   nativeBuildInputs = [
@@ -97,7 +98,7 @@ pythonPackages.buildPythonApplication {
       --with-mimedir=$out/etc/cups
       --enable-policykit
       --disable-qt4
-      ${stdenv.lib.optionals withQt5 "--enable-qt5"}
+      ${stdenv.lib.optionalString withQt5 "--enable-qt5"}
     "
 
     export makeFlags="
@@ -182,7 +183,7 @@ pythonPackages.buildPythonApplication {
 
   meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";
-    homepage = http://hplipopensource.com/;
+    homepage = https://developers.hp.com/hp-linux-imaging-and-printing;
     license = if withPlugin
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];

From 17e1795db014caa2a231a27bae3e97737c3898b8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 10 Mar 2018 23:22:35 +0100
Subject: [PATCH 0875/2266] pythonPackages.asana: fix build

Fetching sources from GitHub to have needed files like `LICENSE` and
tests available to provide safer builds.

See https://hydra.nixos.org/build/70676254/log
See ticket #36453
---
 .../python-modules/asana/default.nix          | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 91664f76ad1..62b176fb59c 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -1,5 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi,
-  pytest, requests, requests_oauthlib, six
+{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six
+, fetchFromGitHub, responses, stdenv
 }:
 
 buildPythonPackage rec {
@@ -7,18 +7,14 @@ buildPythonPackage rec {
   version = "0.7.0";
   name = "${pname}-${version}";
 
-  meta = {
-    description = "Python client library for Asana";
-    homepage = https://github.com/asana/python-asana;
-    license = lib.licenses.mit;
+  src = fetchFromGitHub {
+    owner = "asana";
+    repo = "python-asana";
+    rev = "v${version}";
+    sha256 = "0786y3wxqxxhsb0kkpx4bfzif3dhvv3dmm6vnq58iyj94862kpxf";
   };
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a7ff4a78529257a5412e78cafd6b3025523364c0ab628d579f2771dd66b254bc";
-  };
-
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest responses ];
   propagatedBuildInputs = [ requests requests_oauthlib six ];
 
   patchPhase = ''
@@ -27,11 +23,13 @@ buildPythonPackage rec {
     sed -i "s/requests_oauthlib~=0.6.1/requests_oauthlib >=0.6.1/" setup.py
   '';
 
-  # ERROR: file not found: tests
-  doCheck = false; 
-
   checkPhase = ''
     py.test tests
   '';
 
+  meta = with stdenv.lib; {
+    description = "Python client library for Asana";
+    homepage = https://github.com/asana/python-asana;
+    license = licenses.mit;
+  };
 }

From 0c629e9c2320b5028ef2924a61901cfab6350181 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 12 Mar 2018 21:08:44 +0100
Subject: [PATCH 0876/2266] v8: fix clang build

/cc ZHF #36454
---
 pkgs/development/libraries/v8/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 4d49fdce3a9..3e54a02bb4e 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -156,10 +156,11 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu patchelf ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ];
+  buildInputs = [ readline python icu ]
+    ++ stdenv.lib.optional stdenv.isDarwin cctools
+    ++ stdenv.lib.optional stdenv.isLinux patchelf;
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes";
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes -Wno-error=unused-lambda-capture";
 
   buildFlags = [
     "LINK=c++"

From 0fdbf3edeb7e58d174aaa9dc881adee471174827 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 12 Mar 2018 21:12:20 +0100
Subject: [PATCH 0877/2266] sslscan: fix clang build

/cc ZHF #36454
---
 pkgs/tools/security/sslscan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 782341923fa..6c89b0defa6 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl ];
 
-  installFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
 
   meta = with stdenv.lib; {
     description = "Tests SSL/TLS services and discover supported cipher suites";

From 4ba61cd136f5c7e18e5016bb20390946419fd178 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 12 Mar 2018 21:23:34 +0100
Subject: [PATCH 0878/2266] libpar2: fix clang build

/cc ZHF #36454
---
 pkgs/development/libraries/libpar2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix
index 6d7606428f6..cf97744069b 100644
--- a/pkgs/development/libraries/libpar2/default.nix
+++ b/pkgs/development/libraries/libpar2/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./libpar2-0.4-external-verification.patch ];
 
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   meta = {
     homepage = http://parchive.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;

From 11d40d53314a3f3d100ace991484543a5769887e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski.uu@gmail.com>
Date: Mon, 12 Mar 2018 13:30:51 -0700
Subject: [PATCH 0879/2266] beegfs: 6.17 -> 6.18

---
 pkgs/os-specific/linux/beegfs/default.nix       | 4 ++--
 pkgs/os-specific/linux/beegfs/kernel-module.nix | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index 6cf233694cd..f17bc9492c1 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -5,7 +5,7 @@
 } :
 
 let
-  version = "6.17";
+  version = "6.18";
 
   subdirs = [
     "beeond_thirdparty/build"
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
-    sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3";
+    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
   };
 
   nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];
diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix
index 4525d156159..63e45928f21 100644
--- a/pkgs/os-specific/linux/beegfs/kernel-module.nix
+++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix
@@ -3,13 +3,13 @@
 } :
 
 let
-  version = "6.17";
+  version = "6.18";
 in stdenv.mkDerivation {
   name = "beegfs-module-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
-    sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3";
+    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
   };
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@@ -41,6 +41,5 @@ in stdenv.mkDerivation {
     platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.gpl2;
     maintainers = with maintainers; [ markuskowa ];
-    broken = versionAtLeast kernel.version "4.14";
   };
 }

From af041b34a29d2e681af9870ce3c359c88e1dbe03 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 12 Mar 2018 21:32:38 +0100
Subject: [PATCH 0880/2266] libcdio: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/libcdio/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index 6817d1a888c..bb81721feea 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }:
+{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libcdio-2.0.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libcddb ncurses help2man ]
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
 
   # Disabled due to several spurious test failures.
   # doCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e267a460d0d..3753bbc74eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2290,7 +2290,7 @@ with pkgs;
   flameGraph = flamegraph;
 
   flvtool2 = callPackage ../tools/video/flvtool2 { };
-  
+
   fmbt = callPackage ../development/tools/fmbt {
     python = python2;
   };
@@ -9555,7 +9555,10 @@ with pkgs;
 
   libcddb = callPackage ../development/libraries/libcddb { };
 
-  libcdio = callPackage ../development/libraries/libcdio { };
+  libcdio = callPackage ../development/libraries/libcdio {
+    inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
+  };
+
   libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { };
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };

From b0fa004fa9247a15c31f4f986791c025f9242c3d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 12 Mar 2018 22:26:23 +0100
Subject: [PATCH 0881/2266] nixos/tests/containers-tmpfs: fix test name

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

diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index 564831fa273..873dd364369 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -1,7 +1,7 @@
 # Test for NixOS' container support.
 
 import ./make-test.nix ({ pkgs, ...} : {
-  name = "containers-bridge";
+  name = "containers-tmpfs";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ ckampka ];
   };

From 991e5ca486544a46eba957915902b9baa57896b1 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Mon, 12 Mar 2018 21:43:02 +0000
Subject: [PATCH 0882/2266] wxhexeditor: 0.22 -> 0.24 (#36832)

---
 .../editors/wxhexeditor/default.nix           | 28 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index ad294480e60..85d9b0546d6 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,25 +1,35 @@
-{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
+{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
 
 stdenv.mkDerivation rec {
   name = "wxHexEditor-${version}";
-  version = "v0.22";
+  version = "v0.24";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2";
-    sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w";
+  src = fetchFromGitHub {
+    repo = "wxHexEditor";
+    owner = "EUA";
+    rev = version;
+    sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
   };
 
   buildInputs = [ wxGTK autoconf automake libtool python gettext ];
 
-  patchPhase = ''
-    substituteInPlace Makefile --replace "/usr/local" "$out"
+  preConfigure = "patchShebangs .";
+
+  prePatch = ''
+    substituteInPlace Makefile --replace "/usr" "$out"
     substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
-    substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash"
   '';
 
+  patches = [
+    # https://github.com/EUA/wxHexEditor/issues/90
+    (fetchpatch {
+      url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
+      sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
+    })
+  ];
+
   buildPhase = ''
     make OPTFLAGS="-fopenmp"
-
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3753bbc74eb..b42fcc68e3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18289,7 +18289,9 @@ with pkgs;
 
   wtftw = callPackage ../applications/window-managers/wtftw {};
 
-  wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
+  wxhexeditor = callPackage ../applications/editors/wxhexeditor {
+    wxGTK = wxGTK31;
+  };
 
   wxcam = callPackage ../applications/video/wxcam {
     inherit (gnome2) libglade;

From d5dd7f44131d6d048ab409bcb1305c3d4cece5ce Mon Sep 17 00:00:00 2001
From: Amine Chikhaoui <amine.chikhaoui91@gmail.com>
Date: Mon, 12 Mar 2018 21:51:38 +0000
Subject: [PATCH 0883/2266] pcstat: init at 2017-05-28 (#33643)

---
 maintainers/maintainer-list.nix      |  5 +++++
 pkgs/tools/system/pcstat/default.nix | 24 ++++++++++++++++++++++++
 pkgs/tools/system/pcstat/deps.nix    | 11 +++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 4 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/system/pcstat/default.nix
 create mode 100644 pkgs/tools/system/pcstat/deps.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 807b5e07201..000d3123e68 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -319,6 +319,11 @@
     github = "amiloradovsky";
     name = "Andrew Miloradovsky";
   };
+  aminechikhaoui = {
+    email = "amine.chikhaoui91@gmail.com";
+    github = "AmineChikhaoui";
+    name = "Amine Chikhaoui";
+  };
   amorsillo = {
     email = "andrew.morsillo@gmail.com";
     github = "AndrewMorsillo";
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
new file mode 100644
index 00000000000..cd3c815934f
--- /dev/null
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "pcstat-unstable-${version}";
+  version = "2017-05-28";
+
+  goPackagePath = "github.com/tobert/pcstat";
+
+  src = fetchFromGitHub {
+    rev    = "91a7346e5b462a61e876c0574cb1ba331a6a5ac5";
+    owner  = "tobert";
+    repo   = "pcstat";
+    sha256 = "88853e42d16c05e580af4fb8aa815a84ea0fc43e3a25e19c85e649a5f5a2874c";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Page Cache stat: get page cache stats for files on Linux.";
+    homepage = https://github.com/tobert/pcstat;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ aminechikhaoui ];
+  };
+}
diff --git a/pkgs/tools/system/pcstat/deps.nix b/pkgs/tools/system/pcstat/deps.nix
new file mode 100644
index 00000000000..809bde1122f
--- /dev/null
+++ b/pkgs/tools/system/pcstat/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d38bf781f16e180a1b2ad82697d2f81d7b7ecfac";
+      sha256 = "0eedd518ab68c6dfd431a41709d9888bbc13ed31ff64d69dcbd947442b3aaa04";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b42fcc68e3a..8e6b347c608 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13694,6 +13694,8 @@ with pkgs;
     config = config.pcmciaUtils.config or null;
   };
 
+  pcstat = callPackage ../tools/system/pcstat { };
+
   perf-tools = callPackage ../os-specific/linux/perf-tools { };
 
   pipes = callPackage ../misc/screensavers/pipes { };

From 5e9e30799b07b24826b852652fe4196efad5a1cd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 12 Mar 2018 18:28:41 +0300
Subject: [PATCH 0884/2266] xgboost: disable on AArch64

It requires SSE2.
---
 pkgs/development/libraries/xgboost/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 6f296bb40b9..0d86c862891 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
     homepage = https://github.com/dmlc/xgboost;
     license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = with maintainers; [ abbradar ];
   };
 }

From 2dfbef2764e40eb1c4cc26ea1e8bffd6886e7226 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 12 Mar 2018 18:43:51 +0300
Subject: [PATCH 0885/2266] dfhack: fix checksum

Fixes #36819.
---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index f9a61ddbf8b..e716bdcbb02 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -7,7 +7,7 @@ let
   dfVersion = "0.44.05";
   version = "${dfVersion}-r2";
   rev = "refs/tags/${version}";
-  sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52";
+  sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9";
 
   # revision of library/xml submodule
   xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142";

From 5ed883a40bad26512475568e59ef566aaf9e2f8c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 13 Mar 2018 01:00:49 +0300
Subject: [PATCH 0886/2266] warsow: 1.03 -> 2.1.2

Fix build, split into engine and game to build engine on Hydra.
---
 pkgs/games/warsow/default.nix   | 67 ++++++++++-----------------------
 pkgs/games/warsow/engine.nix    | 52 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 3 files changed, 74 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/games/warsow/engine.nix

diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 3e1729e2091..1b51130768e 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -1,52 +1,27 @@
-{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis
-, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, libGLU_combined, openal, freetype
-, makeWrapper
-}:
+{ stdenv, fetchurl, warsow-engine, makeWrapper }:
+
 stdenv.mkDerivation rec {
   name = "warsow-${version}";
-  version = "1.03";
-  mversion = "1.02";  # sometimes only engine is updated
-  src1 = fetchurl {
-    url = "http://www.warsow.net:1337/~warsow/${version}/warsow_${version}_sdk.tar.gz";
-    sha256 = "0z6r5v30p8fxbszmkxssv5fnnjw7w5wfn7wfgbwvmy87ayi7mkcq";
+  version = "2.1.2";
+
+  src = fetchurl {
+    url = "http://sebastian.network/warsow/${name}.tar.gz";
+    sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc";
   };
-  src2 = fetchurl {
-    url = "http://www.warsow.net:1337/~warsow/${mversion}/warsow_${mversion}.tar.gz";
-    sha256 = "0ai5v1h5g9nq21ixz23v0qsj9dr7dbiz7l8r34mq4c3z6ili8zpy";
-  };
-  unpackPhase = ''
-    tar xf "$src1"
-    cd warsow_${version}_sdk
-    tar xf "$src2"
-    mkdir -p source/release/
-    mv warsow_${mversion}/basewsw source/release/
-    cd source
-  '';
-  patchPhase = ''
-    substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1
-  '';
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora
-                  libXxf86dga libXxf86vm libXinerama SDL libGLU_combined openal makeWrapper
-                ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
   installPhase = ''
-    dest=$out/opt/warsow
-    cd release
-    mkdir -p $dest
+    mkdir -p $out/share/warsow
+    cp -r basewsw $out/share/warsow
+    ln -s ${warsow-engine}/lib/warsow $out/share/warsow/libs
+
     mkdir -p $out/bin
-    cp -v {warsow,wsw_server,wswtv_server}* $dest
-    cp -rv basewsw libs $dest
-    # Since 1.03 some modules are _always_ downloaded from server, thus
-    makeWrapper $dest/warsow $out/bin/warsow \
-      --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib"
-    makeWrapper $dest/wsw_server $out/bin/wsw_server
-    makeWrapper $dest/wswtv_server $out/bin/wswtv_server
-  '';
-  postFixup = ''
-    p=$out/opt/warsow/warsow.*
-    cur_rpath=$(patchelf --print-rpath $p)
-    patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p
+    for i in ${warsow-engine}/bin/*; do
+      makeWrapper "$i" "$out/bin/$(basename "$i")" --run "cd $out/share/warsow"
+    done
   '';
+
   meta = with stdenv.lib; {
     description = "Multiplayer FPS game designed for competitive gaming";
     longDescription = ''
@@ -56,10 +31,8 @@ stdenv.mkDerivation rec {
       and macOS.
     '';
     homepage = http://www.warsow.net;
-    # Engine is under GPLv2, everything else is under
     license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ astsmtl ];
-    platforms = platforms.linux;
-    broken = true; # Depends on a specific old libjpeg version
+    maintainers = with maintainers; [ astsmtl abbradar ];
+    platforms = warsow-engine.meta.platforms;
   };
 }
diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix
new file mode 100644
index 00000000000..12832f2a439
--- /dev/null
+++ b/pkgs/games/warsow/engine.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype
+, libjpeg, libpng, SDL2, libGL, openal, zlib
+}:
+
+let
+  # The game loads all those via dlopen().
+  libs = lib.mapAttrs (name: x: lib.getLib x) {
+    inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;
+  };
+
+in stdenv.mkDerivation (libs // rec {
+  name = "warsow-engine-${version}";
+  version = "2.1.0";
+
+  src = fetchurl {
+    url = "http://sebastian.network/warsow/warsow_21_sdk.tar.gz";
+    sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    libogg libvorbis libtheora curl freetype libjpeg SDL2 libGL openal zlib
+    libpng
+  ];
+
+  patches = [ ./libpath.patch ];
+  postPatch = ''
+    cd source/source
+    substituteAllInPlace gameshared/q_arch.h
+  '';
+
+  cmakeFlags = [ "-DQFUSION_GAME=Warsow" ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp -r libs $out/lib/warsow
+    for i in warsow.* wsw_server.* wswtv_server.*; do
+      install -Dm755 "$i" "$out/bin/''${i%.*}"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multiplayer FPS game designed for competitive gaming (engine only)";
+    homepage = http://www.warsow.net;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ astsmtl abbradar ];
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e6b347c608..24d98cb838d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19259,6 +19259,8 @@ with pkgs;
 
   warmux = callPackage ../games/warmux { };
 
+  warsow-engine = callPackage ../games/warsow/engine.nix { };
+
   warsow = callPackage ../games/warsow { };
 
   warzone2100 = libsForQt5.callPackage ../games/warzone2100 { };

From bef8321f9faaa9fa95b515dc32e4c7d74b2995cf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 13 Mar 2018 01:02:18 +0300
Subject: [PATCH 0887/2266] kega-fusion: init at 3.63x

---
 pkgs/misc/emulators/kega-fusion/default.nix | 78 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/misc/emulators/kega-fusion/default.nix

diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
new file mode 100644
index 00000000000..bdc372c7ca2
--- /dev/null
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }:
+
+let
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ];
+
+in stdenv.mkDerivation rec {
+  name = "kega-fusion-${version}";
+  version = "3.63x";
+
+  src = fetchurl {
+    url = "http://www.carpeludum.com/download/Fusion363x.tar.gz";
+    sha256 = "14s6czy20h5khyy7q95hd7k77v17ssafv9l6lafkiysvj2nmw94g";
+  };
+
+  plugins = fetchurl {
+    url = "http://www.carpeludum.com/download/PluginsLinux.tar.gz";
+    sha256 = "0d623cvh6n5ijj3wb64g93mxx2xbichsn7hj7brbb0ndw5cs70qj";
+  };
+
+  runner = writeText "kega-fusion" ''
+    #!${stdenv.shell} -ex
+
+    kega_libdir="@out@/lib/kega-fusion"
+    kega_localdir="$HOME/.Kega Fusion"
+
+    # create local plugins directory if not present
+    mkdir -p "$kega_localdir/Plugins"
+
+    # create links for every included plugin
+    if [ $(ls -1A $kega_libdir/plugins | wc -l) -gt 0 ]; then
+      for i in $kega_libdir/plugins/*; do
+        if [ ! -e "$kega_localdir/Plugins/$(basename "$i")" ]; then
+          ln -sf "$i" "$kega_localdir/Plugins/"
+        fi
+      done
+    fi
+
+    # copy configuration file if not present
+    if ! [ -f "$kega_localdir/Fusion.ini" ]; then
+      cat > "$kega_localdir/Fusion.ini" <<EOF
+    ALSADeviceName=default
+    libmpg123path=${lib.getLib mpg123}/lib/libmpg123.so.0
+    EOF
+    else
+      sed -i 's,^\(libmpg123path=\).*,\1${lib.getLib mpg123}/lib/libmpg123.so.0,' "$kega_localdir/Fusion.ini"
+    fi
+
+    # here we go!
+    exec "$kega_libdir/Fusion" "$@"
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  nativeBuildInputs = [ upx ];
+
+  installPhase = ''
+    upx -d Fusion
+    install -Dm755 Fusion "$out/lib/kega-fusion/Fusion"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}" "$out/lib/kega-fusion/Fusion"
+
+    tar -xaf $plugins
+    mkdir -p "$out/lib/kega-fusion/plugins"
+    cp -r Plugins/*.rpi "$out/lib/kega-fusion/plugins"
+
+    mkdir -p "$out/bin"
+    substitute "$runner" "$out/bin/kega-fusion" --subst-var out
+    chmod +x "$out/bin/kega-fusion"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator";
+    homepage = http://www.carpeludum.com/kega-fusion/;
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.unfreeRedistributable;
+    platforms = [ "i686-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24d98cb838d..25e39cf780d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16235,6 +16235,8 @@ with pkgs;
 
   keepnote = callPackage ../applications/office/keepnote { };
 
+  kega-fusion = callPackage_i686 ../misc/emulators/kega-fusion { };
+
   kermit = callPackage ../tools/misc/kermit { };
 
   kexi = libsForQt5.callPackage ../applications/office/kexi { };

From 28264de9fcbf24b9c5076199a4dc4d8375f7964b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 13 Mar 2018 01:11:56 +0300
Subject: [PATCH 0888/2266] warsow: add missing patch

---
 pkgs/games/warsow/libpath.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/games/warsow/libpath.patch

diff --git a/pkgs/games/warsow/libpath.patch b/pkgs/games/warsow/libpath.patch
new file mode 100644
index 00000000000..ad248710237
--- /dev/null
+++ b/pkgs/games/warsow/libpath.patch
@@ -0,0 +1,28 @@
+diff -ru3 warsow_21_sdk_old/source/source/gameshared/q_arch.h warsow_21_sdk_new/source/source/gameshared/q_arch.h
+--- warsow_21_sdk_old/source/source/gameshared/q_arch.h	2016-03-26 22:22:10.000000000 +0300
++++ warsow_21_sdk_new/source/source/gameshared/q_arch.h	2018-03-13 00:37:29.907019953 +0300
+@@ -206,15 +206,15 @@
+ #endif
+ 
+ // FIXME: move these to CMakeLists.txt
+-#define LIBZ_LIBNAME "libz.so.1|libz.so"
+-#define LIBCURL_LIBNAME "libcurl.so.4|libcurl.so.3|libcurl.so"
+-#define LIBPNG_LIBNAME "libpng16.so.16|libpng15.so.15|libpng14.so.14|libpng12.so.0|libpng.so"
+-#define LIBJPEG_LIBNAME "libjpeg.so.8|libjpeg.so"
+-#define LIBOGG_LIBNAME "libogg.so.0|libogg.so"
+-#define LIBVORBIS_LIBNAME "libvorbis.so.0|libvorbis.so"
+-#define LIBVORBISFILE_LIBNAME "libvorbisfile.so.3|libvorbisfile.so"
+-#define LIBTHEORA_LIBNAME "libtheora.so.0|libtheora.so"
+-#define LIBFREETYPE_LIBNAME "libfreetype.so.6|libfreetype.so"
++#define LIBZ_LIBNAME "@zlib@/lib/libz.so"
++#define LIBCURL_LIBNAME "@curl@/lib/libcurl.so"
++#define LIBPNG_LIBNAME "@libpng@/lib/libpng.so"
++#define LIBJPEG_LIBNAME "@libjpeg@/lib/libjpeg.so"
++#define LIBOGG_LIBNAME "@libogg@/lib/libogg.so"
++#define LIBVORBIS_LIBNAME "@libvorbis@/lib/libvorbis.so"
++#define LIBVORBISFILE_LIBNAME "@libvorbis@/lib/libvorbisfile.so"
++#define LIBTHEORA_LIBNAME "@libtheora@/lib/libtheora.so"
++#define LIBFREETYPE_LIBNAME "@freetype@/lib/libfreetype.so"
+ 
+ #if defined ( __FreeBSD__ )
+ #define BUILDSTRING "FreeBSD"

From da45e8d09938676d07955c0a000dac8b8ceab022 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Sun, 11 Mar 2018 01:01:19 -0500
Subject: [PATCH 0889/2266] sambaMaster: 4.8.0_2018-01-25 -> 2018-03-09

---
 pkgs/servers/samba/master.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix
index f1dd7fe7b14..df1f9feb4de 100644
--- a/pkgs/servers/samba/master.nix
+++ b/pkgs/servers/samba/master.nix
@@ -4,14 +4,14 @@
 } :
 
   (samba4.overrideAttrs(oldAttrs: rec {
-    name = "samba-master${version}";
-    version = "4.8.0_2018-01-25";
+    name = "samba-unstable-${version}";
+    version = "2018-03-09";
 
     src = fetchFromGitHub {
       owner = "samba-team";
       repo = "samba";
-      rev = "849169a7b6ed0beb78bbddf25537521c1ed2f8e1";
-      sha256 = "1535w787cy1x5ia9arjrg6hhf926wi8wm9qj0k0jgydy3600zpbv";
+      rev = "9e954bcbf43d67a18ee55f84cda0b09028f96b92";
+      sha256 = "07j1pwm4kax6pq21gq9gpmp7dhj5afdyvkhgyl3yz334mb41q11g";
     };
 
     # Remove unnecessary install flags, same as <4.8 patch

From ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 8 Mar 2018 14:14:47 +0100
Subject: [PATCH 0890/2266] grafana: 5.0.0 -> 5.0.1

---
 nixos/tests/grafana.nix                     | 2 +-
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix
index 16b8181498a..d45776c3ee2 100644
--- a/nixos/tests/grafana.nix
+++ b/nixos/tests/grafana.nix
@@ -20,6 +20,6 @@ import ./make-test.nix ({ lib, ... }:
     $machine->start;
     $machine->waitForUnit("grafana.service");
     $machine->waitForOpenPort(3000);
-    $machine->succeed("curl -sS http://127.0.0.1:3000/");
+    $machine->succeed("curl -sSfL http://127.0.0.1:3000/");
   '';
 })
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 876209b9b02..b255a153a2b 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.0";
+  version = "5.0.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9";
+    sha256 = "0nvns6ysnl7a4blcq9iyhhn9nxhk8fpwkfzlyvm8dx6y8hwawlq1";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd";
+    sha256 = "1zjy4h2w8dghqziafn23msl29yds9w4q0ryywv1sdrzkb1331cyk";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From dde80d705e4b47e8ad7774037533e46ad1f7d53c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 9 Mar 2018 18:03:00 -0500
Subject: [PATCH 0891/2266] qtbase: Fix x86_64-conditional logic

Now works with cross and old and new meta checks alike.
---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 3a0a7326f76..c6473ff188a 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -30,7 +30,6 @@ assert withGtk3 -> dconf != null;
 assert withGtk3 -> gtk3 != null;
 
 let
-  system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
   compareVersion = v: builtins.compareVersions version v;
 in
 
@@ -258,7 +257,7 @@ stdenv.mkDerivation {
       "-no-warnings-are-errors"
     ]
     ++ (
-      if (!system-x86_64)
+      if (!stdenv.hostPlatform.isx86_64)
       then [ "-no-sse2" ]
       else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ]
     )

From eeb8419c6a358a7b8d5a8fa9fc3d0352337196f7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 9 Mar 2018 18:22:57 -0500
Subject: [PATCH 0892/2266] ceph: Fix --with-file-aio logic for new
 meta.platforms and cross

---
 pkgs/servers/http/nginx/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index de30870bee8..ff0a4c65b4a 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     "--with-mail_ssl_module"
   ]
     ++ optional (gd != null) "--with-http_image_filter_module"
-    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
+    ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
     ++ map (mod: "--add-module=${mod.src}") modules;
 
   NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";

From 79d8353b5e4bb98f1b51ab32b9b26df81bb7e106 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 9 Mar 2018 17:58:36 -0500
Subject: [PATCH 0893/2266] treewide: Make `shouldUsePackages` copypasta use
 meta.available

The old way depended on old list-of-strings `meta.platforms`, and was
not good for cross.
---
 pkgs/development/libraries/wiredtiger/default.nix | 2 +-
 pkgs/misc/jackaudio/default.nix                   | 2 +-
 pkgs/misc/jackaudio/jack1.nix                     | 2 +-
 pkgs/os-specific/linux/ffado/default.nix          | 2 +-
 pkgs/servers/shishi/default.nix                   | 2 +-
 pkgs/tools/filesystems/ceph/generic.nix           | 3 +--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 9d11b98b1cb..c905c40cf96 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -15,7 +15,7 @@ let
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a242f0261c7..0ed0246a881 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -15,7 +15,7 @@
 with stdenv.lib;
 let
   inherit (python2Packages) python dbus-python;
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   libOnly = prefix == "lib";
 
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 28ce85bd8a3..43d23dd525a 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optAlsaLib = shouldUsePkg alsaLib;
   optDb = shouldUsePkg db;
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 4e2d2b38841..4e3e373d244 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -11,7 +11,7 @@
 
 let
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   libOnly = prefix == "lib";
 
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 535571f46e2..1540a6f1fd1 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -14,7 +14,7 @@ let
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 32b85eaa681..3d35a10f3b3 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -37,8 +37,7 @@ with stdenv.lib;
 let
 
   shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value;
-    in if lib.any (x: x == system) (pkg.meta.platforms or [])
-      then pkg else null;
+    in if pkg.meta.available or false then pkg else null;
 
   optYasm = shouldUsePkg yasm;
   optFcgi = shouldUsePkg fcgi;

From 59c656a42137e529cd77f7e42c559cef7c0e33f3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 9 Mar 2018 18:31:42 -0500
Subject: [PATCH 0894/2266] dvdisaster: Fix sse2 logic for cross and improved
 `meta.platforms`

---
 pkgs/tools/cd-dvd/dvdisaster/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index e70d259df68..590c3218814 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
     "--docdir=share/doc"
     "--with-nls=yes"
     "--with-embedded-src-path=no"
-  ] ++ stdenv.lib.optional (builtins.elem stdenv.system
-      stdenv.lib.platforms.x86_64) "--with-sse2=yes";
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
 
   # fatal error: inlined-icons.h: No such file or directory
   enableParallelBuilding = false;

From 94cbd141203ca5007bc56236e24eeceae42778aa Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 9 Mar 2018 18:40:51 -0500
Subject: [PATCH 0895/2266] nethack: Fix platform logic

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

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index d9ab3ee833b..b67a79aa3fe 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -2,11 +2,11 @@
 
 let
   platform =
-    if lib.elem stdenv.system lib.platforms.unix then "unix"
+    if stdenv.hostPlatform.isUnix then "unix"
     else throw "Unknown platform for NetHack: ${stdenv.system}";
   unixHint =
-    if stdenv.isLinux then "linux"
-    else if stdenv.isDarwin then "macosx10.10"
+    /**/ if stdenv.hostPlatform.isLinux  then "linux"
+    else if stdenv.hostPlatform.isDarwin then "macosx10.10"
     # We probably want something different for Darwin
     else "unix";
   userDir = "~/.config/nethack";

From c208ca638763ad7c0e5f4cc2e35016fff8ca1676 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 12 Mar 2018 18:37:17 -0400
Subject: [PATCH 0896/2266] robo3t: Simplify meta.platforms and don't refer to
 glibc directly

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

diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index fc7ff484239..8928ee18064 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/icons
     cp ${icon} $out/share/icons/robomongo.png
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
+    patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
 
     mkdir $out/bin
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://robomongo.org/;
     description = "Query GUI for mongodb";
-    platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
+    platforms = [ "x86_64-linux" ];
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.eperuffo ];
   };

From b152dcf852ecef3e30a632f0050abb30a26e1dfd Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 12 Mar 2018 15:18:25 -0400
Subject: [PATCH 0897/2266] pharo: Tighten source and simplify meta.platforms

---
 pkgs/development/pharo/vm/build-vm-legacy.nix |  8 ++++----
 pkgs/development/pharo/wrapper/default.nix    | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix
index 66cef77e5a9..f2fd6eebd56 100644
--- a/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
-    platforms = with stdenv.lib;
-                  intersectLists
-                    platforms.mesaPlatforms
-                    (subtractLists platforms.darwin platforms.unix);
+    platforms = stdenv.lib.filter
+      (system: with stdenv.lib.systems.elaborate { inherit system; };
+         isUnix && !isDarwin)
+      stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix
index f60b8a6d203..084c46cd5b5 100644
--- a/pkgs/development/pharo/wrapper/default.nix
+++ b/pkgs/development/pharo/wrapper/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "pharo";
-  src = ./.;
+  src = ./pharo-vm.sh;
   inherit cog32 spur32 spur64 file;
   magic = ./magic;
   desktopItem = makeDesktopItem {
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     categories = "Development;";
     mimeType = "application/x-pharo-image";
   };
+  unpackPhase = ''
+    cp $src ./pharo-vm.sh
+    sourceRoot=$PWD
+  '';
   buildPhase = ''
     substituteAllInPlace ./pharo-vm.sh
   '';
@@ -49,10 +53,10 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
-    platforms = with stdenv.lib;
-                  intersectLists
-                    platforms.mesaPlatforms
-                    (subtractLists platforms.darwin platforms.unix);
+    platforms = stdenv.lib.filter
+      (system: with stdenv.lib.systems.elaborate { inherit system; };
+         isUnix && !isDarwin)
+      stdenv.lib.platforms.mesaPlatforms;
   };
 }
 

From 2d1d83d836e09e50469302101955ea6c58dcd206 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 12 Mar 2018 18:30:50 -0400
Subject: [PATCH 0898/2266] pond: Simplify platform logic

---
 .../networking/instant-messengers/pond/default.nix           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index 002d0345a00..5d463648bd8 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -2,7 +2,6 @@
   fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 let
-  isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
   gui = true; # Might be implemented with nixpkgs config.
 in
 buildGoPackage rec {
@@ -22,11 +21,11 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ trousers gtk3 gtkspell3 ]
-    ++ stdenv.lib.optional isx86_64 dclxvi
+    ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi
     ++ stdenv.lib.optionals gui [ wrapGAppsHook ];
   buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
   excludedPackages = "\\(appengine\\|bn256cgo\\)";
-  postPatch = stdenv.lib.optionalString isx86_64 ''
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 ''
     grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
       -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
       -e "s,bn256\.,bn256cgo.,g"

From fe70fbdefe65266365ad14ed9e05e5d20e02151f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 12 Mar 2018 22:55:30 +0000
Subject: [PATCH 0899/2266] xfce: do not use old names

---
 .../window-managers/xmonad-log-applet/default.nix           | 4 ++--
 pkgs/desktops/xfce/applications/orage.nix                   | 2 +-
 pkgs/desktops/xfce/applications/xfce4-mixer.nix             | 4 ++--
 pkgs/desktops/xfce/applications/xfce4-screenshooter.nix     | 4 ++--
 pkgs/desktops/xfce/core/thunar-build.nix                    | 4 ++--
 pkgs/desktops/xfce/core/thunar.nix                          | 6 +++---
 pkgs/desktops/xfce/core/xfce4-panel.nix                     | 4 ++--
 pkgs/desktops/xfce/core/xfce4-power-manager.nix             | 4 ++--
 pkgs/desktops/xfce/core/xfce4-session.nix                   | 4 ++--
 pkgs/desktops/xfce/core/xfdesktop.nix                       | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix   | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix   | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix   | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix  | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix  | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix      | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix  | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix     | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix      | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix   | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix    | 4 ++--
 .../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix    | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix       | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix   | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix   | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix     | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix   | 4 ++--
 .../desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix     | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix     | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix   | 4 ++--
 .../xfce/panel-plugins/xfce4-whiskermenu-plugin.nix         | 6 +++---
 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix  | 4 ++--
 pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix       | 4 ++--
 pkgs/desktops/xfce/thunar-plugins/archive/default.nix       | 4 ++--
 pkgs/misc/screensavers/light-locker/default.nix             | 2 +-
 pkgs/top-level/all-packages.nix                             | 6 +++---
 38 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
index def5766e5ee..f2acf03958b 100644
--- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
 , desktopSupport
 , gtk2, gnome2_panel, GConf2
-, libxfce4util, xfce4panel
+, libxfce4util, xfce4-panel
 }:
 
 assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
               ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ]
               # TODO: no idea where to find libpanelapplet-4.0
               ++ optionals (desktopSupport == "gnome3") [ ]
-              ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4panel ]
+              ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
               ;
   
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
index f376b743c82..812630e17d0 100644
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ b/pkgs/desktops/xfce/applications/orage.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool bison flex ];
   
   buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
-    xfce.xfce4panel ];
+    xfce.xfce4-panel ];
 
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache ";
 
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index 05a5fa4a6fc..93a7fad4918 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, makeWrapper
 , glib, gstreamer, gst-plugins-base, gtk
-, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
+, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null
 , pulseaudioSupport ? false, gst-plugins-good
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool glib gstreamer gtk
-      libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper
+      libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper
     ] ++ gst_plugins;
 
   postInstall =
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
index 4c855b8ddeb..28c586382b4 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup
+{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
 , makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking
+    xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking
   ];
 
   meta = {
diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix
index bf44fc0adbb..5f8cc71de85 100644
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ b/pkgs/desktops/xfce/core/thunar-build.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool
 , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
-, exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook
+, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     intltool
     gtk dbus-glib libstartup_notification libnotify libexif pcre udev
-    exo libxfce4util xfconf xfce4panel
+    exo libxfce4util xfconf xfce4-panel
   ];
   # TODO: optionality?
 
diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix
index 037a3f947fb..83e3a2879d7 100644
--- a/pkgs/desktops/xfce/core/thunar.nix
+++ b/pkgs/desktops/xfce/core/thunar.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-build
+{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare
 , thunarPlugins ? []
 }:
 
@@ -6,7 +6,7 @@ with stdenv.lib;
 
 let
 
-  build = thunar-build;
+  build = thunar-bare;
 
   replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: ''
     exeDir="${exeDir}"
@@ -50,7 +50,7 @@ runCommand name {
 } 
 (let
   buildWithPlugins = buildEnv {
-    name = "thunar-build-with-plugins";
+    name = "thunar-bare-with-plugins";
     paths = [ build ] ++ thunarPlugins;
   };
 
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 26548f6daa4..009416dea6c 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
-, makeWrapper, xfce4mixer, hicolor-icon-theme
+, makeWrapper, xfce4-mixer, hicolor-icon-theme
 , withGtk3 ? false, gtk3, gettext, glib-networking
 }:
 let
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util exo libwnck
       garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme
-    ] ++ xfce4mixer.gst_plugins
+    ] ++ xfce4-mixer.gst_plugins
       ++ optional withGtk3 gtk3;
 
   propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 9425c4d8884..ffcc67bf0e9 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf
-, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme
+, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme
 , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:
 let
   p_name  = "xfce4-power-manager";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ] ++
     (if withGtk3
     then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]
-    else [ gtk  libxfce4ui      xfce4panel      ]);
+    else [ gtk  libxfce4ui      xfce4-panel      ]);
 
   postPatch = lib.optionalString withGtk3 ''
     substituteInPlace configure --replace gio-2.0 gio-unix-2.0
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
index 73939d53587..2d5a169a215 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit
-, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg
+, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
 , hicolor-icon-theme
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib
-      xfconf xfce4panel libglade xorg.iceauth xorg.libSM
+      xfconf xfce4-panel libglade xorg.iceauth xorg.libSM
       polkit hicolor-icon-theme
     ]; #TODO: upower-glib, gconf (assistive?), gnome keyring
 
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix
index 491185ff2c0..48585b4004b 100644
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify
+, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify
 , hicolor-icon-theme }:
 let
   p_name  = "xfdesktop";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
-    libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme
+    libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme
   ];
 
   patches = [(fetchpatch {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
index 0dcdcda6994..c64e8770d25 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
index 6614d746b68..236c71c66d5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
index c0c8519d63a..0a309c433e9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index fb8b1bae83d..c5487198f97 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ];
+  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
index 0905a9bb16a..c6317010031 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel
 , gtk }:
 
 with stdenv.lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ];
+  buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index b6d0fc12db3..8210fc62ccb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
index 438be7e8494..621b4266d10 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ]
-    ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ])
+    ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
     ++ pythonPath;
 
   postPatch = ''
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
index a5cfc3659f6..0d99c2053df 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 81bff06500b..3a79f67068c 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
index 4f4f882d67b..6d0f8ee73a4 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
index c6252a48bff..039ac144094 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index ea17c960b2e..cac09d0ad35 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2,
-  libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors
+  libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libgtop
     libxfce4ui
     libxfce4util
-    xfce4panel
+    xfce4-panel
     lm_sensors
    ];
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index 2b43eaca4c0..80153332934 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
 libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
 
 with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
     libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index 6f16561d41d..8a602b8b4a1 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
 libxfcegui4, xfconf, gtk, exo }:
 
 with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
     libxfcegui4 xfconf gtk exo ];
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
index e81289f26f6..66179996df6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }:
+{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }:
 
 stdenv.mkDerivation rec {
   ver = "0.3.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ];
+  buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ];
 
   postPatch = ''
     substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
index 9650cafedec..a843f0223c4 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
index c8c9c7735a9..d61dae6bdd5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
index 3314d313ad2..5a4dfee76fc 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
-  libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu
+  libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     gnome2.gtk
     libxfce4ui
     libxfce4util
-    xfce4panel
+    xfce4-panel
     libnotify
     lm_sensors
     hddtemp
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
index 34677db81d1..698d4aae532 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
index 5ec89790451..1ba4340fcb5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel
 , libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
 
 with stdenv.lib;
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf
     gtk hicolor-icon-theme ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
index 3c0d1a488f8..96ef08cbeb7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre
-, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }:
+, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ];
+  buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 0af0e62244f..03f062532ea 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
-libxfce4ui, libxfce4util, xfce4panel }:
+libxfce4ui, libxfce4util, xfce4-panel }:
 
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
 
   buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
-   xfce4panel ];
+   xfce4-panel ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index 92564c4eb68..c29758452ae 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4
-, xfce4panel, gtk, exo, garcon }:
+, xfce4-panel, gtk, exo, garcon }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig intltool ];
 
-  buildInputs = [ libxfce4util libxfcegui4 xfce4panel gtk exo garcon ];
+  buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ];
 
   enableParallelBuilding = true;
 
   preFixup = ''
     substituteInPlace $out/bin/xfce4-popup-whiskermenu \
-      --replace $out/bin/xfce4-panel ${xfce4panel.out}/bin/xfce4-panel
+      --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
   '';
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
index 32b2e651462..8798851579d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2
-, exo, libxfce4ui, libxfce4util, xfce4panel, xfconf, xfce4_dev_tools }:
+, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools }:
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-windowck-plugin";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ intltool python3 imagemagick libwnck gtk2
-    exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ];
+    exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
index 453c09cfc70..307d2e81bf2 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel
 , garcon, gtk, libxklavier, librsvg, libwnck
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon
     gtk libxklavier librsvg libwnck  ];
 
   meta = {
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index 8ff4a74e6bf..9783e6c9228 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools
+{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools
 , gtk
 , thunarx-2-dev
 , exo, libxfce4util, libxfce4ui
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    xfce4_dev_tools
+    xfce4-dev-tools
     thunarx-2-dev
     exo gtk libxfce4util libxfce4ui
     xfconf udev libnotify
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index c2486b7ebe4..d081581d255 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   patches = [ ./systemd.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which xfce.xfce4_dev_tools glib systemd
+  buildInputs = [ which xfce.xfce4-dev-tools glib systemd
                   libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e39cf780d..9775ef2c280 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18456,21 +18456,21 @@ with pkgs;
 
   xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet {
     desktopSupport = "gnome2";
-    inherit (xfce) libxfce4util xfce4panel;
+    inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
 
   xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet {
     desktopSupport = "gnome3";
-    inherit (xfce) libxfce4util xfce4panel;
+    inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
 
   xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet {
     desktopSupport = "xfce4";
-    inherit (xfce) libxfce4util xfce4panel;
+    inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };

From 40e3ad60aaa0bdcec71409ae167c2b1425bffe06 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 13 Mar 2018 00:04:44 +0100
Subject: [PATCH 0900/2266] nodePackages: regenerate with node2nix 1.5.3

---
 .../node-packages/composition-v6.nix          |    3 +-
 .../node-packages/composition-v8.nix          |    3 +-
 pkgs/development/node-packages/node-env.nix   |   12 +-
 .../node-packages/node-packages-v6.nix        | 2543 +++++++++--------
 .../node-packages/node-packages-v8.nix        |  525 ++--
 5 files changed, 1595 insertions(+), 1491 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index fa4d7268f01..2252bab3a79 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.2. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -8,6 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v6.nix {
diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix
index a83df852ce2..96266105942 100644
--- a/pkgs/development/node-packages/composition-v8.nix
+++ b/pkgs/development/node-packages/composition-v8.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.2. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -8,6 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v8.nix {
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 15bc6c638d9..fc118a788ea 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -316,7 +316,10 @@ let
     in
     stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
       name = "node-${name}-${version}";
-      buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
+      buildInputs = [ tarWrapper python nodejs ]
+        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+        ++ args.buildInputs or [];
       dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
 
       inherit dontNpmInstall preRebuild;
@@ -413,7 +416,10 @@ let
       nodeDependencies = stdenv.mkDerivation {
         name = "node-dependencies-${name}-${version}";
 
-        buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ args.buildInputs or [];
 
         includeScript = includeDependencies { inherit dependencies; };
         pinpointDependenciesScript = pinpointDependenciesOfPackage args;
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index ebea0df1362..88a40fb0402 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,18 +1,9 @@
-# This file has been generated by node2nix 1.5.2. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@browserify/acorn5-object-spread-5.0.1" = {
-      name = "_at_browserify_slash_acorn5-object-spread";
-      packageName = "@browserify/acorn5-object-spread";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@browserify/acorn5-object-spread/-/acorn5-object-spread-5.0.1.tgz";
-        sha512 = "0l47lh2pz596qayh9mmg2x2zjvjm6phj6llj4465cc420fpsjpwbm4i67mkc7d3iylilxhrcs9mlyqm2cpc79xqvrm3f4hy70zr8l5h";
-      };
-    };
     "@ionic/cli-framework-0.1.2" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
@@ -85,22 +76,22 @@ let
         sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4";
       };
     };
-    "@types/node-8.9.4" = {
+    "@types/node-8.9.5" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.9.4";
+      version = "8.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz";
-        sha512 = "0fc7dnkm8mxih1kx7dpxdjp9432wwn2hj9k3rs6ipmyac7x4d73kjxhkinlv9wzmzpxkz8n0cp6zykl8nvb4ksh3gycwhm7mbgw6avm";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz";
+        sha512 = "06wcjpwrp2zkccv51w2j75yq11jcdb69r7y04l1qihncwhd56dagwcvvn7lm48bjp7rkfcxbsfn18658wjy9wqrdvfxacpjrdddy4cd";
       };
     };
-    "@types/node-9.4.6" = {
+    "@types/node-9.4.7" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.4.6";
+      version = "9.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.4.6.tgz";
-        sha512 = "08j600qycq8wmra6zn9jvh2ifnkr90s08rcv3spjqc03mjapfm4bz009cm6xfqd7ipbsm7q6ymxccdnlw4gbyd3lyh21a4npqnjsd89";
+        url = "https://registry.npmjs.org/@types/node/-/node-9.4.7.tgz";
+        sha512 = "1rk1inz71x7pkcc7j3w776wf7wi8byz3h2203wzl3vpmxrhmy4vfkmhy25sdhi05pc6f0dy1254qilfn1hwivm7dmfwgiwdcp9bs5p0";
       };
     };
     "@types/request-2.47.0" = {
@@ -256,13 +247,13 @@ let
         sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
       };
     };
-    "accepts-1.3.4" = {
+    "accepts-1.3.5" = {
       name = "accepts";
       packageName = "accepts";
-      version = "1.3.4";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz";
-        sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f";
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz";
+        sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2";
       };
     };
     "acorn-1.2.2" = {
@@ -301,13 +292,13 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.5.0" = {
+    "acorn-5.5.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.5.0";
+      version = "5.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.5.0.tgz";
-        sha512 = "3zaj6p3hwrmg5i65dg7q0kk9224w6fd404k830k922wn3mn4x95c48zrmgg4n85xigg904syrzbh5nca94aaf4anfjpjm9vbpfgkfba";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz";
+        sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld";
       };
     };
     "acorn-dynamic-import-2.0.2" = {
@@ -382,13 +373,13 @@ let
         sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8";
       };
     };
-    "adal-node-0.1.27" = {
+    "adal-node-0.1.28" = {
       name = "adal-node";
       packageName = "adal-node";
-      version = "0.1.27";
+      version = "0.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.27.tgz";
-        sha1 = "42252337bc1d01aff6b3c26138a08a3d4f420b0e";
+        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz";
+        sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485";
       };
     };
     "adbkit-2.11.0" = {
@@ -454,15 +445,6 @@ let
         sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng";
       };
     };
-    "addressparser-0.1.3" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
-        sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
-      };
-    };
     "addressparser-0.3.2" = {
       name = "addressparser";
       packageName = "addressparser";
@@ -580,13 +562,13 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ajv-6.2.0" = {
+    "ajv-6.2.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.2.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz";
-        sha1 = "afac295bbaa0152449e522742e4547c1ae9328d2";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.2.1.tgz";
+        sha1 = "28a6abc493a2abe0fb4c8507acaedb43fa550671";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -796,13 +778,13 @@ let
         sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
-    "ansi-styles-3.2.0" = {
+    "ansi-styles-3.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
       };
     };
     "ansi-wrap-0.1.0" = {
@@ -1390,13 +1372,13 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
-    "ast-types-0.11.2" = {
+    "ast-types-0.11.3" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.11.2";
+      version = "0.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.2.tgz";
-        sha512 = "1mfcrhzn37ray5i3fizrfm5gr1zijv6k1gy370v62smzd6j8d3irphhma9cs9kij7nwkgh5v60q53bfivpm2sscfxbdms9ywiqakgv8";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz";
+        sha512 = "2lga5vgh6bz1vii6kfdy2k1g99arw9cikxx8705p9v92rqn7ksdvbzjvhgfdf4s21nbfafrxjh3hrr5jz2yq43dr4hw7hqdvgjnh3jw";
       };
     };
     "ast-types-0.9.6" = {
@@ -1498,15 +1480,6 @@ let
         sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385";
       };
     };
-    "async-2.1.4" = {
-      name = "async";
-      packageName = "async";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
-        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
-      };
-    };
     "async-2.1.5" = {
       name = "async";
       packageName = "async";
@@ -1516,6 +1489,15 @@ let
         sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
+    "async-2.3.0" = {
+      name = "async";
+      packageName = "async";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz";
+        sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9";
+      };
+    };
     "async-2.5.0" = {
       name = "async";
       packageName = "async";
@@ -1597,13 +1579,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.203.0" = {
+    "aws-sdk-2.208.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.203.0";
+      version = "2.208.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.203.0.tgz";
-        sha1 = "7573c1274a4350bd5d78a6db93c9eeab40940acb";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.208.0.tgz";
+        sha1 = "f95e44524cb62c9a6e0ef95270236fc6a62178d6";
       };
     };
     "aws-sign-0.2.0" = {
@@ -2479,6 +2461,15 @@ let
         sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p";
       };
     };
+    "bencode-2.0.0" = {
+      name = "bencode";
+      packageName = "bencode";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz";
+        sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2";
+      };
+    };
     "better-assert-1.0.2" = {
       name = "better-assert";
       packageName = "better-assert";
@@ -3082,13 +3073,13 @@ let
         sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
       };
     };
-    "browser-stdout-1.3.0" = {
+    "browser-stdout-1.3.1" = {
       name = "browser-stdout";
       packageName = "browser-stdout";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
-        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
+        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
       };
     };
     "browserify-13.3.0" = {
@@ -3910,13 +3901,13 @@ let
         sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3";
       };
     };
-    "chalk-2.3.1" = {
+    "chalk-2.3.2" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz";
-        sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz";
+        sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
       };
     };
     "character-entities-1.2.1" = {
@@ -4108,13 +4099,13 @@ let
         sha1 = "04a106672c18b085ab774d983dfa3ea138f22205";
       };
     };
-    "ci-info-1.1.2" = {
+    "ci-info-1.1.3" = {
       name = "ci-info";
       packageName = "ci-info";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz";
-        sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr";
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz";
+        sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8";
       };
     };
     "cint-8.2.1" = {
@@ -4180,13 +4171,13 @@ let
         sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff";
       };
     };
-    "clean-css-4.1.9" = {
+    "clean-css-4.1.11" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "4.1.9";
+      version = "4.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz";
-        sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz";
+        sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a";
       };
     };
     "clean-stack-1.3.0" = {
@@ -4504,13 +4495,13 @@ let
         sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
       };
     };
-    "cloneable-readable-1.0.0" = {
+    "cloneable-readable-1.1.1" = {
       name = "cloneable-readable";
       packageName = "cloneable-readable";
-      version = "1.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz";
-        sha1 = "a6290d413f217a61232f95e458ff38418cfb0117";
+        url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.1.tgz";
+        sha512 = "3bfsmhwhasp3dqnj54lss7pcmyliy2i15x9sqm11yrlah27i6xyiiagh4f252ss7kr7b7spgqpcslv45am4vg9drm7i3a2xlaml9lqc";
       };
     };
     "cmd-shim-2.0.2" = {
@@ -4576,13 +4567,13 @@ let
         sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
-    "codecs-1.2.0" = {
+    "codecs-1.2.1" = {
       name = "codecs";
       packageName = "codecs";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz";
-        sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16";
+        url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz";
+        sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8";
       };
     };
     "codepage-1.4.0" = {
@@ -4711,6 +4702,15 @@ let
         sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
+    "colors-1.2.1" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz";
+        sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk";
+      };
+    };
     "colour-0.7.1" = {
       name = "colour";
       packageName = "colour";
@@ -4873,6 +4873,15 @@ let
         sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r";
       };
     };
+    "commander-2.15.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz";
+        sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc";
+      };
+    };
     "commander-2.6.0" = {
       name = "commander";
       packageName = "commander";
@@ -5062,6 +5071,15 @@ let
         sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
+    "concat-stream-1.6.1" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz";
+        sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2";
+      };
+    };
     "conf-1.4.0" = {
       name = "conf";
       packageName = "conf";
@@ -5369,13 +5387,13 @@ let
         sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
       };
     };
-    "conventional-changelog-1.1.17" = {
+    "conventional-changelog-1.1.18" = {
       name = "conventional-changelog";
       packageName = "conventional-changelog";
-      version = "1.1.17";
+      version = "1.1.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.17.tgz";
-        sha512 = "325x3h1qn2q1cg3x4dlia7sjanlv2qsj9c0nq8pzvr5fcwmg9qmf3am30bk4c4yjikyvfgpsvnp8rrh937bywd5y4d410hwfn1hbwhn";
+        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.18.tgz";
+        sha512 = "02967qizq9ymmgf5yahk2rca3dkrjsslqwrdsdsw4a8qjfhkliijsngzvi8p95mkr84mh4651kapbybiwdwyfncv4cgpv36m1pgj1xk";
       };
     };
     "conventional-changelog-angular-1.6.6" = {
@@ -5396,13 +5414,13 @@ let
         sha512 = "2b43fd5cpi069hsmfswl320lnpnvahmqmnrc9csk6qv0dq72nfj0jzafmbv5gsb3ds2ssr29lswwky61shy3n9hbxshq0qw3in6ds73";
       };
     };
-    "conventional-changelog-cli-1.3.15" = {
+    "conventional-changelog-cli-1.3.16" = {
       name = "conventional-changelog-cli";
       packageName = "conventional-changelog-cli";
-      version = "1.3.15";
+      version = "1.3.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.15.tgz";
-        sha512 = "0b9w7fp4mrgs12s4hznwzp79m9lza4fsygvdyma6qnd53h699jscc7h6jwlhdf398h5rpf91y2x0gl38fxfb9ydicshmvy5qdsgc4yh";
+        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz";
+        sha512 = "1h3h3vq237a95wqm6ml85794lhr268mq6v3j7574hmb04ssw7mrls5b6mn5q9azs5i594xxi9klaxzbrnqwxcyyz5cnz1svngzcdl6c";
       };
     };
     "conventional-changelog-codemirror-0.3.4" = {
@@ -5432,13 +5450,13 @@ let
         sha512 = "24dx0snmkfhr4qi7vdq0aywjw9k23x68kaqh0gn92lca7j1268zbzr6vf00izx5g86kkjihlzgsgx8piyy1mnimn9nk7bj8pv2ka4w4";
       };
     };
-    "conventional-changelog-eslint-1.0.4" = {
+    "conventional-changelog-eslint-1.0.5" = {
       name = "conventional-changelog-eslint";
       packageName = "conventional-changelog-eslint";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.4.tgz";
-        sha512 = "3zk9p0rc8xns93flvpc0lnyfqdyv48yc3m2z71da07gj8fbmbrxs0px30xnlqzdwmbcz86i9fksxrcnqq9mhlwcfkwyzma396n4cxpp";
+        url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz";
+        sha512 = "272hf880yc54va1r1h5zg9fk2vhfcacw7jixn3ksgaxk4nld0kdlfrpnv7b2nf682dssagbk6mdkqljgc0ldig3yqwccjqf0gx2zmgc";
       };
     };
     "conventional-changelog-express-0.3.4" = {
@@ -6782,13 +6800,13 @@ let
         sha512 = "2sylzgq5rwi12ac5y4fbvyyhs128zlcrp1q1i0bkp27fvlg60hr1slxzckk22x2rzgmwsqqlvzyylm9v0gwzbsbprd3c1mg78c396gp";
       };
     };
-    "deepmerge-2.0.1" = {
+    "deepmerge-2.1.0" = {
       name = "deepmerge";
       packageName = "deepmerge";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz";
-        sha512 = "2qww1m640drvrkcyijaky5kpzdg7pqixb2qk3ms5r99p9ch6isv8a6h0yqwypsw42d1hlg3v7v1x4x7cy0v10pn87cms9vaqa4g10sl";
+        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz";
+        sha512 = "2zs0sn06vr11mwi2xg2vns26s07gajx2s94hnpfab8g6fl7wmnwbg14fvi2ificasppcmy8g2dh1xiijxg6r8gilkjhsz40lbdmkks3";
       };
     };
     "default-browser-id-1.0.4" = {
@@ -7070,13 +7088,13 @@ let
         sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz";
       };
     };
-    "detective-5.0.2" = {
+    "detective-5.1.0" = {
       name = "detective";
       packageName = "detective";
-      version = "5.0.2";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-5.0.2.tgz";
-        sha512 = "0q6jv51mrwjp7ws5xdfpi49rq6ywl0fcl70hllsxiyqy4c89k14v0g9fj5g4y690n8yqw9vxxq6zgnw8lpwbsdvlgyhdqz3xjhhnjrm";
+        url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz";
+        sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac";
       };
     };
     "di-0.0.1" = {
@@ -7124,22 +7142,13 @@ let
         sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "diff-3.3.1" = {
+    "diff-3.5.0" = {
       name = "diff";
       packageName = "diff";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz";
-        sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh";
-      };
-    };
-    "diff-3.4.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz";
-        sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2";
+        url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
+        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
       };
     };
     "diff2html-2.3.3" = {
@@ -7565,13 +7574,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "duplexify-3.5.3" = {
+    "duplexify-3.5.4" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.3";
+      version = "3.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz";
-        sha512 = "0c611ik2kv5wiqwfi5zjyx70dnw117lbr0wwqxqxc0hldnnfigiqyh5xr7x6267vs63jgvqkzvvwb3b1g37zkk3nx5dh5z8xbs07hl3";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz";
+        sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7";
       };
     };
     "each-async-1.1.1" = {
@@ -7872,13 +7881,13 @@ let
         sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101";
       };
     };
-    "engine.io-client-3.1.5" = {
+    "engine.io-client-3.1.6" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
-      version = "3.1.5";
+      version = "3.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.5.tgz";
-        sha512 = "3ld2inpqkyy451a7lpf8kmaf76zrj9a50yg28z1d1znhnnj40g3cnrcq93690lknhb6mjv0k1nav2cbqx2p3aqqhmav7kippy0nzzs6";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz";
+        sha512 = "1zfr0lycsgvwkxc8i4qhg5rjr59ss7p66nz3j1y1awmvzgy9myn0rqrpv2hrnm76qv9kmiiss0jpxaaz9xy0lkp7857npkfb6q8fyw6";
       };
     };
     "engine.io-parser-1.0.6" = {
@@ -8052,13 +8061,13 @@ let
         sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
       };
     };
-    "es5-ext-0.10.39" = {
+    "es5-ext-0.10.40" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.39";
+      version = "0.10.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz";
-        sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz";
+        sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab";
       };
     };
     "es5-ext-0.8.2" = {
@@ -8277,13 +8286,13 @@ let
         sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc";
       };
     };
-    "eslint-4.18.1" = {
+    "eslint-4.18.2" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.18.1";
+      version = "4.18.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz";
-        sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz";
+        sha512 = "0mqvxkfl52068bfkpxjn14dgwfv4vv8w0a8pq2rw54bkbshfa2y6rpx122ssk3si3dy9298g68079ns1n7m0jrzgwca7a430ggj4bmb";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -8313,13 +8322,13 @@ let
         sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb";
       };
     };
-    "espree-3.5.3" = {
+    "espree-3.5.4" = {
       name = "espree";
       packageName = "espree";
-      version = "3.5.3";
+      version = "3.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz";
-        sha512 = "1cv3w3jgkm5sdaszxn172lhwgwr13w7sw75hmigqppmr9n2xx761r5cm32xhhg25ws8h00iy746qka5l85nm6sx5qci8iyfj00fsbb7";
+        url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
+        sha512 = "3a07jjjp8g8mdayw3n9l0p0llw7cfipjifan2ccyn2vm1zyafrmv5cj11rc6qmk7ibbq1vc4xxc3sfr54qpgxmxiizj0ck63d1hh1y8";
       };
     };
     "esprima-1.0.4" = {
@@ -8781,6 +8790,15 @@ let
         sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c";
       };
     };
+    "express-4.16.3" = {
+      name = "express";
+      packageName = "express";
+      version = "4.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz";
+        sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53";
+      };
+    };
     "express-5.0.0-alpha.6" = {
       name = "express";
       packageName = "express";
@@ -9159,13 +9177,13 @@ let
         sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
       };
     };
-    "feedparser-1.1.3" = {
+    "feedparser-2.2.9" = {
       name = "feedparser";
       packageName = "feedparser";
-      version = "1.1.3";
+      version = "2.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz";
-        sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b";
+        url = "https://registry.npmjs.org/feedparser/-/feedparser-2.2.9.tgz";
+        sha1 = "9138197dafdae05fcadde0036beeaf6066c2c5e9";
       };
     };
     "fibers-1.0.15" = {
@@ -9330,6 +9348,15 @@ let
         sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
       };
     };
+    "finalhandler-1.1.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
+        sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3";
+      };
+    };
     "find-cache-dir-1.0.0" = {
       name = "find-cache-dir";
       packageName = "find-cache-dir";
@@ -9780,13 +9807,13 @@ let
         sha1 = "ef5491490f9433b705faa77249c99029ae348559";
       };
     };
-    "formidable-1.1.1" = {
+    "formidable-1.2.0" = {
       name = "formidable";
       packageName = "formidable";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
-        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.0.tgz";
+        sha512 = "00p3bjjkrbwf4xcizvkz2bdc1h0cs8gnshfwn35ncx0zs5qy8pzgc65xg6ndma0mlfy69v5r0cg3zj8x6j6jdn4gzj2w0ibgm7mmgw6";
       };
     };
     "forwarded-0.1.2" = {
@@ -9942,6 +9969,15 @@ let
         sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
+    "fs-extra-2.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz";
+        sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600";
+      };
+    };
     "fs-extra-2.1.2" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -10699,13 +10735,13 @@ let
         sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
       };
     };
-    "got-8.2.0" = {
+    "got-8.3.0" = {
       name = "got";
       packageName = "got";
-      version = "8.2.0";
+      version = "8.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-8.2.0.tgz";
-        sha512 = "01g5s6aqp4ikmpwhqvw4j7c4n4fq3v7nqaszr9kvwrx801gxzb70b3qx0pqsir2hqw2a7jfd1ja6v577hmmnblvz7c0h8spkal9s9l2";
+        url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz";
+        sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh";
       };
     };
     "graceful-fs-1.2.3" = {
@@ -11338,13 +11374,13 @@ let
         sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
       };
     };
-    "hosted-git-info-2.5.0" = {
+    "hosted-git-info-2.6.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.5.0";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz";
+        sha512 = "1vi4baj130s7mladvb4rad9ka8nqzcwws9i1zaaplp0fdrmnfwjfbpq01cghha2c2frd2f900f07awglhbbyym0bpwmrph0hhhf11ll";
       };
     };
     "hot-shots-4.8.0" = {
@@ -11473,13 +11509,13 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
-    "http-parser-js-0.4.10" = {
+    "http-parser-js-0.4.11" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.10";
+      version = "0.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz";
-        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz";
+        sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920";
       };
     };
     "http-proxy-1.0.2" = {
@@ -11608,13 +11644,13 @@ let
         sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
       };
     };
-    "https-proxy-agent-2.1.1" = {
+    "https-proxy-agent-2.2.0" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz";
-        sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.0.tgz";
+        sha512 = "2ybiwjzy908vjwlhg0cfi00ylv35l1kkldn3l69j8hvng0wn7l6193054hy2zw7a69r8xgn5n6w0fx3h2pajnyggiqggjzgf5yrqidr";
       };
     };
     "humanize-0.0.9" = {
@@ -11644,22 +11680,22 @@ let
         sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42";
       };
     };
-    "hypercore-6.12.2" = {
+    "hypercore-6.12.3" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.12.2";
+      version = "6.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz";
-        sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.3.tgz";
+        sha512 = "0gxq17xmp2926g01dram5fdny52r40lvvanf83d35vvrhsck95zx2ymrhn6hv81hp8wvlwlqs84zbz35xp6d0nf3396pa0kra44ma4k";
       };
     };
-    "hypercore-protocol-6.5.2" = {
+    "hypercore-protocol-6.6.0" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.5.2";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.2.tgz";
-        sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.0.tgz";
+        sha512 = "3kwmsg8vfza3i9nbx84v43sh4gi5bjpmj7mn15xyvxg30k0074yvgpng16g8310r88dsk055awlj9zf5zpsk1r0zy61890k9y7bpppg";
       };
     };
     "hyperdrive-9.12.3" = {
@@ -11797,6 +11833,15 @@ let
         sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
       };
     };
+    "ignore-walk-3.0.1" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
+      };
+    };
     "image-size-0.5.5" = {
       name = "image-size";
       packageName = "image-size";
@@ -11959,13 +12004,13 @@ let
         sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
-    "init-package-json-1.10.1" = {
+    "init-package-json-1.10.3" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "1.10.1";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz";
-        sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz";
+        sha512 = "0kkcy07hj1ck8xmwspn6x32k4j1c6j88wr7wq2kxb6cx9rml0b8ncglglkhcz0r7k417fshknm2vzrqm188yp18gdny7gahm1fa596c";
       };
     };
     "ink-0.3.1" = {
@@ -11995,13 +12040,13 @@ let
         sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
       };
     };
-    "innertext-1.0.2" = {
+    "innertext-1.0.3" = {
       name = "innertext";
       packageName = "innertext";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz";
-        sha1 = "11a197b3143a593636fba5d59213835e6954580a";
+        url = "https://registry.npmjs.org/innertext/-/innertext-1.0.3.tgz";
+        sha512 = "1ig0sy92zxyzynzi9d4g3wq1286sjs9xx6dpn10lmis6hpjh5266b0v8nzp2ry5x35ybfq9g60qjhy5pfyl26yzkbmv8vn8pv8kabk4";
       };
     };
     "inquirer-0.10.1" = {
@@ -12058,13 +12103,13 @@ let
         sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47";
       };
     };
-    "insert-module-globals-7.0.1" = {
+    "insert-module-globals-7.0.2" = {
       name = "insert-module-globals";
       packageName = "insert-module-globals";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz";
-        sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3";
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz";
+        sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7";
       };
     };
     "insight-0.8.4" = {
@@ -13111,13 +13156,13 @@ let
         sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd";
       };
     };
-    "jaeger-client-3.9.1" = {
+    "jaeger-client-3.10.0" = {
       name = "jaeger-client";
       packageName = "jaeger-client";
-      version = "3.9.1";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.9.1.tgz";
-        sha1 = "27a7954cf390e279ba9ad503cfed01ce171b15a1";
+        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.10.0.tgz";
+        sha1 = "ad0e830ead7aabad2601a52a7e463f0d942b0091";
       };
     };
     "jed-1.1.1" = {
@@ -13228,6 +13273,15 @@ let
         sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv";
       };
     };
+    "js-yaml-3.11.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
+        sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
+      };
+    };
     "js2xmlparser-1.0.0" = {
       name = "js2xmlparser";
       packageName = "js2xmlparser";
@@ -13705,6 +13759,15 @@ let
         sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j";
       };
     };
+    "k-bucket-4.0.0" = {
+      name = "k-bucket";
+      packageName = "k-bucket";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz";
+        sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk";
+      };
+    };
     "k-rpc-3.7.0" = {
       name = "k-rpc";
       packageName = "k-rpc";
@@ -13714,22 +13777,22 @@ let
         sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23";
       };
     };
-    "k-rpc-4.2.1" = {
+    "k-rpc-4.3.1" = {
       name = "k-rpc";
       packageName = "k-rpc";
-      version = "4.2.1";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz";
-        sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n";
+        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz";
+        sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s";
       };
     };
-    "k-rpc-socket-1.7.2" = {
+    "k-rpc-socket-1.8.0" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.7.2";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz";
-        sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz";
+        sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz";
       };
     };
     "kad-fs-0.0.4" = {
@@ -13994,15 +14057,6 @@ let
         sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
       };
     };
-    "lazy-cache-2.0.2" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz";
-        sha1 = "b9190a4f913354694840859f8a8f7084d8822264";
-      };
-    };
     "lazystream-1.0.0" = {
       name = "lazystream";
       packageName = "lazystream";
@@ -14687,6 +14741,15 @@ let
         sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
       };
     };
+    "lodash.get-4.4.2" = {
+      name = "lodash.get";
+      packageName = "lodash.get";
+      version = "4.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    };
     "lodash.groupby-4.6.0" = {
       name = "lodash.groupby";
       packageName = "lodash.groupby";
@@ -14696,6 +14759,15 @@ let
         sha1 = "0b08a1dcf68397c397855c3239783832df7403d1";
       };
     };
+    "lodash.has-4.5.2" = {
+      name = "lodash.has";
+      packageName = "lodash.has";
+      version = "4.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz";
+        sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862";
+      };
+    };
     "lodash.isarguments-3.1.0" = {
       name = "lodash.isarguments";
       packageName = "lodash.isarguments";
@@ -14939,6 +15011,15 @@ let
         sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4";
       };
     };
+    "lodash.uniq-4.5.0" = {
+      name = "lodash.uniq";
+      packageName = "lodash.uniq";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+      };
+    };
     "log-symbols-1.0.2" = {
       name = "log-symbols";
       packageName = "log-symbols";
@@ -14993,13 +15074,13 @@ let
         sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee";
       };
     };
-    "lokijs-1.5.2" = {
+    "lokijs-1.5.3" = {
       name = "lokijs";
       packageName = "lokijs";
-      version = "1.5.2";
+      version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.2.tgz";
-        sha1 = "75d43df21232f1d5479d191a69b6ebf61754a873";
+        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.3.tgz";
+        sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b";
       };
     };
     "long-2.4.0" = {
@@ -15164,13 +15245,13 @@ let
         sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
       };
     };
-    "lru-cache-4.1.1" = {
+    "lru-cache-4.1.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz";
+        sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2";
       };
     };
     "lsmod-1.0.0" = {
@@ -16199,6 +16280,15 @@ let
         sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2";
       };
     };
+    "moment-2.21.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.21.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz";
+        sha512 = "02hkdlhchyx4dqrh4q7p3c0xggpygcf0pimjvm66sib8z87wkbndici8vp2r39b472zpmybrf85y2c92lbw3hng9j2kfifl33l7f9jc";
+      };
+    };
     "moment-2.6.0" = {
       name = "moment";
       packageName = "moment";
@@ -16397,13 +16487,13 @@ let
         sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
       };
     };
-    "ms-rest-2.3.1" = {
+    "ms-rest-2.3.2" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.1.tgz";
-        sha512 = "34xikyld48lq65i6ngn4wf8gsnn2lllbd7fray2rsxihkz6azm7zsqs2fm9ng566fdy6mf6qj41lvvyl2xih7d5a074rkhxpwdf1w1m";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.2.tgz";
+        sha512 = "04bv4p3b4k2qz7h4yqhk163fm69yhip62hph9xa6ncx5icw06jkhyjgsag12f83l2d3f95541qfdpynv388s0jjyqn57d52l6nvbhp3";
       };
     };
     "ms-rest-azure-1.15.7" = {
@@ -17113,13 +17203,13 @@ let
         sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
       };
     };
-    "node-appc-0.2.41" = {
+    "node-appc-0.2.44" = {
       name = "node-appc";
       packageName = "node-appc";
-      version = "0.2.41";
+      version = "0.2.44";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz";
-        sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52";
+        url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.44.tgz";
+        sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh";
       };
     };
     "node-cache-4.1.1" = {
@@ -17167,22 +17257,22 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "node-forge-0.7.2" = {
+    "node-forge-0.7.4" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "0.7.2";
+      version = "0.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.2.tgz";
-        sha512 = "2kc6a8y2fmpsmiddh9vkiy32kg6isg3igpfgpkvvkw48y5x2n3wwrxsi7zcjyxf2yakjygvim3gy74c077lrc0cm60f388diw2nhc2x";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.4.tgz";
+        sha512 = "0ygz69n952i01haj405jv90sa51d0yvyxqq9hn04p6fkfvbvm0yzk0310d864sjz5frvj1f6r0dl4xaiwz690hvkglazdmy9vvz8dzh";
       };
     };
-    "node-gyp-build-3.2.2" = {
+    "node-gyp-build-3.3.0" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "3.2.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz";
-        sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
+        sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
       };
     };
     "node-int64-0.4.0" = {
@@ -17248,13 +17338,13 @@ let
         sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2";
       };
     };
-    "node-red-node-feedparser-0.1.8" = {
+    "node-red-node-feedparser-0.1.10" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.8";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz";
-        sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.10.tgz";
+        sha512 = "0d40wp93zkzw88sv839mm8ywrv0jidpfqbv5a6j0dgj5ivvi7crnsy92ciiifazdrnh9qqhg2vs7ganja4h8xrsmjal1jh48cdyxwdz";
       };
     };
     "node-red-node-rbe-0.2.1" = {
@@ -17590,6 +17680,15 @@ let
         sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws";
       };
     };
+    "npm-bundled-1.0.3" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
+        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
+      };
+    };
     "npm-keyword-5.0.0" = {
       name = "npm-keyword";
       packageName = "npm-keyword";
@@ -17599,13 +17698,22 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-package-arg-5.1.2" = {
+    "npm-package-arg-6.0.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "5.1.2";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz";
+        sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047";
+      };
+    };
+    "npm-packlist-1.1.10" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
+        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
       };
     };
     "npm-registry-client-0.2.27" = {
@@ -17617,13 +17725,13 @@ let
         sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
       };
     };
-    "npm-registry-client-8.5.0" = {
+    "npm-registry-client-8.5.1" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "8.5.0";
+      version = "8.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz";
-        sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz";
+        sha512 = "0g7abpykfqb1x17pajm1ndsh61n3ydyimv5npsjrn9hd1s72csxh7fzdn28gldz30n00wgb8rg9y8jfhxli3cnii61i5vl0cwbwdf7f";
       };
     };
     "npm-run-path-1.0.0" = {
@@ -18392,6 +18500,15 @@ let
         sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5";
       };
     };
+    "p-cancelable-0.4.0" = {
+      name = "p-cancelable";
+      packageName = "p-cancelable";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.0.tgz";
+        sha512 = "3bd5qxdbz8icpcdb0mnhbfb5p4vzqx0jf02ii71prl6kgnaiki21agp84imr0id9fiwk0h8yi0wchmsy749r98ldscg3jxmyyl1s2pw";
+      };
+    };
     "p-finally-1.0.0" = {
       name = "p-finally";
       packageName = "p-finally";
@@ -18689,13 +18806,13 @@ let
         sha1 = "32d4b6afde631420e5f415919a222b774b575707";
       };
     };
-    "parse-torrent-file-4.0.3" = {
+    "parse-torrent-file-4.1.0" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz";
-        sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r";
+        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz";
+        sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5";
       };
     };
     "parse5-3.0.3" = {
@@ -19932,31 +20049,31 @@ let
         sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
       };
     };
-    "pug-2.0.0-rc.4" = {
+    "pug-2.0.1" = {
       name = "pug";
       packageName = "pug";
-      version = "2.0.0-rc.4";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz";
-        sha512 = "1fbygi6jg8awam3agrc63yjlgxk8vfpnym1ql4dikclikp3kdrxfpfgdywadidzzic33b9fdqnwqy6ag82m4x6kmgl644zsz2ig3gj8";
+        url = "https://registry.npmjs.org/pug/-/pug-2.0.1.tgz";
+        sha1 = "27c151612b53d729abe8e8285aac6bc89345b5d0";
       };
     };
-    "pug-attrs-2.0.2" = {
+    "pug-attrs-2.0.3" = {
       name = "pug-attrs";
       packageName = "pug-attrs";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz";
-        sha1 = "8be2b2225568ffa75d1b866982bff9f4111affcb";
+        url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz";
+        sha1 = "a3095f970e64151f7bdad957eef55fb5d7905d15";
       };
     };
-    "pug-code-gen-2.0.0" = {
+    "pug-code-gen-2.0.1" = {
       name = "pug-code-gen";
       packageName = "pug-code-gen";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz";
-        sha512 = "1b9phnpcwd902482wvyql8a4h9wr1fw5idsjvg14bjvkmvxharb8m2ca25rj2f0s4i9sdldp2fj02i5933qys4921r9p7w97wjj52hk";
+        url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz";
+        sha1 = "0951ec83225d74d8cfc476a7f99a259b5f7d050c";
       };
     };
     "pug-error-1.3.2" = {
@@ -19968,76 +20085,76 @@ let
         sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26";
       };
     };
-    "pug-filters-2.1.5" = {
+    "pug-filters-3.0.1" = {
       name = "pug-filters";
       packageName = "pug-filters";
-      version = "2.1.5";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz";
-        sha512 = "0nihpmd2irqm58nrnc382aqyb787sw551g74fc4500j4kda6qxhvahknqahl918pizcx97wp64fq34m2kksp8p2jlqqn2vbmga3nk66";
+        url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.0.1.tgz";
+        sha1 = "163ef73bfbb1f1544d032b2b40f45130eb52dccb";
       };
     };
-    "pug-lexer-3.1.0" = {
+    "pug-lexer-4.0.0" = {
       name = "pug-lexer";
       packageName = "pug-lexer";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz";
-        sha1 = "fd087376d4a675b4f59f8fef422883434e9581a2";
-      };
-    };
-    "pug-linker-3.0.3" = {
-      name = "pug-linker";
-      packageName = "pug-linker";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz";
-        sha512 = "3j4v4ah7h6m44m7z40iqkmsdyyjb0azz5ajifi5v4byld75vrl715r2xnc8vhm4z1v686m55yyxhlcmzx4cby2ssv4yqp221779q8hc";
-      };
-    };
-    "pug-load-2.0.9" = {
-      name = "pug-load";
-      packageName = "pug-load";
-      version = "2.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz";
-        sha512 = "3liz20386ljxz81ia1jz31fljanr88zp0br2b45lrjdzr40slg2nkyz3xi7bsqam2zixzb86hspwvl734ac36f8shz6iqpf58w5jdq4";
-      };
-    };
-    "pug-parser-4.0.0" = {
-      name = "pug-parser";
-      packageName = "pug-parser";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz";
-        sha512 = "11a3hd10qhnpzmdrgqwndjjzmgqz090q2l89jmaqvjm0lnlrxcqig1fi0d92wxna26d18g8ywv4n9msnnlb5x2qq2qdc6sbywa19hd1";
+        url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz";
+        sha1 = "210c18457ef2e1760242740c5e647bd794cec278";
       };
     };
-    "pug-runtime-2.0.3" = {
+    "pug-linker-3.0.5" = {
+      name = "pug-linker";
+      packageName = "pug-linker";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz";
+        sha1 = "9e9a7ae4005682d027deeb96b000f88eeb83a02f";
+      };
+    };
+    "pug-load-2.0.11" = {
+      name = "pug-load";
+      packageName = "pug-load";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz";
+        sha1 = "e648e57ed113fe2c1f45d57858ea2bad6bc01527";
+      };
+    };
+    "pug-parser-5.0.0" = {
+      name = "pug-parser";
+      packageName = "pug-parser";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz";
+        sha1 = "e394ad9b3fca93123940aff885c06e44ab7e68e4";
+      };
+    };
+    "pug-runtime-2.0.4" = {
       name = "pug-runtime";
       packageName = "pug-runtime";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz";
-        sha1 = "98162607b0fce9e254d427f33987a5aee7168bda";
+        url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.4.tgz";
+        sha1 = "e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58";
       };
     };
-    "pug-strip-comments-1.0.2" = {
+    "pug-strip-comments-1.0.3" = {
       name = "pug-strip-comments";
       packageName = "pug-strip-comments";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz";
-        sha1 = "d313afa01bcc374980e1399e23ebf2eb9bdc8513";
+        url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz";
+        sha1 = "f1559592206edc6f85310dacf4afb48a025af59f";
       };
     };
-    "pug-walk-1.1.5" = {
+    "pug-walk-1.1.7" = {
       name = "pug-walk";
       packageName = "pug-walk";
-      version = "1.1.5";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz";
-        sha512 = "1418rf52jpq3k5l26drb11156l945688pjpia6njqrxzgffjb2rric213vrqigglhmhwc0r57zsmlknnwvhg5w9nh025b6yapb4g6dc";
+        url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.7.tgz";
+        sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3";
       };
     };
     "pull-cat-1.1.11" = {
@@ -20661,13 +20778,13 @@ let
         sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
       };
     };
-    "read-package-json-2.0.12" = {
+    "read-package-json-2.0.13" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.12";
+      version = "2.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz";
-        sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz";
+        sha512 = "2d6gl0kam8r9s4akgqi1pjbfqa6iszwsi1v87kw354b68s7dck4w8flnjp38b9dsj9cldbch0czj1m9gbrh252dm3c6mg2r6knmjmzz";
       };
     };
     "read-pkg-1.1.0" = {
@@ -20769,13 +20886,13 @@ let
         sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
       };
     };
-    "readable-stream-2.3.4" = {
+    "readable-stream-2.3.5" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.4";
+      version = "2.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz";
-        sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz";
+        sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl";
       };
     };
     "readdirp-2.1.0" = {
@@ -20895,13 +21012,13 @@ let
         sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
       };
     };
-    "redis-commands-1.3.4" = {
+    "redis-commands-1.3.5" = {
       name = "redis-commands";
       packageName = "redis-commands";
-      version = "1.3.4";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.4.tgz";
-        sha512 = "2xl6insq71fz02pxvdcqj9q06la7nj0g5idl66yp5x7741k6xah4slrslq8wfil0fa9lx68cgl2rvzy08p1bgp7jyvjbinc8r13df25";
+        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz";
+        sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by";
       };
     };
     "redis-parser-2.6.0" = {
@@ -21192,6 +21309,15 @@ let
         sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
       };
     };
+    "request-2.85.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.85.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
+        sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
+      };
+    };
     "request-2.9.203" = {
       name = "request";
       packageName = "request";
@@ -21750,15 +21876,6 @@ let
         sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
       };
     };
-    "sax-0.6.1" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
-        sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9";
-      };
-    };
     "sax-1.1.4" = {
       name = "sax";
       packageName = "sax";
@@ -22146,13 +22263,13 @@ let
         sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
       };
     };
-    "service-runner-2.5.1" = {
+    "service-runner-2.5.2" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.5.1";
+      version = "2.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.1.tgz";
-        sha1 = "b282214463187607748aa3695023a09f5d28c672";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.2.tgz";
+        sha1 = "3a1b8f85625d0cb9154dcbe34d578142c95f1cc7";
       };
     };
     "set-blocking-2.0.0" = {
@@ -22164,15 +22281,6 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "set-getter-0.1.0" = {
-      name = "set-getter";
-      packageName = "set-getter";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz";
-        sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376";
-      };
-    };
     "set-immediate-shim-1.0.1" = {
       name = "set-immediate-shim";
       packageName = "set-immediate-shim";
@@ -22416,13 +22524,13 @@ let
         sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6";
       };
     };
-    "simple-git-1.91.0" = {
+    "simple-git-1.92.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.91.0";
+      version = "1.92.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.91.0.tgz";
-        sha1 = "842db6c2ba08328e93c17391a895b850518cd13a";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.92.0.tgz";
+        sha1 = "6061468eb7d19f0141078fc742e62457e910f547";
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -22668,13 +22776,13 @@ let
         sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1";
       };
     };
-    "snapdragon-0.8.1" = {
+    "snapdragon-0.8.2" = {
       name = "snapdragon";
       packageName = "snapdragon";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz";
-        sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370";
+        url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
+        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
       };
     };
     "snapdragon-node-2.1.1" = {
@@ -22731,13 +22839,13 @@ let
         sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
-    "snyk-1.69.10" = {
+    "snyk-1.70.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.69.10";
+      version = "1.70.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.69.10.tgz";
-        sha1 = "34c66b21791435dd17fa2955904a5fdd6b57415d";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.70.0.tgz";
+        sha1 = "141a5ab88c262ef1bd6cb2b590bc50d4f46f4dc8";
       };
     };
     "snyk-config-1.0.1" = {
@@ -22839,13 +22947,13 @@ let
         sha1 = "13743a058437dff890baaf437c333c966a743cb6";
       };
     };
-    "snyk-sbt-plugin-1.2.4" = {
+    "snyk-sbt-plugin-1.2.5" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.4.tgz";
-        sha512 = "3fry8q6f0nrcrzs67zjxkgabb0hinyn5zy1kxq8wf9ca1r0fs67mk4ybiy4fxjy8rwj2axbhhhc3lf5wi97m3amh9k70pakg08yq7q4";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz";
+        sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -23496,15 +23604,6 @@ let
         sha1 = "62e143c18530fda103320b3403e8ad42786d9718";
       };
     };
-    "ssri-4.1.6" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
-      };
-    };
     "ssri-5.2.4" = {
       name = "ssri";
       packageName = "ssri";
@@ -24252,13 +24351,13 @@ let
         sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b";
       };
     };
-    "supports-color-5.2.0" = {
+    "supports-color-5.3.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "5.2.0";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz";
-        sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
+        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
       };
     };
     "symbol-observable-1.0.1" = {
@@ -24297,6 +24396,15 @@ let
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
+    "table-4.0.2" = {
+      name = "table";
+      packageName = "table";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz";
+        sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai";
+      };
+    };
     "table-4.0.3" = {
       name = "table";
       packageName = "table";
@@ -25432,13 +25540,13 @@ let
         sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
       };
     };
-    "uglify-js-2.7.5" = {
+    "uglify-js-2.8.21" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.5";
+      version = "2.8.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.21.tgz";
+        sha1 = "1733f669ae6f82fc90c7b25ec0f5c783ee375314";
       };
     };
     "uglify-js-2.8.29" = {
@@ -25450,13 +25558,13 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.3.12" = {
+    "uglify-js-3.3.14" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.12";
+      version = "3.3.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz";
-        sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz";
+        sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr";
       };
     };
     "uglify-js-3.3.6" = {
@@ -25486,13 +25594,13 @@ let
         sha1 = "b951f4abb6bd617e66f63eb891498e391763e309";
       };
     };
-    "uglifyjs-webpack-plugin-1.2.2" = {
+    "uglifyjs-webpack-plugin-1.2.3" = {
       name = "uglifyjs-webpack-plugin";
       packageName = "uglifyjs-webpack-plugin";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz";
-        sha512 = "3ngk387v5rza5gly8576cr1kmqmrpvb5jp6l33ac6ps5zkra0anr722gmx29i4m6q5bj6v4gdh8jikqg7l1lf4nkc06aynz6nzwsvq8";
+        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.3.tgz";
+        sha512 = "3dhgxlb6k66s9ah10iapb3lsyygxg6hxrdrs734pgppyrqf8h9ib6mv1vhja19j1chnhffqryl84i6p77qmdq86i53f5fkmgv9zkkva";
       };
     };
     "uid-0.0.2" = {
@@ -25585,13 +25693,13 @@ let
         sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah";
       };
     };
-    "umd-3.0.1" = {
+    "umd-3.0.2" = {
       name = "umd";
       packageName = "umd";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz";
-        sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e";
+        url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz";
+        sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -26071,13 +26179,13 @@ let
         sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
       };
     };
-    "use-2.0.2" = {
+    "use-3.1.0" = {
       name = "use";
       packageName = "use";
-      version = "2.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz";
-        sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8";
+        url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz";
+        sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9";
       };
     };
     "user-home-1.1.1" = {
@@ -26611,31 +26719,58 @@ let
         sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa";
       };
     };
-    "vscode-languageclient-3.5.0" = {
+    "vscode-jsonrpc-3.6.0" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz";
+        sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y";
+      };
+    };
+    "vscode-languageclient-4.0.0" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
-      version = "3.5.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz";
-        sha1 = "36d02cc186a8365a4467719a290fb200a9ae490a";
+        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz";
+        sha512 = "26vnna1pgmd2l4al7p76v5jqv5jnbljan1wjqywnn1h4wypx3bilgfnir5xmyj356hyvcikihbj7m030blp0nn9a7cmdmwrws110vf1";
       };
     };
-    "vscode-languageserver-3.5.0" = {
+    "vscode-languageserver-3.5.1" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz";
-        sha1 = "d28099bc6ddda8c1dd16b707e454e1b1ddae0dba";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz";
+        sha512 = "20rg3b1dymhvnkkxjg481ygy13zg0lg35n5bs4fhwl8f8g3lwy53vnfsxcarjnn6zfjbanq0mllqcqaimbf24n99df327g082ghm1a5";
       };
     };
-    "vscode-languageserver-protocol-3.5.0" = {
+    "vscode-languageserver-4.0.0" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz";
+        sha512 = "1g2q6pp97pn1vw1qsxw22487iv64qc8vpr3pjjdmb6j6h6r08l2jb8mv1x8zrv42zsy62c9cvjq1qkb74q7xgsigpc4adlx2sfzs63g";
+      };
+    };
+    "vscode-languageserver-protocol-3.5.1" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz";
-        sha1 = "067c5cbe27709795398d119692c97ebba1452209";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz";
+        sha512 = "1hajzildw9njhvj7psprgaw4kipjfsi0dw6fw1r1a8nk04plns64f5f2rvzxsj1knm9ad55f2x0d4dcivbg2zi5gii5ggq01ciw7wym";
+      };
+    };
+    "vscode-languageserver-protocol-3.6.0" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz";
+        sha512 = "0qcx36adi340y26hb4smwifvand4xkysgxm7mr5m4ycxbfnx8vd0g2sin9j4p9v2lnrgx47zpshiam95lmm0z4l953vpihh0ian3piw";
       };
     };
     "vscode-languageserver-types-3.5.0" = {
@@ -26647,13 +26782,22 @@ let
         sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374";
       };
     };
-    "vscode-uri-1.0.1" = {
+    "vscode-languageserver-types-3.6.1" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz";
+        sha512 = "2ci0g6n2903n20zdbgjbvj3wxn7fh09f9pmbgnwyjjnxwfvmgni244v0k5y31jlv351bdk8cqk4p81wdb9qkyfchxwwqn8lr25vg61n";
+      };
+    };
+    "vscode-uri-1.0.3" = {
       name = "vscode-uri";
       packageName = "vscode-uri";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz";
-        sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8";
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.3.tgz";
+        sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52";
       };
     };
     "walk-2.3.9" = {
@@ -26692,6 +26836,15 @@ let
         sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac";
       };
     };
+    "watchpack-1.5.0" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz";
+        sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5";
+      };
+    };
     "wcwidth-1.0.1" = {
       name = "wcwidth";
       packageName = "wcwidth";
@@ -26755,13 +26908,13 @@ let
         sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy";
       };
     };
-    "websocket-stream-5.1.1" = {
+    "websocket-stream-5.1.2" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz";
-        sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz";
+        sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m";
       };
     };
     "whatwg-fetch-2.0.3" = {
@@ -27007,13 +27160,13 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "winston-2.4.0" = {
+    "winston-2.4.1" = {
       name = "winston";
       packageName = "winston";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz";
-        sha1 = "808050b93d52661ed9fb6c26b3f0c826708b0aee";
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz";
+        sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk";
       };
     };
     "with-4.0.3" = {
@@ -27061,13 +27214,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "worker-farm-1.5.4" = {
+    "worker-farm-1.6.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
-      version = "1.5.4";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz";
-        sha512 = "3xic3z7f6cga2kaps1ysysq02qljwi534lziz472mvngx097xg4y0fk77qi194akp44dbl8wcinys0mjvwxcrd2rqlgsznw9fa84g11";
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz";
+        sha512 = "1yxyar4li6hnvj884kxg0agx61wsrmqnbqc06r7wy8is6iyhf2czrdgnxx4055c5hwlhhg1y8j72sh35wak9i3996kvbwycfssbf3zb";
       };
     };
     "wrap-ansi-2.1.0" = {
@@ -27115,15 +27268,6 @@ let
         sha512 = "3s89p8x1i16wg1prbm40z7l00611hzk2s7kkvph6fw4cx049p3gpviqmhbgqxxi9pfjz32mx3aj7qsygmfcnvasgs43rj1ynwdd944p";
       };
     };
-    "wrench-1.5.9" = {
-      name = "wrench";
-      packageName = "wrench";
-      version = "1.5.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz";
-        sha1 = "411691c63a9b2531b1700267279bdeca23b2142a";
-      };
-    };
     "write-0.2.1" = {
       name = "write";
       packageName = "write";
@@ -27412,6 +27556,15 @@ let
         sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f";
       };
     };
+    "xmldom-0.1.22" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+      };
+    };
     "xmldom-0.1.27" = {
       name = "xmldom";
       packageName = "xmldom";
@@ -27886,8 +28039,8 @@ in
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
       sources."chmodr-1.0.2"
-      sources."colors-1.1.2"
-      sources."commander-2.14.1"
+      sources."colors-1.2.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
       sources."core-js-2.5.3"
@@ -27979,10 +28132,10 @@ in
   asar = nodeEnv.buildNodePackage {
     name = "asar";
     packageName = "asar";
-    version = "0.14.2";
+    version = "0.14.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz";
-      sha512 = "1s03v9h1823r1y95jgrdnf4b2hj56gdi879kq29lv7q59hnn530q6g32qakjj8d6lzjx52r5qvg30szdi1fkvj3zx1dgaq30k5kiakq";
+      url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz";
+      sha512 = "1p102lrikvbx1rrp8b1d47fif3qwz2487q4djgnf6288hjk8gf2nxcinwzixkfh0dw0zy7mbv1przwg4zcnpgv7wpsbnqg6a1anf4zs";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -28003,7 +28156,7 @@ in
       sources."chromium-pickle-js-0.2.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       (sources."cryptiles-3.1.2" // {
@@ -28065,7 +28218,7 @@ in
       sources."q-1.5.1"
       sources."qs-6.5.1"
       sources."readable-stream-1.1.14"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."sntp-2.1.0"
@@ -28106,7 +28259,7 @@ in
     dependencies = [
       sources."@types/caseless-0.12.1"
       sources."@types/form-data-2.2.1"
-      sources."@types/node-8.9.4"
+      sources."@types/node-8.9.5"
       sources."@types/request-2.47.0"
       sources."@types/tough-cookie-2.3.2"
       sources."@types/uuid-3.4.3"
@@ -28289,7 +28442,7 @@ in
       sources."combined-stream-1.0.6"
       sources."commander-1.0.4"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."core-util-is-1.0.2"
       (sources."cryptiles-3.1.2" // {
         dependencies = [
@@ -28384,21 +28537,21 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.20.1"
-      (sources."ms-rest-2.3.1" // {
+      sources."moment-2.21.0"
+      (sources."ms-rest-2.3.2" // {
         dependencies = [
           sources."extend-3.0.1"
-          sources."request-2.83.0"
+          sources."request-2.85.0"
           sources."through-2.3.8"
           sources."tunnel-0.0.5"
         ];
       })
       (sources."ms-rest-azure-2.5.4" // {
         dependencies = [
-          sources."@types/node-9.4.6"
-          (sources."adal-node-0.1.27" // {
+          sources."@types/node-9.4.7"
+          (sources."adal-node-0.1.28" // {
             dependencies = [
-              sources."@types/node-8.9.4"
+              sources."@types/node-8.9.5"
             ];
           })
           sources."async-2.6.0"
@@ -28453,7 +28606,7 @@ in
           sources."boom-2.10.1"
           sources."caseless-0.11.0"
           sources."chalk-1.1.3"
-          sources."commander-2.14.1"
+          sources."commander-2.15.0"
           sources."cryptiles-2.0.5"
           sources."extend-3.0.1"
           sources."form-data-1.0.1"
@@ -28493,7 +28646,7 @@ in
         dependencies = [
           sources."caseless-0.11.0"
           sources."process-nextick-args-2.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -28597,7 +28750,7 @@ in
       sources."get-stdin-4.0.1"
       sources."glob-6.0.4"
       sources."graceful-fs-3.0.11"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -28675,13 +28828,12 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.1.0";
+    version = "16.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.1.0.tgz";
-      sha512 = "356pxbnfj5skk2jkc36m9qma51v9f2cf3km9rbvblhdzv1jlpdhppm0ggi42ifmq2knlfg5jcvif4pqlxfkfjrs27x3adz5s0naa14g";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz";
+      sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9";
     };
     dependencies = [
-      sources."@browserify/acorn5-object-spread-5.0.1"
       sources."JSONStream-1.3.2"
       sources."acorn-4.0.13"
       sources."acorn-node-1.3.0"
@@ -28715,7 +28867,7 @@ in
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
@@ -28732,7 +28884,7 @@ in
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
-      sources."detective-5.0.2"
+      sources."detective-5.1.0"
       sources."diffie-hellman-5.0.2"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
@@ -28753,7 +28905,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      (sources."insert-module-globals-7.0.1" // {
+      (sources."insert-module-globals-7.0.2" // {
         dependencies = [
           sources."combine-source-map-0.7.2"
           sources."concat-stream-1.5.2"
@@ -28782,7 +28934,8 @@ in
       sources."mkdirp-0.5.1"
       (sources."module-deps-6.0.0" // {
         dependencies = [
-          sources."acorn-5.5.0"
+          sources."acorn-5.5.3"
+          sources."minimist-1.2.0"
         ];
       })
       sources."once-1.4.0"
@@ -28804,7 +28957,7 @@ in
       sources."randombytes-2.0.6"
       sources."randomfill-1.0.4"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.4" // {
+      (sources."readable-stream-2.3.5" // {
         dependencies = [
           sources."process-nextick-args-2.0.0"
         ];
@@ -28826,18 +28979,14 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      (sources."syntax-error-1.4.0" // {
-        dependencies = [
-          sources."acorn-5.5.0"
-        ];
-      })
+      sources."syntax-error-1.4.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."to-arraybuffer-1.0.1"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
-      sources."umd-3.0.1"
+      sources."umd-3.0.2"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -28885,7 +29034,7 @@ in
       sources."aws-sign-0.2.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.2.0"
-      sources."bencode-1.0.0"
+      sources."bencode-2.0.0"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
       sources."bittorrent-tracker-7.7.0"
@@ -28913,10 +29062,10 @@ in
       sources."codepage-1.4.0"
       sources."colour-0.7.1"
       sources."combined-stream-0.0.7"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."cookie-jar-0.2.0"
       sources."core-util-is-1.0.2"
       sources."cryptiles-0.1.3"
@@ -28963,7 +29112,7 @@ in
       sources."hat-0.0.3"
       sources."hawk-0.10.2"
       sources."hoek-0.7.6"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
@@ -28987,11 +29136,11 @@ in
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
-          sources."bencode-1.0.0"
+          sources."bencode-2.0.0"
           sources."k-bucket-2.0.1"
         ];
       })
-      sources."k-rpc-socket-1.7.2"
+      sources."k-rpc-socket-1.8.0"
       sources."keypress-0.2.1"
       sources."load-json-file-1.1.0"
       sources."lodash-3.10.1"
@@ -29026,7 +29175,7 @@ in
       sources."pad-0.0.5"
       sources."parse-json-2.2.0"
       sources."parse-torrent-5.8.3"
-      sources."parse-torrent-file-4.0.3"
+      sources."parse-torrent-file-4.1.0"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
@@ -29048,7 +29197,7 @@ in
           sources."object-assign-4.1.1"
           sources."once-1.2.0"
           sources."parse-torrent-file-2.1.4"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."safe-buffer-5.0.1"
           sources."string_decoder-1.0.3"
           sources."thirty-two-0.0.2"
@@ -29133,7 +29282,7 @@ in
       (sources."srt2vtt-1.3.1" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -29203,10 +29352,10 @@ in
   clean-css = nodeEnv.buildNodePackage {
     name = "clean-css";
     packageName = "clean-css";
-    version = "4.1.9";
+    version = "4.1.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz";
-      sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301";
+      url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz";
+      sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a";
     };
     dependencies = [
       sources."source-map-0.5.7"
@@ -29247,17 +29396,17 @@ in
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."axios-0.17.1"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.1.0"
       sources."cli-table2-0.2.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.1.2"
-      sources."commander-2.14.1"
+      sources."colors-1.2.1"
+      sources."commander-2.15.0"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
       sources."follow-redirects-1.4.1"
@@ -29276,7 +29425,7 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -29310,7 +29459,7 @@ in
       sources."stack-trace-0.0.10"
       sources."statsd-parser-0.0.4"
       sources."strftime-0.10.0"
-      sources."winston-2.4.0"
+      sources."winston-2.4.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -29332,8 +29481,8 @@ in
     dependencies = [
       sources."JSONStream-1.3.2"
       sources."abbrev-1.1.1"
-      sources."accepts-1.3.4"
-      sources."acorn-5.5.0"
+      sources."accepts-1.3.5"
+      sources."acorn-5.5.3"
       sources."acorn-node-1.3.0"
       sources."aliasify-2.1.0"
       sources."ansi-0.3.1"
@@ -29402,7 +29551,7 @@ in
       sources."code-point-at-1.1.0"
       sources."combine-source-map-0.8.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."compressible-2.0.13"
       sources."compression-1.7.2"
       sources."concat-map-0.0.1"
@@ -29431,7 +29580,7 @@ in
       })
       (sources."cordova-js-4.2.2" // {
         dependencies = [
-          sources."acorn-5.5.0"
+          sources."acorn-5.5.3"
           sources."isarray-0.0.1"
         ];
       })
@@ -29496,7 +29645,7 @@ in
       sources."domain-browser-1.1.7"
       sources."dot-prop-3.0.0"
       sources."duplexer2-0.1.4"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."ecc-jsbn-0.1.1"
       sources."editor-1.0.0"
       sources."ee-first-1.1.1"
@@ -29510,12 +29659,12 @@ in
       sources."events-1.1.1"
       sources."evp_bytestokey-1.0.3"
       sources."exit-hook-1.1.1"
-      sources."express-4.16.2"
+      sources."express-4.16.3"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
       sources."falafel-2.1.0"
       sources."figures-1.7.0"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."foreach-2.0.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
@@ -29538,7 +29687,7 @@ in
       sources."hawk-3.1.3"
       sources."hmac-drbg-1.0.1"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."htmlescape-1.1.1"
       (sources."http-errors-1.6.2" // {
         dependencies = [
@@ -29555,10 +29704,10 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."init-package-json-1.10.1"
+      sources."init-package-json-1.10.3"
       sources."inline-source-map-0.6.2"
       sources."inquirer-0.10.1"
-      sources."insert-module-globals-7.0.1"
+      sources."insert-module-globals-7.0.2"
       (sources."insight-0.8.4" // {
         dependencies = [
           (sources."configstore-1.4.0" // {
@@ -29629,7 +29778,7 @@ in
       sources."nested-error-stacks-1.0.2"
       sources."nopt-3.0.1"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-5.1.2"
+      sources."npm-package-arg-6.0.0"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
@@ -29681,8 +29830,8 @@ in
       sources."read-1.0.7"
       sources."read-all-stream-3.1.0"
       sources."read-only-stream-2.0.0"
-      sources."read-package-json-2.0.12"
-      sources."readable-stream-2.3.4"
+      sources."read-package-json-2.0.13"
+      sources."readable-stream-2.3.5"
       sources."readline2-1.0.1"
       sources."rechoir-0.6.2"
       sources."registry-url-3.1.0"
@@ -29698,8 +29847,8 @@ in
       sources."sax-0.3.5"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
-      sources."send-0.16.1"
-      sources."serve-static-1.13.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
       sources."setprototypeof-1.1.0"
       sources."sha.js-2.4.10"
       sources."shasum-1.0.2"
@@ -29719,7 +29868,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."stream-browserify-2.0.1"
       sources."stream-buffers-2.2.0"
       sources."stream-combiner2-1.1.1"
@@ -29747,7 +29896,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      sources."umd-3.0.1"
+      sources."umd-3.0.2"
       sources."underscore-1.8.3"
       sources."unorm-1.4.1"
       sources."unpipe-1.0.0"
@@ -29833,7 +29982,7 @@ in
       sources."ajv-5.5.2"
       sources."ansi-diff-stream-1.2.0"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
       sources."ap-0.1.0"
       sources."append-tree-2.4.1"
@@ -29873,17 +30022,17 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
       sources."co-4.6.0"
-      sources."codecs-1.2.0"
+      sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.1.2"
+      sources."colors-1.2.1"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."connections-1.4.2"
       sources."content-types-0.1.0"
       sources."core-util-is-1.0.2"
@@ -29950,7 +30099,7 @@ in
       sources."dns-socket-1.6.3"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."ecc-jsbn-0.1.1"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -29985,12 +30134,12 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.12.2" // {
+      (sources."hypercore-6.12.3" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
       })
-      sources."hypercore-protocol-6.5.2"
+      sources."hypercore-protocol-6.6.0"
       (sources."hyperdrive-9.12.3" // {
         dependencies = [
           sources."varint-4.0.1"
@@ -30026,8 +30175,13 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."k-bucket-3.3.1"
-      sources."k-rpc-4.2.1"
-      sources."k-rpc-socket-1.7.2"
+      (sources."k-rpc-4.3.1" // {
+        dependencies = [
+          sources."bencode-2.0.0"
+          sources."k-bucket-4.0.0"
+        ];
+      })
+      sources."k-rpc-socket-1.8.0"
       sources."kind-of-3.2.2"
       sources."last-one-wins-1.0.4"
       sources."length-prefixed-message-3.0.3"
@@ -30063,7 +30217,7 @@ in
       })
       sources."nets-3.2.0"
       sources."network-address-1.1.2"
-      sources."node-gyp-build-3.2.2"
+      sources."node-gyp-build-3.3.0"
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.8.2"
       sources."object.omit-2.0.1"
@@ -30104,13 +30258,13 @@ in
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
       sources."read-1.0.7"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."recursive-watch-1.1.3"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
@@ -30143,7 +30297,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       (sources."throttle-1.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -30268,7 +30422,7 @@ in
       sources."fresh-0.2.4"
       sources."from-0.1.7"
       sources."hiredis-0.4.1"
-      sources."http-parser-js-0.4.10"
+      sources."http-parser-js-0.4.11"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."ipaddr.js-1.0.5"
@@ -30375,7 +30529,7 @@ in
       sources."cors-2.8.4"
       sources."deferred-leveldown-0.2.0"
       sources."docker-parse-image-3.0.1"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."end-of-stream-1.4.1"
       (sources."errno-0.1.7" // {
         dependencies = [
@@ -30386,7 +30540,7 @@ in
       (sources."fs-blob-store-5.2.1" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -30437,7 +30591,7 @@ in
         dependencies = [
           sources."isarray-1.0.0"
           sources."minimist-1.2.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."split2-2.2.0"
           sources."string_decoder-1.0.3"
           sources."through2-2.0.3"
@@ -30476,7 +30630,7 @@ in
         dependencies = [
           sources."bl-1.2.1"
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -30507,10 +30661,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.6";
+    version = "3.3.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.6.tgz";
-      sha512 = "0zn9wiliz4sz4xnmcc3nks76gkaxp8q0lk0nqm1ysxczibxnh074kap87w366jnzxvzx5la0h6wdqjrm7zja307sq8g0qj265fjyky6";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.7.tgz";
+      sha512 = "07fvd6djvw50nbjimxyvl9jv86lky0wz6v5mrj8q4fgdpwgb70636bgsg13plj83jl33lk9mk7ixmidp85zikv4w4cwnli53hi4r8vi";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -30519,7 +30673,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.0"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.203.0"
+      sources."aws-sdk-2.208.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."base64-js-1.2.3"
@@ -30573,7 +30727,7 @@ in
       sources."punycode-1.3.2"
       sources."qs-6.5.1"
       sources."querystring-0.2.0"
-      (sources."request-2.83.0" // {
+      (sources."request-2.85.0" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
@@ -30645,14 +30799,14 @@ in
       sources."caseless-0.11.0"
       (sources."chalk-2.1.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
+          sources."ansi-styles-3.2.1"
         ];
       })
       sources."chokidar-1.6.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.0"
@@ -30725,7 +30879,7 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lodash-4.13.1"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."micromatch-2.3.11"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
@@ -30764,7 +30918,7 @@ in
           })
         ];
       })
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
@@ -30886,7 +31040,7 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."iconv-lite-0.4.19"
       (sources."import-jsx-1.3.0" // {
         dependencies = [
@@ -30898,11 +31052,11 @@ in
       sources."indent-string-3.2.0"
       (sources."ink-0.3.1" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."chalk-2.3.1"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
           sources."core-js-1.2.7"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       sources."ink-text-input-1.1.1"
@@ -30933,7 +31087,7 @@ in
       sources."loose-envify-1.3.1"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
@@ -31035,20 +31189,20 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.18.1";
+    version = "4.18.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz";
-      sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz";
+      sha512 = "0mqvxkfl52068bfkpxjn14dgwfv4vv8w0a8pq2rw54bkbshfa2y6rpx122ssk3si3dy9298g68079ns1n7m0jrzgwca7a430ggj4bmb";
     };
     dependencies = [
-      sources."acorn-5.5.0"
+      sources."acorn-5.5.3"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
         ];
       })
       sources."ajv-5.5.2"
-      sources."ajv-keywords-3.1.0"
+      sources."ajv-keywords-2.1.1"
       sources."ansi-escapes-3.0.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -31066,10 +31220,10 @@ in
       sources."brace-expansion-1.1.11"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
-      (sources."chalk-2.3.1" // {
+      (sources."chalk-2.3.2" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-5.2.0"
+          sources."ansi-styles-3.2.1"
+          sources."supports-color-5.3.0"
         ];
       })
       sources."chardet-0.4.2"
@@ -31080,7 +31234,7 @@ in
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."debug-3.1.0"
@@ -31090,7 +31244,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."eslint-scope-3.7.1"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-3.5.3"
+      sources."espree-3.5.4"
       sources."esprima-4.0.0"
       sources."esquery-1.0.0"
       sources."esrecurse-4.2.1"
@@ -31126,12 +31280,12 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.5"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -31154,7 +31308,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
       sources."pseudomap-1.0.2"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."require-uncached-1.0.3"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-2.0.0"
@@ -31178,11 +31332,7 @@ in
       })
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
-      (sources."table-4.0.3" // {
-        dependencies = [
-          sources."ajv-6.2.0"
-        ];
-      })
+      sources."table-4.0.2"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -31213,14 +31363,14 @@ in
       sha512 = "32h5278qn4pnlm2wl573mhg112diqpiazr07vxj0la2qwc3a1dlva5gsbyypnbnsis7r05kcx173qhb4wdl9w8spc7g3zk1575ciirc";
     };
     dependencies = [
-      sources."acorn-5.5.0"
+      sources."acorn-5.5.3"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
         ];
       })
       sources."ajv-5.5.2"
-      sources."ajv-keywords-3.1.0"
+      sources."ajv-keywords-2.1.1"
       sources."ansi-escapes-3.0.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -31251,7 +31401,7 @@ in
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."debug-3.1.0"
@@ -31259,13 +31409,13 @@ in
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-4.18.1" // {
+      (sources."eslint-4.18.2" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.0"
-          (sources."chalk-2.3.1" // {
+          sources."ansi-styles-3.2.1"
+          (sources."chalk-2.3.2" // {
             dependencies = [
-              sources."supports-color-5.2.0"
+              sources."supports-color-5.3.0"
             ];
           })
           sources."strip-ansi-4.0.0"
@@ -31274,7 +31424,7 @@ in
       })
       sources."eslint-scope-3.7.1"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-3.5.3"
+      sources."espree-3.5.4"
       sources."esprima-4.0.0"
       sources."esquery-1.0.0"
       sources."esrecurse-4.2.1"
@@ -31310,12 +31460,12 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.5"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -31339,7 +31489,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
       sources."pseudomap-1.0.2"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."require-uncached-1.0.3"
       sources."resolve-1.5.0"
       sources."resolve-from-1.0.1"
@@ -31364,11 +31514,7 @@ in
           sources."has-flag-1.0.0"
         ];
       })
-      (sources."table-4.0.3" // {
-        dependencies = [
-          sources."ajv-6.2.0"
-        ];
-      })
+      sources."table-4.0.2"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -31475,7 +31621,7 @@ in
       sources."hasha-2.2.0"
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."http-signature-1.2.0"
       sources."indent-string-2.1.0"
       sources."inherits-2.0.3"
@@ -31517,12 +31663,12 @@ in
       sources."onetime-1.1.0"
       (sources."ora-1.4.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."chalk-2.3.1"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
           sources."cli-cursor-2.1.0"
           sources."onetime-2.0.1"
           sources."restore-cursor-2.0.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       sources."os-tmpdir-1.0.2"
@@ -31546,10 +31692,10 @@ in
       sources."qs-6.5.1"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."request-progress-2.0.1"
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.1"
@@ -31729,7 +31875,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.1.2"
+          sources."colors-1.2.1"
           sources."minimist-1.2.0"
         ];
       })
@@ -31746,7 +31892,7 @@ in
         ];
       })
       sources."read-1.0.7"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
@@ -31799,7 +31945,7 @@ in
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.0.0"
-      sources."simple-git-1.91.0"
+      sources."simple-git-1.92.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -32084,7 +32230,7 @@ in
       (sources."gulp-util-3.0.8" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -32117,7 +32263,6 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."kind-of-6.0.2"
-      sources."lazy-cache-2.0.2"
       (sources."liftoff-2.5.0" // {
         dependencies = [
           sources."has-values-0.1.4"
@@ -32216,10 +32361,9 @@ in
       sources."safe-regex-1.1.0"
       sources."semver-4.3.6"
       sources."sequencify-0.0.7"
-      sources."set-getter-0.1.0"
       sources."set-value-2.0.0"
       sources."sigmund-1.0.1"
-      (sources."snapdragon-0.8.1" // {
+      (sources."snapdragon-0.8.2" // {
         dependencies = [
           (sources."define-property-0.2.5" // {
             dependencies = [
@@ -32275,7 +32419,11 @@ in
         ];
       })
       sources."urix-0.1.0"
-      sources."use-2.0.2"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."user-home-1.1.1"
       sources."util-deprecate-1.0.2"
       sources."v8flags-2.1.1"
@@ -32414,14 +32562,14 @@ in
   html-minifier = nodeEnv.buildNodePackage {
     name = "html-minifier";
     packageName = "html-minifier";
-    version = "3.5.9";
+    version = "3.5.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.9.tgz";
-      sha512 = "3a2xnyzk38awjgzlkd59vsf8bk77ahyxsk7k9vg7gspl9z0v3zxgzzmix1vrz8xdfcxc00kg807z85hfqnz9wg20py4ihn9apvqx6hi";
+      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.10.tgz";
+      sha512 = "1kbzriri14n8z4mjn3a8azsvspj4lzdhzp3nsagkja15py5q35k4cf2py19x37bg0irifbi1k4jyn6nn952fqqm2sp0h6484w1j5kz5";
     };
     dependencies = [
       sources."camel-case-3.0.0"
-      sources."clean-css-4.1.9"
+      sources."clean-css-4.1.11"
       sources."commander-2.14.1"
       sources."he-1.1.1"
       sources."lower-case-1.1.4"
@@ -32430,7 +32578,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.5.7"
-      (sources."uglify-js-3.3.12" // {
+      (sources."uglify-js-3.3.14" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -32466,16 +32614,15 @@ in
           sources."mime-1.4.1"
           sources."raw-body-1.1.7"
           sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
           sources."string_decoder-0.10.31"
           sources."yallist-3.0.2"
         ];
       })
       sources."@ionic/discover-0.4.0"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."ansi-escapes-3.0.0"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
       sources."archiver-2.1.1"
       sources."archiver-utils-1.3.0"
@@ -32501,11 +32648,11 @@ in
       })
       sources."buffer-crc32-0.2.13"
       sources."bytes-3.0.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."chardet-0.4.2"
       sources."chokidar-1.7.0"
       sources."chownr-1.0.1"
-      sources."ci-info-1.1.2"
+      sources."ci-info-1.1.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       sources."color-convert-1.9.1"
@@ -32529,7 +32676,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."diff-3.4.0"
+      sources."diff-3.5.0"
       sources."ee-first-1.1.1"
       sources."elementtree-0.1.7"
       sources."encodeurl-1.0.2"
@@ -32541,7 +32688,7 @@ in
       sources."eventemitter3-1.2.0"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
-      sources."express-4.16.2"
+      sources."express-4.16.3"
       sources."extend-3.0.1"
       sources."external-editor-2.1.0"
       sources."extglob-0.3.2"
@@ -32549,11 +32696,11 @@ in
       sources."figures-2.0.0"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.3"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."form-data-2.3.2"
-      sources."formidable-1.1.1"
+      sources."formidable-1.2.0"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-minipass-1.2.5"
@@ -32569,7 +32716,7 @@ in
           sources."depd-1.1.1"
         ];
       })
-      sources."http-parser-js-0.4.10"
+      sources."http-parser-js-0.4.11"
       sources."http-proxy-1.16.2"
       sources."http-proxy-middleware-0.17.4"
       sources."iconv-lite-0.4.19"
@@ -32609,7 +32756,7 @@ in
       sources."lodash.isarray-3.0.4"
       sources."lodash.keys-3.1.2"
       sources."lodash.restparam-3.6.1"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."macos-release-1.1.0"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -32659,7 +32806,7 @@ in
       })
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
@@ -32676,8 +32823,8 @@ in
       sources."safe-json-parse-1.0.1"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
-      sources."send-0.16.1"
-      sources."serve-static-1.13.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.0.3"
       sources."shebang-command-1.2.0"
@@ -32691,7 +32838,7 @@ in
       sources."string_decoder-1.0.3"
       sources."strip-ansi-4.0.0"
       sources."superagent-3.8.2"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       (sources."tar-4.4.0" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -32790,7 +32937,7 @@ in
       sources."inherits-2.0.3"
       sources."is-buffer-1.1.6"
       sources."isexe-2.0.0"
-      (sources."js-yaml-3.10.0" // {
+      (sources."js-yaml-3.11.0" // {
         dependencies = [
           sources."esprima-4.0.0"
         ];
@@ -32844,14 +32991,14 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.7.1";
+    version = "2.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.7.1.tgz";
-      sha512 = "3dxj2iihfilq0dbhhrchhxqd6x9nhrjwnqkgr4gnmqk75zgnaa119p1h2vx7l0wmpqcafw0nifv02bn0g5y1wgal06a5yr6iii7dx18";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.8.0.tgz";
+      sha512 = "23rbqwsks302r65kckp12dy9pid4lpl9cn51bz9xg54j90ig3cxxd9ygs7vq5b72k2x75w960hfd4ww2zgqpypdqmb510vqfhx442s1";
     };
     dependencies = [
       sources."ansi-color-0.2.1"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."any-promise-1.3.0"
       sources."assertion-error-1.1.0"
       sources."balanced-match-1.0.0"
@@ -32859,11 +33006,11 @@ in
       sources."bufrw-1.2.1"
       sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."check-error-1.0.2"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       sources."deep-eql-3.0.1"
       sources."deep-equal-1.0.1"
@@ -32877,7 +33024,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."iterare-0.0.8"
-      (sources."jaeger-client-3.9.1" // {
+      (sources."jaeger-client-3.10.0" // {
         dependencies = [
           sources."opentracing-0.13.0"
         ];
@@ -32897,18 +33044,23 @@ in
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."string-template-0.2.1"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       sources."symbol-observable-1.0.1"
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
       sources."thriftrw-3.11.2"
       sources."type-detect-4.0.8"
       sources."typescript-2.7.2"
-      sources."vscode-jsonrpc-3.5.0"
-      sources."vscode-languageserver-3.5.0"
-      sources."vscode-languageserver-protocol-3.5.0"
-      sources."vscode-languageserver-types-3.5.0"
-      sources."vscode-uri-1.0.1"
+      sources."vscode-jsonrpc-3.6.0"
+      (sources."vscode-languageserver-3.5.1" // {
+        dependencies = [
+          sources."vscode-jsonrpc-3.5.0"
+          sources."vscode-languageserver-types-3.5.0"
+        ];
+      })
+      sources."vscode-languageserver-protocol-3.5.1"
+      sources."vscode-languageserver-types-3.6.1"
+      sources."vscode-uri-1.0.3"
       sources."wrappy-1.0.2"
       sources."xorshift-0.2.1"
       sources."xtend-4.0.1"
@@ -33067,7 +33219,7 @@ in
     dependencies = [
       sources."abbrev-1.1.1"
       sources."bluebird-3.5.1"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."config-chain-1.1.11"
       sources."editorconfig-0.13.3"
       sources."ini-1.3.5"
@@ -33175,11 +33327,11 @@ in
       sources."esprima-4.0.0"
       sources."extend-3.0.1"
       sources."form-data-2.3.2"
-      sources."formidable-1.1.1"
+      sources."formidable-1.2.0"
       sources."graphlib-2.1.5"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."lodash-4.17.5"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
@@ -33191,7 +33343,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.0"
       sources."qs-6.5.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."safe-buffer-5.1.1"
       sources."slash-1.0.0"
       sources."sprintf-js-1.0.3"
@@ -33218,11 +33370,11 @@ in
       sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si";
     };
     dependencies = [
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."ajv-5.5.2"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."array-flatten-1.1.1"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
@@ -33238,7 +33390,7 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."cli-boxes-1.0.0"
       sources."cliui-4.0.0"
       sources."co-4.6.0"
@@ -33281,10 +33433,9 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."execa-0.7.0"
-      (sources."express-4.16.2" // {
+      (sources."express-4.16.3" // {
         dependencies = [
           sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
         ];
       })
       (sources."express-urlrewrite-1.2.0" // {
@@ -33296,7 +33447,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."find-up-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
@@ -33353,7 +33504,7 @@ in
       sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."media-typer-0.3.0"
       sources."mem-1.1.0"
@@ -33400,14 +33551,14 @@ in
       sources."rc-1.2.5"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
-      sources."send-0.16.1"
-      sources."serve-static-1.13.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.0.3"
@@ -33423,7 +33574,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       sources."term-size-1.2.0"
       sources."timed-out-4.0.1"
       sources."tough-cookie-2.3.4"
@@ -33472,10 +33623,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.10.0";
+    version = "3.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz";
-      sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
+      sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -33501,7 +33652,7 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.2"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."acorn-4.0.13"
       sources."acorn-node-1.3.0"
       sources."addressparser-1.0.1"
@@ -33528,7 +33679,7 @@ in
       sources."asn1.js-4.10.1"
       sources."assert-1.4.1"
       sources."assert-plus-1.0.0"
-      sources."ast-types-0.11.2"
+      sources."ast-types-0.11.3"
       sources."astw-2.2.0"
       sources."async-2.1.5"
       sources."async-each-1.0.1"
@@ -33572,7 +33723,7 @@ in
       })
       (sources."browserify-14.5.0" // {
         dependencies = [
-          sources."acorn-5.5.0"
+          sources."acorn-5.5.3"
           sources."combine-source-map-0.7.2"
           sources."hash-base-2.0.2"
           sources."isarray-0.0.1"
@@ -33600,11 +33751,11 @@ in
       sources."cipher-base-1.0.4"
       sources."circular-json-0.5.1"
       sources."co-4.6.0"
-      sources."colors-1.1.2"
+      sources."colors-1.2.1"
       sources."combine-lists-1.0.1"
       sources."combine-source-map-0.8.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
@@ -33665,7 +33816,7 @@ in
           sources."debug-3.1.0"
         ];
       })
-      (sources."engine.io-client-3.1.5" // {
+      (sources."engine.io-client-3.1.6" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -33754,7 +33905,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      sources."insert-module-globals-7.0.1"
+      sources."insert-module-globals-7.0.2"
       sources."ip-1.0.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -33920,20 +34071,20 @@ in
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.4" // {
+      (sources."readable-stream-2.3.5" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
       })
       sources."readdirp-2.1.0"
       sources."redis-2.8.0"
-      sources."redis-commands-1.3.4"
+      sources."redis-commands-1.3.5"
       sources."redis-parser-2.6.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."requestretry-1.13.0"
       sources."requires-port-1.0.0"
       sources."resolve-1.5.0"
@@ -33995,7 +34146,7 @@ in
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
       sources."ultron-1.1.1"
-      sources."umd-3.0.1"
+      sources."umd-3.0.2"
       sources."underscore-1.7.0"
       sources."unpipe-1.0.0"
       (sources."url-0.11.0" // {
@@ -34005,7 +34156,7 @@ in
       })
       (sources."useragent-2.3.0" // {
         dependencies = [
-          sources."lru-cache-4.1.1"
+          sources."lru-cache-4.1.2"
         ];
       })
       (sources."util-0.10.3" // {
@@ -34093,7 +34244,7 @@ in
       sources."etag-1.7.0"
       (sources."express-3.21.2" // {
         dependencies = [
-          sources."accepts-1.3.4"
+          sources."accepts-1.3.5"
           sources."destroy-1.0.3"
           sources."ms-2.0.0"
           sources."negotiator-0.6.1"
@@ -34215,7 +34366,7 @@ in
       sources."amdefine-1.0.1"
       sources."ansi-escapes-3.0.0"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.4"
       sources."array-find-index-1.0.2"
@@ -34232,9 +34383,9 @@ in
       sources."camelcase-keys-2.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."center-align-0.1.3"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."chardet-0.4.2"
-      sources."ci-info-1.1.2"
+      sources."ci-info-1.1.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       sources."cliui-2.1.0"
@@ -34247,9 +34398,9 @@ in
       sources."command-join-2.0.0"
       sources."compare-func-1.3.2"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."console-control-strings-1.1.0"
-      (sources."conventional-changelog-1.1.17" // {
+      (sources."conventional-changelog-1.1.18" // {
         dependencies = [
           sources."camelcase-4.1.0"
           sources."map-obj-1.0.1"
@@ -34258,7 +34409,7 @@ in
       })
       sources."conventional-changelog-angular-1.6.6"
       sources."conventional-changelog-atom-0.2.4"
-      (sources."conventional-changelog-cli-1.3.15" // {
+      (sources."conventional-changelog-cli-1.3.16" // {
         dependencies = [
           sources."camelcase-2.1.1"
           sources."camelcase-keys-4.2.0"
@@ -34288,7 +34439,7 @@ in
         ];
       })
       sources."conventional-changelog-ember-0.3.6"
-      sources."conventional-changelog-eslint-1.0.4"
+      sources."conventional-changelog-eslint-1.0.5"
       sources."conventional-changelog-express-0.3.4"
       sources."conventional-changelog-jquery-0.1.0"
       sources."conventional-changelog-jscs-0.1.0"
@@ -34354,7 +34505,7 @@ in
       sources."handlebars-4.0.11"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."iconv-lite-0.4.19"
       sources."imurmurhash-0.1.4"
       sources."indent-string-2.1.0"
@@ -34408,7 +34559,7 @@ in
       sources."longest-1.0.1"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
@@ -34428,7 +34579,7 @@ in
       sources."minimist-options-3.0.2"
       sources."mkdirp-0.5.1"
       sources."modify-values-1.0.0"
-      sources."moment-2.20.1"
+      sources."moment-2.21.0"
       sources."mute-stream-0.0.7"
       sources."normalize-package-data-2.4.0"
       sources."npm-run-path-2.0.2"
@@ -34473,7 +34624,7 @@ in
       sources."read-cmd-shim-1.0.1"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."redent-1.0.0"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
@@ -34514,7 +34665,7 @@ in
           sources."minimist-0.1.0"
         ];
       })
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       sources."temp-dir-1.0.0"
       (sources."temp-write-3.4.0" // {
         dependencies = [
@@ -34717,11 +34868,11 @@ in
       sources."clone-2.1.1"
       sources."clone-buffer-1.0.0"
       sources."clone-stats-1.0.0"
-      sources."cloneable-readable-1.0.0"
+      sources."cloneable-readable-1.1.1"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
       sources."core-util-is-1.0.2"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."end-of-stream-1.4.1"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
@@ -34793,7 +34944,7 @@ in
           })
         ];
       })
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
@@ -34810,11 +34961,7 @@ in
       sources."unique-stream-2.2.1"
       sources."util-deprecate-1.0.2"
       sources."vali-date-1.0.0"
-      (sources."vinyl-2.1.0" // {
-        dependencies = [
-          sources."process-nextick-args-1.0.7"
-        ];
-      })
+      sources."vinyl-2.1.0"
       (sources."vinyl-fs-2.4.4" // {
         dependencies = [
           sources."clone-1.0.3"
@@ -34848,7 +34995,7 @@ in
       sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b";
     };
     dependencies = [
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."after-0.8.2"
       sources."ajv-5.5.2"
       sources."anymatch-1.3.2"
@@ -34915,7 +35062,7 @@ in
           sources."debug-3.1.0"
         ];
       })
-      (sources."engine.io-client-3.1.5" // {
+      (sources."engine.io-client-3.1.6" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -34926,10 +35073,9 @@ in
       sources."etag-1.8.1"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
-      (sources."express-4.16.2" // {
+      (sources."express-4.16.3" // {
         dependencies = [
           sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
         ];
       })
       sources."extend-3.0.1"
@@ -34939,7 +35085,7 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.3"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
@@ -34968,7 +35114,7 @@ in
       sources."iconv-lite-0.4.19"
       sources."indexof-0.0.1"
       sources."inherits-2.0.3"
-      sources."innertext-1.0.2"
+      sources."innertext-1.0.3"
       sources."ipaddr.js-1.6.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -35038,16 +35184,16 @@ in
       })
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."safe-buffer-5.1.1"
-      sources."send-0.16.1"
-      sources."serve-static-1.13.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.0.3"
       sources."sntp-2.1.0"
@@ -35104,7 +35250,7 @@ in
       sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3";
     };
     dependencies = [
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."anymatch-1.3.2"
       sources."apache-crypt-1.2.1"
       sources."apache-md5-1.1.2"
@@ -35124,7 +35270,7 @@ in
         ];
       })
       sources."chokidar-1.7.0"
-      sources."colors-1.1.2"
+      sources."colors-1.2.1"
       sources."concat-map-0.0.1"
       sources."connect-3.5.1"
       sources."core-util-is-1.0.2"
@@ -35159,7 +35305,7 @@ in
           sources."depd-1.1.1"
         ];
       })
-      sources."http-parser-js-0.4.10"
+      sources."http-parser-js-0.4.11"
       sources."inherits-2.0.3"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -35213,7 +35359,7 @@ in
         ];
       })
       sources."range-parser-1.2.0"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
@@ -35297,19 +35443,19 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.1";
+    version = "5.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz";
-      sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz";
+      sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."browser-stdout-1.3.0"
+      sources."browser-stdout-1.3.1"
       sources."commander-2.11.0"
       sources."concat-map-0.0.1"
       sources."debug-3.1.0"
-      sources."diff-3.3.1"
+      sources."diff-3.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.2"
@@ -35348,7 +35494,7 @@ in
       sources."argparse-1.0.10"
       sources."asynckit-0.4.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
       sources."core-util-is-1.0.2"
@@ -35357,11 +35503,11 @@ in
       sources."esprima-4.0.0"
       sources."extend-3.0.1"
       sources."form-data-2.3.2"
-      sources."formidable-1.1.1"
+      sources."formidable-1.2.0"
       sources."graphlib-2.1.5"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."json-refs-2.1.7"
       sources."lodash-4.17.5"
       sources."methods-1.1.2"
@@ -35374,7 +35520,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.0"
       sources."qs-6.5.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."safe-buffer-5.1.1"
       sources."slash-1.0.0"
       sources."sprintf-js-1.0.3"
@@ -35415,10 +35561,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.5.2";
+    version = "1.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.2.tgz";
-      sha512 = "2mvfkqyzfcjfp429vmagcshlp9iqblngn9fslcxpg2n83k6ajwlh0gcnyiypsixpws8nq14d3b3syr9implhsq98wg3zw7nj6b6sg9f";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.3.tgz";
+      sha512 = "1nwm3hvx3ybg10mzn5sysdgxii42975v6gyrzjb79s46lhk67ndf1fcrlrxcfaiyj9a997hz2zk9ysm0qclxsd5nziwm01myv95z262";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -35440,7 +35586,7 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."config-chain-1.1.11"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
@@ -35475,7 +35621,7 @@ in
       sources."has-unicode-2.0.1"
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."http-signature-1.2.0"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -35500,8 +35646,8 @@ in
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-5.1.2"
-      sources."npm-registry-client-8.5.0"
+      sources."npm-package-arg-6.0.0"
+      sources."npm-registry-client-8.5.1"
       (sources."npmconf-2.1.2" // {
         dependencies = [
           sources."once-1.3.3"
@@ -35522,8 +35668,8 @@ in
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
-      sources."readable-stream-2.3.4"
-      sources."request-2.83.0"
+      sources."readable-stream-2.3.5"
+      sources."request-2.85.0"
       sources."retry-0.10.1"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.1"
@@ -35538,7 +35684,7 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
       sources."sshpk-1.13.1"
-      sources."ssri-4.1.6"
+      sources."ssri-5.2.4"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
@@ -35658,8 +35804,8 @@ in
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
-      sources."readable-stream-2.3.4"
-      sources."request-2.83.0"
+      sources."readable-stream-2.3.5"
+      sources."request-2.85.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."semver-5.3.0"
@@ -35694,10 +35840,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.2.2";
+    version = "3.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz";
-      sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
+      sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -35718,7 +35864,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."after-0.8.2"
       sources."ajv-4.11.8"
       sources."ansi-regex-2.1.1"
@@ -35789,10 +35935,10 @@ in
       sources."error-ex-1.3.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."express-4.16.2"
+      sources."express-4.16.3"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."find-up-1.1.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
@@ -35812,7 +35958,7 @@ in
       sources."hawk-3.1.3"
       sources."headless-0.1.7"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       (sources."http-errors-1.6.2" // {
         dependencies = [
           sources."depd-1.1.1"
@@ -35901,16 +36047,16 @@ in
       sources."rc-1.2.5"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
       sources."request-2.81.0"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.1"
       sources."semver-4.3.6"
-      sources."send-0.16.1"
+      sources."send-0.16.2"
       sources."serve-favicon-2.4.5"
-      sources."serve-static-1.13.1"
+      sources."serve-static-1.13.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.0"
       sources."signal-exit-3.0.2"
@@ -35924,7 +36070,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
@@ -35986,37 +36132,40 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.39";
+    version = "0.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
-      sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.8.0.tgz";
+      sha512 = "3z3mz92ya4hx3mg902sb6kwlkfz8dkc12hxcnp4sygbiahbiknzh585jrf9zf3bqd9xgsh9109dz5mqwjh268zl0nmn2n30fl7cqa49";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-4.11.8"
+      sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.4"
       sources."asn1-0.2.3"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."block-stream-0.0.9"
-      sources."boom-2.10.1"
+      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
+      sources."chownr-1.0.1"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
       sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
       sources."deep-extend-0.4.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -36024,21 +36173,22 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      sources."form-data-2.3.2"
+      sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
-      sources."graceful-fs-4.1.11"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-signature-1.1.1"
+      sources."hawk-6.0.2"
+      sources."hoek-4.2.1"
+      sources."http-signature-1.2.0"
+      sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -36048,21 +36198,19 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-stable-stringify-1.0.1"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
+      sources."minipass-2.2.1"
+      sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
       sources."nopt-4.0.1"
+      sources."npm-bundled-1.0.3"
+      sources."npm-packlist-1.1.10"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
@@ -36072,44 +36220,39 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
-      sources."performance-now-0.2.0"
+      sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.4.0"
+      sources."qs-6.5.1"
       (sources."rc-1.2.5" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."readable-stream-2.3.4"
-      sources."request-2.81.0"
+      sources."readable-stream-2.3.5"
+      sources."request-2.83.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-1.0.9"
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sntp-2.1.0"
+      sources."sshpk-1.13.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
+      sources."tar-4.4.0"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uid-number-0.0.6"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.2.1"
       sources."verror-1.10.0"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
+      sources."yallist-3.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -36132,7 +36275,7 @@ in
       sources."abbrev-1.1.1"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       (sources."anymatch-2.0.0" // {
         dependencies = [
           sources."is-accessor-descriptor-1.0.0"
@@ -36172,7 +36315,7 @@ in
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       (sources."chokidar-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -36286,9 +36429,8 @@ in
       sources."isobject-3.0.1"
       sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
-      sources."lazy-cache-2.0.2"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."map-cache-0.2.2"
       sources."map-stream-0.1.0"
@@ -36337,7 +36479,7 @@ in
       sources."pseudomap-1.0.2"
       sources."pstree.remy-1.1.0"
       sources."rc-1.2.5"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-3.3.2"
@@ -36351,13 +36493,12 @@ in
       sources."safe-regex-1.1.0"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
-      sources."set-getter-0.1.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      (sources."snapdragon-0.8.1" // {
+      (sources."snapdragon-0.8.2" // {
         dependencies = [
           (sources."define-property-0.2.5" // {
             dependencies = [
@@ -36391,7 +36532,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
@@ -36424,7 +36565,11 @@ in
       sources."update-notifier-2.3.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
-      sources."use-2.0.2"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."which-1.3.0"
       sources."widest-line-2.0.0"
@@ -36451,11 +36596,10 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."addressparser-0.3.2"
       sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
       sources."append-field-0.1.0"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.4"
@@ -36463,49 +36607,28 @@ in
       sources."array-flatten-1.1.1"
       sources."array-indexofobject-0.0.1"
       sources."asn1-0.2.3"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."async-0.1.22"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."balanced-match-1.0.0"
       sources."basic-auth-2.0.0"
-      (sources."bcrypt-1.0.3" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."aws-sign2-0.7.0"
-          sources."boom-4.3.1"
-          sources."caseless-0.12.0"
-          (sources."cryptiles-3.1.2" // {
-            dependencies = [
-              sources."boom-5.2.0"
-            ];
-          })
-          sources."form-data-2.3.2"
-          sources."har-validator-5.0.3"
-          sources."hawk-6.0.2"
-          sources."hoek-4.2.1"
-          sources."http-signature-1.2.0"
-          sources."request-2.83.0"
-          sources."sntp-2.1.0"
-          sources."tunnel-agent-0.6.0"
-        ];
-      })
+      sources."bcrypt-1.0.3"
       sources."bcrypt-pbkdf-1.0.1"
       sources."bcryptjs-2.4.3"
       sources."bl-1.2.1"
       sources."block-stream-0.0.9"
       sources."body-parser-1.18.2"
       sources."boolbase-1.0.0"
-      sources."boom-2.10.1"
+      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buildmail-2.0.0"
       sources."busboy-0.2.14"
       sources."bytes-3.0.0"
       sources."callback-stream-1.1.0"
-      sources."caseless-0.11.0"
-      sources."chalk-1.1.3"
+      sources."caseless-0.12.0"
       (sources."cheerio-0.22.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
@@ -36515,10 +36638,10 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.13.0"
       sources."commist-1.0.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
@@ -36530,7 +36653,11 @@ in
       sources."cors-2.8.4"
       sources."crc-3.4.4"
       sources."cron-1.3.0"
-      sources."cryptiles-2.0.5"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
       sources."css-select-1.2.0"
       sources."css-what-2.1.0"
       sources."dashdash-1.14.1"
@@ -36545,7 +36672,7 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
       sources."domutils-1.5.1"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -36567,7 +36694,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."feedparser-1.1.3"
+      sources."feedparser-2.2.9"
       sources."finalhandler-1.1.0"
       (sources."follow-redirects-1.3.0" // {
         dependencies = [
@@ -36575,7 +36702,7 @@ in
         ];
       })
       sources."forever-agent-0.6.1"
-      sources."form-data-1.0.1"
+      sources."form-data-2.3.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-extra-5.0.0"
@@ -36584,21 +36711,18 @@ in
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."gauge-2.7.4"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
       sources."glob-parent-3.1.0"
       sources."glob-stream-6.1.0"
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
-      sources."har-validator-2.0.6"
-      sources."has-ansi-2.0.0"
+      sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
       sources."hash-sum-1.0.2"
-      sources."hawk-3.1.3"
+      sources."hawk-6.0.2"
       sources."help-me-1.1.0"
-      sources."hoek-2.16.3"
+      sources."hoek-4.2.1"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
           sources."domelementtype-1.3.0"
@@ -36609,7 +36733,7 @@ in
           sources."depd-1.1.1"
         ];
       })
-      sources."http-signature-1.1.1"
+      sources."http-signature-1.2.0"
       sources."i18next-1.10.6"
       sources."i18next-client-1.10.3"
       sources."iconv-lite-0.4.19"
@@ -36622,10 +36746,7 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-3.1.0"
-      sources."is-my-ip-valid-1.0.0"
-      sources."is-my-json-valid-2.17.2"
       sources."is-negated-glob-1.0.0"
-      sources."is-property-1.0.2"
       sources."is-relative-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-1.0.0"
@@ -36643,31 +36764,29 @@ in
       sources."jsonata-1.5.0"
       sources."jsonfile-4.0.0"
       sources."jsonify-0.0.0"
-      sources."jsonpointer-4.0.1"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."keygrip-1.0.2"
       sources."leven-1.0.2"
       sources."libbase64-0.1.0"
       sources."libmime-1.2.0"
       sources."libqp-1.1.0"
-      sources."lodash-4.17.5"
+      sources."lodash.assign-4.2.0"
       sources."lodash.assignin-4.2.0"
       sources."lodash.bind-4.2.1"
       sources."lodash.defaults-4.2.0"
       sources."lodash.filter-4.6.0"
       sources."lodash.flatten-4.4.0"
       sources."lodash.foreach-4.5.0"
+      sources."lodash.get-4.4.2"
+      sources."lodash.has-4.5.2"
       sources."lodash.map-4.6.0"
       sources."lodash.merge-4.6.1"
       sources."lodash.pick-4.4.0"
       sources."lodash.reduce-4.6.0"
       sources."lodash.reject-4.6.0"
       sources."lodash.some-4.6.0"
-      sources."lru-cache-4.1.1"
+      sources."lodash.uniq-4.5.0"
+      sources."lru-cache-4.1.2"
       (sources."mailcomposer-2.1.0" // {
         dependencies = [
           sources."needle-0.10.0"
@@ -36689,7 +36808,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mkdirp-0.5.1"
-      sources."moment-2.20.1"
+      sources."moment-2.21.0"
       sources."moment-timezone-0.5.14"
       (sources."mqtt-2.15.1" // {
         dependencies = [
@@ -36697,6 +36816,7 @@ in
         ];
       })
       sources."mqtt-packet-5.5.0"
+      sources."mri-1.1.0"
       sources."ms-2.0.0"
       (sources."multer-1.3.0" // {
         dependencies = [
@@ -36723,41 +36843,13 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      (sources."node-red-node-feedparser-0.1.8" // {
+      (sources."node-red-node-feedparser-0.1.10" // {
         dependencies = [
-          sources."addressparser-0.1.3"
-          sources."async-2.6.0"
-          sources."bl-1.1.2"
-          sources."isarray-0.0.1"
-          sources."process-nextick-args-1.0.7"
-          sources."qs-6.2.3"
-          sources."readable-stream-1.0.34"
-          sources."string_decoder-0.10.31"
+          sources."addressparser-1.0.1"
         ];
       })
       sources."node-red-node-rbe-0.2.1"
-      (sources."node-red-node-twitter-0.1.12" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."aws-sign2-0.7.0"
-          sources."boom-4.3.1"
-          sources."caseless-0.12.0"
-          (sources."cryptiles-3.1.2" // {
-            dependencies = [
-              sources."boom-5.2.0"
-            ];
-          })
-          sources."form-data-2.3.2"
-          sources."har-validator-5.0.3"
-          sources."hawk-6.0.2"
-          sources."hoek-4.2.1"
-          sources."http-signature-1.2.0"
-          sources."request-2.83.0"
-          sources."sntp-2.1.0"
-          sources."tunnel-agent-0.6.0"
-        ];
-      })
-      sources."node-uuid-1.4.8"
+      sources."node-red-node-twitter-0.1.12"
       sources."nodemailer-1.11.0"
       sources."nodemailer-direct-transport-1.1.0"
       sources."nodemailer-smtp-transport-1.1.0"
@@ -36789,8 +36881,6 @@ in
       sources."path-to-regexp-0.1.7"
       sources."pause-0.0.1"
       sources."performance-now-2.1.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
       sources."poplib-0.1.7"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.3"
@@ -36803,19 +36893,14 @@ in
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
       sources."rc-1.2.5"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
-      (sources."request-2.74.0" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."request-2.85.0"
       sources."retry-0.6.1"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
-      sources."sax-0.6.1"
+      sources."sax-1.2.4"
       sources."semver-5.4.1"
       sources."send-0.16.1"
       sources."sentiment-2.1.0"
@@ -36824,15 +36909,11 @@ in
       sources."setprototypeof-1.0.3"
       sources."signal-exit-3.0.2"
       sources."smtp-connection-1.3.8"
-      sources."sntp-1.0.9"
+      sources."sntp-2.1.0"
       sources."source-map-0.6.1"
       sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sshpk-1.13.1"
       sources."statuses-1.4.0"
       sources."stream-shift-1.0.0"
       sources."streamsearch-0.1.2"
@@ -36841,23 +36922,18 @@ in
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.1"
       sources."through2-2.0.3"
       sources."through2-filter-2.0.0"
       sources."to-absolute-glob-2.0.2"
       sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twitter-ng-0.6.2"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      (sources."uglify-js-3.3.6" // {
-        dependencies = [
-          sources."commander-2.13.0"
-        ];
-      })
+      sources."uglify-js-3.3.6"
       sources."uid-number-0.0.6"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
@@ -36873,7 +36949,7 @@ in
       sources."uuid-3.2.1"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."websocket-stream-5.1.1"
+      sources."websocket-stream-5.1.2"
       sources."when-3.7.8"
       sources."wide-align-1.1.2"
       sources."wordwrap-0.0.3"
@@ -37027,10 +37103,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.6.0";
+    version = "5.7.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz";
-      sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws";
+      url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz";
+      sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -37170,8 +37246,8 @@ in
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
-      sources."readable-stream-2.3.4"
-      sources."request-2.83.0"
+      sources."readable-stream-2.3.5"
+      sources."request-2.85.0"
       sources."retry-0.6.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
@@ -37221,10 +37297,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.14.0";
+    version = "2.14.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.0.tgz";
-      sha512 = "1yk2hf3npvf7kjmiapbq8np5dsb9sx8iiinnfm69vabh55ahzxdv3m14s2sbbsx5q0n269jyz3qhiqx5krhvmbpgqpihas5nvwwlras";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz";
+      sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -37261,7 +37337,7 @@ in
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."colors-1.0.3"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       (sources."configstore-1.4.0" // {
         dependencies = [
@@ -37278,7 +37354,7 @@ in
       sources."dot-prop-3.0.0"
       sources."duplexer2-0.1.4"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."email-validator-1.1.1"
       sources."end-of-stream-1.4.1"
       sources."error-ex-1.3.1"
@@ -37303,7 +37379,7 @@ in
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hasbin-1.2.3"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."iconv-lite-0.4.19"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -37332,7 +37408,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."jju-1.3.0"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."json-parse-helpfulerror-1.0.3"
       sources."json5-0.5.1"
       sources."kind-of-3.2.2"
@@ -37348,7 +37424,7 @@ in
       sources."lodash.mergewith-4.6.1"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -37408,7 +37484,7 @@ in
       sources."read-all-stream-3.1.0"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."recursive-readdir-2.2.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
@@ -37436,7 +37512,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."slide-1.1.6"
-      (sources."snyk-1.69.10" // {
+      (sources."snyk-1.70.0" // {
         dependencies = [
           sources."async-0.9.2"
           sources."camelcase-3.0.0"
@@ -37494,7 +37570,7 @@ in
           sources."uuid-2.0.3"
         ];
       })
-      (sources."snyk-sbt-plugin-1.2.4" // {
+      (sources."snyk-sbt-plugin-1.2.5" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -37537,10 +37613,10 @@ in
       (sources."update-notifier-2.3.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.0"
+          sources."ansi-styles-3.2.1"
           sources."boxen-1.3.0"
           sources."camelcase-4.1.0"
-          sources."chalk-2.3.1"
+          sources."chalk-2.3.2"
           sources."configstore-3.1.1"
           sources."dot-prop-4.2.0"
           sources."got-6.7.1"
@@ -37550,7 +37626,7 @@ in
           sources."pify-3.0.0"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
           sources."timed-out-4.0.1"
           sources."unzip-response-2.0.1"
           sources."widest-line-2.0.0"
@@ -37602,11 +37678,11 @@ in
       sources."agent-base-4.2.0"
       sources."ansi-escapes-3.0.0"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."boom-5.2.0"
       sources."builtin-modules-1.1.1"
       sources."camelcase-4.1.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-table2-0.2.0"
@@ -37619,7 +37695,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.1.2"
+      sources."colors-1.2.1"
       sources."cross-spawn-5.1.0"
       sources."cvss-1.0.2"
       sources."debug-3.1.0"
@@ -37637,8 +37713,8 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."hoek-4.2.1"
-      sources."hosted-git-info-2.5.0"
-      sources."https-proxy-agent-2.1.1"
+      sources."hosted-git-info-2.6.0"
+      sources."https-proxy-agent-2.2.0"
       sources."iconv-lite-0.4.19"
       (sources."inquirer-3.3.0" // {
         dependencies = [
@@ -37660,7 +37736,7 @@ in
       sources."load-json-file-2.0.0"
       sources."locate-path-2.0.0"
       sources."lodash-3.10.1"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."mem-1.1.0"
       sources."mimic-fn-1.2.0"
       sources."ms-2.0.0"
@@ -37703,7 +37779,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."validate-npm-package-license-3.0.3"
@@ -37735,33 +37811,33 @@ in
   ocaml-language-server = nodeEnv.buildNodePackage {
     name = "ocaml-language-server";
     packageName = "ocaml-language-server";
-    version = "1.0.27";
+    version = "1.0.28";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.27.tgz";
-      sha512 = "14fhxv57nybf56n1454ccmdn2sn41amzf4f6a1n70ha48ndrpcw14g6hvv91k5bj775pxh74aa8ncsc3f7bfgz0cg0nwg8ysv43dmqw";
+      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.28.tgz";
+      sha512 = "2brmnb1vvd9aw553ngmvfsf5m9wl3i4ykjlms5khiplp02hvsj7g8ag9vn6dznp1r1jg6v5w8sg77z5d23n354jfnfwpxpwl571d307";
     };
     dependencies = [
       sources."async-2.6.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
-      sources."deepmerge-2.0.1"
+      sources."deepmerge-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.2"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."lodash-4.17.5"
-      sources."lokijs-1.5.2"
+      sources."lokijs-1.5.3"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."pegjs-0.10.0"
-      sources."vscode-jsonrpc-3.5.0"
-      sources."vscode-languageclient-3.5.0"
-      sources."vscode-languageserver-3.5.0"
-      sources."vscode-languageserver-protocol-3.5.0"
-      sources."vscode-languageserver-types-3.5.0"
-      sources."vscode-uri-1.0.1"
+      sources."vscode-jsonrpc-3.6.0"
+      sources."vscode-languageclient-4.0.0"
+      sources."vscode-languageserver-4.0.0"
+      sources."vscode-languageserver-protocol-3.6.0"
+      sources."vscode-languageserver-types-3.6.1"
+      sources."vscode-uri-1.0.3"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -37782,7 +37858,7 @@ in
       sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9";
     };
     dependencies = [
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."ajv-5.5.2"
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
@@ -37820,7 +37896,7 @@ in
       sources."cliui-2.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."colors-1.1.2"
+      sources."colors-1.2.1"
       sources."combined-stream-1.0.6"
       sources."compressible-2.0.13"
       sources."compression-1.7.2"
@@ -37858,11 +37934,10 @@ in
       sources."escape-html-1.0.3"
       sources."esprima-4.0.0"
       sources."etag-1.8.1"
-      (sources."express-4.16.2" // {
+      (sources."express-4.16.3" // {
         dependencies = [
           sources."content-type-1.0.4"
           sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
         ];
       })
       (sources."express-handlebars-3.0.0" // {
@@ -37876,11 +37951,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      (sources."finalhandler-1.1.0" // {
-        dependencies = [
-          sources."statuses-1.3.1"
-        ];
-      })
+      sources."finalhandler-1.1.1"
       sources."find-up-1.1.2"
       sources."foreach-2.0.5"
       sources."forever-agent-0.6.1"
@@ -37901,7 +37972,7 @@ in
       sources."hat-0.0.3"
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."hot-shots-4.8.0"
       (sources."http-errors-1.6.2" // {
         dependencies = [
@@ -37923,7 +37994,7 @@ in
       sources."is-utf8-0.2.1"
       sources."isarray-0.0.1"
       sources."isstream-0.1.2"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -37953,7 +38024,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
       sources."mkdirp-0.5.1"
-      sources."moment-2.20.1"
+      sources."moment-2.21.0"
       sources."ms-2.0.0"
       sources."msgpack5-3.6.0"
       sources."mv-2.1.1"
@@ -37993,7 +38064,7 @@ in
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-1.1.14"
       sources."repeat-string-1.6.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."right-align-0.1.3"
@@ -38001,15 +38072,15 @@ in
       sources."safe-buffer-5.1.1"
       sources."safe-json-stringify-1.1.0"
       sources."semver-5.5.0"
-      sources."send-0.16.1"
+      sources."send-0.16.2"
       sources."serve-favicon-2.4.5"
-      sources."serve-static-1.13.1"
-      (sources."service-runner-2.5.1" // {
+      sources."serve-static-1.13.2"
+      (sources."service-runner-2.5.2" // {
         dependencies = [
           sources."isarray-1.0.0"
           sources."minimist-0.0.8"
           sources."ms-0.7.3"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -38091,7 +38162,7 @@ in
       sources."array-flatten-2.1.1"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
-      sources."bencode-1.0.0"
+      sources."bencode-2.0.0"
       sources."big-integer-1.6.26"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
@@ -38117,7 +38188,7 @@ in
       sources."code-point-at-1.1.0"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."consume-http-header-1.0.0"
       sources."consume-until-1.0.0"
       sources."core-util-is-1.0.2"
@@ -38153,7 +38224,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."http-headers-3.0.2"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
@@ -38179,11 +38250,11 @@ in
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
-          sources."bencode-1.0.0"
+          sources."bencode-2.0.0"
           sources."k-bucket-2.0.1"
         ];
       })
-      sources."k-rpc-socket-1.7.2"
+      sources."k-rpc-socket-1.8.0"
       sources."keypress-0.2.1"
       sources."load-json-file-1.1.0"
       sources."lodash-3.10.1"
@@ -38224,7 +38295,7 @@ in
           sources."get-stdin-5.0.1"
         ];
       })
-      sources."parse-torrent-file-4.0.3"
+      sources."parse-torrent-file-4.1.0"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
@@ -38248,7 +38319,7 @@ in
       sources."re-emitter-1.1.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
       sources."restore-cursor-1.0.1"
@@ -38297,7 +38368,7 @@ in
           sources."bencode-0.8.0"
           sources."isarray-1.0.0"
           sources."minimist-1.2.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -38434,7 +38505,7 @@ in
       sources."etag-1.7.0"
       (sources."express-3.21.2" // {
         dependencies = [
-          sources."accepts-1.3.4"
+          sources."accepts-1.3.5"
           sources."destroy-1.0.3"
           sources."ms-2.0.0"
           sources."multiparty-3.3.2"
@@ -38488,11 +38559,11 @@ in
       sources."k-bucket-0.6.0"
       (sources."k-rpc-3.7.0" // {
         dependencies = [
-          sources."bencode-1.0.0"
+          sources."bencode-2.0.0"
           sources."k-bucket-2.0.1"
         ];
       })
-      sources."k-rpc-socket-1.7.2"
+      sources."k-rpc-socket-1.8.0"
       sources."lodash-2.4.2"
       sources."lru-2.0.1"
       sources."magnet-uri-2.0.1"
@@ -38638,7 +38709,7 @@ in
           sources."mkdirp-0.3.5"
           sources."ms-2.0.0"
           sources."once-1.3.3"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."safe-buffer-5.0.1"
           sources."string_decoder-1.0.3"
           sources."ultron-1.1.1"
@@ -38696,7 +38767,7 @@ in
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       sources."core-util-is-1.0.2"
@@ -38801,10 +38872,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.11.0";
+    version = "1.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.11.0.tgz";
-      sha512 = "3xk1i02slbak5bilsgbsi5qh2f68dn84s1as0h2bymmiwm3isnazndlvl74yjwlmqxkaw9sj45c402xhy5xk5h0nkbcv39gqwyyfg75";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz";
+      sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -38827,26 +38898,54 @@ in
       sources."JSONStream-1.3.2"
       sources."acorn-4.0.13"
       sources."acorn-node-1.3.0"
-      sources."anymatch-1.3.2"
-      sources."arr-diff-2.0.0"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-filter-0.0.1"
       sources."array-map-0.0.0"
       sources."array-reduce-0.0.0"
-      sources."array-unique-0.2.1"
+      sources."array-unique-0.3.2"
       sources."asn1.js-4.10.1"
       sources."assert-1.4.1"
+      sources."assign-symbols-1.0.0"
       sources."astw-2.2.0"
       sources."async-1.5.2"
       sources."async-each-1.0.1"
+      sources."atob-2.0.3"
       sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          (sources."define-property-1.0.0" // {
+            dependencies = [
+              sources."kind-of-6.0.2"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."base64-js-1.2.3"
       sources."binary-extensions-1.11.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
-      (sources."braces-1.8.5" // {
+      (sources."braces-2.3.1" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."is-extendable-0.1.1"
         ];
       })
       sources."brorand-1.1.0"
@@ -38858,7 +38957,7 @@ in
       })
       (sources."browserify-13.3.0" // {
         dependencies = [
-          sources."acorn-5.5.0"
+          sources."acorn-5.5.3"
           sources."combine-source-map-0.7.2"
           (sources."concat-stream-1.5.2" // {
             dependencies = [
@@ -38886,22 +38985,41 @@ in
       sources."buffer-4.9.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
+      sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.1"
-      sources."chokidar-1.7.0"
+      (sources."chokidar-2.0.2" // {
+        dependencies = [
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."cipher-base-1.0.4"
-      sources."colors-1.1.2"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."collection-visit-1.0.0"
+      sources."colors-1.2.1"
       sources."combine-source-map-0.8.0"
+      sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.0"
       sources."create-hash-1.1.3"
       sources."create-hmac-1.1.6"
       sources."crypto-browserify-3.12.0"
       sources."date-now-0.1.4"
+      sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
+      sources."define-property-2.0.2"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
@@ -38912,21 +39030,36 @@ in
       sources."elliptic-6.4.0"
       sources."events-1.1.1"
       sources."evp_bytestokey-1.0.3"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
-      sources."extglob-0.3.2"
-      sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."fill-range-4.0.0"
       sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
+      sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.1.3"
       sources."function-bind-1.1.1"
+      sources."get-value-2.0.6"
       sources."glob-7.1.2"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
       sources."graceful-fs-4.1.11"
       sources."has-1.0.1"
+      sources."has-value-1.0.0"
+      sources."has-values-1.0.0"
       sources."hash-base-3.0.4"
       sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
@@ -38937,39 +39070,46 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      sources."insert-module-globals-7.0.1"
+      sources."insert-module-globals-7.0.2"
+      sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-glob-2.0.1"
-      sources."is-number-2.1.0"
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.0"
+      sources."is-number-4.0.0"
+      sources."is-odd-2.0.0"
+      sources."is-plain-object-2.0.4"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-2.1.0"
+      sources."isobject-3.0.1"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
-      sources."kind-of-3.2.2"
+      sources."kind-of-6.0.2"
       sources."labeled-stream-splicer-2.0.0"
       sources."lexical-scope-1.2.0"
-      sources."lodash-4.17.5"
       sources."lodash.memoize-3.0.4"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
       sources."md5.js-1.3.4"
-      sources."micromatch-2.3.11"
+      sources."micromatch-3.1.9"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
       sources."minimalistic-assert-1.0.0"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
+      sources."mixin-deep-1.3.1"
       sources."module-deps-4.1.1"
+      sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.9.2"
+      sources."nanomatch-1.2.9"
+      sources."neo-async-2.5.0"
       (sources."node-static-0.7.10" // {
         dependencies = [
           sources."minimist-0.0.10"
@@ -38977,7 +39117,9 @@ in
         ];
       })
       sources."normalize-path-2.1.1"
-      sources."object.omit-2.0.1"
+      sources."object-copy-0.1.0"
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."optimist-0.6.1"
       sources."os-browserify-0.1.2"
@@ -38985,52 +39127,74 @@ in
       sources."pako-0.2.9"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.0"
-      sources."parse-glob-3.0.4"
+      sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.0"
+      sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
       sources."pbkdf2-3.0.14"
-      sources."preserve-0.2.0"
+      sources."posix-character-classes-0.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-1.0.7"
       sources."public-encrypt-4.0.0"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-        ];
-      })
       sources."randombytes-2.0.6"
       sources."randomfill-1.0.4"
       sources."read-1.0.7"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.4" // {
+      (sources."readable-stream-2.3.5" // {
         dependencies = [
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.3"
         ];
       })
       sources."readdirp-2.1.0"
-      sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."resolve-1.5.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."rimraf-2.2.8"
       sources."ripemd160-2.0.1"
       sources."safe-buffer-5.1.1"
+      sources."safe-regex-1.1.0"
       sources."set-immediate-shim-1.0.1"
+      sources."set-value-2.0.0"
       sources."sha.js-2.4.10"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          (sources."define-property-0.2.5" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
       sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.1"
+      sources."source-map-url-0.4.0"
+      (sources."split-string-3.1.0" // {
+        dependencies = [
+          sources."extend-shallow-3.0.2"
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."static-extend-0.1.2"
       sources."stream-browserify-2.0.1"
       sources."stream-combiner2-1.1.1"
       sources."stream-http-2.8.0"
@@ -39044,15 +39208,39 @@ in
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."to-arraybuffer-1.0.1"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
       sources."tree-kill-1.2.0"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
-      sources."umd-3.0.1"
+      sources."umd-3.0.2"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."set-value-0.4.3"
+        ];
+      })
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+        ];
+      })
+      sources."upath-1.0.4"
+      sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       (sources."util-0.10.3" // {
         dependencies = [
           sources."inherits-2.0.1"
@@ -39060,9 +39248,28 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      (sources."watchpack-1.4.0" // {
+      (sources."watchpack-1.5.0" // {
         dependencies = [
-          sources."async-2.6.0"
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."has-values-0.1.4"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
         ];
       })
       sources."which-1.3.0"
@@ -39090,7 +39297,7 @@ in
     dependencies = [
       sources."@types/babel-types-7.0.1"
       sources."@types/babylon-6.16.2"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."acorn-3.3.0"
       (sources."acorn-globals-3.1.0" // {
         dependencies = [
@@ -39131,7 +39338,7 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."console-control-strings-1.1.0"
       sources."constantinople-3.1.2"
       sources."content-disposition-0.5.2"
@@ -39161,15 +39368,14 @@ in
       sources."etag-1.8.1"
       sources."eventemitter2-3.0.2"
       sources."expand-template-1.1.0"
-      (sources."express-4.16.2" // {
+      (sources."express-4.16.3" // {
         dependencies = [
           sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
         ];
       })
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
       sources."forwarded-0.1.2"
@@ -39270,28 +39476,28 @@ in
       sources."promise-7.3.1"
       sources."proxy-addr-2.0.3"
       sources."prr-1.0.1"
-      (sources."pug-2.0.0-rc.4" // {
+      (sources."pug-2.0.1" // {
         dependencies = [
           sources."acorn-4.0.13"
           sources."commander-2.8.1"
           sources."source-map-0.4.4"
         ];
       })
-      sources."pug-attrs-2.0.2"
-      sources."pug-code-gen-2.0.0"
+      sources."pug-attrs-2.0.3"
+      sources."pug-code-gen-2.0.1"
       sources."pug-error-1.3.2"
-      (sources."pug-filters-2.1.5" // {
+      (sources."pug-filters-3.0.1" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
-      sources."pug-lexer-3.1.0"
-      sources."pug-linker-3.0.3"
-      sources."pug-load-2.0.9"
-      sources."pug-parser-4.0.0"
-      sources."pug-runtime-2.0.3"
-      sources."pug-strip-comments-1.0.2"
-      sources."pug-walk-1.1.5"
+      sources."pug-lexer-4.0.0"
+      sources."pug-linker-3.0.5"
+      sources."pug-load-2.0.11"
+      sources."pug-parser-5.0.0"
+      sources."pug-runtime-2.0.4"
+      sources."pug-strip-comments-1.0.3"
+      sources."pug-walk-1.1.7"
       sources."pump-1.0.3"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
@@ -39299,7 +39505,7 @@ in
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
       sources."rc-1.2.5"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."regenerator-runtime-0.11.1"
       sources."repeat-string-1.6.1"
       sources."request-2.81.0"
@@ -39307,7 +39513,7 @@ in
       sources."right-align-0.1.3"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
-      sources."send-0.16.1"
+      sources."send-0.16.2"
       (sources."serve-favicon-2.3.2" // {
         dependencies = [
           sources."etag-1.7.0"
@@ -39315,7 +39521,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      sources."serve-static-1.13.1"
+      sources."serve-static-1.13.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.0.3"
       sources."signal-exit-3.0.2"
@@ -39379,13 +39585,13 @@ in
       sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
     };
     dependencies = [
-      sources."acorn-5.5.0"
+      sources."acorn-5.5.3"
       sources."amdefine-1.0.1"
       sources."ast-types-0.9.6"
       sources."balanced-match-1.0.0"
       sources."base62-0.1.1"
       sources."brace-expansion-1.1.11"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."commoner-0.10.8"
       sources."concat-map-0.0.1"
       sources."defined-1.0.0"
@@ -39590,7 +39796,7 @@ in
       (sources."openid-2.0.6" // {
         dependencies = [
           sources."qs-6.5.1"
-          sources."request-2.83.0"
+          sources."request-2.85.0"
         ];
       })
       sources."pause-0.0.1"
@@ -39646,10 +39852,10 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.5.0";
+    version = "6.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.5.0.tgz";
-      sha512 = "3jvih9f09fhgz59n8j1nb607wvhwailsnw1x98zqrq8rig5rc2a6dc3v3r2mw4mnvbgg5jnpiss440jfm9gbrymf985hqw1wlngbyf2";
+      url = "https://registry.npmjs.org/serve/-/serve-6.5.3.tgz";
+      sha512 = "1jywhr5vn5y47j4zh87vgh214j2zyd28j9jzcqdp7i9wdmv2v1i5yy3zfz7bb620md2v5fvz9x7ca6i1n9vihvg8xgm1mpijvnv3i3g";
     };
     dependencies = [
       (sources."@zeit/check-updates-1.1.0" // {
@@ -39657,13 +39863,13 @@ in
           sources."chalk-2.3.0"
         ];
       })
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."address-1.0.3"
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."arch-2.1.0"
       (sources."args-3.0.8" // {
         dependencies = [
@@ -39678,10 +39884,10 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."center-align-0.1.3"
-      (sources."chalk-2.3.1" // {
+      (sources."chalk-2.3.2" // {
         dependencies = [
           sources."has-flag-3.0.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       sources."cli-boxes-1.0.0"
@@ -39759,7 +39965,7 @@ in
       sources."lodash-4.17.5"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."micro-9.1.0"
       sources."micro-compress-1.0.0"
@@ -39858,7 +40064,7 @@ in
     dependencies = [
       sources."CSSselect-0.4.1"
       sources."CSSwhat-0.4.7"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."after-0.8.1"
       sources."ajv-5.5.2"
       sources."array-flatten-1.1.1"
@@ -39891,7 +40097,7 @@ in
       })
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.1.2"
       sources."component-inherit-0.0.3"
@@ -39930,12 +40136,12 @@ in
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."event-stream-3.3.4"
-      sources."express-4.16.2"
+      sources."express-4.16.3"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."forwarded-0.1.2"
@@ -40008,10 +40214,10 @@ in
       sources."raw-body-2.3.2"
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."safe-buffer-5.1.1"
-      sources."send-0.16.1"
-      sources."serve-static-1.13.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
       sources."setprototypeof-1.1.0"
       sources."slate-irc-0.7.3"
       (sources."slate-irc-parser-0.0.2" // {
@@ -40036,7 +40242,7 @@ in
       sources."socket.io-parser-2.2.0"
       sources."split-0.3.3"
       sources."sshpk-1.13.1"
-      sources."statuses-1.3.1"
+      sources."statuses-1.4.0"
       sources."stream-combiner-0.0.4"
       sources."string_decoder-0.10.31"
       sources."stringstream-0.0.5"
@@ -40075,10 +40281,10 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.2"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."ajv-5.5.2"
       sources."amdefine-1.0.1"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."array-flatten-2.1.1"
       sources."array-uniq-1.0.3"
@@ -40107,12 +40313,12 @@ in
       })
       sources."bytes-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."co-4.6.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."compressible-2.0.13"
       (sources."compression-1.7.2" // {
         dependencies = [
@@ -40195,7 +40401,7 @@ in
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
       sources."jju-1.3.0"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -40222,7 +40428,7 @@ in
       sources."minimatch-1.0.0"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.20.1"
+      sources."moment-2.21.0"
       sources."ms-2.0.0"
       sources."mv-2.1.1"
       sources."nan-2.9.2"
@@ -40253,11 +40459,11 @@ in
       })
       (sources."render-readme-1.3.1" // {
         dependencies = [
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."source-map-0.6.1"
         ];
       })
-      (sources."request-2.83.0" // {
+      (sources."request-2.85.0" // {
         dependencies = [
           sources."qs-6.5.1"
         ];
@@ -40286,7 +40492,7 @@ in
       sources."statuses-1.3.1"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       sources."through-2.3.8"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -40340,7 +40546,7 @@ in
       sources."lodash-4.17.5"
       sources."minimatch-3.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."safe-buffer-5.1.1"
       sources."set-immediate-shim-1.0.1"
@@ -40386,7 +40592,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."escape-regexp-component-1.0.2"
       sources."extsprintf-1.2.0"
-      sources."formidable-1.1.1"
+      sources."formidable-1.2.0"
       sources."glob-6.0.4"
       sources."http-signature-0.11.0"
       sources."inflight-1.0.6"
@@ -40413,7 +40619,7 @@ in
       sources."precond-0.2.3"
       sources."process-nextick-args-2.0.0"
       sources."qs-3.1.0"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       (sources."restify-4.0.3" // {
         dependencies = [
           sources."lru-cache-2.7.3"
@@ -40501,7 +40707,7 @@ in
       sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014";
     };
     dependencies = [
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.7"
       sources."async-limiter-1.0.0"
@@ -40521,7 +40727,7 @@ in
           sources."debug-3.1.0"
         ];
       })
-      (sources."engine.io-client-3.1.5" // {
+      (sources."engine.io-client-3.1.6" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -40779,7 +40985,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
       sources."prr-1.0.1"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."resolve-from-2.0.0"
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
@@ -40799,13 +41005,14 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.0.14";
+    version = "5.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz";
-      sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.1.0.tgz";
+      sha1 = "68597b6d324a65c7cf070c40a2a156b219ca06dd";
     };
     dependencies = [
       sources."adm-zip-0.4.7"
+      sources."ajv-4.11.8"
       sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
@@ -40819,13 +41026,14 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."boom-2.10.1"
       sources."camelcase-1.2.1"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       sources."cliui-2.1.0"
+      sources."co-4.6.0"
       sources."colors-1.1.2"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       sources."cycle-1.0.3"
@@ -40850,7 +41058,8 @@ in
       sources."generate-object-property-1.2.0"
       sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
-      sources."har-validator-2.0.6"
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
       sources."has-ansi-2.0.0"
       sources."hawk-3.1.3"
       sources."hoek-2.16.3"
@@ -40864,8 +41073,10 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
+      sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-2.4.0"
+      sources."jsonify-0.0.0"
       sources."jsonpointer-4.0.1"
       (sources."jsprim-1.4.1" // {
         dependencies = [
@@ -40882,26 +41093,36 @@ in
       sources."mime-types-2.1.18"
       sources."minimist-0.0.10"
       sources."moment-2.16.0"
-      (sources."node-appc-0.2.41" // {
+      (sources."node-appc-0.2.44" // {
         dependencies = [
-          sources."async-2.1.4"
+          sources."async-2.3.0"
+          sources."fs-extra-2.0.0"
+          sources."request-2.81.0"
           sources."source-map-0.5.7"
           sources."wordwrap-0.0.2"
         ];
       })
-      sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."optimist-0.6.1"
       sources."os-tmpdir-1.0.2"
+      sources."performance-now-0.2.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."pkginfo-0.3.1"
       sources."punycode-1.4.1"
-      sources."qs-6.3.2"
+      sources."qs-6.4.0"
       sources."repeat-string-1.6.1"
-      sources."request-2.79.0"
+      (sources."request-2.79.0" // {
+        dependencies = [
+          sources."caseless-0.11.0"
+          sources."har-validator-2.0.6"
+          sources."qs-6.3.2"
+          sources."tunnel-agent-0.4.3"
+        ];
+      })
       sources."right-align-0.1.3"
       sources."rimraf-2.2.8"
+      sources."safe-buffer-5.1.1"
       sources."semver-5.3.0"
       sources."sntp-1.0.9"
       sources."source-map-0.1.32"
@@ -40918,15 +41139,11 @@ in
       sources."supports-color-2.0.0"
       sources."temp-0.8.3"
       sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      (sources."uglify-js-2.7.5" // {
-        dependencies = [
-          sources."async-0.2.10"
-        ];
-      })
+      sources."uglify-js-2.8.21"
       sources."uglify-to-browserify-1.0.2"
-      sources."uuid-3.2.1"
+      sources."uuid-3.0.1"
       sources."verror-1.10.0"
       sources."window-size-0.1.0"
       (sources."winston-1.1.2" // {
@@ -40936,8 +41153,7 @@ in
         ];
       })
       sources."wordwrap-0.0.3"
-      sources."wrench-1.5.9"
-      sources."xmldom-0.1.27"
+      sources."xmldom-0.1.22"
       sources."xtend-4.0.1"
       sources."yargs-3.10.0"
     ];
@@ -41007,7 +41223,7 @@ in
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."configstore-3.1.1"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
@@ -41071,7 +41287,7 @@ in
       sources."log-update-1.0.2"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."make-error-1.3.4"
       sources."make-error-cause-1.2.2"
@@ -41108,7 +41324,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."restore-cursor-1.0.1"
@@ -41147,10 +41363,10 @@ in
       sources."unzip-response-2.0.1"
       (sources."update-notifier-2.3.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."chalk-2.3.1"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
           sources."semver-5.5.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       sources."url-parse-lax-1.0.0"
@@ -41178,10 +41394,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.3.12";
+    version = "3.3.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz";
-      sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz";
+      sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr";
     };
     dependencies = [
       sources."commander-2.14.1"
@@ -41199,14 +41415,14 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.4.10";
+    version = "1.4.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.10.tgz";
-      sha512 = "0l2pf7nl7pkc8kq77agwg5s5c21wd3rl10l42l6xk6s3bkdv8l0vhlrvzampasaraikblyjh0sq81rqym3whn2jfspqhivllpkb8iqp";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.12.tgz";
+      sha512 = "2g1lac2bgp7zgrl4jvmapyqy51rvzmphx3nlvy1hmy6ld2k5dycmhbv6qqq740ypdi57wd7vch5nlrf2w833mbk54rglhq80ly7vwk6";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."accepts-1.3.4"
+      sources."accepts-1.3.5"
       sources."after-0.8.2"
       sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
@@ -41257,7 +41473,7 @@ in
       sources."component-emitter-1.1.2"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
@@ -41283,7 +41499,7 @@ in
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."diff-3.4.0"
+      sources."diff-3.5.0"
       (sources."diff2html-2.3.3" // {
         dependencies = [
           sources."mkdirp-0.3.0"
@@ -41299,7 +41515,7 @@ in
           sources."debug-3.1.0"
         ];
       })
-      (sources."engine.io-client-3.1.5" // {
+      (sources."engine.io-client-3.1.6" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -41309,11 +41525,9 @@ in
       sources."etag-1.8.1"
       sources."eve-0.5.4"
       sources."execa-0.7.0"
-      (sources."express-4.16.2" // {
+      (sources."express-4.16.3" // {
         dependencies = [
-          sources."serve-static-1.13.1"
           sources."setprototypeof-1.1.0"
-          sources."statuses-1.3.1"
         ];
       })
       sources."express-session-1.15.6"
@@ -41323,7 +41537,7 @@ in
       sources."eyes-0.1.8"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."finalhandler-1.1.0"
+      sources."finalhandler-1.1.1"
       sources."find-up-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-0.1.3"
@@ -41347,7 +41561,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."hogan.js-3.0.2"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       (sources."http-errors-1.6.2" // {
         dependencies = [
           sources."depd-1.1.1"
@@ -41389,7 +41603,7 @@ in
       sources."lcid-1.0.0"
       sources."locate-path-2.0.0"
       sources."lodash-4.17.5"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."lsmod-1.0.0"
       sources."media-typer-0.3.0"
       sources."mem-1.1.0"
@@ -41414,15 +41628,15 @@ in
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
       sources."npm-5.6.0"
-      sources."npm-package-arg-5.1.2"
-      (sources."npm-registry-client-8.5.0" // {
+      sources."npm-package-arg-6.0.0"
+      (sources."npm-registry-client-8.5.1" // {
         dependencies = [
           sources."combined-stream-1.0.6"
           sources."delayed-stream-1.0.0"
           sources."extend-3.0.1"
           sources."form-data-2.3.2"
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -41478,19 +41692,15 @@ in
       })
       sources."readable-stream-1.0.27-1"
       sources."reduce-component-1.0.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."semver-5.4.1"
-      sources."send-0.16.1"
-      (sources."serve-static-1.13.2" // {
-        dependencies = [
-          sources."send-0.16.2"
-        ];
-      })
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.0.3"
       sources."shebang-command-1.2.0"
@@ -41519,7 +41729,7 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
       sources."sshpk-1.13.1"
-      sources."ssri-4.1.6"
+      sources."ssri-5.2.4"
       sources."stack-trace-0.0.9"
       sources."statuses-1.4.0"
       sources."string-width-1.0.2"
@@ -41537,9 +41747,9 @@ in
           sources."delayed-stream-1.0.0"
           sources."extend-3.0.1"
           sources."form-data-2.3.2"
-          sources."formidable-1.1.1"
+          sources."formidable-1.2.0"
           sources."isarray-1.0.0"
-          sources."readable-stream-2.3.4"
+          sources."readable-stream-2.3.5"
           sources."string_decoder-1.0.3"
         ];
       })
@@ -41572,7 +41782,7 @@ in
       sources."which-1.3.0"
       sources."which-module-2.0.0"
       sources."wide-align-1.1.2"
-      (sources."winston-2.4.0" // {
+      (sources."winston-2.4.1" // {
         dependencies = [
           sources."async-1.0.0"
         ];
@@ -41633,7 +41843,7 @@ in
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       (sources."config-chain-1.1.11" // {
@@ -41759,17 +41969,17 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.0.1";
+    version = "4.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.0.1.tgz";
-      sha512 = "1hb2dyvj718ijrx00xnd3zbzqll3jqnij5rp5qp4pxx3vl9wxg7jsz8s703h3snxr73yi9a2xpfgwqxs8gcbhl277g5l4lgc8r0sx4c";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.1.1.tgz";
+      sha512 = "2gs8dnr0n1p7npwjb37f3mh08gfrab0xcfp6cwm4zyxvx5lkx2hvqr81sd8mcyys9062f2pvx7njbr6zzwbr68lr37kcbkjrlgll31z";
     };
     dependencies = [
-      sources."acorn-5.5.0"
+      sources."acorn-5.5.3"
       sources."acorn-dynamic-import-3.0.0"
-      sources."ajv-6.2.0"
+      sources."ajv-6.2.1"
       sources."ajv-keywords-3.1.0"
-      sources."anymatch-1.3.2"
+      sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -41778,7 +41988,6 @@ in
       sources."asn1.js-4.10.1"
       sources."assert-1.4.1"
       sources."assign-symbols-1.0.0"
-      sources."async-2.6.0"
       sources."async-each-1.0.1"
       sources."atob-2.0.3"
       sources."balanced-match-1.0.0"
@@ -41817,7 +42026,7 @@ in
       sources."builtin-status-codes-3.0.0"
       sources."cacache-10.0.4"
       sources."cache-base-1.0.1"
-      sources."chokidar-1.7.0"
+      sources."chokidar-2.0.2"
       sources."chownr-1.0.1"
       sources."chrome-trace-event-0.1.2"
       sources."cipher-base-1.0.4"
@@ -41831,7 +42040,7 @@ in
       sources."commondir-1.0.1"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
       sources."copy-concurrently-1.0.5"
@@ -41849,7 +42058,7 @@ in
       sources."des.js-1.0.0"
       sources."diffie-hellman-5.0.2"
       sources."domain-browser-1.2.0"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."elliptic-6.4.0"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -41865,7 +42074,6 @@ in
           sources."define-property-0.2.5"
         ];
       })
-      sources."expand-range-1.8.2"
       sources."extend-shallow-3.0.2"
       (sources."extglob-2.0.4" // {
         dependencies = [
@@ -41877,7 +42085,6 @@ in
       })
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."filename-regex-2.0.1"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -41887,7 +42094,6 @@ in
       sources."find-up-2.1.0"
       sources."flush-write-stream-1.0.2"
       sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
@@ -41895,8 +42101,11 @@ in
       sources."fsevents-1.1.3"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
       sources."graceful-fs-4.1.11"
       sources."has-value-1.0.0"
       sources."has-values-1.0.0"
@@ -41915,28 +42124,22 @@ in
       sources."is-buffer-1.1.6"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-glob-2.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.0"
       sources."is-number-3.0.0"
       sources."is-odd-2.0.0"
       sources."is-plain-object-2.0.4"
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isobject-3.0.1"
       sources."json-schema-traverse-0.3.1"
       sources."json5-0.5.1"
       sources."kind-of-6.0.2"
-      sources."lazy-cache-2.0.2"
       sources."loader-runner-2.3.0"
       sources."loader-utils-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -41982,7 +42185,6 @@ in
       sources."normalize-path-2.1.1"
       sources."object-copy-0.1.0"
       sources."object-visit-1.0.1"
-      sources."object.omit-2.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
@@ -41992,16 +42194,15 @@ in
       sources."pako-1.0.6"
       sources."parallel-transform-1.1.0"
       sources."parse-asn1-5.1.0"
-      sources."parse-glob-3.0.4"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.0"
+      sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."pbkdf2-3.0.14"
       sources."pify-3.0.0"
       sources."pkg-dir-2.0.0"
       sources."posix-character-classes-0.1.1"
-      sources."preserve-0.2.0"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."promise-inflight-1.0.1"
@@ -42013,20 +42214,10 @@ in
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      (sources."randomatic-1.1.7" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-        ];
-      })
       sources."randombytes-2.0.6"
       sources."randomfill-1.0.4"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
-      sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
@@ -42040,12 +42231,11 @@ in
       sources."safe-regex-1.1.0"
       sources."schema-utils-0.4.5"
       sources."serialize-javascript-1.4.0"
-      sources."set-getter-0.1.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."setimmediate-1.0.5"
       sources."sha.js-2.4.10"
-      (sources."snapdragon-0.8.1" // {
+      (sources."snapdragon-0.8.2" // {
         dependencies = [
           (sources."define-property-0.2.5" // {
             dependencies = [
@@ -42108,7 +42298,7 @@ in
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
       sources."uglify-es-3.3.10"
-      (sources."uglifyjs-webpack-plugin-1.2.2" // {
+      (sources."uglifyjs-webpack-plugin-1.2.3" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -42129,40 +42319,28 @@ in
           })
         ];
       })
+      sources."upath-1.0.4"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
-      sources."use-2.0.2"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."util-0.10.3"
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      (sources."watchpack-1.4.0" // {
-        dependencies = [
-          sources."arr-diff-2.0.0"
-          sources."array-unique-0.2.1"
-          (sources."braces-1.8.5" // {
-            dependencies = [
-              sources."kind-of-4.0.0"
-            ];
-          })
-          sources."expand-brackets-0.1.5"
-          sources."extglob-0.3.2"
-          sources."fill-range-2.2.3"
-          sources."is-number-2.1.0"
-          sources."isobject-2.1.0"
-          sources."kind-of-3.2.2"
-          sources."micromatch-2.3.11"
-        ];
-      })
+      sources."watchpack-1.5.0"
       (sources."webpack-sources-1.1.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."worker-farm-1.5.4"
+      sources."worker-farm-1.6.0"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
       sources."y18n-4.0.0"
@@ -42186,9 +42364,9 @@ in
       sha1 = "4103e737196eb2a9fe83087752357d1dfe618294";
     };
     dependencies = [
-      sources."@types/node-9.4.6"
+      sources."@types/node-9.4.7"
       sources."JSONSelect-0.2.1"
-      sources."acorn-5.5.0"
+      sources."acorn-5.5.3"
       (sources."acorn-dynamic-import-2.0.2" // {
         dependencies = [
           sources."acorn-4.0.13"
@@ -42207,7 +42385,7 @@ in
           sources."ajv-keywords-1.5.1"
           sources."ansi-escapes-1.4.0"
           sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.0"
+          sources."ansi-styles-3.2.1"
           sources."async-2.6.0"
           sources."camelcase-1.2.1"
           sources."cli-cursor-1.0.2"
@@ -42381,11 +42559,11 @@ in
       sources."colors-0.5.1"
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.6"
-      sources."commander-2.14.1"
+      sources."commander-2.15.0"
       sources."common-tags-1.7.2"
       sources."compress-commons-1.2.2"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."configstore-3.1.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
@@ -42453,7 +42631,7 @@ in
       sources."entities-1.1.1"
       sources."errno-0.1.7"
       sources."error-ex-1.3.1"
-      sources."es5-ext-0.10.39"
+      sources."es5-ext-0.10.40"
       sources."es6-error-4.1.1"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
@@ -42492,7 +42670,7 @@ in
       })
       sources."eslint-scope-3.7.1"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-3.5.3"
+      sources."espree-3.5.4"
       sources."esprima-3.1.3"
       sources."esquery-1.0.0"
       sources."esrecurse-4.2.1"
@@ -42583,7 +42761,7 @@ in
       sources."hmac-drbg-1.0.1"
       sources."hoek-4.2.1"
       sources."home-or-tmp-2.0.0"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."htmlparser2-3.9.2"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
@@ -42646,7 +42824,7 @@ in
       sources."joi-6.10.1"
       sources."js-select-0.6.0"
       sources."js-tokens-3.0.2"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."jsbn-0.1.1"
       sources."jsesc-1.3.0"
       sources."json-loader-0.5.7"
@@ -42687,7 +42865,7 @@ in
       sources."longest-streak-1.0.0"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."markdown-table-0.4.0"
       sources."markdown-to-ast-3.4.0"
@@ -42708,7 +42886,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.20.1"
+      sources."moment-2.21.0"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."mv-2.1.1"
@@ -42724,7 +42902,7 @@ in
           sources."traverse-0.4.6"
         ];
       })
-      sources."node-forge-0.7.2"
+      sources."node-forge-0.7.4"
       sources."node-libs-browser-2.1.0"
       sources."node-notifier-5.2.1"
       sources."nomnom-1.8.1"
@@ -42814,7 +42992,7 @@ in
       sources."rc-1.2.5"
       sources."read-pkg-2.0.0"
       sources."read-pkg-up-2.0.0"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."readline2-1.0.1"
       sources."rechoir-0.6.2"
@@ -42838,7 +43016,7 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-uncached-1.0.3"
@@ -42935,7 +43113,7 @@ in
       sources."supports-color-2.0.0"
       (sources."table-4.0.3" // {
         dependencies = [
-          sources."ajv-6.2.0"
+          sources."ajv-6.2.1"
         ];
       })
       sources."tapable-0.2.8"
@@ -43182,7 +43360,7 @@ in
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."configstore-3.1.1"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
@@ -43204,7 +43382,7 @@ in
       sources."default-uid-1.0.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."diff-3.4.0"
+      sources."diff-3.5.0"
       sources."dot-prop-4.2.0"
       sources."downgrade-root-1.2.2"
       sources."duplexer3-0.1.4"
@@ -43244,7 +43422,7 @@ in
       sources."glob-7.1.2"
       sources."global-dirs-0.1.1"
       sources."globby-6.1.0"
-      sources."got-8.2.0"
+      sources."got-8.3.0"
       sources."graceful-fs-4.1.11"
       sources."grouped-queue-0.3.3"
       sources."har-schema-2.0.0"
@@ -43256,7 +43434,7 @@ in
       sources."has-unicode-2.0.1"
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
-      sources."hosted-git-info-2.5.0"
+      sources."hosted-git-info-2.6.0"
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.1"
@@ -43270,10 +43448,10 @@ in
       (sources."inquirer-3.3.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.0"
-          sources."chalk-2.3.1"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       (sources."insight-0.8.4" // {
@@ -43346,7 +43524,7 @@ in
       sources."log-symbols-1.0.2"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.0"
-      sources."lru-cache-4.1.1"
+      sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
@@ -43372,6 +43550,7 @@ in
       (sources."npm-keyword-5.0.0" // {
         dependencies = [
           sources."got-7.1.0"
+          sources."p-cancelable-0.3.0"
           sources."p-timeout-1.2.1"
           sources."prepend-http-1.0.4"
           sources."url-parse-lax-1.0.0"
@@ -43397,7 +43576,7 @@ in
       sources."osenv-0.1.5"
       sources."osx-release-1.1.0"
       sources."p-any-1.1.0"
-      sources."p-cancelable-0.3.0"
+      sources."p-cancelable-0.4.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
       sources."p-limit-1.2.0"
@@ -43448,14 +43627,14 @@ in
           sources."strip-bom-3.0.0"
         ];
       })
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readline2-1.0.1"
       sources."redent-1.0.0"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."repeating-2.0.1"
       sources."replace-ext-0.0.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."root-check-1.0.0"
@@ -43534,11 +43713,11 @@ in
       sources."unzip-response-2.0.1"
       (sources."update-notifier-2.3.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
+          sources."ansi-styles-3.2.1"
           sources."camelcase-4.1.0"
-          sources."chalk-2.3.1"
+          sources."chalk-2.3.2"
           sources."execa-0.7.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       sources."url-parse-lax-3.0.0"
@@ -43577,17 +43756,17 @@ in
       })
       (sources."yeoman-environment-2.0.5" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
-          sources."chalk-2.3.1"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
           sources."debug-3.1.0"
           sources."log-symbols-2.2.0"
           sources."pify-2.3.0"
-          sources."supports-color-5.2.0"
+          sources."supports-color-5.3.0"
         ];
       })
       (sources."yosay-2.0.1" // {
         dependencies = [
-          sources."ansi-styles-3.2.0"
+          sources."ansi-styles-3.2.1"
           sources."is-fullwidth-code-point-1.0.0"
         ];
       })
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 61752e7598c..3f6765bb008 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.2. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -22,15 +22,6 @@ let
         sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda";
       };
     };
-    "ajv-4.11.8" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
-      };
-    };
     "ajv-5.5.2" = {
       name = "ajv";
       packageName = "ajv";
@@ -67,13 +58,13 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
-    "ansi-styles-3.2.0" = {
+    "ansi-styles-3.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam";
       };
     };
     "anymatch-1.3.2" = {
@@ -166,15 +157,6 @@ let
         sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "assert-plus-0.2.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
-      };
-    };
     "assert-plus-1.0.0" = {
       name = "assert-plus";
       packageName = "assert-plus";
@@ -229,15 +211,6 @@ let
         sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4";
       };
     };
-    "aws-sign2-0.6.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
-        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
-      };
-    };
     "aws-sign2-0.7.0" = {
       name = "aws-sign2";
       packageName = "aws-sign2";
@@ -346,15 +319,6 @@ let
         sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8";
       };
     };
-    "boom-2.10.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "2.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
-      };
-    };
     "boom-4.3.1" = {
       name = "boom";
       packageName = "boom";
@@ -391,13 +355,13 @@ let
         sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7";
       };
     };
-    "browser-stdout-1.3.0" = {
+    "browser-stdout-1.3.1" = {
       name = "browser-stdout";
       packageName = "browser-stdout";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
-        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
+        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
       };
     };
     "buffer-equals-1.0.4" = {
@@ -454,13 +418,22 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chalk-2.3.1" = {
+    "chalk-2.3.2" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz";
-        sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz";
+        sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
+      };
+    };
+    "chownr-1.0.1" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
+        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
     "cli-table-0.3.1" = {
@@ -508,13 +481,13 @@ let
         sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
-    "codecs-1.2.0" = {
+    "codecs-1.2.1" = {
       name = "codecs";
       packageName = "codecs";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz";
-        sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16";
+        url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz";
+        sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8";
       };
     };
     "color-convert-1.9.1" = {
@@ -544,13 +517,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "colors-1.1.2" = {
+    "colors-1.2.1" = {
       name = "colors";
       packageName = "colors";
-      version = "1.1.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
-        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz";
+        sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk";
       };
     };
     "combined-stream-1.0.6" = {
@@ -589,13 +562,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "concat-stream-1.6.0" = {
+    "concat-stream-1.6.1" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz";
+        sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2";
       };
     };
     "connections-1.4.2" = {
@@ -643,15 +616,6 @@ let
         sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0";
       };
     };
-    "cryptiles-2.0.5" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
-      };
-    };
     "cryptiles-3.1.2" = {
       name = "cryptiles";
       packageName = "cryptiles";
@@ -868,13 +832,13 @@ let
         sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
       };
     };
-    "diff-3.3.1" = {
+    "diff-3.5.0" = {
       name = "diff";
       packageName = "diff";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz";
-        sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh";
+        url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
+        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
       };
     };
     "directory-index-html-2.1.0" = {
@@ -949,13 +913,13 @@ let
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
-    "duplexify-3.5.3" = {
+    "duplexify-3.5.4" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.3";
+      version = "3.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz";
-        sha512 = "0c611ik2kv5wiqwfi5zjyx70dnw117lbr0wwqxqxc0hldnnfigiqyh5xr7x6267vs63jgvqkzvvwb3b1g37zkk3nx5dh5z8xbs07hl3";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz";
+        sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7";
       };
     };
     "ecc-jsbn-0.1.1" = {
@@ -1138,15 +1102,6 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "form-data-2.1.4" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
-        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
-      };
-    };
     "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -1165,6 +1120,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fs-minipass-1.2.5" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";
+        sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416";
+      };
+    };
     "fs.realpath-1.0.0" = {
       name = "fs.realpath";
       packageName = "fs.realpath";
@@ -1183,15 +1147,6 @@ let
         sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
       };
     };
-    "fstream-ignore-1.0.5" = {
-      name = "fstream-ignore";
-      packageName = "fstream-ignore";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz";
-        sha1 = "9c31dae34767018fe1d249b24dada67d092da105";
-      };
-    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -1291,15 +1246,6 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "har-schema-1.0.5" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
-        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
-      };
-    };
     "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
@@ -1309,15 +1255,6 @@ let
         sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
-    "har-validator-4.2.1" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
-        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
-      };
-    };
     "har-validator-5.0.3" = {
       name = "har-validator";
       packageName = "har-validator";
@@ -1354,15 +1291,6 @@ let
         sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
       };
     };
-    "hawk-3.1.3" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
-      };
-    };
     "hawk-6.0.2" = {
       name = "hawk";
       packageName = "hawk";
@@ -1381,15 +1309,6 @@ let
         sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
       };
     };
-    "hoek-2.16.3" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "2.16.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
-      };
-    };
     "hoek-4.2.1" = {
       name = "hoek";
       packageName = "hoek";
@@ -1408,15 +1327,6 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
-    "http-signature-1.1.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
-      };
-    };
     "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -1426,22 +1336,22 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "hypercore-6.12.2" = {
+    "hypercore-6.12.3" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.12.2";
+      version = "6.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz";
-        sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.3.tgz";
+        sha512 = "0gxq17xmp2926g01dram5fdny52r40lvvanf83d35vvrhsck95zx2ymrhn6hv81hp8wvlwlqs84zbz35xp6d0nf3396pa0kra44ma4k";
       };
     };
-    "hypercore-protocol-6.5.2" = {
+    "hypercore-protocol-6.6.0" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.5.2";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.2.tgz";
-        sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.0.tgz";
+        sha512 = "3kwmsg8vfza3i9nbx84v43sh4gi5bjpmj7mn15xyvxg30k0074yvgpng16g8310r88dsk055awlj9zf5zpsk1r0zy61890k9y7bpppg";
       };
     };
     "hyperdrive-9.12.3" = {
@@ -1480,6 +1390,15 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
+    "ignore-walk-3.0.1" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
+      };
+    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -1723,15 +1642,6 @@ let
         sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
-      };
-    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -1741,15 +1651,6 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "jsonify-0.0.0" = {
-      name = "jsonify";
-      packageName = "jsonify";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
-        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
-      };
-    };
     "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -1768,13 +1669,22 @@ let
         sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j";
       };
     };
-    "k-rpc-4.2.1" = {
+    "k-bucket-4.0.0" = {
+      name = "k-bucket";
+      packageName = "k-bucket";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz";
+        sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk";
+      };
+    };
+    "k-rpc-4.3.1" = {
       name = "k-rpc";
       packageName = "k-rpc";
-      version = "4.2.1";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz";
-        sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n";
+        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz";
+        sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s";
       };
     };
     "k-rpc-socket-1.8.0" = {
@@ -1957,6 +1867,24 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
+    "minipass-2.2.1" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
+        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
+      };
+    };
+    "minizlib-1.1.0" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
+        sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
+      };
+    };
     "mirror-folder-2.1.1" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
@@ -2101,13 +2029,13 @@ let
         sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e";
       };
     };
-    "node-gyp-build-3.2.2" = {
+    "node-gyp-build-3.3.0" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "3.2.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz";
-        sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
+        sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
       };
     };
     "nopt-3.0.6" = {
@@ -2137,6 +2065,24 @@ let
         sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
       };
     };
+    "npm-bundled-1.0.3" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
+        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
+      };
+    };
+    "npm-packlist-1.1.10" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz";
+        sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
+      };
+    };
     "npmlog-4.1.2" = {
       name = "npmlog";
       packageName = "npmlog";
@@ -2254,15 +2200,6 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
-    "performance-now-0.2.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
-        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
-      };
-    };
     "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
@@ -2398,15 +2335,6 @@ let
         sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     };
-    "qs-6.4.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
-      };
-    };
     "qs-6.5.1" = {
       name = "qs";
       packageName = "qs";
@@ -2488,13 +2416,13 @@ let
         sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
-    "readable-stream-2.3.4" = {
+    "readable-stream-2.3.5" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.4";
+      version = "2.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz";
-        sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz";
+        sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl";
       };
     };
     "readdirp-2.1.0" = {
@@ -2551,15 +2479,6 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "request-2.81.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.81.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
-      };
-    };
     "request-2.83.0" = {
       name = "request";
       packageName = "request";
@@ -2569,6 +2488,15 @@ let
         sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
       };
     };
+    "request-2.85.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.85.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
+        sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
+      };
+    };
     "resolve-1.1.7" = {
       name = "resolve";
       packageName = "resolve";
@@ -2704,15 +2632,6 @@ let
         sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
-    "sntp-1.0.9" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
-      };
-    };
     "sntp-2.1.0" = {
       name = "sntp";
       packageName = "sntp";
@@ -2929,13 +2848,13 @@ let
         sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
-    "supports-color-5.2.0" = {
+    "supports-color-5.3.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "5.2.0";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz";
-        sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
+        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
       };
     };
     "tar-2.2.1" = {
@@ -2947,13 +2866,13 @@ let
         sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
       };
     };
-    "tar-pack-3.4.1" = {
-      name = "tar-pack";
-      packageName = "tar-pack";
-      version = "3.4.1";
+    "tar-4.4.0" = {
+      name = "tar";
+      packageName = "tar";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz";
-        sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz";
+        sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0";
       };
     };
     "throttle-1.0.3" = {
@@ -3073,15 +2992,6 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "uid-number-0.0.6" = {
-      name = "uid-number";
-      packageName = "uid-number";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
-        sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
-      };
-    };
     "uint64be-2.0.1" = {
       name = "uint64be";
       packageName = "uint64be";
@@ -3280,6 +3190,15 @@ let
         sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
       };
     };
+    "yallist-3.0.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
+        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+      };
+    };
   };
 in
 {
@@ -3330,7 +3249,7 @@ in
       sources."ajv-5.5.2"
       sources."ansi-diff-stream-1.2.0"
       sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.0"
+      sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
       sources."ap-0.1.0"
       sources."append-tree-2.4.1"
@@ -3370,17 +3289,17 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.1"
+      sources."chalk-2.3.2"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
       sources."co-4.6.0"
-      sources."codecs-1.2.0"
+      sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.1.2"
+      sources."colors-1.2.1"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.6.1"
       sources."connections-1.4.2"
       sources."content-types-0.1.0"
       sources."core-util-is-1.0.2"
@@ -3447,7 +3366,7 @@ in
       sources."dns-socket-1.6.3"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
-      sources."duplexify-3.5.3"
+      sources."duplexify-3.5.4"
       sources."ecc-jsbn-0.1.1"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -3482,12 +3401,12 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.12.2" // {
+      (sources."hypercore-6.12.3" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
       })
-      sources."hypercore-protocol-6.5.2"
+      sources."hypercore-protocol-6.6.0"
       (sources."hyperdrive-9.12.3" // {
         dependencies = [
           sources."varint-4.0.1"
@@ -3523,9 +3442,10 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."k-bucket-3.3.1"
-      (sources."k-rpc-4.2.1" // {
+      (sources."k-rpc-4.3.1" // {
         dependencies = [
           sources."bencode-2.0.0"
+          sources."k-bucket-4.0.0"
         ];
       })
       sources."k-rpc-socket-1.8.0"
@@ -3564,7 +3484,7 @@ in
       })
       sources."nets-3.2.0"
       sources."network-address-1.1.2"
-      sources."node-gyp-build-3.2.2"
+      sources."node-gyp-build-3.3.0"
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.8.2"
       sources."object.omit-2.0.1"
@@ -3605,13 +3525,13 @@ in
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
       sources."read-1.0.7"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."recursive-watch-1.1.3"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.83.0"
+      sources."request-2.85.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
@@ -3644,7 +3564,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."supports-color-5.2.0"
+      sources."supports-color-5.3.0"
       (sources."throttle-1.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -3730,19 +3650,19 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.1";
+    version = "5.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz";
-      sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz";
+      sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."browser-stdout-1.3.0"
+      sources."browser-stdout-1.3.1"
       sources."commander-2.11.0"
       sources."concat-map-0.0.1"
       sources."debug-3.1.0"
-      sources."diff-3.3.1"
+      sources."diff-3.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.2"
@@ -3879,8 +3799,8 @@ in
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
-      sources."readable-stream-2.3.4"
-      sources."request-2.83.0"
+      sources."readable-stream-2.3.5"
+      sources."request-2.85.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."semver-5.3.0"
@@ -3915,10 +3835,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.2.2";
+    version = "3.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz";
-      sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz";
+      sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -3932,37 +3852,40 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.39";
+    version = "0.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz";
-      sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.8.0.tgz";
+      sha512 = "3z3mz92ya4hx3mg902sb6kwlkfz8dkc12hxcnp4sygbiahbiknzh585jrf9zf3bqd9xgsh9109dz5mqwjh268zl0nmn2n30fl7cqa49";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-4.11.8"
+      sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.4"
       sources."asn1-0.2.3"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."block-stream-0.0.9"
-      sources."boom-2.10.1"
+      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
+      sources."chownr-1.0.1"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
       sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
       sources."deep-extend-0.4.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -3970,21 +3893,22 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      sources."form-data-2.3.2"
+      sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
-      sources."fstream-1.0.11"
-      sources."fstream-ignore-1.0.5"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
-      sources."graceful-fs-4.1.11"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-signature-1.1.1"
+      sources."hawk-6.0.2"
+      sources."hoek-4.2.1"
+      sources."http-signature-1.2.0"
+      sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -3994,21 +3918,19 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-stable-stringify-1.0.1"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
+      sources."minipass-2.2.1"
+      sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
       sources."nopt-4.0.1"
+      sources."npm-bundled-1.0.3"
+      sources."npm-packlist-1.1.10"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
@@ -4018,44 +3940,39 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
-      sources."performance-now-0.2.0"
+      sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.4.0"
+      sources."qs-6.5.1"
       (sources."rc-1.2.5" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      sources."readable-stream-2.3.4"
-      sources."request-2.81.0"
+      sources."readable-stream-2.3.5"
+      sources."request-2.83.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-1.0.9"
-      (sources."sshpk-1.13.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sntp-2.1.0"
+      sources."sshpk-1.13.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-2.2.1"
-      sources."tar-pack-3.4.1"
+      sources."tar-4.4.0"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uid-number-0.0.6"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.2.1"
       sources."verror-1.10.0"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
+      sources."yallist-3.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -4069,10 +3986,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.35.1";
+    version = "1.35.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.1.tgz";
-      sha1 = "7eb1265daa9da18dab7a7b1645747cd046c42f33";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.8.tgz";
+      sha1 = "de87c7b33f00189654aea49b4eb56317dcdbe7cd";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -4124,7 +4041,7 @@ in
       sources."lodash-4.17.5"
       sources."minimatch-3.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."readable-stream-2.3.4"
+      sources."readable-stream-2.3.5"
       sources."readdirp-2.1.0"
       sources."safe-buffer-5.1.1"
       sources."set-immediate-shim-1.0.1"
@@ -4143,10 +4060,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.6.0";
+    version = "5.7.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz";
-      sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws";
+      url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz";
+      sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g";
     };
     buildInputs = globalBuildInputs;
     meta = {

From 77e2f28b45d5c7a9d742f2b153499230fb57c624 Mon Sep 17 00:00:00 2001
From: Yuri Aisaka <yuriaisaka@users.noreply.github.com>
Date: Tue, 13 Mar 2018 08:15:56 +0900
Subject: [PATCH 0901/2266] cpp-gsl: treat sign-conversion as warning (#36630)

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

diff --git a/pkgs/development/libraries/cpp-gsl/default.nix b/pkgs/development/libraries/cpp-gsl/default.nix
index ecd86354ee8..833275c72bd 100644
--- a/pkgs/development/libraries/cpp-gsl/default.nix
+++ b/pkgs/development/libraries/cpp-gsl/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h8py468bvxnydkjs352d7a9s8hk0ihc7msjkcnzj2d7nzp5nsc1";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=sign-conversion";
   nativeBuildInputs = [ cmake catch ];
 
   meta = with stdenv.lib; {

From 2c9d2d65266c2c3aca1e4c80215de8bee5295b04 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Mar 2018 00:44:01 +0100
Subject: [PATCH 0902/2266] nodePackages: fix evaluation

Introduced in 40e3ad60aaa0bdcec71409ae167c2b1425bffe06.
---
 pkgs/misc/base16-builder/node-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index bb98d7ab9cc..a112dcdec97 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-generated.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}

From 50d3c09e67505c36543a233627b15e59fdd5a15d Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 11 Mar 2018 19:49:43 +0100
Subject: [PATCH 0903/2266] rush: fix build

see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853649
---
 pkgs/shells/rush/default.nix    |   4 +-
 pkgs/shells/rush/gets.patch     |  13 --
 pkgs/shells/rush/intprops.patch | 257 ++++++++++++++++++++++++++++++++
 3 files changed, 260 insertions(+), 14 deletions(-)
 delete mode 100644 pkgs/shells/rush/gets.patch
 create mode 100644 pkgs/shells/rush/intprops.patch

diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index 8280897c47a..9a5f7a753d3 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz";
   };
 
-  patches = [ ./fix-format-security-error.patch ];
+  patches = [ ./fix-format-security-error.patch
+    ./intprops.patch
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/shells/rush/gets.patch b/pkgs/shells/rush/gets.patch
deleted file mode 100644
index 94b1f5dd2f5..00000000000
--- a/pkgs/shells/rush/gets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- rush-1.7/gnu/stdio.in.h.org	2010-06-13 19:14:59.000000000 +0200
-+++ rush-1.7/gnu/stdio.in.h	2013-12-30 14:29:55.000000000 +0100
-@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets 
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/shells/rush/intprops.patch b/pkgs/shells/rush/intprops.patch
new file mode 100644
index 00000000000..947cb0b9ab9
--- /dev/null
+++ b/pkgs/shells/rush/intprops.patch
@@ -0,0 +1,257 @@
+Description: Update to latest intprops.h from gnulib, fixes FTBFS with gcc 7
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/853649
+
+--- rush-1.8+dfsg.orig/gnu/intprops.h
++++ rush-1.8+dfsg/gnu/intprops.h
+@@ -1,20 +1,18 @@
+-/* -*- buffer-read-only: t -*- vi: set ro: */
+-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+ /* intprops.h -- properties of integer types
+ 
+-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
++   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published
+-   by the Free Software Foundation; either version 3 of the License, or
++   under the terms of the GNU Lesser General Public License as published
++   by the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU General Public License
++   You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ /* Written by Paul Eggert.  */
+@@ -23,7 +21,6 @@
+ #define _GL_INTPROPS_H
+ 
+ #include <limits.h>
+-#include <verify.h>
+ 
+ /* Return a value with the common real type of E and V and the value of V.  */
+ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+@@ -49,12 +46,16 @@
+ 
+ /* Minimum and maximum values for integer types and expressions.  */
+ 
++/* The width in bits of the integer type or expression T.
++   Padding bits are not supported; this is checked at compile-time below.  */
++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
++
+ /* The maximum and minimum values for the integer type T.  */
+ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+ #define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
+-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
++        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+ 
+ /* The maximum and minimum values for the type of the expression E,
+    after integer promotion.  E should not have side effects.  */
+@@ -67,29 +68,23 @@
+    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+    : _GL_INT_NEGATE_CONVERT (e, 1))
+ #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
++  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
++
++/* Work around OpenVMS incompatibility with C99.  */
++#if !defined LLONG_MAX && defined __INT64_MAX
++# define LLONG_MAX __INT64_MAX
++# define LLONG_MIN __INT64_MIN
++#endif
+ 
+ /* This include file assumes that signed types are two's complement without
+    padding bits; the above macros have undefined behavior otherwise.
+    If this is a problem for you, please let us know how to fix it for your host.
+-   As a sanity check, test the assumption for some signed types that
+-   <limits.h> bounds.  */
+-verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+-verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+-verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+-verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+-verify (TYPE_MINIMUM (int) == INT_MIN);
+-verify (TYPE_MAXIMUM (int) == INT_MAX);
+-verify (TYPE_MINIMUM (long int) == LONG_MIN);
+-verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+-#ifdef LLONG_MAX
+-verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+-verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+-#endif
++   This assumption is tested by the intprops-tests module.  */
+ 
+ /* Does the __typeof__ keyword work?  This could be done by
+    'configure', but for now it's easier to do it by hand.  */
+-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
++#if (2 <= __GNUC__ \
++     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+      || (0x5110 <= __SUNPRO_C && !__STDC__))
+ # define _GL_HAVE___TYPEOF__ 1
+ #else
+@@ -118,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) ==
+    signed, this macro may overestimate the true bound by one byte when
+    applied to unsigned types of size 2, 4, 16, ... bytes.  */
+ #define INT_STRLEN_BOUND(t)                                     \
+-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
+-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
++  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+    + _GL_SIGNED_TYPE_OR_EXPR (t))
+ 
+ /* Bound on buffer size needed to represent an integer type or expression T,
+@@ -224,20 +218,27 @@ verify (TYPE_MAXIMUM (long long int) ==
+    ? (a) < (min) >> (b)                                 \
+    : (max) >> (b) < (a))
+ 
+-/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
+-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
++/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
++#if 5 <= __GNUC__ && !defined __ICC
++# define _GL_HAS_BUILTIN_OVERFLOW 1
++#else
++# define _GL_HAS_BUILTIN_OVERFLOW 0
++#endif
++
++/* True if __builtin_add_overflow_p (A, B, C) works.  */
++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+ 
+ /* The _GL*_OVERFLOW macros have the same restrictions as the
+    *_RANGE_OVERFLOW macros, except that they do not assume that operands
+    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+    that the result (e.g., A + B) has that type.  */
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
+-   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
+-   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
+-   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
++#if _GL_HAS_BUILTIN_OVERFLOW_P
++# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
++   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
++   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
++   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+@@ -317,7 +318,7 @@ verify (TYPE_MAXIMUM (long long int) ==
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+ #define INT_SUBTRACT_OVERFLOW(a, b) \
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
++#if _GL_HAS_BUILTIN_OVERFLOW_P
+ # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+ #else
+ # define INT_NEGATE_OVERFLOW(a) \
+@@ -351,10 +352,6 @@ verify (TYPE_MAXIMUM (long long int) ==
+ #define INT_MULTIPLY_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+ 
+-#ifndef __has_builtin
+-# define __has_builtin(x) 0
+-#endif
+-
+ /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+    https://llvm.org/bugs/show_bug.cgi?id=25390
+@@ -371,17 +368,17 @@ verify (TYPE_MAXIMUM (long long int) ==
+    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+    overflow predicate.  Return 1 if the result overflows.  See above
+    for restrictions.  */
+-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
++#if _GL_HAS_BUILTIN_OVERFLOW
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
+ #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+    (_Generic \
+     (*(r), \
+      signed char: \
+-       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \
++       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                         signed char, SCHAR_MIN, SCHAR_MAX), \
+      short int: \
+-       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \
++       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                         short int, SHRT_MIN, SHRT_MAX), \
+      int: \
+        _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+@@ -395,10 +392,10 @@ verify (TYPE_MAXIMUM (long long int) ==
+ #else
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+    (sizeof *(r) == sizeof (signed char) \
+-    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \
++    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        signed char, SCHAR_MIN, SCHAR_MAX) \
+     : sizeof *(r) == sizeof (short int) \
+-    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \
++    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        short int, SHRT_MIN, SHRT_MAX) \
+     : sizeof *(r) == sizeof (int) \
+     ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+@@ -414,15 +411,14 @@ verify (TYPE_MAXIMUM (long long int) ==
+ # else
+ #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+-                     long int, LONG_MIN, LONG_MAX))
++                     long int, LONG_MIN, LONG_MAX)
+ # endif
+ #endif
+ 
+ /* Store the low-order bits of A <op> B into *R, where the operation
+    is given by OP.  Use the unsigned type UT for calculation to avoid
+-   overflow problems.  *R's type is T, with extremal values TMIN and
+-   TMAX.  T must be a signed integer type.  Return 1 if the result
+-   overflows.  */
++   overflow problems.  *R's type is T, with extrema TMIN and TMAX.
++   T must be a signed integer type.  Return 1 if the result overflows.  */
+ #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
+   (sizeof ((a) op (b)) < sizeof (t) \
+    ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \
+@@ -431,17 +427,27 @@ verify (TYPE_MAXIMUM (long long int) ==
+   ((overflow (a, b) \
+     || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \
+     || (tmax) < ((a) op (b))) \
+-   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \
+-   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0))
++   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
++   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
++
++/* Return the low-order bits of A <op> B, where the operation is given
++   by OP.  Use the unsigned type UT for calculation to avoid undefined
++   behavior on signed integer overflow, and convert the result to type T.
++   UT is at least as wide as T and is no narrower than unsigned int,
++   T is two's complement, and there is no padding or trap representations.
++   Assume that converting UT to T yields the low-order bits, as is
++   done in all known two's-complement C compilers.  E.g., see:
++   https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
++
++   According to the C standard, converting UT to T yields an
++   implementation-defined result or signal for values outside T's
++   range.  However, code that works around this theoretical problem
++   runs afoul of a compiler bug in Oracle Studio 12.3 x86.  See:
++   http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html
++   As the compiler bug is real, don't try to work around the
++   theoretical problem.  */
+ 
+-/* Return A <op> B, where the operation is given by OP.  Use the
+-   unsigned type UT for calculation to avoid overflow problems.
+-   Convert the result to type T without overflow by subtracting TMIN
+-   from large values before converting, and adding it afterwards.
+-   Compilers can optimize all the operations except OP.  */
+-#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \
+-  (((ut) (a) op (ut) (b)) <= (tmax) \
+-   ? (t) ((ut) (a) op (ut) (b)) \
+-   : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin)))
++#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
++  ((t) ((ut) (a) op (ut) (b)))
+ 
+ #endif /* _GL_INTPROPS_H */

From ab5071ec8690ef95710c48ded065b786bbba53d4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Mar 2018 00:33:19 +0100
Subject: [PATCH 0904/2266] gnome3.gnome-color-manager: init at 3.26.0

---
 .../core/gnome-color-manager/default.nix      | 38 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
new file mode 100644
index 00000000000..b5052281b2f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }:
+
+let
+  pname = "gnome-color-manager";
+  version = "3.26.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "1kbi46vk0qf0gxiwm4yhsx8931r7c9cg0c4244j8ncr0hph008b5";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
+  buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ];
+
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=791158
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=364865;
+      sha256 = "1zh1aql6rwzfhy2xbdw0jqgzrl9l6wf0jcbdkjd67ykbmynh2cmv";
+    })
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "A set of graphical utilities for color management to be used in the GNOME desktop";
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index cd150c2d683..047d07aaae2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -110,6 +110,8 @@ let
 
   gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
 
+  gnome-color-manager = callPackage ./core/gnome-color-manager { };
+
   gnome-contacts = callPackage ./core/gnome-contacts { };
 
   gnome-control-center = callPackage ./core/gnome-control-center { };

From 72c033f8ffa9e81bc01225226d80f88709223b2d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Mar 2018 00:53:54 +0100
Subject: [PATCH 0905/2266] gnome3.gnome-control-center: add
 gnome-color-manager support

---
 .../core/gnome-control-center/default.nix     | 42 +++++-----
 .../core/gnome-control-center/paths.patch     | 82 +++++++++++++++++++
 2 files changed, 103 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 8774de41c4b..b49b13aae80 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,27 +1,22 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook
+{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook
 , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libnotify, libgudev
+, gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, libkrb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared-mime-info, tzdata, libtool
+, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
+, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
 , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk
 , fontconfig, sound-theme-freedesktop, grilo }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-control-center-${version}";
+let
   version = "3.26.2";
+in stdenv.mkDerivation rec {
+  name = "gnome-control-center-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-control-center"; attrPath = "gnome3.gnome-control-center"; };
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   nativeBuildInputs = [
     pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns
     shared-mime-info
@@ -37,15 +32,13 @@ stdenv.mkDerivation rec {
     networkmanager modemmanager gnome-bluetooth tracker
   ];
 
-  preBuild = ''
-    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
-    substituteInPlace panels/region/cc-region-panel.c --replace "gkbd-keyboard-display" "${gnome3.libgnomekbd}/bin/gkbd-keyboard-display"
-
-    # hack to make test-endianess happy
-    mkdir -p $out/share/locale
-    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
-  '';
+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      gcm = gnome-color-manager;
+      inherit glibc libgnomekbd tzdata;
+    })
+  ];
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -59,6 +52,13 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-control-center";
+      attrPath = "gnome3.gnome-control-center";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Utilities to configure the GNOME desktop";
     license = licenses.gpl2Plus;
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
new file mode 100644
index 00000000000..ad9187b650e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
@@ -0,0 +1,82 @@
+--- a/panels/color/cc-color-panel.c
++++ b/panels/color/cc-color-panel.c
+@@ -634,7 +634,7 @@
+ 
+   /* run with modal set */
+   argv = g_ptr_array_new_with_free_func (g_free);
+-  g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
++  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
+   g_ptr_array_add (argv, g_strdup ("--device"));
+   g_ptr_array_add (argv, g_strdup (cd_device_get_id (priv->current_device)));
+   g_ptr_array_add (argv, g_strdup ("--parent-window"));
+@@ -1136,7 +1136,7 @@
+ 
+   /* open up gcm-viewer as a info pane */
+   argv = g_ptr_array_new_with_free_func (g_free);
+-  g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL));
++  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL));
+   g_ptr_array_add (argv, g_strdup ("--profile"));
+   g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
+   g_ptr_array_add (argv, g_strdup ("--parent-window"));
+@@ -1406,7 +1406,6 @@
+ gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
+ {
+   GtkWidget *widget;
+-  gchar *s;
+   CcColorPanelPrivate *priv = prefs->priv;
+ 
+   /* get profile */
+@@ -1416,11 +1415,9 @@
+   /* allow getting profile info */
+   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+                "toolbutton_profile_view"));
+-  if (cd_profile_get_filename (profile) != NULL &&
+-      (s = g_find_program_in_path ("gcm-viewer")) != NULL)
++  if (cd_profile_get_filename (profile) != NULL)
+     {
+       gtk_widget_set_sensitive (widget, TRUE);
+-      g_free (s);
+     }
+   else
+       gtk_widget_set_sensitive (widget, FALSE);
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -26,7 +26,7 @@
+ 	GDir *dir;
+ 	const char *name;
+ 
+-	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++	dir = g_dir_open ("@glibc@/share/i18n/locales/", 0, NULL);
+ 	if (dir == NULL) {
+ 		/* Try with /usr/share/locale/
+ 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -27,11 +27,7 @@
+ 
+ #include <glib.h>
+ 
+-#ifndef __sun
+-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
+-#else
+-#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+-#endif
++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
+ 
+ typedef struct _TzDB TzDB;
+ typedef struct _TzLocation TzLocation;
+--- a/panels/region/cc-region-panel.c
++++ b/panels/region/cc-region-panel.c
+@@ -1388,10 +1388,10 @@
+         }
+ 
+         if (variant && variant[0])
+-                commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
++                commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
+                                                layout, variant);
+         else
+-                commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
++                commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
+                                                layout);
+ 
+         g_spawn_command_line_async (commandline, NULL);

From cfa4c065d9af56dee79c9ba417c702e51cf19a45 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 13 Mar 2018 01:16:08 +0100
Subject: [PATCH 0906/2266] i3: 4.14.1 -> 4.15

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

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 19aa89a7f7e..9c24df004f3 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.14.1";
+  version = "4.15";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh";
+    sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91";
   };
 
   nativeBuildInputs = [ which pkgconfig makeWrapper ];

From 34f12184cdead575e5c88487fcf00a278ece53a2 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 13 Mar 2018 00:47:10 +0000
Subject: [PATCH 0907/2266] treewide: s/saneBackends/sane-backends/g

---
 pkgs/development/haskell-modules/hackage-packages.nix | 6 +++---
 pkgs/misc/emulators/wine/base.nix                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c8707f3aa08..deb53426888 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35146,17 +35146,17 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, saneBackends }:
+    ({ mkDerivation, base, bindings-DSL, sane-backends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ saneBackends ];
+       libraryPkgconfigDepends = [ sane-backends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
-     }) {inherit (pkgs) saneBackends;};
+     }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index a147c986674..6eb1841d1c7 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional vaSupport              pkgs.libva-full
   ++ lib.optional pcapSupport            pkgs.libpcap
   ++ lib.optional v4lSupport             pkgs.libv4l
-  ++ lib.optional saneSupport            pkgs.saneBackends
+  ++ lib.optional saneSupport            pkgs.sane-backends
   ++ lib.optional gsmSupport             pkgs.gsm
   ++ lib.optional gphoto2Support         pkgs.libgphoto2
   ++ lib.optional ldapSupport            pkgs.openldap

From 310a665b98d480b6d8b01f1b32efcc9b41c86197 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 13 Mar 2018 02:05:31 +0100
Subject: [PATCH 0908/2266] androidStudioPackages.beta: 3.1.0.12 -> 3.1.0.14

---
 .../applications/editors/android-studio/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 4a71153cf91..6737b406055 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -6,6 +6,11 @@ let
     };
   };
 in rec {
+  # Old alias
+  preview = beta;
+
+  # Attributes are named by the channels
+
   # linux-bundle
   stable = mkStudio {
     pname = "android-studio";
@@ -27,11 +32,11 @@ in rec {
   };
 
   # linux-beta-bundle
-  preview = mkStudio {
+  beta = mkStudio {
     pname = "android-studio-preview";
-    version = "3.1.0.12"; # "Android Studio 3.1 Beta 4"
-    build = "173.4615496";
-    sha256Hash = "0rp0vg5hwv7kdrirydvnwznpfwibwwm2dxsbhbxfkyahph10ly72";
+    version = "3.1.0.14"; # "Android Studio 3.1 RC 2"
+    build = "173.4640767";
+    sha256Hash = "00v8qbis4jm31v1g9989f9y15av6p3ywj8mmfxcsc3hjlpzdgid8";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c8b9caea99..81f605efea9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14579,7 +14579,7 @@ with pkgs;
 
   androidStudioPackages = callPackage ../applications/editors/android-studio { };
   android-studio = androidStudioPackages.stable;
-  android-studio-preview = androidStudioPackages.preview;
+  android-studio-preview = androidStudioPackages.beta;
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};
 

From 74d922638ba2f6a86b6aeb5d6ea15bdf45f5d333 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 13 Mar 2018 02:23:41 +0100
Subject: [PATCH 0909/2266] androidStudioPackages.{dev,canary}: init at 3.2.0.5

Switch the naming scheme to the channel names.
---
 .../editors/android-studio/default.nix        | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 6737b406055..e3c9fb5b14a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,12 +14,13 @@ in rec {
   # linux-bundle
   stable = mkStudio {
     pname = "android-studio";
+    #pname = "android-studio-stable"; # TODO: Rename
     version = "3.0.1.0"; # "Android Studio 3.0.1"
     build = "171.4443003";
     sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
 
     meta = with stdenv.lib; {
-      description = "The Official IDE for Android (stable version)";
+      description = "The Official IDE for Android (stable channel)";
       longDescription = ''
         Android Studio is the official IDE for Android app development, based on
         IntelliJ IDEA.
@@ -34,13 +35,36 @@ in rec {
   # linux-beta-bundle
   beta = mkStudio {
     pname = "android-studio-preview";
+    #pname = "android-studio-beta"; # TODO: Rename
     version = "3.1.0.14"; # "Android Studio 3.1 RC 2"
     build = "173.4640767";
     sha256Hash = "00v8qbis4jm31v1g9989f9y15av6p3ywj8mmfxcsc3hjlpzdgid8";
 
     meta = stable.meta // {
-      description = "The Official IDE for Android (preview version)";
+      description = "The Official IDE for Android (beta channel)";
       homepage = https://developer.android.com/studio/preview/index.html;
     };
   };
+
+  dev = mkStudio {
+    pname = "android-studio-dev";
+    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
+    build = "173.4640885";
+    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
+
+    meta = beta.meta // {
+      description = "The Official IDE for Android (dev channel)";
+    };
+  };
+
+  canary = mkStudio {
+    pname = "android-studio-canary";
+    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
+    build = "173.4640885";
+    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
+
+    meta = beta.meta // {
+      description = "The Official IDE for Android (canary channel)";
+    };
+  };
 }

From 0e93dd0583ab8b13bcd6949d4b0176afafb39274 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Mon, 12 Mar 2018 23:06:00 -0400
Subject: [PATCH 0910/2266] airfield: inherit libtool for derivation

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

diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 7460cf4ca6c..63d00366f0a 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}

From ba0e18829eba983084b64ff556371fc707c9a1ee Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Mon, 12 Mar 2018 23:30:52 -0400
Subject: [PATCH 0911/2266] nixui: inherit libtool for derivation

---
 pkgs/tools/package-management/nixui/nixui.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index ade19b52162..a2b6feeaea4 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}

From 85d22e75106b9850528463e6f455cfbb39c45e48 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Mon, 12 Mar 2018 23:45:34 -0400
Subject: [PATCH 0912/2266] remarkjs: inherit libtool for derivation

---
 pkgs/development/web/remarkjs/nodepkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index dde8ada0db9..3d0d1cf232c 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in

From 708e3fb160ad7f7e5fc1e126c26293ce618ded4f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 12 Mar 2018 22:47:11 -0500
Subject: [PATCH 0913/2266] zed: inherit libtool, fix eval

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

diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
index ff0bf1eb805..f458caddbbe 100644
--- a/pkgs/applications/editors/zed/node.nix
+++ b/pkgs/applications/editors/zed/node.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}

From 5eb07e23966aa1d1a835fe1b913a0214235cd5f8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 12 Mar 2018 22:38:42 -0500
Subject: [PATCH 0914/2266] metrics: fixup sed expr to work with Nix 2

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

diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index 5f61c67b29c..eeacb59b64b 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -35,7 +35,7 @@ runCommand "nixpkgs-metrics"
       [[ -n $x ]] || exit 1
       echo "$name.allocations $x B" >> $out/nix-support/hydra-metrics
 
-      x=$(sed -e 's/.*values allocated: \([0-9]\+\) .*/\1/ ; t ; d' stats)
+      x=$(sed -e 's/.*values allocated bytes: \([0-9]\+\).*/\1/ ; t ; d' stats)
       [[ -n $x ]] || exit 1
       echo "$name.values $x" >> $out/nix-support/hydra-metrics
     }

From 9b94dd099913ff0b881a9b7c2f17d0956222cf35 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 09:04:12 +0100
Subject: [PATCH 0915/2266] maintainers/scripts/update.nix: fix error message

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

diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index 7c54821f66c..cb819a053c4 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -65,7 +65,7 @@ let
       if package == null then
         builtins.throw "Package with an attribute name `${name}` does not exists."
       else if ! builtins.hasAttr "updateScript" package then
-        builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined."
+        builtins.throw "Package with an attribute name `${name}` does not have a `passthru.updateScript` attribute defined."
       else
         package;
 

From dc1c9fb2512070ecf795efe6731ac1c62399067a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 13 Mar 2018 09:08:18 +0100
Subject: [PATCH 0916/2266] noteshrink: init at 0.1.1

---
 pkgs/tools/misc/noteshrink/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/noteshrink/default.nix

diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix
new file mode 100644
index 00000000000..77c84ab4511
--- /dev/null
+++ b/pkgs/tools/misc/noteshrink/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, python3, imagemagick }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+  name = "noteshrink-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner  = "mzucker";
+    repo   = "noteshrink";
+    rev    = version;
+    sha256 = "0xhrvg3d8ffnbbizsrfppcd2y98znvkgxjdmvbvin458m2rwccka";
+  };
+
+  propagatedBuildInputs = [ numpy scipy imagemagick pillow ];
+
+  meta = with stdenv.lib; {
+    description = "Convert scans of handwritten notes to beautiful, compact PDFs";
+    homepage    = https://mzucker.github.io/2016/09/20/noteshrink.html;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ rnhmjoj ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a72fdd669a..f0c1feb7824 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1308,6 +1308,8 @@ with pkgs;
 
   nfdump = callPackage ../tools/networking/nfdump { };
 
+  noteshrink = callPackage ../tools/misc/noteshrink { };
+
   nrsc5 = callPackage ../applications/misc/nrsc5 { };
 
   onboard = callPackage ../applications/misc/onboard { };

From a28464cba7909f228c22a73790968b270231d709 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 27 Feb 2018 04:54:19 +0000
Subject: [PATCH 0917/2266] frostwire: 6.4.5 -> 6.6.3-build-253

---
 .../networking/p2p/frostwire/default.nix      | 82 ++++++++++++++++---
 1 file changed, 69 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 8a159f033ae..744b5616963 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -1,24 +1,80 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
 
-with stdenv.lib;
+let
+  version = "6.6.3-build-253";
+  name = "frostwire-desktop-${version}";
 
-stdenv.mkDerivation rec {
-  version = "6.4.5";
-  name = "frostwire-${version}";
-
-  src = fetchurl {
-    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
-    sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z";
+  src = fetchFromGitHub {
+    owner = "frostwire";
+    repo = "frostwire";
+    rev = name;
+    sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7";
   };
 
+  desktopItem = makeDesktopItem {
+    name = "frostwire";
+    desktopName = "FrostWire";
+    genericName = "P2P Bittorrent client";
+    exec = "frostwire";
+    icon = "frostwire";
+    comment = "Search and explore all kinds of files on the Bittorrent network";
+    categories = "Network;FileTransfer;P2P;";
+  };
+
+  # fake build to pre-download deps into fixed-output derivation
+  deps = stdenv.mkDerivation {
+    name = "${name}-deps";
+    inherit src;
+    buildInputs = [ gradle perl ];
+    buildPhase = ''
+      export GRADLE_USER_HOME=$(mktemp -d)
+      ( cd desktop
+        gradle --no-daemon build
+      )
+    '';
+    # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+    installPhase = ''
+      find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | sh
+    '';
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc";
+  };
+
+in stdenv.mkDerivation {
+  inherit name src;
+
   nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ gradle ];
+
+  buildPhase = ''
+    export GRADLE_USER_HOME=$(mktemp -d)
+    ( cd desktop
+      substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \
+        --replace /usr/bin/mplayer ${mplayer}/bin/mplayer
+      substituteInPlace build.gradle \
+        --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }'
+      gradle --offline --no-daemon build
+    )
+  '';
 
   installPhase = ''
-    mkdir -p $out/share/java
-    mv $(ls */*.jar) $out/share/java
+    mkdir -p $out/lib $out/share/java
 
-    makeWrapper $out/share/java/frostwire $out/bin/frostwire \
-      --prefix PATH : ${jre}/bin/
+    cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar
+
+    cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib";
+            x86_64-linux  = "desktop/lib/native/libjlibtorrent.so";
+            i686-linux    = "desktop/lib/native/libjlibtorrentx86.so";
+          }.${stdenv.system} or (throw "unsupported system ${stdenv.system}")
+        } $out/lib
+
+    cp -dpR ${desktopItem}/share $out
+
+    makeWrapper ${jre}/bin/java $out/bin/frostwire \
+      --add-flags "-Djava.library.path=$out/lib -jar $out/share/java/frostwire.jar"
   '';
 
   meta = with stdenv.lib; {

From 0596a7c6d62647110686b14156d872367211d250 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 27 Feb 2018 04:58:31 +0000
Subject: [PATCH 0918/2266] frostwire: fixed meta.platforms

---
 pkgs/applications/networking/p2p/frostwire/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 744b5616963..475b9b6f2f8 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -82,6 +82,6 @@ in stdenv.mkDerivation {
     description = "BitTorrent Client and Cloud File Downloader";
     license = licenses.gpl2;
     maintainers = with maintainers; [ gavin ];
-    platforms = platforms.all;
+    platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" ];
   };
 }

From cedfe316480acb9a1b39f6c752a0e3efe34efe1e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 27 Feb 2018 14:28:45 +0000
Subject: [PATCH 0919/2266] frostwire: restore download-and-unpack derivation
 as frostwire-bin

---
 .../p2p/frostwire/frostwire-bin.nix           | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix

diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
new file mode 100644
index 00000000000..eff424e2bb1
--- /dev/null
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "6.6.3";
+  name = "frostwire-${version}";
+
+  src = fetchurl {
+    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
+    sha256 = "0di1kfvdjglav5pm23gcggfn9qznk5viah55jggv4cb6h16vxc3p";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    mv $(ls */*.jar) $out/share/java
+
+    makeWrapper $out/share/java/frostwire $out/bin/frostwire \
+      --prefix PATH : ${jre}/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.frostwire.com/;
+    description = "BitTorrent Client and Cloud File Downloader";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ gavin ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81f605efea9..535e40d34ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2351,6 +2351,7 @@ with pkgs;
   frescobaldi = callPackage ../misc/frescobaldi {};
 
   frostwire = callPackage ../applications/networking/p2p/frostwire { };
+  frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
 
   ftgl = callPackage ../development/libraries/ftgl { };
 

From b20fe4a99d3315850b0546d44f2d21036c56c035 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 27 Feb 2018 14:43:44 +0000
Subject: [PATCH 0920/2266] frostwire: a stricter regex, just in case

---
 pkgs/applications/networking/p2p/frostwire/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 475b9b6f2f8..72799941402 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -35,7 +35,7 @@ let
     # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
     installPhase = ''
       find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \
-        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
         | sh
     '';
     outputHashAlgo = "sha256";

From 5a1da02976137e46ecabca8822c8e55c9b1256ea Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 13 Mar 2018 08:32:14 +0000
Subject: [PATCH 0921/2266] frostwire-bin: update sha256

---
 pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index eff424e2bb1..4f885116bd8 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
-    sha256 = "0di1kfvdjglav5pm23gcggfn9qznk5viah55jggv4cb6h16vxc3p";
+    sha256 = "0n1g0am3d2fxw4a4zzzyif1fal1x3xch9q7743jhkkm3mldl2grw";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f9bb730d771d5505b9c03626eef0a23bfd819a33 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 13 Mar 2018 10:38:38 +0100
Subject: [PATCH 0922/2266] zed: regenerate packages with node2nix 1.5.3

---
 .../editors/zed/node-packages.nix             | 1227 +++++++++--------
 pkgs/applications/editors/zed/node.nix        |    7 +-
 2 files changed, 620 insertions(+), 614 deletions(-)

diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix
index 5aaa75b6c91..e47f11e6eb5 100644
--- a/pkgs/applications/editors/zed/node-packages.nix
+++ b/pkgs/applications/editors/zed/node-packages.nix
@@ -1,99 +1,9 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "bytes-1.0.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
-        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
-      };
-    };
-    "depd-0.4.4" = {
-      name = "depd";
-      packageName = "depd";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
-        sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
-      };
-    };
-    "iconv-lite-0.4.4" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
-        sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
-      };
-    };
-    "media-typer-0.2.0" = {
-      name = "media-typer";
-      packageName = "media-typer";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
-        sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
-      };
-    };
-    "on-finished-2.1.0" = {
-      name = "on-finished";
-      packageName = "on-finished";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
-        sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
-      };
-    };
-    "qs-2.2.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
-        sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
-      };
-    };
-    "raw-body-1.3.0" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
-        sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
-      };
-    };
-    "type-is-1.3.2" = {
-      name = "type-is";
-      packageName = "type-is";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
-        sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
-      };
-    };
-    "ee-first-1.0.5" = {
-      name = "ee-first";
-      packageName = "ee-first";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
-        sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
-      };
-    };
-    "mime-types-1.0.2" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
-        sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
-      };
-    };
     "accepts-1.0.7" = {
       name = "accepts";
       packageName = "accepts";
@@ -103,6 +13,78 @@ let
         sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
       };
     };
+    "asn1-0.1.11" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      };
+    };
+    "assert-plus-0.1.5" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      };
+    };
+    "async-0.9.2" = {
+      name = "async";
+      packageName = "async";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+      };
+    };
+    "aws-sign2-0.5.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "block-stream-0.0.9" = {
+      name = "block-stream";
+      packageName = "block-stream";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+      };
+    };
+    "boom-0.4.2" = {
+      name = "boom";
+      packageName = "boom";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
+      };
+    };
     "buffer-crc32-0.2.3" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
@@ -112,6 +94,78 @@ let
         sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
       };
     };
+    "bytes-1.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+      };
+    };
+    "combined-stream-0.0.7" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+      };
+    };
+    "commander-2.1.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "cookie-0.1.2" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+        sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+      };
+    };
+    "cookie-signature-1.0.4" = {
+      name = "cookie-signature";
+      packageName = "cookie-signature";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+        sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
+      };
+    };
+    "cryptiles-0.2.2" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      };
+    };
+    "ctype-0.5.3" = {
+      name = "ctype";
+      packageName = "ctype";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+      };
+    };
     "debug-1.0.4" = {
       name = "debug";
       packageName = "debug";
@@ -121,6 +175,42 @@ let
         sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
       };
     };
+    "delayed-stream-0.0.5" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      };
+    };
+    "depd-0.4.4" = {
+      name = "depd";
+      packageName = "depd";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
+        sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
+      };
+    };
+    "destroy-1.0.3" = {
+      name = "destroy";
+      packageName = "destroy";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+        sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+      };
+    };
+    "ee-first-1.0.5" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+        sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
+      };
+    };
     "escape-html-1.0.1" = {
       name = "escape-html";
       packageName = "escape-html";
@@ -139,6 +229,159 @@ let
         sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
       };
     };
+    "forever-agent-0.5.2" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+      };
+    };
+    "form-data-0.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+      };
+    };
+    "fresh-0.2.2" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
+        sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "fstream-0.1.31" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "0.1.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+      };
+    };
+    "glob-7.1.2" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+      };
+    };
+    "graceful-fs-3.0.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "3.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
+        sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
+      };
+    };
+    "hawk-1.0.0" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      };
+    };
+    "hoek-0.9.1" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "0.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      };
+    };
+    "http-signature-0.10.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+      };
+    };
+    "iconv-lite-0.4.4" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+        sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "ipaddr.js-0.1.2" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+        sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "media-typer-0.2.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+        sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
+      };
+    };
+    "merge-descriptors-0.0.2" = {
+      name = "merge-descriptors";
+      packageName = "merge-descriptors";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+        sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+      };
+    };
     "methods-1.1.0" = {
       name = "methods";
       packageName = "methods";
@@ -148,6 +391,132 @@ let
         sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
       };
     };
+    "mime-1.2.11" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      };
+    };
+    "mime-types-1.0.2" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+        sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "ms-0.6.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+        sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+      };
+    };
+    "nan-1.0.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+      };
+    };
+    "natives-1.1.1" = {
+      name = "natives";
+      packageName = "natives";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz";
+        sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i";
+      };
+    };
+    "negotiator-0.4.7" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+        sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
+      };
+    };
+    "node-uuid-1.4.8" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
+      };
+    };
+    "oauth-sign-0.3.0" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      };
+    };
+    "on-finished-2.1.0" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+        sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "options-0.0.6" = {
+      name = "options";
+      packageName = "options";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
+        sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+      };
+    };
     "parseurl-1.3.2" = {
       name = "parseurl";
       packageName = "parseurl";
@@ -157,6 +526,15 @@ let
         sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
       };
     };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
     "path-to-regexp-0.1.3" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
@@ -175,6 +553,33 @@ let
         sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
       };
     };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qs-0.6.6" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      };
+    };
+    "qs-2.2.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
+        sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
+      };
+    };
     "range-parser-1.0.0" = {
       name = "range-parser";
       packageName = "range-parser";
@@ -184,6 +589,24 @@ let
         sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
       };
     };
+    "raw-body-1.3.0" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+        sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
+      };
+    };
+    "rimraf-2.6.2" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
+        sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
+      };
+    };
     "send-0.8.5" = {
       name = "send";
       packageName = "send";
@@ -202,294 +625,6 @@ let
         sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
       };
     };
-    "vary-0.1.0" = {
-      name = "vary";
-      packageName = "vary";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
-        sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
-      };
-    };
-    "cookie-0.1.2" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
-        sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
-      };
-    };
-    "fresh-0.2.2" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
-        sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
-      };
-    };
-    "cookie-signature-1.0.4" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
-        sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
-      };
-    };
-    "merge-descriptors-0.0.2" = {
-      name = "merge-descriptors";
-      packageName = "merge-descriptors";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
-        sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
-      };
-    };
-    "utils-merge-1.0.0" = {
-      name = "utils-merge";
-      packageName = "utils-merge";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
-      };
-    };
-    "negotiator-0.4.7" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
-        sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
-      };
-    };
-    "ms-0.6.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
-        sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
-      };
-    };
-    "ipaddr.js-0.1.2" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
-        sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
-      };
-    };
-    "destroy-1.0.3" = {
-      name = "destroy";
-      packageName = "destroy";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
-        sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
-      };
-    };
-    "mime-1.2.11" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-      };
-    };
-    "qs-0.6.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.6.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
-      };
-    };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "forever-agent-0.5.2" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
-      };
-    };
-    "node-uuid-1.4.8" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
-        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
-      };
-    };
-    "tough-cookie-2.3.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
-        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
-      };
-    };
-    "form-data-0.1.4" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
-        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
-      };
-    };
-    "tunnel-agent-0.3.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
-        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
-      };
-    };
-    "http-signature-0.10.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
-      };
-    };
-    "oauth-sign-0.3.0" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
-        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
-      };
-    };
-    "hawk-1.0.0" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
-        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
-      };
-    };
-    "aws-sign2-0.5.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "combined-stream-0.0.7" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
-      };
-    };
-    "async-0.9.2" = {
-      name = "async";
-      packageName = "async";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
-        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
-      };
-    };
-    "delayed-stream-0.0.5" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
-      };
-    };
-    "assert-plus-0.1.5" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
-      };
-    };
-    "asn1-0.1.11" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
-      };
-    };
-    "ctype-0.5.3" = {
-      name = "ctype";
-      packageName = "ctype";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
-      };
-    };
-    "hoek-0.9.1" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "0.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
-      };
-    };
-    "boom-0.4.2" = {
-      name = "boom";
-      packageName = "boom";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
-      };
-    };
-    "cryptiles-0.2.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
-      };
-    };
     "sntp-0.2.4" = {
       name = "sntp";
       packageName = "sntp";
@@ -499,186 +634,6 @@ let
         sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
       };
     };
-    "block-stream-0.0.9" = {
-      name = "block-stream";
-      packageName = "block-stream";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
-        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
-      };
-    };
-    "fstream-0.1.31" = {
-      name = "fstream";
-      packageName = "fstream";
-      version = "0.1.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "graceful-fs-3.0.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "3.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
-        sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "rimraf-2.6.2" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
-        sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
-      };
-    };
-    "natives-1.1.0" = {
-      name = "natives";
-      packageName = "natives";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz";
-        sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "glob-7.1.2" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-    "brace-expansion-1.1.8" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
-        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
-      };
-    };
-    "balanced-match-1.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "commander-2.1.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
-      };
-    };
-    "nan-1.0.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
-        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
-      };
-    };
     "tinycolor-0.0.1" = {
       name = "tinycolor";
       packageName = "tinycolor";
@@ -688,13 +643,58 @@ let
         sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
       };
     };
-    "options-0.0.6" = {
-      name = "options";
-      packageName = "options";
-      version = "0.0.6";
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
-        sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+      };
+    };
+    "tunnel-agent-0.3.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+      };
+    };
+    "type-is-1.3.2" = {
+      name = "type-is";
+      packageName = "type-is";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+        sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
+      };
+    };
+    "utils-merge-1.0.0" = {
+      name = "utils-merge";
+      packageName = "utils-merge";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+      };
+    };
+    "vary-0.1.0" = {
+      name = "vary";
+      packageName = "vary";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+        sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
   };
@@ -711,14 +711,14 @@ in
     dependencies = [
       sources."bytes-1.0.0"
       sources."depd-0.4.4"
+      sources."ee-first-1.0.5"
       sources."iconv-lite-0.4.4"
       sources."media-typer-0.2.0"
+      sources."mime-types-1.0.2"
       sources."on-finished-2.1.0"
       sources."qs-2.2.2"
       sources."raw-body-1.3.0"
       sources."type-is-1.3.2"
-      sources."ee-first-1.0.5"
-      sources."mime-types-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -727,6 +727,7 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   "express-~4.8.3" = nodeEnv.buildNodePackage {
     name = "express";
@@ -739,12 +740,24 @@ in
     dependencies = [
       sources."accepts-1.0.7"
       sources."buffer-crc32-0.2.3"
+      sources."cookie-0.1.2"
+      sources."cookie-signature-1.0.4"
       sources."debug-1.0.4"
       sources."depd-0.4.4"
+      sources."destroy-1.0.3"
+      sources."ee-first-1.0.5"
       sources."escape-html-1.0.1"
       sources."finalhandler-0.1.0"
+      sources."fresh-0.2.2"
+      sources."ipaddr.js-0.1.2"
       sources."media-typer-0.2.0"
+      sources."merge-descriptors-0.0.2"
       sources."methods-1.1.0"
+      sources."mime-1.2.11"
+      sources."mime-types-1.0.2"
+      sources."ms-0.6.2"
+      sources."negotiator-0.4.7"
+      sources."on-finished-2.1.0"
       sources."parseurl-1.3.2"
       sources."path-to-regexp-0.1.3"
       sources."proxy-addr-1.0.1"
@@ -753,20 +766,8 @@ in
       sources."send-0.8.5"
       sources."serve-static-1.5.4"
       sources."type-is-1.3.2"
-      sources."vary-0.1.0"
-      sources."cookie-0.1.2"
-      sources."fresh-0.2.2"
-      sources."cookie-signature-1.0.4"
-      sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-1.0.2"
-      sources."negotiator-0.4.7"
-      sources."ms-0.6.2"
-      sources."ipaddr.js-0.1.2"
-      sources."destroy-1.0.3"
-      sources."mime-1.2.11"
-      sources."on-finished-2.1.0"
-      sources."ee-first-1.0.5"
+      sources."vary-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -775,6 +776,7 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   "request-~2.34.0" = nodeEnv.buildNodePackage {
     name = "request";
@@ -785,29 +787,29 @@ in
       sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
     };
     dependencies = [
-      sources."qs-0.6.6"
-      sources."json-stringify-safe-5.0.1"
-      sources."forever-agent-0.5.2"
-      sources."node-uuid-1.4.8"
-      sources."mime-1.2.11"
-      sources."tough-cookie-2.3.3"
-      sources."form-data-0.1.4"
-      sources."tunnel-agent-0.3.0"
-      sources."http-signature-0.10.1"
-      sources."oauth-sign-0.3.0"
-      sources."hawk-1.0.0"
-      sources."aws-sign2-0.5.0"
-      sources."punycode-1.4.1"
-      sources."combined-stream-0.0.7"
-      sources."async-0.9.2"
-      sources."delayed-stream-0.0.5"
-      sources."assert-plus-0.1.5"
       sources."asn1-0.1.11"
-      sources."ctype-0.5.3"
-      sources."hoek-0.9.1"
+      sources."assert-plus-0.1.5"
+      sources."async-0.9.2"
+      sources."aws-sign2-0.5.0"
       sources."boom-0.4.2"
+      sources."combined-stream-0.0.7"
       sources."cryptiles-0.2.2"
+      sources."ctype-0.5.3"
+      sources."delayed-stream-0.0.5"
+      sources."forever-agent-0.5.2"
+      sources."form-data-0.1.4"
+      sources."hawk-1.0.0"
+      sources."hoek-0.9.1"
+      sources."http-signature-0.10.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."mime-1.2.11"
+      sources."node-uuid-1.4.8"
+      sources."oauth-sign-0.3.0"
+      sources."punycode-1.4.1"
+      sources."qs-0.6.6"
       sources."sntp-0.2.4"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.3.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -816,6 +818,7 @@ in
       license = "Apache, Version 2.0";
     };
     production = true;
+    bypassCache = false;
   };
   "tar-~0.1.19" = nodeEnv.buildNodePackage {
     name = "tar";
@@ -826,24 +829,24 @@ in
       sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
     };
     dependencies = [
+      sources."balanced-match-1.0.0"
       sources."block-stream-0.0.9"
-      sources."fstream-0.1.31"
-      sources."inherits-2.0.3"
-      sources."graceful-fs-3.0.11"
-      sources."mkdirp-0.5.1"
-      sources."rimraf-2.6.2"
-      sources."natives-1.1.0"
-      sources."minimist-0.0.8"
-      sources."glob-7.1.2"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
+      sources."fstream-0.1.31"
+      sources."glob-7.1.2"
+      sources."graceful-fs-3.0.11"
       sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
       sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."natives-1.1.1"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
+      sources."rimraf-2.6.2"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -852,6 +855,7 @@ in
       license = "BSD";
     };
     production = true;
+    bypassCache = false;
   };
   "ws-~0.4.32" = nodeEnv.buildNodePackage {
     name = "ws";
@@ -864,8 +868,8 @@ in
     dependencies = [
       sources."commander-2.1.0"
       sources."nan-1.0.0"
-      sources."tinycolor-0.0.1"
       sources."options-0.0.6"
+      sources."tinycolor-0.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -873,5 +877,6 @@ in
       homepage = https://github.com/einaros/ws;
     };
     production = true;
+    bypassCache = false;
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
index f458caddbbe..75bc6ec109c 100644
--- a/pkgs/applications/editors/zed/node.nix
+++ b/pkgs/applications/editors/zed/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file

From 3a5e38fa00b0fc0dcd0ab0278afb7ebe73d0e46d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 13 Mar 2018 10:41:53 +0100
Subject: [PATCH 0923/2266] remarkjs: regenerate dependencies with node2nix
 1.5.3

---
 pkgs/development/web/remarkjs/generate.sh     |    2 +-
 .../web/remarkjs/node-packages.nix            | 5753 ++++++++---------
 pkgs/development/web/remarkjs/nodepkgs.nix    |    7 +-
 3 files changed, 2651 insertions(+), 3111 deletions(-)

diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh
index 63d43c6773f..040aaf97716 100644
--- a/pkgs/development/web/remarkjs/generate.sh
+++ b/pkgs/development/web/remarkjs/generate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -e
 
-node2nix -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix
+node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 8ece92b4a3f..4c8a6c6db97 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,1060 +1,79 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "JSONStream-1.3.1" = {
+    "@sinonjs/formatio-2.0.0" = {
+      name = "_at_sinonjs_slash_formatio";
+      packageName = "@sinonjs/formatio";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz";
+        sha512 = "37dc2svic03crmc9mvs4xc16rd28cbbf33js9ndp8278gb5xi40h1yzx467h3ca9mszjfwwr9vyfnvfbk07dj7gz039izrsq0085kln";
+      };
+    };
+    "JSONStream-1.3.2" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz";
-        sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a";
-      };
-    };
-    "assert-1.4.1" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
-      };
-    };
-    "browser-pack-6.0.2" = {
-      name = "browser-pack";
-      packageName = "browser-pack";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz";
-        sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531";
-      };
-    };
-    "browser-resolve-1.11.2" = {
-      name = "browser-resolve";
-      packageName = "browser-resolve";
-      version = "1.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz";
-        sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
-      };
-    };
-    "browserify-zlib-0.1.4" = {
-      name = "browserify-zlib";
-      packageName = "browserify-zlib";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
-        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
-      };
-    };
-    "buffer-5.0.5" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "5.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
-        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
-      };
-    };
-    "cached-path-relative-1.0.1" = {
-      name = "cached-path-relative";
-      packageName = "cached-path-relative";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz";
-        sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7";
-      };
-    };
-    "concat-stream-1.5.2" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
-      };
-    };
-    "console-browserify-1.1.0" = {
-      name = "console-browserify";
-      packageName = "console-browserify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
-      };
-    };
-    "constants-browserify-1.0.0" = {
-      name = "constants-browserify";
-      packageName = "constants-browserify";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz";
-        sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
-      };
-    };
-    "crypto-browserify-3.11.0" = {
-      name = "crypto-browserify";
-      packageName = "crypto-browserify";
-      version = "3.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz";
-        sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522";
-      };
-    };
-    "defined-1.0.0" = {
-      name = "defined";
-      packageName = "defined";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz";
-        sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
-      };
-    };
-    "deps-sort-2.0.0" = {
-      name = "deps-sort";
-      packageName = "deps-sort";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
-        sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
-      };
-    };
-    "domain-browser-1.1.7" = {
-      name = "domain-browser";
-      packageName = "domain-browser";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz";
-        sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc";
-      };
-    };
-    "duplexer2-0.1.4" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz";
-        sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
-      };
-    };
-    "events-1.1.1" = {
-      name = "events";
-      packageName = "events";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz";
-        sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
-      };
-    };
-    "glob-7.1.1" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
-        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
-      };
-    };
-    "has-1.0.1" = {
-      name = "has";
-      packageName = "has";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz";
-        sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28";
-      };
-    };
-    "htmlescape-1.1.1" = {
-      name = "htmlescape";
-      packageName = "htmlescape";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz";
-        sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
-      };
-    };
-    "https-browserify-0.0.1" = {
-      name = "https-browserify";
-      packageName = "https-browserify";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
-        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "insert-module-globals-7.0.1" = {
-      name = "insert-module-globals";
-      packageName = "insert-module-globals";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz";
-        sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3";
-      };
-    };
-    "labeled-stream-splicer-2.0.0" = {
-      name = "labeled-stream-splicer";
-      packageName = "labeled-stream-splicer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz";
-        sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
-      };
-    };
-    "module-deps-4.1.1" = {
-      name = "module-deps";
-      packageName = "module-deps";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz";
-        sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd";
-      };
-    };
-    "os-browserify-0.1.2" = {
-      name = "os-browserify";
-      packageName = "os-browserify";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
-        sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
-      };
-    };
-    "parents-1.0.1" = {
-      name = "parents";
-      packageName = "parents";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz";
-        sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
-      };
-    };
-    "path-browserify-0.0.0" = {
-      name = "path-browserify";
-      packageName = "path-browserify";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
-        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
-      };
-    };
-    "process-0.11.9" = {
-      name = "process";
-      packageName = "process";
-      version = "0.11.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process/-/process-0.11.9.tgz";
-        sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "querystring-es3-0.2.1" = {
-      name = "querystring-es3";
-      packageName = "querystring-es3";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
-        sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
-      };
-    };
-    "read-only-stream-2.0.0" = {
-      name = "read-only-stream";
-      packageName = "read-only-stream";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz";
-        sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
-      };
-    };
-    "readable-stream-2.2.6" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz";
-        sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816";
-      };
-    };
-    "resolve-1.3.2" = {
-      name = "resolve";
-      packageName = "resolve";
       version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz";
-        sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz";
+        sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea";
       };
     };
-    "shasum-1.0.2" = {
-      name = "shasum";
-      packageName = "shasum";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
-        sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
-      };
-    };
-    "shell-quote-1.6.1" = {
-      name = "shell-quote";
-      packageName = "shell-quote";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz";
-        sha1 = "f4781949cce402697127430ea3b3c5476f481767";
-      };
-    };
-    "stream-browserify-2.0.1" = {
-      name = "stream-browserify";
-      packageName = "stream-browserify";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
-        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
-      };
-    };
-    "stream-http-2.6.3" = {
-      name = "stream-http";
-      packageName = "stream-http";
-      version = "2.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz";
-        sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3";
-      };
-    };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-      };
-    };
-    "subarg-1.0.0" = {
-      name = "subarg";
-      packageName = "subarg";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
-        sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
-      };
-    };
-    "syntax-error-1.3.0" = {
-      name = "syntax-error";
-      packageName = "syntax-error";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz";
-        sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1";
-      };
-    };
-    "through2-2.0.3" = {
-      name = "through2";
-      packageName = "through2";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
-        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
-      };
-    };
-    "timers-browserify-1.4.2" = {
-      name = "timers-browserify";
-      packageName = "timers-browserify";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz";
-        sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
-      };
-    };
-    "tty-browserify-0.0.0" = {
-      name = "tty-browserify";
-      packageName = "tty-browserify";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
-        sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
-      };
-    };
-    "url-0.11.0" = {
-      name = "url";
-      packageName = "url";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz";
-        sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
-      };
-    };
-    "util-0.10.3" = {
-      name = "util";
-      packageName = "util";
-      version = "0.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz";
-        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
-      };
-    };
-    "vm-browserify-0.0.4" = {
-      name = "vm-browserify";
-      packageName = "vm-browserify";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
-        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
-      };
-    };
-    "xtend-4.0.1" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
-        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
-      };
-    };
-    "jsonparse-1.3.0" = {
-      name = "jsonparse";
-      packageName = "jsonparse";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz";
-        sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8";
-      };
-    };
-    "through-2.3.8" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
-        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
-      };
-    };
-    "combine-source-map-0.7.2" = {
-      name = "combine-source-map";
-      packageName = "combine-source-map";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz";
-        sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e";
-      };
-    };
-    "umd-3.0.1" = {
-      name = "umd";
-      packageName = "umd";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz";
-        sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e";
-      };
-    };
-    "convert-source-map-1.1.3" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz";
-        sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
-      };
-    };
-    "inline-source-map-0.6.2" = {
-      name = "inline-source-map";
-      packageName = "inline-source-map";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz";
-        sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
-      };
-    };
-    "lodash.memoize-3.0.4" = {
-      name = "lodash.memoize";
-      packageName = "lodash.memoize";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz";
-        sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
-      };
-    };
-    "source-map-0.5.6" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
-        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
-      };
-    };
-    "resolve-1.1.7" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
-      };
-    };
-    "pako-0.2.9" = {
-      name = "pako";
-      packageName = "pako";
-      version = "0.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz";
-        sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
-      };
-    };
-    "base64-js-1.2.0" = {
-      name = "base64-js";
-      packageName = "base64-js";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz";
-        sha1 = "a39992d723584811982be5e290bb6a53d86700f1";
-      };
-    };
-    "ieee754-1.1.8" = {
-      name = "ieee754";
-      packageName = "ieee754";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
-        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
-      };
-    };
-    "typedarray-0.0.6" = {
-      name = "typedarray";
-      packageName = "typedarray";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-      };
-    };
-    "readable-stream-2.0.6" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-      };
-    };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
-      };
-    };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      };
-    };
-    "browserify-cipher-1.0.0" = {
-      name = "browserify-cipher";
-      packageName = "browserify-cipher";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
-        sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
-      };
-    };
-    "browserify-sign-4.0.4" = {
-      name = "browserify-sign";
-      packageName = "browserify-sign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
-        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
-      };
-    };
-    "create-ecdh-4.0.0" = {
-      name = "create-ecdh";
-      packageName = "create-ecdh";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz";
-        sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
-      };
-    };
-    "create-hash-1.1.2" = {
-      name = "create-hash";
-      packageName = "create-hash";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz";
-        sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad";
-      };
-    };
-    "create-hmac-1.1.4" = {
-      name = "create-hmac";
-      packageName = "create-hmac";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz";
-        sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170";
-      };
-    };
-    "diffie-hellman-5.0.2" = {
-      name = "diffie-hellman";
-      packageName = "diffie-hellman";
-      version = "5.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
-        sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
-      };
-    };
-    "pbkdf2-3.0.9" = {
-      name = "pbkdf2";
-      packageName = "pbkdf2";
-      version = "3.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz";
-        sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693";
-      };
-    };
-    "public-encrypt-4.0.0" = {
-      name = "public-encrypt";
-      packageName = "public-encrypt";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz";
-        sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
-      };
-    };
-    "randombytes-2.0.3" = {
-      name = "randombytes";
-      packageName = "randombytes";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz";
-        sha1 = "674c99760901c3c4112771a31e521dc349cc09ec";
-      };
-    };
-    "browserify-aes-1.0.6" = {
-      name = "browserify-aes";
-      packageName = "browserify-aes";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz";
-        sha1 = "5e7725dbdef1fd5930d4ebab48567ce451c48a0a";
-      };
-    };
-    "browserify-des-1.0.0" = {
-      name = "browserify-des";
-      packageName = "browserify-des";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz";
-        sha1 = "daa277717470922ed2fe18594118a175439721dd";
-      };
-    };
-    "evp_bytestokey-1.0.0" = {
-      name = "evp_bytestokey";
-      packageName = "evp_bytestokey";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz";
-        sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53";
-      };
-    };
-    "buffer-xor-1.0.3" = {
-      name = "buffer-xor";
-      packageName = "buffer-xor";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz";
-        sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
-      };
-    };
-    "cipher-base-1.0.3" = {
-      name = "cipher-base";
-      packageName = "cipher-base";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz";
-        sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07";
-      };
-    };
-    "des.js-1.0.0" = {
-      name = "des.js";
-      packageName = "des.js";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
-      };
-    };
-    "minimalistic-assert-1.0.0" = {
-      name = "minimalistic-assert";
-      packageName = "minimalistic-assert";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
-        sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
-      };
-    };
-    "bn.js-4.11.6" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "4.11.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz";
-        sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215";
-      };
-    };
-    "browserify-rsa-4.0.1" = {
-      name = "browserify-rsa";
-      packageName = "browserify-rsa";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
-        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
-      };
-    };
-    "elliptic-6.4.0" = {
-      name = "elliptic";
-      packageName = "elliptic";
-      version = "6.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz";
-        sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
-      };
-    };
-    "parse-asn1-5.1.0" = {
-      name = "parse-asn1";
-      packageName = "parse-asn1";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
-        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
-      };
-    };
-    "brorand-1.1.0" = {
-      name = "brorand";
-      packageName = "brorand";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz";
-        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
-      };
-    };
-    "hash.js-1.0.3" = {
-      name = "hash.js";
-      packageName = "hash.js";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz";
-        sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
-      };
-    };
-    "hmac-drbg-1.0.0" = {
-      name = "hmac-drbg";
-      packageName = "hmac-drbg";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz";
-        sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5";
-      };
-    };
-    "minimalistic-crypto-utils-1.0.1" = {
-      name = "minimalistic-crypto-utils";
-      packageName = "minimalistic-crypto-utils";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
-        sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
-      };
-    };
-    "asn1.js-4.9.1" = {
-      name = "asn1.js";
-      packageName = "asn1.js";
-      version = "4.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
-        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
-      };
-    };
-    "ripemd160-1.0.1" = {
-      name = "ripemd160";
-      packageName = "ripemd160";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz";
-        sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
-      };
-    };
-    "sha.js-2.4.8" = {
-      name = "sha.js";
-      packageName = "sha.js";
-      version = "2.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
-        sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
-      };
-    };
-    "miller-rabin-4.0.0" = {
-      name = "miller-rabin";
-      packageName = "miller-rabin";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz";
-        sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "minimatch-3.0.3" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz";
-        sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-    "brace-expansion-1.1.6" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz";
-        sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9";
-      };
-    };
-    "balanced-match-0.4.2" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
-        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "function-bind-1.1.0" = {
-      name = "function-bind";
-      packageName = "function-bind";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz";
-        sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
-      };
-    };
-    "is-buffer-1.1.5" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
-        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
-      };
-    };
-    "lexical-scope-1.2.0" = {
-      name = "lexical-scope";
-      packageName = "lexical-scope";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz";
-        sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
-      };
-    };
-    "astw-2.2.0" = {
-      name = "astw";
-      packageName = "astw";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
-        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
-      };
-    };
-    "acorn-4.0.11" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "4.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
-        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
-      };
-    };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-      };
-    };
-    "stream-splicer-2.0.0" = {
-      name = "stream-splicer";
-      packageName = "stream-splicer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz";
-        sha1 = "1b63be438a133e4b671cc1935197600175910d83";
-      };
-    };
-    "detective-4.5.0" = {
-      name = "detective";
-      packageName = "detective";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz";
-        sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1";
-      };
-    };
-    "stream-combiner2-1.1.1" = {
-      name = "stream-combiner2";
-      packageName = "stream-combiner2";
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
-        sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
       };
     };
-    "path-platform-0.11.15" = {
-      name = "path-platform";
-      packageName = "path-platform";
-      version = "0.11.15";
+    "acorn-4.0.13" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "4.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz";
-        sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";
+        sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
+    "acorn-5.5.3" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "5.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz";
+        sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld";
       };
     };
-    "path-parse-1.0.5" = {
-      name = "path-parse";
-      packageName = "path-parse";
-      version = "1.0.5";
+    "acorn-node-1.3.0" = {
+      name = "acorn-node";
+      packageName = "acorn-node";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
-        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
+        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz";
+        sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr";
       };
     };
-    "json-stable-stringify-0.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "0.0.1";
+    "adm-zip-0.2.1" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
-        sha1 = "611c23e814db375527df851193db59dd2af27f45";
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz";
+        sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
       };
     };
-    "jsonify-0.0.0" = {
-      name = "jsonify";
-      packageName = "jsonify";
-      version = "0.0.0";
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
-        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
     "array-filter-0.0.1" = {
@@ -1066,15 +85,6 @@ let
         sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
       };
     };
-    "array-reduce-0.0.0" = {
-      name = "array-reduce";
-      packageName = "array-reduce";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
-        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
-      };
-    };
     "array-map-0.0.0" = {
       name = "array-map";
       packageName = "array-map";
@@ -1084,283 +94,121 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-3.0.0" = {
-      name = "builtin-status-codes";
-      packageName = "builtin-status-codes";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
-        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
-      };
-    };
-    "to-arraybuffer-1.0.1" = {
-      name = "to-arraybuffer";
-      packageName = "to-arraybuffer";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
-        sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
-      };
-    };
-    "minimist-1.2.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
-      };
-    };
-    "punycode-1.3.2" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
-      };
-    };
-    "querystring-0.2.0" = {
-      name = "querystring";
-      packageName = "querystring";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz";
-        sha1 = "b209849203bb25df820da756e747005878521620";
-      };
-    };
-    "inherits-2.0.1" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
-      };
-    };
-    "indexof-0.0.1" = {
-      name = "indexof";
-      packageName = "indexof";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
-        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
-      };
-    };
-    "yargs-3.10.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
-        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
-      };
-    };
-    "uglify-to-browserify-1.0.2" = {
-      name = "uglify-to-browserify";
-      packageName = "uglify-to-browserify";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
-        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "cliui-2.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
-        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
-      };
-    };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-      };
-    };
-    "window-size-0.1.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
-        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
-      };
-    };
-    "center-align-0.1.3" = {
-      name = "center-align";
-      packageName = "center-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
-        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
-      };
-    };
-    "right-align-0.1.3" = {
-      name = "right-align";
-      packageName = "right-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
-      };
-    };
-    "wordwrap-0.0.2" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
-      };
-    };
-    "align-text-0.1.4" = {
-      name = "align-text";
-      packageName = "align-text";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
-        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
-      };
-    };
-    "lazy-cache-1.0.4" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
-        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
-      };
-    };
-    "kind-of-3.1.0" = {
-      name = "kind-of";
-      packageName = "kind-of";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
-        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
-      };
-    };
-    "longest-1.0.1" = {
-      name = "longest";
-      packageName = "longest";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
-        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
-      };
-    };
-    "repeat-string-1.6.1" = {
-      name = "repeat-string";
-      packageName = "repeat-string";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
-      };
-    };
-    "errno-0.1.4" = {
-      name = "errno";
-      packageName = "errno";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
-        sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
-      };
-    };
-    "graceful-fs-4.1.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
-      };
-    };
-    "image-size-0.5.1" = {
-      name = "image-size";
-      packageName = "image-size";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/image-size/-/image-size-0.5.1.tgz";
-        sha1 = "28eea8548a4b1443480ddddc1e083ae54652439f";
-      };
-    };
-    "mime-1.3.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "promise-7.1.1" = {
-      name = "promise";
-      packageName = "promise";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz";
-        sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
-      };
-    };
-    "request-2.81.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.81.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
-      };
-    };
-    "prr-0.0.0" = {
-      name = "prr";
-      packageName = "prr";
+    "array-reduce-0.0.0" = {
+      name = "array-reduce";
+      packageName = "array-reduce";
       version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
-        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
+        url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
+        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
       };
     };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "asap-2.0.5" = {
+    "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
-        sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    };
+    "asn1-0.1.11" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      };
+    };
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+      };
+    };
+    "asn1.js-4.10.1" = {
+      name = "asn1.js";
+      packageName = "asn1.js";
+      version = "4.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
+        sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7";
+      };
+    };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      };
+    };
+    "assert-plus-0.1.5" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      };
+    };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "astw-2.2.0" = {
+      name = "astw";
+      packageName = "astw";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz";
+        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
+      };
+    };
+    "async-0.9.2" = {
+      name = "async";
+      packageName = "async";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "aws-sign2-0.5.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -1381,400 +229,22 @@ let
         sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
-    "caseless-0.12.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
-        sha1 = "1b681c21ff84033c826543090689420d187151dc";
-      };
-    };
-    "combined-stream-1.0.5" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
-      };
-    };
-    "extend-3.0.0" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
-        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
-      };
-    };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-      };
-    };
-    "form-data-2.1.2" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
-        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
-      };
-    };
-    "har-validator-4.2.1" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
-        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
-      };
-    };
-    "hawk-3.1.3" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
-      };
-    };
-    "http-signature-1.1.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
-      };
-    };
-    "is-typedarray-1.0.0" = {
-      name = "is-typedarray";
-      packageName = "is-typedarray";
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
-        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "isstream-0.1.2" = {
-      name = "isstream";
-      packageName = "isstream";
-      version = "0.1.2";
+    "base64-js-1.2.3" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
-        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
-      };
-    };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "mime-types-2.1.15" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
-        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
-      };
-    };
-    "oauth-sign-0.8.2" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
-        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
-      };
-    };
-    "performance-now-0.2.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
-        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
-      };
-    };
-    "qs-6.4.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
-      };
-    };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
-      };
-    };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-      };
-    };
-    "tough-cookie-2.3.2" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
-        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
-      };
-    };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "uuid-3.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
-      };
-    };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
-    "asynckit-0.4.0" = {
-      name = "asynckit";
-      packageName = "asynckit";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
-        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
-      };
-    };
-    "ajv-4.11.5" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz";
-        sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd";
-      };
-    };
-    "har-schema-1.0.5" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
-        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
-      };
-    };
-    "co-4.6.0" = {
-      name = "co";
-      packageName = "co";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
-        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
-      };
-    };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
-      };
-    };
-    "hoek-2.16.3" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "2.16.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
-      };
-    };
-    "boom-2.10.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "2.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
-      };
-    };
-    "cryptiles-2.0.5" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
-      };
-    };
-    "sntp-1.0.9" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
-      };
-    };
-    "assert-plus-0.2.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
-      };
-    };
-    "jsprim-1.4.0" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
-        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
-      };
-    };
-    "sshpk-1.11.0" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz";
-        sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77";
-      };
-    };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-      };
-    };
-    "extsprintf-1.0.2" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
-        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
-      };
-    };
-    "json-schema-0.2.3" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
-        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
-      };
-    };
-    "verror-1.3.6" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
-        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
-      };
-    };
-    "asn1-0.2.3" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
-      };
-    };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
-      };
-    };
-    "getpass-0.1.6" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz";
-        sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
-      };
-    };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
-      };
-    };
-    "tweetnacl-0.14.5" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
-      };
-    };
-    "jodid25519-1.0.2" = {
-      name = "jodid25519";
-      packageName = "jodid25519";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
-        sha1 = "06d4912255093419477d425633606e0e90782967";
-      };
-    };
-    "ecc-jsbn-0.1.1" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";
+        sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j";
       };
     };
     "bcrypt-pbkdf-1.0.1" = {
@@ -1786,553 +256,13 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.27.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.27.0";
+    "bn.js-4.11.8" = {
+      name = "bn.js";
+      packageName = "bn.js";
+      version = "4.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
-        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
-      };
-    };
-    "browser-stdout-1.3.0" = {
-      name = "browser-stdout";
-      packageName = "browser-stdout";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
-        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
-      };
-    };
-    "commander-2.9.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
-      };
-    };
-    "debug-2.2.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-      };
-    };
-    "diff-1.4.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
-        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
-      };
-    };
-    "glob-7.0.5" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz";
-        sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95";
-      };
-    };
-    "growl-1.9.2" = {
-      name = "growl";
-      packageName = "growl";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
-        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
-      };
-    };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-      };
-    };
-    "lodash.create-3.1.1" = {
-      name = "lodash.create";
-      packageName = "lodash.create";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
-        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
-      };
-    };
-    "supports-color-3.1.2" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
-        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
-      };
-    };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
-      };
-    };
-    "ms-0.7.1" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-      };
-    };
-    "lodash._baseassign-3.2.0" = {
-      name = "lodash._baseassign";
-      packageName = "lodash._baseassign";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
-        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
-      };
-    };
-    "lodash._basecreate-3.0.3" = {
-      name = "lodash._basecreate";
-      packageName = "lodash._basecreate";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
-        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
-      };
-    };
-    "lodash._isiterateecall-3.0.9" = {
-      name = "lodash._isiterateecall";
-      packageName = "lodash._isiterateecall";
-      version = "3.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz";
-        sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c";
-      };
-    };
-    "lodash._basecopy-3.0.1" = {
-      name = "lodash._basecopy";
-      packageName = "lodash._basecopy";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
-        sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36";
-      };
-    };
-    "lodash.keys-3.1.2" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz";
-        sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a";
-      };
-    };
-    "lodash._getnative-3.9.1" = {
-      name = "lodash._getnative";
-      packageName = "lodash._getnative";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz";
-        sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5";
-      };
-    };
-    "lodash.isarguments-3.1.0" = {
-      name = "lodash.isarguments";
-      packageName = "lodash.isarguments";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz";
-        sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a";
-      };
-    };
-    "lodash.isarray-3.0.4" = {
-      name = "lodash.isarray";
-      packageName = "lodash.isarray";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz";
-        sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55";
-      };
-    };
-    "has-flag-1.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz";
-        sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
-      };
-    };
-    "phantomjs-1.9.7-15" = {
-      name = "phantomjs";
-      packageName = "phantomjs";
-      version = "1.9.7-15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz";
-        sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
-      };
-    };
-    "mocha-phantomjs-core-1.3.1" = {
-      name = "mocha-phantomjs-core";
-      packageName = "mocha-phantomjs-core";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz";
-        sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
-      };
-    };
-    "adm-zip-0.2.1" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz";
-        sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
-      };
-    };
-    "kew-0.1.7" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
-        sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
-      };
-    };
-    "ncp-0.4.2" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
-        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
-      };
-    };
-    "npmconf-0.0.24" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "0.0.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz";
-        sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c";
-      };
-    };
-    "mkdirp-0.3.5" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      };
-    };
-    "progress-1.1.8" = {
-      name = "progress";
-      packageName = "progress";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
-        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
-      };
-    };
-    "request-2.36.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.36.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz";
-        sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
-      };
-    };
-    "request-progress-0.3.1" = {
-      name = "request-progress";
-      packageName = "request-progress";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
-        sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
-      };
-    };
-    "rimraf-2.2.8" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
-      };
-    };
-    "which-1.0.9" = {
-      name = "which";
-      packageName = "which";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
-        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
-      };
-    };
-    "config-chain-1.1.11" = {
-      name = "config-chain";
-      packageName = "config-chain";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
-        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
-      };
-    };
-    "inherits-1.0.2" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
-        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
-      };
-    };
-    "once-1.1.1" = {
-      name = "once";
-      packageName = "once";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz";
-        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
-      };
-    };
-    "osenv-0.0.3" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
-        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
-      };
-    };
-    "nopt-2.2.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
-        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
-      };
-    };
-    "semver-1.1.4" = {
-      name = "semver";
-      packageName = "semver";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
-        sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
-      };
-    };
-    "ini-1.1.0" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
-        sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
-      };
-    };
-    "proto-list-1.2.4" = {
-      name = "proto-list";
-      packageName = "proto-list";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
-        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
-      };
-    };
-    "ini-1.3.4" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-        sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
-      };
-    };
-    "abbrev-1.1.0" = {
-      name = "abbrev";
-      packageName = "abbrev";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
-        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
-      };
-    };
-    "qs-0.6.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.6.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
-      };
-    };
-    "mime-1.2.11" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-      };
-    };
-    "forever-agent-0.5.2" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
-      };
-    };
-    "node-uuid-1.4.8" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
-        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
-      };
-    };
-    "form-data-0.1.4" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
-        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
-      };
-    };
-    "tunnel-agent-0.4.3" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
-        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
-      };
-    };
-    "http-signature-0.10.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
-      };
-    };
-    "oauth-sign-0.3.0" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
-        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
-      };
-    };
-    "hawk-1.0.0" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
-        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
-      };
-    };
-    "aws-sign2-0.5.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
-      };
-    };
-    "combined-stream-0.0.7" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
-      };
-    };
-    "async-0.9.2" = {
-      name = "async";
-      packageName = "async";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
-        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
-      };
-    };
-    "delayed-stream-0.0.5" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
-      };
-    };
-    "assert-plus-0.1.5" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
-      };
-    };
-    "asn1-0.1.11" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
-      };
-    };
-    "ctype-0.5.3" = {
-      name = "ctype";
-      packageName = "ctype";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
-      };
-    };
-    "hoek-0.9.1" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "0.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
+        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
       };
     };
     "boom-0.4.2" = {
@@ -2344,148 +274,166 @@ let
         sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
       };
     };
-    "cryptiles-0.2.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "0.2.2";
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
       };
     };
-    "sntp-0.2.4" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "0.2.4";
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
-        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
       };
     };
-    "throttleit-0.0.2" = {
-      name = "throttleit";
-      packageName = "throttleit";
-      version = "0.0.2";
+    "brorand-1.1.0" = {
+      name = "brorand";
+      packageName = "brorand";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
-        sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz";
+        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
-    "should-equal-1.0.1" = {
-      name = "should-equal";
-      packageName = "should-equal";
-      version = "1.0.1";
+    "browser-pack-6.0.4" = {
+      name = "browser-pack";
+      packageName = "browser-pack";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-equal/-/should-equal-1.0.1.tgz";
-        sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7";
+        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz";
+        sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123";
       };
     };
-    "should-format-3.0.3" = {
-      name = "should-format";
-      packageName = "should-format";
-      version = "3.0.3";
+    "browser-resolve-1.11.2" = {
+      name = "browser-resolve";
+      packageName = "browser-resolve";
+      version = "1.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz";
-        sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1";
+        url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz";
+        sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
       };
     };
-    "should-type-1.4.0" = {
-      name = "should-type";
-      packageName = "should-type";
-      version = "1.4.0";
+    "browser-stdout-1.3.1" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz";
-        sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3";
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
+        sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
       };
     };
-    "should-type-adaptors-1.0.1" = {
-      name = "should-type-adaptors";
-      packageName = "should-type-adaptors";
-      version = "1.0.1";
+    "browserify-aes-1.1.1" = {
+      name = "browserify-aes";
+      packageName = "browserify-aes";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz";
-        sha1 = "efe5553cdf68cff66e5c5f51b712dc351c77beaa";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz";
+        sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah";
       };
     };
-    "should-util-1.0.0" = {
-      name = "should-util";
-      packageName = "should-util";
+    "browserify-cipher-1.0.0" = {
+      name = "browserify-cipher";
+      packageName = "browserify-cipher";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz";
-        sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063";
+        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
+        sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
       };
     };
-    "diff-3.2.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.2.0";
+    "browserify-des-1.0.0" = {
+      name = "browserify-des";
+      packageName = "browserify-des";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
+        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz";
+        sha1 = "daa277717470922ed2fe18594118a175439721dd";
       };
     };
-    "formatio-1.2.0" = {
-      name = "formatio";
-      packageName = "formatio";
-      version = "1.2.0";
+    "browserify-rsa-4.0.1" = {
+      name = "browserify-rsa";
+      packageName = "browserify-rsa";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz";
-        sha1 = "f3b2167d9068c4698a8d51f4f760a39a54d818eb";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "lolex-1.6.0" = {
-      name = "lolex";
-      packageName = "lolex";
-      version = "1.6.0";
+    "browserify-sign-4.0.4" = {
+      name = "browserify-sign";
+      packageName = "browserify-sign";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz";
-        sha1 = "3a9a0283452a47d7439e72731b9e07d7386e49f6";
+        url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
-    "native-promise-only-0.8.1" = {
-      name = "native-promise-only";
-      packageName = "native-promise-only";
-      version = "0.8.1";
+    "browserify-zlib-0.2.0" = {
+      name = "browserify-zlib";
+      packageName = "browserify-zlib";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz";
-        sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
+        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
+        sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
       };
     };
-    "path-to-regexp-1.7.0" = {
-      name = "path-to-regexp";
-      packageName = "path-to-regexp";
-      version = "1.7.0";
+    "buffer-5.1.0" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
-        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz";
+        sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2";
       };
     };
-    "samsam-1.2.1" = {
-      name = "samsam";
-      packageName = "samsam";
-      version = "1.2.1";
+    "buffer-xor-1.0.3" = {
+      name = "buffer-xor";
+      packageName = "buffer-xor";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz";
-        sha1 = "edd39093a3184370cb859243b2bdf255e7d8ea67";
+        url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz";
+        sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
       };
     };
-    "text-encoding-0.6.4" = {
-      name = "text-encoding";
-      packageName = "text-encoding";
-      version = "0.6.4";
+    "builtin-status-codes-3.0.0" = {
+      name = "builtin-status-codes";
+      packageName = "builtin-status-codes";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz";
-        sha1 = "e399a982257a276dae428bb92845cb71bdc26d19";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
-    "type-detect-4.0.0" = {
-      name = "type-detect";
-      packageName = "type-detect";
-      version = "4.0.0";
+    "cached-path-relative-1.0.1" = {
+      name = "cached-path-relative";
+      packageName = "cached-path-relative";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.0.tgz";
-        sha1 = "62053883542a321f2f7b25746dc696478b18ff6b";
+        url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz";
+        sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "cipher-base-1.0.4" = {
+      name = "cipher-base";
+      packageName = "cipher-base";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
+        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
       };
     };
     "cli-1.0.1" = {
@@ -2497,49 +445,346 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "exit-0.1.2" = {
-      name = "exit";
-      packageName = "exit";
-      version = "0.1.2";
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
-        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
       };
     };
-    "htmlparser2-3.8.3" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.8.3";
+    "combine-source-map-0.7.2" = {
+      name = "combine-source-map";
+      packageName = "combine-source-map";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
-        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
+        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz";
+        sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e";
       };
     };
-    "shelljs-0.3.0" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.3.0";
+    "combine-source-map-0.8.0" = {
+      name = "combine-source-map";
+      packageName = "combine-source-map";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
-        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+        url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz";
+        sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b";
       };
     };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
+    "combined-stream-0.0.7" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
       };
     };
-    "lodash-3.7.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "3.7.0";
+    "combined-stream-1.0.6" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
-        sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "commander-2.11.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
+        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
+      };
+    };
+    "commander-2.14.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz";
+        sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r";
+      };
+    };
+    "commander-2.15.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz";
+        sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "concat-stream-1.5.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    };
+    "concat-stream-1.6.1" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz";
+        sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2";
+      };
+    };
+    "config-chain-1.1.11" = {
+      name = "config-chain";
+      packageName = "config-chain";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+      };
+    };
+    "console-browserify-1.1.0" = {
+      name = "console-browserify";
+      packageName = "console-browserify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+      };
+    };
+    "constants-browserify-1.0.0" = {
+      name = "constants-browserify";
+      packageName = "constants-browserify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz";
+        sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
+      };
+    };
+    "convert-source-map-1.1.3" = {
+      name = "convert-source-map";
+      packageName = "convert-source-map";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz";
+        sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "create-ecdh-4.0.0" = {
+      name = "create-ecdh";
+      packageName = "create-ecdh";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz";
+        sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
+      };
+    };
+    "create-hash-1.1.3" = {
+      name = "create-hash";
+      packageName = "create-hash";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz";
+        sha1 = "606042ac8b9262750f483caddab0f5819172d8fd";
+      };
+    };
+    "create-hmac-1.1.6" = {
+      name = "create-hmac";
+      packageName = "create-hmac";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz";
+        sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
+      };
+    };
+    "cryptiles-0.2.2" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      };
+    };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "crypto-browserify-3.12.0" = {
+      name = "crypto-browserify";
+      packageName = "crypto-browserify";
+      version = "3.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
+        sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz";
+      };
+    };
+    "ctype-0.5.3" = {
+      name = "ctype";
+      packageName = "ctype";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "date-now-0.1.4" = {
+      name = "date-now";
+      packageName = "date-now";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      };
+    };
+    "debug-3.1.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+      };
+    };
+    "defined-1.0.0" = {
+      name = "defined";
+      packageName = "defined";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz";
+        sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
+      };
+    };
+    "delayed-stream-0.0.5" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "deps-sort-2.0.0" = {
+      name = "deps-sort";
+      packageName = "deps-sort";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
+        sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
+      };
+    };
+    "des.js-1.0.0" = {
+      name = "des.js";
+      packageName = "des.js";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
+        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+      };
+    };
+    "detective-5.1.0" = {
+      name = "detective";
+      packageName = "detective";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz";
+        sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac";
+      };
+    };
+    "diff-3.5.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz";
+        sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3";
+      };
+    };
+    "diffie-hellman-5.0.2" = {
+      name = "diffie-hellman";
+      packageName = "diffie-hellman";
+      version = "5.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
+        sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
+      };
+    };
+    "dom-serializer-0.1.0" = {
+      name = "dom-serializer";
+      packageName = "dom-serializer";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      };
+    };
+    "domain-browser-1.2.0" = {
+      name = "domain-browser";
+      packageName = "domain-browser";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
+        sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f";
+      };
+    };
+    "domelementtype-1.1.3" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+      };
+    };
+    "domelementtype-1.3.0" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
       };
     };
     "domhandler-2.3.0" = {
@@ -2560,22 +805,31 @@ let
         sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
       };
     };
-    "domelementtype-1.3.0" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.3.0";
+    "duplexer2-0.1.4" = {
+      name = "duplexer2";
+      packageName = "duplexer2";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
-        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz";
+        sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
       };
     };
-    "readable-stream-1.1.14" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.1.14";
+    "ecc-jsbn-0.1.1" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
-        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+      };
+    };
+    "elliptic-6.4.0" = {
+      name = "elliptic";
+      packageName = "elliptic";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz";
+        sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
     "entities-1.0.0" = {
@@ -2587,24 +841,6 @@ let
         sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
       };
     };
-    "dom-serializer-0.1.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
-      };
-    };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
     "entities-1.1.1" = {
       name = "entities";
       packageName = "entities";
@@ -2614,13 +850,1147 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "interpret-1.0.2" = {
-      name = "interpret";
-      packageName = "interpret";
+    "errno-0.1.7" = {
+      name = "errno";
+      packageName = "errno";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "events-2.0.0" = {
+      name = "events";
+      packageName = "events";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz";
+        sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg";
+      };
+    };
+    "evp_bytestokey-1.0.3" = {
+      name = "evp_bytestokey";
+      packageName = "evp_bytestokey";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
+        sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx";
+      };
+    };
+    "exit-0.1.2" = {
+      name = "exit";
+      packageName = "exit";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+      };
+    };
+    "extend-3.0.1" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
+        sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "forever-agent-0.5.2" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-0.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+      };
+    };
+    "form-data-2.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "function-bind-1.1.1" = {
+      name = "function-bind";
+      packageName = "function-bind";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-7.1.2" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+      };
+    };
+    "graceful-fs-4.1.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      };
+    };
+    "growl-1.10.3" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz";
+        sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
+      };
+    };
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "has-1.0.1" = {
+      name = "has";
+      packageName = "has";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz";
+        sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28";
+      };
+    };
+    "has-flag-2.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
+        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
+      };
+    };
+    "has-flag-3.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+      };
+    };
+    "hash-base-2.0.2" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz";
+        sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1";
+      };
+    };
+    "hash-base-3.0.4" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+      };
+    };
+    "hash.js-1.1.3" = {
+      name = "hash.js";
+      packageName = "hash.js";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
+        sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx";
+      };
+    };
+    "hawk-1.0.0" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
+    "he-1.1.1" = {
+      name = "he";
+      packageName = "he";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz";
+        sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
+      };
+    };
+    "hmac-drbg-1.0.1" = {
+      name = "hmac-drbg";
+      packageName = "hmac-drbg";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+        sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
+      };
+    };
+    "hoek-0.9.1" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "0.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+    };
+    "htmlescape-1.1.1" = {
+      name = "htmlescape";
+      packageName = "htmlescape";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz";
+        sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
+      };
+    };
+    "htmlparser2-3.8.3" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
+        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
+      };
+    };
+    "http-signature-0.10.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+      };
+    };
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+      };
+    };
+    "https-browserify-1.0.0" = {
+      name = "https-browserify";
+      packageName = "https-browserify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz";
+        sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
+      };
+    };
+    "ieee754-1.1.8" = {
+      name = "ieee754";
+      packageName = "ieee754";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
+        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
+      };
+    };
+    "image-size-0.5.5" = {
+      name = "image-size";
+      packageName = "image-size";
+      version = "0.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz";
+        sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c";
+      };
+    };
+    "indexof-0.0.1" = {
+      name = "indexof";
+      packageName = "indexof";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-1.0.2" = {
+      name = "inherits";
+      packageName = "inherits";
       version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz";
-        sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d";
+        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
+        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
+      };
+    };
+    "inherits-2.0.1" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "ini-1.1.0" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+        sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+      };
+    };
+    "ini-1.3.5" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
+      };
+    };
+    "inline-source-map-0.6.2" = {
+      name = "inline-source-map";
+      packageName = "inline-source-map";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz";
+        sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
+      };
+    };
+    "insert-module-globals-7.0.2" = {
+      name = "insert-module-globals";
+      packageName = "insert-module-globals";
+      version = "7.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz";
+        sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7";
+      };
+    };
+    "interpret-1.1.0" = {
+      name = "interpret";
+      packageName = "interpret";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz";
+        sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614";
+      };
+    };
+    "is-buffer-1.1.6" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
+      };
+    };
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-stable-stringify-0.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
+        sha1 = "611c23e814db375527df851193db59dd2af27f45";
+      };
+    };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "jsonify-0.0.0" = {
+      name = "jsonify";
+      packageName = "jsonify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      };
+    };
+    "jsonparse-1.3.1" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
+        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
+      };
+    };
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    };
+    "just-extend-1.1.27" = {
+      name = "just-extend";
+      packageName = "just-extend";
+      version = "1.1.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz";
+        sha512 = "3x01f92pvzs341qv1cin9mb3yiimkzjpy0f4dms78ki26ba01kjqcjpcm85sw005lc8d5dkk9wsigwh7zawnh10vml03siifbbnk5cq";
+      };
+    };
+    "kew-0.1.7" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
+        sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
+      };
+    };
+    "labeled-stream-splicer-2.0.0" = {
+      name = "labeled-stream-splicer";
+      packageName = "labeled-stream-splicer";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz";
+        sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
+      };
+    };
+    "lexical-scope-1.2.0" = {
+      name = "lexical-scope";
+      packageName = "lexical-scope";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz";
+        sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
+      };
+    };
+    "lodash-3.7.0" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
+        sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
+      };
+    };
+    "lodash.get-4.4.2" = {
+      name = "lodash.get";
+      packageName = "lodash.get";
+      version = "4.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    };
+    "lodash.memoize-3.0.4" = {
+      name = "lodash.memoize";
+      packageName = "lodash.memoize";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz";
+        sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
+      };
+    };
+    "lolex-2.3.2" = {
+      name = "lolex";
+      packageName = "lolex";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz";
+        sha512 = "2g7dp64fm1kp17mxgz5r8hlgd65k8wfxz8jwcgqskdxn7vsnm6vj1bylcqblyzl6879p3g7qcjqqwmw0nik6032fksb33q5v7d4v6h3";
+      };
+    };
+    "md5.js-1.3.4" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+      };
+    };
+    "miller-rabin-4.0.1" = {
+      name = "miller-rabin";
+      packageName = "miller-rabin";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
+        sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp";
+      };
+    };
+    "mime-1.2.11" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      };
+    };
+    "mime-1.6.0" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
+        sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
+      };
+    };
+    "mime-db-1.33.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.33.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
+        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+      };
+    };
+    "mime-types-2.1.18" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
+        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+      };
+    };
+    "minimalistic-assert-1.0.0" = {
+      name = "minimalistic-assert";
+      packageName = "minimalistic-assert";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
+        sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+      };
+    };
+    "minimalistic-crypto-utils-1.0.1" = {
+      name = "minimalistic-crypto-utils";
+      packageName = "minimalistic-crypto-utils";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
+        sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    };
+    "mkdirp-0.3.5" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "mocha-phantomjs-core-1.3.1" = {
+      name = "mocha-phantomjs-core";
+      packageName = "mocha-phantomjs-core";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz";
+        sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
+      };
+    };
+    "module-deps-6.0.0" = {
+      name = "module-deps";
+      packageName = "module-deps";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz";
+        sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "ncp-0.4.2" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+      };
+    };
+    "nise-1.3.0" = {
+      name = "nise";
+      packageName = "nise";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nise/-/nise-1.3.0.tgz";
+        sha512 = "20b9q52bz8ncm5jqjfhrhrcr2rb0y8jhb867ayrkdsf78y1c186qra112a6sj6lbnkab0dx0i1cnr2hz4l4dzzkn1l8khvc71vspqjk";
+      };
+    };
+    "node-uuid-1.4.8" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
+      };
+    };
+    "nopt-2.2.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+      };
+    };
+    "npmconf-0.0.24" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "0.0.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz";
+        sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c";
+      };
+    };
+    "oauth-sign-0.3.0" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      };
+    };
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "once-1.1.1" = {
+      name = "once";
+      packageName = "once";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz";
+        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "os-browserify-0.3.0" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz";
+        sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
+      };
+    };
+    "osenv-0.0.3" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+      };
+    };
+    "pako-1.0.6" = {
+      name = "pako";
+      packageName = "pako";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz";
+        sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm";
+      };
+    };
+    "parents-1.0.1" = {
+      name = "parents";
+      packageName = "parents";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz";
+        sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
+      };
+    };
+    "parse-asn1-5.1.0" = {
+      name = "parse-asn1";
+      packageName = "parse-asn1";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
+        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
+      };
+    };
+    "path-browserify-0.0.0" = {
+      name = "path-browserify";
+      packageName = "path-browserify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
+        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "path-parse-1.0.5" = {
+      name = "path-parse";
+      packageName = "path-parse";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
+        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
+      };
+    };
+    "path-platform-0.11.15" = {
+      name = "path-platform";
+      packageName = "path-platform";
+      version = "0.11.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz";
+        sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2";
+      };
+    };
+    "path-to-regexp-1.7.0" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
+        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+      };
+    };
+    "pbkdf2-3.0.14" = {
+      name = "pbkdf2";
+      packageName = "pbkdf2";
+      version = "3.0.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz";
+        sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2";
+      };
+    };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
+    "phantomjs-1.9.7-15" = {
+      name = "phantomjs";
+      packageName = "phantomjs";
+      version = "1.9.7-15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz";
+        sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
+      };
+    };
+    "process-0.11.10" = {
+      name = "process";
+      packageName = "process";
+      version = "0.11.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz";
+        sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+      };
+    };
+    "process-nextick-args-1.0.7" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
+        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
+      };
+    };
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j";
+      };
+    };
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+      };
+    };
+    "promise-7.3.1" = {
+      name = "promise";
+      packageName = "promise";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
+      };
+    };
+    "proto-list-1.2.4" = {
+      name = "proto-list";
+      packageName = "proto-list";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
+        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
+      };
+    };
+    "prr-1.0.1" = {
+      name = "prr";
+      packageName = "prr";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz";
+        sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+      };
+    };
+    "public-encrypt-4.0.0" = {
+      name = "public-encrypt";
+      packageName = "public-encrypt";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz";
+        sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
+      };
+    };
+    "punycode-1.3.2" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
+        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qs-0.6.6" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      };
+    };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+      };
+    };
+    "querystring-0.2.0" = {
+      name = "querystring";
+      packageName = "querystring";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz";
+        sha1 = "b209849203bb25df820da756e747005878521620";
+      };
+    };
+    "querystring-es3-0.2.1" = {
+      name = "querystring-es3";
+      packageName = "querystring-es3";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
+        sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+      };
+    };
+    "randombytes-2.0.6" = {
+      name = "randombytes";
+      packageName = "randombytes";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
+        sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108";
+      };
+    };
+    "randomfill-1.0.4" = {
+      name = "randomfill";
+      packageName = "randomfill";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
+        sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk";
+      };
+    };
+    "read-only-stream-2.0.0" = {
+      name = "read-only-stream";
+      packageName = "read-only-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz";
+        sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
+      };
+    };
+    "readable-stream-1.1.14" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+      };
+    };
+    "readable-stream-2.0.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+      };
+    };
+    "readable-stream-2.3.5" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz";
+        sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl";
       };
     };
     "rechoir-0.6.2" = {
@@ -2632,347 +2002,722 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
+    "request-2.36.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.36.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz";
+        sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
+      };
+    };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "request-progress-0.3.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
+        sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
+      };
+    };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
+    "resolve-1.5.0" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz";
+        sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6";
+      };
+    };
+    "rimraf-2.2.8" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+    };
+    "ripemd160-2.0.1" = {
+      name = "ripemd160";
+      packageName = "ripemd160";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz";
+        sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
+      };
+    };
+    "safe-buffer-5.1.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+      };
+    };
+    "samsam-1.3.0" = {
+      name = "samsam";
+      packageName = "samsam";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz";
+        sha512 = "1p5ac86nbwsyxsaqbfa288xk904a0lfc8fph9h2nflvgmz5ilwyprs12lb6as5n6k8q24y541sr4bvv7dy3pl1d2nnm6lpw7xh0hz6l";
+      };
+    };
+    "semver-1.1.4" = {
+      name = "semver";
+      packageName = "semver";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+        sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+      };
+    };
+    "sha.js-2.4.10" = {
+      name = "sha.js";
+      packageName = "sha.js";
+      version = "2.4.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz";
+        sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y";
+      };
+    };
+    "shasum-1.0.2" = {
+      name = "shasum";
+      packageName = "shasum";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
+        sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
+      };
+    };
+    "shell-quote-1.6.1" = {
+      name = "shell-quote";
+      packageName = "shell-quote";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz";
+        sha1 = "f4781949cce402697127430ea3b3c5476f481767";
+      };
+    };
+    "shelljs-0.3.0" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+      };
+    };
+    "should-equal-2.0.0" = {
+      name = "should-equal";
+      packageName = "should-equal";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz";
+        sha512 = "16cp397231rnlk9vc4i8jggycqwxpgrn3pm9l2bf5y02ln4gawz41z2ycqnw9h1rkm7x8zf5qy5d7jv7ll0c634p62fpxfar96gmzb4";
+      };
+    };
+    "should-format-3.0.3" = {
+      name = "should-format";
+      packageName = "should-format";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz";
+        sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1";
+      };
+    };
+    "should-type-1.4.0" = {
+      name = "should-type";
+      packageName = "should-type";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz";
+        sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3";
+      };
+    };
+    "should-type-adaptors-1.1.0" = {
+      name = "should-type-adaptors";
+      packageName = "should-type-adaptors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz";
+        sha512 = "1y2b2dwphk185za2spffsr383na1pdjl2bf8lwv6yzaix1q9px92brp5i0m670kz5lb9kdlxkp61vq53v7mcxjadhgfjdz7h9v223i4";
+      };
+    };
+    "should-util-1.0.0" = {
+      name = "should-util";
+      packageName = "should-util";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz";
+        sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063";
+      };
+    };
+    "sntp-0.2.4" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+      };
+    };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
+      };
+    };
+    "sshpk-1.14.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
+      };
+    };
+    "stream-browserify-2.0.1" = {
+      name = "stream-browserify";
+      packageName = "stream-browserify";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
+        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+      };
+    };
+    "stream-combiner2-1.1.1" = {
+      name = "stream-combiner2";
+      packageName = "stream-combiner2";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
+        sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
+      };
+    };
+    "stream-http-2.8.0" = {
+      name = "stream-http";
+      packageName = "stream-http";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz";
+        sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi";
+      };
+    };
+    "stream-splicer-2.0.0" = {
+      name = "stream-splicer";
+      packageName = "stream-splicer";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz";
+        sha1 = "1b63be438a133e4b671cc1935197600175910d83";
+      };
+    };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
+    "string_decoder-1.0.3" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
+        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
+      };
+    };
+    "stringstream-0.0.5" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+      };
+    };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
+    "subarg-1.0.0" = {
+      name = "subarg";
+      packageName = "subarg";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
+        sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
+      };
+    };
+    "supports-color-4.4.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
+        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
+      };
+    };
+    "supports-color-5.3.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
+        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
+      };
+    };
+    "syntax-error-1.4.0" = {
+      name = "syntax-error";
+      packageName = "syntax-error";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz";
+        sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0";
+      };
+    };
+    "text-encoding-0.6.4" = {
+      name = "text-encoding";
+      packageName = "text-encoding";
+      version = "0.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz";
+        sha1 = "e399a982257a276dae428bb92845cb71bdc26d19";
+      };
+    };
+    "throttleit-0.0.2" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
+        sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
+    "through2-2.0.3" = {
+      name = "through2";
+      packageName = "through2";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
+      };
+    };
+    "timers-browserify-1.4.2" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz";
+        sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
+      };
+    };
+    "to-arraybuffer-1.0.1" = {
+      name = "to-arraybuffer";
+      packageName = "to-arraybuffer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+        sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+      };
+    };
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+      };
+    };
+    "tty-browserify-0.0.1" = {
+      name = "tty-browserify";
+      packageName = "tty-browserify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz";
+        sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b";
+      };
+    };
+    "tunnel-agent-0.4.3" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "type-detect-4.0.8" = {
+      name = "type-detect";
+      packageName = "type-detect";
+      version = "4.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz";
+        sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni";
+      };
+    };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
+    "umd-3.0.2" = {
+      name = "umd";
+      packageName = "umd";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz";
+        sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6";
+      };
+    };
+    "url-0.11.0" = {
+      name = "url";
+      packageName = "url";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz";
+        sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
+      };
+    };
+    "util-0.10.3" = {
+      name = "util";
+      packageName = "util";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "uuid-3.2.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
+        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "vm-browserify-0.0.4" = {
+      name = "vm-browserify";
+      packageName = "vm-browserify";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
+        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
+      };
+    };
+    "which-1.0.9" = {
+      name = "which";
+      packageName = "which";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
+        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "xtend-4.0.1" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+    };
   };
 in
 {
   marked = nodeEnv.buildNodePackage {
     name = "marked";
     packageName = "marked";
-    version = "0.3.6";
+    version = "0.3.17";
     src = fetchurl {
-      url = "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz";
-      sha1 = "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7";
+      url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz";
+      sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "A markdown parser built for speed";
-      homepage = https://github.com/chjj/marked;
+      homepage = https://github.com/markedjs/marked;
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.1.0";
+    version = "16.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz";
-      sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz";
+      sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9";
     };
     dependencies = [
-      (sources."JSONStream-1.3.1" // {
-        dependencies = [
-          sources."jsonparse-1.3.0"
-          sources."through-2.3.8"
-        ];
-      })
+      sources."JSONStream-1.3.2"
+      sources."acorn-4.0.13"
+      sources."acorn-node-1.3.0"
+      sources."array-filter-0.0.1"
+      sources."array-map-0.0.0"
+      sources."array-reduce-0.0.0"
+      sources."asn1.js-4.10.1"
       sources."assert-1.4.1"
-      (sources."browser-pack-6.0.2" // {
-        dependencies = [
-          (sources."combine-source-map-0.7.2" // {
-            dependencies = [
-              sources."convert-source-map-1.1.3"
-              sources."inline-source-map-0.6.2"
-              sources."lodash.memoize-3.0.4"
-              sources."source-map-0.5.6"
-            ];
-          })
-          sources."umd-3.0.1"
-        ];
-      })
+      sources."astw-2.2.0"
+      sources."balanced-match-1.0.0"
+      sources."base64-js-1.2.3"
+      sources."bn.js-4.11.8"
+      sources."brace-expansion-1.1.11"
+      sources."brorand-1.1.0"
+      sources."browser-pack-6.0.4"
       (sources."browser-resolve-1.11.2" // {
         dependencies = [
           sources."resolve-1.1.7"
         ];
       })
-      (sources."browserify-zlib-0.1.4" // {
-        dependencies = [
-          sources."pako-0.2.9"
-        ];
-      })
-      (sources."buffer-5.0.5" // {
-        dependencies = [
-          sources."base64-js-1.2.0"
-          sources."ieee754-1.1.8"
-        ];
-      })
+      sources."browserify-aes-1.1.1"
+      sources."browserify-cipher-1.0.0"
+      sources."browserify-des-1.0.0"
+      sources."browserify-rsa-4.0.1"
+      sources."browserify-sign-4.0.4"
+      sources."browserify-zlib-0.2.0"
+      sources."buffer-5.1.0"
+      sources."buffer-xor-1.0.3"
+      sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."typedarray-0.0.6"
-          (sources."readable-stream-2.0.6" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
-              sources."process-nextick-args-1.0.7"
-              sources."util-deprecate-1.0.2"
-            ];
-          })
-        ];
-      })
-      (sources."console-browserify-1.1.0" // {
-        dependencies = [
-          sources."date-now-0.1.4"
-        ];
-      })
+      sources."cipher-base-1.0.4"
+      sources."combine-source-map-0.8.0"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.1"
+      sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      (sources."crypto-browserify-3.11.0" // {
+      sources."convert-source-map-1.1.3"
+      sources."core-util-is-1.0.2"
+      sources."create-ecdh-4.0.0"
+      sources."create-hash-1.1.3"
+      sources."create-hmac-1.1.6"
+      (sources."crypto-browserify-3.12.0" // {
         dependencies = [
-          (sources."browserify-cipher-1.0.0" // {
-            dependencies = [
-              (sources."browserify-aes-1.0.6" // {
-                dependencies = [
-                  sources."buffer-xor-1.0.3"
-                  sources."cipher-base-1.0.3"
-                ];
-              })
-              (sources."browserify-des-1.0.0" // {
-                dependencies = [
-                  sources."cipher-base-1.0.3"
-                  (sources."des.js-1.0.0" // {
-                    dependencies = [
-                      sources."minimalistic-assert-1.0.0"
-                    ];
-                  })
-                ];
-              })
-              sources."evp_bytestokey-1.0.0"
-            ];
-          })
-          (sources."browserify-sign-4.0.4" // {
-            dependencies = [
-              sources."bn.js-4.11.6"
-              sources."browserify-rsa-4.0.1"
-              (sources."elliptic-6.4.0" // {
-                dependencies = [
-                  sources."brorand-1.1.0"
-                  sources."hash.js-1.0.3"
-                  sources."hmac-drbg-1.0.0"
-                  sources."minimalistic-assert-1.0.0"
-                  sources."minimalistic-crypto-utils-1.0.1"
-                ];
-              })
-              (sources."parse-asn1-5.1.0" // {
-                dependencies = [
-                  (sources."asn1.js-4.9.1" // {
-                    dependencies = [
-                      sources."minimalistic-assert-1.0.0"
-                    ];
-                  })
-                  (sources."browserify-aes-1.0.6" // {
-                    dependencies = [
-                      sources."buffer-xor-1.0.3"
-                      sources."cipher-base-1.0.3"
-                    ];
-                  })
-                  sources."evp_bytestokey-1.0.0"
-                ];
-              })
-            ];
-          })
-          (sources."create-ecdh-4.0.0" // {
-            dependencies = [
-              sources."bn.js-4.11.6"
-              (sources."elliptic-6.4.0" // {
-                dependencies = [
-                  sources."brorand-1.1.0"
-                  sources."hash.js-1.0.3"
-                  sources."hmac-drbg-1.0.0"
-                  sources."minimalistic-assert-1.0.0"
-                  sources."minimalistic-crypto-utils-1.0.1"
-                ];
-              })
-            ];
-          })
-          (sources."create-hash-1.1.2" // {
-            dependencies = [
-              sources."cipher-base-1.0.3"
-              sources."ripemd160-1.0.1"
-              sources."sha.js-2.4.8"
-            ];
-          })
-          sources."create-hmac-1.1.4"
-          (sources."diffie-hellman-5.0.2" // {
-            dependencies = [
-              sources."bn.js-4.11.6"
-              (sources."miller-rabin-4.0.0" // {
-                dependencies = [
-                  sources."brorand-1.1.0"
-                ];
-              })
-            ];
-          })
-          sources."pbkdf2-3.0.9"
-          (sources."public-encrypt-4.0.0" // {
-            dependencies = [
-              sources."bn.js-4.11.6"
-              sources."browserify-rsa-4.0.1"
-              (sources."parse-asn1-5.1.0" // {
-                dependencies = [
-                  (sources."asn1.js-4.9.1" // {
-                    dependencies = [
-                      sources."minimalistic-assert-1.0.0"
-                    ];
-                  })
-                  (sources."browserify-aes-1.0.6" // {
-                    dependencies = [
-                      sources."buffer-xor-1.0.3"
-                      sources."cipher-base-1.0.3"
-                    ];
-                  })
-                  sources."evp_bytestokey-1.0.0"
-                ];
-              })
-            ];
-          })
-          sources."randombytes-2.0.3"
+          sources."hash-base-2.0.2"
         ];
       })
+      sources."date-now-0.1.4"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
-      sources."domain-browser-1.1.7"
+      sources."des.js-1.0.0"
+      sources."detective-5.1.0"
+      sources."diffie-hellman-5.0.2"
+      sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      sources."events-1.1.1"
-      (sources."glob-7.1.1" // {
-        dependencies = [
-          sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.6" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          (sources."minimatch-3.0.3" // {
-            dependencies = [
-              (sources."brace-expansion-1.1.6" // {
-                dependencies = [
-                  sources."balanced-match-0.4.2"
-                  sources."concat-map-0.0.1"
-                ];
-              })
-            ];
-          })
-          (sources."once-1.4.0" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          sources."path-is-absolute-1.0.1"
-        ];
-      })
-      (sources."has-1.0.1" // {
-        dependencies = [
-          sources."function-bind-1.1.0"
-        ];
-      })
+      sources."elliptic-6.4.0"
+      sources."events-2.0.0"
+      sources."evp_bytestokey-1.0.3"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."glob-7.1.2"
+      sources."has-1.0.1"
+      sources."hash-base-3.0.4"
+      sources."hash.js-1.1.3"
+      sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
-      sources."https-browserify-0.0.1"
+      sources."https-browserify-1.0.0"
+      sources."ieee754-1.1.8"
+      sources."indexof-0.0.1"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      (sources."insert-module-globals-7.0.1" // {
+      sources."inline-source-map-0.6.2"
+      (sources."insert-module-globals-7.0.2" // {
         dependencies = [
-          (sources."combine-source-map-0.7.2" // {
-            dependencies = [
-              sources."convert-source-map-1.1.3"
-              sources."inline-source-map-0.6.2"
-              sources."lodash.memoize-3.0.4"
-              sources."source-map-0.5.6"
-            ];
-          })
-          sources."is-buffer-1.1.5"
-          (sources."lexical-scope-1.2.0" // {
-            dependencies = [
-              (sources."astw-2.2.0" // {
-                dependencies = [
-                  sources."acorn-4.0.11"
-                ];
-              })
-            ];
-          })
+          sources."combine-source-map-0.7.2"
+          sources."concat-stream-1.5.2"
+          sources."readable-stream-2.0.6"
+          sources."string_decoder-0.10.31"
         ];
       })
+      sources."is-buffer-1.1.6"
+      sources."isarray-1.0.0"
+      sources."json-stable-stringify-0.0.1"
+      sources."jsonify-0.0.0"
+      sources."jsonparse-1.3.1"
       (sources."labeled-stream-splicer-2.0.0" // {
         dependencies = [
           sources."isarray-0.0.1"
-          sources."stream-splicer-2.0.0"
         ];
       })
-      (sources."module-deps-4.1.1" // {
+      sources."lexical-scope-1.2.0"
+      sources."lodash.memoize-3.0.4"
+      sources."md5.js-1.3.4"
+      sources."miller-rabin-4.0.1"
+      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-crypto-utils-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      (sources."module-deps-6.0.0" // {
         dependencies = [
-          (sources."detective-4.5.0" // {
-            dependencies = [
-              sources."acorn-4.0.11"
-            ];
-          })
-          sources."stream-combiner2-1.1.1"
-        ];
-      })
-      sources."os-browserify-0.1.2"
-      (sources."parents-1.0.1" // {
-        dependencies = [
-          sources."path-platform-0.11.15"
+          sources."acorn-5.5.3"
+          sources."minimist-1.2.0"
         ];
       })
+      sources."once-1.4.0"
+      sources."os-browserify-0.3.0"
+      sources."pako-1.0.6"
+      sources."parents-1.0.1"
+      sources."parse-asn1-5.1.0"
       sources."path-browserify-0.0.0"
-      sources."process-0.11.9"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.5"
+      sources."path-platform-0.11.15"
+      sources."pbkdf2-3.0.14"
+      sources."process-0.11.10"
+      sources."process-nextick-args-1.0.7"
+      sources."public-encrypt-4.0.0"
       sources."punycode-1.4.1"
+      sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
+      sources."randombytes-2.0.6"
+      sources."randomfill-1.0.4"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.6" // {
+      (sources."readable-stream-2.3.5" // {
         dependencies = [
-          sources."buffer-shims-1.0.0"
-          sources."core-util-is-1.0.2"
-          sources."isarray-1.0.0"
-          sources."process-nextick-args-1.0.7"
-          sources."util-deprecate-1.0.2"
-        ];
-      })
-      (sources."resolve-1.3.2" // {
-        dependencies = [
-          sources."path-parse-1.0.5"
-        ];
-      })
-      (sources."shasum-1.0.2" // {
-        dependencies = [
-          (sources."json-stable-stringify-0.0.1" // {
-            dependencies = [
-              sources."jsonify-0.0.0"
-            ];
-          })
-          sources."sha.js-2.4.8"
-        ];
-      })
-      (sources."shell-quote-1.6.1" // {
-        dependencies = [
-          sources."jsonify-0.0.0"
-          sources."array-filter-0.0.1"
-          sources."array-reduce-0.0.0"
-          sources."array-map-0.0.0"
+          sources."process-nextick-args-2.0.0"
         ];
       })
+      sources."resolve-1.5.0"
+      sources."ripemd160-2.0.1"
+      sources."safe-buffer-5.1.1"
+      sources."sha.js-2.4.10"
+      sources."shasum-1.0.2"
+      sources."shell-quote-1.6.1"
+      sources."source-map-0.5.7"
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.6.3" // {
-        dependencies = [
-          sources."builtin-status-codes-3.0.0"
-          sources."to-arraybuffer-1.0.1"
-        ];
-      })
-      sources."string_decoder-0.10.31"
+      sources."stream-combiner2-1.1.1"
+      sources."stream-http-2.8.0"
+      sources."stream-splicer-2.0.0"
+      sources."string_decoder-1.0.3"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
-      (sources."syntax-error-1.3.0" // {
-        dependencies = [
-          sources."acorn-4.0.11"
-        ];
-      })
+      sources."syntax-error-1.4.0"
+      sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
-      sources."tty-browserify-0.0.0"
+      sources."to-arraybuffer-1.0.1"
+      sources."tty-browserify-0.0.1"
+      sources."typedarray-0.0.6"
+      sources."umd-3.0.2"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
-          sources."querystring-0.2.0"
         ];
       })
       (sources."util-0.10.3" // {
@@ -2980,75 +2725,31 @@ in
           sources."inherits-2.0.1"
         ];
       })
-      (sources."vm-browserify-0.0.4" // {
-        dependencies = [
-          sources."indexof-0.0.1"
-        ];
-      })
+      sources."util-deprecate-1.0.2"
+      sources."vm-browserify-0.0.4"
+      sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "browser-side require() the node way";
-      homepage = "https://github.com/substack/node-browserify#readme";
+      homepage = "https://github.com/browserify/browserify#readme";
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.8.20";
+    version = "3.3.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz";
-      sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz";
+      sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr";
     };
     dependencies = [
-      sources."source-map-0.5.6"
-      (sources."yargs-3.10.0" // {
-        dependencies = [
-          sources."camelcase-1.2.1"
-          (sources."cliui-2.1.0" // {
-            dependencies = [
-              (sources."center-align-0.1.3" // {
-                dependencies = [
-                  (sources."align-text-0.1.4" // {
-                    dependencies = [
-                      (sources."kind-of-3.1.0" // {
-                        dependencies = [
-                          sources."is-buffer-1.1.5"
-                        ];
-                      })
-                      sources."longest-1.0.1"
-                      sources."repeat-string-1.6.1"
-                    ];
-                  })
-                  sources."lazy-cache-1.0.4"
-                ];
-              })
-              (sources."right-align-0.1.3" // {
-                dependencies = [
-                  (sources."align-text-0.1.4" // {
-                    dependencies = [
-                      (sources."kind-of-3.1.0" // {
-                        dependencies = [
-                          sources."is-buffer-1.1.5"
-                        ];
-                      })
-                      sources."longest-1.0.1"
-                      sources."repeat-string-1.6.1"
-                    ];
-                  })
-                ];
-              })
-              sources."wordwrap-0.0.2"
-            ];
-          })
-          sources."decamelize-1.2.0"
-          sources."window-size-0.1.0"
-        ];
-      })
-      sources."uglify-to-browserify-1.0.2"
+      sources."commander-2.14.1"
+      sources."source-map-0.6.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3057,123 +2758,85 @@ in
       license = "BSD-2-Clause";
     };
     production = true;
+    bypassCache = false;
   };
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "2.7.2";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz";
-      sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df";
+      url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz";
+      sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59";
     };
     dependencies = [
-      (sources."errno-0.1.4" // {
-        dependencies = [
-          sources."prr-0.0.0"
-        ];
-      })
+      sources."ajv-4.11.8"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.3"
+      sources."assert-plus-0.2.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."boom-2.10.1"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      sources."cryptiles-2.0.5"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.1"
+      sources."errno-0.1.7"
+      sources."extend-3.0.1"
+      sources."extsprintf-1.3.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
-      sources."image-size-0.5.1"
-      sources."mime-1.3.4"
-      (sources."mkdirp-0.5.1" // {
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."http-signature-1.1.1"
+      sources."image-size-0.5.5"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-stable-stringify-1.0.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."assert-plus-1.0.0"
         ];
       })
-      (sources."promise-7.1.1" // {
+      sources."mime-1.6.0"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."promise-7.3.1"
+      sources."prr-1.0.1"
+      sources."punycode-1.4.1"
+      sources."qs-6.4.0"
+      sources."request-2.81.0"
+      sources."safe-buffer-5.1.1"
+      sources."sntp-1.0.9"
+      sources."source-map-0.5.7"
+      (sources."sshpk-1.14.1" // {
         dependencies = [
-          sources."asap-2.0.5"
-        ];
-      })
-      sources."source-map-0.5.6"
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."aws-sign2-0.6.0"
-          sources."aws4-1.6.0"
-          sources."caseless-0.12.0"
-          (sources."combined-stream-1.0.5" // {
-            dependencies = [
-              sources."delayed-stream-1.0.0"
-            ];
-          })
-          sources."extend-3.0.0"
-          sources."forever-agent-0.6.1"
-          (sources."form-data-2.1.2" // {
-            dependencies = [
-              sources."asynckit-0.4.0"
-            ];
-          })
-          (sources."har-validator-4.2.1" // {
-            dependencies = [
-              (sources."ajv-4.11.5" // {
-                dependencies = [
-                  sources."co-4.6.0"
-                  (sources."json-stable-stringify-1.0.1" // {
-                    dependencies = [
-                      sources."jsonify-0.0.0"
-                    ];
-                  })
-                ];
-              })
-              sources."har-schema-1.0.5"
-            ];
-          })
-          (sources."hawk-3.1.3" // {
-            dependencies = [
-              sources."hoek-2.16.3"
-              sources."boom-2.10.1"
-              sources."cryptiles-2.0.5"
-              sources."sntp-1.0.9"
-            ];
-          })
-          (sources."http-signature-1.1.1" // {
-            dependencies = [
-              sources."assert-plus-0.2.0"
-              (sources."jsprim-1.4.0" // {
-                dependencies = [
-                  sources."assert-plus-1.0.0"
-                  sources."extsprintf-1.0.2"
-                  sources."json-schema-0.2.3"
-                  sources."verror-1.3.6"
-                ];
-              })
-              (sources."sshpk-1.11.0" // {
-                dependencies = [
-                  sources."asn1-0.2.3"
-                  sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
-                  sources."getpass-0.1.6"
-                  sources."jsbn-0.1.1"
-                  sources."tweetnacl-0.14.5"
-                  sources."jodid25519-1.0.2"
-                  sources."ecc-jsbn-0.1.1"
-                  sources."bcrypt-pbkdf-1.0.1"
-                ];
-              })
-            ];
-          })
-          sources."is-typedarray-1.0.0"
-          sources."isstream-0.1.2"
-          sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.15" // {
-            dependencies = [
-              sources."mime-db-1.27.0"
-            ];
-          })
-          sources."oauth-sign-0.8.2"
-          sources."performance-now-0.2.0"
-          sources."qs-6.4.0"
-          sources."safe-buffer-5.0.1"
-          sources."stringstream-0.0.5"
-          (sources."tough-cookie-2.3.2" // {
-            dependencies = [
-              sources."punycode-1.4.1"
-            ];
-          })
-          sources."tunnel-agent-0.6.0"
-          sources."uuid-3.0.1"
+          sources."assert-plus-1.0.0"
         ];
       })
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uuid-3.2.1"
+      sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3182,86 +2845,40 @@ in
       license = "Apache-2.0";
     };
     production = true;
+    bypassCache = false;
   };
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "3.2.0";
+    version = "5.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz";
-      sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz";
+      sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww";
     };
     dependencies = [
-      sources."browser-stdout-1.3.0"
-      (sources."commander-2.9.0" // {
-        dependencies = [
-          sources."graceful-readlink-1.0.1"
-        ];
-      })
-      (sources."debug-2.2.0" // {
-        dependencies = [
-          sources."ms-0.7.1"
-        ];
-      })
-      sources."diff-1.4.0"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."browser-stdout-1.3.1"
+      sources."commander-2.11.0"
+      sources."concat-map-0.0.1"
+      sources."debug-3.1.0"
+      sources."diff-3.5.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."glob-7.0.5" // {
-        dependencies = [
-          sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.6" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          sources."inherits-2.0.3"
-          (sources."minimatch-3.0.3" // {
-            dependencies = [
-              (sources."brace-expansion-1.1.6" // {
-                dependencies = [
-                  sources."balanced-match-0.4.2"
-                  sources."concat-map-0.0.1"
-                ];
-              })
-            ];
-          })
-          (sources."once-1.4.0" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          sources."path-is-absolute-1.0.1"
-        ];
-      })
-      sources."growl-1.9.2"
-      sources."json3-3.3.2"
-      (sources."lodash.create-3.1.1" // {
-        dependencies = [
-          (sources."lodash._baseassign-3.2.0" // {
-            dependencies = [
-              sources."lodash._basecopy-3.0.1"
-              (sources."lodash.keys-3.1.2" // {
-                dependencies = [
-                  sources."lodash._getnative-3.9.1"
-                  sources."lodash.isarguments-3.1.0"
-                  sources."lodash.isarray-3.0.4"
-                ];
-              })
-            ];
-          })
-          sources."lodash._basecreate-3.0.3"
-          sources."lodash._isiterateecall-3.0.9"
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      (sources."supports-color-3.1.2" // {
-        dependencies = [
-          sources."has-flag-1.0.0"
-        ];
-      })
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."growl-1.10.3"
+      sources."has-flag-2.0.0"
+      sources."he-1.1.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."supports-color-4.4.0"
+      sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3270,6 +2887,7 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   mocha-phantomjs = nodeEnv.buildNodePackage {
     name = "mocha-phantomjs";
@@ -3280,90 +2898,56 @@ in
       sha1 = "c75e16612e1a6af0ad8d281e3a2fef49d55e505b";
     };
     dependencies = [
-      (sources."phantomjs-1.9.7-15" // {
+      sources."abbrev-1.1.1"
+      sources."adm-zip-0.2.1"
+      sources."asn1-0.1.11"
+      sources."assert-plus-0.1.5"
+      sources."async-0.9.2"
+      sources."aws-sign2-0.5.0"
+      sources."boom-0.4.2"
+      sources."combined-stream-0.0.7"
+      sources."commander-2.15.0"
+      (sources."config-chain-1.1.11" // {
         dependencies = [
-          sources."adm-zip-0.2.1"
-          sources."kew-0.1.7"
-          sources."ncp-0.4.2"
-          (sources."npmconf-0.0.24" // {
-            dependencies = [
-              (sources."config-chain-1.1.11" // {
-                dependencies = [
-                  sources."proto-list-1.2.4"
-                  sources."ini-1.3.4"
-                ];
-              })
-              sources."inherits-1.0.2"
-              sources."once-1.1.1"
-              sources."osenv-0.0.3"
-              (sources."nopt-2.2.1" // {
-                dependencies = [
-                  sources."abbrev-1.1.0"
-                ];
-              })
-              sources."semver-1.1.4"
-              sources."ini-1.1.0"
-            ];
-          })
-          sources."mkdirp-0.3.5"
-          sources."progress-1.1.8"
-          (sources."request-2.36.0" // {
-            dependencies = [
-              sources."qs-0.6.6"
-              sources."json-stringify-safe-5.0.1"
-              sources."mime-1.2.11"
-              sources."forever-agent-0.5.2"
-              sources."node-uuid-1.4.8"
-              (sources."tough-cookie-2.3.2" // {
-                dependencies = [
-                  sources."punycode-1.4.1"
-                ];
-              })
-              (sources."form-data-0.1.4" // {
-                dependencies = [
-                  (sources."combined-stream-0.0.7" // {
-                    dependencies = [
-                      sources."delayed-stream-0.0.5"
-                    ];
-                  })
-                  sources."async-0.9.2"
-                ];
-              })
-              sources."tunnel-agent-0.4.3"
-              (sources."http-signature-0.10.1" // {
-                dependencies = [
-                  sources."assert-plus-0.1.5"
-                  sources."asn1-0.1.11"
-                  sources."ctype-0.5.3"
-                ];
-              })
-              sources."oauth-sign-0.3.0"
-              (sources."hawk-1.0.0" // {
-                dependencies = [
-                  sources."hoek-0.9.1"
-                  sources."boom-0.4.2"
-                  sources."cryptiles-0.2.2"
-                  sources."sntp-0.2.4"
-                ];
-              })
-              sources."aws-sign2-0.5.0"
-            ];
-          })
-          (sources."request-progress-0.3.1" // {
-            dependencies = [
-              sources."throttleit-0.0.2"
-            ];
-          })
-          sources."rimraf-2.2.8"
-          sources."which-1.0.9"
+          sources."ini-1.3.5"
         ];
       })
+      sources."cryptiles-0.2.2"
+      sources."ctype-0.5.3"
+      sources."delayed-stream-0.0.5"
+      sources."forever-agent-0.5.2"
+      sources."form-data-0.1.4"
+      sources."hawk-1.0.0"
+      sources."hoek-0.9.1"
+      sources."http-signature-0.10.1"
+      sources."inherits-1.0.2"
+      sources."ini-1.1.0"
+      sources."json-stringify-safe-5.0.1"
+      sources."kew-0.1.7"
+      sources."mime-1.2.11"
+      sources."mkdirp-0.3.5"
       sources."mocha-phantomjs-core-1.3.1"
-      (sources."commander-2.9.0" // {
-        dependencies = [
-          sources."graceful-readlink-1.0.1"
-        ];
-      })
+      sources."ncp-0.4.2"
+      sources."node-uuid-1.4.8"
+      sources."nopt-2.2.1"
+      sources."npmconf-0.0.24"
+      sources."oauth-sign-0.3.0"
+      sources."once-1.1.1"
+      sources."osenv-0.0.3"
+      sources."phantomjs-1.9.7-15"
+      sources."progress-1.1.8"
+      sources."proto-list-1.2.4"
+      sources."punycode-1.4.1"
+      sources."qs-0.6.6"
+      sources."request-2.36.0"
+      sources."request-progress-0.3.1"
+      sources."rimraf-2.2.8"
+      sources."semver-1.1.4"
+      sources."sntp-0.2.4"
+      sources."throttleit-0.0.2"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.4.3"
+      sources."which-1.0.9"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3371,20 +2955,21 @@ in
       homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme";
     };
     production = true;
+    bypassCache = false;
   };
   should = nodeEnv.buildNodePackage {
     name = "should";
     packageName = "should";
-    version = "11.2.1";
+    version = "13.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/should/-/should-11.2.1.tgz";
-      sha1 = "90f55145552d01cfc200666e4e818a1c9670eda2";
+      url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz";
+      sha512 = "21w1m96rk6ljlx72mlkyg4ix3bg2s4s461fpwi1i6shz7fvl6kfmyqgmij3374iq187a4qfhn7vsc0zs7qw1i61nqn3gy0f8g0cvvwp";
     };
     dependencies = [
-      sources."should-equal-1.0.1"
+      sources."should-equal-2.0.0"
       sources."should-format-3.0.3"
       sources."should-type-1.4.0"
-      sources."should-type-adaptors-1.0.1"
+      sources."should-type-adaptors-1.1.0"
       sources."should-util-1.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -3394,28 +2979,30 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "2.1.0";
+    version = "4.4.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-2.1.0.tgz";
-      sha1 = "e057a9d2bf1b32f5d6dd62628ca9ee3961b0cafb";
+      url = "https://registry.npmjs.org/sinon/-/sinon-4.4.4.tgz";
+      sha512 = "2wny4iakvr5mfcbgka4hb99893a7v00ygavndsavqpvijidhigwg9iqq9w225vgb741z0waxn4fdi2ndzp83dk2dja2fkj10kglb6q3";
     };
     dependencies = [
-      sources."diff-3.2.0"
-      sources."formatio-1.2.0"
-      sources."lolex-1.6.0"
-      sources."native-promise-only-0.8.1"
-      (sources."path-to-regexp-1.7.0" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      sources."samsam-1.2.1"
+      sources."@sinonjs/formatio-2.0.0"
+      sources."diff-3.5.0"
+      sources."has-flag-3.0.0"
+      sources."isarray-0.0.1"
+      sources."just-extend-1.1.27"
+      sources."lodash.get-4.4.2"
+      sources."lolex-2.3.2"
+      sources."nise-1.3.0"
+      sources."path-to-regexp-1.7.0"
+      sources."samsam-1.3.0"
+      sources."supports-color-5.3.0"
       sources."text-encoding-0.6.4"
-      sources."type-detect-4.0.0"
+      sources."type-detect-4.0.8"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3424,81 +3011,53 @@ in
       license = "BSD-3-Clause";
     };
     production = true;
+    bypassCache = false;
   };
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.9.4";
+    version = "2.9.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz";
-      sha1 = "5e3ba97848d5290273db514aee47fe24cf592934";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz";
+      sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c";
     };
     dependencies = [
-      (sources."cli-1.0.1" // {
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."cli-1.0.1"
+      sources."concat-map-0.0.1"
+      sources."console-browserify-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."date-now-0.1.4"
+      (sources."dom-serializer-0.1.0" // {
         dependencies = [
-          (sources."glob-7.1.1" // {
-            dependencies = [
-              sources."fs.realpath-1.0.0"
-              (sources."inflight-1.0.6" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-              sources."inherits-2.0.3"
-              (sources."once-1.4.0" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-              sources."path-is-absolute-1.0.1"
-            ];
-          })
+          sources."domelementtype-1.1.3"
         ];
       })
-      (sources."console-browserify-1.1.0" // {
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.3.0"
+      (sources."domutils-1.5.1" // {
         dependencies = [
-          sources."date-now-0.1.4"
+          sources."entities-1.1.1"
         ];
       })
+      sources."entities-1.0.0"
       sources."exit-0.1.2"
-      (sources."htmlparser2-3.8.3" // {
-        dependencies = [
-          sources."domhandler-2.3.0"
-          (sources."domutils-1.5.1" // {
-            dependencies = [
-              (sources."dom-serializer-0.1.0" // {
-                dependencies = [
-                  sources."domelementtype-1.1.3"
-                  sources."entities-1.1.1"
-                ];
-              })
-            ];
-          })
-          sources."domelementtype-1.3.0"
-          (sources."readable-stream-1.1.14" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-0.0.1"
-              sources."string_decoder-0.10.31"
-              sources."inherits-2.0.3"
-            ];
-          })
-          sources."entities-1.0.0"
-        ];
-      })
-      (sources."minimatch-3.0.3" // {
-        dependencies = [
-          (sources."brace-expansion-1.1.6" // {
-            dependencies = [
-              sources."balanced-match-0.4.2"
-              sources."concat-map-0.0.1"
-            ];
-          })
-        ];
-      })
-      sources."shelljs-0.3.0"
-      sources."strip-json-comments-1.0.4"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."htmlparser2-3.8.3"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."isarray-0.0.1"
       sources."lodash-3.7.0"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."readable-stream-1.1.14"
+      sources."shelljs-0.3.0"
+      sources."string_decoder-0.10.31"
+      sources."strip-json-comments-1.0.4"
+      sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3507,60 +3066,40 @@ in
       license = "(MIT AND JSON)";
     };
     production = true;
+    bypassCache = false;
   };
   shelljs = nodeEnv.buildNodePackage {
     name = "shelljs";
     packageName = "shelljs";
-    version = "0.7.7";
+    version = "0.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz";
-      sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz";
+      sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0";
     };
     dependencies = [
-      (sources."glob-7.1.1" // {
-        dependencies = [
-          sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.6" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          sources."inherits-2.0.3"
-          (sources."minimatch-3.0.3" // {
-            dependencies = [
-              (sources."brace-expansion-1.1.6" // {
-                dependencies = [
-                  sources."balanced-match-0.4.2"
-                  sources."concat-map-0.0.1"
-                ];
-              })
-            ];
-          })
-          (sources."once-1.4.0" // {
-            dependencies = [
-              sources."wrappy-1.0.2"
-            ];
-          })
-          sources."path-is-absolute-1.0.1"
-        ];
-      })
-      sources."interpret-1.0.2"
-      (sources."rechoir-0.6.2" // {
-        dependencies = [
-          (sources."resolve-1.3.2" // {
-            dependencies = [
-              sources."path-parse-1.0.5"
-            ];
-          })
-        ];
-      })
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."interpret-1.1.0"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.5"
+      sources."rechoir-0.6.2"
+      sources."resolve-1.5.0"
+      sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Portable Unix shell commands for Node.js";
-      homepage = https://github.com/shelljs/shelljs;
+      homepage = http://github.com/shelljs/shelljs;
       license = "BSD-3-Clause";
     };
     production = true;
+    bypassCache = false;
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 3d0d1cf232c..186302f2715 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,12 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file

From e2cb020a270c626e15838bf166bcbb2ea8aa50e4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 13 Mar 2018 10:43:37 +0100
Subject: [PATCH 0924/2266] nixui: regenerate with node2nix 1.5.3

---
 pkgs/tools/package-management/nixui/nixui.nix         | 7 ++++---
 pkgs/tools/package-management/nixui/node-packages.nix | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index a2b6feeaea4..75bc6ec109c 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.1. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 4973223c0ac..b532039ede1 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.1. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 

From ce78db79a32c21fa8fe98e39c521c622ffb0637e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 13 Mar 2018 15:56:24 +0800
Subject: [PATCH 0925/2266] overmind: init at 1.1.1

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

diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
new file mode 100644
index 00000000000..46e00a97990
--- /dev/null
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }:
+
+buildGoPackage rec {
+  name = "overmind-${version}";
+  version = "1.1.1";
+  goPackagePath = "github.com/DarthSim/overmind";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}"
+  '';
+
+  src = fetchFromGitHub {
+    owner = "DarthSim";
+    repo = "overmind";
+    rev = "v${version}";
+    sha256 = "0gdsbm54ln07jv1kgg53fiavx18xxw4f21lfcdl74ijk6bx4jbzv";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/DarthSim/;
+    description = "Process manager for Procfile-based applications and tmux";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.adisbladis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 535e40d34ce..3d1db776366 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4058,6 +4058,8 @@ with pkgs;
 
   otpw = callPackage ../os-specific/linux/otpw { };
 
+  overmind = callPackage ../applications/misc/overmind { };
+
   owncloud = owncloud70;
 
   inherit (callPackages ../servers/owncloud { })

From ebb562d29a6b397d1fb30d094cefe2030559711c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 13 Mar 2018 10:44:58 +0100
Subject: [PATCH 0926/2266] airfield: regenerate with node2nix 1.5.3

---
 .../networking/airfield/node-packages.nix     | 1155 +++++++++--------
 pkgs/tools/networking/airfield/node.nix       |    7 +-
 2 files changed, 587 insertions(+), 575 deletions(-)

diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix
index e92921e15b8..657d9284f1b 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/pkgs/tools/networking/airfield/node-packages.nix
@@ -1,223 +1,43 @@
-# This file has been generated by node2nix 1.4.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "connect-2.7.1" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.7.1";
+    "ajv-5.5.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "5.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.7.1.tgz";
-        sha1 = "b869df9acf3dd8a0af7523c7c6f1aa8b4b761daa";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
+        sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "commander-0.6.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "0.6.1";
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "range-parser-0.0.4" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "0.0.4";
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
-        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "mkdirp-0.3.3" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.3";
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.3.tgz";
-        sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
-      };
-    };
-    "cookie-0.0.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
-        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
-      };
-    };
-    "buffer-crc32-0.1.1" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
-        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
-      };
-    };
-    "fresh-0.1.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
-        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
-      };
-    };
-    "methods-0.0.1" = {
-      name = "methods";
-      packageName = "methods";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
-        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
-      };
-    };
-    "send-0.1.0" = {
-      name = "send";
-      packageName = "send";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
-        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
-      };
-    };
-    "cookie-signature-0.0.1" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-0.0.1.tgz";
-        sha1 = "13d3603b5cf63befbf85a8801e37aa900db46985";
-      };
-    };
-    "debug-3.1.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
-      };
-    };
-    "qs-0.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
-        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
-      };
-    };
-    "formidable-1.0.11" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
-        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
-      };
-    };
-    "crc-0.2.0" = {
-      name = "crc";
-      packageName = "crc";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
-        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
-      };
-    };
-    "bytes-0.1.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
-        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
-      };
-    };
-    "pause-0.0.1" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
-      };
-    };
-    "mime-1.2.6" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
-        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
-      };
-    };
-    "ms-2.0.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
-      };
-    };
-    "underscore-1.8.3" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
-      };
-    };
-    "double-ended-queue-2.1.0-0" = {
-      name = "double-ended-queue";
-      packageName = "double-ended-queue";
-      version = "2.1.0-0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
-        sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
-      };
-    };
-    "redis-commands-1.3.1" = {
-      name = "redis-commands";
-      packageName = "redis-commands";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz";
-        sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b";
-      };
-    };
-    "redis-parser-2.6.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz";
-        sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
-      };
-    };
-    "redis-2.8.0" = {
-      name = "redis";
-      packageName = "redis";
-      version = "2.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-        sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
-      };
-    };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -238,6 +58,51 @@ let
         sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
+    "bcrypt-pbkdf-1.0.1" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
+      };
+    };
+    "boom-4.3.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
+        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
+      };
+    };
+    "boom-5.2.0" = {
+      name = "boom";
+      packageName = "boom";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
+        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
+      };
+    };
+    "buffer-crc32-0.1.1" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+      };
+    };
+    "bytes-0.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
+        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -247,13 +112,130 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "combined-stream-1.0.5" = {
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    };
+    "combined-stream-1.0.6" = {
       name = "combined-stream";
       packageName = "combined-stream";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "commander-0.6.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      };
+    };
+    "connect-2.7.1" = {
+      name = "connect";
+      packageName = "connect";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect/-/connect-2.7.1.tgz";
+        sha1 = "b869df9acf3dd8a0af7523c7c6f1aa8b4b761daa";
+      };
+    };
+    "cookie-0.0.5" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+      };
+    };
+    "cookie-signature-0.0.1" = {
+      name = "cookie-signature";
+      packageName = "cookie-signature";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-0.0.1.tgz";
+        sha1 = "13d3603b5cf63befbf85a8801e37aa900db46985";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "crc-0.2.0" = {
+      name = "crc";
+      packageName = "crc";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
+        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
+      };
+    };
+    "cryptiles-3.1.2" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
+        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "debug-3.1.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "double-ended-queue-2.1.0-0" = {
+      name = "double-ended-queue";
+      packageName = "double-ended-queue";
+      version = "2.1.0-0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
+        sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
+      };
+    };
+    "ecc-jsbn-0.1.1" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
     "extend-3.0.1" = {
@@ -265,6 +247,33 @@ let
         sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
       };
     };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "fast-deep-equal-1.1.0" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
+        sha1 = "c053477817c86b51daa853c81e059b733d023614";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
     "forever-agent-0.6.1" = {
       name = "forever-agent";
       packageName = "forever-agent";
@@ -274,13 +283,49 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "form-data-2.3.1" = {
+    "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz";
-        sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz";
+        sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
+      };
+    };
+    "formidable-1.0.11" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+      };
+    };
+    "fresh-0.1.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
     "har-validator-5.0.3" = {
@@ -301,6 +346,15 @@ let
         sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als";
       };
     };
+    "hoek-4.2.1" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz";
+        sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
+      };
+    };
     "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -328,247 +382,13 @@ let
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "mime-types-2.1.17" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz";
-        sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a";
-      };
-    };
-    "oauth-sign-0.8.2" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
-        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
-      };
-    };
-    "performance-now-2.1.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
-      };
-    };
-    "qs-6.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
-      };
-    };
-    "safe-buffer-5.1.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
-      };
-    };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-      };
-    };
-    "tough-cookie-2.3.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
-        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
-      };
-    };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "uuid-3.1.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
-      };
-    };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
-    "asynckit-0.4.0" = {
-      name = "asynckit";
-      packageName = "asynckit";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
-        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
-      };
-    };
-    "ajv-5.3.0" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz";
-        sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda";
-      };
-    };
-    "har-schema-2.0.0" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
-        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
-      };
-    };
-    "co-4.6.0" = {
-      name = "co";
-      packageName = "co";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
-        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
-      };
-    };
-    "fast-deep-equal-1.0.0" = {
-      name = "fast-deep-equal";
-      packageName = "fast-deep-equal";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz";
-        sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
-      };
-    };
-    "fast-json-stable-stringify-2.0.0" = {
-      name = "fast-json-stable-stringify";
-      packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
-      };
-    };
-    "json-schema-traverse-0.3.1" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
-        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
-      };
-    };
-    "hoek-4.2.0" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz";
-        sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz";
-      };
-    };
-    "boom-4.3.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "cryptiles-3.1.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
-        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
-      };
-    };
-    "sntp-2.1.0" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
-        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
-      };
-    };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-      };
-    };
-    "jsprim-1.4.1" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
-        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
-      };
-    };
-    "sshpk-1.13.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
-        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "json-schema-0.2.3" = {
@@ -580,58 +400,247 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
+    "json-schema-traverse-0.3.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
+        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "asn1-0.2.3" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.3";
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
+    "lodash-4.17.5" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz";
+        sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
+      };
+    };
+    "methods-0.0.1" = {
+      name = "methods";
+      packageName = "methods";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+      };
+    };
+    "mime-1.2.6" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+      };
+    };
+    "mime-db-1.33.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.33.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
+        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+      };
+    };
+    "mime-types-2.1.18" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
+        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+      };
+    };
+    "mkdirp-0.3.3" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.3.tgz";
+        sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "pause-0.0.1" = {
+      name = "pause";
+      packageName = "pause";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qs-0.5.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+      };
+    };
+    "qs-6.5.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
+        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
+      };
+    };
+    "range-parser-0.0.4" = {
+      name = "range-parser";
+      packageName = "range-parser";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+      };
+    };
+    "redis-2.8.0" = {
+      name = "redis";
+      packageName = "redis";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
+        sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
+      };
+    };
+    "redis-commands-1.3.5" = {
+      name = "redis-commands";
+      packageName = "redis-commands";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz";
+        sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by";
+      };
+    };
+    "redis-parser-2.6.0" = {
+      name = "redis-parser";
+      packageName = "redis-parser";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz";
+        sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
+      };
+    };
+    "safe-buffer-5.1.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+      };
+    };
+    "send-0.1.0" = {
+      name = "send";
+      packageName = "send";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
+        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+      };
+    };
+    "sntp-2.1.0" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
+        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
+      };
+    };
+    "sshpk-1.14.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
       version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
       };
     };
-    "getpass-0.1.7" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.7";
+    "stringstream-0.0.5" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
-        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -643,40 +652,31 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "ecc-jsbn-0.1.1" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.1";
+    "underscore-1.8.3" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     };
-    "bcrypt-pbkdf-1.0.1" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
+    "uuid-3.2.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
+        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
       };
     };
-    "mime-db-1.30.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.30.0";
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
-        sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
   };
@@ -691,30 +691,31 @@ in
       sha1 = "4c6e5850e6b5e8ca2af57f21ed7097de50948b73";
     };
     dependencies = [
-      sources."connect-2.7.1"
-      sources."commander-0.6.1"
-      sources."range-parser-0.0.4"
-      sources."mkdirp-0.3.3"
-      sources."cookie-0.0.5"
       sources."buffer-crc32-0.1.1"
+      sources."bytes-0.1.0"
+      sources."commander-0.6.1"
+      sources."connect-2.7.1"
+      sources."cookie-0.0.5"
+      sources."cookie-signature-0.0.1"
+      sources."crc-0.2.0"
+      sources."debug-3.1.0"
+      sources."formidable-1.0.11"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
-      sources."send-0.1.0"
-      sources."cookie-signature-0.0.1"
-      sources."debug-3.1.0"
-      sources."qs-0.5.1"
-      sources."formidable-1.0.11"
-      sources."crc-0.2.0"
-      sources."bytes-0.1.0"
-      sources."pause-0.0.1"
       sources."mime-1.2.6"
+      sources."mkdirp-0.3.3"
       sources."ms-2.0.0"
+      sources."pause-0.0.1"
+      sources."qs-0.5.1"
+      sources."range-parser-0.0.4"
+      sources."send-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Sinatra inspired web development framework";
     };
     production = true;
+    bypassCache = false;
   };
   "swig-0.14.0" = nodeEnv.buildNodePackage {
     name = "swig";
@@ -732,6 +733,7 @@ in
       description = "A fast django-like templating engine for node.js and browsers.";
     };
     production = true;
+    bypassCache = false;
   };
   "consolidate-0.10.0" = nodeEnv.buildNodePackage {
     name = "consolidate";
@@ -747,6 +749,7 @@ in
       homepage = https://github.com/visionmedia/consolidate.js;
     };
     production = true;
+    bypassCache = false;
   };
   redis = nodeEnv.buildNodePackage {
     name = "redis";
@@ -758,7 +761,7 @@ in
     };
     dependencies = [
       sources."double-ended-queue-2.1.0-0"
-      sources."redis-commands-1.3.1"
+      sources."redis-commands-1.3.5"
       sources."redis-parser-2.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -768,21 +771,22 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   connect-redis = nodeEnv.buildNodePackage {
     name = "connect-redis";
     packageName = "connect-redis";
-    version = "3.3.2";
+    version = "3.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.2.tgz";
-      sha512 = "3w8bsdsqpz407jwgac2qa2lp08551xlqmsfyps1q7p0c80lx1dwip148rjc5fgm5w845al5c30i6rypggp4h6nhqzdk1jf0vyagbrkc";
+      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz";
+      sha512 = "355x879l7vfnzp6m199ghns4sgl5xpx0j6nr2bqimy3xj29i168bsaxi8gwky6cqy4apvb62sp8n67rssdzq667zngf7mm4dddsr5df";
     };
     dependencies = [
       sources."debug-3.1.0"
-      sources."redis-2.8.0"
-      sources."ms-2.0.0"
       sources."double-ended-queue-2.1.0-0"
-      sources."redis-commands-1.3.1"
+      sources."ms-2.0.0"
+      sources."redis-2.8.0"
+      sources."redis-commands-1.3.5"
       sources."redis-parser-2.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -792,6 +796,7 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   async = nodeEnv.buildNodePackage {
     name = "async";
@@ -802,7 +807,7 @@ in
       sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4";
     };
     dependencies = [
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -811,66 +816,71 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   request = nodeEnv.buildNodePackage {
     name = "request";
     packageName = "request";
-    version = "2.83.0";
+    version = "2.85.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
-      sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
+      url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
+      sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
     };
     dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.3"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."boom-4.3.1"
       sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.1"
       sources."extend-3.0.1"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."hawk-6.0.2"
+      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.17"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
+      sources."punycode-1.4.1"
       sources."qs-6.5.1"
       sources."safe-buffer-5.1.1"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-5.3.0"
-      sources."har-schema-2.0.0"
-      sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."json-schema-traverse-0.3.1"
-      sources."hoek-4.2.0"
-      sources."boom-5.2.0"
-      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
-      sources."core-util-is-1.0.2"
-      sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
-      sources."jsbn-0.1.1"
+      sources."sshpk-1.14.1"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
+      sources."uuid-3.2.1"
+      sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -879,5 +889,6 @@ in
       license = "Apache-2.0";
     };
     production = true;
+    bypassCache = false;
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 63d00366f0a..75bc6ec109c 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.4.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,12 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file

From 7ec04712423d47148f98fe3c935c60d181af99c4 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 13 Mar 2018 10:16:03 +0000
Subject: [PATCH 0927/2266] treewide: s/xlibs/xorg/g (#36889)

---
 .../editors/kodestudio/default.nix            |  2 +-
 pkgs/applications/graphics/pencil/default.nix | 24 ++++++++--------
 .../graphics/solvespace/default.nix           |  4 +--
 pkgs/applications/misc/deco/default.nix       |  4 +--
 .../applications/misc/playonlinux/default.nix |  2 +-
 .../networking/browsers/palemoon/default.nix  |  4 +--
 .../networking/dropbox/default.nix            |  2 +-
 .../ring-daemon/default.nix                   |  4 +--
 .../signal-desktop/beta.nix                   |  4 +--
 .../signal-desktop/default.nix                |  4 +--
 .../remote/citrix-receiver/default.nix        | 12 ++++----
 .../networking/remote/teamviewer/default.nix  |  2 +-
 pkgs/applications/office/mendeley/default.nix |  3 +-
 pkgs/applications/office/zotero/default.nix   |  2 +-
 .../science/logic/mcrl2/default.nix           |  2 +-
 .../science/math/scilab-bin/default.nix       | 14 +++++-----
 .../window-managers/wtftw/default.nix         |  2 +-
 .../libraries/AntTweakBar/default.nix         |  4 +--
 .../kdelibs4support/default.nix               |  4 +--
 .../libraries/pipewire/default.nix            |  4 +--
 .../libraries/qt-5/modules/qtbase.nix         |  2 +-
 .../libraries/qt-5/modules/qtwebengine.nix    |  6 ++--
 pkgs/development/libraries/webkitgtk/2.18.nix |  4 +--
 .../ruby-modules/gem-config/default.nix       | 14 +++++-----
 pkgs/development/web/postman/default.nix      | 28 +++++++++----------
 pkgs/games/steam/chrootenv.nix                | 16 +++++------
 pkgs/games/steam/runtime-wrapped.nix          | 24 ++++++++--------
 pkgs/tools/misc/x11idle/default.nix           |  2 +-
 pkgs/tools/typesetting/pdf2htmlEX/default.nix |  6 ++--
 pkgs/top-level/all-packages.nix               |  2 +-
 30 files changed, 103 insertions(+), 104 deletions(-)

diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index 8eb2f392ddc..b03abc2146a 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper
 , # Patchelf dependencies:
   alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined
-, openssl, xlibs, xorg, zlib
+, openssl, xorg, zlib
 }:
 
 let
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index a4e73d2f5b5..0e52190af42 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, makeWrapper,
   # build dependencies
   alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
-  freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xlibs,
+  freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
   glibc, udev
 }:
 
@@ -55,17 +55,17 @@ stdenv.mkDerivation rec {
       gnome2.pango
       nspr
       nss
-      xlibs.libX11
-      xlibs.libXScrnSaver
-      xlibs.libXcomposite
-      xlibs.libXcursor
-      xlibs.libXdamage
-      xlibs.libXext
-      xlibs.libXfixes
-      xlibs.libXi
-      xlibs.libXrandr
-      xlibs.libXrender
-      xlibs.libXtst
+      xorg.libX11
+      xorg.libXScrnSaver
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
       stdenv.cc.cc.lib
       stdenv.cc.cc
       glibc
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 08ce9c1fc2e..a1d0316631f 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
-, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xlibs, pcre
+, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre
 , wrapGAppsHook
 }:
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     zlib libpng cairo freetype
     json_c fontconfig gtkmm3 pangomm glew libGLU
-    xlibs.libpthreadstubs xlibs.libXdmcp pcre
+    xorg.libpthreadstubs xorg.libXdmcp pcre
   ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix
index 170018dc972..e5dc011d553 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/pkgs/applications/misc/deco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, scsh, feh, xlibs }:
+{ stdenv, fetchFromGitHub, scsh, feh, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "deco";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     substituteInPlace $out/bin/deco --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
     substituteInPlace $out/bin/deco --replace "feh" "${feh}/bin/feh"
-    substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xlibs.xdpyinfo}/bin/xdpyinfo"
+    substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 44650d001e3..9fb15aab2d4 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -50,7 +50,7 @@ let
     else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
     else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}";
   ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
-  libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];
+  libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ];
 
 in stdenv.mkDerivation {
   name = "playonlinux-${version}";
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 58aa0f477ed..f3eb38422c6 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -5,7 +5,7 @@
 , gtk2, hunspell, icu, libevent, libjpeg, libnotify
 , libstartup_notification, libvpx, makeWrapper, libGLU_combined
 , nspr, nss, pango, perl, python, libpulseaudio, sqlite
-, unzip, xlibs, which, yasm, zip, zlib
+, unzip, xorg, which, yasm, zip, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     hunspell icu libevent libjpeg libnotify libstartup_notification
     libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python
     libpulseaudio sqlite unzip which yasm zip zlib
-  ] ++ (with xlibs; [
+  ] ++ (with xorg; [
     libX11 libXext libXft libXi libXrender libXScrnSaver
     libXt pixman scrnsaverproto xextproto
   ]);
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 5bafb8e7c4c..2d364450677 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -32,7 +32,7 @@ in
 buildFHSUserEnv {
   name = "dropbox";
 
-  targetPkgs = pkgs: with pkgs; with xlibs; [
+  targetPkgs = pkgs: with pkgs; with xorg; [
     libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
     libXxf86vm libxcb xkeyboardconfig
     curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 38bc58d8b10..024902a9c48 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -24,7 +24,7 @@
 , gnutls
 , zlib
 , jsoncpp
-, xlibs
+, xorg
 , libargon2
 , cryptopp
 , openssl
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     zlib
     jsoncpp
     restbed
-    xlibs.libX11
+    xorg.libX11
     libargon2
     cryptopp
     openssl
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
index 9876767b57e..f627479a3c0 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
-fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
+fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
 libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
 nspr, alsaLib, cups, expat, udev
 }:
@@ -33,7 +33,7 @@ let
     nss
     stdenv.cc.cc
     udev
-    xlibs.libxcb
+    xorg.libxcb
   ];
 
 in
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index c77173d490a..8dbf0e774e4 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
-fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
+fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
 libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
 nspr, alsaLib, cups, expat, udev
 }:
@@ -33,7 +33,7 @@ let
     nss
     stdenv.cc.cc
     udev
-    xlibs.libxcb
+    xorg.libxcb
   ];
 
 in
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 51a37d3152b..d5982f33e78 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -15,7 +15,7 @@
 , cairo
 , pango
 , gnome3
-, xlibs
+, xorg
 , libpng12
 , freetype
 , fontconfig
@@ -143,11 +143,11 @@ let
         cairo
         pango
         gnome3.dconf
-        xlibs.libX11
-        xlibs.libXext
-        xlibs.libXrender
-        xlibs.libXinerama
-        xlibs.libXfixes
+        xorg.libX11
+        xorg.libXext
+        xorg.libXrender
+        xorg.libXinerama
+        xorg.libXfixes
         libpng12
         libidn
         zlib
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 4ff649dbf2a..df7cba3daec 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -9,7 +9,7 @@ let
 
   mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
 
-  deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
+  deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
   tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
   tvldpath64 = lib.makeLibraryPath (deps pkgs);
 in
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index fbadd442ce7..a8664e6820a 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -24,7 +24,6 @@
 , qtwebengine
 , sqlite
 , xorg
-, xlibs
 , zlib
 # The provided wrapper does this, but since we don't use it
 # we emulate the behavior.  The downside is that this
@@ -78,7 +77,7 @@ let
     orc
     sqlite
     xorg.libX11
-    xlibs.xcbutilkeysyms
+    xorg.xcbutilkeysyms
     xorg.libxcb
     xorg.libXcomposite
     xorg.libXext
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 8e2f6bce0b1..a666e80e68e 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -31,7 +31,7 @@ zoteroSrc = stdenv.mkDerivation rec {
 
 fhsEnv = buildFHSUserEnv {
   name = "zotero-fhs-env";
-  targetPkgs = pkgs: with pkgs; with xlibs; [
+  targetPkgs = pkgs: with pkgs; with xorg; [
     gtk3 dbus-glib
     libXt nss
   ];
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index c84f81740c7..6e8797fcc40 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xlibs, cmake, subversion, libGLU_combined, qt5, boost,
+{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost,
  python27, python27Packages}:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index f6e255ee46e..154f1ba39e3 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, xlibs }:
+{ stdenv, fetchurl, lib, xorg }:
 
 let
   name = "scilab-bin-${ver}";
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
 
   libPath = lib.makeLibraryPath [
     stdenv.cc.cc
-    xlibs.libX11
-    xlibs.libXext
-    xlibs.libXi
-    xlibs.libXrender
-    xlibs.libXtst
-    xlibs.libXxf86vm
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXxf86vm
   ];
 
   phases = [ "unpackPhase" "fixupPhase" "installPhase" ];
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index a4eff26d88c..c68562d82b3 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }:
+{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
   name = "wtftw-0.0pre20170921";
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index 108a11ece58..fcb708c829b 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, unzip, xlibs, libGLU_combined }:
+{ stdenv, fetchurl, unzip, xorg, libGLU_combined }:
 
 stdenv.mkDerivation rec {
   name = "AntTweakBar-1.16";
 
-  buildInputs = [ unzip xlibs.libX11 libGLU_combined ];
+  buildInputs = [ unzip xorg.libX11 libGLU_combined ];
 
   src = fetchurl {
     url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index 6937a4056b2..7e3de9d4d14 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -5,7 +5,7 @@
   kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
   ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice,
   ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui,
-  networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs
+  networkmanager, qtbase, qtsvg, qttools, qtx11extras, xorg
 }:
 
 mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
   propagatedNativeBuildInputs = [ kdoctools ];
   buildInputs = [
     kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+    kxmlgui networkmanager qtsvg qtx11extras xorg.libSM
   ];
   propagatedBuildInputs = [
     kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 304d5baa3aa..90174bf749a 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xlibs
+, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg
 , sbc, SDL2, makeFontsConf, freefont_ttf
 }:
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
-    alsaLib ffmpeg libjack2 libudev libva xlibs.libX11 sbc SDL2
+    alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2
   ];
 
   patches = [
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index c6473ff188a..8887e05704d 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -10,7 +10,7 @@
   dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
-  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
+  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg,
   zlib,
 
   # optional dependencies
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 4be72b08784..df9995bc3b9 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -3,7 +3,7 @@
 
 , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
 
-, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
 , fontconfig, freetype, harfbuzz, icu, dbus
 , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
 , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
@@ -103,8 +103,8 @@ qtModule {
     pciutils
 
     # X11 libs
-    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
-    xlibs.libXcomposite
+    xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
+    xorg.libXcomposite
   ];
 
   dontUseNinjaBuild = true;
diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix
index cecac45a3dc..9dec5a4c953 100644
--- a/pkgs/development/libraries/webkitgtk/2.18.nix
+++ b/pkgs/development/libraries/webkitgtk/2.18.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
 , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
-, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core
+, gtk3, wayland, libwebp, enchant, xorg, libxkbcommon, epoxy, at-spi2-core
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
 , libidn, libedit, readline, libGLU_combined, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
   ] ++ optional enableGeoLocation geoclue2
     ++ optional enableGtk2Plugins gtk2
-    ++ (with xlibs; [ libXdmcp libXt libXtst ])
+    ++ (with xorg; [ libXdmcp libXt libXtst ])
     ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
     ++ optional stdenv.isLinux wayland;
 
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index a442155a631..7a31cf0cbbc 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
-, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem
+, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf
 }@args:
 
@@ -60,12 +60,12 @@ in
 
   cairo = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
+    buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
   };
 
   cairo-gobject = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ cairo pcre xlibs.libpthreadstubs xlibs.libXdmcp ];
+    buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
   };
 
   capybara-webkit = attrs: {
@@ -87,14 +87,14 @@ in
       sed -i $installPath/lib/dep-selector-libgecode.rb -e 's@VENDORED_GECODE_DIR =.*@VENDORED_GECODE_DIR = "${gecode_3}"@'
     '';
   };
-  
+
   ethon = attrs: {
     dontBuild = false;
     postPatch = ''
       substituteInPlace lib/ethon/curls/settings.rb \
         --replace "libcurl" "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}"
     '';
-  }; 
+  };
 
   eventmachine = attrs: {
     buildInputs = [ openssl ];
@@ -128,7 +128,7 @@ in
 
   gtk2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
+    buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
     # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
     CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
   };
@@ -205,7 +205,7 @@ in
 
   pango = attrs: {
   nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 xlibs.libXdmcp pcre xlibs.libpthreadstubs ];
+    buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ];
   };
 
   patron = attrs: {
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 605e5de0311..48f76e9e85d 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, gnome2, fetchurl, pkgs, xlibs, udev, makeWrapper, makeDesktopItem }:
+{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "postman-${version}";
@@ -54,19 +54,19 @@ stdenv.mkDerivation rec {
       pkgs.nss
       pkgs.nspr
       pkgs.udev.lib
-      xlibs.libX11
-      xlibs.libxcb
-      xlibs.libXi
-      xlibs.libXcursor
-      xlibs.libXdamage
-      xlibs.libXrandr
-      xlibs.libXcomposite
-      xlibs.libXext
-      xlibs.libXfixes
-      xlibs.libXrender
-      xlibs.libX11
-      xlibs.libXtst
-      xlibs.libXScrnSaver
+      xorg.libX11
+      xorg.libxcb
+      xorg.libXi
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXrandr
+      xorg.libXcomposite
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXrender
+      xorg.libX11
+      xorg.libXtst
+      xorg.libXScrnSaver
     ];
   in ''
     patchelf \
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 8fd8c3d7d20..88cde733176 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -15,7 +15,7 @@ let
       pciutils
       python2
       # Games' dependencies
-      xlibs.xrandr
+      xorg.xrandr
       which
       # Needed by gdialog, including in the steam-runtime
       perl
@@ -51,12 +51,12 @@ in buildFHSUserEnv rec {
 
   multiPkgs = pkgs: with pkgs; [
     # These are required by steam with proper errors
-    xlibs.libXcomposite
-    xlibs.libXtst
-    xlibs.libXrandr
-    xlibs.libXext
-    xlibs.libX11
-    xlibs.libXfixes
+    xorg.libXcomposite
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.libXext
+    xorg.libX11
+    xorg.libXfixes
 
     # Needed to properly check for libGL.so.1 in steam-wrapper.sh
     pkgsi686Linux.glxinfo
@@ -67,7 +67,7 @@ in buildFHSUserEnv rec {
     libdrm
     mono
     xorg.xkeyboardconfig
-    xlibs.libpciaccess
+    xorg.libpciaccess
 
     (steamPackages.steam-runtime-wrapped.override {
       inherit nativeOnly runtimeOnly;
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 2030425ba12..5412a1be518 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -15,15 +15,15 @@ let
     gdk_pixbuf
 
     # Without these it silently fails
-    xlibs.libXinerama
-    xlibs.libXdamage
-    xlibs.libXcursor
-    xlibs.libXrender
-    xlibs.libXScrnSaver
-    xlibs.libXxf86vm
-    xlibs.libXi
-    xlibs.libSM
-    xlibs.libICE
+    xorg.libXinerama
+    xorg.libXdamage
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXxf86vm
+    xorg.libXi
+    xorg.libSM
+    xorg.libICE
     gnome2.GConf
     freetype
     (curl.override { gnutlsSupport = true; sslSupport = false; })
@@ -46,8 +46,8 @@ let
     networkmanager098
 
     # Verified games requirements
-    xlibs.libXmu
-    xlibs.libxcb
+    xorg.libXmu
+    xorg.libxcb
     libGLU
     libuuid
     libogg
@@ -60,7 +60,7 @@ let
     tbb
 
     # Other things from runtime
-    xlibs.libXinerama
+    xorg.libXinerama
     flac
     freeglut
     libjpeg
diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix
index 8ebc5047358..c8adff788c7 100644
--- a/pkgs/tools/misc/x11idle/default.nix
+++ b/pkgs/tools/misc/x11idle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, xlibs, fetchgit, libXScrnSaver, libX11 }:
+{ stdenv, fetchgit, libXScrnSaver, libX11 }:
 
 stdenv.mkDerivation {
   name = "x11idle-unstable-2017-07-01";
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
index b6d29052dcc..e0f3681f43d 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8
+, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8
 
 }:
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    xlibs.libpthreadstubs
-    xlibs.libXdmcp
+    xorg.libpthreadstubs
+    xorg.libXdmcp
     pcre
     python
     glib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d1db776366..c45490e4937 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9538,7 +9538,7 @@ with pkgs;
   libburn = callPackage ../development/libraries/libburn { };
 
   libcaca = callPackage ../development/libraries/libcaca {
-    inherit (xlibs) libX11 libXext;
+    inherit (xorg) libX11 libXext;
   };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };

From 5fdfe61b35945b287b084f22076fef34062f17d2 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 11 Mar 2018 15:21:01 +0100
Subject: [PATCH 0928/2266] conan: Fix build

conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
---
 pkgs/development/python-modules/distro/11.nix | 26 +++++++++++++++++++
 .../python-modules/node-semver/2.nix          | 21 +++++++++++++++
 .../tools/build-managers/conan/default.nix    | 10 ++++---
 pkgs/top-level/python-packages.nix            |  4 +++
 4 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/distro/11.nix
 create mode 100644 pkgs/development/python-modules/node-semver/2.nix

diff --git a/pkgs/development/python-modules/distro/11.nix b/pkgs/development/python-modules/distro/11.nix
new file mode 100644
index 00000000000..bc9158e1545
--- /dev/null
+++ b/pkgs/development/python-modules/distro/11.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "distro";
+  version = "1.1.0";
+
+  buildInputs = [ pytest pytestcov tox];
+
+  checkPhase = ''
+    touch tox.ini
+    tox
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/nir0s/distro;
+    description = "Linux Distribution - a Linux OS platform information API.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/development/python-modules/node-semver/2.nix b/pkgs/development/python-modules/node-semver/2.nix
new file mode 100644
index 00000000000..0ca61bd1351
--- /dev/null
+++ b/pkgs/development/python-modules/node-semver/2.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.2.0";
+  pname = "node-semver";
+
+  buildInputs = [ pytest tox ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/podhmo/python-semver;
+    description = "A port of node-semver";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 4a2afbeedfe..6350798e108 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,26 +1,28 @@
 { lib, buildPythonApplication, fetchPypi
 , requests, fasteners, pyyaml, pyjwt, colorama, patch
-, bottle, pluginbase, six, distro, pylint, node-semver
+, bottle, pluginbase, six, distro11, pylint, node-semver2
 , future, pygments, mccabe
+, fetchpatch
 }:
 
 buildPythonApplication rec {
-  version = "0.28.1";
+  version = "1.1.1";
   pname = "conan";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a";
+    sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
   };
 
   propagatedBuildInputs = [
     requests fasteners pyyaml pyjwt colorama patch
-    bottle pluginbase six distro pylint node-semver
+    bottle pluginbase six distro11 pylint node-semver2
     future pygments mccabe
   ];
 
   # enable tests once all of these pythonPackages available:
   # [ nose nose_parameterized mock webtest codecov ]
+  # update 2018-03-11: only nose_parameterized is missing
   doCheck = false;
 
   meta = with lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0adbb05477..3c48c72e340 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21051,8 +21051,12 @@ EOF
 
   node-semver = callPackage ../development/python-modules/node-semver { };
 
+  node-semver2 = callPackage ../development/python-modules/node-semver/2.nix { };
+
   distro = callPackage ../development/python-modules/distro { };
 
+  distro11 = callPackage ../development/python-modules/distro/11.nix { };
+
   bz2file =  callPackage ../development/python-modules/bz2file { };
 
   smart_open =  callPackage ../development/python-modules/smart_open { };

From e8f452f110864dcee0d4d42e306686179638a5cf Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 1 Feb 2018 16:13:05 +0100
Subject: [PATCH 0929/2266] dockerTools: add an onTopOfPulledImage example

This allows to test if a pulled image can be updated by using our
Docker tools.
---
 pkgs/build-support/docker/examples.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 691d4bb74db..315440349b6 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -116,4 +116,12 @@ rec {
       Env = [ "NIX_PAGER=cat" ];
     };
   };
+
+  # 7. example of adding something on top of an image pull by our
+  # dockerTools chain.
+  onTopOfPulledImage = buildImage {
+    name = "onTopOfPulledImage";
+    fromImage = nixFromDockerHub;
+    contents = [ pkgs.hello ];
+  };
 }

From bc1e8f95d4c20c996ca14f39331fe23cbb3ffe2c Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sun, 4 Mar 2018 17:48:07 +0100
Subject: [PATCH 0930/2266] tests/docker-tools: add onTopOfPulledImage test

---
 nixos/tests/docker-tools.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index e52a4c3f884..9135bca0f4f 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     docker =
       { config, pkgs, ... }: {
         virtualisation = {
-          diskSize = 1024;
+          diskSize = 2048;
           docker.enable = true;
         };
       };
@@ -21,19 +21,29 @@ import ./make-test.nix ({ pkgs, ... }: {
       $docker->waitForUnit("sockets.target");
 
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
-      $docker->succeed("docker run ${pkgs.dockerTools.examples.bash.imageName} /bin/bash --version");
+      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} /bin/bash --version");
+      $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}");
 
+      # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'");
-      $docker->succeed("docker run ${pkgs.dockerTools.examples.nix.imageName} /bin/nix-store -qR ${pkgs.nix}");
+      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} /bin/nix-store -qR ${pkgs.nix}");
+      $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}");
 
       # To test the pullImage tool
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'");
-      $docker->succeed("docker run nixos/nix:1.11 nix-store --version");
+      $docker->succeed("docker run --rm nixos/nix:1.11 nix-store --version");
+      $docker->succeed("docker rmi nixos/nix:1.11");
 
       # To test runAsRoot and entry point
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'");
       $docker->succeed("docker run --name nginx -d -p 8000:80 ${pkgs.dockerTools.examples.nginx.imageName}");
       $docker->waitUntilSucceeds('curl http://localhost:8000/');
       $docker->succeed("docker rm --force nginx");
+      $docker->succeed("docker rmi '${pkgs.dockerTools.examples.nginx.imageName}'");
+
+      # An pulled image can be used as base image
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'");
+      $docker->succeed("docker run --rm ontopofpulledimage hello");
+      $docker->succeed("docker rmi ontopofpulledimage");
     '';
 })

From 346996ceecc421577be638b9aac4917925329130 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 12 Mar 2018 17:06:21 +0100
Subject: [PATCH 0931/2266] dockerTools: dereference hard links in tar archives

This is to improve image creation reproducibility. Since the nar
format doesn't support hard link, the tar stream of a layer can be
different if a dependency of a layer has been built locally or if it
has been fetched from a binary cache.

If the dependency has been build locally, it can contain hard links
which are encoded in the tar stream. If the dependency has been
fetched from a binary cache, the tar stream doesn't contain any hard
link. So even if the content is the same, tar streams are different.
---
 pkgs/build-support/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index c40b096e208..328419d639f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -212,7 +212,7 @@ rec {
 
       postMount = ''
         echo "Packing raw image..."
-        tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
+        tar -C mnt --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
       '';
     };
 
@@ -277,7 +277,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+      tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
@@ -359,7 +359,7 @@ rec {
 
         echo "Packing layer..."
         mkdir $out
-        tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
+        tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
 
         # Compute the tar checksum and add it to the output json.
         echo "Computing checksum..."
@@ -489,7 +489,7 @@ rec {
         comm <(sort -n baseFiles|uniq) \
              <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
         # Append the new files to the layer.
-        tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \
+        tar -rpf temp/layer.tar --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" \
           --owner=0 --group=0 --no-recursion --files-from newFiles
 
         echo "Adding meta..."
@@ -537,7 +537,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
+        tar -C image --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From ac0c491836a835c43641989ccb4b95a172749806 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 12 Mar 2018 18:26:15 +0100
Subject: [PATCH 0932/2266] dockerTools: add --sort=name options on all tar
 calls

This is to go to a reproducible image build.
Note without this options image are identical from the Docker point of
view but generated docker archives could have different hashes.
---
 pkgs/build-support/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 328419d639f..653a651df7b 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -212,7 +212,7 @@ rec {
 
       postMount = ''
         echo "Packing raw image..."
-        tar -C mnt --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
+        tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
       '';
     };
 
@@ -277,7 +277,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+      tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
@@ -359,7 +359,7 @@ rec {
 
         echo "Packing layer..."
         mkdir $out
-        tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
+        tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
 
         # Compute the tar checksum and add it to the output json.
         echo "Computing checksum..."
@@ -489,7 +489,7 @@ rec {
         comm <(sort -n baseFiles|uniq) \
              <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
         # Append the new files to the layer.
-        tar -rpf temp/layer.tar --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" \
+        tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \
           --owner=0 --group=0 --no-recursion --files-from newFiles
 
         echo "Adding meta..."
@@ -537,7 +537,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
+        tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From ef939539f37713477f1267cc6593994ed9af77e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 12 Mar 2018 17:37:45 +0100
Subject: [PATCH 0933/2266] kde-frameworks: 5.43 -> 5.44

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 624 +++++++++---------
 2 files changed, 313 insertions(+), 313 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index d4901ba4233..85a49ce6b6c 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.43/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.44/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index af01f6faef6..84cbbe798fc 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/attica-5.43.0.tar.xz";
-      sha256 = "1vvf5d0dnfm69gahrhndy9jqxk7hkh5vj6z9pyprpl3zp5z1ki1a";
-      name = "attica-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/attica-5.44.0.tar.xz";
+      sha256 = "1ac2k3rc5dd5sc9n8qdb1d6jssjpag709sfsnvif1cvp0j8s2xj3";
+      name = "attica-5.44.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/baloo-5.43.0.tar.xz";
-      sha256 = "095z6w5qyq4z2hkdxq0vizfgv1v6g9w960wrh78b6bi1bf4ig2np";
-      name = "baloo-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/baloo-5.44.0.tar.xz";
+      sha256 = "0ybxl05njryk7zrdcwh4gbvxbn7n6xb51y2587d9bxiizasmbbiy";
+      name = "baloo-5.44.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/bluez-qt-5.43.0.tar.xz";
-      sha256 = "04bsrp0biyn7b630hywk82rwn8kl8c2rwh8iwhjz35b51jjqm2b5";
-      name = "bluez-qt-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/bluez-qt-5.44.0.tar.xz";
+      sha256 = "054zh3hc7wq13iks3nryzdns61wb56j2cvvfvsnv3yl9ni6i6wxv";
+      name = "bluez-qt-5.44.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/breeze-icons-5.43.0.tar.xz";
-      sha256 = "19yy6pcqjfbjxlkkf4g1hcgl3lv4m640sl26nblrydn9qyj5iniy";
-      name = "breeze-icons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/breeze-icons-5.44.0.tar.xz";
+      sha256 = "05ndqmprwv4dd8aib3sjmvd5481znq4jg58cpk4id1xxq4dgx9gg";
+      name = "breeze-icons-5.44.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/extra-cmake-modules-5.43.0.tar.xz";
-      sha256 = "1zgzjh5q1ppgfzj4mhprgd4848iwjnzqsnilb0dk5rgdrvfsamsp";
-      name = "extra-cmake-modules-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/extra-cmake-modules-5.44.0.tar.xz";
+      sha256 = "121gwj54f7bns386wrw6rwqmwzsny93mb00sxxzf3ic8m6mw6wis";
+      name = "extra-cmake-modules-5.44.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/frameworkintegration-5.43.0.tar.xz";
-      sha256 = "0qjpk4lslpxqj5aisczm5kl201g4z3grgjhx38r1ih4hyp805vw0";
-      name = "frameworkintegration-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/frameworkintegration-5.44.0.tar.xz";
+      sha256 = "10rqabchldra16zb0ryynvjimc67di3r4b29fbn47wg4pwj0jn41";
+      name = "frameworkintegration-5.44.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kactivities-5.43.0.tar.xz";
-      sha256 = "0rmmyjfgz8ybvdgpbqndsn0gxizxpmwhvglnnl8ia1s4sna6sjby";
-      name = "kactivities-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kactivities-5.44.0.tar.xz";
+      sha256 = "1j5v03mgh0prql51hy468k2vhskg1gyddhjlb8qlyzyzqz1aj82c";
+      name = "kactivities-5.44.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kactivities-stats-5.43.0.tar.xz";
-      sha256 = "1rrn1dxsiyvyf3pa5fyxa0sfbamv5c6g95s4f144xwrx2b130rh1";
-      name = "kactivities-stats-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kactivities-stats-5.44.0.tar.xz";
+      sha256 = "1p1vznw8qxdasb82cvjc35wnhvfhjhapx3r451kl3ly4cbjf39fg";
+      name = "kactivities-stats-5.44.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kapidox-5.43.0.tar.xz";
-      sha256 = "0c358ply0qzg269vxyg6py6l8z5j8l4h6apqcynyql4dbbbm8941";
-      name = "kapidox-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kapidox-5.44.0.tar.xz";
+      sha256 = "0mn67ckxhsav70jk1wj5qci07qyy0291rm7q54qmcl6p7a7a0vj4";
+      name = "kapidox-5.44.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/karchive-5.43.0.tar.xz";
-      sha256 = "1f3pqhpdgn00ni05iflyydkmsf3vd403ma5f42zj00kh30l9lqqf";
-      name = "karchive-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/karchive-5.44.0.tar.xz";
+      sha256 = "00mvn9rsc4lb2kamfz2xzmm0a0s1m68ar65dcfrp0n2i8plxin5j";
+      name = "karchive-5.44.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kauth-5.43.0.tar.xz";
-      sha256 = "05w8vx45mrf32kzcyjmay1k9dw3j8axbrrp6infg0hhfsgk04w1f";
-      name = "kauth-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kauth-5.44.0.tar.xz";
+      sha256 = "1ph2jlbwx27g9awfvkvrynnfwyr8yqq4x7w4msn1clh8nz9c9n0k";
+      name = "kauth-5.44.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kbookmarks-5.43.0.tar.xz";
-      sha256 = "0i7rfahn32m6xpbwra5m5nnpgq8l56jm0ijsq6f80cx8ww3nkcq5";
-      name = "kbookmarks-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kbookmarks-5.44.0.tar.xz";
+      sha256 = "04wwg9s3i3nj7im0cscdzb3c78lqg96k7vyg9ziyn2cpqmj6gihr";
+      name = "kbookmarks-5.44.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcmutils-5.43.0.tar.xz";
-      sha256 = "1dshx859k64yp00s5xx7z6x0wlawxyq41rg795nqizhk2s76agr2";
-      name = "kcmutils-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcmutils-5.44.0.tar.xz";
+      sha256 = "1fddjg89az0gfcl9gf3r7rq7hw9j8k10mvlvzq31x89hn8h7kafs";
+      name = "kcmutils-5.44.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcodecs-5.43.0.tar.xz";
-      sha256 = "0ncrzxvy2l324yvlzha9hkyp5qq75wfb9cbnxb5mygispxhrgh2v";
-      name = "kcodecs-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcodecs-5.44.0.tar.xz";
+      sha256 = "15fv3f2akjz8n65rj6r2nd5zzc4wsz67zc80bp45kqynrb1jgcjk";
+      name = "kcodecs-5.44.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcompletion-5.43.0.tar.xz";
-      sha256 = "065nzw26ps367lf3m1j6x95swk0f6grap71wjjv688gablcaz699";
-      name = "kcompletion-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcompletion-5.44.0.tar.xz";
+      sha256 = "1fy2krnxxppax13jb82zsfxky9n01z28d3kw4jx58yw1b1jm9ha4";
+      name = "kcompletion-5.44.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kconfig-5.43.0.tar.xz";
-      sha256 = "1na1b2dsajl9b9rn2990fd8cqqaj2iwddrxjacbf0ib5mray1sr2";
-      name = "kconfig-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kconfig-5.44.0.tar.xz";
+      sha256 = "1vfl7jchlrw8hkf613nb9a4f0dxyppkc97506xsknxwf1z5v7cmm";
+      name = "kconfig-5.44.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kconfigwidgets-5.43.0.tar.xz";
-      sha256 = "1qxv8m614y0j687gwcsqqkwcdwsbbwc7ivwx6l9djll4r7r1d43w";
-      name = "kconfigwidgets-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kconfigwidgets-5.44.0.tar.xz";
+      sha256 = "15a7k8ai70a061gw91aps282v1f4sric0fhyw2fysfdfv6ry92rz";
+      name = "kconfigwidgets-5.44.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcoreaddons-5.43.0.tar.xz";
-      sha256 = "10pgja1v2x5q6jyajld3yq116g1m90djnbf6p35i6n9ng65h0zy6";
-      name = "kcoreaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcoreaddons-5.44.0.tar.xz";
+      sha256 = "0lwxa326gap83qjw1dsj330qd3klgm6jwr7d77f7hyhm95d7pidl";
+      name = "kcoreaddons-5.44.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcrash-5.43.0.tar.xz";
-      sha256 = "1hvfhr3s0igc1n37w5fxx0jivsgvcdvpa5iywnkk4g1r1l6snx1b";
-      name = "kcrash-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcrash-5.44.0.tar.xz";
+      sha256 = "01dcj5cyqqn2jb6mjshjcf48jdjhmjhkqxbhhx07dy7r56r4sqp1";
+      name = "kcrash-5.44.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdbusaddons-5.43.0.tar.xz";
-      sha256 = "1h4m6ra1cangvqyzmkxkh1fld4rlvxnzz8wny53drgbyrsq2xxv5";
-      name = "kdbusaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdbusaddons-5.44.0.tar.xz";
+      sha256 = "15b7nyivkrv7s2hdahsv27p8j6q80209ayqvi3dzlhzj2b5qqzkg";
+      name = "kdbusaddons-5.44.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdeclarative-5.43.0.tar.xz";
-      sha256 = "0jbm2ih9hzpnfaqc867fvwr414q78f9jjk6yyf1cjgq8vx8rmjq1";
-      name = "kdeclarative-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdeclarative-5.44.0.tar.xz";
+      sha256 = "0byggaxfkna0iqlhp970fx8kp926dc6m99xihvja1765525i1lj0";
+      name = "kdeclarative-5.44.0.tar.xz";
     };
   };
   kded = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kded-5.43.0.tar.xz";
-      sha256 = "1kfli2f4hxc9a0hk75kgln3x374y4av6hfajhncwyq37zd4wxq3r";
-      name = "kded-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kded-5.44.0.tar.xz";
+      sha256 = "04sdsz5frwff602ls3mqwijckl3kl64lanhhpmzxc33xdniff9as";
+      name = "kded-5.44.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kdelibs4support-5.43.0.tar.xz";
-      sha256 = "1rwk436vpny3sq12bjqwapjicc3inyrq6dn34a6mr6gjcd5p2mch";
-      name = "kdelibs4support-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kdelibs4support-5.44.0.tar.xz";
+      sha256 = "1cyxry09qnlbc2khaqjpb598f4rscg80dmjcqhlsn6b1375iqkjn";
+      name = "kdelibs4support-5.44.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdesignerplugin-5.43.0.tar.xz";
-      sha256 = "0pk95vsgj67jw0qaalcrfvzkr9flxh6shkkmlaxclrz6yhnf9axz";
-      name = "kdesignerplugin-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdesignerplugin-5.44.0.tar.xz";
+      sha256 = "1fh4nw8qh563yc2parqlbrjzx6avi4gi01jzclf4bxv78zs4957a";
+      name = "kdesignerplugin-5.44.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdesu-5.43.0.tar.xz";
-      sha256 = "1mll18ms5zk7i4lpkj6qdcxwaf0h52h9mi47y882hzqkvvbnk4d6";
-      name = "kdesu-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdesu-5.44.0.tar.xz";
+      sha256 = "1p6bk7cnngwqklvm6aj5xlna6c5r6rznfbvdn7zz5h3wpzs8pqz2";
+      name = "kdesu-5.44.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdewebkit-5.43.0.tar.xz";
-      sha256 = "0yi7dv77flz7z1yjzlvrfvlybp7knz808hpfbr6hxgrp1gwi7h6b";
-      name = "kdewebkit-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdewebkit-5.44.0.tar.xz";
+      sha256 = "07mr4x55pp6wvbgnkggwalrqx9z8y9q1mmn79jkyhf2q905ynsmj";
+      name = "kdewebkit-5.44.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdnssd-5.43.0.tar.xz";
-      sha256 = "0d58aaii1r2x3nmw9s2hnk178sr54yvrqi22ry3xm3v7yvx9jr3b";
-      name = "kdnssd-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdnssd-5.44.0.tar.xz";
+      sha256 = "18x43l7ni7jwfpch4hngiyz5w05z48q8wmhm38gz3jw09w9npgi4";
+      name = "kdnssd-5.44.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdoctools-5.43.0.tar.xz";
-      sha256 = "1llif166p17ffjwsgvb0n9lq8ip3if0hqma9zm9jpghm5j21q1jh";
-      name = "kdoctools-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdoctools-5.44.0.tar.xz";
+      sha256 = "146crn9arrbi6ha7p5p0x7zmwlz86my067rif0v7j48xmmz6h5i3";
+      name = "kdoctools-5.44.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kemoticons-5.43.0.tar.xz";
-      sha256 = "161n9xg82gxvl4a4by328llxz0x4w643vcxi88414zg1bm1z1cfb";
-      name = "kemoticons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kemoticons-5.44.0.tar.xz";
+      sha256 = "1ggwyzs22907kxgapqi7md3ng1ry85gccyxbqvn638inxk299mla";
+      name = "kemoticons-5.44.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kfilemetadata-5.43.0.tar.xz";
-      sha256 = "1lxbj8fnaf6sybxgyq6h1qnic65l0mdhhxlw1djd16c7ih7ghrnq";
-      name = "kfilemetadata-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kfilemetadata-5.44.0.tar.xz";
+      sha256 = "0v8xdl0wgp67ykw5czxzvzsqzijg0qpkm5vjc9rnai7zaymxg7bg";
+      name = "kfilemetadata-5.44.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kglobalaccel-5.43.0.tar.xz";
-      sha256 = "00ygkszkklaz7k4hkshcb5gfynha8rncwvj7z9jvhd9chmwkiffc";
-      name = "kglobalaccel-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kglobalaccel-5.44.0.tar.xz";
+      sha256 = "16qhf6kb6q85p6y9zh72b4rz0ikmahvhyzmrx0jd1r044g4j81wn";
+      name = "kglobalaccel-5.44.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kguiaddons-5.43.0.tar.xz";
-      sha256 = "0z6sf4pr4ykhlzdckyfap2f41y2chrl2kwlrb4djflfxf7q2xcqr";
-      name = "kguiaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kguiaddons-5.44.0.tar.xz";
+      sha256 = "1npl2ibk7ilsicmyvlnvf42lz6qjmqp4nl607a66ikxp3kvk3sdc";
+      name = "kguiaddons-5.44.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kholidays-5.43.0.tar.xz";
-      sha256 = "0zkjh7y0gdwakil6dj0z8yi2zzczzvdfhmnsd54s5yn0fvv37xbk";
-      name = "kholidays-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kholidays-5.44.0.tar.xz";
+      sha256 = "134zxnkclh16gh0qf2ak1pmhlxxwrcgzgmkn5wrynwraplf9b812";
+      name = "kholidays-5.44.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/khtml-5.43.0.tar.xz";
-      sha256 = "034aycdi7i6pvwkwz632nzk3vp8040hlvmzpp38nsy4idl4klh46";
-      name = "khtml-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/khtml-5.44.0.tar.xz";
+      sha256 = "1sph90cfwq0067a6ih8mx1bn715lvsspn6s9lijmm0ck9vbbixgp";
+      name = "khtml-5.44.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/ki18n-5.43.0.tar.xz";
-      sha256 = "1zspxv6z4a3rarrn9n38g7rp0gc48bl4kih91m3r2nkap83jb04a";
-      name = "ki18n-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/ki18n-5.44.0.tar.xz";
+      sha256 = "1rg24i8ks5mxryssq0zdig0q545zyj4svy9kb6r84qwag4vn7pcc";
+      name = "ki18n-5.44.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kiconthemes-5.43.0.tar.xz";
-      sha256 = "105c892d4np4lshmd5f5x74m1ib3fbmvwgjzf6j317mq261r3rsw";
-      name = "kiconthemes-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kiconthemes-5.44.0.tar.xz";
+      sha256 = "1xkrczqw332hr667qp9pwlkypcn9d6zkx51bmi4bg9xfgpg1pwz4";
+      name = "kiconthemes-5.44.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kidletime-5.43.0.tar.xz";
-      sha256 = "1jm2rdbzffnw0fv1pzfyz5lvzaa3x2pfp12zm9kl7skyj39z5vbj";
-      name = "kidletime-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kidletime-5.44.0.tar.xz";
+      sha256 = "1zf8rspn603hyz1rr3rkslnij7883f4ha0ls6v5phh19jdp9hcis";
+      name = "kidletime-5.44.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kimageformats-5.43.0.tar.xz";
-      sha256 = "1bn4rx5xx68m101n3ba774pd8qddaw3bwf2bc7zp7gi6d8bprh9i";
-      name = "kimageformats-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kimageformats-5.44.0.tar.xz";
+      sha256 = "1zpz3a4wghh348is2yyfs5qhhkg0261p5v2khxcgcy6vpblv1h1j";
+      name = "kimageformats-5.44.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kinit-5.43.0.tar.xz";
-      sha256 = "1jrzr4kv84rvf214wszd2zdnvlx2qxvr1ah9f564h23vvdrg79gd";
-      name = "kinit-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kinit-5.44.0.tar.xz";
+      sha256 = "1v3zmlmh3yg9333v7ha1xg3hp7ig2q8w7ixyzww5a5q4gxpzz9z5";
+      name = "kinit-5.44.0.tar.xz";
     };
   };
   kio = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kio-5.43.0.tar.xz";
-      sha256 = "1mbjld1kh5hhslfm4rx9nddghkcgrxbw2pf39c7niq0r1llx5v76";
-      name = "kio-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kio-5.44.0.tar.xz";
+      sha256 = "1dvif1779kh8d8yh6svmbs2yhvprzc38hchd4wb4l70hmzqcd3vs";
+      name = "kio-5.44.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kirigami2-5.43.0.tar.xz";
-      sha256 = "0vshabb1q5pjscw0g57l7lpaal69g1mdpf01w0yskmbiqnzzpjl0";
-      name = "kirigami2-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kirigami2-5.44.0.tar.xz";
+      sha256 = "1vvq3c2j9v07ngkm3c8hwvik80sfd7i20ga7hyx4i94spjcagj6h";
+      name = "kirigami2-5.44.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kitemmodels-5.43.0.tar.xz";
-      sha256 = "1yw7h7g0knlljizsf9cir196v22cqhlaazmrbm6jqz198g47sqdd";
-      name = "kitemmodels-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kitemmodels-5.44.0.tar.xz";
+      sha256 = "0m63i10nvgp86ajsd7aizah4g21dpwxrs2lvglv0kybhaykziwa8";
+      name = "kitemmodels-5.44.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kitemviews-5.43.0.tar.xz";
-      sha256 = "19w6xhhxr7w40baw6i6lfq0fd7bahxfzr7pj10mrwb5i6bcbsk1h";
-      name = "kitemviews-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kitemviews-5.44.0.tar.xz";
+      sha256 = "1vg99figpspm0p7ipbgf94j4xarcf2zicm3rijywxfcwcl0sr99h";
+      name = "kitemviews-5.44.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kjobwidgets-5.43.0.tar.xz";
-      sha256 = "1kri6z737abwsglh29bh4kckbf1ici8n162lcyvw8b3w91l4dyc6";
-      name = "kjobwidgets-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kjobwidgets-5.44.0.tar.xz";
+      sha256 = "1c26vdq8sqja95scqbvm0y2zhl1qx5aapkadi44vrjf54q4kgqrv";
+      name = "kjobwidgets-5.44.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kjs-5.43.0.tar.xz";
-      sha256 = "1jdqdy1kxarv6k31yd0k280jyfy7y3qwgd9c7is7aya1ns46nx59";
-      name = "kjs-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kjs-5.44.0.tar.xz";
+      sha256 = "1y350xgxip9qlwzanzlbyj4mb7i53msldv2wmacdp2di1hxn8ihy";
+      name = "kjs-5.44.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kjsembed-5.43.0.tar.xz";
-      sha256 = "11hcwwhkrl7sns4s36nxnp550n9xvky1rkrissm0mqh76309g6hy";
-      name = "kjsembed-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kjsembed-5.44.0.tar.xz";
+      sha256 = "0d71pnfx5fylxlpc0m08i1qasnrk0jvwmcv7zr7r8fnfagjl7gpk";
+      name = "kjsembed-5.44.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kmediaplayer-5.43.0.tar.xz";
-      sha256 = "1q1s5v3fqnmxx58ixgdhkhrgkrdxy8mq8hg4ll7l6038lgycfsxf";
-      name = "kmediaplayer-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kmediaplayer-5.44.0.tar.xz";
+      sha256 = "1nwpx2y8bl92m8yxk5c3sw7a0zm50hfpfrcicdqpv7nfs4n70anj";
+      name = "kmediaplayer-5.44.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/knewstuff-5.43.0.tar.xz";
-      sha256 = "1v3wzydi1jqb9an2bnxzfhwxhlb2lj8l735mdhym4859njj8x7w7";
-      name = "knewstuff-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/knewstuff-5.44.0.tar.xz";
+      sha256 = "1sd5780gpxidlc9g3dmd38ji5q5c1va49r604x5y739wjdrsgm0a";
+      name = "knewstuff-5.44.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/knotifications-5.43.0.tar.xz";
-      sha256 = "0kgn5h38z9xd5a210w989j3z0khs4l9ahf19lqfara1ziwl4gaiv";
-      name = "knotifications-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/knotifications-5.44.0.tar.xz";
+      sha256 = "137snmjix1jji1vn40vxsnigddz7xxlkkch1rag79f6dqjnswb76";
+      name = "knotifications-5.44.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/knotifyconfig-5.43.0.tar.xz";
-      sha256 = "0nrjxs263sp64h9pmrmr7fjkbpkalzr6crpyq0aqclciwfjpj326";
-      name = "knotifyconfig-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/knotifyconfig-5.44.0.tar.xz";
+      sha256 = "0122w5mklyr958284824qzxxp76hacnf8zgv58b9ihr5finc919z";
+      name = "knotifyconfig-5.44.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kpackage-5.43.0.tar.xz";
-      sha256 = "1nr7zkqp7zbvyrhc7iqznyqnfhmnqhhaqs30ig4gwsagq3x2a02b";
-      name = "kpackage-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kpackage-5.44.0.tar.xz";
+      sha256 = "1av8m9m7by0j128779rhws0pjc3hhi37cp311nks5sa5mmpbksmz";
+      name = "kpackage-5.44.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kparts-5.43.0.tar.xz";
-      sha256 = "09i2ds6xgkbm9k9nd9yj1p3qw9xl3a25lh97ln9c39ccx32i32wd";
-      name = "kparts-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kparts-5.44.0.tar.xz";
+      sha256 = "0bbf17y8nnd1gbhdnffhgj9xn1wjida6a7qgwi16k3zp4yjmpgac";
+      name = "kparts-5.44.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kpeople-5.43.0.tar.xz";
-      sha256 = "0xi6sxprqvmjc30cw1rfpryahid9dswql6b1wrdv5wsmci8k4xmq";
-      name = "kpeople-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kpeople-5.44.0.tar.xz";
+      sha256 = "0gp602c2wq2ipbsan84r11a14xqpzyfszhb4lw3qkd7y4dpha37i";
+      name = "kpeople-5.44.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kplotting-5.43.0.tar.xz";
-      sha256 = "0d5mf5xaysw837ninvdx1hfra8qjaxd9lcm28fyjfm506iq8v09f";
-      name = "kplotting-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kplotting-5.44.0.tar.xz";
+      sha256 = "0ccgpbccfrn4c4wri80zm8ni8390jnqywh4k1z5r68hzmr3l79xw";
+      name = "kplotting-5.44.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kpty-5.43.0.tar.xz";
-      sha256 = "09m02ramzk6jc9scnsvcm2sgnia2vmnnfgmjsddspc2kp1aj2km8";
-      name = "kpty-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kpty-5.44.0.tar.xz";
+      sha256 = "08jxq693mkwxr45696nz05f2zxa16finvacif330r6s03izvwfw0";
+      name = "kpty-5.44.0.tar.xz";
     };
   };
   kross = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kross-5.43.0.tar.xz";
-      sha256 = "05px64msss6as0pbrpl6l4y2n97kayphxqhwfilgsj9yjmyhm46h";
-      name = "kross-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kross-5.44.0.tar.xz";
+      sha256 = "1gq2cg3gq40rqih0kflfxl2n5l7j4gli0w57xnfhc39xpkpd1cqv";
+      name = "kross-5.44.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/krunner-5.43.0.tar.xz";
-      sha256 = "1wiaaz7wc2ls0gxyyws7cw6gmphkzayhdz1xxsyn4bzrc1h3z7dw";
-      name = "krunner-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/krunner-5.44.0.tar.xz";
+      sha256 = "1zr3zm528p4agw8d7krm4drs8638gfmbnm011r9kcmpjadkv0ila";
+      name = "krunner-5.44.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kservice-5.43.0.tar.xz";
-      sha256 = "1mdxd8kxawlhrsnd9lrx6cx9p8gvvsr9mx2d1s0bi90kapfqyqi3";
-      name = "kservice-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kservice-5.44.0.tar.xz";
+      sha256 = "0gzp8sbf0mk7nhy1hz9m3fz97lkwijpxwf2l2ljz375ylf374iyk";
+      name = "kservice-5.44.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/ktexteditor-5.43.0.tar.xz";
-      sha256 = "1rhw1y0js2vjjp7c9f539lvqvci4nrgdicaypw3p5ndg8vsw2xag";
-      name = "ktexteditor-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/ktexteditor-5.44.0.tar.xz";
+      sha256 = "1g0v5sax3pfkvdcvyxyz81j3ainm0n1m7nc1rxh106iz8gs0z9cn";
+      name = "ktexteditor-5.44.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/ktextwidgets-5.43.0.tar.xz";
-      sha256 = "0h5bxf1a9mik2p2xhnm7nnr0r54s6zf4cby4qd8nlwl292dyf8gy";
-      name = "ktextwidgets-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/ktextwidgets-5.44.0.tar.xz";
+      sha256 = "1kxh39n9gzism99x1x7fpdqkppdpn7aaj6j3wp4a4y4hrn82bqwp";
+      name = "ktextwidgets-5.44.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kunitconversion-5.43.0.tar.xz";
-      sha256 = "14syfc9vybmaais740xmb79g7ffpyanwkb2blar88zm810dpshqd";
-      name = "kunitconversion-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kunitconversion-5.44.0.tar.xz";
+      sha256 = "1zr7m1wmyr9phg3lq11qm0l24kkc1zh6xc3x4hcrpv1yn458qxdl";
+      name = "kunitconversion-5.44.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwallet-5.43.0.tar.xz";
-      sha256 = "01mxl06nbpgkp6dva1kvqcbhjahgjqkbql6rhwgdyhb4asabnsmj";
-      name = "kwallet-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwallet-5.44.0.tar.xz";
+      sha256 = "01bah8rycjhgycd2bfkxj5jwfrwdbi2ba6bis79kbiaacl0q0qns";
+      name = "kwallet-5.44.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwayland-5.43.0.tar.xz";
-      sha256 = "0glp9bnv53jjycwni0ywd7apr0jps3j0hpzs14y2v9bp4mwjgaji";
-      name = "kwayland-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwayland-5.44.0.tar.xz";
+      sha256 = "1pq8gikwcq6p67whhfm653xq79cdwr48br5ydism06644ikc2nlk";
+      name = "kwayland-5.44.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwidgetsaddons-5.43.0.tar.xz";
-      sha256 = "15x7k953jj6vqmb2bbw4wad2n10akkg4i5n0gmkj4fsaiag359sr";
-      name = "kwidgetsaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwidgetsaddons-5.44.0.tar.xz";
+      sha256 = "11yaqwqkmwvhn9phmsfgyfl229zcrikdi3hz2w7nk8ibraagn5pi";
+      name = "kwidgetsaddons-5.44.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwindowsystem-5.43.0.tar.xz";
-      sha256 = "0zcrls3m9np2a9r5n7fry03ll6vrj36abjh2sajm531z657xmxjd";
-      name = "kwindowsystem-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwindowsystem-5.44.0.tar.xz";
+      sha256 = "0qn02c0yq1ir7vb56jhlla8j7nm6yx725hxnw31b8i62k1i7nvqy";
+      name = "kwindowsystem-5.44.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kxmlgui-5.43.0.tar.xz";
-      sha256 = "1jncpyfvanyl02zx8zi2mmwbx86yaq9k7k40vh716dswbh2idzd3";
-      name = "kxmlgui-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kxmlgui-5.44.0.tar.xz";
+      sha256 = "1qr6j4cnndb14fdppc2mpbqgk1mkjfdxyl5pl7gjrwd8558brjg2";
+      name = "kxmlgui-5.44.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kxmlrpcclient-5.43.0.tar.xz";
-      sha256 = "0c99wq7kqaqvafppcai47q8w9n21ncfmrc562cvhyqnx9qr9n5vn";
-      name = "kxmlrpcclient-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kxmlrpcclient-5.44.0.tar.xz";
+      sha256 = "1r6mcwgagnskh8jiy2fyajgzqacw03d2qfk1fb3vv4lfwry4h2j3";
+      name = "kxmlrpcclient-5.44.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/modemmanager-qt-5.43.0.tar.xz";
-      sha256 = "16h8af046jlhn31dg1y3ajpniidkijf0wy0qa7z6bpqw01vj4l6w";
-      name = "modemmanager-qt-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/modemmanager-qt-5.44.0.tar.xz";
+      sha256 = "1dkbyn6y605i8xqwqvpxmspp0fh7zarc0h54k30rnvv1g9rs1dd4";
+      name = "modemmanager-qt-5.44.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/networkmanager-qt-5.43.0.tar.xz";
-      sha256 = "0pkm02bg201xcxyn2cbw1w3gag9ig4g5yz4wbd2db6qzvficmfqc";
-      name = "networkmanager-qt-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/networkmanager-qt-5.44.0.tar.xz";
+      sha256 = "0bhsminn31b8w1678im5zqixmyx1m5275szca9hh7wx6dl0sxhlw";
+      name = "networkmanager-qt-5.44.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/oxygen-icons5-5.43.0.tar.xz";
-      sha256 = "13c80jnc6h2z9bbwwzq1b8jsn80n4bs0zzr2xsbzsfbl5sw0hwpc";
-      name = "oxygen-icons5-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/oxygen-icons5-5.44.0.tar.xz";
+      sha256 = "0ymd9s26x2ryyw851y4yb2wl9f3syzfp0z08387h90jg6xk36si5";
+      name = "oxygen-icons5-5.44.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/plasma-framework-5.43.0.tar.xz";
-      sha256 = "1v7far0jz0b0rvx4jzqsq2pp1diny5c2qz67jyxnqlfgsba8y466";
-      name = "plasma-framework-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/plasma-framework-5.44.0.tar.xz";
+      sha256 = "1lfrmrgamizfkr9jmfmf3afis0z40r1chpk854pqfr4p27j4gdmz";
+      name = "plasma-framework-5.44.0.tar.xz";
     };
   };
   prison = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/prison-5.43.0.tar.xz";
-      sha256 = "018kj3xgl5wr3nhrasxmwvk6fh63fdwlz78z1rzyd78jx95wpaqc";
-      name = "prison-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/prison-5.44.0.tar.xz";
+      sha256 = "0glcifwjm50kn6fk3lvwpslmh4s6s8g5r7h208dw56n19yhpkrfm";
+      name = "prison-5.44.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/purpose-5.43.0.tar.xz";
-      sha256 = "1vk796f3w2arqaql16yy012211vxgz6awa8kg0p1zrxbid43x757";
-      name = "purpose-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/purpose-5.44.0.tar.xz";
+      sha256 = "1scc2vbb5ws70kvicaay634ghgp2c7xhm7d907b36jj9gvyp4d2f";
+      name = "purpose-5.44.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/qqc2-desktop-style-5.43.0.tar.xz";
-      sha256 = "0q6v1si1c8dlvq5f303dd4n1qqrn9kw0r51dl37px6rvy2n16d0w";
-      name = "qqc2-desktop-style-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/qqc2-desktop-style-5.44.0.tar.xz";
+      sha256 = "02s22xncpy988fbyjj17j5saamaf8q0sll4gd2s5xsswmalvnb51";
+      name = "qqc2-desktop-style-5.44.0.tar.xz";
     };
   };
   solid = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/solid-5.43.0.tar.xz";
-      sha256 = "0q62z23dml6rndgmkg6r09gsi0in8c4gbgv66dw47v02spsnp7v9";
-      name = "solid-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/solid-5.44.0.tar.xz";
+      sha256 = "08xw54m5srjr5n1h689hd05ld7ssimwvhlb9dlpxdavkag1vbqq1";
+      name = "solid-5.44.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/sonnet-5.43.0.tar.xz";
-      sha256 = "0i5vxaw124093fi7fi8gjyi08xgxpkpb68lrpsxqdikadvx6nwaa";
-      name = "sonnet-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/sonnet-5.44.0.tar.xz";
+      sha256 = "1dip8h9frxvzy39cjc205y2szdpczyh1fldlcpcq8ckjfk8pmgdm";
+      name = "sonnet-5.44.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/syntax-highlighting-5.43.0.tar.xz";
-      sha256 = "0a1xrpk3wavcq6d3cld33l05g5xlhz635vwcc6i1092gsgdns7k1";
-      name = "syntax-highlighting-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/syntax-highlighting-5.44.0.tar.xz";
+      sha256 = "10s5m1as9c1kln8mc7zf2m8zsqrf9rxfa2rzfyff1kki1icp65nm";
+      name = "syntax-highlighting-5.44.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/threadweaver-5.43.0.tar.xz";
-      sha256 = "0mmnf6lirvqwlrijpn5vqd8l9pk74dpsbr81y6kyfmx31mj36jjx";
-      name = "threadweaver-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/threadweaver-5.44.0.tar.xz";
+      sha256 = "135x9z1rzvlhx13nbkacmcj7g0z88rpv0c2vy8yybysfaspc1hzn";
+      name = "threadweaver-5.44.0.tar.xz";
     };
   };
 }

From d7470c1f1e401cd3265a511871dafef4f8cafad5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 13 Mar 2018 16:08:09 +0300
Subject: [PATCH 0934/2266] android-studio: fix GTK LaF

Closes #36887.
---
 pkgs/applications/editors/android-studio/common.nix  | 6 ++++++
 pkgs/applications/editors/android-studio/default.nix | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 2c2227dd4ee..5e6d44807ee 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -29,6 +29,7 @@
 , writeTextFile
 , xkeyboard_config
 , zlib
+, gtk2, gnome_vfs, glib, GConf
 , fontsConf
 }:
 
@@ -95,6 +96,11 @@ let
           libpulseaudio
           libX11
 
+          # For GTKLookAndFeel
+          gtk2
+          gnome_vfs
+          glib
+          GConf
         ]}" \
         --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
         --set FONTCONFIG_FILE ${fontsConf}
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index e3c9fb5b14a..382066d1dbd 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, callPackage, fetchurl, makeFontsConf }:
+{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
     fontsConf = makeFontsConf {
       fontDirectories = [];
     };
+    inherit (gnome2) GConf gnome_vfs;
   };
 in rec {
   # Old alias

From 0fe236dbf28c91971442dfb07697b2b5b02f3885 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 13 Mar 2018 14:11:15 +0100
Subject: [PATCH 0935/2266] dtc: fetch over https

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

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index fd02f779b3c..b342bd94585 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.4.5";
 
   src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
+    url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
     rev = "refs/tags/v${version}";
     sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3";
   };

From 7e3d181160728e2904732f2095d517fcd375b873 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 13 Mar 2018 14:11:35 +0100
Subject: [PATCH 0936/2266] netpbm: fetch over https

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

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 1f1dd363233..fcd347182ec 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "netpbm-10.77.02";
 
   src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/netpbm/code/advanced";
+    url = "https://svn.code.sf.net/p/netpbm/code/advanced";
     rev = 2883;
     sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f";
   };

From d9d21b67345c3be39fa8dd0de7781618e86ac338 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 13 Mar 2018 14:12:00 +0100
Subject: [PATCH 0937/2266] diffoscope: fetch over https

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

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 894079fad84..1987c6aed0a 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   version = "91";
 
   src = fetchgit {
-    url    = "git://anonscm.debian.org/reproducible/diffoscope.git";
+    url    = "https://anonscm.debian.org/git/reproducible/diffoscope.git";
     rev    = "refs/tags/${version}";
     sha256 = "16xqy71115cj4kws6bkcjm98nlaff3a32fz82rn2l1xk9w9n3dnz";
   };

From bfc75b51982ed081e5034ff9cf5cd3de31a65160 Mon Sep 17 00:00:00 2001
From: Lassulus <github@lassul.us>
Date: Tue, 13 Mar 2018 14:57:58 +0100
Subject: [PATCH 0938/2266] altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0
 (#36715)

* altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0

* Update default.nix
---
 pkgs/applications/altcoins/bitcoin-unlimited.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 23d9e63459a..d9040377ebe 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
-  version = "1.0.2.0";
+  version = "1.0.3.0";
 
   src = fetchFromGitHub {
     owner = "bitcoinunlimited";
     repo = "bitcoinunlimited";
     rev = "v${version}";
-    sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
+    sha256 = "0l02a7h502msrp4c02wgm7f3159ap8l61k4890vas99gq7ywxkcx";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From d2582dc92a2a18ee3c54098e08c97aec4554d852 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Mar 2018 15:30:58 +0100
Subject: [PATCH 0939/2266] samba: 4.7.5 -> 4.7.6 for multiple CVEs

Fixes CVE-2018-1050, CVE-2018-1057.
---
 pkgs/servers/samba/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 187e79da43c..ba7e9c923e3 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.7.5";
+  version = "4.7.6";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "13gyr0sk9vx6mccr2h35ca3g92kp50cqxrlzfgrddfmskzx08v9i";
+    sha256 = "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y";
   };
 
   outputs = [ "out" "dev" "man" ];

From 4f17851fb2e63b704627b7b22fa72c5fd8d3d95c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Mar 2018 17:14:15 +0100
Subject: [PATCH 0940/2266] fetchurl: remove broken samba mirror

---
 pkgs/build-support/fetchurl/mirrors.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index d612db64c12..b0d3f373a46 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -129,7 +129,7 @@ rec {
 
   samba = [
     https://www.samba.org/ftp/
-    http://ftp.riken.jp/net/samba
+    http://www.samba.org/ftp/
   ];
 
   # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .

From e0bf8113bf05f66077db96ae6d31609dd12e8f1a Mon Sep 17 00:00:00 2001
From: Eli Flanagan <eflanagan@innovu.com>
Date: Tue, 13 Mar 2018 12:30:51 -0400
Subject: [PATCH 0941/2266] timewarrior: enable for darwin

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

diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index b2dcd418fb2..42f3d1646c5 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = https://tasktools.org/projects/timewarrior.html;
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer mrVanDalo ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
 

From 7da70c0b87e56375f24584c18faa10b95803c3c9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 9 Mar 2018 16:33:18 +0100
Subject: [PATCH 0942/2266] freeorion: fix build

`boost::system::posix_error` is deprecated since v1.37, however the
default Boost version in NixOS is 1.66.

The following upstream patch fixed the issue:
https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95

See ticket #36453
---
 pkgs/games/freeorion/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 3d7e132e612..011812580e7 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper
-, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, libGLU_combined, glew, libxslt }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, graphviz, makeWrapper
+, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff
+, libjpeg, libGLU_combined, glew, libxslt
+}:
 
 stdenv.mkDerivation rec {
   version = "0.4.7.1";
@@ -19,6 +21,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
+    # fix build with boost 1.66
+    (fetchpatch {
+      url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch;
+      sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94";
+    })
     ./fix_rpaths.patch
   ];
 

From f043e09e0239c58e01165f61076723cd59be7eaf Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 13 Mar 2018 17:52:50 +0100
Subject: [PATCH 0943/2266] qutebrowser: 1.1.1 -> 1.2.0

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 2f9170eff87..426d91d3455 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.1.1";
+  version = "1.2.0";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "09fa77rg1yrl8cksavxmgm9z2246s4d8wjbkl5jm1gsam345f7mz";
+    sha256 = "0za0iiljs86y2n4znwk8cgn948xcv8iv80a9qfm87zl18y3ashly";
   };
 
   # Needs tox

From 2381bcd86f3bc79fffc025ffd99ea75ae5a9b7b5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 18:04:29 +0100
Subject: [PATCH 0944/2266] maintainers/scripts/update.nix: use saner nubbing

---
 maintainers/scripts/update.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index cb819a053c4..c637540a5aa 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -6,11 +6,22 @@
 # TODO: add assert statements
 
 let
+  /* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity.
+   */
+  nubOn = f: list:
+    if list == [] then
+      []
+    else
+      let
+        x = pkgs.lib.head list;
+        xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list);
+      in
+        [x] ++ nubOn f xs;
 
   pkgs = import ./../../default.nix { };
 
   packagesWith = cond: return: set:
-    pkgs.lib.unique
+    nubOn (pkg: pkg.updateScript)
       (pkgs.lib.flatten
         (pkgs.lib.mapAttrsToList
           (name: pkg:

From 43da40ecae3a49c2bdf42a5fdb6121bf3578350d Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 13 Mar 2018 19:16:11 +0100
Subject: [PATCH 0945/2266] firefox-bin: 58.0.2 -> 59.0

---
 .../browsers/firefox-bin/release_sources.nix  | 780 +++++++++---------
 .../networking/browsers/firefox/update.nix    |   2 +-
 2 files changed, 396 insertions(+), 386 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 0fbe6d749c2..b28d4645c38 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,975 @@
 {
-  version = "58.0.2";
+  version = "59.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ach/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ach/firefox-59.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "4f974e90d5db09a02c61a634f7309ba479f8699d1d61f4c21a7bb6ae5f520332292031ce0988605f8e727da5161de1b3a055da59d5f8bf220c1b369f9c453f17";
+      sha512 = "12e4398b10c4e2c6364307098307895afd2a5054f729be61230a402b7fc7e55371b1ae04693f3aa87ec1d8a537d92174be1b61bef601d41ba821c8f4a4c4353b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/af/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/af/firefox-59.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "d821bf5c1fa1bc38f64195d1bfbc7ce5205b50139710fde6e1db37c4a429a0df16ede8411a618d8e339f369dac699a38651c3aec9952d7c20fb84e1eaf1f59de";
+      sha512 = "5e5f7febbe069692edcf4e1e91cb1f2cf5b54b66e3f8e77c4920f5f64011f426fcd69f04ed8f84cee569f7cb7d11445dd59c6e308a58927e37955f8bbf75f166";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/an/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/an/firefox-59.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7238e49735bab7983a478c217b128d7cc8b07e90fc5e2739eaf07e35be054a354c5c0006bae6fdb29ef71855c33ea531e84c1617832412315eb2e07ad7310d14";
+      sha512 = "50f0e7b76401de5c5f30fb58920263b2f4221a02ca0e9f987e19d0150eab3b81da0f9c28f0c6b711a7666abc3a34f22e820c4a3496fb73bd2d736f8cbf2691f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ar/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ar/firefox-59.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "f505930eed9262e595a8969dc86ed43c04f32ba62301b2fa8d1246ef956f3075d5633112e6129707ddb02d3047b93a5c9f5ce16f958a06ad928c59d64c8a1e75";
+      sha512 = "d0d77e62ef730af02ef24794099e022296563906019f955861886aee3306aa8326ee5c89e0cd3734640b2253065ddeb1f6941a689593b616fb741e5d52c3a157";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/as/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/as/firefox-59.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "e1b876dee0ac09a391c53f066f5bf56fa6b0b4bcb389beb0844670a7f14ff422a230f58389f3c3d2a1f8b7486fe528a7abbe3b6abfb86c330ea13cab0cc67a7f";
+      sha512 = "2b6333d2e36d44d45d64c53481e82b110a03a18b6156b7d2b0666645a193b116112e3c061c3a07d96b1001b4e8842821f52f3ee1dc6676c44d2b1ae89087d5f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ast/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ast/firefox-59.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "1c47fae696cfcbdd4f7fbbc8ddeacbfa1ae1b9a624bec9f512527b99c7ddd63c99fd55b60ae9a3ea1104fb5b943c8c029b19b93e6426de793788c2a5354a0d57";
+      sha512 = "c21a0e8b1b4c4a6e7eaf9558d2ec72fcbddac12e5b75c066596c57687f02559ed15dedcd5e1a5b6d719664b086ea2b9c17a6dae51ac85a6a0019a8a44f50bf4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/az/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/az/firefox-59.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "5c3bab4ba81967b957c14152f6461ccb129396562ece07a34644f88b67185f9d6639ce3bd709a463816efe531c6e8bf3aa6414828feb37ae54564d1c9ae237fc";
+      sha512 = "c057c7c73a9946aa8bafc535e3da57c59037c7150d9b3152ed993587999068712d05dc6625c1a36c38665f5495b4d147f48d962479ea849073f76e7f218e5330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/be/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/be/firefox-59.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "8c719a8fcaef9f2f3ae50d0ecd999972649b5814c1bab45a418c474b6090bbcb47d58a32012f3ccb6c785ca9a1c76cb2f69e370714e1533349806c3db0364dd5";
+      sha512 = "51403b2a65b4c4f3839b53793cb88d941e50c5b14d63f2690b3490b63d9bdef7c12c82d2ccedd633d9811b01dcadae9b94d5c6a5c6bfd59f7a1710c2cb1d8ae0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bg/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bg/firefox-59.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "b871aa3dc5e4721174e73081e4c551f802a16cb54690ea1850e549c37c1160000b9eb0e312fe03e43d8e254cfc063d971625624a6d0d7a8de14f731d1e139135";
+      sha512 = "5251dcbd0c87bc2d41f7ea1487e9ca4aff80bfaa8ed2be8a76ec96388587b41cf9a4a80f8936c9b770fbfc9f3d1b1716f6f8d591b6bd523e3bdf0baf35e8b5b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-BD/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-BD/firefox-59.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "53cfa7aa2bcdebb6770d1d993d71a0fd039eb540884d0dbe3d0fc953260a850bcdf72b20eb67d11630aafa9f282cab279776fa9d5cb45aeb7280dfd064b0199b";
+      sha512 = "3010153a9285c5f85eaf5910d93ccf64fc903db34ad8183ca7841040cae522b004d257bd17325d5fe333714baba4f300ab9b1ccde920568f849105acc4f5fbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-IN/firefox-59.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "a47f5c6bb46f6f4a2af27a8dd1556339ba5efd1b2c23494b0913033580dc735097eeefd58a6c0253d74c8fab30fa628d106a0f4111b0b5af5f98b1dd2d9d111d";
+      sha512 = "12f013cad7391649482bae272899a74d0981df94693105fce9e22fd7ca9c28bd992c2f80cc68ec5e70713d82e21cb015af5a3469b7868b89ea182d2b8b41a52e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/br/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/br/firefox-59.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b4dade4de1e40f8ef6c1af9fa260f7e06bbae6790a87813032c35317fa462f15905fa8b66c8b08bae640186f1fe6d10c15c87d64085d6fd23e5dd7a33cb9326d";
+      sha512 = "f00b92c8328e7e97abc5b1f4233a49f9af396cf147e4ca0682b54c541fd40d3c03252464d6ad888cad06f8e79b6d02432e86f944d297457a4cca2fa668f3722e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bs/firefox-59.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "d32cd117524343cf451b30526466b84f84a7ab99f6e716ccff5c1c7e768003409723df93ee8839ca00d3e0a52cd9cba270f78033124809e4d18942bae9c736e0";
+      sha512 = "70af2412a775157473b3018c630d6786c650cdbd5691ef893e91807020d360c37a3031771442f3e16d678658ac045bd4fe8393a35951ef9edfa77242785c6b41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ca/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ca/firefox-59.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c4063632526c6936e71e50a898077568cf678a8f9275258311bda91ca0a150b7c30b19b86cb12bbf786624675ed3f383ba21b52545b36f8ef7032ef9001136e1";
+      sha512 = "6cf8206a6b92878fe6cc789619eb92f231d758faad1cec562329399529dfa7671dd2245301be7d75e98afe5714185826f4ce13748a01c768bf186805be579488";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cak/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cak/firefox-59.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "cb1f2142d698226ff881e9b3a1037ddbea1bc3ffca8ae98a7526bc3a6b728a3e30957196d809d523a638d7482db3e60b774de8f7f274c76982962026cebc0b9c";
+      sha512 = "01891976a3053fae3d8ad723456e2003afe75aa7904549f2d9e5cd3becbc3e33c3ae73755ebe6b92d9bbe05a2f3efb52e0794cc6a3f1c00cd9b376cac6f85818";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cs/firefox-59.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8b17ed6a66081f445319a6e329710350f79751388e1cc6eb6f5945e0c0e6145053904ee2a1c1a562407299518eb8d97a52d86a0d4807f8711ee3ba6521f23820";
+      sha512 = "d307d2a2be21ca964e2bb48ef062ca4a84229108d8047e601cd9f650fb0c0445f477d08e48cc6fa3a6fd0f3877a2c65527ce98c6e42a85aa8b1734ac0467b9de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cy/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cy/firefox-59.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a679e779b6afda954fde1bfdf079eca62e4541bb5c0398e8fe797e3ab8341922c279d1eb5d4f237995d01d39261f9b6f814540532c646558b10cef178870d5bb";
+      sha512 = "0d5eb86ca615908701972a03e12ab2485ecaa22ba6a5263ab4bd748fa91d5ce1aebea2cf86249e25fae46a3e50404d2f91d10937da6e85d9695ec70f04b92857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/da/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/da/firefox-59.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "81771c6a78ff9349ac8086dce32900544d0a8b79eca55a61bc1efde34788a77fd41607c43403bf1df18f2f6aee8b61460e113ee301c2888494a970600fb4a371";
+      sha512 = "f304162d5da09f87b318dd0c9f769d8a0dc37d205b1a1cee316b807c6b9ce80d5252af1e5fdef8da9d2575d5722d37cd15ea1cea587670695e1c3b577006050a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/de/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/de/firefox-59.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "cef7eebf9dd55af3d7245161c6f41153b99cefdb73e71c5cfaab1d8f1037c8da7ee2f36836e51416c36f7a7472b113bab23fa6a35ce30269733889ecd4aa1d5d";
+      sha512 = "699ecbc68675286294d2917e5d024ba4705d8644a5c43aca5ccd5cce43f06717d853c109290806990909e55f0fa47ef308d9c1a9818502b1f9ea527c5d38dd60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/dsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/dsb/firefox-59.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "986c25e9f994ab766f4017f664304c03cc0a26c8ea50f892d48ff571322aeaa6b76eb1f4c7f1133a68783a9f55ce0e56a6cc599fb6eae0431e5bccec639504d9";
+      sha512 = "050e15e9e82638bd70a8a3ae845da65bf7021bab70411ed33b686b14aa8ac96a694f85a4ddc36b074ccffd63704c88e77010d24943bae6ba76c506cd2c2fcd92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/el/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/el/firefox-59.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8d352b56ef049e2bb94952ebaca276dbfa4d7ea34ad368907406b67391d618e8aa2f908c19f3c7210220237d3721021686bc8fa0702c748680035a48b9ff2c4e";
+      sha512 = "5655883ffd4d55900b50fec19436c475c78a6d9616c277b1b547b9054674343a187f3cb0d637e08c45695994ab9173d4cd0fc24a0dff9770aea9f7defa9e53af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-GB/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-GB/firefox-59.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "318a67d7d875a350e561a2a4e0f2d6278ce3a9f7e2db9ce307c58b5a2ffd40753edbfce01438c7b02421efa84129f95caf3887ca2929271ce5fe95f9321db11a";
+      sha512 = "059034d9f6be9153111e173b4c55a8670a94675aa574bd0f0859c93c0f32ae949b849bf77816f68f4e6b726bb0cc5ee2ba1b68c7c76beb72b2fe99a91183e296";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-US/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-US/firefox-59.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "71f5d1d3779eab4025ab57aef1795f9d6c509a50c5397df6a8ec741584d441acb9f7cbf8c8c002cb367c9c42b72dd6d29710fcf0cfead3a4525f2ccf39f3b930";
+      sha512 = "0443db32335191e1cc2f65512c692663aaa1ffcf05875b9d955a9afc7a651999e0e1c81e515ba887cefd115a4db541999acca6014b7a3fbe89784d3077185905";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-ZA/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-ZA/firefox-59.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "07604a360c8a932fdc161b4c2762e953812eef7cca765db29bcf0514027a8db3c22bbd879de6a1222eadbfb817540ef55e136df0df858a21c55ab4150cb3d5a4";
+      sha512 = "78d2e567a791ce410442ab0b8c12e5e4f5fc671f1f74870aa02ff3b08d69f51f7e06027d81f917ce79f8422548731bf78c6bdc208472e3a3d97e0b0c47139e57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eo/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eo/firefox-59.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "cdcb32f4b5e14a11033f62ec7e4ba00fab689dde93978cec405d55a497fb6a59a9c06839e04b8cd550557d37f1801bc6f9a9440e4a59f3d4b32cd2a27ddbac9c";
+      sha512 = "2e6a42a96dc3d29b229de4a214fd2106424cc702d6fd2a985f0de6854663c3cf3b5c1025e2f2032bc4c271efa02df450e8677cec516cde1114fcccf5b506c7ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-AR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-AR/firefox-59.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "aaf28d1b93d1eba50eafdc112f51fe261a0a38bb9e28ba4d86c12cb1f509d5fb375986e7a7e7a81483aa64bcf16f09620ff325674c29738ff62335d8ad1d1c7b";
+      sha512 = "48d2835f64b8e010288daaa5f9023b0f008479fceb3f08a19dcf7044283ec922632e2cb08725676ffc3b3406a379df790fdcb3c928a2a02ccb66269c91109c63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-CL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-CL/firefox-59.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f30c318fa51c551fc03bf9f962cad8fce4795094d1389c1a35096e8e229fd1d78dae43cfb6c01f2600e7f5fd8efd02345f2c18578e3bc0378fedb947abf5904a";
+      sha512 = "e35f259268f34fb0df14b85d5d50ba9ec55cb3a905df88b488a5c552f2820f426a86d7d820c8ea92055ba51cb48c2cf2c41cac2fb0d863f4e341d316960322e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-ES/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-ES/firefox-59.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "08fc4a475fdf2e91550de0b5127df679f4011cc79af6125fb117aec44f97936f794fc0135fd381abaae4370b7343c200308e0cc659828fa8f8e665f39c4109cd";
+      sha512 = "2b09055ff9a4a803003d98c4223c328502f863419a70c0a4f56d92df04f2b484ece4a86caa0cc670538ce91c7add1d31885493d5e49a3fa33d8c983d67443600";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-MX/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-MX/firefox-59.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "baf9277fe32334b88be4bb6aa5b714e86d6d316866088173d0bfb221ab989708e3b67dfdd934c0df80ddbbcef8b2d78c35b33b1420332b094442b31aa62b6ca7";
+      sha512 = "1520332a48ca76d9101805943b7a40a6c55ac1959650361f87725fac542d8f6dd5f0ca4564ef28ad2375aa2ea9ea49b31c14e34687b566105b7098cbe8a4d4c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/et/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/et/firefox-59.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "eed1be0068e6efba0130658c7fe5104ca0fd9c7485da0715113ac82665a153836e6d0eed083c91a89b4f8c11eec0fe2c0f8ef161f2bf7f565b6689f5978a454a";
+      sha512 = "330f653d29f02c7db61e1009af54a2f2d95e8d2a46283681475f988781dcc62650886fbdf4729448997d8eec8fe6aa401e095d7b0284a67682c3ba4ee24e0d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eu/firefox-59.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d0bd609308813d99a79b393dc4fe0960da01ab032ada1d4c2933c89acdc7a1016ac25ca67205aa29106ca12b34fe7dee42316ed457a4e0cee9fc43e3acc2011e";
+      sha512 = "4a37bd50167f6bf57f7f89f12314bbe3bd198003f8bbe9c45c7f38b06f51956a5dfcc2cb65af536044b64b22ff778b274d5f87867a7f1d0d6a74aa07cfb2ed59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fa/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fa/firefox-59.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "cde046bc147e860c40f979f8fe1bb39cc3391939f2b04f572d6db5a61be8be9574c1ddde1a400d16c06c2c6dd87a9b19830f2591809439820a27349d10860801";
+      sha512 = "481a1a26bbfad9376f7da898d4aed4b5637fa3a8f72d5f2dd4240d310ca95349f31690df7ad4dc1316360d2c4837a8c40bb4b7261ef6459ed05bcc870fdda987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ff/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ff/firefox-59.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "047d9b2af90da36699cec77ba419db42cf6ac63fd3d9185150973fa6aaa20cb4bf23538e50154f03bb3edee4f16985baa4332e247ccf7d756f358f81afb2c329";
+      sha512 = "be22da0887c10742db25bdecc28170652fac7e3aa819e757b900e321cbb86e3570dd0cc1dc45ef6ae56bad7fb407f5081d656be44dd5c161294e6087ff563ee1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fi/firefox-59.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5c2955e5c1e54bc0b2bfa08051ec61745765b7d9c970c7ea905e41d4ccb22b32caa3011a64a152d997db1f0b6451b10116060914c601aaa7a240f23cecff166c";
+      sha512 = "f9cc91a350c243fdbc80e4d4d85024ea805face7406098c2c016c154d7e705d15e6445478f63e9ef62838fb3ea74efa186336d14a57ac715df025f526010bd05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fr/firefox-59.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "e32448bc068d0c816c16ec1b4c53d462da430ca7ebca484dd363253e9d47277a0eb40ef0291b58e7dadd3457f49fd69d452c2e7728e45a1473472a2523c24028";
+      sha512 = "774a038f6b3b27e7aad40935d33c770cef2b0553b78ccdaeeecb23d1c153898beeedf14c59762581bd5ecf4489e739641d4ac04c44fcb64e40da419c232c79e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fy-NL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fy-NL/firefox-59.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "9501fc459c883b3d7c3299243288aa5210755d78238af2f6d79e15104ba575b4a7cffebc9c067dc23bbc0941bc5f4a786909a194bac9f1f59244715f8b3cea2c";
+      sha512 = "3d6149960c5bc044db065b7972e6c55ee74bc650ddff5ea127224d081de2122427fc6166d89448402bf8d07147d847e1be86c28fd4b949a3b2a90337979eefea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ga-IE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ga-IE/firefox-59.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d7696ae4b38bfdcd93ffc6796bb2fdd6b952a5892a4a753b0a0717c0448ff59263516896dac2830aabc7b2df5719856f077450d29a48e25fec77bde00cb25d4a";
+      sha512 = "6d6ff8e7425ce6a5ab1a30936ba52e9f9f819b31b3b4cfa2028829a7260ab489b785e1f56d2095f3cc669e5b7647b5c5622cb751bfe90408b0c4c7edc09dadb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gd/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gd/firefox-59.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ebe7526f32d43572538bde521b4df30aff91eb1a30148e20a164cfa044d7391bd7259486c72e68f9c110745e9013f36fa8c1f5be7519551c303cfdb06d4b6008";
+      sha512 = "84c99ebe9add8acffe3fe82b7d0f233dab91d251c1211b4b0c79cdac99f272a12a551a91c6568ec0298160467cb17e9b2c9206ce1b8f78e2bd8e1f6b53bada94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gl/firefox-59.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "a071ecc811b90c102dd5c7b4174d6cd65e7e07bed16566e71740cc3d29446757f220330910aa3a321809de3417a64641ee74b788bd27975c7ad75cc4e777116a";
+      sha512 = "8f5ac4fa1549e89946378dea8af31133e4918f4fa09f6392aa048aed8161e939f65bc5a86f44a416c55cf5f770eba27fe862d9c189f448f93bda44c50f01142c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gn/firefox-59.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "1bc8f57884cd4af64e1a99defaca501561d84a70aaa3f4ee71c3c1497a4829248e2f5fea5b09c89eaf8d3701fd4f9753bdb50f6133850d2baa1708e942d8281a";
+      sha512 = "55a4ecfec8f853f9f97e3f810c377a0921f1553fde6fe60fc7e996c0f20b2576997ee4999e392687606ab89c20e44507db1668a8f5ef2491838da9951d9e8bad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gu-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gu-IN/firefox-59.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "230b2c609b5ff96385b93ece8ac197910fe332ca76300dada12a0687b025ee7781ded47bb1a13816bb2fbd6c7e250bd0af8f4b40dd78c1d75a77a66391d7bccf";
+      sha512 = "487a830757aecef4a8158f52231ba7128c4d0ccb1831fe986f78cf627997927b43ddaef073882b5d3f445c27a4a80c5960204c5ae666ed8d889531f06b433807";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/he/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/he/firefox-59.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f52add938bcf862c8d417709298eae9e502aa5845d01a349b9a8d29ab790ed342b7bbbe615fee6db7e939150a15a2e46895d162544ce4028806bd68c0c832186";
+      sha512 = "c6b0cadd23930933b80dffda825ab9bbf5a498f7d8f92c0a2e74e7f82b5bd9c19bd4f73f492ca9c7350015b0818d702519c97a3369ea3e7129caec7684737688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hi-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hi-IN/firefox-59.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "10406b782c3343fcb63420cf98690ac6eb1eaf9024eff226066587c356edf32006e288e8ce6373f6fc1475dd08c30da2b38cd284ccfd610c33c3726c91dc7691";
+      sha512 = "2cbfa8f66aa329ad2311cc73b545f09236dc6f014f009cb77bf8ba1886b665002849f2f1a85d8827baae706557436203ba9f5ac85eb7a11766c388a7bec3087b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hr/firefox-59.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "8fdfd613b9ee56a9da8f8c1ed1e9c9a6ece04bbffb1dc197120c9d3aeef2c36d9d660a44539f4c1820273be91dcc30d89652a9d9ecabe9bfa88b146fdaef18a0";
+      sha512 = "c7ef4d6c42685ce58402a3a7d42b556280e4bce0633d0d0125aaef391e7a0ebee17347c848928f134af3b2327ea547121c7834b33b98732fd32e29cc2bd739eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hsb/firefox-59.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "4e1cce7f55a3b66b21c0f8f16661855b2946a403d6f29e3725aa300fce49bc065dd7719b9203e79b3ead73dc92220a40d2f99d9079eecc8ae44a38b87086394d";
+      sha512 = "ea42844766e41d634b4b50fba65cbbd4e8f4813bb56abee12fe8c559c031ba54e73aa8725074391b879f9ff88cb9ec285306bc816039037c7306ebbc8cfe7a82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hu/firefox-59.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b636ff6691834dbab712be03bd3dfa92f8a0bcf5e4807ef77e81d0a602acfd1f5df37e0c5a2237518305e4a9150fa592204f84e93ef83273f84a4ec34f65d3f2";
+      sha512 = "8e84cff8c9a20949d7ba08f57a671ae06ec4b3181cee67894d752289193d6652744611a82c666275e9ca6d03b9aa4b1e73637a9435fdc25e3dbb2100d53ed021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hy-AM/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hy-AM/firefox-59.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "909f565a687d6676175105584b2042af8cea66a2da1a2d529954c1a3f5f98807f655a20b1b16d1d80a9af05c02997d543055bd2edcffaec4fb0df0da6e610ab7";
+      sha512 = "33771438db83a53231502eea1921948c53095db70bb09e7ae354615af294b0b85c7318944b8cc524f6a6e8386b351153993b9368ce38ceb8f57f7486d2626a58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/id/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ia/firefox-59.0.tar.bz2";
+      locale = "ia";
+      arch = "linux-x86_64";
+      sha512 = "1f529c3d83d419a8890f947b4999e9b27c6963987879d25c72e7f4217c1ed7a6c471822d59697c252f18bc5d0a10f869e63ddd76c2b2a762dd150e92a6c63af7";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/id/firefox-59.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "1338acae5fb5d477f51d09c8e49bf29ea4a7ac1a86d2b8bbfd431af2faa7a2db19fe5ae61650127c0f10a40b37a464bf7c67e4a4d2930bdb0dd04160013f5ead";
+      sha512 = "c18fa29c6dfd11fe311440fb4eaeda46077b9270945d02d6e88546fee0682bc7cae8ed41a2cf50b42d851bd7b61f689bd3f6b92970b1ce7e314a7822a54526aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/is/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/is/firefox-59.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "6bf296d0e64ded43518b30f2b064cc99ddad031e8ff6129a6a9bda4736e93cfee1d2a9c0df96e86754762cc0ef38fa9cf7d79caf154c1db8c5ba57d88abfce0c";
+      sha512 = "2057a0ac563b16d61ded5ad9f5ec45baf9e1789303d7fc0707a94caf2eb193aeee11610bac46146489993118a3a2b1aa0e1b8f2a4bb5aa0be95d55d48bc52092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/it/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/it/firefox-59.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c46ab44a51aa21b23b50763a6f35c5418a03a847584a1aad3560f62a828d2f859c912ead26d1a1206cfde73d411bad31bc87f19c5203850712bae911dc86fa44";
+      sha512 = "175ec65442e20b0b05b6ec5ed104117163e25d96e801bf268b5a58ffc94d8ae91f237d0d88157fa70792e1b9ac9b3fa6e8dba8000e4f0d7f344a1598a56657b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ja/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ja/firefox-59.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "4765ad23e91c8599b6d1144533b7b24cac68b77a91c197e6e505a3be0bdb74f60bec2c49b7e7338ba994619d3969c00e5b9c7ba872da4958be37ab69b772d786";
+      sha512 = "ef2aa0a3409fdf9553bcf11a6b87a86165f976a9c84587c369d32d9c25a0387b991d71e9c3333e603bf73e37db2c79b3fb47a8391ca75a84634b937ab9a7cf39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ka/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ka/firefox-59.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "2a8aee12fead92872c5c94a319926aec87a95e891fa280588737b66814aa7378c5d7240a3c5f50145ff23c7673767037160d043b655b2a96ccdded6015254f4f";
+      sha512 = "31e09c540764e993246f929c6a8f1b8a0bb5b35856981e5edf7f55b4226caf5dd1bad2d4d1eb63f915b663c46a4800d11b1835c3234a21f5bccbea6c263631ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kab/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kab/firefox-59.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6518ac1276db195c2435160e619dbc1ec7494e51b06971fe409f46ead4af6367567a99356f6b5e353c024a8b9e51d2c2f99983d50709fba2e12342b0084c39f8";
+      sha512 = "95105aeb8cff505ce4b6ad401bf1d823818a3ce9f64a02154c628a7bffac0a8cabfebd9cfe623f8bf945128f44d673220abf770c30c15b942e59ecbb36310e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kk/firefox-59.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2d515605c00f1cf2e76b26dfba3d4fbca00da18bddc5ed39f66d15568b15a2bbee0f1676d2b1b5058e11399ecb3e7cc593ff040757fce76d82ca859ca7b9ce81";
+      sha512 = "ce8f9488fba0789ed8d39ca3e2055a8b088761e0516c4b214421443a5d5c88ab9f732b600e937fabfd8b9f8cbfe35471bf8c8754c5e20ed103c986d945b2ac71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/km/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/km/firefox-59.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "6bcba0015fd5753f7ab6725197fc164723d64de0790927115a0c06d0d1d92fd39bd41d83ffe59a5e9eaec48224c24e39f26cab3ac1bef6265eff8ad9a70c46c5";
+      sha512 = "a31bf297f9f9eed047cff8b3ec7f5638caf3538b5662f8d2ecb8f37e54e22ddb1fc37c6c8c854d3d95b8e49cc2ca82e9aeca6894808b3b77fd8642c04f7caad3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kn/firefox-59.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5fbbffed20a48328d2b199626a9810dfa6bf9cc84f358d429e7986d813c1ffa37fc95eb20a37b10bbf728e4bddd3ce8635c096b7fc4a4dabe462a32606a6dd96";
+      sha512 = "941d71e3763c16d6387f397e7d6c7771c2b9ff99e1eb8a32ce188d704f3f89aef2a6c66e5397fe056725c25628960a8c58d5b2611c8728128ada60e92e6dc95f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ko/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ko/firefox-59.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "2e7f5b385fb65b167ef1784288a68fdde29a3345ade9eb873a6e07a340c5bf76df5769c7771fbf9049eb31bfc5978e20c143a2e753614237b25a065e0735313d";
+      sha512 = "5c013f5a5b9033fb71896611570d3a465b7e264eda5f51f480e557ef6fb7eada5f291b714282c7c50bbd7b75a7d1664879e8575419e71e40a45043c031309e07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lij/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lij/firefox-59.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "fe436e3ab07f3b139460ff385e73147572a1becbda1ccacc0da6a6cf1c49ab3e1424e9b9d8e26a14a2748e5ac9b0c67fc8970f14f5d64975ace3c6e9949f702a";
+      sha512 = "f94d01a0c63bae58027d973d67fbacc76b982abefe561ef086b4b897ea686d9c8521a81cbb8a2f1ee25f1402935107f42821e7c41f593b042891d6e8285000f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lt/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lt/firefox-59.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "b6e3d248f7a76c4a202c767710151067031e34a08ebcc460f4d6bd95fb395533414d6267daa1d9d8172097aa4ae0155ae693e027757c93b1cba50ad9a94f3cc4";
+      sha512 = "84a60ed8e168c63528c8b93e9e77eba73f27b6dad13e6042568272f992350086e72735cd184da71075d8111d1fb298a79ed4fc03b4734f83d13842a6a9715ca2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lv/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lv/firefox-59.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "7bd3844aedf8112d396f07e1d57ec915e48bec1c375c8489057d7a3f2aa5f93c738d2d361848b977243b95b79a821848c2b27b3117a26fce9054d26e4621522e";
+      sha512 = "6faa48a449627279bb291328428e4031e2e3f55d1ff6e0805e720a89c20aa50dec119fccfb552fe9dbfa302a7da560d63f1e0f4f053dc14cbb4df3a79e21b609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mai/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mai/firefox-59.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "d5e6a53c7744ab267404d9107665e6f55acf584c11123d0e9b4a82f6572ef815fb87f52ce9e0be9352ed7c4af901819fa186ed57e4a313349ddee680727b0343";
+      sha512 = "00dfd076186f53915d26016107934705c4585edaa17a5a3a6887ff646d2c4583620b052f8fcdd66bb5841b5b63252e64460806c92ac895879035e91c2a957724";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mk/firefox-59.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7c49cc95a233c4662265e3fe57e87f4320ed120309599f0f78655a9e70b87ae36dad915afad2445cbf55c84e906c3fd2df4b7f84db59323f4629f662f6f2af31";
+      sha512 = "a0905eafcbc262c367cdd8ed94161a71bf0916727fb728033dd4f43462693550e90da9479cd72d8f9d644bbaff95cd2a04a17ca5fd4e90c151b3dcc6e8179c27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ml/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ml/firefox-59.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "d1aed7e78433d3b427c215ed0b2c8455a8a0374bd4e2d88d7dca59c2a3d0402ce1670f1dc1c8675cf7953416fd4be584df59ab646783240f3aef14cb9474c91c";
+      sha512 = "53bcb3c892761447c0c0f62794d1765536d5ab3bb99e9d076ca75280b93b86d64694355569fbbdeefdf5b588bfaf90b0e0d0ef10f30b1efbb9a37073ad5cece1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mr/firefox-59.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3244354a154372149da8b0564645ac5b827176c6eb79a88a2a182d2ae7a5e320fc1f843c1576eee86dec62d2866f6648403bc9c687322eade1f943717b655771";
+      sha512 = "3da0e724bd03a088d6e5f14bba294290800a46b245867381333d4f32e7c53ed2fa2e2ec0c7aa5d57b3a5af6e71310416b83f3511af26bb0431254bec387f1af4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ms/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ms/firefox-59.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "3f753476dcd5f128d7a660dfb9e1003f706ba2b2a135df629bdd68c8580e9bd47f23b5fe3ef77136c8e6611f434bc502f96eef4b7f7d6185ce7630bfd1f32e24";
+      sha512 = "6b2e6861cb3feb8987fec2e72e3bb958bc6d2884e4c71f5a762b57f17981130439e85a85acdf7285b4cced9b5088e34b7736a2dc57d35eaeb14185d88a7b7415";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/my/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/my/firefox-59.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "b83f6807c08c08e7245bc1c5309e2bb2d3d434a577f672a9ea9e95017b61993acbd0df9c339a4fff4c5e65c589d939c57477ba206194e7d09ff140a8882d2e52";
+      sha512 = "18201ec177a93ea77f8fbbd201754e05dc6126954771764778e48833f858c3c46bece73ac4698050f4f6126ef9f136365f7387d363dd274063d6bb46d23d527d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nb-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nb-NO/firefox-59.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e59931df86dff00b3ee55f93b01e4828a60de0f693de412c4825dfe7957c0bda8b9644040657036d5228fd7b6f4e3a93273d561f14fc5e9d3d81cc5c708f0f84";
+      sha512 = "b18a913ef9aa15d43ff201f61d7350e41e0f8819a835bd777ebb29607f82f3b4d4e223c5c035b2ea49bc4306c489190f55e545f79989440824742b7ec22b3e6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ne-NP/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ne-NP/firefox-59.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4dc88c6895264f50639e17eddd5df76de7689208d6094b0d4a51586fa45b359a0ebddc2d58cffbb952cda0a3c199ca287dac278f2a9cd517b923c60398fea449";
+      sha512 = "6f4fe4817d6204d2b1a93fda7e070ab17aab04148ab33508b4f2e4aefe4e23ace3cc1e3a0cf11df35582ee8f39e841e14e151d668f411529b99b0add1ebb34fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nl/firefox-59.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "30f623d07fba2688b8f4c4958817ca208bb8981d1c5a64a232568c301aa8b95dec9406bc064b5c629c357381b5c41bcaed9d652d7e25b3a4f537717d79302361";
+      sha512 = "8a74b28ea9b288c8b35136274839d77c8bbbe0a11a2f3ab6b9577c000a8c3fbba3d1a053dde2ac336e91ab5cce4d5809ee0c08e91fb452251f2c33714c7089eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nn-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nn-NO/firefox-59.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ddb85b71a86ad20a363edbdc9e0e79f6c485b4da02cb803142a717d297e58c10a4ada476a57dee01d5834246a53051b9e65b95eafae081b5b43648b2ac914acd";
+      sha512 = "1e06c148bda453f841f837aface7dfc228b20c8e10d84afd90a0cff2e12a457c5f176461d79543e775c45bf4dd62d7cf1048bec5d3574c5dfcf62c8e6609b487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/or/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/or/firefox-59.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "8161a5ccf70f5b370d1bdfb9b849a2761eb4c25f6d821d39e63f45cd29d9be82be81f523bdb9b1f1b2ea134a8672b9153ff14ece3af6ed7e5a2339c9a43d71a7";
+      sha512 = "bc8575ff5aefdc8df53bf121733189775b1c145c189ed4b0ae8a99fd1f8f578b8380836331f77b03f766bbf9a4f1e6e7c9bbe6087686a14f0617569863c76d86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pa-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pa-IN/firefox-59.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "fc0424027788746b0c8b68c553b7d989e60af2a29e4fa733bea440f31d277c1e64fba06a74c915986dfb3c8da13405689121a8771fb0a47f091e27185cfd7a28";
+      sha512 = "0d32075943cfad32e01df6a2efdfd20a4cab604227b44ba45d8389de18de020dc137096d9de602dda5cc9fabd80ab07017fde6f8ba6e9c46132fcb98908eaac8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pl/firefox-59.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f39a26cbc41739b250bb92bf2daf6ba835639e5751e1dd0893013e1541ec43de7e747b3ec754894a56362263b3ace8d5f105ace5654c30657ad9e44195cd42ee";
+      sha512 = "c114fee704632eaa7fad91d82836329bc873984ab836edfb2d4b880be07e308bf50f4eb0989995a127bdc649501e9a4c76e91b73d5bba9b9ac67fde22b0a02ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-BR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-BR/firefox-59.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "2d3fb878c286a750fa10413545f0d2ce5efeebea5f8c4192dd5b53131edcaa6a54940f242ea002d9a79f41a14e70095cc79526773dc95d3550bc0e0291185a5f";
+      sha512 = "831f0f1e1442520b96706b672c2c34f46a1335808d552473a5eaec898fe7b085485b3c66535356731507937dc2d11f2082db1a182404d672c479f916868283a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-PT/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-PT/firefox-59.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a2eb5b43c3d87ea8193fdb1f0ecb0e1a317a71f10af4f3184484536dfc1f7f09fdfb498bbf073f68847f7c2cbf9383adf9ad9e92371c8a835e4e3651a0546ce7";
+      sha512 = "9a6d7559d79808d47dd0dec15afbc477d599be476761d48426ecda6ac96cd9ce560bac9eee05a5020b8f6cb764d07546ef2fe59f79c39f20190739f1a3236967";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/rm/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/rm/firefox-59.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8dd38ae11781013a03fae2b3cd5fc1b033c45050ed4245fca2302e1818135f1e754cb6c8ecbc535d253104ebafc0792dbabe78f7f336f12297b7b4b8c4a9f2a3";
+      sha512 = "03925bf66c04031813b05008879bbac83ec81684a5419d6d0ec87ba35e15f3f8eb3fdcff191b4ced92f1ac50136f13544c03d58bb0f241ae50e953940a7be8cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ro/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ro/firefox-59.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e9958818254c1b5577a83960e1136541c8ebf2cd4f43ba06d73c2e40990fb6da958aeb423c640ae988057d3782db145ba8e8cd7816b8aac8dfb7f58c2eb0060a";
+      sha512 = "5f7dfa6494e8c1687d8bc3ee473d8bf1a5721f2766c883f4072a55c0507eba1cf422769a099b2485762b996c8f7dd251577d94c785c186a73fd0db7d548e8a9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ru/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ru/firefox-59.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "abcd9a548335648d84ed3856a89275c62ef7d883e18d52dca053b4d8f80deff8fdab7336a2aa9382e55e110ded2d4bd9cf147b3f482f3b0ebb972ac696562645";
+      sha512 = "9104b67151238cc6b531a1d874d2474ded47ba1f5ba5bd65f66ac60ed0876d4170f19b2c5152f5d07e9965fe74de0df2504ae40f49d883546d21586d4d832a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/si/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/si/firefox-59.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "53a7b139ba28103b88359eb450c033fbc8bd3a0c95048aadbd058e505ec85b652054968304d113826a5fcdb6abcb47e8498d9750023a899fd83d5c0dc8b3ed63";
+      sha512 = "79a88f42f81caa578afb3d7b1efd85a74c76c1b9ac7876e63d19a15bd3a7ebe5602cda5ba3b67c7e2a4f24d22d3a83bfb35ecd034ceb95fbd40652a88bdb89c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sk/firefox-59.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "05d4f52e87bf24884caa888c14dbb6e46bce2de967fa4524090df63b2d9f2f4f82b926842544d2ce7ee46f0196a62e8dbe26e7b07176f5c13886ab2a1b2cd184";
+      sha512 = "9ce10a004fa3f3f4a02bfea3abccec28785a0db9c1e5a0e797f6eb83731c6e7f4902906863cd681f5351c7bb84dbeec59b840c4612b1b6ddbe244a4142f6bc0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sl/firefox-59.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "655b4fae25e42cd1678e49b555508ddba2da83a24f04d7d66f5d25a124fa2818368adc851258dd78915a2998272cf8e7bb7a5e918e01228e735d3ad0caa8edc8";
+      sha512 = "898915cab6633ae442b7328ffc3e6ec60649b5d7bcebd795c05a2e552d40a6431ba02274079f2b3069ddf284be986b427509077526a03a550d635f518c8b1620";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/son/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/son/firefox-59.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "cb555d1465c5ce0a7db10e5117081e682425aaf00221b93a66d23ca9217cb2cd2b3835007961f572a39d93a02d12f9a62acc75f1ce3d8c3bd6cd057afd750f79";
+      sha512 = "fce8ede20a5f9510546736b37d6f80fe65470582ebf9608ab4d4984e8b46225f3f68c4d82569bf20db204094932703a74b1333884791db1bcce154fa17f45d09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sq/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sq/firefox-59.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "5afe4996a2c66d220d038cc041fba4a3bb5e411c0d1c4962b2a3f28ee16c5f23d1d8609a7d492a10b16d508c2781b7bdfb884d810ae5d8c5fdadee8120a34659";
+      sha512 = "4a92efdc1363069dd871aca5024334866443fd9228e317d2ead30a4546102e71c7678df46726774e989e4e0ed7d3f205c229dd9fbd3a18cb234d099f3ed7a90b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sr/firefox-59.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "641e3173693e73018154f5f3fdeefc0b0fdc0b1939ccac19b73769476a8827b7244a4088cc83fc651694e9c82fa5231b114fc05c80371469e63926494906aa83";
+      sha512 = "6966a84f7846f20951f25e4e6c56a65d896e8e51f6d1cf8ff9ced8814fffbe3d6db301668cfea28bf34c338900410b8e633f8a7d241aaaf46fadbaa04ad3eabe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sv-SE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sv-SE/firefox-59.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "873f11216e002fc9eb4bd6389774c21d1f3aa17baf0f38770c18db541b30334a84cf2c33b478d009227b1ef48a7c45183d7df9991878daee78c139f6964c8b3a";
+      sha512 = "c4802d33c9574f6b676360ae402d27d755325f208547e7d6b137bce69b0e4170b3d7139d9fc97a6ea21d60ee083c90dbd9d09af4dce8dff78f502bf6669c608e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ta/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ta/firefox-59.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "1d91749d41fdd5d5f3988803563e083f3d65ed6c70fed197f38fffa7847c10d2b0f355fd46a1fb7f84d8c94dce096d2b84ff692fc6f5f33be4ee1dc63a4efcd0";
+      sha512 = "d3782b30491e9044e16d672e697b51449f66b750b466c830acf2b53a13d5448848fe2fb035338d32b43951f2d10b88a12c2dae3cc07050925e127e2c7da6bb1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/te/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/te/firefox-59.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "2b779beaee906278903dc12bf679f0d8ed51d622a1f790a956d039faa71c11abf1b4d462527e330dfb92dabd87aaaa70b3d84a295f21e1a701b4a308c85dc821";
+      sha512 = "37bad7c63601005ab4d93903a8e00c81449acd78a694a855edc9a5aeec404f49433467a9ed6b431886ab9dd754a5f51c29502ff350936f84df69676a6999c0a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/th/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/th/firefox-59.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "82bf20ace51794807f6460ae4142869fc2efb1b4bcef66cc5d68fe8812d4cb89578a45cfe0cb7927c45ab0d1e057f30d4388093678213187bbbb6f209babad2c";
+      sha512 = "a0a6e1803c54f06ed49c1c339da0baf2058fd3a8e612df0c2bdc088d7bec8d8785a688b230e9df6c96aba4923253186f118d0c660bee60bde1054dde246082eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/tr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/tr/firefox-59.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "65766e0207ea300dae4d95023ddc732cf5f59662a894689e87620e6e08a3f658234293b666467eb1f76afffda29716b128d72286b1c9cd68cf574f7121b71792";
+      sha512 = "06c61402c4732041e2140dbb6e56d969edbd64a0e25a31ad521c2b692df2193369fbb6af2848c68da0c5b620af4c171f2d748a10f0e402ac56b72c2f5fea3277";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uk/firefox-59.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "01aab08b333c16ac7156ca35580fc6502aaccdc269c6be29e20ea3ecf97104a3d0214d16bb65f1e3e7aab5b17ef3c637d948a2767594c36ab920c7086e11607d";
+      sha512 = "7a7a76241dbe77680229df13b1a724d71a2139c5fc38bbc573592fcb9f07e5ab2122700854e18af339805073fef0081ec3f1b0f47d19fd1edd225b4556137d8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ur/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ur/firefox-59.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b282916667060259bb90452d08a2bb65cb1225cc45494c2c18c4982e710abbd345744b08bb9c2bd200073c2b470c3b3bddf7f9b6d652563e3c4a8cf6a6248391";
+      sha512 = "33af5113a20708300d8d9de5584e22212a3561cda55a666e153af7e4dda67a114d1b7d3c9a3606f47ce0885613dcffea8c78981a24973d996533020ec3906161";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uz/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uz/firefox-59.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "9339ec640a3d4920fba39e69520477d9c00cdda5f1617067f19fb13b1c17cabd1cf1917001a49604686cd835839adcf3f206dcde14e7c4a98d579c7d8a19386d";
+      sha512 = "8cbe6151d20b18741af0ec6c2c70da8f23753562a4f8619f1d1a9fccc890bd13590dfd22c6bda0db4b113651d3e89c147733ebe5cc761a24eac656f6f3ad2bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/vi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/vi/firefox-59.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c318398809637623e4ecb187f4b531bfc1b9abe093cfecfefe2faa75990dad09b505d8f88e2556476c92cdfda491161af8e7fc27c68c8bbedf5d4abee8eda941";
+      sha512 = "22a8c52c09f6c8fce4cb9eecf6378d9b5fed6a60f0ae73c44a91156fca23d85db837e670f9afeff57290f42c00b10aad5a0ff5b279e7f7d91e9d139928244932";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/xh/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/xh/firefox-59.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "08caf6844c3900624093ada61c92f7c74dc5533818745b8e85b15a093b640eda9686bb0d5d86cfec0c90df49e782c942693d4e0a169b7cdfecfd13827ae27ea8";
+      sha512 = "874e3dd3bd4e5ccf058d026e61314e48c9f06f549912066058d3c936ec606264754c4ac76035ee09b4112faa2b96e146f5250caf1ee7421325f6beaae259f2db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-CN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-CN/firefox-59.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3046e58285f220ef7ecaea81c44063b8573f59ffc64dc12f698a184ad2f11bed3a4cb5d03a2bc105083b0fd84335d7477f81d3eac4bb28b961d38d9c886a9376";
+      sha512 = "658b94cdb5f6dde841c95a48bf1f3e401d02891d5385d0608951630b38aa74dd92894d67d672818cbeb63a3cecdcf101c9ac381b21f208fdb27061681911abd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-TW/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-TW/firefox-59.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "cc453128e4720181d147552fe2452b5142b959e3e0cfd3e340159def69be169d272980066f9a34206da5f815ea54b8e4a062bf95ec4b1cd7ec7b3b83e2ae13b8";
+      sha512 = "de8e1bb93294891439c9925a76b380aa40c29ccf6ce01db23c16469e60d8e9f7f49d0e8e5875cdf0f9afafa9df7968293ae6218039c9a3a0f38db15b39e89a41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ach/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ach/firefox-59.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "c26386414dd416bee1e4fe505da524a4c1de34ba8c25b2978a20c66a09f8e3c7339dfc4b5fa00f0d2c052fea1574e5ef1a5d74e67d39c7e717b54439d7dbb852";
+      sha512 = "a8f58cadcefed9ffaacc55c9e14a8a7c96f854ad624280eec4c978c3a2b8a8b503fbb6173e4c34168ea0563e5937a65736cd170413671670c04ab9155f279851";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/af/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/af/firefox-59.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a8c4485e579f127882c0f00a4a90bff5d02bee5f28642257bfe0d6638fe9156ab10a00dfd48052aa4995dcecbe10b7247f1d4e6d9b424bf06e431a782b46b95c";
+      sha512 = "b69726e9aaed92712f332a8c8a46310881f043d51f5c19ded3cc39feefccad26c41c94ac247cff870289217b36f3c035d60ed32844105b3b6decd87017f8a100";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/an/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/an/firefox-59.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "29e91d4e5ff020241ac81b810b893bdea9fc194090c78fc857d507d7bec8651f15a3c70f3fc245f0d5faa21a3cc44b6327c1a32444eeff3ae4d93a723e230e16";
+      sha512 = "c68b504e7ca5553e14562d347b8bfd69dad41d5f2961e6102db344ca42c1e05ae88c73537fbdf08c4d21cc907c4baa64f8d2592ab8ba284673b15162cdbb06d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ar/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ar/firefox-59.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d1d936284a12f1718b69b279334aecd49a68e5dbabc65a5ade2af277ac7b8ea342ba4b580df95040ae057525d28a7c1852222ab2bd273c2aae74409a5533f74b";
+      sha512 = "6dcde34f30e4f945b36d1d019190ae6aa83b70af4fc2ae4e2c6d02ca013dfb2955639cb0e02014cb65f21b969fd3d8589e0efdfdb13b6cdcde956751329e5c87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/as/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/as/firefox-59.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "49f8e1e8cbe6910a9fc8a812b3dcb7e694c2785fca1c65639d70a5d0fc82dcda9630a1e311df9bdf148d684c2173c761b6aa3926a425730dc35fe99b14124992";
+      sha512 = "be78bef5378fee1a9c38df3364f294f56e5c1a64df2613504fc1d5e0728ad3e41bc8314c9489ff300dfc522d301c66045bb6ed567aac80528add08d8fd40490a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ast/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ast/firefox-59.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a01eb17a9952055aedc3eb29126a826ef812c75f5f5b5a22af3125ab37b63e3e0ad6de0a5f68d0a5bf0b3d1c8fb1f721d4331f1afd30b6a3ee94a502d5931ff1";
+      sha512 = "4fb28c925add1b528406b7f951e06818c6e6f641a998c286bf68422faa037a890f9a556bc61a54a48607776bba33b1dc97f00244122310611d32a7d731d583fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/az/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/az/firefox-59.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "7117993a67c2d0f3c0438afcbd87f22ce141063dbc66a1fea997f5145603f8e9d28b62473add81475bdfbad350d6e683d0c483ec2287f0a47f4e9b3bfbe92ec7";
+      sha512 = "8708a6ed5266c4bb70c747bfe7e5225edce564d5ee5009f016c0a4ed87c6676c04dbcfe573ac31f7d8ad8db23d45c5218dba7ac1b8f16f546fb2484457bdea81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/be/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/be/firefox-59.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "9b3486fdb08f0aae375a74701e7904dc13b1e4db7a1489c4538d523bd4af91b882b9785fc4fbc3da2f6ac67745216ffaf7c48c173f840288c6e39b2fb8e78b62";
+      sha512 = "a469f44da99b430acc985d077ae47d61d518ad9f172ddac88e65114ed144b69f0ede2aa7388b6dba3f9c35944489024a5a419f0433054983d328ff0d09c83736";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bg/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bg/firefox-59.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a917bd437926c8854786b4169ddb2a132bf4ca0e51c17a99a3cb814a1c1fa7fbc7c2ca46a0c7c91ada117ce4b2e89c955e1d60502c6eaefc9c57e0011459609e";
+      sha512 = "dc4c39517e124d241e9a779db619f3dcf1c11b9a2a5afd15d2ba4d4894978d1383c30beead473b9ebf5343d1f7ac1c6d6aea17f0865fa7abd06301f8c3648921";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-BD/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-BD/firefox-59.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "51032301e619fdf9e9ac99c52f771e39425e9e8f063f71c491f0802f02993bda668e0e18196f4d10125ffc66fec760df0f98c19713f8b54b5b05c502067fa4ff";
+      sha512 = "82d1a8615e9d7f97d23ef9265674511a8c5ea15fcde020a6405e5e1b05eeebdd93d1f7c2f9cff96f88b36f1493b721566395834479253476c0e76d807faf4094";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-IN/firefox-59.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b76ea76976ade5df4866c2c54bef553924ec9d3bc229cc7513530ca81c4c4e118bbbbadbea8a64f27a061d0ccb061d7ec0e1a398a428892a2c59761b0a7392e6";
+      sha512 = "a0032964905e4b0df68d8db313759c510d236feef049149140d8eb8c9fea2a8a372ebf1c73f222b959d90c04ae84dae429113d97292f1b0395cb00147ca1e66c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/br/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/br/firefox-59.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "7ba73fb0068862700bf64248987796837c44bb59ffec052638956fe205bb52780bf2ce9bc6b1a5347b173255e893de8b9380dbbb245d8a3552dfd1a6fb73f7cf";
+      sha512 = "cce14e58021b86447b6d7b58d082abc42451aa5af30bb5a81a42ee70c9b17cb653ca3f9a97180d2ebdc2ca943a96b1d85f0beccefebab926ee0872ed03579fc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bs/firefox-59.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "5f2aa4be25f279212541716777012f87f5e65a57deb3b4dd84d4187d84db80ef3f8dede2adf971dae1fd9f4e6398db81f956f59df2f51f35f1893f581266fe0f";
+      sha512 = "c91fc6c8d17aeb65bc95ea3e8f9c6e90cfd46a5b89ea8623dfa61e068e1b129a1c228649a73d70d1bfdaf9aca5a3ca90d2722b16593f3d5b55b5d1d5a7b3f305";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ca/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ca/firefox-59.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2995ed991ab118d5e318f085a340113a0e71801cb2b781890dec674bf3a8142b9bd8b0bc23ee23bed72b1b7bdc7f0181abd4f4d23fc88b7930f710934d2943c0";
+      sha512 = "274f6cbc0488d1417ac34841f3b7574dab1663cd583e481c8c928445b1197c4a716810cbe3413e2857a43ff83b27cc02cd7735b1758d8c67f424fe797b633ea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cak/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cak/firefox-59.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "dce6a70f1c59b01a2d3ac65c6f44adb9baa8e483dba84989e40d7388f9ffaea894e3107cc4a82ba6aa730770c681bd73b50d0ae2f248477f0b63192c45f142d6";
+      sha512 = "25c65e084a21bd1da1732e007020c57f22bc49c7be0c99e1932d733433f57d88d73fc0187ebc55db251876da2d2353f2bab205775bb4e8f66d8871a25b01b857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cs/firefox-59.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "3c84b185de63520d430ef541cc95290868fb8ccb09829ef8887ee0559fc5da8182e890155e3d1bf4e82966c82837d05253fdf2d2115f376c4bb0d09c21cef339";
+      sha512 = "8595e022a47f60bb9df6a54ada7d788b85e9caff164c4763e31544c099dcb161beb4cf7122b4eedcaaf0f330b47ea60f7f8f69bc442623c1d4fee00b6842717c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cy/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cy/firefox-59.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "1561488521608643f3ce97da23052b8e968c1b8ad7ca38b966fd088368932976be0f503942ef65617248d3ae572afa4ecda3499c427845de32572d163d577c9e";
+      sha512 = "9e7d939963bc28bbe9d1c4c610d0c7820907a94add5d9afdb41b69e050378b1376bff82d429c6a340701063d9516891380f7b7630a2c8557ba36ca8a75a29069";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/da/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/da/firefox-59.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "fda58e6fbf5243d5fed1b386ac8014efefa856ea3f8cdfca4e723f646dda2a8825356818bc8f06183a57337a5449ae3907bb3ac4c81bd7f9590d94bbc32749a2";
+      sha512 = "e28aa52cf42472eba10ff29419910d391e70f62492f4d4ac7e38619c48d4dad760123e1b26455c2fff05794c8f945982d4f4798894acc55f262185ff89829d63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/de/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/de/firefox-59.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d56395a97002f31ead2523179eec912dea7035a86c80a8788b21f272c6e6ac4095caff5520feed261f5ab5a2a2366cd12e223b23d276e01d1ef318b8c15db860";
+      sha512 = "24ef96a42c0d6a580d382e1c793ac0e8a70e1a2a6a66ef2a295e026ad52b706cd73ff0cf858ef927e2e031261e5e8b0bd3fa38d1afcc7659149494c1f0900cbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/dsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/dsb/firefox-59.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "97538fdf8a2a1cc3c485210583d9c80db10b2d599d2b34bfffd5e3b29c092a8573f100cee5c69dbbc69fe67ba6e2c648715fbb9271704dc26e6b2fa98a8512c3";
+      sha512 = "b60cd13f290def58ef219757004eb2ad4ed92f1497b091162b61fcf7f185fd2f7708a1f6ba2218b4cf28084ed270031900cc6ace00edf56dc94a97ff22214a4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/el/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/el/firefox-59.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "4a12302d67b830098e74ecc5a2e785829c1602dfc3cdc20c1e4be5a2e58854128a68ef9fe459dc4baf7f1f87e8ac2a065061a259c9625f09098b364c6d12a393";
+      sha512 = "fecbd2d681c81dc4a8459bde6fb55d595fef390cc54ab1f3e5ca0230ada9b0fa3d69d280aaf1ff6218b5a348b7fb7f06800bbd710f3b20db98056c5a7a75ec84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-GB/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-GB/firefox-59.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0ef9e96b43154f3b6d8e620183c092d38b8a5dfd7b762416b090e2754baee4564f6876bba9765cbf7499f5c658f2d352bb45769d852a683fd528573b53eff2d8";
+      sha512 = "be9bcda727b18bf8dd822fbaa62f7da17ce24f728b1c48fefdd6163934fcf9591f999f45bf5a2dbe092f37f37a7fa3b7d90afb2f2a915a11f17530ff17593a87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-US/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-US/firefox-59.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "05046233531db36a9c9c16cf6247401ec662254e8e1b896abf557bb2f4043ee2ec1f83a04c9b1199877d66b50b41d47bef1ebe6236e21998406616b8251001ca";
+      sha512 = "6b42ca4bacb37012d99508048d01686b881217e80bd2f57bb9b3a22207888dc9db19151adabb64c074421460e0309d298edd7078a13c44c815ff99a24a97b2ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-ZA/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-ZA/firefox-59.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "7ff1777a3aab71e9bdac1d41f777837cf91ca5f9ae353e6289812899fd10a4f58c13938cef0f33cb3d3a0e80b42c70034f7af22783e0b22495fe279cc497fa5a";
+      sha512 = "ef85c017d1df9eed592b1816692d2e57f6555575ab9eea630817ade5c156e944a4196637fd640ff22922da12710f000fb559b5e5f16d0ce5d07feb5bc59ec2ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eo/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eo/firefox-59.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3b4a8b0fb29abbebb224cbdc4dd9ca62457d88394f653388915898fba9eed6d1cbed43f6b8fb7bebbf18963d368fbea6aeef5bf681c14d2d5e09747fbd42fbe1";
+      sha512 = "9deb3e19177e35dffa51913decdf5579fb925158843c762bf44355e5a0173e2b7604c1d7c26a1cfcfb7420695b18a9002a4ec1a4b683911d09366569b7b0fbfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-AR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-AR/firefox-59.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "9409072b8aaffe4ed914832d0b545fefd20b9930e0529c38255f19a0ad524b66127d9704eae2b8623696560fb78169aa66d1b5bde358885dad4d00e010189841";
+      sha512 = "bab8d2eaf02961c665ddbfe4d380c72dc0363feb356854a9dd7d28526b7c01dc8b2dad13c087d91ad7056ce50d0cf37123ce54afa45c1279ff827e3ce808fbb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-CL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-CL/firefox-59.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0bcdfe996b3a8f4810d464bbca0690d12f6262032a21e0716f86f793faa4e707d3c308e79aac5657d619ebca204d5f67667c6d3d09e405e887c338a859ea1faf";
+      sha512 = "981df51596a9e3fab9281c3319960f766b02941d3d89371f15c3ef6ddb853cc3dc3b2de3f196eb83d20a503eec6cc7926ce66a41f67ad4690fb601b9731e8522";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-ES/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-ES/firefox-59.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "1f2aa1ec1c97cfdaff07b7aabf75b5e1bfc628fd8ee71c988af5471e570574453889a7bf40f9d3a4ec06889a4672518c986c3bc6fd35d7436d45c5c74507d801";
+      sha512 = "017875c18052a84bc262812332d854d6f1402b9b81d8e0399d319e5c2b9d41a6a199e5286cbb2973ed8eeec0d9753f66a4911deda4a31049033c1ce47c992c98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-MX/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-MX/firefox-59.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "366dc93d1e6508b00987163e44ac2d6fd318bc9c80487a13d581926be7d3a88a6fbc6438effcefcfbe6a1a9794f2a692c385fec7503ea96feeabc5fe10cc7a4b";
+      sha512 = "9a4c52058d5db0b342b68b6c389932106ad1f4a041e152acac7bf86c7bfad84aa8228299bd0dc60817bc51ad3c42ca07ced58eb9b0d60cdfd58775eabdd06fb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/et/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/et/firefox-59.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "82b25a2e1ab4d61d89f5944495f69fcc7db33b3a7bb7822758b588ea7c3fe9ce3d728ba838760b93975cc52b105de77cd980d20997f642839680a20ccd5e1d4f";
+      sha512 = "24c85711693582ee0eaf7985af0bfecc5e905d9687dace724a57c66ace2ed72318c48ee7c1d0ccd0de125929c829afb2b08a13cb4072ddb73d12e8143f95a267";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eu/firefox-59.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "6eacc4b6069f6bda6b08fca871c7cf08bd666f974bedff6c511652801e3718ef60ab97425c8ce6d1cf5aaac1b5b9a62990ab086ebfd9e76f646d491a19325b34";
+      sha512 = "916164528c57173f70adbe3f92a9f80aeb5cdd46540b3dfb4261afec0649ba976375dfa54e11ece249fa2cd6b8a905dc0f1fef3104e83ed3e7dc4e622a82f8f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fa/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fa/firefox-59.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "e3f4c57555c415a4d3830a6751c5444e07987fdf85ed0e122312bc4bfd0fbaf841cda7aeeb6aa161d48070844aaab316ffc163755481479f5d421ab8967aac15";
+      sha512 = "d3ec04850664f1480be7f722bd694a74091197e1fca9a780808884cd72864ce6502ec02ac6aab2498a5adc87b34770022edce940d7e5af6d1856641282547880";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ff/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ff/firefox-59.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "695b44de161563727097da1d969c0a98fdbda51613ae8631a757410a502ab25038a9c356338b1178f7d35e0110e9772b3e2fb705e20d81787317b528ffd709c0";
+      sha512 = "b0af3deba5f7c823eab1053b21e0efe00492ac8dcc55ba7d223c4531ae16ccd7f81ea4acc4b6d3996efd25b2c3401449870d0818ab1c180b1b3aae86c2640af5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fi/firefox-59.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1227a6e57a68c0ffc60f6d9eda20a41fe70e7da130bc705fa15e428539e0380e1f65739e791ec699f216588ba54e558ddb6242862396837229c3ef3b028a6346";
+      sha512 = "d88a2b576f56f49953f0e9129fcf78ff62791a905afe41e1e7b7c73402f054d762983bc354acfc177a58a4e72e4786c82fd8776f07dc413d4b73851da26e2c3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fr/firefox-59.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "c15980e0a1b4b9709416d362e36a3dab26502af4788b7c74d68e0ebd2f3ada6039d10af1e1d49885604c4c3b41356519e53c278f04b14729502d8044bc106384";
+      sha512 = "8087e313549c8a4e8fb534c72b6de0be694305c4786a685f8899aa483c80e4ddb0a5d134cbaac56f4eeef31fb8802353d1a531dbf33f639c79e668bdbfb711a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fy-NL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fy-NL/firefox-59.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "dd38e22a986b558aea005900c2da53cbf28ea68a77bff428aea6ebaa09318439232cc2d5c8d0599fd8512ee4ca2488080297ffa61f2cac9547fd5257a01abd3f";
+      sha512 = "3fd21e1c39c32c11650cbbb095b64bd1ce720ef2614d98cf7af2fc3bf7979c19566b4c0abe0a24e2f80bce7f05a49740cfe8d9dca6edfbbc4a5ab32f808c5629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ga-IE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ga-IE/firefox-59.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "97ff02536814db1310bcf53adac31fd9e84a5e39d58f9d81dc2f70d40e6b608c450dbdb38edc83abbaeb0535f1a1c0b1511c77a161e6d0ec22b8cde71501be08";
+      sha512 = "946fc4e3b831f91f5e505c7fe4aac8100d3b3edead97655a47ea5b2138595fd821d96dca3df88bb3e3cd6522753f2262bb61f5b9a563e073f27f128f390bd0ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gd/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gd/firefox-59.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "7e8d8dc8c341ab3990b550392f92029b70f6d947119de13843e11a8067c2edcd10a02dc088396beb52b1d069e8f42732db8c514f822706de3f309061e649caa8";
+      sha512 = "ee014509e87ebd64096c8d87170ebefddfd600843e410fdbe74a65e5d4fdcd40de59881396d39db9e68a09ee7f10b03a5e3459b07ea442c4d1e5e44bb6b14a78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gl/firefox-59.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "31b57462e13e43e31e0e9073b353e1f5a3c32ffcf5c5fded188a1a61a973510479d5e04dc26437eba5445baca51f82311ee9470e3bed9a6309d40cd456da4763";
+      sha512 = "c90904cae401464bed29e5c2b33940f9b996ac46e071be89a5ca51dc6db492f6914d234b518706278b0d2d676bb1ab017b5055c3297d269017bcd6c04b766dce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gn/firefox-59.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "d54e50b52870747013ba457d205fd9d2632302309b9850171b968d66dc537357bf747e322420e70e5c029532b053e557da86076a25fe8c5f1a3491acc9906b37";
+      sha512 = "dd401ed91652cd458152372deab8c3067fc7f000abdda3b9d1f3e9e5b1cc253c9ee081fba3bdc9b5c5398d64d43a42a80c20d6caadc761bfe4469bd4ac7a4b9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gu-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gu-IN/firefox-59.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d18427e64b54eb6aa1a1ee7ebfe4bdc3b219af28e7cedde55ae384d475ba88b83b9c6fe701ff849aeec32f8e6b184f2e3f910b407a9d200fd45ceaa18fc7d61f";
+      sha512 = "889d81035e9a618539eb9aeb85567406a589e6691c162481bd5622ea3be06e46910314b83c3008f3bf9f6c35b6330acce459b84136e111f45b247ce9771a99fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/he/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/he/firefox-59.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a7ac2db737ddeb870bbd136f8dea08306e8bc7158d7e880655cf15541ed26382086d270a6ff2bbfb332fcc3e53c7348a403bb889aa8ae5dd1cc6fd1b7844e768";
+      sha512 = "e8057f72bc093ccf150d9a014eb2ea2ecb86d7b383603542bb90944dfbba3bd391fe36645c6f0124d6e9fc50cc7cb3e70c1339d4eb9e4c928c2621aa38cefa3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hi-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hi-IN/firefox-59.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "18263b33d5fff4154db809fed79fc2ae20590cc2ad609e2abe90b036420bcd38fda629c613750432ca4c06684c772cf567368ba2bf098719b501e329e55caf51";
+      sha512 = "d651eddbb9f3b419c86ff9535519dfde886172b0f81972880e10c7c0234f01f5fa4050218d1c8cad302a401fbf9dc369dbe9749822f2f9efe2426cba31dc9d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hr/firefox-59.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f75aa782b03335b0197cbea1446cca56cedeb4be0282dff8bc0f1d6f6c8bf596113edcab650b6c8b7bf5a9ffe6bd14e0e29f2e82002a5c720cbf82f9dfca1b08";
+      sha512 = "e1de943f777afe8564d5da316cc13c7232f431e023eba55cccbf9443451089d84f0c66b6818d88b2dceb47299693e0c06e0058f41a0929cabc486fc7b78218da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hsb/firefox-59.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c0b987b299ba764ff5418be38e68c52b7caaf61480edc34d575ef58807b5289fabc25cb22d7d87dc8ba708d6fa4157d46237e0a31dafcbbe5f463fc945a620e5";
+      sha512 = "20bdc20beb7853264a98201e4a3c39c2ff9058ad9a5cf23e0cf57879ed6d11f4c59589078410411276c2e4cef01869a7c418265f2755b1324c10757dd41accf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hu/firefox-59.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "58c7c346d0fdb16efee21d8802d3bc668ff4fd9497ceef1b7a96cb8bff01df647c32819a5606891e2b7a9283677bfa9624e33423f7ed1a9c6acd1c19414276fb";
+      sha512 = "37d6b03aec34c3a958cd58e489dd1da715c676532b70a90ed87fd9e05ac30deb60e2e5c35ca6c4e2b21eda1066ee5c84780149298aed4149ad937fa99a71ab79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hy-AM/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hy-AM/firefox-59.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "79e733f8be50ce4cab74d80dd8e4ea667ac9b2973bce27fc1f70a37b879e19b52ee423c2b360433d1e5e15a4143050e7943a3bdcbf709bc34e89302bb0ad7f35";
+      sha512 = "b3f4b807a1a5c3c6a2e79570567a89d3fdf7ebfa565d57723f161a81ab05a23dadcd1d47b3a220553e14604ac54b0bd0dabce47d54383594978723fb67b37248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/id/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ia/firefox-59.0.tar.bz2";
+      locale = "ia";
+      arch = "linux-i686";
+      sha512 = "48cc98802d7f5efe1b9ad21c5f223099b99f7cbb5f659577646fb56f412551d234f9c2709a6b26c790f91ad6e1167160e995e040c334836ae4abc7f20e07fabb";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/id/firefox-59.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "5f49f449fd68cd4513ccbb541d3884e190b2a9897ba6267f348f4e7df9415a63e58a254d18f116cecd33f0e34a9022f4e34472bf2486e29b0ff17702f4790e0b";
+      sha512 = "f47d27aa649d702b372e7571fa2dc08179ecb1e8db3600eef7c2a26cb68ce74e747af5a7fe2e2cde68546a9a04cb895973a3cebb4cf93e54cf9f6cdf089bdd3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/is/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/is/firefox-59.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6c5028ec47a18d9de6bfb4d99d54815b174ed51ccb74f84e0e1d69ad10940847d4655eb76b13281296575fdbb972d32df34e8e9849c8db4fd46a6dac4b4f0d62";
+      sha512 = "c92a6940f537f13608a322de49027cefcf52f5f740c450c37083acafc805cfcdaa01ae8bcde46799a252e5149256c8a4c464411d14d02c969f1a158931b352cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/it/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/it/firefox-59.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "dd4e79563c63cfcd76906dad9b28162bc9df443964a10fb0be7c2a201621d394d45ace33dbdf85d7acd040175528d58da243333d06ced80bfa96f8c6226aa3de";
+      sha512 = "c5db9df2e668d91884d1c81f325a6cd5649fc8f9c1cd67e3107f54a2028db866c3d9e9f504ea84fb997403aba04e773225fb5509b60e194929756610e4f20813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ja/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ja/firefox-59.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "472f544038dce535691db40eae8cb06dcd77a468059a261cfe04186bedb4403ca209efd51a5b5efdedca323f70f4a69140614d13380fae0e01b49c85e5fffb8c";
+      sha512 = "c56d79fcf04458d0d4b11c3ca675493a5c9ce8013eccace4d9182aaac361b5524cbeffee2c206d5d0c4c3b641f0a7db6acc05745bd1cf54a795b833a0585c7cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ka/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ka/firefox-59.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "8337bbc594e6d7c0f862a99b8ad67fa7b86e55d372c5db850657eb7952f9abe2640c7bccf69568790099c8f9e7dcda65ecb28bbf2c18eeeb6760f3274f343513";
+      sha512 = "9596b0982e29f7302963e96c6db071d668cf7bfc8c31f634d2cbe687582906806c832c9d06cef22f44cec5418aeeaf42afbed6fd00e32f845e5f57eb08482a11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kab/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kab/firefox-59.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "8d46fdff00c65f503f87b1d478b71621a2051c7ea7c24747f0793f6f6b7ebccaa39e8a61b35299078e2b49f07a17f7c4f744c97ee3767f598503faf7bae4a17d";
+      sha512 = "6988478ec06e738e333508c5cd64688429f9445391899e57931dd7672c88767b7c84ac2bd7aaf952343c4c671a205864dbe7736401625decc2b72c48db749dc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kk/firefox-59.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "617ce9bd37cd1ef36251cae9a0738ab93bfc4eeac2f54912011343905047ea5d181c25fc891b8abe178f3632189fe62c38ea00910a1c4bea3d47907c0a2caa07";
+      sha512 = "05ad5aef14e19bbf2b6665f96877d7484280484ea274a4bc1c5ed77911575ce9e6d9ff87dbde790c04691bb4dce02b03ba0286a48c159b9f48d5133581ccf040";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/km/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/km/firefox-59.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "38ee6522276cd186ae63053fb15978f6eb5bfa8b2e78b3f2e4233d58ef53ac32307c936c454eb76e86e9f5d4845632a7b58e6209851a775c93629d0bad1473d5";
+      sha512 = "5298858458e6a7fdb1c506b54ff3e0ea8d28b85120cda27994838ab614fcc5cb95699acd607970dc2fd8961d66f2640b9f135995e1407f7c511631c43586fca0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kn/firefox-59.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "462349b1bf91686f8212deb580166a3e0ca5dafb947c74b9786809626af68e43c4ac6e51c8351d028acb3c86d1f687ea9f94cf34c9b5085801c242d136a19383";
+      sha512 = "6a32c5e98920a90af971a12dfa15f434a968e2fd0faac302c8b79881e42917eb8e2fe028873f23159870c08e90d3410308ca3c7233c49d72cb4940ba076038de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ko/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ko/firefox-59.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "78e8eb72d89173676a0b65d7295f37b656791595c4def454604a83ad76e2fdf8ce40976bc91ee17219a320242e9a41568157f3754719ab9f9e0a7ce6cb4f66ff";
+      sha512 = "e05c536e4c901323d1e744bb1e85ae85df1454ffaff9234db6fd8fbc79807198c775cf1e0179ab670903bf12ca34c9356b30afe25d8dbc27c9ef4549a5148023";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lij/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lij/firefox-59.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "f51136d2e8e29af14aee4cc20e3fba6546effa40c681d3831a9ced7008a845e27e9bb80ada996d0d77c2c9ecc0825f6c7bbf1063797f71a153fe298be06e7da4";
+      sha512 = "2f47338944f8b34eaa7bb28a2804c637b392a2af4630d758b1c378b9b1d020aa6e611f8e8504adeff75e9eec5eb70c3b39f20b779003d22b87c79ebe0973ae6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lt/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lt/firefox-59.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e1ba1b26612c2622853987fb802c4fd5e7433481b6721950813f76b6463b1320484383b25574733d75c5c4e547b52b3ad9d8687c1a28b511b07bacb9186f22f0";
+      sha512 = "d593966d81f8a0652368f819f8e3f0624fc6d28ebc7387bd5a6a2b3a10d3e87f657076fdeb6eab7a93b7c22e87fea1b84a776ac3d667ea90b302fe1b20638af3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lv/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lv/firefox-59.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "894b82ffe22425e1c95c4e148c7dd58f5b14e2ec11a5a27594e0a00b8d5d57364080caf4da38f73c0af3962600d0051f6d6d436687f485cc178e6eab1d5733d7";
+      sha512 = "3e0a350f87e487c0496f04b419f7eb2313341798f042344b5e2406f7b59d154bbe7830683797021a412c1e2a18f30324260a6988e8d2de5fe6e2a02b28a18493";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mai/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mai/firefox-59.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7240f90b5a4b6cd68135b3436fa796de0e799316b8abc06c1c62bbe22ef9b6ae38bdcf1c60a5df97354ec5b0b69f64635ad6a88321a34a6b15e035bbee19fd53";
+      sha512 = "6bdb0c149489e2acf9fa9ffeb9f519f0ce2d167fa4a7c36cde81675cc9876d202d116b97ccb853ee869e6ab7afc570a023b2a1be847a6ab976bb3c0186aa51b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mk/firefox-59.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "30769e066f1c0cc71f0e5139c893b3e887f4618640b762b666f85c208fc8bdddc53afd7f0beb0421e9c84f82a6b332321840c93ecc9635dff784185f2122527c";
+      sha512 = "233551a16630146475f0bb479f9c2152e546b9e56d3137dc391dba586a1988246c86862c317c5ad13b3a96c8e4f80ef4e108047e9fd917b97165ef3d8dee6f6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ml/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ml/firefox-59.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "6c3f77d4fd7fbc05b7812eff2e8c5ebb75d4fd97a1cb8797260da5d2e53e10def88cfe107131097e6b72968b4c827b998abc42df0443c24330be3a0b0622b715";
+      sha512 = "59711210565b4fb45b7cb001e7315116a666819abe81ead43d8cb70604e33c2cccf5a1469ca8ae72ba2bf73a2d74e4ce024b75fcf7c2ca722ac390ce4371f2b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mr/firefox-59.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "60d8c8824ee7b414ada656310218cc87ad347b36e7192196b2d5c6a5e0958f9786589a3c3f896f1a99b19aa2419431e6aaafaf69b877240872f9ea89178ea699";
+      sha512 = "4dddc2a3f9f646062d0c047f66b86ed8270457d7184eb8147330576eb6c9afc025e025c99bca2cba1854248777eccdf4793be94df0100a035914f8dfd1918a7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ms/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ms/firefox-59.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "114c337fdceec43c1482ee60467526d7fc422f720400e2cd66259cb11c1aed46fc800b1b3fc32ca5e08ad85667bdff31cb31ecd19f66e63d29bdf8696f8e4477";
+      sha512 = "635ebb9f601898097ec59368df8050df894d086e173371479ba4a922beb829adf3ed2af05bf03dd91526ac13cf4b7092f37c6253913806708326b7ed8901b203";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/my/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/my/firefox-59.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "430ed92df431653d7c2f3750c6a7e3987424d9bc49359dcbe6f9c2b66c601e263cdb26f2428c9a1948de78ea51a78e0f1e6fc1538c4cdbc39a126c76050ea51d";
+      sha512 = "7d58e3be5f83d1a42445debbe02a2b4d3305c61523bf3cf8550a7d1dff5f44a8be453f2d4a487b290c61258c4d9ea1c74579d207ce1ad270f3c0dfd2f16e3b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nb-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nb-NO/firefox-59.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c0b00789726e8020a5d8f853b73280720ba650f81cb4559e17578c862ab3d45aadd6a1948ff26e502bacd34d8c0cffa8d46ad6fd35d968ddcb4f8300dfcf44b8";
+      sha512 = "61b25e6697de41ea41daa549fb087b1ea35ac756eee3a783a29d3282ddbde1b63c46848a6ce9fd9f5455806c440ed7c9e4690f2176e3214979bd8c17c83b5e9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ne-NP/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ne-NP/firefox-59.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "b90dc1fd628689c45f06800b3cadee034d6da54a3695959a927ac0466ba70378f4197bc5b17b39d9572a8369897aebb589d1ce7d2dcc0972a371100938704f9c";
+      sha512 = "9b10111c6ed5acd8e0e43bb91837f27e70149685ed40f274e63faa88dd6b2a984cd654e708a72c56f57f1e69fca8518be0e355113456d087256cd0cbe08bce2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nl/firefox-59.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "ab802fa78343b4a2074d2a09187cc96b66c03a26d26f21eb158e90b30bbbafe6dd40d563c9a65c3b6c99f79edcca3615e1322dd9a4fe3ddf1ea527ae41b4b25d";
+      sha512 = "f35f5b21ed6d88686c3411581d3fa3545e8498b04b970e2d18794b56c2b155a2006b90f71fc2e66948f3476116933f1809db403672a66c698f949b4852dff56c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nn-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nn-NO/firefox-59.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4ca2889f2e0a7f19ff1e1f7fa95ef692188f78289e1830df5c72e27db761f599dc1022ce1f9b8c8f30eab92aa70381a1e721deff07fe130b1685e968cd3aaa68";
+      sha512 = "39c0202f69f5d210da4996abe072a60354b2df73266dae36d636c48df576aa7cce1a85214a0c25ff41b3ea7128cb01c2302451d16d637c4b3d8b9595aae5914c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/or/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/or/firefox-59.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "f2da13fc423beccb7044af1b8ad8ae5b8728aeff5ad0bccf52625936b59040aa6db6fd8fec112be8cfa0baf5448ff4b9d0e179b35302c235e6b4dae01500660d";
+      sha512 = "684c2c0d6886152632f530e0f6d290f5ceef9d427cb33d5214cde5e34131092ad682f010db8b6d12470d332b4cf9c7deb0905427a363c776959a64f8958a0c24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pa-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pa-IN/firefox-59.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ab193a72db52ab2208f7c6b5b5eca4756231cc31a7fc9f6adf434169ece5df5cca8800c952bca285f989dd2b5c8d7f825b0a0e99d2fa6a698a70a11fc63b1602";
+      sha512 = "0098f298243cdd4bd114a796cd1e6325e73802d8b9d8fcdcad954c8d648de00d08efe51082bf24f66d23dce696764b745002d56ce049c68a71093ecedd4b661a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pl/firefox-59.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "31954e6be8bc114fab04c45f5ffa1f38c74ca147d790bf63130dac4fbc6f8213cf485216d5f50ceb87e60d587fbdb82fe7034c04182017b8120ec6995a9278a1";
+      sha512 = "f759cb045f817264f63f7b222c93da2dece9b8c14d9621d23798c5e924982e64da2a15af888d1ef0a6b1b2de34695f1c3e70527dcd9b9ddc069c281eb43ffc43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-BR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-BR/firefox-59.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5cfe1e7d703cfa42a1033df3509db3e91788160079c9396d55356b3c7f0b848b59e6a8f704866dd14f2f0714e89830ad541da615c7d4209249ccc46b01eb11ee";
+      sha512 = "367d1ba059d2c4c9b4dbd3422e7a7d964bcaed6d066e022fbbf5c603c80e36acf81aed8c8b9cc4c076f4293a5ec5da81c3c4f9e2cfe6fddcbe0c3db6db3a67b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-PT/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-PT/firefox-59.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "124ce2632b461e53b2cd3474e4fbcb92554006bee72498356886a451800a15d91ffe32ac87451b61d32e6f9d60b04dd14f4ba081a535124c7e2816edc11ac287";
+      sha512 = "a7fba52997e5925bc462fe6cbfb89b642d5759f4bb0c71e07ac2b88e1d726f664a829c433be14088f32eba59474bd3da152da10602fd57a3a8a8f433e738633a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/rm/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/rm/firefox-59.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "847f41ff0293f82425bfba1af30deb4858c066f738f0f9d3db5303092406358e9b11f6207ed732903b860f60c1c1b1f622c5c1d2113eed073d70d039dac4a6bd";
+      sha512 = "a009a30f8b1040e66bb6b49cbad0830e052e95c29a6b294d13f3475e0c2389d8123c20121580f503a1cb5427715d6e8eac501eb3919c894799e2eeb976d4b808";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ro/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ro/firefox-59.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ccd5ac724cd810dec2e1ddb3e48139d9f5768d56ded09c0e6576c0dae898df310a4c5815635f646c0aa91caaad696c0ec6338bf21dacde33b4675f320fb4bca8";
+      sha512 = "5856f65cdbc8ed9161b7a9be8d2f060ed029443bc45cf65b50ae97bd7786a069454a269ab98caff1449a6d6ce804438f08b0a39deaf047ebf024f8da79510ae8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ru/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ru/firefox-59.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d003f707e4a481ddaeab11dffccbc46d0d7173afb081a5007b3efbb6e1ce8d081a4eb23017b87d7e22fc3741e117bdcddbd2393b578bae2d07a2c2c2bbe2d0a9";
+      sha512 = "52a7634f62b97cf2af945d9c69599f2e6e65ae56d52c1e562a28f13f8631e9a75975e37d4bf97ad2b3e50d4e4c58f0b67b6514fc34bc2034989b0ae055187cab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/si/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/si/firefox-59.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "80e0e8c1ee6483a5b70140e4a6c0eb694f24dbce0a638700866ea8759063bba3f42c33ffaf465c7e8266fc764fe2983a2d6b098356dc6f4420eff9089c22331a";
+      sha512 = "e87128bc44713f3d26bf97f2d5a607e63845bcf84e9016886c06ae5ca9153a42cc042e5754e4c97462bcf1079ba699e653f99761f991a0cd0d270eb28561cc54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sk/firefox-59.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9aec4b3085ac757137a8ead6829bee1ae26cc02a494f60a3aa44daa56f5cbe1201c7588a60682b3bdccccad75782bade43d092352c015213e5f16212f9fb2800";
+      sha512 = "3507a790a43da30d9ab82f5a54682d7907982a599ac88ce38f0db5940d49a45ec05093a577c4d549070bfd17f9e1fa3110e2e4fe07c8aeca338bb4486f0c7cfa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sl/firefox-59.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2dc5d855eaedd125f8a3d828d85bc12ae47123f2f4be2bbf1e262c678cbd2607ee48c61e6fa70402da5e7ad549e2580e7d9a0a696e89ac5fee1da2154443f289";
+      sha512 = "ccc7ec548f3639f4c44b42c2c787944c243c7824210cbb52dd8662f4035e12eb1026c6ee8bfc33452f8861fef16be2684e9fc10b7b6cedd94fc1559f98278d0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/son/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/son/firefox-59.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7a1c4f86a4e459e80725b250b3a54be7c78397bd909c7a2081723571378578b7e672af380305ff9dae714e911fb209833833fd7cb3fb8a850f9d6a3b14f41cba";
+      sha512 = "079a31ab92406db87653e5046b4abec632775404fd4850605fd57695d19fbd034b2b5e6de2bcb6340401bb16f0150a20ee437b881fbf23fcab235bb2cee86012";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sq/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sq/firefox-59.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "45d20dcd82c6648c0429dfa0009aaf2d807efb7e9468ded4491a04dced5957d3bc9c1491c09c7f85ea63991283e2c38b2c906ebb338dffba1d0db4748e56246a";
+      sha512 = "c51c0631f9caf84e079bf38f842aa3f85ec8c7289483f7174109f957ee43bd998937f6bd0dc2f4db63bed3e5ee7f113af2def5ac957b854ec044f280feeabde7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sr/firefox-59.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "799f0548e18cbf77a6daf6ec0f9c12e904fde3235e9d8a5564e06df45bc037f4a04de0f5bfb9e74f9fa7053e8fc7b39b5c55b03dba5e78cf4e1400c033077f5f";
+      sha512 = "100b80f6644759840f41d926a5d18b39adf84d626b4dc60fb7b379b0b12d4925f0ba6d223ab36081948f47b527cea3b87600688b99b280bbfb7192dd68606dda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sv-SE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sv-SE/firefox-59.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c2c693ab974b4c26a0c786955cff61f3b0689bd272b00fe4cbdbd7701a57481724f0ebf8aeb8427c7b50f4419875e9ca10d79c534c0e3ca8db132bcf6436e013";
+      sha512 = "3d3a400efa6288b69a42ff9a3dc61b0905250f677f4fcddbe084a562f15d8904a9233bd79c67dcdf1b7d04f7465f2f8cd5f93dfdb5e2e253697875bdda65ac55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ta/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ta/firefox-59.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "0771a9cbb44102291142fab34dbfd704461da5c6c013b48c1ee22cd7cc92ebfaad7ccac5b87bf764489d66e8cec2e4056e9fcd62c3ddb734753a48022f7f8914";
+      sha512 = "de47657375144e368e8a8801b9a486ff11628d86dcc43609ce285710b0bd529df418d8644c8b97e4f1562057d1d5cf7e2bda346cb01f1d9ddb800dbf517a9d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/te/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/te/firefox-59.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "699d8d52cc8e1bac02fbca3caa6504a028100d76fc9fe2492dfe214c5a96f0d3425bf541d2873133dd00e501dcc9d27894e613c44fc3cf9adedc0e08104524f6";
+      sha512 = "0a8a9e5fbacec8ac7473507e6304c52535f81a5b358651b87cb3412e193dfcbf30085b1b725113eceb1818e3c564de05a6a3fa5dc27cbe72b26ba9d58f2be76e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/th/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/th/firefox-59.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "13cf7e1740ab2f508983617ce27f991db8049070061cb4d31299b372a801abf7292edd185fafc73dd58c46d009c32a6b5103a77834b2ddb0cc420cd98f747e9b";
+      sha512 = "312ac50828b9a0fd63be8ef9341b98a3efa6fa8e358730b09e51a4553008a8a38b43306ceb65e9a6dde594c9615c0540584d0b67ece408bf4bd2f6ba19daf80a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/tr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/tr/firefox-59.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a3439d157762eddcc1c09c4b687028b97004ac49144a3f26ea2a05a8eccc0a8b04659147ae7e8972ac16299d262586cc1d0c1bc69e5a309a0c82086cf61202ac";
+      sha512 = "f07f4ec0ed1aad0de8196b7f74316156d677184c102e31e24d9b0384f8cbf4782fcd9ca847974a417d4ac596d6c9b90edc8be6b3a6440c65a39e2b760da12342";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uk/firefox-59.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7767a4549265131e29a142c6f2a914b8699f2042a9da5831192668300acc564fbfe94009b3ea33a7bedc469a7585029685fa91dc752b46d7d7be5425776bc7c4";
+      sha512 = "6cdf07d539646c83059452750f6b70fdff5f9172fc68ac00a82a731c18cbdcb518fed4e1777d44a0ede00af0bfc8c2ccbe5c745140b6bbbeaa8916ed2f4417da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ur/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ur/firefox-59.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "b85f5c3067cf897079ff1de7c0de84756fb2224f703ec6825108efff52bed3a6e780b8410a58ed756e926a6033cd10c888743642f997b9c9d7390096c3b5e7c9";
+      sha512 = "a3111464bdad72fe3af763003941bb1d36de607b1df222a00fb65ed79c7b2c364657493408a634fc55bf3525d584231915970bcf31e94dbf331b65bae47fbcb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uz/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uz/firefox-59.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3febb16ceabdcf7395196f1aef6c5ecc6a09f45e63485207816e95dd5ec0ac9729c3644b8afa75d68241ad203459239bd7f5693c6d8aa7e59afb1a1f661015ff";
+      sha512 = "852f44d66be42fb6973529143f99d358ce3b5839154b70ab57d9547dcbe1d3c408df396901b57a7c05c66cbc8e9cc6f7acc4d1bc638a19ab19279a053342cefd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/vi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/vi/firefox-59.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d117eca28279af133e2dde8dc25d3f7c4dcdc97f683f4570aa9cb8965200dfd8799271958ed6113b9bee488fc3e17d772b1aa4a4d657a49f72914890752af13c";
+      sha512 = "b4a8662cb51660051ea0ce52156f8e767b0a465a3cf954f08b3e7eb6f55d2f48da16ac47ec8e6c431836956058df388c35437f29f3e993d2e918de328edb6ffa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/xh/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/xh/firefox-59.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "4ce7c4627a7db67ebe85ddb134cadca8cc4ecd3a01d8895dcb8b691f85e01911818404cc7243b4f5e1df0133a204a1ce5289168cae0b7e1b0b2674a659fc6684";
+      sha512 = "a3bb908c5785995cbae70ed6bd8f819f1d7bd39073b210489d48db17132be0a28485969ce5619752724ea28eff33f7c20e532edfc260b4fcb80187755f9b3b76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-CN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-CN/firefox-59.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d0a73f00af50d70b055a1b2e89dc942b56d8d6e3a297407060a88a994dfcbd52fd60ec221e3afd9b6036500d27d861415ab0b25ceb443210321823e4e3b189e2";
+      sha512 = "7c9a083e669a8412915f3423b639605fe5377945d81f21c5acc4efa19d8204b53093bfe99f3a664e7190a91b2a5eb957f561667644569cbd272ab13dcf53568e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-TW/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-TW/firefox-59.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a855e8de90b5b26e8d4fed05b48c5efd6626c9d793f30c1f0b71d9b062a4e253b8c417a44e581ea8edd7babf5bd536b4384dd494dbb2fa36d7f585e555cdd655";
+      sha512 = "9cfcf4928557a4158c802a20b7c63d8097fa629cb755399d16cfbd7e61c7dfc4058b3879f4840743ed25925a4a9d6ef200c7f6a40bed428915f3d3c0392deb23";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 0f465122806..3fbf8b7ff03 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -22,7 +22,7 @@ writeScript "update-${attrPath}" ''
   #  - removes trailing slash
   #  - sorts everything with semver in mind
   #  - picks up latest release
-  version=`xidel -q $url --extract "//a" | \
+  version=`xidel $url --extract "//a" | \
            grep "^[0-9.]*${versionSuffix}/$" | \
            sed s/[/]$// | \
            sort --version-sort | \

From 15ee5ff446e494e420ce8fb5d05f7119f1f9753f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 13 Mar 2018 19:21:47 +0100
Subject: [PATCH 0946/2266] v8: only use -Wno-error=unused-lambda-capture with
 clang

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

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 3e54a02bb4e..f14ec4fc608 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -160,7 +160,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin cctools
     ++ stdenv.lib.optional stdenv.isLinux patchelf;
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes -Wno-error=unused-lambda-capture";
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"
+    + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
 
   buildFlags = [
     "LINK=c++"

From 29d46471e0ee2d21b359819bc38e8649d1180de5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 13 Mar 2018 13:29:15 -0500
Subject: [PATCH 0947/2266] metrics: fix "values" to be count not bytes, to
 match prev behavior

https://github.com/NixOS/nixpkgs/pull/36896#discussion_r174163744
---
 pkgs/top-level/metrics.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index eeacb59b64b..77f620da724 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -35,7 +35,7 @@ runCommand "nixpkgs-metrics"
       [[ -n $x ]] || exit 1
       echo "$name.allocations $x B" >> $out/nix-support/hydra-metrics
 
-      x=$(sed -e 's/.*values allocated bytes: \([0-9]\+\).*/\1/ ; t ; d' stats)
+      x=$(sed -e 's/.*values allocated count: \([0-9]\+\).*/\1/ ; t ; d' stats)
       [[ -n $x ]] || exit 1
       echo "$name.values $x" >> $out/nix-support/hydra-metrics
     }

From 9c7e9ef023e7747c79b40dab52b676e927820084 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 13 Mar 2018 19:43:16 +0100
Subject: [PATCH 0948/2266] faust: 2.5.21 -> 2.5.23

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

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 877bd26a5c1..f0564f37d6b 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -16,13 +16,13 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.5.21";
+  version = "2.5.23";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
     rev = "${version}";
-    sha256 = "1kfrcfhpzkpjxsrvgwmc2valgwfb4b7gfwwnlnjq6f6dp56yflpz";
+    sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
     fetchSubmodules = true;
   };
 

From 4f225f96d5a379e9955652e8867541ad04c297f6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 10 Mar 2018 00:08:27 +0100
Subject: [PATCH 0949/2266] xautolock: implement basic test to confirm
 functionality

---
 nixos/release.nix         |  1 +
 nixos/tests/xautolock.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 nixos/tests/xautolock.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index a1310a409a1..6a3fcea1768 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -368,6 +368,7 @@ in rec {
   tests.vault = callTest tests/vault.nix {};
   tests.virtualbox = callSubTestsOnTheseSystems ["x86_64-linux"] tests/virtualbox.nix {};
   tests.wordpress = callTest tests/wordpress.nix {};
+  tests.xautolock = callTest tests/xautolock.nix {};
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix
new file mode 100644
index 00000000000..ee46d9e05b0
--- /dev/null
+++ b/nixos/tests/xautolock.nix
@@ -0,0 +1,24 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+  name = "xautolock";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+
+  nodes.machine = {
+    imports = [ ./common/x11.nix ./common/user-account.nix ];
+
+    services.xserver.displayManager.auto.user = "bob";
+    services.xserver.xautolock.enable = true;
+    services.xserver.xautolock.time = 1;
+  };
+
+  testScript = ''
+    $machine->start;
+    $machine->waitForX;
+    $machine->mustFail("pgrep xlock");
+    $machine->sleep(120);
+    $machine->mustSucceed("pgrep xlock");
+  '';
+})

From 2b114a8c29071b8adc44d5d5c63abbf503bc4cc8 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 13 Mar 2018 20:13:31 +0000
Subject: [PATCH 0950/2266] Fix qca-qt5 build on darwin

---
 .../development/libraries/qca-qt5/default.nix |  6 +++++-
 .../libraries/qca-qt5/move-project.patch      | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qca-qt5/move-project.patch

diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index ee27d89f563..db40a40d02d 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl qtbase ];
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  # Without this patch cmake fails with a "No known features for CXX compiler"
+  # error
+  patches = [./move-project.patch];
+
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
 
@@ -22,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = http://delta.affinix.com/qca;
     maintainers = with maintainers; [ ttuegel ];
     license = licenses.lgpl21Plus;
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch
new file mode 100644
index 00000000000..2a109a3aa3c
--- /dev/null
+++ b/pkgs/development/libraries/qca-qt5/move-project.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 453fd8a..5f6ee11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX)
+   unset(CMAKE_INSTALL_PREFIX CACHE)
+ endif(NOT CMAKE_INSTALL_PREFIX)
+
+-project(qca)
+
+ if(NOT APPLE)
+   cmake_minimum_required(VERSION 2.8.12)
+ else()
+   cmake_minimum_required(VERSION 3.0)
+ endif()
++project(qca)
+
+ set(QCA_LIB_MAJOR_VERSION "2")
+ set(QCA_LIB_MINOR_VERSION "1")

From a3a6918137643235ec7a8427b1bf28063323ec4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 14:39:31 +0100
Subject: [PATCH 0951/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9-5-g32974fc from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3e784a7dcf5510641ea65173d405ce4b3ab3884e.
---
 .../haskell-modules/hackage-packages.nix      | 850 ++++++++++++++++--
 1 file changed, 761 insertions(+), 89 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index deb53426888..8e495e3ea58 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1790,6 +1790,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "BlastHTTP_1_3_0" = callPackage
+    ({ mkDerivation, base, BiobaseBlast, biocore, biofasta, blastxml
+     , bytestring, conduit, either-unwrap, HTTP, http-conduit, hxt, mtl
+     , network, transformers
+     }:
+     mkDerivation {
+       pname = "BlastHTTP";
+       version = "1.3.0";
+       sha256 = "1hlb6mmhcb7ijpd3xbsq2piw817k9pk09w4lgq1cgfgs1r6f3vdh";
+       libraryHaskellDepends = [
+         base BiobaseBlast biocore biofasta blastxml bytestring conduit
+         either-unwrap HTTP http-conduit hxt mtl network transformers
+       ];
+       homepage = "https://github.com/eggzilla/BlastHTTP";
+       description = "Libary to interface with the NCBI blast REST interface";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Blobs" = callPackage
     ({ mkDerivation, base, containers, directory, HaXml, polyparse
      , pretty, wx, wxcore
@@ -2977,6 +2996,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "ClustalParser_1_2_3" = callPackage
+    ({ mkDerivation, base, cmdargs, either-unwrap, hspec
+     , hspec-discover, parsec, text, vector
+     }:
+     mkDerivation {
+       pname = "ClustalParser";
+       version = "1.2.3";
+       sha256 = "0wjs6bsbyykrm0hjdybnap86zsnhjjifampm08dqg7fqp7f7pmpy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec text vector ];
+       executableHaskellDepends = [ base cmdargs either-unwrap ];
+       testHaskellDepends = [ base hspec hspec-discover parsec text ];
+       description = "Libary for parsing Clustal tools output";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Coadjute" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-csv
      , containers, directory, fgl, filepath, mtl, old-time, pretty
@@ -16645,8 +16682,8 @@ self: {
      }:
      mkDerivation {
        pname = "SelectSequencesFromMSA";
-       version = "1.0.4";
-       sha256 = "0rr8gxkypjg347fna0q5aqjllvc95477n3xy63cvs0bn8v5vq9z5";
+       version = "1.0.5";
+       sha256 = "0m68xiaa6acaq30qlscpd5lm7x0rfrqxyn0krwahkqd5s9h5aj7i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -22064,8 +22101,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.7.1";
        sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
-       revision = "1";
-       editedCabalFile = "0zm4i3n8n2xj53ymb8cd1d7bnsgna5064198ackj1xjh8zsaarz6";
+       revision = "2";
+       editedCabalFile = "0pwa5r0nkc9c80ky3iqki6hvcd5ifw2rd6yj27h66r3jyk2h2qhz";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-iso8601 base base-compat bytestring
          containers exceptions hashable scientific tagged text time
@@ -38652,6 +38689,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bsb-http-chunked" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder }:
+     mkDerivation {
+       pname = "bsb-http-chunked";
+       version = "0.0.0.1";
+       sha256 = "062rlcipj61cj38mysg8bmbiklbsz45lhgb0cl39j2wvxpmr6v6b";
+       libraryHaskellDepends = [ base bytestring bytestring-builder ];
+       homepage = "http://github.com/sjakobi/bsb-http-chunked";
+       description = "Chunked HTTP transfer encoding for bytestring builders";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bsd-sysctl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50095,6 +50144,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conduit-algorithms_0_0_8_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
+     , conduit-combinators, conduit-extra, containers, deepseq
+     , directory, exceptions, HUnit, lzma-conduit, monad-control, mtl
+     , resourcet, stm, stm-conduit, streaming-commons, test-framework
+     , test-framework-hunit, test-framework-th, transformers
+     , unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit-algorithms";
+       version = "0.0.8.0";
+       sha256 = "0i8ikrh3fpwfqli8ksfayc20kml1wacl0rgv8pc00lgrsmd8r9i8";
+       libraryHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers deepseq exceptions lzma-conduit
+         monad-control mtl resourcet stm stm-conduit streaming-commons
+         transformers unliftio-core vector
+       ];
+       testHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers deepseq directory exceptions HUnit
+         lzma-conduit monad-control mtl resourcet stm stm-conduit
+         streaming-commons test-framework test-framework-hunit
+         test-framework-th transformers unliftio-core vector
+       ];
+       homepage = "https://github.com/luispedro/conduit-algorithms#readme";
+       description = "Conduit-based algorithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -54976,6 +55056,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cublas_0_4_0_1" = callPackage
+    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
+     , storable-complex, template-haskell
+     }:
+     mkDerivation {
+       pname = "cublas";
+       version = "0.4.0.1";
+       sha256 = "0fk0yrm6arb85xxy7vr2bnkxgwassahfcl8lf9k99s9f9wqc9glr";
+       setupHaskellDepends = [ base Cabal cuda directory filepath ];
+       libraryHaskellDepends = [
+         base cuda half storable-complex template-haskell
+       ];
+       libraryToolDepends = [ c2hs ];
+       description = "FFI bindings to the CUDA BLAS library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cuboid" = callPackage
     ({ mkDerivation, base, GLUT, Yampa }:
      mkDerivation {
@@ -55010,6 +55108,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cuda_0_9_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
+     , pretty, template-haskell
+     }:
+     mkDerivation {
+       pname = "cuda";
+       version = "0.9.0.3";
+       sha256 = "0ym5j3rllxyl9zqji47pngwbi032hzm0bv5j06756d5cb769k44q";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         base bytestring filepath template-haskell
+       ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base pretty ];
+       homepage = "https://github.com/tmcdonell/cuda";
+       description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cudd" = callPackage
     ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }:
      mkDerivation {
@@ -55069,6 +55189,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cufft_0_9_0_0" = callPackage
+    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "cufft";
+       version = "0.9.0.0";
+       sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv";
+       setupHaskellDepends = [
+         base Cabal cuda directory filepath template-haskell
+       ];
+       libraryHaskellDepends = [ base cuda ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "https://github.com/robeverest/cufft";
+       description = "Haskell bindings for the CUFFT library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "curl" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl }:
      mkDerivation {
@@ -55096,19 +55235,21 @@ self: {
      }) {};
 
   "curl-runnings" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs
-     , directory, hspec, hspec-expectations, http-conduit, text
-     , unordered-containers, yaml
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+     , case-insensitive, cmdargs, directory, hspec, hspec-expectations
+     , http-conduit, http-types, text, unordered-containers, vector
+     , yaml
      }:
      mkDerivation {
        pname = "curl-runnings";
-       version = "0.2.0";
-       sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n";
+       version = "0.3.0";
+       sha256 = "0bcapr5kcwlc65bkg6w3aq69jzrb2rydkw13v99dcf9fn43kwcfj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hspec
-         hspec-expectations http-conduit text unordered-containers yaml
+         aeson aeson-pretty base bytestring case-insensitive directory hspec
+         hspec-expectations http-conduit http-types text
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [ base cmdargs text ];
        testHaskellDepends = [ base directory hspec hspec-expectations ];
@@ -55364,6 +55505,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cusolver_0_1_0_1" = callPackage
+    ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
+     , directory, filepath, half, storable-complex
+     }:
+     mkDerivation {
+       pname = "cusolver";
+       version = "0.1.0.1";
+       sha256 = "1wjwdhy51pzvhvr50v7b1s9ljgk001wp9qlmwkkjih0csk79047k";
+       setupHaskellDepends = [ base Cabal cuda directory filepath ];
+       libraryHaskellDepends = [
+         base cublas cuda cusparse half storable-complex
+       ];
+       libraryToolDepends = [ c2hs ];
+       description = "FFI bindings to CUDA Solver, a LAPACK-like library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cusparse" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
      , storable-complex
@@ -55380,6 +55539,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cusparse_0_1_0_1" = callPackage
+    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
+     , storable-complex
+     }:
+     mkDerivation {
+       pname = "cusparse";
+       version = "0.1.0.1";
+       sha256 = "1fsldpi4bglh875fc9blki3mlz14dal2j37651br1l587ky1v55w";
+       setupHaskellDepends = [ base Cabal cuda directory filepath ];
+       libraryHaskellDepends = [ base cuda half storable-complex ];
+       libraryToolDepends = [ c2hs ];
+       description = "FFI bindings to the CUDA Sparse BLAS library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "custom-prelude" = callPackage
     ({ mkDerivation, base, basic-prelude, monad-loops }:
      mkDerivation {
@@ -59505,14 +59680,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_3_1_0" = callPackage
+  "dejafu_1_3_2_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, profunctors, random, ref-fd, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.1.0";
-       sha256 = "09c2gsgqxnr9kpkhbz4g1wrl66qy02vp3sckp8vsg194r5xx4s1b";
+       version = "1.3.2.0";
+       sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
          profunctors random ref-fd transformers
@@ -60393,7 +60568,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_11_0" = callPackage
+  "dhall_1_11_1" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , contravariant, cryptonite, deepseq, directory, exceptions
@@ -60406,8 +60581,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.11.0";
-       sha256 = "1vfraj97vj6jc9ysz3svibadhwrd7q0p3wjlvp6vaackiprfbinf";
+       version = "1.11.1";
+       sha256 = "1vaggm5i89yry8z6xyx8852d91nmcdlmf527bnps37fmgrkvhga4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63426,6 +63601,8 @@ self: {
        pname = "dlist-nonempty";
        version = "0.1.1";
        sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
+       revision = "1";
+       editedCabalFile = "0dcqfyp38f792nzsv4977dcv4zr4xdrg780lz6bpf2hn7ikdglz9";
        libraryHaskellDepends = [
          base base-compat deepseq dlist semigroupoids
        ];
@@ -63768,14 +63945,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "docker-build-cacher_1_9_1" = callPackage
+  "docker-build-cacher_1_9_3" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.1";
-       sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4";
+       version = "1.9.3";
+       sha256 = "12x91w3wq0hndssz48xka0cb7ajmlrvdv2ysc0pv333smkmclsw1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -64353,6 +64530,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dotenv_0_5_2_4" = callPackage
+    ({ mkDerivation, base, base-compat, directory, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers, yaml
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.5.2.4";
+       sha256 = "13c6b01gkkykg1sl1dk1374nbayg523w4fiy2bg494bj5ia516di";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat directory exceptions megaparsec process text
+         transformers yaml
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers yaml
+       ];
+       testHaskellDepends = [
+         base base-compat directory exceptions hspec hspec-megaparsec
+         megaparsec process text transformers yaml
+       ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -65279,8 +65486,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.3.0";
-       sha256 = "1nk9rdfd4kcim5i9p891cic562g2wda0l6d1xvkkl4hh4b8bym7k";
+       version = "0.1.4.0";
+       sha256 = "0m5f71z9rqfvvqxpsvbpr258rgirphgdyfvzb1wv20zdhfi67lzh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67414,6 +67621,25 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
+  "elm-export-persistent_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, elm-export, persistent, scientific
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "elm-export-persistent";
+       version = "0.2.0";
+       sha256 = "09by77av5p18q89ryzid52zcr153mgx0zsksp5vg8ps6an5apirc";
+       libraryHaskellDepends = [
+         aeson base elm-export persistent scientific text
+         unordered-containers
+       ];
+       homepage = "https://github.com/jb55/elm-export-persistent";
+       description = "elm-export persistent entities";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+     }) {};
+
   "elm-get" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
      , bytestring, containers, directory, Elm, filepath, HTTP
@@ -69036,6 +69262,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_2_5" = callPackage
+    ({ mkDerivation, base, exceptions, safe, text, transformers
+     , transformers-compat, unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.2.5";
+       sha256 = "0p3kpipixdcwhwjcwq8ks8iik78dsddglxrn929dfwsm1ibcl5z9";
+       libraryHaskellDepends = [
+         base exceptions safe text transformers transformers-compat
+         unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "errors-ext" = callPackage
     ({ mkDerivation, base, errors, exceptions, HUnit, monad-control
      , mtl, transformers
@@ -70852,6 +71095,28 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "exp-pairs_0_1_6_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
+     , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "exp-pairs";
+       version = "0.1.6.0";
+       sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim prettyprinter
+       ];
+       testHaskellDepends = [
+         base matrix QuickCheck random smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/Bodigrim/exp-pairs";
+       description = "Linear programming over exponent pairs";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "expand" = callPackage
     ({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }:
      mkDerivation {
@@ -74300,12 +74565,27 @@ self: {
        pname = "fixed-vector-hetero";
        version = "0.4.0.0";
        sha256 = "1x163xw7r95xj8m7nrsbi090pvbmvqw6wplg5ki96k6wa5slidin";
+       revision = "1";
+       editedCabalFile = "0gc12lyp07yjs1xhdbfwllbw2ccdr131w0naxv5cn09bh9iay5xs";
        libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
        homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
        description = "Generic heterogeneous vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed-vector-hetero_0_5_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, fixed-vector, primitive }:
+     mkDerivation {
+       pname = "fixed-vector-hetero";
+       version = "0.5.0.0";
+       sha256 = "1446xsj030xr7zry2pqq0yxv4f0j46jmpisfmp357jb0n9l5kwm3";
+       libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
+       homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
+       description = "Generic heterogeneous vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-width" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -80106,6 +80386,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-aeson_0_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , genvalidity, genvalidity-aeson, genvalidity-hspec
+     , genvalidity-text, hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-aeson";
+       version = "0.1.0.2";
+       sha256 = "05h3y3bnq2i9xhjh5i5rghazfwz5n1vsvrmx4r3ircd6zv4nm2g1";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
+         genvalidity-text hspec text
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "Standard spec's for aeson-related instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec-binary" = callPackage
     ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
@@ -80881,6 +81184,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-events_0_7_2" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "ghc-events";
+       version = "0.7.2";
+       sha256 = "1gzz71b0xnrri85pz5jl5ar0pyr13gbq31xll1iwv3s45bvl65mh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers text vector
+       ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base ];
+       description = "Library and tool for parsing .eventlog files from GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-events-analyze" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg
      , filepath, ghc-events, lens, mtl, optparse-applicative, parsec
@@ -88505,6 +88828,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "greskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
+     , greskell-core, hint, hspec, semigroups, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "greskell";
+       version = "0.1.0.0";
+       sha256 = "0krmn6gbf50q8w9gm041zangfsc1c738ajahzg65hcclkca2iq4c";
+       libraryHaskellDepends = [
+         aeson base greskell-core semigroups text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover greskell-core hint
+         hspec text unordered-containers
+       ];
+       homepage = "https://github.com/debug-ito/greskell/";
+       description = "Haskell binding for Gremlin graph query language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "greskell-core" = callPackage
+    ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec
+     , QuickCheck, scientific, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "greskell-core";
+       version = "0.1.0.0";
+       sha256 = "1s8hwfp4vfyj5zb8kfvk7ahi5crbf6jwsjk2g188nf7gzy76mf6v";
+       libraryHaskellDepends = [
+         aeson base scientific text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base doctest doctest-discover hspec QuickCheck text
+       ];
+       homepage = "https://github.com/debug-ito/greskell/";
+       description = "Haskell binding for Gremlin graph query language - core data types and tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -88843,6 +89207,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grouped-list_0_2_2_0" = callPackage
+    ({ mkDerivation, base, binary, containers, criterion, deepseq
+     , pointed, QuickCheck, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "grouped-list";
+       version = "0.2.2.0";
+       sha256 = "0733wmdflxpd2ryrdx4ygizyclxmbd8xmkdfs7d7s4x8hffk0k5x";
+       libraryHaskellDepends = [ base binary containers deepseq pointed ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groupoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -96410,7 +96791,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-cli_1_0_1_1" = callPackage
+  "haskell-tools-cli_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-daemon
@@ -96419,8 +96800,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "1.0.1.1";
-       sha256 = "1fr4hzhlbwxna326dkzc92x1scjrf2yjgx8rhn5r76afay5w0wj9";
+       version = "1.0.1.2";
+       sha256 = "03s7jhq7449z52h6vq9gbay3xdn66s8ma7snak0kk6nra41zrlpp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96719,7 +97100,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-tools-refactor_1_0_1_1" = callPackage
+  "haskell-tools-refactor_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -96729,8 +97110,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.0.1.1";
-       sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2";
+       version = "1.0.1.2";
+       sha256 = "0fbfmbrskhmzqcsrv4aviaf6b4rn7i3zs2ckl3l4r1q7rslxw3fk";
        libraryHaskellDepends = [
          aeson base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -100235,6 +100616,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_0_5_3" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text
+     , th-lift, time, transformers, transformers-base, unix
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.5.3";
+       sha256 = "1vv8vnkv6d0fvm0vwfm11ajyd9da3hfy2wdkd4p7dhfyscq9cwx4";
+       revision = "1";
+       editedCabalFile = "0hhzkl88xk9j62897y11f4xx84qdh0mdap55iw30cl4zwlgp10ir";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text th-lift time transformers transformers-base
+         unix wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       homepage = "https://hedgehog.qa";
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -100526,8 +100937,8 @@ self: {
        pname = "heist";
        version = "1.0.1.2";
        sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71";
-       revision = "1";
-       editedCabalFile = "0aac04b374bi02nj1li7xf0w2z1d87l8qhzjmpsharg9jxrk8ngn";
+       revision = "2";
+       editedCabalFile = "0nyxym4jqkcxx0rim7vzfgr1hhmcgvgi3pann4192ahhsail8b2d";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -101126,8 +101537,8 @@ self: {
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.8.1.3";
-       sha256 = "17ix7j2q1iawf152lips74pp9qb0j412k8zdliv588xz2a9hijk0";
+       version = "1.8.1.4";
+       sha256 = "1hgrwp39q6fwq0ssfkbfq8ndwmyiv1szpl8qa1p0fss5ddf002bc";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103455,6 +103866,8 @@ self: {
        pname = "histogram-fill";
        version = "0.8.5.0";
        sha256 = "0csijwl60v81inn7awl27b302c9ibblplr58ka7xih17dxyidpgv";
+       revision = "1";
+       editedCabalFile = "0pa5i5187g0y7r7ngy4gf9lqp76k9saz5qjri4nx0f98kwsacagg";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
@@ -103462,6 +103875,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "histogram-fill_0_9_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ghc-prim, mwc-random
+     , primitive, vector
+     }:
+     mkDerivation {
+       pname = "histogram-fill";
+       version = "0.9.0.0";
+       sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56";
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
+       homepage = "https://github.com/Shimuuar/histogram-fill/";
+       description = "Library for histograms creation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "histogram-fill-binary" = callPackage
     ({ mkDerivation, base, binary, histogram-fill, vector }:
      mkDerivation {
@@ -104078,8 +104507,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.5";
-       sha256 = "10ar6ic9snrbwi60sz1729dshff01s3knmb7d7kwfk9svmilxq6f";
+       version = "1.5.1";
+       sha256 = "0g3jxxxav1v55dy50sclij05ypmapwbi43xxqz3y47xgvlfq9j23";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -112408,6 +112837,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-api-data_0_3_8" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
+     , Cabal, cabal-doctest, containers, directory, doctest, filepath
+     , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
+     , quickcheck-instances, text, time, time-locale-compat
+     , unordered-containers, uri-bytestring, uuid, uuid-types
+     }:
+     mkDerivation {
+       pname = "http-api-data";
+       version = "0.3.8";
+       sha256 = "0m1q3zl2bjayafr8b9ihizk0mg8awga4l7gg1p1khy3yyzngl5wv";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec attoparsec-iso8601 base bytestring containers hashable
+         http-types text time time-locale-compat unordered-containers
+         uri-bytestring uuid-types
+       ];
+       testHaskellDepends = [
+         base bytestring directory doctest filepath hspec HUnit QuickCheck
+         quickcheck-instances text time unordered-containers uuid
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "http://github.com/fizruk/http-api-data";
+       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, http-types }:
      mkDerivation {
@@ -113139,7 +113596,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-reverse-proxy_0_5_0" = callPackage
+  "http-reverse-proxy_0_5_0_1" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -113148,8 +113605,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-reverse-proxy";
-       version = "0.5.0";
-       sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i";
+       version = "0.5.0.1";
+       sha256 = "1fl4gsp5743a7kzd12d7r3mwyvdq3fb7ngxlkywzphjlx61asl2y";
        libraryHaskellDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
@@ -114422,8 +114879,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "2.0.0";
-       sha256 = "0j1qwn9an397vl3y3mlrzhjw3c8jbmw1c0wpsywk0v0p7rfjg5nn";
+       version = "2.1.0";
+       sha256 = "1ncxagsmil3cxmsrw2ywzcpfhhlkaz87mfhzkww7j93jcwacbph2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116046,8 +116503,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "icon-fonts";
-       version = "0.2.1.0";
-       sha256 = "0i0gxrvmvlklsdr70fgajj9padgz8s743hs3i8lb4wnp71n7vyvl";
+       version = "0.2.1.1";
+       sha256 = "0lc5filf2xydjrsq9d5qlwz3y76pn590pjiqjjhibkk4dhnys3gs";
        libraryHaskellDepends = [ base ];
        description = "Package for handling icon fonts in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -126804,7 +127261,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_2_0_1" = callPackage
+  "language-docker_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
      , semigroups, split, template-haskell, text, th-lift
@@ -126812,8 +127269,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "2.0.1";
-       sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc";
+       version = "3.0.0";
+       sha256 = "0bxj7ipv6b07yjyz4a03j3whayb6rln5ymj1n06kfnbpl0lzcmyr";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath free Glob mtl parsec
          pretty semigroups split template-haskell text th-lift
@@ -136177,8 +136634,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.4.4.0";
-       sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj";
+       version = "0.4.5.0";
+       sha256 = "0z21jcrzky80fq172b2s0hwna4g1kzfzval40cdl6glf0l2zfimv";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -136193,23 +136650,24 @@ self: {
     ({ mkDerivation, base, call-stack, comonad, constrained-categories
      , containers, deepseq, free, free-vector-spaces, lens, linear
      , linearmap-category, manifolds-core, MemoTrie, number-show
-     , placeholders, pragmatic-show, semigroups, tagged, tasty
-     , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space
-     , void
+     , placeholders, pragmatic-show, QuickCheck, semigroups, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, transformers, vector
+     , vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.4.4.0";
-       sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx";
+       version = "0.4.5.0";
+       sha256 = "0paq7x9nhna74q4y7gvwlvwfpzxil9dx9ysg3r6k5as4i9687442";
        libraryHaskellDepends = [
          base call-stack comonad constrained-categories containers deepseq
          free free-vector-spaces lens linear linearmap-category
          manifolds-core MemoTrie number-show placeholders pragmatic-show
-         semigroups tagged transformers vector vector-space void
+         QuickCheck semigroups tagged transformers vector vector-space void
        ];
        testHaskellDepends = [
-         base constrained-categories containers lens linearmap-category
-         pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space
+         base constrained-categories containers lens linear
+         linearmap-category pragmatic-show tasty tasty-hunit
+         tasty-quickcheck vector-space
        ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
@@ -136221,8 +136679,8 @@ self: {
     ({ mkDerivation, base, call-stack, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.4.4.0";
-       sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q";
+       version = "0.4.5.0";
+       sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "The basic classes for the manifolds hierarchy";
@@ -137055,6 +137513,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrix_0_3_6_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, loop, primitive
+     , QuickCheck, semigroups, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "matrix";
+       version = "0.3.6.0";
+       sha256 = "1l1pwj6j4k9da4c507z0k17zjvni895qgcgjvln2ggxinzz88fcb";
+       libraryHaskellDepends = [
+         base deepseq loop primitive semigroups vector
+       ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "A native implementation of matrix operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix-market" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -140933,15 +141409,15 @@ self: {
      }) {};
 
   "monad-abort-fd" = callPackage
-    ({ mkDerivation, base, mtl, transformers, transformers-abort
+    ({ mkDerivation, base, mtl, stm, transformers, transformers-abort
      , transformers-base, transformers-compat
      }:
      mkDerivation {
        pname = "monad-abort-fd";
-       version = "0.6";
-       sha256 = "0a9ykj8cp817qlzvz7l5502zmwhiqa5236xvnsf93x38h34xwx5m";
+       version = "0.6.1";
+       sha256 = "1wwaia512sb3kh8k0p4ql6zqkmj4fpxzwqfnp7s939j2simmv8gp";
        libraryHaskellDepends = [
-         base mtl transformers transformers-abort transformers-base
+         base mtl stm transformers transformers-abort transformers-base
          transformers-compat
        ];
        homepage = "https://github.com/mvv/monad-abort-fd";
@@ -142645,6 +143121,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoidal-containers_0_3_1_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
+     , semigroups, unordered-containers
+     }:
+     mkDerivation {
+       pname = "monoidal-containers";
+       version = "0.3.1.0";
+       sha256 = "11gpqp4c54q6kmsdfpl0lcrfj6687h51mjpgirl299j6bam2bhs4";
+       libraryHaskellDepends = [
+         base containers deepseq hashable lens newtype semigroups
+         unordered-containers
+       ];
+       homepage = "http://github.com/bgamari/monoidal-containers";
+       description = "Containers with monoidal accumulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoidplus" = callPackage
     ({ mkDerivation, base, contravariant, semigroups, transformers }:
      mkDerivation {
@@ -146551,18 +147045,18 @@ self: {
      }) {};
 
   "nested-routes" = callPackage
-    ({ mkDerivation, attoparsec, base, bifunctors, bytestring
-     , composition-extra, errors, exceptions, extractable-singleton
-     , hashable, hashtables, HSet, hspec, hspec-wai, http-types
-     , monad-control-aligned, mtl, poly-arity, pred-set, pred-trie
-     , regex-compat, semigroups, tasty, tasty-hspec, text, transformers
-     , tries, unordered-containers, wai-middleware-content-type
-     , wai-middleware-verbs, wai-transformers
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, errors
+     , exceptions, extractable-singleton, hashable, hashtables, hspec
+     , hspec-wai, http-types, monad-control-aligned, mtl, poly-arity
+     , pred-set, pred-trie, regex-compat, semigroups, tasty, tasty-hspec
+     , text, transformers, tries, unordered-containers
+     , wai-middleware-content-type, wai-middleware-verbs
+     , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "8.1.0";
-       sha256 = "1cd88ma1naw998ask0pc1whnyczrc5b9dp6n1maanc027f7rfn66";
+       version = "8.2.0";
+       sha256 = "1fg901fa9an4589my637lld8y4nyq3pd0gqy008p10w3c0mznhw6";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring errors exceptions
          extractable-singleton hashable hashtables monad-control-aligned mtl
@@ -146571,11 +147065,11 @@ self: {
          wai-middleware-verbs wai-transformers
        ];
        testHaskellDepends = [
-         attoparsec base bifunctors bytestring composition-extra errors
-         exceptions extractable-singleton hashable hashtables HSet hspec
-         hspec-wai http-types monad-control-aligned mtl poly-arity pred-set
-         pred-trie regex-compat semigroups tasty tasty-hspec text
-         transformers tries unordered-containers wai-middleware-content-type
+         attoparsec base bifunctors bytestring errors exceptions
+         extractable-singleton hashable hashtables hspec hspec-wai
+         http-types monad-control-aligned mtl poly-arity pred-set pred-trie
+         regex-compat semigroups tasty tasty-hspec text transformers tries
+         unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        homepage = "https://github.com/athanclark/nested-routes#readme";
@@ -150327,6 +150821,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nvvm_0_8_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
+     , filepath, template-haskell
+     }:
+     mkDerivation {
+       pname = "nvvm";
+       version = "0.8.0.3";
+       sha256 = "1kwmgl1bp0mlv4bdnjl6m1v34k68pgg6z00z3i7x3wfjff8gd5sr";
+       setupHaskellDepends = [
+         base Cabal cuda directory filepath template-haskell
+       ];
+       libraryHaskellDepends = [ base bytestring cuda template-haskell ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "https://github.com/tmcdonell/nvvm";
+       description = "FFI bindings to NVVM";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nyan" = callPackage
     ({ mkDerivation, base, bytestring, mtl, ncurses, text }:
      mkDerivation {
@@ -157768,7 +158281,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-postgresql_2_8_1_1" = callPackage
+  "persistent-postgresql_2_8_2_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-logger, persistent, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -157776,8 +158289,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.8.1.1";
-       sha256 = "1ikjcd1i33nf044gcjfk2jxppjwl14vn7yd7jwjci5w0vjx6fwqi";
+       version = "2.8.2.0";
+       sha256 = "0j9g12fk1rlxhd45frxrj9bkmzrk1qbz611296af8nhxkw5wiwzj";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          persistent postgresql-libpq postgresql-simple resource-pool
@@ -159170,6 +159683,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes_4_3_9" = callPackage
+    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+     , optparse-applicative, QuickCheck, semigroups, test-framework
+     , test-framework-quickcheck2, transformers, void
+     }:
+     mkDerivation {
+       pname = "pipes";
+       version = "4.3.9";
+       sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
+       libraryHaskellDepends = [
+         base exceptions mmorph mtl semigroups transformers void
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
+       description = "Compositional pipelines";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers
@@ -160083,6 +160620,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-safe_2_2_8" = callPackage
+    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+     , pipes, primitive, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "pipes-safe";
+       version = "2.2.8";
+       sha256 = "0gc02s0sc32z53l76pkp7y0r70m9acwrlbhfqmm03yyrkn4j35wd";
+       libraryHaskellDepends = [
+         base containers exceptions monad-control mtl pipes primitive
+         transformers transformers-base
+       ];
+       description = "Safety for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-shell" = callPackage
     ({ mkDerivation, async, base, bytestring, directory, hspec, pipes
      , pipes-bytestring, pipes-safe, process, stm, stm-chans, text
@@ -162418,6 +162972,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-libpq_0_9_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
+     mkDerivation {
+       pname = "postgresql-libpq";
+       version = "0.9.4.1";
+       sha256 = "0ssn12cs643nd1bliaks0l0ssainydsrzjr3l5p7hm3wnqwa77qd";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ postgresql ];
+       homepage = "https://github.com/lpsmith/postgresql-libpq";
+       description = "low-level binding to libpq";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "postgresql-named" = callPackage
     ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl
      , postgresql-libpq, postgresql-simple, utf8-string
@@ -162530,6 +163099,8 @@ self: {
        pname = "postgresql-simple";
        version = "0.5.3.0";
        sha256 = "0h8f4d09f25p0dlz2mxvgp5b5pr56hnhng3yhb69pmv0dmj7n38y";
+       revision = "1";
+       editedCabalFile = "1hvry7nhk629yas6nbm3wnyy0bgwh6r8511rmsq9r8xkl7qm76r2";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-builder
          case-insensitive containers hashable postgresql-libpq scientific
@@ -162985,8 +163556,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "1.5.1";
-       sha256 = "1c357c5a34k9nd3wjyg246kcc4lfwrrfl01pki2ksdidw9xwclij";
+       version = "1.5.2";
+       sha256 = "1qkr3g7xfbkmvy2a4gcy0zxg22000mxdgw0dapq16pymj9wqf2si";
        libraryHaskellDepends = [ base profunctors stm ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -167040,6 +167611,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pusher-http-haskell_1_5_1_3" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, hashable, hspec, http-client, http-types, memory
+     , QuickCheck, scientific, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.5.1.3";
+       sha256 = "0a8q16l6yv5azwbp4c8bmw78yd9kmkvyn6s5qsras4x9r1j4fq1m";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hashable
+         http-client http-types memory text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hspec
+         http-client http-types QuickCheck scientific text time transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/pusher-community/pusher-http-haskell";
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -177558,8 +178155,8 @@ self: {
        pname = "safe-exceptions";
        version = "0.1.7.0";
        sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
-       revision = "1";
-       editedCabalFile = "12rv8mjrchpx9xaw87ph1hccr5hs6mb0g1imxjr8adw45prnvrw4";
+       revision = "2";
+       editedCabalFile = "01n9yyhqa1xzsi2mk4if7p0zqdxcwr8f44vbbj01hx9152xs7j4k";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        homepage = "https://github.com/fpco/safe-exceptions#readme";
@@ -188319,8 +188916,8 @@ self: {
        pname = "snap";
        version = "1.1.0.0";
        sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8";
-       revision = "2";
-       editedCabalFile = "05k5fgb31xvz733j3d4hqbhzbjlglv1m4f020mdnm1q7qg4a81nq";
+       revision = "3";
+       editedCabalFile = "0jkxlbbx4whwqqxb1c04xp1zanzmda4b4bwz8swk2pcixmmzx2xa";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -188883,6 +189480,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "snaplet-customauth" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary
+     , binary-orphans, bytestring, configurator, containers, errors
+     , heist, hoauth2, http-client, http-client-tls, lens, map-syntax
+     , mtl, random, snap, snap-core, text, time, transformers
+     , unordered-containers, uri-bytestring, xmlhtml
+     }:
+     mkDerivation {
+       pname = "snaplet-customauth";
+       version = "0.1.0";
+       sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary binary-orphans bytestring
+         configurator containers errors heist hoauth2 http-client
+         http-client-tls lens map-syntax mtl random snap snap-core text time
+         transformers unordered-containers uri-bytestring xmlhtml
+       ];
+       description = "Alternate authentication snaplet";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "snaplet-environments" = callPackage
     ({ mkDerivation, base, bson, configurator, mtl, regex-tdfa, snap
      , snap-core, text, unordered-containers
@@ -195060,13 +195678,14 @@ self: {
      }) {};
 
   "streaming-pcap" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, pcap, streaming
-     , streaming-bytestring, streaming-utils, tasty, tasty-hunit
+    ({ mkDerivation, attoparsec, base, bytestring, criterion, pcap
+     , streaming, streaming-bytestring, streaming-utils, tasty
+     , tasty-hunit
      }:
      mkDerivation {
        pname = "streaming-pcap";
-       version = "1.1.0";
-       sha256 = "1pkw864pj8vb5fmcg69rahq6a0bc1fb1ql8vb9lrh34z1fyx46v3";
+       version = "1.1.1";
+       sha256 = "1riw6n3n5rbzfqlm0z6qbznlx2lc8bk2s1qjy8a9zx90wbys0xp1";
        libraryHaskellDepends = [
          attoparsec base bytestring pcap streaming streaming-bytestring
          streaming-utils
@@ -195075,6 +195694,10 @@ self: {
          attoparsec base bytestring pcap streaming streaming-bytestring
          streaming-utils tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion pcap streaming
+         streaming-bytestring streaming-utils
+       ];
        homepage = "https://github.com/fosskers/streaming-pcap";
        description = "Stream packets via libpcap";
        license = stdenv.lib.licenses.bsd3;
@@ -200062,6 +200685,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-expected-failure_0_11_1_1" = callPackage
+    ({ mkDerivation, base, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-expected-failure";
+       version = "0.11.1.1";
+       sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
+       libraryHaskellDepends = [ base tagged tasty ];
+       homepage = "http://github.com/nomeata/tasty-expected-failure";
+       description = "Mark tasty tests as failure expected";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-fail-fast" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tagged, tasty
      , tasty-golden, tasty-hunit, tasty-tap
@@ -200158,6 +200794,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hedgehog_0_2_0_0" = callPackage
+    ({ mkDerivation, base, hedgehog, tagged, tasty
+     , tasty-expected-failure
+     }:
+     mkDerivation {
+       pname = "tasty-hedgehog";
+       version = "0.2.0.0";
+       sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
+       libraryHaskellDepends = [ base hedgehog tagged tasty ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-expected-failure
+       ];
+       homepage = "https://github.com/qfpl/tasty-hedghog";
+       description = "Integration for tasty and hedgehog";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-hspec" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
@@ -210477,8 +211131,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.5.1.1";
-       sha256 = "0yg75dj3bfxpqzdqw8lk7ligs39dnlya93qcg9grlbav9jpzv38n";
+       version = "0.6.1.1";
+       sha256 = "0dmdwlfn73anw4ap74aqnldp42383c2mi12r9y7sf1j1gyy872ac";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -216843,6 +217497,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_3_2" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, case-insensitive
+     , doctest, fast-logger, http-types, network, unix, unix-time, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.2";
+       sha256 = "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d";
+       libraryHaskellDepends = [
+         base byteorder bytestring case-insensitive fast-logger http-types
+         network unix unix-time wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-logger-buffered" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , http-types, time, wai, warp

From 79c97645b48c7eb8c4a1c70450d40af29b53a6d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 14:36:13 +0100
Subject: [PATCH 0952/2266] haskell-Cabal: version 2.2.x now accepts older
 versions of text

---
 .../configuration-ghc-8.2.x.nix               | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f14f0b0ebd1..c6e9f40a316 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -86,27 +86,12 @@ self: super: {
   # https://github.com/purescript/purescript/issues/3189
   purescript = doJailbreak (super.purescript);
 
-  # Needs text >=1.2.3.0 && <1.3, which is not the default yet.
-  Cabal_2_2_0_0 = super.Cabal_2_2_0_0.overrideScope (self: super: {
-    text = self.text_1_2_3_0;
-  });
-
   # These packages need Cabal 2.2.x, which is not the default.
-  distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: {
-    Cabal = self.Cabal_2_2_0_0;
-    text = self.text_1_2_3_0;
-  });
-  hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: {
-    Cabal = self.Cabal_2_2_0_0;
-    text = self.text_1_2_3_0;
-  });
-  cabal2nix = super.cabal2nix.overrideScope (self: super: {
-    Cabal = self.Cabal_2_2_0_0;
-    text = self.text_1_2_3_0;
-  });
+  distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
+  hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
   stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: {
     Cabal = self.Cabal_2_2_0_0;
-    text = self.text_1_2_3_0;
     haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
   })));
 

From 1aaed1724406c1eb780201f5717b0533b346f07d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Mar 2018 21:42:38 +0100
Subject: [PATCH 0953/2266] hackage: update database snapshot to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 03fb2d448cd..2f095e49828 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56955295749aea09bd42591cd506c2616d48ebfd.tar.gz";
-  sha256 = "17c8a1wj1jxr14sxvwq0i9kidwycz2hkl1ls51yfz14anylxr84l";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c1b1aa583dc3e3cd2c97c17d865be34ff3e019ab.tar.gz";
+  sha256 = "03q732jxymdxmm9gqfyghjcsscc5qwg7aicx5kk8fkrfz17xd44k";
 }

From ba816ee08721d0c2f5f7e6652091bed085ac7687 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 13 Mar 2018 21:42:50 +0100
Subject: [PATCH 0954/2266] nixos/tests/virtualbox: Work around test failures

I've started digging into the actual cause of the problem a week ago but
didn't continue fixing this.

The reason why the tests are failing is because
torvalds/linux/commit/72f5e08dbba2d01aa90b592cf76c378ea233b00b has
remapped the location of the TSS into the CPU entry area and we did
update our default kernel to version 4.14 in NixOS/nixpkgs@88530e02b6fa.

Back to VirtualBox: The guru meditation happens in
selmRCGuestTssPostWriteCheck, which I think is only a followup error. I
believe the right location couldn't be determined by VirtualBox and thus
the write check function triggers that panic because it's reading from
the wrong location.

So the actual problem *only* surfaces whenever we use software
virtualization, which we do for our tests because we don't have nested
virtualization available.

Our tests are also for testing the functionality of VirtualBox itself
and not certain kernel versions or kernel features, so for the time
being and until this is fixed, let's actually use kernel version 4.9 for
the guests within the VM tests. Kernel 4.9 didn't have the mentioned
change of the TSS location and thus the tests succeed.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @dtzWill
---
 nixos/tests/virtualbox.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 5574293ba37..249571fcede 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -43,6 +43,9 @@ let
       "init=${pkgs.writeScript "mini-init.sh" miniInit}"
     ];
 
+    # XXX: Remove this once TSS location detection has been fixed in VirtualBox
+    boot.kernelPackages = pkgs.linuxPackages_4_9;
+
     fileSystems."/" = {
       device = "vboxshare";
       fsType = "vboxsf";

From 273fd896bc5eb560ad4dc102cde6a1a5ce9e5c8d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Feb 2018 09:21:56 -0600
Subject: [PATCH 0955/2266] virtualbox: 5.2.6 -> 5.2.8

Tested against all the VirtualBox VM tests.

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #36127
---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 011a4e34e74..29cb7c192b5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,10 +21,10 @@ let
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
   # Do not forget to update the hash in ./guest-additions/default.nix!
-  extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5";
-  extpackRev = "120293";
-  main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y";
-  version = "5.2.6";
+  extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26";
+  extpackRev = "121009";
+  main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8";
+  version = "5.2.8";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f82eec07a29..96e8404b3ef 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5";
+    sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From 4436d21dfa444ff65a9079def7b601580a919864 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 13 Mar 2018 22:20:59 +0100
Subject: [PATCH 0956/2266] libdynd: fix build w/gcc7

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

diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix
index 8deec094866..93ece69cf05 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/pkgs/development/libraries/libdynd/default.nix
@@ -15,6 +15,12 @@ stdenv.mkDerivation {
     "-DDYND_BUILD_BENCHMARKS=OFF"
   ];
 
+  # added to fix build with gcc7
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=implicit-fallthrough"
+    "-Wno-error=nonnull"
+  ];
+
   buildInputs = [ cmake ];
 
   outputs = [ "out" "dev" ];
@@ -24,5 +30,6 @@ stdenv.mkDerivation {
     description = "C++ dynamic ndarray library, with Python exposure.";
     homepage = http://libdynd.org;
     license = licenses.bsd2;
+    platforms = platforms.linux;
   };
 }

From 591fd5ee9b4c1a5f1847b090eed83b13e784ff63 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 13 Mar 2018 22:40:07 +0100
Subject: [PATCH 0957/2266] libsemanage: fix build w/gcc7

---
 pkgs/os-specific/linux/libsemanage/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index c60d96bba78..587349e4067 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -13,7 +13,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+  NIX_CFLAGS_COMPILE = [
+    "-fstack-protector-all"
+    "-std=gnu89"
+    # these were added to fix build with gcc7. review on update
+    "-Wno-error=format-truncation"
+    "-Wno-error=implicit-fallthrough"
+  ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")

From 490079cf373d3f671f994c3132f036a8ed68b316 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 13 Mar 2018 22:15:48 +0000
Subject: [PATCH 0958/2266] libgksu: fix build

no longer builds after gtk-doc bump in https://github.com/NixOS/nixpkgs/commit/eb0368554661385ae470e245e50bd0bc10693bf0

https://hydra.nixos.org/build/70843465/nixlog/1
---
 pkgs/development/libraries/libgksu/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 8961afcd620..652848d8a95 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
   libstartup_notification, libgtop, perl, perlXMLParser,
-  autoreconfHook, intltool, gtk-doc, docbook_xsl, xauth, sudo
+  autoreconfHook, intltool, docbook_xsl, xauth, sudo
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig autoreconfHook intltool gtk-doc docbook_xsl wrapGAppsHook
+    pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook
   ];
 
   buildInputs = [
@@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
     intltoolize --force --copy --automake
   '';
 
+  configureFlags = [
+    "--disable-gtk-doc"
+  ];
+
   meta = {
     description = "A library for integration of su into applications";
     longDescription = ''

From 823b155adbb43ff9c27af2eecf1a031b31090f3f Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 13 Mar 2018 23:19:37 +0100
Subject: [PATCH 0959/2266] libs3: 2015-04-23 -> 2017-06-01, fix build

---
 pkgs/development/libraries/libs3/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 2d8b2a3b5f1..540d84dc244 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "libs3-2015-04-23";
+  name = "libs3-2017-06-01";
 
   src = fetchFromGitHub {
     owner = "bji";
     repo = "libs3";
-    rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519";
-    sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i";
+    rev = "fd8b149044e429ad30dc4c918f0713cdd40aadd2";
+    sha256 = "0a4c9rsd3wildssvnvph6cd11adn0p3rd4l02z03lvxkjhm20gw3";
   };
 
   buildInputs = [ curl libxml2 ];
 
+  # added to fix build with gcc7, review on update
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
+
   DESTDIR = "\${out}";
 
   meta = with stdenv.lib; {

From 7ec30b3fcd3f86cc590ff01e32e69fd89e8cf3ad Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 13 Mar 2018 23:51:19 +0100
Subject: [PATCH 0960/2266] manticore: 2014.08.18 -> 2017.08.22, fix build

---
 pkgs/development/compilers/manticore/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 795830e0e70..2c8fe186612 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
 
 let
-    rev = "592a5714595b4448b646a7d49df04c285668c2f8";
+  rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2";
 in stdenv.mkDerivation rec {
   name = "manticore-${version}";
-  version = "2014.08.18";
+  version = "2017.08.22";
  
   src = fetchFromGitHub {
-    owner = "rrnewton";
-    repo = "manticore_temp_mirror";
-    sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi";
+    owner = "ManticoreProject";
+    repo = "manticore";
+    sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73";
     inherit rev;
   };
 
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out
     cd $out
     unpackFile $src
-    mv manticore_temp_mirror-${rev}-src repo_checkout
+    mv source repo_checkout
     cd repo_checkout
     chmod u+w . -R
   ''; 

From a4fd4e3af05802c9f1e17347bccef5d33e0c3cd8 Mon Sep 17 00:00:00 2001
From: DarkScythe97 <darknx97@gmail.com>
Date: Wed, 14 Mar 2018 12:09:07 +1030
Subject: [PATCH 0961/2266] microcode-intel: 20171117 -> 20180312

---
 pkgs/os-specific/linux/microcode/intel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 97843b2253f..857a3b580a8 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20171117";
+  version = "20180312";
 
   src = fetchurl {
-    url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz";
-    sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck";
+    url = "https://downloadmirror.intel.com/27591/eng/microcode-${version}.tgz";
+    sha256 = "0yg7q5blcqgq8jyjxhn9n48rxws77ylqzyn4kn10l6yzwan1yf0b";
   };
 
   buildInputs = [ libarchive ];

From cce1e28faebb05bc515b82266a0cc3c5d9255d05 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Tue, 13 Mar 2018 22:45:55 -0700
Subject: [PATCH 0962/2266] swi-prolog: add JDK to build dependencies to enable
 JPL.

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

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 0f84b8ba4cd..b2fd98501c8 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib
+{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
 , libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig
 , fontconfig, makeWrapper ? stdenv.isDarwin
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz";
   };
 
-  buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
+  buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama
     libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ]
   ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
 

From 6c1931b15f9fbfd7aca288b6a31bda3d7e976b44 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Tue, 13 Mar 2018 22:46:39 -0700
Subject: [PATCH 0963/2266] swi-prolog: 7.4.2 -> 7.6.4

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

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index b2fd98501c8..670a00e250f 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "7.4.2";
+  version = "7.6.4";
 in
 stdenv.mkDerivation {
   name = "swi-prolog-${version}";
 
   src = fetchurl {
     url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz";
-    sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz";
+    sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d";
   };
 
   buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama

From f310df17fe3e7a4d5064c60a43965c2a69572fd8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 13 Mar 2018 23:19:16 -0700
Subject: [PATCH 0964/2266] arangodb: 3.3.3 -> 3.3.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangobench --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangobench --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangodump --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangodump --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangoexport --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangoexport --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangoimp --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangoimp --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangorestore --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangorestore --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangosh --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangosh --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangovpack --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangovpack --version` and found version 3.3.4
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangod --help` got 0 exit code
- ran `/nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4/bin/arangod --version` and found version 3.3.4
- found 3.3.4 with grep in /nix/store/vrgq52j00vwlq56wzq21rzq281lvrzrw-arangodb-3.3.4
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 238cd20d75e..75ba1f6a940 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.3";
+  version = "3.3.4";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "0hw6yzxmhmnb7qz30pqjdbgin41w892pbf1xbl2821nsz9b290sd";
+    sha256 = "0gfjmva043f9nhqjpa0qy2cdbz84z7b1c2wgcy77i3wnskicy0pc";
   };
 
   buildInputs = [

From b81e300dbd2190ec18254fc23da3a44f53d8083e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 13 Mar 2018 23:35:25 -0700
Subject: [PATCH 0965/2266] atk: 2.26.1 -> 2.28.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.28.1 with grep in /nix/store/gqr774xsr2qkb7g7s5zz56lyvdf0qm0c-atk-2.28.1
- found 2.28.1 in filename of file in /nix/store/gqr774xsr2qkb7g7s5zz56lyvdf0qm0c-atk-2.28.1
---
 pkgs/development/libraries/atk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index eb2466590be..9b1865d77f5 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -2,14 +2,14 @@
 
 let
   pname = "atk";
-  version = "2.26.1";
+  version = "2.28.1";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g";
+    sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
   };
 
   enableParallelBuilding = true;

From d788ba5a4675f6f528cda661e55e634929c9ed51 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 00:11:36 -0700
Subject: [PATCH 0966/2266] btrbk: 0.26.0 -> 0.26.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/.btrbk-wrapped -h` got 0 exit code
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/.btrbk-wrapped --help` got 0 exit code
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/.btrbk-wrapped --version` and found version 0.26.1
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/.btrbk-wrapped -h` and found version 0.26.1
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/.btrbk-wrapped --help` and found version 0.26.1
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/btrbk -h` got 0 exit code
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/btrbk --help` got 0 exit code
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/btrbk --version` and found version 0.26.1
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/btrbk -h` and found version 0.26.1
- ran `/nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1/bin/btrbk --help` and found version 0.26.1
- found 0.26.1 with grep in /nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1
- found 0.26.1 in filename of file in /nix/store/7sylf9ajn9ryic3752af47dsd93c82sc-btrbk-0.26.1
---
 pkgs/tools/backup/btrbk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 3565d8cbeb2..ace54318665 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchurl {
     url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "1brnh5x3fd91j3v8rz3van08m9i0ym4lv4hqz274s86v1kx4k330";
+    sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
   };
 
   buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];

From a83c45964fd424c41bb57337fcbf874978523e28 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 01:10:44 -0700
Subject: [PATCH 0967/2266] cdrtools: 3.02a06 -> 3.01

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/btcflash -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/btcflash --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/cdda2wav --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/cdrecord --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/cdrecord --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/mkisofs --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/mkisofs --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/devdump -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/devdump --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/devdump --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isodump -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isodump --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isodump --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isoinfo -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isoinfo --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isoinfo --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isovfy -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isovfy --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isovfy --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isodebug -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isodebug --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/isodebug --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/readcd -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/readcd --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/readcd --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/scgcheck -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/scgcheck --help` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/scgcheck --version` and found version 3.01
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/scgskeleton -h` got 0 exit code
- ran `/nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01/bin/scgskeleton --help` got 0 exit code
- found 3.01 with grep in /nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01
- found 3.01 in filename of file in /nix/store/d7l7g8h8jdpknng4jxrn712fyp3f7dnr-cdrtools-3.01
---
 pkgs/applications/misc/cdrtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index a46565eb76b..688f9a0a46b 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cdrtools-${version}";
-  version = "3.02a06";
+  version = "3.01";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
-    sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
+    sha256 = "03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d";
   };
 
   patches = [ ./fix-paths.patch ];

From bc5ad14e7a0725ba50b0f49403204faa25082e4d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 01:26:40 -0700
Subject: [PATCH 0968/2266] cfitsio: 3.43 -> 3.430

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.430 with grep in /nix/store/nlysxv2yb8v91i8lj8zqflibgvzpccyp-cfitsio-3.430
- found 3.430 in filename of file in /nix/store/nlysxv2yb8v91i8lj8zqflibgvzpccyp-cfitsio-3.430
---
 pkgs/development/libraries/cfitsio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index dedcb805327..ecf5fb1f02f 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
  stdenv.mkDerivation {
-  name = "cfitsio-3.43";
+  name = "cfitsio-3.430";
 
   src = fetchurl {
     url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz";
-    sha256 = "1rw481bv5srfmldf1h8bqmyljjh0siqh87xh6rip67ms59ssxpn8";
+    sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l";
   };
 
   # Shared-only build

From a73c91c99c0217f99ba8636e79fb907364f26b15 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 01:42:16 -0700
Subject: [PATCH 0969/2266] chunksync: 0.3 -> 0.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4/bin/chunksync -h` got 0 exit code
- ran `/nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4/bin/chunksync -V` and found version 0.4
- ran `/nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4/bin/chunksync -h` and found version 0.4
- found 0.4 with grep in /nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4
- found 0.4 in filename of file in /nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4
---
 pkgs/tools/backup/chunksync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index e1d19a48971..91d12a568a4 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.3";
+  version = "0.4";
   name = "chunksync-${version}";
 
   src = fetchurl {
     url = "http://chunksync.florz.de/chunksync_${version}.tar.gz";
-    sha256 = "e0c27f925c5cf811798466312a56772864b633728c433fb2fcce23c8712b52fc";
+    sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00";
   };
 
   buildInputs = [openssl perl];

From e2fb4411ebd73ed221101d5ab06f72d7f46c752f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 01:59:10 -0700
Subject: [PATCH 0970/2266] clutter-gst: 3.0.24 -> 3.0.26

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.26 with grep in /nix/store/3x1gsqxcrbyiq3jncz9k8dfa8bi0bamf-clutter-gst-3.0.26
- found 3.0.26 in filename of file in /nix/store/3x1gsqxcrbyiq3jncz9k8dfa8bi0bamf-clutter-gst-3.0.26
---
 pkgs/development/libraries/clutter-gst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index b2d397e3d55..962ca9ff9b5 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "clutter-gst";
-  version = "3.0.24";
+  version = "3.0.26";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9";
+    sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];

From b32839211ba7727ed87cb2b8e4ec80f3b1006b84 Mon Sep 17 00:00:00 2001
From: Michal Rus <m@michalrus.com>
Date: Wed, 14 Mar 2018 10:08:15 +0100
Subject: [PATCH 0971/2266] =?UTF-8?q?hubstaff:=201.3.0=20=E2=86=92=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index bd4a891a329..2b6e58a6ab3 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -5,7 +5,7 @@
 
 let
 
-  version = "1.3.0-9b2ba62";
+  version = "1.3.1-ff75f26";
 
   rpath = stdenv.lib.makeLibraryPath
     [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
-    sha256 = "1dxzyl3yxbfmbw1pv8k3vhqzbmyyf16zkgrhzsbm866nmbgnqk1s";
+    sha256 = "0jm5l34r6lkfkg8vsdfqbr0axngxznhagwcl9y184lnyji91fmdl";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From f161fe06b86508f5ac31b9cce768394efc421db5 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 14 Mar 2018 09:13:38 +0000
Subject: [PATCH 0972/2266] sshuttle: fix build on i686-linux

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

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 8674de1fcee..f01a1f00a6d 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
+  nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
   buildInputs =
     [ coreutils openssh ] ++
     stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];

From a7bedb193399e6cd24c24f410ce0d05e416fb885 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 02:28:16 -0700
Subject: [PATCH 0973/2266] editres: 1.0.6 -> 1.0.7

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.7 in filename of file in /nix/store/3mbmc1niw3y2m109f6v0xlch0pn1ml8q-editres-1.0.7
---
 pkgs/tools/graphics/editres/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 91dd85b0757..8bc33fb1b0a 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }:
 
 stdenv.mkDerivation rec {
-  name = "editres-1.0.6";
+  name = "editres-1.0.7";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/${name}.tar.gz";
-    sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45";
+    sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 619af3dc1e0eed185ecc175dd48f2163d7b0d653 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 14 Mar 2018 09:29:02 +0000
Subject: [PATCH 0974/2266] graalvm8: dontFixup = true

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

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index ce324b353ec..2eb9c4a7e83 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -116,6 +116,7 @@ in rec {
       mv jdk1.8.0_*/linux-amd64/product $out
       find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \;
     '';
+    dontFixup = true; # do not nuke path of ffmpeg etc
     dontStrip = true; # why? see in oraclejdk derivation
     inherit (oraclejdk8) meta;
   };
@@ -174,6 +175,7 @@ in rec {
         --replace file:/dev/random    file:/dev/./urandom \
         --replace NativePRNGBlocking  SHA1PRNG
     '';
+    dontFixup = true; # do not nuke path of ffmpeg etc
     dontStrip = true; # why? see in oraclejdk derivation
     doInstallCheck = true;
     installCheckPhase = ''

From ca1921eb5bd8edc941be6abc7e971baf3a24fba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 14 Mar 2018 09:32:17 +0000
Subject: [PATCH 0975/2266] shuttle: disable buggy test on darwin

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

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index f01a1f00a6d..d2c194308e1 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -29,6 +29,10 @@ python3Packages.buildPythonApplication rec {
   # uses Python 3, so it should be fine.
   doCheck = true;
 
+  checkPhase = ''
+    py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}"
+  '';
+
   postInstall = let
     mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
   in ''

From 99866d022322b40f15a4ac950efbce9e1ecda9f8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 02:49:40 -0700
Subject: [PATCH 0976/2266] evince: 3.26.0 -> 3.28.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince --version` and found version 3.28.0
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-thumbnailer -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-thumbnailer --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-previewer -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-previewer --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-wrapped -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-wrapped --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-wrapped --version` and found version 3.28.0
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-thumbnailer-wrapped -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-thumbnailer-wrapped --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-previewer-wrapped -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-previewer-wrapped --help` got 0 exit code
- found 3.28.0 with grep in /nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0
---
 pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 2d52e22c54c..f2459d7885c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name = "evince-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8";
+    sha256 = "1a3kcls18dcz1lj8hrx8skcli9xxfyi71c17xjwayh71cm5jc8zs";
   };
 
   passthru = {

From cce7d1b60ac3d72b766c9a866409c827a6f8dc45 Mon Sep 17 00:00:00 2001
From: mt_caret <mtakeda.enigsol@gmail.com>
Date: Wed, 14 Mar 2018 18:57:08 +0900
Subject: [PATCH 0977/2266] satysfi: init at 2018-03-07 (#36428)

---
 pkgs/tools/typesetting/satysfi/default.nix | 45 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/typesetting/satysfi/default.nix

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
new file mode 100644
index 00000000000..aee85e08375
--- /dev/null
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchzip, fetchFromGitHub, ocamlPackages }:
+let
+  lm = fetchzip {
+    url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip";
+    sha256 = "1mc88fbhfd2wki2vr700pgv96smya6d1z783xs3mfy138yb6ga2p";
+    stripRoot = false;
+  };
+  lm-math = fetchzip {
+    url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
+    sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
+  };
+in
+  stdenv.mkDerivation rec {
+    name = "satysfi-${version}";
+    version = "2018-03-07";
+    src = fetchFromGitHub {
+      owner = "gfngfn";
+      repo = "SATySFi";
+      rev = "a050ec0906d083682c630b0dea68887415b5f53d";
+      sha256 = "12bhl7s2kc02amr8rm71pihj203f2j15y5j0kz3swgsw0gqh81gv";
+      fetchSubmodules = true;
+    };
+
+    preConfigure = ''
+      substituteInPlace src/frontend/main.ml --replace \
+      '/usr/local/share/satysfi"; "/usr/share/satysfi' \
+      $out/share/satysfi
+    '';
+
+    buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib menhir
+      ppx_deriving uutf result core_kernel bitv batteries yojson camlimages ];
+    installPhase = ''
+      cp -r ${lm}/* lib-satysfi/dist/fonts/
+      cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
+      make install PREFIX=$out LIBDIR=$out/share/satysfi
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/gfngfn/SATySFi;
+      description = "A statically-typed, functional typesetting system";
+      license = licenses.lgpl3;
+      maintainers = [ maintainers.mt-caret ];
+      platforms = platforms.all;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8858029a687..d27e93eb041 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20556,6 +20556,10 @@ with pkgs;
 
   sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
+  satysfi = callPackage ../tools/typesetting/satysfi {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_06;
+  };
+
   sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
     inherit libusb1; # Shadow python.pkgs.libusb1.
     librsvg = librsvg.override { enableIntrospection = true; };

From 1891567c7459a198d4fa9570a046592511603cb6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 03:05:15 -0700
Subject: [PATCH 0978/2266] fanficfare: 2.22.0 -> 2.23.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/.fanficfare-wrapped -h` got 0 exit code
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/.fanficfare-wrapped --help` got 0 exit code
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/.fanficfare-wrapped -v` and found version 2.23.0
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/.fanficfare-wrapped --version` and found version 2.23.0
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/fanficfare -h` got 0 exit code
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/fanficfare --help` got 0 exit code
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/fanficfare -v` and found version 2.23.0
- ran `/nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0/bin/fanficfare --version` and found version 2.23.0
- found 2.23.0 with grep in /nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0
- found 2.23.0 in filename of file in /nix/store/3f3695k3x1y2jnq4l62rifazm9hkrwri-fanficfare-2.23.0
---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 2af9baeb5c5..cffce8e3b88 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.22.0";
+  version = "2.23.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "1gwr2qk0wff8f69w21ffj6cq8jklqd89vcdhhln6ii1h1kf8k031";
+    sha256 = "0589b5pg03rfv9x753cnbkz6pz508xs1n2lla3qfpagxc0pyg8i1";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];

From 352c567d1ca0cffd24a5f8a48fb3fb3a8ba2c86a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 14 Mar 2018 11:44:29 +0100
Subject: [PATCH 0979/2266] graphviz_2_32: restore libgraph, the reason to keep
 this version

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d27e93eb041..238c0e55a5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2617,9 +2617,9 @@ with pkgs;
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.
    */
-  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix {
+  graphviz_2_32 = lib.overrideDerivation (callPackage ../tools/graphics/graphviz/2.32.nix {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-  };
+  }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];});
 
   grin = callPackage ../tools/text/grin { };
   ripgrep = callPackage ../tools/text/ripgrep { };

From 0077c7651c572b237f243abc898d1e0a84971d0b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 14 Mar 2018 12:06:46 +0100
Subject: [PATCH 0980/2266] netsurfPackages.libcss: fix build by
 -Wno-error=implicit-fallthrough.

---
 pkgs/applications/misc/netsurf/libcss/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
index 02bb593ce71..e97452249bc 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
   ];
 
+  NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ];
+
   meta = with stdenv.lib; {
     homepage = http://www.netsurf-browser.org/;
     description = "Cascading Style Sheets library for netsurf browser";

From 864f4ceba4b3064157363a647156764c1bebf307 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 13 Mar 2018 21:12:32 +0900
Subject: [PATCH 0981/2266] flashplayer: 28.0.0.161 -> 29.0.0.113

---
 .../networking/browsers/chromium/plugins.nix         |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index bac4a361a19..07bc2bbc5f0 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,12 +98,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "28.0.0.161";
+    version = "29.0.0.113";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0xhfr2mqmg71dxnsq4x716hzkryj2dmmlzgyi8hf7s999p7x8djw";
+      sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index dc9c3358552..7d69c03ea36 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "28.0.0.161";
+  version = "29.0.0.113";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m"
+          "15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0"
         else
-          "0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd"
+          "0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7"
       else
         if arch == "x86_64" then
-          "1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0"
+          "18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4"
         else
-          "1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x";
+          "06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 4528dd70cbd..fead4cb9fad 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "28.0.0.161";
+  version = "29.0.0.113";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1"
+        "12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc"
       else
-        "0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0";
+        "17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348";
   };
 
   nativeBuildInputs = [ unzip ];

From eb0fa09232a35148aaffcfbfb900663a166a11bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Mar 2018 15:06:31 +0100
Subject: [PATCH 0982/2266] 18.09: let's call it "Jackrabbit"

I was mainly considering Jellyfish and Jaguar (and Jackrabbit).
Originally I was inclined for Jellyfish, but then I thought of the
release T-shirts someone makes and it didn't seem suitable...
Jaguar would keep the name referring to a car as well, but as a
not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
---
 nixos/doc/manual/release-notes/rl-1809.xml | 2 +-
 nixos/modules/misc/version.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index f44d9cad52f..55f294e3957 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -4,7 +4,7 @@
          version="5.0"
          xml:id="sec-release-18.09">
 
-<title>Release 18.09 (“??”, 2018/09/??)</title>
+<title>Release 18.09 (“Jackrabbit”, 2018/09/??)</title>
 
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 6af584250a7..957eeb90850 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -86,7 +86,7 @@ in
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
       # Note: code names must only increase in alphabetical order.
-      codeName = "Impala";
+      codeName = "Jackrabbit";
     };
 
     # Generate /etc/os-release.  See

From bf06f445ddd4bb4252304fce7811bc2027cbbe61 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 08:04:41 -0700
Subject: [PATCH 0983/2266] fricas: 1.3.2 -> 1.3.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/gbxxlzids227g9xaiqyqp2hp8ccmkfvq-fricas-1.3.3/bin/fricas -h` got 0 exit code
- ran `/nix/store/gbxxlzids227g9xaiqyqp2hp8ccmkfvq-fricas-1.3.3/bin/fricas -h` and found version 1.3.3
- ran `/nix/store/gbxxlzids227g9xaiqyqp2hp8ccmkfvq-fricas-1.3.3/bin/efricas --help` got 0 exit code
- found 1.3.3 with grep in /nix/store/gbxxlzids227g9xaiqyqp2hp8ccmkfvq-fricas-1.3.3
---
 pkgs/applications/science/math/fricas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 7e5233180cc..553905c2195 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
 
 let
-  version = "1.3.2";
+  version = "1.3.3";
   name = "fricas-" + version;
 in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url    = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
-    sha256 = "17a3vfvsn2idydqslf5r6z3sk6a5bdgj6z1n3dmnwmpkc4z152vr";
+    sha256 = "1avp9mbl5yn192c7kz5c2d18k33hay9lwii363b0v5hj3qgq2hhl";
   };
 
   buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];

From 4fcadba5eabba61c47bdd2a82dc60cdc4e7d09d7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Feb 2018 17:22:00 +0000
Subject: [PATCH 0984/2266] ocamlPackages: default to 4.05

---
 pkgs/top-level/all-packages.nix   | 2 +-
 pkgs/top-level/ocaml-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 238c0e55a5d..6ac59bb2739 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16425,7 +16425,7 @@ with pkgs;
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };
 
-  llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { };
+  llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { };
 
   lmms = libsForQt5.callPackage ../applications/audio/lmms {
     lame = null;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a8111f9256e..65d3de2d9e2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1036,5 +1036,5 @@ in rec
 
   ocamlPackages_latest = ocamlPackages_4_06;
 
-  ocamlPackages = ocamlPackages_4_04;
+  ocamlPackages = ocamlPackages_4_05;
 }

From 3b089a5eb6d85854af27bd3504409491c230a24b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Mar 2018 10:52:30 -0500
Subject: [PATCH 0985/2266] pixman: fix on darwin

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

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 6b891bdb38c..e70ffc3eb2f 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, libpng, glib /*just passthru*/ }:
+{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, autoreconfHook, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
   name = "pixman-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool ];
+    ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool autoreconfHook ];
 
   buildInputs = stdenv.lib.optional doCheck libpng;
 

From 1199d03b93ca2768e21460d62e8564d517c6599c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 09:22:51 -0700
Subject: [PATCH 0986/2266] fwts: 18.01.00 -> 18.02.00

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts -h` got 0 exit code
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts --help` got 0 exit code
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts -V` and found version 18.02.00
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts -v` and found version 18.02.00
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts --version` and found version 18.02.00
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts -h` and found version 18.02.00
- ran `/nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00/bin/fwts --help` and found version 18.02.00
- found 18.02.00 with grep in /nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00
- found 18.02.00 in filename of file in /nix/store/crwgi7517lb2f7b0dag5nnyvqcdr8iw3-fwts-18.02.00
---
 pkgs/os-specific/linux/fwts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 4c393a0f326..c4c49515f04 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "fwts-${version}";
-  version = "18.01.00";
+  version = "18.02.00";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
-    sha256 = "043wkq4hz5pz79masppya67b8i5jw61p1j8dw17jwc8w6gp8csfb";
+    sha256 = "0z8yvicp4qk1xi8xmbrngnc294fjdnb9qn5d9lnyls4i6mmvpr2d";
     stripRoot = false;
   };
 

From 4b5b1370a7ff61db4408afdf961e0e4ba1c8aebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 17:33:39 +0100
Subject: [PATCH 0987/2266] pythonPackages.pytest-mock: remove superfluous
 patch

---
 pkgs/development/python-modules/pytest-mock/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index e8f8d0a5b76..defbbdbc0c2 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -9,11 +9,6 @@ buildPythonPackage rec {
     sha256 = "0jgr1h1f0m9dl3alxiiw55as28pj2lpihz12gird9z1i3vvdyydq";
   };
 
-  patches = fetchpatch {
-    url = "${meta.homepage}/pull/107.patch";
-    sha256 = "07p7ra6lilfv04wyxc855zmfwxvnpmi9s0v6vh5bx769cj9jwxck";
-  };
-
   propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock;
   nativeBuildInputs = [ setuptools_scm ];
 

From bdc72254e86a8d5090a8691d137659191a6ec357 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 14 Mar 2018 17:32:15 +0100
Subject: [PATCH 0988/2266] gns3Packages.{server,gui}{Stable,Preview}: 2.1.3 ->
 2.1.4

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

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index a140de2c236..66bf843865e 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.3";
+  stableVersion = "2.1.4";
   # Currently there is no preview version.
   previewVersion = stableVersion;
   addVersion = args:
@@ -10,8 +10,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "1yya0alc4ifgikka513ps243l8211rvifm0xz1ymx8nck0s6sj35";
-  serverSrcHash = "16d698gpj2r3z7qvvlrsx8ylgb1nfkmia2pcvk22068p3ajwypx1";
+  guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93";
+  serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f";
 in {
   guiStable = mkGui {
     stable = true;

From 725c2b322ba267ea90cf163099f6cffc55d6865e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 10:25:47 -0700
Subject: [PATCH 0989/2266] googler: 3.3 -> 3.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler -h` got 0 exit code
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler --help` got 0 exit code
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler -v` and found version 3.5
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler --version` and found version 3.5
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler -h` and found version 3.5
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler --help` and found version 3.5
- found 3.5 with grep in /nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5
- found 3.5 in filename of file in /nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5
---
 pkgs/applications/misc/googler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 026457fb857..3b8b08c1b66 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, python}:
 
 stdenv.mkDerivation rec {
-  version = "3.3";
+  version = "3.5";
   name = "googler-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "googler";
     rev = "v${version}";
-    sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43";
+    sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa";
   };
 
   propagatedBuildInputs = [ python ];

From 9a10c55a8ae1f1a74e1bb66eac93bde93b0d94cc Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 00:22:19 +0100
Subject: [PATCH 0990/2266] pythonPackages.nevow: fix build, 0.14.2->0.14.3

fix tests, minor update, move to development/python-modules/
---
 .../python-modules/nevow/default.nix          | 41 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 43 +------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/python-modules/nevow/default.nix

diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
new file mode 100644
index 00000000000..ccbb59c44dc
--- /dev/null
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }:
+
+buildPythonPackage rec {
+  pname = "Nevow";
+  version = "0.14.3";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb";
+  };
+
+  propagatedBuildInputs = [ twisted ];
+
+  checkPhase = ''
+    trial formless nevow
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Nevow, a web application construction kit for Python";
+    longDescription = ''
+      Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
+      is a web application construction kit written in Python.  It is
+      designed to allow the programmer to express as much of the view
+      logic as desired in Python, and includes a pure Python XML
+      expression syntax named stan to facilitate this.  However it
+      also provides rich support for designer-edited templates, using
+      a very small XML attribute language to provide bi-directional
+      template manipulation capability.
+
+      Nevow also includes formless, a declarative syntax for
+      specifying the types of method parameters and exposing these
+      methods to the web.  Forms can be rendered automatically, and
+      form posts will be validated and input coerced, rendering error
+      pages if appropriate.  Once a form post has validated
+      successfully, the method will be called with the coerced values.
+    '';
+    homepage = https://github.com/twisted/nevow;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d3f4ed9280..8259e0caac8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10689,48 +10689,7 @@ in {
     };
   };
 
-  nevow = buildPythonPackage (rec {
-    name = "nevow-${version}";
-    version = "0.14.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz";
-      sha256 = "0wsh40ysj5gvfc777nrdvf5vbkr606r1gh7ibvw7x8b5g8afdy3y";
-      name = "${name}.tar.gz";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ twisted ];
-
-    postInstall = "twistd --help > /dev/null";
-
-    meta = {
-      description = "Nevow, a web application construction kit for Python";
-
-      longDescription = ''
-        Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
-        is a web application construction kit written in Python.  It is
-        designed to allow the programmer to express as much of the view
-        logic as desired in Python, and includes a pure Python XML
-        expression syntax named stan to facilitate this.  However it
-        also provides rich support for designer-edited templates, using
-        a very small XML attribute language to provide bi-directional
-        template manipulation capability.
-
-        Nevow also includes formless, a declarative syntax for
-        specifying the types of method parameters and exposing these
-        methods to the web.  Forms can be rendered automatically, and
-        form posts will be validated and input coerced, rendering error
-        pages if appropriate.  Once a form post has validated
-        successfully, the method will be called with the coerced values.
-      '';
-
-      homepage = http://divmod.org/trac/wiki/DivmodNevow;
-
-      license = "BSD-style";
-    };
-  });
+  nevow = callPackage ../development/python-modules/nevow { };
 
   nibabel = callPackage ../development/python-modules/nibabel {};
 

From 46cf3250c508c98cd169fe077425b5415c643d80 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 10:45:01 -0700
Subject: [PATCH 0991/2266] grib-api: 1.24.0 -> 1.26.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_histogram -h` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_histogram --help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_histogram help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_debug -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_info -v` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_filter -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_ls help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_ls -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_dump -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib2ppm -h` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib2ppm --help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib2ppm help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_set -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_get -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_get_data -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_copy -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_packing help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_packing version` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_packing help` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_convert -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_corruption_check help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_corruption_check version` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_corruption_check help` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_compare -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_parser help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_count help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_index_build help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_index_build -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_to_json help` got 0 exit code
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_to_netcdf -V` and found version 1.26.0
- ran `/nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0/bin/grib_list_keys help` got 0 exit code
- found 1.26.0 with grep in /nix/store/7371b0i6vd3ryh90kikrfcpa6am6ls8y-grib-api-1.26.0
---
 pkgs/development/libraries/grib-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 3abea7d2d8c..61409279ded 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec{
   name = "grib-api-${version}";
-  version = "1.24.0";
+  version = "1.26.0";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
-    sha256 = "1kbvyzaghbn1bqn97sslskmb6k3ki1dnr0g5abk5sb40n0y483bb";
+    sha256 = "00cmmj44bhdlzhqbvwb3bb4xks3bpva669m6g3g6ffjaqm25b90c";
   };
 
   preConfigure = ''

From dc2104d132aa89b705486691c891c4573e07c7ca Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 14 Mar 2018 20:42:46 +0300
Subject: [PATCH 0992/2266] sleekxmpp: 1.3.1 -> 1.3.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d3f4ed9280..97e1fa9ee4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10588,19 +10588,22 @@ in {
 
   sleekxmpp = buildPythonPackage rec {
     name = "sleekxmpp-${version}";
-    version = "1.3.1";
+    version = "1.3.3";
 
-    propagatedBuildInputs = with self ; [ dnspython pyasn1 ];
+    propagatedBuildInputs = with self; [ dnspython pyasn1 gevent ];
+    checkInputs = [ pkgs.gnupg ];
+    checkPhase = "${python.interpreter} testall.py";
+    doCheck = false; # Tests failed all this time and upstream doesn't seem to care.
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
-      sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr";
+      sha256 = "0samiq1d97kk8g9pszfbrbfw9zc41zp6017dbkwha9frf7gc24yj";
     };
 
     meta = {
       description = "XMPP library for Python";
       license = licenses.mit;
-      homepage = "http://sleekxmpp.com/";
+      homepage = http://sleekxmpp.com/;
     };
   };
 

From b298f4e18529e4d3507e53e76f45023e41b3a22e Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 00:22:19 +0100
Subject: [PATCH 0993/2266] pythonPackages.nevow: fix build, 0.14.2->0.14.3

fix tests, minor update, move to development/python-modules/

(cherry picked from commit 9a10c55a8ae1f1a74e1bb66eac93bde93b0d94cc)
---
 .../python-modules/nevow/default.nix          | 41 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 43 +------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/python-modules/nevow/default.nix

diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
new file mode 100644
index 00000000000..ccbb59c44dc
--- /dev/null
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }:
+
+buildPythonPackage rec {
+  pname = "Nevow";
+  version = "0.14.3";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb";
+  };
+
+  propagatedBuildInputs = [ twisted ];
+
+  checkPhase = ''
+    trial formless nevow
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Nevow, a web application construction kit for Python";
+    longDescription = ''
+      Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
+      is a web application construction kit written in Python.  It is
+      designed to allow the programmer to express as much of the view
+      logic as desired in Python, and includes a pure Python XML
+      expression syntax named stan to facilitate this.  However it
+      also provides rich support for designer-edited templates, using
+      a very small XML attribute language to provide bi-directional
+      template manipulation capability.
+
+      Nevow also includes formless, a declarative syntax for
+      specifying the types of method parameters and exposing these
+      methods to the web.  Forms can be rendered automatically, and
+      form posts will be validated and input coerced, rendering error
+      pages if appropriate.  Once a form post has validated
+      successfully, the method will be called with the coerced values.
+    '';
+    homepage = https://github.com/twisted/nevow;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 883e8c8d661..d4889087c52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10595,48 +10595,7 @@ in {
     };
   };
 
-  nevow = buildPythonPackage (rec {
-    name = "nevow-${version}";
-    version = "0.14.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz";
-      sha256 = "0wsh40ysj5gvfc777nrdvf5vbkr606r1gh7ibvw7x8b5g8afdy3y";
-      name = "${name}.tar.gz";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ twisted ];
-
-    postInstall = "twistd --help > /dev/null";
-
-    meta = {
-      description = "Nevow, a web application construction kit for Python";
-
-      longDescription = ''
-        Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
-        is a web application construction kit written in Python.  It is
-        designed to allow the programmer to express as much of the view
-        logic as desired in Python, and includes a pure Python XML
-        expression syntax named stan to facilitate this.  However it
-        also provides rich support for designer-edited templates, using
-        a very small XML attribute language to provide bi-directional
-        template manipulation capability.
-
-        Nevow also includes formless, a declarative syntax for
-        specifying the types of method parameters and exposing these
-        methods to the web.  Forms can be rendered automatically, and
-        form posts will be validated and input coerced, rendering error
-        pages if appropriate.  Once a form post has validated
-        successfully, the method will be called with the coerced values.
-      '';
-
-      homepage = http://divmod.org/trac/wiki/DivmodNevow;
-
-      license = "BSD-style";
-    };
-  });
+  nevow = callPackage ../development/python-modules/nevow { };
 
   nibabel = callPackage ../development/python-modules/nibabel {};
 

From 863fb7b86ad9992bd098bb64655af6f6f01ed144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 14 Mar 2018 18:06:21 +0000
Subject: [PATCH 0994/2266] glm: fix darwin build

---
 pkgs/development/libraries/glm/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index 803f08a7a11..319a0359c58 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   # fetch newer version of platform.h which correctly supports gcc 7.3
   gcc7PlatformPatch = fetchurl {
-    url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
-    sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
+    url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h";
+    sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia";
   };
 
   postPatch = ''
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     cp ${gcc7PlatformPatch} glm/simd/platform.h
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [
+    "-DGLM_COMPILER=0"
+  ];
+
   postInstall = ''
     mkdir -p $doc/share/doc/glm
     cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm

From 4e96d0e2b7a87197610e7fea3a1c486ceda58c8a Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 14 Mar 2018 18:22:10 +0000
Subject: [PATCH 0995/2266] Only apply patch on darwin

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

diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index db40a40d02d..6e190a656f6 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   # Without this patch cmake fails with a "No known features for CXX compiler"
-  # error
-  patches = [./move-project.patch];
+  # error on darwin
+  patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ;
 
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';

From a31b2ca00fae7db4f02ec0cace9f8774226c6c3a Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Wed, 14 Mar 2018 11:36:03 -0700
Subject: [PATCH 0996/2266] gnome2.zenity: Add docbook_xml_dtd_412 to prevent
 build from attempting to reference DTD from network and failing.

---
 pkgs/desktops/gnome-2/desktop/zenity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index 55a5f9c0a23..014255785dd 100644
--- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk
-, gnome-doc-utils, intltool, libglade, libX11, which }:
+, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
   name = "zenity-2.32.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ gtk libglade libxml2 libxslt libX11 ];
+  buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
 }

From 7dd7638cba521e527d41a15d6e56cb24cfe95c4c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 13 Mar 2018 22:30:06 +0100
Subject: [PATCH 0997/2266] pythonPackages.diff_cover: fix build

In order to adjust the language with `LC_ALL` properly the
`glibcLocales` is needed as `checkInput`. This was the only thing
preventing the testsuite from passing.

See ticket #36453
See https://hydra.nixos.org/build/70682982/nixlog/3
---
 pkgs/development/python-modules/diff_cover/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix
index b8286e7d6b1..57f0a1ef238 100644
--- a/pkgs/development/python-modules/diff_cover/default.nix
+++ b/pkgs/development/python-modules/diff_cover/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, jinja2, jinja2_pluralize, pygments,
   six, inflect, mock, nose, coverage, pycodestyle, flake8, pyflakes, git,
-  pylint, pydocstyle, fetchpatch }:
+  pylint, pydocstyle, fetchpatch, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "diff_cover";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ];
 
-  checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git ];
+  checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git glibcLocales ];
 
   meta = with stdenv.lib; {
     description = "Automatically find diff lines that need test coverage";

From 50f42f0c6bb179cbf5964b65de394c06c9ead361 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Wed, 14 Mar 2018 19:45:15 +0100
Subject: [PATCH 0998/2266] flink: 1.4.0 -> 1.4.2

Release Announcement: https://flink.apache.org/news/2018/03/08/release-1.4.2.html
---
 pkgs/applications/networking/cluster/flink/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 48308d3a201..f394df3391a 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, jre
-, version ? "1.3" }:
+, version ? "1.4" }:
 
 let
   versionMap = {
@@ -10,9 +10,9 @@ let
       hadoopBundle = "-hadoop27";
     };
     "1.4" = {
-      flinkVersion = "1.4.0";
+      flinkVersion = "1.4.2";
       scalaVersion = "2.11";
-      sha256 = "0d80djx1im3h8mf60qzi12km1bbik8a5l3nks85jzi0r0xzfgkm6";
+      sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
       hadoopBundle = "";
     };
   };

From 3296b87bb13fbfa1cab96b7f1855e6727dec0553 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 11:47:34 -0700
Subject: [PATCH 0999/2266] hwdata: 0.309 -> 0.310

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.310 with grep in /nix/store/m4pqcazp9c7nn1kkzi12l9m6hr8drl7v-hwdata-0.310
- found 0.310 in filename of file in /nix/store/m4pqcazp9c7nn1kkzi12l9m6hr8drl7v-hwdata-0.310
---
 pkgs/os-specific/linux/hwdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 6f2dc807fba..724242c588a 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
-  version = "0.309";
+  version = "0.310";
 
   src = fetchurl {
-    url = "https://github.com/vcrhonek/hwdata/archive/v0.309.tar.gz";
-    sha256 = "1njx4lhg7a0cawz82x535vk4mslmnfj7nmf8dbq8kgqxiqh6h2c7";
+    url = "https://github.com/vcrhonek/hwdata/archive/v0.310.tar.gz";
+    sha256 = "08mhwwc9g9cpfyxrwwviflkdk2jnqs6hc95iv4r5d59hqrj5kida";
   };
 
   preConfigure = "patchShebangs ./configure";

From 9b044a1dba64f08762157f131aed18684602ff01 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 19:52:34 +0100
Subject: [PATCH 1000/2266] python-tkinter: mark linux only

/cc ZHF #36454
---
 pkgs/top-level/python-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27d60f6e238..691876095ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16700,7 +16700,9 @@ in {
       patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
     '';
 
-    inherit (py) meta;
+    meta = py.meta // {
+      platforms = platforms.linux;
+    };
   };
 
   tlslite = buildPythonPackage rec {

From 42555f6c7dc88c014f0963d6c030f740526d5fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 14 Mar 2018 19:58:02 +0100
Subject: [PATCH 1001/2266] pythonPackages.pycurl: Fix darwin build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcbaabdc334..1d892ce7c64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13013,8 +13013,10 @@ in {
 
     buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
-    # error: invalid command 'test'
-    doCheck = false;
+    checkInputs = with self; [ bottle pytest nose ];
+    checkPhase = ''
+      py.test -k "not test_ssl_in_static_libs" tests
+    '';
 
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
@@ -13024,7 +13026,6 @@ in {
     meta = {
       homepage = http://pycurl.sourceforge.net/;
       description = "Python wrapper for libcurl";
-      platforms = platforms.linux;
     };
   });
 

From 2217c706d48d1550a6b91bc14b2978b832955ce5 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sun, 28 Jan 2018 19:53:44 +0100
Subject: [PATCH 1002/2266] doitlive: init at 3.0.3

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

diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix
new file mode 100644
index 00000000000..aa3e1e18ae6
--- /dev/null
+++ b/pkgs/tools/misc/doitlive/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "doitlive";
+  version = "3.0.3";
+
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ click ];
+
+  # disable tests (too many failures)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Tool for live presentations in the terminal";
+    homepage = https://pypi.python.org/pypi/doitlive;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39cc942bc7a..a567eeb7038 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1114,6 +1114,8 @@ with pkgs;
 
   dlx = callPackage ../misc/emulators/dlx { };
 
+  doitlive = callPackage ../tools/misc/doitlive { };
+
   dosage = pythonPackages.dosage;
 
   dpic = callPackage ../tools/graphics/dpic { };

From 9b4c82d366cc7fe9eb1db3e883d4de42fffc634f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 12:04:23 -0700
Subject: [PATCH 1003/2266] igv: 2.4.8 -> 2.4.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.9 with grep in /nix/store/q5c9jyg6gc4v3ns7rw5lxj7v4v916a7f-igv-2.4.9
- found 2.4.9 in filename of file in /nix/store/q5c9jyg6gc4v3ns7rw5lxj7v4v916a7f-igv-2.4.9
---
 pkgs/applications/science/biology/igv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 7825da0100a..853203e7dbb 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "igv-${version}";
-  version = "2.4.8";
+  version = "2.4.9";
 
   src = fetchurl {
     url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
-    sha256 = "1ca4lsb5j00066sd1gy8jr8jhzpd9142fhj4khb8nc45010wib0q";
+    sha256 = "0acyq7602g2pz6mc9ip1297c68kgl9pq9yzk3k2lli9l5qvxi3g1";
   };
 
   buildInputs = [ unzip jre ];

From 4b625fd25ae90f8b23c418d0ca8948273a6f16f7 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Wed, 14 Mar 2018 12:07:45 -0700
Subject: [PATCH 1004/2266] gnome2.gnome-control-center: Add
 docbook_xml_dtd_412 to prevent build from attempting to reference DTD from
 network and failing.

---
 .../gnome-2/desktop/gnome-control-center/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index 7202be83908..276bc7e79c1 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -3,7 +3,7 @@
 , glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
 , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon
 , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2
-, libSM }:
+, libSM, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
   name = "gnome-control-center-2.32.1";
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils
-                  gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 
+                  gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2
                   libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon
-                  libSM
+                  libSM docbook_xml_dtd_412
   ];
   configureFlags = "--disable-scrollkeeper";
 }

From 9e78baf5c75ed87360dfcab4c5eeeee2256be2dc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 7 Mar 2018 18:28:33 +0200
Subject: [PATCH 1005/2266] nixos/qemu-vm: Add virtualized display + HID
 devices on AArch64

---
 nixos/modules/virtualisation/qemu-vm.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 3270f1507f9..c5b1cc5375a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -434,9 +434,11 @@ in
 
     virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
-    # FIXME: Figure out how to make this work on non-x86
-    virtualisation.qemu.options =
-      mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ];
+    # FIXME: Consolidate this one day.
+    virtualisation.qemu.options = mkMerge [
+      (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ])
+      (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
+    ];
 
     # Mount the host filesystem via 9P, and bind-mount the Nix store
     # of the host into our own filesystem.  We use mkVMOverride to

From b11133607eee5d462d63038c27496584ab19c008 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 12:20:12 -0700
Subject: [PATCH 1006/2266] inboxer: 1.0.2 -> 1.0.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.3 with grep in /nix/store/5n2jwjv8x9a1sic8ia32vncq5i5smd0f-inboxer-1.0.3
- found 1.0.3 in filename of file in /nix/store/5n2jwjv8x9a1sic8ia32vncq5i5smd0f-inboxer-1.0.3
---
 pkgs/applications/networking/mailreaders/inboxer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index a71db1cf715..cd4de0ecd56 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
 
   meta = with stdenv.lib; {
     description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
-    sha256 = "0nqgsqxsjnj46wsfb60p7fr631yx3fx7dfa4fpj6x2ml4i42kxid";
+    sha256 = "1k2wgvs17lfxqmk0v7g8cf34h5ahr41vaibgb4a6ixay41hfx06d";
   };
 
   unpackPhase = ''

From 5568e25fa029272a341a502da4ad6182f7458f0f Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Thu, 8 Mar 2018 00:10:24 +0100
Subject: [PATCH 1007/2266] python.msgpack-numpy: init 0.4.1

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

diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
new file mode 100644
index 00000000000..0244b03c484
--- /dev/null
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, cython
+, msgpack-python
+, numpy
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "msgpack-numpy";
+  version = "0.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1czf125nixzwskiqiw0145kfj15030sp334cb89gp5w4rz3h7img";
+  };
+
+  buildInputs = [
+    cython
+  ];
+
+  propagatedBuildInputs = [
+   msgpack-python
+   numpy
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} msgpack_numpy.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Practical Machine Learning for NLP in Python";
+    homepage = https://github.com/lebedov/msgpack-numpy;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ aborsu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4529f7febd4..33b971d3564 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10161,6 +10161,8 @@ in {
 
   msgpack = callPackage ../development/python-modules/msgpack {};
 
+  msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {};
+
   msgpack-python = self.msgpack.overridePythonAttrs {
     pname = "msgpack-python";
     postPatch = ''

From 2e67c8e03021b42f1bc4fffc59e3c92074652772 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Mon, 12 Mar 2018 23:44:45 +0100
Subject: [PATCH 1008/2266] python.murmurhash: 0.26.4 -> 0.28.0

---
 .../python-modules/murmurhash/default.nix     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index 023c94cdc8e..f689bc2ff49 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -1,35 +1,34 @@
 { stdenv
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , cython
 , python
 }:
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "0.26.4";
-  name = pname + "-" + version;
+  version = "0.28.0";
 
-  src = fetchFromGitHub {
-    owner = "explosion";
-    repo = "murmurhash";
-    rev = "0.26.4";
-    sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16id8jppw8r54wisrlaaiprcszzb7d7lbpnskqn38s8i7vnkf4b5";
   };
 
   buildInputs = [
    cython
   ];
 
+  # No test
+  doCheck = false;
+
   checkPhase = ''
-    cd murmurhash/tests
-    ${python.interpreter} -m unittest discover -p "*test*"
+    pytest murmurhash
   '';
 
   meta = with stdenv.lib; {
     description = "Cython bindings for MurmurHash2";
     homepage = https://github.com/explosion/murmurhash;
     license = licenses.mit;
-    maintainers = with maintainers; [ sdll ];
-    };
+    maintainers = with maintainers; [ aborsu sdll ];
+  };
 }

From 9478948f4dd80b2fbc70728aa35d067c00469699 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Mon, 12 Mar 2018 23:45:13 +0100
Subject: [PATCH 1009/2266] python.thinc: 6.5.1 -> 6.10.2

---
 .../python-modules/thinc/default.nix          | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 15794caf58b..2c6df953e16 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -1,15 +1,19 @@
 { stdenv
+, lib
 , pkgs
 , buildPythonPackage
 , fetchPypi
-, fetchFromGitHub
+, pythonOlder
 , pytest
 , cython
 , cymem
+, msgpack-numpy
+, msgpack-python
 , preshed
 , numpy
 , python
 , murmurhash
+, pathlib
 , hypothesis
 , tqdm
 , cytoolz
@@ -21,36 +25,21 @@
 , dill
 }:
 
-let
-  enableDebugging = true;
-
-  pathlibLocked = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pathlib";
-    version = "1.0.1";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
-    };
-
-    doCheck = false; # fails to import support from test
-  };
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "thinc";
-  version = "6.5.1";
+  version = "6.10.2";
   name = pname + "-" + version;
 
-  src = fetchFromGitHub {
-    owner = "explosion";
-    repo = "thinc";
-    rev = "v${version}";
-    sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs";
   };
 
   propagatedBuildInputs = [
    cython
    cymem
+   msgpack-numpy
+   msgpack-python
    preshed
    numpy
    murmurhash
@@ -64,22 +53,34 @@ in buildPythonPackage rec {
    termcolor
    wrapt
    dill
-   pathlibLocked
+  ] ++ lib.optional (pythonOlder "3.4") pathlib;
+
+
+  checkInputs = [
+    pytest
   ];
 
+  prePatch = ''
+    substituteInPlace setup.py --replace \
+      "'pathlib>=1.0.0,<2.0.0'," \
+      "\"pathlib>=1.0.0,<2.0.0; python_version<'3.4'\","
+
+    substituteInPlace setup.py --replace \
+      "'cytoolz>=0.8,<0.9'," \
+      "'cytoolz>=0.8',"
+  '';
+
+  # Cannot find cython modules.
   doCheck = false;
 
-  # fails to import some modules
-  # checkPhase = ''
-  #   ${python.interpreter} -m pytest thinc/tests
-  #   # cd thinc/tests
-  #   # ${python.interpreter} -m unittest discover -p "*test*"
-  # '';
+  checkPhase = ''
+    pytest thinc/tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Practical Machine Learning for NLP in Python";
     homepage = https://github.com/explosion/thinc;
     license = licenses.mit;
-    maintainers = with maintainers; [ sdll ];
+    maintainers = with maintainers; [ aborsu sdll ];
     };
 }

From 458ba30fa97b6534dd984387191081d092ed49a0 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Tue, 13 Mar 2018 22:10:39 +0100
Subject: [PATCH 1010/2266] add aborsu as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 74b9f23af79..2e1953326f7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -176,6 +176,11 @@
     github = "abigailbuccaneer";
     name = "Abigail Bunyan";
   };
+  aborsu = {
+    email = "a.borsu@gmail.com";
+    github = "aborsu";
+    name = "Augustin Borsu";
+  };
   aboseley = {
     email = "adam.boseley@gmail.com";
     github = "aboseley";

From 8187d93da2b586e7d96358283171899e9efc4ef3 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Wed, 14 Mar 2018 00:01:04 +0100
Subject: [PATCH 1011/2266] python.ftfy: 5.3.0 -> 4.4.3

V5 only supports python3. Since at the moment the only packages
that use ftfy are spacy and textacy which both support
python2 and 3, I propose to roll back to v4 until another package
requires v5, at that point we can make a duplicate package.
---
 .../python-modules/ftfy/default.nix           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index d88c894009c..ca1c9a09e4e 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -7,18 +7,23 @@
 , python
 , isPy3k
 }:
+
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ftfy";
-  # latest is 5.1.1, buy spaCy requires 4.4.3
-  version = "5.3.0";
+
+  version = "4.4.3";
+  # ftfy v5 only supports python3. Since at the moment the only
+  # packages that use ftfy are spacy and textacy which both support
+  # python 2 and 3, they have pinned ftfy to the v4 branch.
+  # I propose to stick to v4 until another package requires v5.
+  # At that point we can make a ftfy_v4 package.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ba702d5138f9b35df32b55920c9466208608108f1f3d5de1a68c17e3d68cb7f";
+    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
   };
 
-  propagatedBuildInputs = [ html5lib wcwidth];
+  propagatedBuildInputs = [ html5lib wcwidth ];
 
   checkInputs = [
     nose
@@ -32,13 +37,10 @@ buildPythonPackage rec {
   # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy'
   doCheck = false;
 
-  # "this version of ftfy is no longer written for Python 2"
-  disabled = !isPy3k;
-
   meta = with stdenv.lib; {
     description = "Given Unicode text, make its representation consistent and possibly less broken.";
     homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests;
     license = licenses.mit;
-    maintainers = with maintainers; [ sdll ];
-    };
+    maintainers = with maintainers; [ sdll aborsu ];
+  };
 }

From 2184aac78c47f65943491ed2c934a4c7d7cb200d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 14:28:38 -0500
Subject: [PATCH 1012/2266] wllvm: 1.1.3 -> 1.1.5

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

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 19bdb1cd9ef..c78767e115a 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.1.3";
+  version = "1.1.5";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1scv9bwr888x2km8njg0000xkj8pz73c0gjbphhqaj8vy87y25cb";
+    sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv";
   };
 
   meta = with stdenv.lib; {

From 22fdb0bd9df0e9e9c0485fcb7fdac92f776aa165 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Wed, 14 Mar 2018 00:02:00 +0100
Subject: [PATCH 1013/2266] python.spacy: 1.8.2 -> 2.0.9

---
 .../python-modules/spacy/default.nix          | 59 ++++++++++++-------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 6c7c3c8400c..b94374aeda8 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -3,12 +3,11 @@
 , buildPythonPackage
 , python
 , fetchPypi
-, fetchFromGitHub
+, html5lib
 , pytest
 , cython
-, cymem
 , preshed
-, pathlib2
+, ftfy
 , numpy
 , murmurhash
 , plac
@@ -16,7 +15,6 @@
 , ujson
 , dill
 , requests
-, ftfy
 , thinc
 , pip
 , regex
@@ -24,32 +22,49 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "1.8.2";
+  version = "2.0.9";
 
-  src = fetchFromGitHub {
-    owner = "explosion";
-    repo = "spaCy";
-    rev = "v${version}";
-    sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5";
   };
 
+  prePatch = ''
+    substituteInPlace setup.py --replace \
+      "'html5lib==1.0b8'," \
+      "'html5lib',"
+
+    substituteInPlace setup.py --replace \
+      "'regex==2017.4.5'," \
+      "'regex',"
+
+    substituteInPlace setup.py --replace \
+      "'ftfy==2017.4.5'," \
+      "'ftfy',"
+
+    substituteInPlace setup.py --replace \
+      "'pathlib'," \
+      "\"pathlib; python_version<'3.4'\","
+  '';
+
   propagatedBuildInputs = [
    cython
-   cymem
-   pathlib2
-   preshed
-   numpy
-   murmurhash
-   plac
-   six
-   ujson
    dill
-   requests
+   html5lib
+   murmurhash
+   numpy
+   plac
+   preshed
    regex
-   ftfy
+   requests
+   six
    thinc
-   pytest
-   pip
+   ujson
+   ftfy
+  ];
+
+  checkInputs = [
+    pytest
   ];
 
   doCheck = false;

From db691029d6931eb03076f6ec569587c3e79ae342 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 20:36:47 +0100
Subject: [PATCH 1014/2266] avian: fix darwin build

/cc ZHF #36454
---
 pkgs/development/compilers/avian/default.nix | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix              |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 3d58e75200c..4dc384f70a3 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, jdk }:
+{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
 
 stdenv.mkDerivation rec {
   name = "avian-${version}";
@@ -11,10 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
   };
 
-  buildInputs = [
-    zlib
-    jdk
-  ];
+  buildInputs = [ zlib jdk ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error";
+
+  postPatch = ''
+    substituteInPlace makefile \
+        --replace 'g++' 'c++' \
+        --replace 'gcc' 'cc'
+  '';
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9866a2aaf99..2ed949ac7a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5769,7 +5769,8 @@ with pkgs;
   avra = callPackage ../development/compilers/avra { };
 
   avian = callPackage ../development/compilers/avian {
-    stdenv = overrideCC stdenv gcc49;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
+    stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv;
   };
 
   bigloo = callPackage ../development/compilers/bigloo { };

From e95539115767a77dab2f4852d7373bb37833517a Mon Sep 17 00:00:00 2001
From: Roosembert Palacios <roosembert.palacios@epfl.ch>
Date: Wed, 14 Mar 2018 18:37:16 +0100
Subject: [PATCH 1015/2266] Add name to maintainers' list

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f4e4355673..ec357d37085 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -111,6 +111,11 @@
     github = "Profpatsch";
     name = "Profpatsch";
   };
+  roosemberth = {
+    email = "roosembert.palacios+nixpkgs@gmail.com";
+    github = "roosemberth";
+    name = "Roosembert (Roosemberth) Palacios";
+  };
   SShrike = {
     email = "severen@shrike.me";
     github = "severen";

From 43c474457cbe627cf1bdc36f083369f9c25c7e42 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 14:48:57 -0500
Subject: [PATCH 1016/2266] gllvm: init at 2018-02-09

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

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
new file mode 100644
index 00000000000..58ee7699b45
--- /dev/null
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "gllvm-${version}";
+  version = "2018-02-09";
+
+  goPackagePath = "github.com/SRI-CSL/gllvm";
+
+  src = fetchFromGitHub {
+    owner = "SRI-CSL";
+    repo = "gllvm";
+    rev = "ef83222afd22452dd1277329df227a326db9f84f";
+    sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/SRI-CSL/gllvm;
+    description = "Whole Program LLVM: wllvm ported to go";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9866a2aaf99..e0d343fc362 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1222,6 +1222,8 @@ with pkgs;
 
   gixy = callPackage ../tools/admin/gixy { };
 
+  gllvm = callPackage ../development/tools/gllvm { };
+
   glide = callPackage ../development/tools/glide { };
 
   glock = callPackage ../development/tools/glock { };

From 70467b9a126a09ae0d90929e06dffe5180d2896e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 20:49:01 +0100
Subject: [PATCH 1017/2266] Fix cross-compilation builds of several Haskell
 packages.

---
 .../haskell-modules/configuration-common.nix          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 69a8bf1e8f2..0466e77738f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -102,6 +102,7 @@ self: super: {
 
   # Test suite doesn't terminate
   hzk = dontCheck super.hzk;
+
   # Tests require a Kafka broker running locally
   haskakafka = dontCheck super.haskakafka;
 
@@ -937,11 +938,11 @@ self: super: {
   JuicyPixels = dontHaddock super.JuicyPixels;
 
   # armv7l fixes.
-  happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
-  hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
-  servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger;
-  swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+  happy = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
+  hashable = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
+  servant-docs = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-docs else super.servant-docs;
+  servant-swagger = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-swagger else super.servant-swagger;
+  swagger2 = if pkgs.stdenv.hostPlatform.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;

From b02694dd45ffe06c8e537a773fa888125e4866a2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 20:58:56 +0100
Subject: [PATCH 1018/2266] python-selenium: fix darwin build

/cc ZHF #36454
---
 .../python-modules/selenium/default.nix       | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index 6b64cd18b4f..1661dd2cf3a 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -7,6 +7,19 @@
 , xorg
 }:
 
+
+let
+  # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
+  # absolute paths. Replaced by relative path so it is found when used in nix.
+  x_ignore_nofocus =
+    fetchFromGitHub {
+      owner = "SeleniumHQ";
+      repo = "selenium";
+      rev = "selenium-3.6.0";
+      sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v";
+    };
+in
+
 buildPythonPackage rec {
   pname = "selenium";
   version = "3.6.0";
@@ -23,21 +36,11 @@ buildPythonPackage rec {
     geckodriver
   ];
 
-  # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
-  # absolute paths. Replaced by relative path so it is found when used in nix.
-  x_ignore_nofocus =
-    fetchFromGitHub {
-      owner = "SeleniumHQ";
-      repo = "selenium";
-      rev = "selenium-3.6.0";
-      sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v";
-    };
-
-  patchPhase = ''
+  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
     cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
     substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6"
-    gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
-    gcc -shared \
+    cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
+    cc -shared \
       -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \
       -o x_ignore_nofocus.so \
       x_ignore_nofocus.o

From cf188440c5fa8f485f0047254dd2f196e9a15bd4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 25 Feb 2018 17:49:36 +0100
Subject: [PATCH 1019/2266] flexget: 2.10.82 -> 2.13.5

---
 .../networking/flexget/default.nix            | 109 ++++++++----------
 1 file changed, 48 insertions(+), 61 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 585e0c847da..b828a49c064 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -1,80 +1,67 @@
-{ lib
-, fetchFromGitHub
-, python
-, transmission
-, deluge
-, config
+{ lib, python
+, delugeSupport ? true, deluge ? null
 }:
 
-with python.pkgs;
+assert delugeSupport -> deluge != null;
+
+let
+  python' = python.override { inherit packageOverrides; };
+
+  packageOverrides = self: super: {
+    sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
+      version = "1.1.10";
+      src = old.src.override {
+        inherit version;
+        sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv";
+      };
+    });
+  };
+
+in
+
+with python'.pkgs;
 
 buildPythonApplication rec {
-  version = "2.10.82";
-  name = "FlexGet-${version}";
+  pname = "FlexGet";
+  version = "2.13.5";
 
-  src = fetchFromGitHub {
-    owner = "Flexget";
-    repo = "Flexget";
-    rev = version;
-    sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9";
   };
 
-  doCheck = true;
-  # test_regexp requires that HOME exist, test_filesystem requires a
-  # unicode-capable filesystem (and setting LC_ALL doesn't work).
-  # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
   postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "chardet==3.0.3" "chardet" \
-      --replace "rebulk==0.8.2" "rebulk" \
-      --replace "cherrypy==10.2.2" "cherrypy" \
-      --replace "portend==1.8" "portend" \
-      --replace "sqlalchemy==1.1.10" "sqlalchemy" \
-      --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
-      --replace "flask-cors==3.0.2" "flask-cors" \
-      --replace "certifi==2017.4.17" "certifi" \
-      --replace "apscheduler==3.3.1" "apscheduler" \
-      --replace "path.py==10.3.1" "path.py" \
-      --replace "tempora==1.8" "tempora" \
-      --replace "cheroot==5.5.0" "cheroot" \
-      --replace "six==1.10.0" "six" \
-      --replace "aniso8601==1.2.1" "aniso8601"
+    # remove dependency constraints
+    sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
   '';
 
-  checkPhase = ''
-    export HOME=.
-    py.test --disable-pytest-warnings -k "not test_quality_failures \
-                                          and not test_group_quality \
-                                          and not crash_report \
-                                          and not test_multi_episode \
-                                          and not test_double_episodes \
-                                          and not test_inject_force \
-                                          and not test_double_prefered \
-                                          and not test_double \
-                                          and not test_non_ascii"
-  '';
+  # ~400 failures
+  doCheck = false;
 
-  buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];
   propagatedBuildInputs = [
-    feedparser sqlalchemy pyyaml chardet
-    beautifulsoup4 html5lib PyRSS2Gen pynzb
-    rpyc jinja2 jsonschema requests dateutil jsonschema
+    feedparser sqlalchemy pyyaml
+    chardet beautifulsoup4 html5lib
+    PyRSS2Gen pynzb rpyc jinja2
+    jsonschema requests dateutil
     pathpy guessit_2_0 APScheduler
     terminaltables colorclass
-    cherrypy flask flask-restful flask-restplus
-    flask-compress flask_login flask-cors
-    pyparsing safe future zxcvbn-python
-    werkzeug tempora cheroot rebulk portend
+    cherrypy flask flask-restful
+    flask-restplus flask-compress
+    flask_login flask-cors safe
+    pyparsing future zxcvbn-python
+    werkzeug tempora cheroot rebulk
+    portend transmissionrpc aniso8601
+    babelfish certifi click futures
+    idna itsdangerous markupsafe
+    plumbum pytz six tzlocal urllib3
+    webencodings werkzeug zxcvbn-python
   ] ++ lib.optional (pythonOlder "3.4") pathlib
-    # enable deluge and transmission plugin support, if they're installed
-    ++ lib.optional (config.deluge or false) deluge
-    ++ lib.optional (transmission != null) transmissionrpc;
+    ++ lib.optional delugeSupport deluge;
 
-  meta = {
-    homepage = https://flexget.com/;
+  meta = with lib; {
+    homepage    = https://flexget.com/;
     description = "Multipurpose automation tool for content like torrents";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ domenkozar tari ];
-    broken = true; # as of 2018-02-09
+    license     = licenses.mit;
+    maintainers = with maintainers; [ domenkozar tari ];
   };
 }

From 77d794fe64bb8136cb4e3fbe367dee32f56e36fc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 15:08:21 -0500
Subject: [PATCH 1020/2266] closurecompiler: 20170910 -> 20180204

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 8d1b06f52b7..9472384020b 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20170910";
+  version = "20180204";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0znzsks8ql9qajhcjzfkhmnpz8zs6b8cji04fhivyq973jpxxrak";
+    sha256 = "1nh4yznabwpp9k6flk9562w87d6sxk1fwwpk4d3knwy25iyn3mwq";
   };
 
   sourceRoot = ".";

From 2f2ad74369d2f516786ca02e2dff37e7713629a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 21:08:43 +0100
Subject: [PATCH 1021/2266] Fix cross-compilation builds of several Haskell
 packages some more.

---
 .../haskell-modules/configuration-common.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0466e77738f..2a0981d2a22 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -937,12 +937,12 @@ self: super: {
   # https://github.com/Twinside/Juicy.Pixels/issues/149
   JuicyPixels = dontHaddock super.JuicyPixels;
 
-  # armv7l fixes.
-  happy = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
-  hashable = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
-  servant-docs = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-swagger else super.servant-swagger;
-  swagger2 = if pkgs.stdenv.hostPlatform.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+  # aarch64 and armv7l fixes.
+  happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
+  hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
+  servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;
+  servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;
+  swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;

From c05eb52c1f3e625cd4d6c4e85d7d0ee6ce8fb626 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 13:18:01 -0700
Subject: [PATCH 1022/2266] insomnia: 5.14.7 -> 5.14.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.14.9 with grep in /nix/store/5pw045b91pq83nph1x95pqqfd3fbjpi1-insomnia-5.14.9
- found 5.14.9 in filename of file in /nix/store/5pw045b91pq83nph1x95pqqfd3fbjpi1-insomnia-5.14.9
---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 45cf993f25e..03db11df5e4 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -18,11 +18,11 @@ let
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.14.7";
+  version = "5.14.9";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1y6bn9kaxxplzyv7jjrcsfkrjnivjqdk5mbdp8vz32hv2bmdvzzy";
+    sha256 = "0hq9pcfw1ic2acaknwp2d5yphg901dmk7d4n7ikx42nya8p39c6j";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From 1583cc6449f0d5c05c27963e17a9db38236b9768 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 21:22:18 +0100
Subject: [PATCH 1023/2266] haskell-SHA: fix compiler crash while trying to
 build the test suite on i686

Fixes https://github.com/NixOS/nixpkgs/issues/36949.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2a0981d2a22..524e73077ad 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1010,4 +1010,10 @@ self: super: {
   # https://github.com/fpco/inline-c/issues/72
   inline-c = dontCheck super.inline-c;
 
+  # Avoid GHC compiler crash a la https://ghc.haskell.org/trac/ghc/ticket/5361.
+  SHA = appendPatch super.SHA (pkgs.fetchpatch {
+    url = https://github.com/GaloisInc/SHA/commit/c258350e953c3de2f98c5625ac3857f1a6863afc.patch;
+    sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
+  });
+
 }

From 33287099183d36a8e4927b007cf47d934b218cb6 Mon Sep 17 00:00:00 2001
From: Roosembert Palacios <roosembert.palacios@epfl.ch>
Date: Tue, 13 Mar 2018 20:33:05 +0100
Subject: [PATCH 1024/2266] pcm: init at 201710

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
---
 pkgs/os-specific/linux/pcm/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pcm/default.nix

diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
new file mode 100644
index 00000000000..43810210a88
--- /dev/null
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "201710";
+  name = "pcm-${version}";
+
+  src = fetchFromGitHub {
+    owner = "opcm";
+    repo = "pcm";
+    rev = "${version}";
+    sha256 = "02rq8739zwwbfrhagvcgf6qpmnswxl9b0qsld26rg6zp91v2npbj";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pcm*.x $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Processor counter monitor";
+    homepage = https://www.intel.com/software/pcm;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ roosemberth ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9866a2aaf99..75a1f152346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13092,6 +13092,8 @@ with pkgs;
 
   i7z = callPackage ../os-specific/linux/i7z { };
 
+  pcm = callPackage ../os-specific/linux/pcm { };
+
   ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
 
   intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };

From ba4356f5856874ebda4211289b35f48e2bbd93b3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Mar 2018 15:31:40 -0500
Subject: [PATCH 1025/2266] json2hcl: fix meta

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

diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index cddf6054d48..d53b3902133 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "json2hcl";
@@ -16,9 +16,10 @@ buildGoPackage rec {
   goPackagePath = "github.com/${owner}/${pname}";
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert JSON to HCL, and vice versa";
     license = with licenses; [ mit ];
     maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.unix;
   };
 }

From f911edaf43e08495ef983b4a4eea57a28774fc7e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 15:35:24 -0500
Subject: [PATCH 1026/2266] llvm6: Build with support for the experimental WASM
 backend

---
 pkgs/development/compilers/llvm/6/llvm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 4f7a2835cc9..256b9120c82 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -16,6 +16,7 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
+, enableWasm ? true
 , darwin
 }:
 
@@ -115,7 +116,9 @@ in stdenv.mkDerivation (rec {
 
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
-  ];
+  ] ++ stdenv.lib.optional enableWasm
+   "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
+  ;
 
   postBuild = ''
     rm -fR $out

From e140014a52205ab68d15ab44fd7df6830c9d02c6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 13:39:01 -0700
Subject: [PATCH 1027/2266] intel-gpu-tools: 1.21 -> 1.22

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/igt_stats -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/igt_stats --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/igt_stats help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_reg --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_reg help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_forcewaked -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_firmware_decode help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_gpu_top -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_gpu_top -h` and found version 1.22
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_guc_logger -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_guc_logger --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_opregion_decode -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_opregion_decode --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dump_decode help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_error_decode help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance -h` and found version 1.22
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance --help` and found version 1.22
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_aubdump -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_aubdump --help` got 0 exit code
- found 1.22 with grep in /nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22
- found 1.22 in filename of file in /nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22
---
 pkgs/development/tools/misc/intel-gpu-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 3d8b29e4ebc..775a31df2b1 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -3,11 +3,11 @@
 , procps, autoreconfHook, utilmacros, gnome2 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.21";
+  name = "intel-gpu-tools-1.22";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
-    sha256 = "0gvh317dg5c7kvjxxkh8g70hh3r3dc73mc4dzyvfa8nb4ix6xbyr";
+    sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix";
   };
 
   nativeBuildInputs = [ pkgconfig utilmacros ];

From 4bc0f88bb30cc51f88851fe3af352a39a1546e8a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 15:42:45 -0500
Subject: [PATCH 1028/2266] libdwarf: 20170709 -> 20180129

Upstream describes changes:

Fixes libdwarf/dwarfdump vulnerabilities related to detecting corrupt
DWARF and includes other small improvements
---
 pkgs/development/libraries/libdwarf/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 4bb91878bd3..6057dae4be2 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, libelf }:
 
 let
-  version = "20170709";
+  version = "20180129";
   src = fetchurl {
     url = "http://www.prevanders.net/libdwarf-${version}.tar.gz";
-    sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd"
-           + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1";
+    # Upstream displays this hash broken into three parts:
+    sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595"
+           + "6d643921a173e6f9e0a184db7aef66f0fd2548d669"
+           + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58";
   };
   meta = {
     homepage = https://www.prevanders.net/dwarf.html;

From e33c221c4923dba0a8da64f1b3994300a834e360 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 13:54:29 -0700
Subject: [PATCH 1029/2266] ipset: 6.35 -> 6.36

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset -h` got 0 exit code
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset --help` got 0 exit code
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset help` got 0 exit code
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset -V` and found version 6.36
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset -v` and found version 6.36
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset --version` and found version 6.36
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset version` and found version 6.36
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset -h` and found version 6.36
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset --help` and found version 6.36
- ran `/nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36/bin/ipset help` and found version 6.36
- found 6.36 with grep in /nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36
- found 6.36 in filename of file in /nix/store/05yb8ry7k0xyxcjq16cx0wkw1fkifb05-ipset-6.36
---
 pkgs/os-specific/linux/ipset/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index c78a4eadfa4..68692019ca9 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "ipset-6.35";
+  name = "ipset-6.36";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${name}.tar.bz2";
-    sha256 = "1p7l1fj3lbv6rr24zxjiwq7jk1yvazk8db6yyni0qbprw49i01rp";
+    sha256 = "03fk40v0rbiv2b9ciy3zk8yix163803xvpmdlyvrfzbcvj84l8i2";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6f9a9e887662c5a05a8401782e36629f68d75931 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Mar 2018 21:13:25 +0100
Subject: [PATCH 1030/2266] tor-browser-bundle-bin: 7.5 -> 7.5.1

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 299ec43a8b9..1e1ea74b680 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5";
+  version = "7.5.1";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1ia8qv5hj7zrrli5d9qf65s3rlrls0whrx3q96lw63x2gn05nwv7";
+      sha256 = "1c5mrc10gm5nklirzwflg7lrdr1v36354g9lgxnjk432izhwb1s0";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1sw1n7jsagyl5cjs265x3k9jzh0j0yh767ixcy17vif5f9dfyzak";
+      sha256 = "0d274f3qhbf1cid3fmpk9s482bjvgcig3q7gdklv9va89bpxzsa6";
     };
   };
 in

From 4e1083256bcd8623e426e0994f954333e1edab60 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Mar 2018 22:07:20 +0100
Subject: [PATCH 1031/2266] Revert "Merge pull request #35636 from
 ryantm/auto-update/emscripten-1.37.16-to-1.37.34"

This reverts commit 5c02b9ab330729d97dd34ecd0e474d93f847af74, reversing
changes made to 2f2ad74369d2f516786ca02e2dff37e7713629a8.

https://github.com/NixOS/nixpkgs/pull/35636#issuecomment-373171672
---
 pkgs/development/compilers/emscripten/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index f8fc12200b7..ae80ad6fc80 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rev = "1.37.34";
+  rev = "1.37.16";
   appdir = "share/emscripten";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "1v62jg0b65shh10lbkvjg79xwnwwms6lr6w5vn1gaq6cpc712y19";
+    sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
     inherit rev;
   };
 

From 95f1754a527e2665a85add731fd448a69959c4f1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 14 Mar 2018 19:09:44 +0100
Subject: [PATCH 1032/2266] youtube-dl: 2018.03.10 -> 2018.03.14

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index bd041d8645d..316d3f181fe 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,12 +15,12 @@
 with stdenv.lib;
 buildPythonApplication rec {
 
-  name = "youtube-dl-${version}";
-  version = "2018.03.10";
+  pname = "youtube-dl";
+  version = "2018.03.14";
 
   src = fetchurl {
-    url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1ibmz91anli1vzkgw2i3h4wf1i8arzd74730ylwcwyg3375xryjb";
+    url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
+    sha256 = "0j8j797gqc29fd5ra3cjvwkp8dgvigdydsj0zzjs05zccfqrj9lh";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5defdee634189be2f7cd29848f54ef9b1bf45210 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 22:41:47 +0100
Subject: [PATCH 1033/2266] cataclysm-dda: fix clang build

/cc ZHF #36454
---
 pkgs/games/cataclysm-dda/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index a3adec38401..01829238daa 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
     "WARNINGS+=-Wno-inconsistent-missing-override"
   ];
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-user-defined-warnings";
+
   postBuild = stdenv.lib.optionalString (tiles && stdenv.isDarwin) ''
     # iconutil on macOS is not available in nixpkgs
     png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/*

From 0175bf648af397675472cf7be9478b22457cc685 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Wed, 14 Mar 2018 16:43:51 -0500
Subject: [PATCH 1034/2266] freenect: 0.5.5 -> 0.5.7

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

diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index d6767a4cbd3..07a40bcecf2 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "freenect-${version}";
-  version = "0.5.5";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "OpenKinect";
     repo = "libfreenect";
     rev = "v${version}";
-    sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx";
+    sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
   };
 
   buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ];

From b150eabc869bd4d10d39f4acc868c57daaee047a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 14:48:49 -0700
Subject: [PATCH 1035/2266] libbson: 1.9.2 -> 1.9.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.3 with grep in /nix/store/2wb2wdhn8wqxcmh8vp75gnnb5sncmf3n-libbson-1.9.3
- found 1.9.3 in filename of file in /nix/store/2wb2wdhn8wqxcmh8vp75gnnb5sncmf3n-libbson-1.9.3
---
 pkgs/development/libraries/libbson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index f3c58baf5a1..6e9b033a976 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libbson-${version}";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "libbson";
     rev = version;
-    sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck";
+    sha256 = "0dbpmvd2p9bdqdyiijmsc1hd9d6l36migk79smw7fpfvh0y6ldsk";
   };
 
   nativeBuildInputs = [ cmake ];

From b546c7440e2953907919cb13121a0927497454bb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 16:58:04 -0500
Subject: [PATCH 1036/2266] busybox: patchshebangs to fix build on "limited"
 /bin/sh builders

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

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 744f37b8b8c..d4c4582ffb2 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
     ./busybox-in-store.patch
   ];
 
+  postPatch = "patchShebangs .";
+
   configurePhase = ''
     export KCONFIG_NOTIMESTAMP=1
     make ${if enableMinimal then "allnoconfig" else "defconfig"}

From ee6d0a7025df93ee93142de0c25264c586b125c7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 23:02:52 +0100
Subject: [PATCH 1037/2266] ccl: fix darwin build

/cc ZHF #36454
---
 pkgs/development/compilers/ccl/default.nix | 15 +++------------
 pkgs/top-level/all-packages.nix            |  4 +++-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 087f7470021..f3a4ff74aa0 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc, glibc, m4, coreutils }:
+{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }:
 
 let
   options = rec {
@@ -27,19 +27,11 @@ let
       runtime = "dx86cl64";
       kernel = "darwinx8664";
     };
-    i686-darwin = {
-      arch = "darwinx86";
-      sha256 = x86_64-darwin.sha256;
-      runtime = "dx86cl";
-      kernel = "darwinx8632";
-    };
     armv6l-linux = armv7l-linux;
   };
-  cfg = options.${stdenv.system};
+  cfg = options."${stdenv.system}" or (throw "missing source url for platform ${stdenv.system}");
 in
 
-assert builtins.hasAttr stdenv.system options;
-
 stdenv.mkDerivation rec {
   name     = "ccl-${version}";
   version  = "1.11.5";
@@ -49,7 +41,7 @@ stdenv.mkDerivation rec {
     sha256 = cfg.sha256;
   };
 
-  buildInputs = if stdenv.isDarwin then [ m4 ] else [ gcc glibc m4 ];
+  buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ];
 
   CCL_RUNTIME = cfg.runtime;
   CCL_KERNEL = cfg.kernel;
@@ -58,7 +50,6 @@ stdenv.mkDerivation rec {
     substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
       --replace "M4 = gm4"   "M4 = m4" \
       --replace "dtrace"     "/usr/sbin/dtrace" \
-      --replace "mig"        "/usr/bin/mig" \
       --replace "/bin/rm"    "${coreutils}/bin/rm" \
       --replace "/bin/echo"  "${coreutils}/bin/echo"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6e6c6adc6e..fbae4e25104 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5797,7 +5797,9 @@ with pkgs;
     chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { };
   };
 
-  ccl = callPackage ../development/compilers/ccl { };
+  ccl = callPackage ../development/compilers/ccl {
+    inherit (darwin) bootstrap_cmds;
+  };
 
   chez = callPackage ../development/compilers/chez {
     inherit (darwin) cctools;

From f6127ee7e36f7d1e9c2307c711c6d3c635dd82b9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 15:06:46 -0700
Subject: [PATCH 1038/2266] libcouchbase: 2.8.4 -> 2.8.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc help` got 0 exit code
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc version` and found version 2.8.5
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-pillowfight --help` got 0 exit code
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-n1qlback --help` got 0 exit code
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-n1qlback --help` and found version 2.8.5
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-subdoc --help` got 0 exit code
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-subdoc --help` and found version 2.8.5
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-proxy --help` got 0 exit code
- ran `/nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5/bin/cbc-proxy --help` and found version 2.8.5
- found 2.8.5 with grep in /nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5
- found 2.8.5 in filename of file in /nix/store/hl81vpsfg8v265spqy58yy25hccl66i2-libcouchbase-2.8.5
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index fb0c2e789f3..7c7cd1c3aae 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.8.4";
+  version = "2.8.5";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "0i5kmv8grsnh2igvlkgjr8lz3h3yrxh82yxbbdsjfpslv61l0gpi";
+    sha256 = "1iwzf0y5f25g5hgdkmv6qf3k5mzlazrpx5sj3m2pvrl9jg9wn4s1";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 4576ff80124b6b5c58bf964b963efa08ecacf6c9 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Wed, 14 Mar 2018 17:11:51 -0500
Subject: [PATCH 1039/2266] freenect: enable Darwin building

---
 pkgs/development/libraries/freenect/default.nix | 14 +++++++++-----
 pkgs/top-level/all-packages.nix                 |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 07a40bcecf2..3771880d360 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu }:
+{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu
+, GLUT, Cocoa
+ }:
 
 stdenv.mkDerivation rec {
   name = "freenect-${version}";
@@ -11,15 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
   };
 
-  buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ];
+  buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ]
+    ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
+
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = {
     description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
     inherit version;
     homepage = http://openkinect.org;
-    license = with stdenv.lib.licenses; [ gpl2 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ gpl2 asl20 ];
+    maintainers = with lib.maintainers; [ bennofs ];
+    platforms = with lib.platforms; linux ++ darwin ;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ac59bb2739..8e84a2658ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8807,7 +8807,9 @@ with pkgs;
 
   freeglut = callPackage ../development/libraries/freeglut { };
 
-  freenect = callPackage ../development/libraries/freenect { };
+  freenect = callPackage ../development/libraries/freenect {
+    inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
+  };
 
   freetype = callPackage ../development/libraries/freetype { };
 

From 0c8e8ce7e879edbd66cc5728d470fbb246bc5d1e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 23:14:37 +0100
Subject: [PATCH 1040/2266] cdo: fix darwin build

/cc ZHF #36454
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbae4e25104..dd1d42fad93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8462,7 +8462,9 @@ with pkgs;
 
   cdk = callPackage ../development/libraries/cdk {};
 
-  cdo = callPackage ../development/libraries/cdo {};
+  cdo = callPackage ../development/libraries/cdo {
+    stdenv = gccStdenv;
+  };
 
   cimg = callPackage  ../development/libraries/cimg { };
 

From 96bb179507ce31fd3f99f6f343b8996896ed4676 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 15:36:04 -0700
Subject: [PATCH 1041/2266] liblouis: 3.4.0 -> 3.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_maketable.d/submit_rows.sh -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_maketable.d/submit_rows.sh --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_maketable.d/submit_rules.sh -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_maketable.d/submit_rules.sh --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_maketable.d/submit_rules.sh help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_allround -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_allround --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_allround -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_allround --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_allround -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_allround --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkhyphens -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkhyphens --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkhyphens -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkhyphens --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkhyphens -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkhyphens --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checktable -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checktable --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checktable -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checktable --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checktable -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checktable --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_debug -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_debug --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_debug -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_debug --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_debug -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_debug --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_translate -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_translate --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_translate -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_translate --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_translate -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_translate --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_trace -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_trace --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_trace -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_trace --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_trace -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_trace --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_tableinfo -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_tableinfo --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_tableinfo -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_tableinfo --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_tableinfo -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_tableinfo --help` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkyaml -h` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkyaml --help` got 0 exit code
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkyaml -v` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkyaml --version` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkyaml -h` and found version 3.5.0
- ran `/nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0/bin/lou_checkyaml --help` and found version 3.5.0
- found 3.5.0 with grep in /nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0
- found 3.5.0 in filename of file in /nix/store/4g34bsgi8mz9xha1n8yrdwn9bm5pxqmw-liblouis-3.5.0
---
 pkgs/development/libraries/liblouis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index d3ddb99adad..bde1ff4e493 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "3.4.0";
+  version = "3.5.0";
 in stdenv.mkDerivation rec {
   name = "liblouis-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "liblouis";
     repo = "liblouis";
     rev = "v${version}";
-    sha256 = "1b3vf6sq2iffdvj0r2q5g5k198camy3sq2nwfz391brpwivsnayh";
+    sha256 = "0klmyh6cg9khv59j4xdsrwwjzdgylw689gvrjiy5jsvqll58fcsd";
   };
 
   outputs = [ "out" "dev" "man" "info" "doc" ];

From 87f7ea335c673f688fa430f663e343d91acb0789 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 15:37:03 -0700
Subject: [PATCH 1042/2266] dehydrated: 0.5.0 -> 0.6.1

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

diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index cbd76b2e7b7..d4211328b95 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,7 +1,7 @@
 { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
-  version = "0.5.0";
+  version = "0.6.1";
 in
 stdenv.mkDerivation rec {
   name = pkgName + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "lukas2511";
     repo = "dehydrated";
     rev = "v${version}";
-    sha256 = "0ysfsz1ny3gcc4r9szrr09dg63zd7ppv6aih13wmai806yapwxrr";
+    sha256 = "0390fnycl3l4yqacwvaf7dp08rx2vvs27s06q7b478qzrn59flz4";
   };
 
   buildInputs = [ makeWrapper ];

From 0bba975febb157adb800386f4cd7ecae0513eb2e Mon Sep 17 00:00:00 2001
From: Reuben D'Netto <rdnetto@gmail.com>
Date: Thu, 15 Mar 2018 09:30:48 +1100
Subject: [PATCH 1043/2266] bar: init at version 1.11.1

Removed lemonbar alias to avoid collision.
---
 maintainers/maintainer-list.nix   |  5 +++++
 pkgs/tools/system/bar/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/aliases.nix        |  1 -
 pkgs/top-level/all-packages.nix   |  2 ++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/system/bar/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 12cbb38a24f..2ae639ca068 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2895,6 +2895,11 @@
     github = "rbasso";
     name = "Rafael Basso";
   };
+  rdnetto = {
+    email = "rdnetto@gmail.com";
+    github = "rdnetto";
+    name = "Reuben D'Netto";
+  };
   redbaron = {
     email = "ivanov.maxim@gmail.com";
     github = "redbaron";
diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix
new file mode 100644
index 00000000000..cd4770bf609
--- /dev/null
+++ b/pkgs/tools/system/bar/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "bar-1.11.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/clpbar/clpbar/bar-1.11.1/bar_1.11.1.tar.gz";
+    sha256 = "00v5cb6vzizyyhflgr62d3k8dqc0rg6wdgfyyk11c0s0r32mw3zs";
+  };
+
+  meta = {
+    description = "Console progress bar";
+    homepage = http://clpbar.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.rdnetto ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fff5f3606e9..07627daad5c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -36,7 +36,6 @@ mapAliases (rec {
   asciidocFull = asciidoc-full;  # added 2014-06-22
   at_spi2_atk = at-spi2-atk; # added 2018-02-25
   at_spi2_core = at-spi2-core; # added 2018-02-25
-  bar = lemonbar;  # added 2015-01-16
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bashCompletion = bash-completion; # Added 2016-09-28
   bridge_utils = bridge-utils;  # added 2015-02-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f4f07cbf0d..8ee9915ec52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -769,6 +769,8 @@ with pkgs;
 
   backup = callPackage ../tools/backup/backup { };
 
+  bar = callPackage ../tools/system/bar {};
+
   base16-builder = callPackage ../misc/base16-builder { };
 
   basex = callPackage ../tools/text/xml/basex { };

From f79f80dbf267036a96f8eae281c8501482756d03 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 13 Mar 2018 18:00:52 -0400
Subject: [PATCH 1044/2266] treewide: get rid of platforms.allBut

Negative reasoning like `allBut` is a bad idea with an open world of
platforms. Concretely, if we add a new, quite different sort of
platform, existing packages with `allBut` will claim they work on it
even though they probably won't.
---
 lib/systems/doubles.nix                             |  3 ++-
 pkgs/applications/graphics/ahoviewer/default.nix    |  4 +++-
 pkgs/applications/window-managers/i3/lock-color.nix |  2 +-
 pkgs/data/icons/numix-icon-theme-square/default.nix |  2 +-
 pkgs/development/compilers/chicken/default.nix      |  2 +-
 pkgs/development/compilers/mono/generic.nix         |  2 +-
 pkgs/development/libraries/buddy/default.nix        |  2 +-
 pkgs/development/libraries/cln/default.nix          |  2 +-
 pkgs/development/libraries/cloog-ppl/default.nix    |  2 +-
 pkgs/development/libraries/cloog/0.18.0.nix         |  2 +-
 pkgs/development/libraries/cloog/default.nix        |  2 +-
 pkgs/development/libraries/rocksdb/default.nix      |  2 +-
 pkgs/development/tools/rtags/default.nix            |  2 +-
 pkgs/games/endless-sky/default.nix                  |  2 +-
 pkgs/misc/screensavers/alock/default.nix            |  2 +-
 pkgs/misc/screensavers/xscreensaver/default.nix     |  2 +-
 pkgs/tools/graphics/barcode/default.nix             |  2 +-
 pkgs/tools/graphics/dcraw/default.nix               |  2 +-
 pkgs/tools/misc/mbuffer/default.nix                 |  2 +-
 pkgs/tools/networking/dnscrypt-proxy/default.nix    |  2 +-
 pkgs/tools/networking/zerotierone/default.nix       |  2 +-
 pkgs/top-level/python-packages.nix                  |  2 +-
 pkgs/top-level/release-lib.nix                      |  2 +-
 pkgs/top-level/release-small.nix                    | 10 +++++-----
 24 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 20294a28a11..0e1ee62ac95 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -24,10 +24,11 @@ let
 in rec {
   inherit all;
 
-  allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
   none = [];
 
   arm     = filterDoubles predicates.isArm;
+  aarch64 = filterDoubles predicates.isAarch64;
+  x86     = filterDoubles predicates.isx86;
   i686    = filterDoubles predicates.isi686;
   mips    = filterDoubles predicates.isMips;
   x86_64  = filterDoubles predicates.isx86_64;
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 2d42a479999..b7647803b3d 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -37,7 +37,9 @@ stdenv.mkDerivation rec {
     description = "A GTK2 image viewer, manga reader, and booru browser";
     maintainers = with maintainers; [ skrzyp xzfc ];
     license = licenses.mit;
-    platforms = platforms.allBut [ "darwin" "cygwin" ];
+    # Unintentionally not working on Darwin:
+    # https://github.com/ahodesuka/ahoviewer/issues/62
+    platforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index ec1673f5040..edaa88bde23 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
 
     # Needs the SSE2 instruction set. See upstream issue
     # https://github.com/chrjguill/i3lock-color/issues/44
-    platforms = platforms.i686 ++ platforms.x86_64;
+    platforms = platforms.x86;
   };
 }
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 198229cce37..99871abe5d4 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Numix icon theme (square version)";
     homepage = https://numixproject.org;
     license = licenses.gpl3;
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 4a2893c303f..ad9e57f794f 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     homepage = http://www.call-cc.org/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = with stdenv.lib.platforms; allBut darwin;
+    platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index a8012f6bb9e..3b476bce027 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
-    platforms = with stdenv.lib.platforms; allBut [ "aarch64-linux" ];
+    platforms = stdenv.lib.platforms.x86;
     maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
     license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
   };
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 313ac086726..00e236eba8c 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Binary decision diagram package";
     license = "as-is";
 
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 9d7c9c4f30f..e39386dca3f 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "C/C++ library for numbers, a part of GiNaC";
     homepage = http://www.ginac.de/CLN/;
     maintainers = [ ];
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 2c49e036358..442b115a408 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
index ccd93828319..fa4e19f716a 100644
--- a/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 5da29273a8b..902e0b26687 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 562942f230f..6ccb78003cf 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     homepage = http://rocksdb.org;
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.bsd3;
-    platforms = platforms.allBut [ "i686-linux" ];
+    platforms = platforms.x86_64 ++ platforms.aarch64;
     maintainers = with maintainers; [ adev wkennington ];
   };
 }
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 13fbea3fc23..a2c75a02aa2 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "C/C++ client-server indexer based on clang";
     homepage = https://github.com/andersbakken/rtags;
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.allBut [ "i686-linux" ];
+    platforms = with stdenv.lib.platforms; x86_64 ++ aarch64;
   };
 }
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 40dbd1d33a7..8e1bd52eb42 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
       gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
     ];
     maintainers = with maintainers; [ lheckemann ];
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
   };
 }
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 1dc03e1e9f0..5b7c12dee1b 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       xscreensaver and never will. It's just for locking the current
       X session.
     '';
-    platforms = with platforms; allBut cygwin;
+    platforms = platforms.unix; # Cygwin had problems at one point
     maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
   };
 }
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index b337b6cb0e9..8035e7da37d 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.jwz.org/xscreensaver/;
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     inherit version;
     downloadPage = "https://www.jwz.org/xscreensaver/download.html";
     updateWalker = true;
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index d6a31bd5c7f..7ed2cc8b6aa 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "GNU barcode generator";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
     downloadPage = "http://ftp.gnu.org/gnu/barcode/";
     updateWalker = true;
     homepage = http://ftp.gnu.org/gnu/barcode/;
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 66d3a110080..30546865bcc 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cybercom.net/~dcoffin/dcraw/;
     description = "Decoder for many camera raw picture formats";
     license = stdenv.lib.licenses.free;
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index e81fa7958b5..ed6c08d5554 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description  = "A tool for buffering data streams with a large set of unique features";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ tokudan ];
-    platforms = with stdenv.lib.platforms; allBut darwin;
+    platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
   };
 }
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 95bfdca6315..6120b821bf4 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.isc;
     maintainers = with maintainers; [ joachifm jgeerds ];
     # upstream claims OSX support, but Hydra fails
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
   };
 }
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 37812029c96..77df8cbf6f7 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
     maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ];
-    platforms = platforms.allBut [ "i686-linux" ];
+    platforms = platforms.x86_64 ++ platforms.aarch64;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 370fe91f998..7969765a95e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13517,7 +13517,7 @@ in {
       homepage = https://pypi.python.org/pypi/PyICU/;
       description = "Python extension wrapping the ICU C++ API";
       license = licenses.mit;
-      platforms = with platforms; allBut darwin;
+      platforms = platforms.linux; # Maybe other non-darwin Unix
       maintainers = [ maintainers.rycee ];
     };
   };
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 87fb00a9682..3e842f8b556 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -108,7 +108,7 @@ rec {
 
 
   /* Common platform groups on which to test packages. */
-  inherit (platforms) unix linux darwin cygwin allBut all mesaPlatforms;
+  inherit (platforms) unix linux darwin cygwin all mesaPlatforms;
 
   /* Platform groups for specific kinds of applications. */
   x11Supported = linux;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 391d79e47f1..e92ad47e142 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -21,7 +21,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   atlas = linux;
   autoconf = all;
   automake = all;
-  avahi = allBut cygwin;  # Cygwin builds fail
+  avahi = unix; # Cygwin builds fail
   bash = all;
   bashInteractive = all;
   bc = all;
@@ -54,7 +54,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   gnumake = all;
   gnupatch = all;
   gnupg = linux;
-  gnuplot = allBut cygwin;
+  gnuplot = unix; # Cygwin builds fail
   gnused = all;
   gnutar = all;
   gnutls = linux;
@@ -128,7 +128,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   pkgconfig = all;
   pmccabe = linux;
   procps = linux;
-  python = allBut cygwin;
+  python = unix; # Cygwin builds fail
   readline = all;
   rlwrap = all;
   rpm = linux;
@@ -138,9 +138,9 @@ with import ./release-lib.nix { inherit supportedSystems; };
   scrot = linux;
   sdparm = linux;
   sharutils = all;
-  sloccount = allBut cygwin;
+  sloccount = unix; # Cygwin builds fail
   smartmontools = all;
-  sqlite = allBut cygwin;
+  sqlite = unix; # Cygwin builds fail
   squid = linux;
   ssmtp = linux;
   stdenv = all;

From 99131b4fc20f1256bdfc4c5237392434c157d234 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 17:50:25 -0500
Subject: [PATCH 1045/2266] pycurl: 7.19.5.1 -> 7.43.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 373c3a27de2..6f85300f1e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12944,19 +12944,21 @@ in {
   };
 
   pycurl = buildPythonPackage (rec {
-    name = "pycurl-7.19.5.1";
+    pname = "pycurl";
+    version = "7.43.0.1";
     disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
-    src = pkgs.fetchurl {
-      url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";
-      sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
     };
 
     buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
-    checkInputs = with self; [ bottle pytest nose ];
+    checkInputs = with self; [ bottle pytest nose flaky ];
+
     checkPhase = ''
-      py.test -k "not test_ssl_in_static_libs" tests
+      py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
     '';
 
     preConfigure = ''

From f3d17b66fbea7c94d8cf4b0774f9bfb1486b308c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 15:52:39 -0700
Subject: [PATCH 1046/2266] libraw: 0.18.7 -> 0.18.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/raw-identify -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/raw-identify --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/raw-identify help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -V` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -v` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw --version` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -h` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw --help` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -V` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -v` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels --version` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -h` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels --help` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/simple_dcraw -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/simple_dcraw --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/simple_dcraw help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/mem_image -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/mem_image --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/mem_image help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_half -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_half --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_half help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/half_mt -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/half_mt --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/half_mt help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/multirender_test -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/multirender_test --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/multirender_test help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/postprocessing_benchmark -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/postprocessing_benchmark help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_emu -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_emu help` got 0 exit code
- found 0.18.8 with grep in /nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8
- found 0.18.8 in filename of file in /nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index c1df11aa544..d4ad1c03860 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7";
+    sha256 = "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From 4c52e34ca60c58fe50e73875550068099dcdebdb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 30 Jan 2018 22:10:34 -0500
Subject: [PATCH 1047/2266] stdenv: Clean up check meta args

---
 pkgs/stdenv/generic/check-meta.nix      | 22 +++++++++++-----------
 pkgs/stdenv/generic/make-derivation.nix |  5 ++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 93d0f4cc980..ee1e657bdab 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -1,11 +1,9 @@
 # Checks derivation meta and attrs for problems (like brokenness,
 # licenses, etc).
 
-{ lib, config, system, meta, derivationArg, mkDerivationArg }:
+{ lib, config, system, meta }:
 
 let
-  attrs = mkDerivationArg; # TODO: probably get rid of passing this one
-
   # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
   # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
   shouldCheckMeta = config.checkMeta or false;
@@ -123,7 +121,7 @@ let
 
       '';
 
-  handleEvalIssue = { reason , errormsg ? "" }:
+  handleEvalIssue = attrs: { reason , errormsg ? "" }:
     let
       msg = ''
         Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
@@ -196,11 +194,13 @@ let
       { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
     else { valid = true; };
 
-   validity = checkValidity attrs;
+  assertValidity = attrs: let
+      validity = checkValidity attrs;
+    in validity // {
+      # Throw an error if trying to evaluate an non-valid derivation
+      handled = if !validity.valid
+        then handleEvalIssue attrs (removeAttrs validity ["valid"])
+        else true;
+  };
 
-in validity // {
-  # Throw an error if trying to evaluate an non-valid derivation
-  handled = if !validity.valid
-    then handleEvalIssue (removeAttrs validity ["valid"])
-    else true;
-}
+in assertValidity
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e8f78d7401f..18c4beb965b 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -204,12 +204,11 @@ rec {
         });
 
       validity = import ./check-meta.nix {
-        inherit lib config meta derivationArg;
-        mkDerivationArg = attrs;
+        inherit lib config meta;
         # Nix itself uses the `system` field of a derivation to decide where
         # to build it. This is a bit confusing for cross compilation.
         inherit (stdenv) system;
-      };
+      } attrs;
 
       # The meta attribute is passed in the resulting attribute set,
       # but it's not part of the actual derivation, i.e., it's not

From cb9adfff0cd690b7b601b9d1aa22403af8c22502 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 16:10:15 -0700
Subject: [PATCH 1048/2266] libsass: 3.4.9 -> 3.5.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.5.1 with grep in /nix/store/k68941z8m2pw5jgmc0f7f2k9x0iv2pcj-libsass-3.5.1
- found 3.5.1 in filename of file in /nix/store/k68941z8m2pw5jgmc0f7f2k9x0iv2pcj-libsass-3.5.1
---
 pkgs/development/libraries/libsass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index e1c50bee75a..df160f3405a 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.4.9";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "0f4mj91zzdzah7fxkdg3dnrimk9ip7czl4g26f32zgifz1nrqgjs";
+    sha256 = "0qy5hsglrdwzlb1x83v40pnm52hrjbdrc5zardp89i3vwcdzkrq8";
   };
 
   patchPhase = ''

From febe728bf5b88b0a7c4f50deaa06fad705aa0b96 Mon Sep 17 00:00:00 2001
From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
Date: Thu, 15 Mar 2018 01:03:31 +0100
Subject: [PATCH 1049/2266] spotify: 1.0.69.336.g7edcc575-39 ->
 1.0.72.117.g6bd7cc73-35

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 9ac0c49ebc3..7b78ceddda2 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
   # Be careful not to pick the testing version.
-  version = "1.0.69.336.g7edcc575-39";
+  version = "1.0.72.117.g6bd7cc73-35";
 
   deps = [
     alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
+    sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 86fbdfdd4c19549d1b299ff284ae53dde1c79f36 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:19:39 +0100
Subject: [PATCH 1050/2266] woff2: propagate brotli build input

brotli is a runtime dependency, as per pc files in woff2.dev

cc @hrdinka
---
 pkgs/development/web/woff2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index 3480924370e..1142c1e006b 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ brotli ];
+  propagatedBuildInputs = [ brotli ];
 
   # without this binaries only get built if shared libs are disable
   patchPhase = ''

From 0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:23:26 +0100
Subject: [PATCH 1051/2266] wxwidgets: depend on generic webkitgtk instead of
 218x

Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6
---
 pkgs/development/libraries/wxwidgets/3.0/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 98621bb781e..309d9be274d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -4,13 +4,13 @@
 , withMesa ? true, libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> libGLU != null && libGL != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
 
 with stdenv.lib;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa libGLU
-    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x)
+    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];

From 80582c600dadd6bd2a15f64a4e3e7da074adc71d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:29:45 +0100
Subject: [PATCH 1052/2266] vimb-unwrapped: depend on generic webkitgtk instead
 of 218x

Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd1d42fad93..e501b1d9206 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20699,9 +20699,7 @@ with pkgs;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
-  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
-    webkit = webkitgtk218x;
-  };
+  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
   vimb = wrapFirefox vimb-unwrapped { };
 
   vips = callPackage ../tools/graphics/vips { };

From a8824ab4fb67e414daa820dd1c9e36ee37dec276 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 10:40:24 -0500
Subject: [PATCH 1053/2266] llvm_5: patch sanitizers to enable w/musl

https://gitweb.gentoo.org/proj/musl.git/plain/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-5.0.0-musl-patches.patch
---
 pkgs/development/compilers/llvm/5/llvm.nix    |   4 +-
 .../compilers/llvm/5/sanitizers-nongnu.patch  | 370 ++++++++++++++++++
 pkgs/development/compilers/llvm/6/llvm.nix    |   9 +-
 3 files changed, 377 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index f574eb05f92..ac575a0bf7a 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -79,6 +79,7 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -114,9 +115,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-
-    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
-    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..c9ddfe45c89
--- /dev/null
+++ b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
@@ -0,0 +1,370 @@
+From 3e1fcb7d4909db8f0f7dd0109b2eee20115c8be3 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sat, 9 Sep 2017 08:31:15 -0500
+Subject: [PATCH] Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                             |  4 +--
+ lib/interception/interception_linux.cc             |  2 +-
+ lib/interception/interception_linux.h              |  2 +-
+ lib/msan/msan_linux.cc                             |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc        |  4 +--
+ lib/sanitizer_common/sanitizer_common_syscalls.inc |  2 +-
+ lib/sanitizer_common/sanitizer_linux_libcdep.cc    | 12 +++----
+ lib/sanitizer_common/sanitizer_platform.h          |  7 ++++
+ .../sanitizer_platform_interceptors.h              |  2 +-
+ .../sanitizer_platform_limits_posix.cc             | 40 +++++++++++++---------
+ lib/tsan/rtl/tsan_platform_linux.cc                |  2 +-
+ 11 files changed, 47 insertions(+), 32 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 6d47ba432..c58dd4864 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -39,7 +39,7 @@
+ #include <sys/link_elf.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #else
+@@ -86,7 +86,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 6e908ac01..76c1688ce 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+   return real == wrapper;
+ }
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && defined(__GLIBC__)  // android does not have dlvsym
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 27a66c882..f60c38991 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 0a687f620..0852d97d7 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX
++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 4ed9afedf..64f584e93 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -100,7 +100,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -361,7 +361,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 52196db12..045d9331f 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -148,7 +148,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -176,11 +176,11 @@ void InitTlsSize() {
+ }
+ #else
+ void InitTlsSize() { }
+-#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
+-    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
++    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -335,7 +335,7 @@ uptr ThreadSelf() {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -362,7 +362,7 @@ static void GetTls(uptr *addr, uptr *size) {
+     *addr = (uptr) dtv[2];
+     *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #else
+@@ -373,7 +373,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ 
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+-#if SANITIZER_FREEBSD || SANITIZER_ANDROID
++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index 396f7c934..5af6f1ed5 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -175,6 +175,13 @@
+ # define SANITIZER_ARM 0
+ #endif
+ 
++
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index 0380cee92..0a39abbd0 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -31,7 +31,7 @@
+ # define SI_POSIX 0
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 83f4fd22f..fa8c1b8bd 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
++// #include <sys/ustat.h>
++#include <sys/statfs.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -251,7 +257,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ustat_sz = sizeof(struct ustat);
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+@@ -309,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -403,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -453,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -821,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -976,7 +982,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1010,6 +1016,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1023,6 +1030,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1125,7 +1133,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1186,7 +1194,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1236,7 +1244,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1255,7 +1263,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index ead1e5704..2c020e3fe 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -284,7 +284,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.16.2
+
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 4f7a2835cc9..80702f3d8fe 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -77,6 +77,12 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
+    sed -i projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc \
+      -e '1i#define _LINUX_SYSINFO_H'
+    substituteInPlace projects/compiler-rt/lib/interception/interception_linux.h \
+      --replace '!defined(__ANDROID__)' \
+                '!defined(__ANDROID__) && !SANITIZER_NONGNU'
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -112,9 +118,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-
-    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
-    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''

From 60bf299e6affada1aec05e6bcbbb44652e417a5d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 12:48:43 -0500
Subject: [PATCH 1054/2266] llvm6: patch to enable sanitizers w/musl

---
 pkgs/development/compilers/llvm/6/llvm.nix    |   5 -
 .../compilers/llvm/6/sanitizers-nongnu.patch  | 377 ++++++++++++++++++
 2 files changed, 377 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 80702f3d8fe..307b2e3a3f2 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -78,11 +78,6 @@ in stdenv.mkDerivation (rec {
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
     patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
-    sed -i projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc \
-      -e '1i#define _LINUX_SYSINFO_H'
-    substituteInPlace projects/compiler-rt/lib/interception/interception_linux.h \
-      --replace '!defined(__ANDROID__)' \
-                '!defined(__ANDROID__) && !SANITIZER_NONGNU'
   '';
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..39a9bbbd207
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
@@ -0,0 +1,377 @@
+From 8c74f8274369f527f2ada3772f4a0b406cb481ec Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sat, 9 Sep 2017 08:31:15 -0500
+Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                             |  4 +--
+ lib/interception/interception_linux.cc             |  2 +-
+ lib/interception/interception_linux.h              |  3 +-
+ lib/msan/msan_linux.cc                             |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc        |  4 +--
+ lib/sanitizer_common/sanitizer_common_syscalls.inc |  2 +-
+ lib/sanitizer_common/sanitizer_linux_libcdep.cc    | 10 +++---
+ lib/sanitizer_common/sanitizer_platform.h          |  6 ++++
+ .../sanitizer_platform_interceptors.h              |  4 +--
+ .../sanitizer_platform_limits_posix.cc             | 40 +++++++++++++---------
+ lib/tsan/rtl/tsan_platform_linux.cc                |  2 +-
+ 11 files changed, 46 insertions(+), 33 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include <link.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index c991550a4..2b706418b 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+ 
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 98fe51b85..c13302b98 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-// Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 4e6321fcb..4d50feb82 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 24e7548a5..20259b1d6 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -102,7 +102,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -363,7 +363,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 56fdfc870..a932d5db1 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ }
+ 
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
+-    !SANITIZER_NETBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -207,7 +207,7 @@ void InitTlsSize() { }
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
+-    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
++    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) {
+       *addr = (uptr)tcb->tcb_dtv[1];
+     }
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
+-    SANITIZER_SOLARIS
++    SANITIZER_SOLARIS || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index 334903c26..fc2afac2c 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -195,6 +195,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index b99ac4480..628d226a1 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -38,7 +38,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -291,7 +291,7 @@
+   (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL                       \
+-  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+                  SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index f12e8206a..8880197b0 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
++// #include <sys/ustat.h>
++#include <sys/statfs.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -252,7 +258,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ustat_sz = sizeof(struct ustat);
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+@@ -311,7 +317,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -405,7 +411,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -455,7 +461,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -823,7 +829,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -978,7 +984,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1012,6 +1018,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1025,6 +1032,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1127,7 +1135,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1188,7 +1196,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1238,7 +1246,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1257,7 +1265,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index e14d5f575..389a3bc88 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -285,7 +285,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.16.2
+

From b2e6952f378e2ed17d0d30b4986c6632a652d867 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 11:24:28 -0500
Subject: [PATCH 1055/2266] llvm4: same treatment

---
 pkgs/development/compilers/llvm/4/llvm.nix    |   4 +-
 .../compilers/llvm/4/sanitizers-nongnu.patch  | 368 ++++++++++++++++++
 2 files changed, 369 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 7fd94316d73..57f76ac5cec 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -83,6 +83,7 @@ in stdenv.mkDerivation (rec {
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
     patch -p1 -i ${./dynamiclibrary-musl.patch}
+    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -118,9 +119,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-
-    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
-    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..5bd858f8ae7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
@@ -0,0 +1,368 @@
+From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Fri, 5 May 2017 17:47:39 +0000
+Subject: [PATCH] Musl patches
+
+Ported to compiler-rt-sanitizers-4.0.0. Taken from
+
+  https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+---
+ lib/asan/asan_linux.cc                             |  4 +--
+ lib/interception/interception_linux.cc             |  2 +-
+ lib/interception/interception_linux.h              |  2 +-
+ lib/msan/msan_linux.cc                             |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc        |  4 +--
+ lib/sanitizer_common/sanitizer_common_syscalls.inc |  2 +-
+ lib/sanitizer_common/sanitizer_linux_libcdep.cc    | 12 +++----
+ lib/sanitizer_common/sanitizer_platform.h          |  7 ++++
+ .../sanitizer_platform_interceptors.h              |  2 +-
+ .../sanitizer_platform_limits_posix.cc             | 39 +++++++++++++---------
+ lib/tsan/rtl/tsan_platform_linux.cc                |  2 +-
+ 11 files changed, 46 insertions(+), 32 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index c051573dd..e295f6004 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -39,7 +39,7 @@
+ #include <sys/link_elf.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #else
+@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 6e908ac01..8f23d9adc 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+   return real == wrapper;
+ }
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && !SANITIZER_NONGNU  // android does not have dlvsym
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 27a66c882..3b559a303 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && !SANITIZER_NONGNU  // android does not have dlvsym
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 0a687f620..0852d97d7 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX
++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 4ed9afedf..64f584e93 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -100,7 +100,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -361,7 +361,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index f99f0b594..3a773a94e 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -180,11 +180,11 @@ void InitTlsSize() {
+ }
+ #else
+ void InitTlsSize() { }
+-#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \
+-    && SANITIZER_LINUX && !SANITIZER_ANDROID
++    && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -338,7 +338,7 @@ uptr ThreadSelf() {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) {
+     *addr = (uptr) dtv[2];
+     *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #else
+@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ 
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+-#if SANITIZER_FREEBSD || SANITIZER_ANDROID
++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d9a8e8df1..fe01c5744 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -162,6 +162,13 @@
+ # define SANITIZER_PPC64V2 0
+ #endif
+ 
++
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index 62875d11a..212e6e882 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -23,7 +23,7 @@
+ # define SI_NOT_WINDOWS 0
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 683f019d7..fd4880962 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,8 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
++// #include <sys/ustat.h>
++#include <sys/statfs.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -252,7 +257,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ustat_sz = sizeof(struct ustat);
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index 3313288a7..103c7b6b9 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -287,7 +287,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   __res_state *statp = (__res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.16.2
+

From 6b2d303b0624619c85377967d30fb00ab1cfc25e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 15 Mar 2018 04:06:19 +0300
Subject: [PATCH 1056/2266] splix: move to DRVs over PPDs

Also enable JBIG support for newer printers.
---
 pkgs/misc/cups/drivers/splix/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 2cdaca8d783..53e8a662697 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchsvn, fetchurl, cups, zlib }:
+{ stdenv, fetchsvn, cups, zlib, jbigkit }:
+
 let rev = "315"; in
 stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
+
   src = fetchsvn {
     # We build this from svn, because splix hasn't been in released in several years
     # although the community has been adding some new printer models.
@@ -11,12 +13,17 @@ stdenv.mkDerivation rec {
   };
 
   preBuild = ''
-    makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
+    makeFlags="$makeFlags CUPSFILTER=$out/lib/cups/filter CUPSDRV=$out/share/cups/drv"
   '';
 
-  buildInputs = [cups zlib];
+  buildFlags = [ "drv" "all" ];
+
+  makeFlags = [ "DRV_ONLY=1" ];
+
+  buildInputs = [ cups zlib jbigkit ];
 
   meta = {
+    description = "CUPS drivers for SPL (Samsung Printer Language) printers";
     homepage = http://splix.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];

From 92a77abd31e6c252390b1baa8a25553909e3f344 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Wed, 14 Mar 2018 18:17:55 -0700
Subject: [PATCH 1057/2266] xgboost: Enable building on Darwin (#37046)

* xgboost: Enable building on Darwin

* Review feedback: pass `xgboost` to the python package
---
 .../development/libraries/xgboost/default.nix | 11 +++---
 .../python-modules/xgboost/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 ++-----------
 3 files changed, 44 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/xgboost/default.nix

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 0d86c862891..7865724efa4 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -2,6 +2,7 @@
 , avxSupport ? false
 , cudaSupport ? false, cudatoolkit
 , ncclSupport ? false, nccl
+, llvmPackages
 }:
 
 assert ncclSupport -> cudaSupport;
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;
 
   buildInputs = lib.optional cudaSupport cudatoolkit
                 ++ lib.optional ncclSupport nccl;
@@ -27,10 +28,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]
                ++ lib.optional ncclSupport "-DUSE_NCCL=ON";
 
-  installPhase = ''
+  installPhase = let
+    libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so";
+  in ''
     mkdir -p $out
     cp -r ../include $out
-    install -Dm755 ../lib/libxgboost.so $out/lib/libxgboost.so
+    install -Dm755 ../lib/${libname} $out/lib/${libname}
     install -Dm755 ../xgboost $out/bin/xgboost
   '';
 
@@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
     homepage = https://github.com/dmlc/xgboost;
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
new file mode 100644
index 00000000000..217c823afe5
--- /dev/null
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, lib
+, pkgs
+, buildPythonPackage
+, nose
+, scipy
+, xgboost
+}:
+
+buildPythonPackage rec {
+  name = "xgboost-${version}";
+
+  inherit (xgboost) version src meta;
+
+  propagatedBuildInputs = [ scipy ];
+  checkInputs = [ nose ];
+
+  postPatch = let
+    libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so";
+
+  in ''
+    cd python-package
+
+    sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
+    sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
+    cat <<EOF >xgboost/libpath.py
+    def find_lib_path():
+      return ["${xgboost}/lib/${libname}"]
+    EOF
+  '';
+
+  postInstall = ''
+    rm -rf $out/xgboost
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 253575fba0b..9220b9e98ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20076,28 +20076,8 @@ EOF
     };
   };
 
-  xgboost = buildPythonPackage rec {
-    name = "xgboost-${version}";
-
-    inherit (pkgs.xgboost) version src meta;
-
-    propagatedBuildInputs = with self; [ scipy ];
-    checkInputs = with self; [ nose ];
-
-    postPatch = ''
-      cd python-package
-
-      sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
-      sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
-      cat <<EOF >xgboost/libpath.py
-      def find_lib_path():
-        return ["${pkgs.xgboost}/lib/libxgboost.so"]
-      EOF
-    '';
-
-    postInstall = ''
-      rm -rf $out/xgboost
-    '';
+  xgboost = callPackage ../development/python-modules/xgboost {
+    xgboost = pkgs.xgboost;
   };
 
   xkcdpass = buildPythonPackage rec {

From 92e7762b36e29a2e7b93a0deed4f426f7b939cab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:09:32 +0100
Subject: [PATCH 1058/2266] networkmanagerapplet: add updateScript

---
 .../network-manager-applet/default.nix          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 20bab09c2a7..b2640743daf 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -4,14 +4,14 @@
 , udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk
 , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}-${major}.${minor}";
+let
   pname   = "network-manager-applet";
-  major   = "1.8";
-  minor   = "6";
+  version = "1.8.6";
+in stdenv.mkDerivation rec {
+  name    = "${pname}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01";
   };
 
@@ -42,6 +42,13 @@ stdenv.mkDerivation rec {
     installFlagsArray=( "sysconfdir=$out/etc" )
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanagerapplet";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage    = http://projects.gnome.org/NetworkManager/;
     description = "NetworkManager control applet for GNOME";

From 72220061574f4504d87394fa118132a550033513 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:09:48 +0100
Subject: [PATCH 1059/2266] networkmanager: add updateScript

---
 .../networking/network-manager/default.nix    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c0471601917..fc7d352757d 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib
+{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib, gnome3
 , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
 , python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }:
 
-stdenv.mkDerivation rec {
-  name    = "network-manager-${version}";
+let
   pname   = "NetworkManager";
-  major   = "1.10";
-  version = "${major}.2";
+  version = "1.10.2";
+in stdenv.mkDerivation rec {
+  name    = "network-manager-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
   };
 
@@ -104,8 +104,15 @@ stdenv.mkDerivation rec {
     ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager";
+    };
+  };
+
   meta = with stdenv.lib; {
-    homepage    = http://projects.gnome.org/NetworkManager/;
+    homepage    = https://wiki.gnome.org/Projects/NetworkManager;
     description = "Network configuration and management tool";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ];

From 8aa3b5c916526132a093f7794e15b48a47dd9512 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:00 +0100
Subject: [PATCH 1060/2266] networkmanager-fortisslvpn: add updateScript

---
 .../networking/network-manager/fortisslvpn.nix  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index 5f1e0790b0b..b924a02438f 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
 networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-fortisslvpn";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
   };
 
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
        --replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-fortisslvpn";
+    };
+  };
+
   meta = {
     description = "NetworkManager's FortiSSL plugin";
     inherit (networkmanager.meta) maintainers platforms;

From dcfbe14f0ed91fa64432f69f6217143a4582a19d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:14 +0100
Subject: [PATCH 1061/2266] networkmanager-iodine: add updateScript

---
 .../tools/networking/network-manager/iodine.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix
index 9e6ba581a94..cbc0e6e6d2d 100644
--- a/pkgs/tools/networking/network-manager/iodine.nix
+++ b/pkgs/tools/networking/network-manager/iodine.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-iodine";
-  major   = "1.2";
-  version = "${major}.0";
+  version = "1.2.0";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh";
   };
 
@@ -32,6 +32,13 @@ stdenv.mkDerivation rec {
        --replace "/usr/bin/iodine" "${iodine}/bin/iodine"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-iodine";
+    };
+  };
+
   meta = {
     description = "NetworkManager's iodine plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 6c4bb91fca42073aa78d948810e9fa519f44baa6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:26 +0100
Subject: [PATCH 1062/2266] networkmanager-openconnect: add updateScript

---
 .../networking/network-manager/openconnect.nix  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index 5a215529d83..efaa146c72f 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-openconnect";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1";
   };
 
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
        --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-openconnect";
+    };
+  };
+
   meta = {
     description = "NetworkManager's OpenConnect plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 348784f8a8ae69f22a89d6498c935b79b2674ed3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:37 +0100
Subject: [PATCH 1063/2266] networkmanager-openvpn: add updateScript

---
 .../networking/network-manager/openvpn.nix      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 49411f77845..edda84ab43e 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-openvpn";
-  major   = "1.8";
-  version = "${major}.0";
+  version = "1.8.0";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn";
   };
 
@@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
        --replace "/sbin/openvpn" "${openvpn}/bin/openvpn"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-openvpn";
+    };
+  };
+
   meta = {
     description = "NetworkManager's OpenVPN plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 47e033ace475ef0b74625d63f4c92365b31e4b42 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:45 +0100
Subject: [PATCH 1064/2266] networkmanager-pptp: add updateScript

---
 pkgs/tools/networking/network-manager/pptp.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index 08f591b117e..6844ca53456 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
 , libsecret, withGnome ? true, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-pptp";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e";
   };
 
@@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
   configureFlags =
     if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome";
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-pptp";
+    };
+  };
+
   meta = {
     description = "PPtP plugin for NetworkManager";
     inherit (networkmanager.meta) maintainers platforms;

From a50dbfca7971c62b3f3f2a94c85c4d836a00ff98 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:57 +0100
Subject: [PATCH 1065/2266] networkmanager-vpnc: add updateScript

---
 pkgs/tools/networking/network-manager/vpnc.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 8d69415313d..81d899527e7 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
-
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-vpnc";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05";
   };
 
@@ -31,6 +30,13 @@ stdenv.mkDerivation rec {
        --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-vpnc";
+    };
+  };
+
   meta = {
     description = "NetworkManager's VPNC plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 13a8e72b01ff5a6e32000e85bab5fac64cf534c5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:12:34 +0100
Subject: [PATCH 1066/2266] =?UTF-8?q?networkmanagerapplet:=201.8.6=20?=
 =?UTF-8?q?=E2=86=92=201.8.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index b2640743daf..578505f1e24 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname   = "network-manager-applet";
-  version = "1.8.6";
+  version = "1.8.10";
 in stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01";
+    sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a";
   };
 
   configureFlags = [

From d5d7fa4c03b4064ef15c73a0706bc7b29cce278a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:12:57 +0100
Subject: [PATCH 1067/2266] =?UTF-8?q?networkmanager:=201.10.2=20=E2=86=92?=
 =?UTF-8?q?=201.10.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index fc7d352757d..dc7a29f5267 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname   = "NetworkManager";
-  version = "1.10.2";
+  version = "1.10.4";
 in stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
+    sha256 = "1zimmpmpd84dscdky7zad5zr1gk1bnsk0insjm0s9415gjvsgq3x";
   };
 
   outputs = [ "out" "dev" ];

From 3ebc49c5c02b13636c7eff235cbcbe14632b816b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:13:29 +0100
Subject: [PATCH 1068/2266] =?UTF-8?q?networkmanager-fortisslvpn:=201.2.4?=
 =?UTF-8?q?=20=E2=86=92=201.2.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/network-manager/fortisslvpn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index b924a02438f..73aaea06c91 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -3,13 +3,13 @@ networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
 
 let
   pname   = "NetworkManager-fortisslvpn";
-  version = "1.2.4";
+  version = "1.2.8";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
+    sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
   };
 
   buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]

From 0008b5c2324b7dfc9420bdec9c8068f0755bf54f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 18:24:31 -0700
Subject: [PATCH 1069/2266] libsolv: 0.6.32 -> 0.6.33

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv --help` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv -V` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv -v` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv --version` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv --help` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/dumpsolv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/testsolv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/testsolv help` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/rpmdb2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/repomdxml2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/rpmmd2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/updateinfoxml2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/deltainfoxml2solv -h` got 0 exit code
- found 0.6.33 with grep in /nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33
- found 0.6.33 in filename of file in /nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33
---
 pkgs/development/libraries/libsolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index f775316a2a0..396bd09921f 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
-  rev  = "0.6.32";
+  rev  = "0.6.33";
   name = "libsolv-${rev}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner  = "openSUSE";
     repo   = "libsolv";
-    sha256 = "0gqvnnc1s5n0yj82ia6w2wjhhn8hpl6wm4lki2kzvjqjgla45fnq";
+    sha256 = "1vf8mwqzjjqkd5ir71h4lifybibs5nhqgfgq5zzlazby02zx2yiz";
   };
 
   cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";

From 18db10a163a342093d121e98def8454c69e1b8cc Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 18:40:11 -0700
Subject: [PATCH 1070/2266] libu2f-host: 1.1.4 -> 1.1.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5/bin/u2f-host -h` got 0 exit code
- ran `/nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5/bin/u2f-host --help` got 0 exit code
- ran `/nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5/bin/u2f-host -V` and found version 1.1.5
- ran `/nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5/bin/u2f-host --version` and found version 1.1.5
- ran `/nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5/bin/u2f-host -h` and found version 1.1.5
- ran `/nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5/bin/u2f-host --help` and found version 1.1.5
- found 1.1.5 with grep in /nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5
- found 1.1.5 in filename of file in /nix/store/npfpn2xy98yy13j3icli75mx4a3xlhmm-libu2f-host-1.1.5
---
 pkgs/development/libraries/libu2f-host/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index b0d6598fc63..2def14b1c10 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-1.1.4";
+  name = "libu2f-host-1.1.5";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "0vvs2p3b25cbybccv3f4ridnp7sg5i4hkzx3hx48ldcn1l1fqhv0";
+    sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1d93c684d57a2ca666f81f579f3850419ccb9551 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 19:19:59 -0700
Subject: [PATCH 1071/2266] libwebsockets: 2.4.1 -> 2.4.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.2 with grep in /nix/store/y3zmgw1wy80xwfmjx8d97nvrr5qfzrmp-libwebsockets-2.4.2
- found 2.4.2 in filename of file in /nix/store/y3zmgw1wy80xwfmjx8d97nvrr5qfzrmp-libwebsockets-2.4.2
---
 pkgs/development/libraries/libwebsockets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index fa35f7546f5..3bc04f9ae3d 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libwebsockets-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
     rev = "v${version}";
-    sha256 = "0d3xqdq3hpk5l9cg4dqkba6jm6620y6knqqywya703662spmj2xw";
+    sha256 = "0gbprzsi054f9gr31ihcf0cq7zfkybrmdp6894pmzb5hcv4wnh9i";
   };
 
   buildInputs = [ cmake openssl zlib libuv ];

From 54471fd01e50d8773bc16139987c4c9df27445e8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 13 Mar 2018 00:15:17 -0300
Subject: [PATCH 1072/2266] calibre: 3.17.0 -> 3.19.0

Also adding locally the lost patches
---
 pkgs/applications/misc/calibre/default.nix    | 16 +++--------
 .../misc/calibre/disable_plugins.patch        | 17 ++++++++++++
 .../misc/calibre/no_updates_dialog.patch      | 27 +++++++++++++++++++
 3 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/applications/misc/calibre/disable_plugins.patch
 create mode 100644 pkgs/applications/misc/calibre/no_updates_dialog.patch

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 8924114013c..ae99bb772a6 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,28 +5,20 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.17.0";
+  version = "3.19.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1w6hw1s0d4daa4q2ykzhxdndiq61l8z7ls7rxh7k7p62ia0i5sxp";
+    sha256 = "0sann0aw6ngvmqp7049zg6hyqjrb5myq5ivr4r9x732c1cnjhhw9";
   };
 
   patches = [
     # Patches from Debian that:
     # - disable plugin installation (very insecure)
+    ./disable_plugins.patch
     # - switches the version update from enabled to disabled by default
-    (fetchpatch {
-      name = "disable_plugins.patch";
-      url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py";
-      sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk";
-    })
-    (fetchpatch {
-      name = "no_updates_dialog.patch";
-      url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch";
-      sha256 = "16xwa2fa47jvs954fjrwr8rhh89aljgi1d1wrfxa40sknlmfwxif";
-    })
+    ./no_updates_dialog.patch
     # the unrar patch is not from debian
   ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
diff --git a/pkgs/applications/misc/calibre/disable_plugins.patch b/pkgs/applications/misc/calibre/disable_plugins.patch
new file mode 100644
index 00000000000..9ef1dd04251
--- /dev/null
+++ b/pkgs/applications/misc/calibre/disable_plugins.patch
@@ -0,0 +1,17 @@
+Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
+Author: Martin Pitt <mpitt@debian.org>
+Bug-Debian: http://bugs.debian.org/640026
+
+Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
+===================================================================
+--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py	2011-12-16 05:49:14.000000000 +0100
++++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py	2011-12-20 19:29:04.798468930 +0100
+@@ -28,8 +28,6 @@
+             pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
+         cm('welcome wizard', _('Run welcome wizard'),
+                 icon='wizard.png', triggered=self.gui.run_wizard)
+-        cm('plugin updater', _('Get plugins to enhance calibre'),
+-                icon='plugins/plugin_updater.png', triggered=self.get_plugins)
+         if not DEBUG:
+             pm.addSeparator()
+             cm('restart', _('Restart in debug mode'), icon='debug.png',
diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch
new file mode 100644
index 00000000000..4d37c3b642f
--- /dev/null
+++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch
@@ -0,0 +1,27 @@
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
+--- calibre-2.9.0.orig/src/calibre/gui2/main.py	2014-11-09 20:09:54.081231882 +0800
++++ calibre-2.9.0/src/calibre/gui2/main.py	2014-11-09 20:15:48.193033844 +0800
+@@ -37,8 +37,9 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True,
++            action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
+--- calibre-2.9.0.orig/src/calibre/gui2/update.py	2014-11-09 20:09:54.082231864 +0800
++++ calibre-2.9.0/src/calibre/gui2/update.py	2014-11-09 20:17:49.954767115 +0800
+@@ -154,6 +154,8 @@
+             self.update_checker.signal.update_found.connect(self.update_found,
+                     type=Qt.QueuedConnection)
+             self.update_checker.start()
++        else:
++            self.update_checker = None
+ 
+     def recalc_update_label(self, number_of_plugin_updates):
+         self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)

From 0ea3fc37495124ac3b79dbf71b013ccdc8800d68 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 20:07:54 -0700
Subject: [PATCH 1073/2266] liferea: 1.12.1 -> 1.12.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/liferea -h` got 0 exit code
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/liferea --help` got 0 exit code
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/liferea -v` and found version 1.12.2
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/liferea --version` and found version 1.12.2
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/.liferea-wrapped -h` got 0 exit code
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/.liferea-wrapped --help` got 0 exit code
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/.liferea-wrapped -v` and found version 1.12.2
- ran `/nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2/bin/.liferea-wrapped --version` and found version 1.12.2
- found 1.12.2 with grep in /nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2
- found 1.12.2 in filename of file in /nix/store/wjf8q5k0hh2vcjw65v2skcn54pq3vb0q-liferea-1.12.2
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 965a8ec58dc..0b8a584fc6a 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "liferea";
-  version = "1.12.1";
+  version = "1.12.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq";
+    sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15";
   };
 
   nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];

From 30116ccd2aea50ae433f43cfe8327bf47c918b51 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 20:40:12 -0700
Subject: [PATCH 1074/2266] logrotate: 3.13.0 -> 3.14.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4y9bpdd23v1jpibrqzpnc4y4qipmz06y-logrotate-3.14.0/bin/logrotate --help` got 0 exit code
- found 3.14.0 in filename of file in /nix/store/4y9bpdd23v1jpibrqzpnc4y4qipmz06y-logrotate-3.14.0
---
 pkgs/tools/system/logrotate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index fa5df06dae3..75e25bcc673 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "logrotate-${version}";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
     rev = version;
-    sha256 = "0b7dnch74pddml3ysavizq26jgwdv0rjmwc8lf6zfvn9fjz19vvs";
+    sha256 = "1wdjqbly97y1i11nl6cmlfpld3yqak270ixf29wixjgrjn8p4xzh";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.

From a34479850ec5bf2277b78478914c390e27e18b35 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 14 Mar 2018 21:03:00 -0700
Subject: [PATCH 1075/2266] fix whois build

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 6f37e88f4f6..2b77184f3c9 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     for i in Makefile po/Makefile; do
       substituteInPlace $i --replace "prefix = /usr" "prefix = $out"
     done
-
-    substituteInPlace Makefile --replace "DEFS += HAVE_ICONV" "DEFS += HAVE_ICONV\nwhois_LDADD += -liconv"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    echo "whois_LDADD += -liconv" >> Makefile
   '';
 
   makeFlags = [ "HAVE_ICONV=1" ];
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = https://packages.qa.debian.org/w/whois.html;
     license = licenses.gpl2;
     maintainers = with maintainers; [ fpletz ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 9e0ce6562a4b8a7a37534e3b7f6e3e9da54fe853 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 21:06:53 -0700
Subject: [PATCH 1076/2266] ltl2ba: 1.1 -> 1.2b1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.2b1 in filename of file in /nix/store/jx5s7w6bmd6lfqvxl2lly3ggd4k9ncax-ltl2ba-1.2b1
---
 pkgs/applications/science/logic/ltl2ba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index f0947fa0ed6..f33152a8767 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ltl2ba-${version}";
-  version = "1.1";
+  version = "1.2b1";
 
   src = fetchurl {
     url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
-    sha256 = "16z0gc7a9dkarwn0l6rvg5jdhw1q4qyn4501zlchy0zxqddz0sx6";
+    sha256 = "1f4jnkfkyj8lcc5qfqbiypfc11rhhpqqi6xs9xx5dysg6r6303wm";
   };
 
   hardeningDisable = [ "format" ];

From 7f112e37d16c9cb67ec5fde43d18b377dc78e005 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Wed, 14 Mar 2018 21:00:31 -0700
Subject: [PATCH 1077/2266] wine: correct install order for WoW wine build. Per
 the wiki at https://wiki.winehq.org/Building_Wine#Shared_WoW64

"if you do choose to install your WoW64 build, you should run make
install in the 32-bit build tree first, then in the 64-bit one."

This is required, for instance, for the resulting "wineserver"
executable to be the 64 bit variant not 32 bit. Which is expected by the
binary loader for WoW64.

This odd dependency is vaguely mentioned on the packaging wiki page:

* https://wiki.winehq.org/Packaging#Binaries
---
 pkgs/misc/emulators/wine/builder-wow.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh
index cf6cc59a6da..1aad9fe20c7 100644
--- a/pkgs/misc/emulators/wine/builder-wow.sh
+++ b/pkgs/misc/emulators/wine/builder-wow.sh
@@ -26,7 +26,7 @@ buildPhase
 # checkPhase
 
 eval "$preInstall"
-cd $TMP/wine64 && make install
 cd $TMP/wine-wow && make install
+cd $TMP/wine64 && make install
 eval "$postInstall"
 fixupPhase

From 0bb522652fe68bbb02bb04970c7ffee17bc80c2d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 21:22:55 -0700
Subject: [PATCH 1078/2266] lynis: 2.6.2 -> 2.6.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/lynis -V` and found version 2.6.3
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/lynis --version` and found version 2.6.3
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/.lynis-wrapped -V` and found version 2.6.3
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/.lynis-wrapped --version` and found version 2.6.3
- found 2.6.3 with grep in /nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3
- found 2.6.3 in filename of file in /nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3
---
 pkgs/tools/security/lynis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index cbbb9b4dd3c..e0a11f57418 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.2";
+  version = "2.6.3";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "0jymp44dmc22cdrsd5hfyv9wc8a5sq92yh9p9c0rg22g53733910";
+    sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From c26252af3e8a102e8ac7ab67ae3ceb2c19845cac Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 31 Jan 2018 00:11:03 -0500
Subject: [PATCH 1079/2266] lib, stdenv: Check `meta.platforms` against host
 platform and be open world

First, we need check against the host platform, not the build platform.
That's simple enough.

Second, we move away from exahustive finite case analysis (i.e.
exhaustively listing all platforms the package builds on). That only
work in a closed-world setting, where we know all platforms we might
build one. But with cross compilation, we may be building for arbitrary
platforms, So we need fancier filters. This is the closed world to open
world change.

The solution is instead of having a list of systems (strings in the form
"foo-bar"), we have a list of of systems or "patterns", i.e. attributes
that partially match the output of the parsers in `lib.systems.parse`.
The "check meta" logic treats the systems strings as an exact whitelist
just as before, but treats the patterns as a fuzzy whitelist,
intersecting the actual `hostPlatform` with the pattern and then
checking for equality. (This is done using `matchAttrs`).

The default convenience lists for `meta.platforms` are now changed to be
lists of patterns (usually a single pattern) in
`lib/systems/for-meta.nix` for maximum flexibility under this new
system.

Fixes #30902
---
 lib/default.nix                         |  2 +-
 lib/systems/default.nix                 |  1 +
 lib/systems/doubles.nix                 |  4 ++--
 lib/systems/for-meta.nix                | 27 +++++++++++++++++++++++++
 pkgs/stdenv/generic/check-meta.nix      | 13 ++++++++----
 pkgs/stdenv/generic/make-derivation.nix |  2 +-
 6 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 lib/systems/for-meta.nix

diff --git a/lib/default.nix b/lib/default.nix
index 4c36f3b0d79..b5ccc3b5144 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -47,7 +47,7 @@ let
     filesystem = callLibs ./filesystem.nix;
 
     # back-compat aliases
-    platforms = systems.doubles;
+    platforms = systems.forMeta;
 
     inherit (builtins) add addErrorContext attrNames
       concatLists deepSeq elem elemAt filter genericClosure genList
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index d5a206e620c..bd408e00bb1 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -3,6 +3,7 @@
 
 rec {
   doubles = import ./doubles.nix { inherit lib; };
+  forMeta = import ./for-meta.nix { inherit lib; };
   parse = import ./parse.nix { inherit lib; };
   inspect = import ./inspect.nix { inherit lib; };
   platforms = import ./platforms.nix { inherit lib; };
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 0e1ee62ac95..012a1786a3c 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -30,14 +30,14 @@ in rec {
   aarch64 = filterDoubles predicates.isAarch64;
   x86     = filterDoubles predicates.isx86;
   i686    = filterDoubles predicates.isi686;
-  mips    = filterDoubles predicates.isMips;
   x86_64  = filterDoubles predicates.isx86_64;
+  mips    = filterDoubles predicates.isMips;
 
   cygwin  = filterDoubles predicates.isCygwin;
   darwin  = filterDoubles predicates.isDarwin;
   freebsd = filterDoubles predicates.isFreeBSD;
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
-  gnu     = filterDoubles (matchAttrs { kernel = parse.kernels.linux;  abi = parse.abis.gnu; });
+  gnu     = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
   illumos = filterDoubles predicates.isSunOS;
   linux   = filterDoubles predicates.isLinux;
   netbsd  = filterDoubles predicates.isNetBSD;
diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
new file mode 100644
index 00000000000..0a7a4bf5b0c
--- /dev/null
+++ b/lib/systems/for-meta.nix
@@ -0,0 +1,27 @@
+{ lib }:
+let
+  inherit (lib.systems) parse;
+  inherit (lib.systems.inspect) patterns;
+
+in rec {
+  inherit (lib.systems.doubles) all mesaPlatforms;
+  none = [];
+
+  arm     = [ patterns.Arm ];
+  aarch64 = [ patterns.Aarch64 ];
+  x86     = [ patterns.x86 ];
+  i686    = [ patterns.i686 ];
+  x86_64  = [ patterns.x86_64 ];
+  mips    = [ patterns.Mips ];
+
+  cygwin  = [ patterns.Cygwin ];
+  darwin  = [ patterns.Darwin ];
+  freebsd = [ patterns.FreeBSD ];
+  # Should be better, but MinGW is unclear, and HURD is bit-rotted.
+  gnu     = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
+  illumos = [ patterns.SunOS ];
+  linux   = [ patterns.Linux ];
+  netbsd  = [ patterns.NetBSD ];
+  openbsd = [ patterns.OpenBSD ];
+  unix    = patterns.Unix; # Actually a list
+}
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index ee1e657bdab..444bad84d8d 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -1,7 +1,7 @@
 # Checks derivation meta and attrs for problems (like brokenness,
 # licenses, etc).
 
-{ lib, config, system, meta }:
+{ lib, config, hostPlatform, meta }:
 
 let
   # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
@@ -144,7 +144,7 @@ let
     license = either (listOf lib.types.attrs) (either lib.types.attrs str);
     maintainers = listOf str;
     priority = int;
-    platforms = listOf str;
+    platforms = listOf (either str lib.systems.parsed.types.system);
     hydraPlatforms = listOf str;
     broken = bool;
 
@@ -173,6 +173,11 @@ let
     else "key '${k}' is unrecognized; expected one of: \n\t      [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
   checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
 
+  checkPlatform = attrs: let
+      raw = attrs.meta.platforms;
+      uniform = map (x: if builtins.isString x then { system = x; } else { parsed = x; }) raw;
+    in lib.any (pat: lib.matchAttrs pat hostPlatform) uniform;
+
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.
   #
@@ -186,8 +191,8 @@ let
       { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
     else if !allowBroken && attrs.meta.broken or false then
       { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
-    else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
-      { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; }
+    else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !(checkPlatform attrs) then
+      { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
     else let res = checkMeta (attrs.meta or {}); in if res != [] then
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 18c4beb965b..46df958b839 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -207,7 +207,7 @@ rec {
         inherit lib config meta;
         # Nix itself uses the `system` field of a derivation to decide where
         # to build it. This is a bit confusing for cross compilation.
-        inherit (stdenv) system;
+        inherit (stdenv) hostPlatform;
       } attrs;
 
       # The meta attribute is passed in the resulting attribute set,

From eae19f3c28503a8623b0fee10bfb0b3322122637 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 31 Jan 2018 16:36:52 -0500
Subject: [PATCH 1080/2266] release-lib: Adapt to work with new meta.platforms

`packagePlatforms` now filters `supportedSystems` with the new-style
`meta.platforms`, rather than just plopping it in as is.
---
 pkgs/top-level/release-lib.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 3e842f8b556..e377ca30f3a 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -98,7 +98,18 @@ rec {
   packagePlatforms = mapAttrs (name: value:
     let res = builtins.tryEval (
       if isDerivation value then
-        value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ])
+        # TODO(@Ericson2314) deduplicate with `checkPlatform` in
+        # `pkgs/stdenv/generic/check-meta.nix`.
+        value.meta.hydraPlatforms or (let
+            raw = value.meta.platforms or [ "x86_64-linux" ];
+            toPattern = x: if builtins.isString x
+                           then { system = x; }
+                           else { parsed = x; };
+            uniform = map toPattern raw;
+            pred = hostPlatform:
+              lib.any (pat: lib.matchAttrs pat hostPlatform) uniform;
+            pred' = system: pred (lib.systems.elaborate { inherit system; });
+         in lib.filter pred' supportedSystems)
       else if value.recurseForDerivations or false || value.recurseForRelease or false then
         packagePlatforms value
       else

From 8bbd48e40f3b5d06b6c93de6ab795d2554717fd3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 04:49:34 +0000
Subject: [PATCH 1081/2266] nixos: fix install-grub.pl dependencies

fallback from updates to perl
---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0d83391de89..1590708dab1 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -538,7 +538,7 @@ in
         in pkgs.writeScript "install-grub.sh" (''
         #!${pkgs.stdenv.shell}
         set -e
-        export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
+        export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ])}
         ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
       '' + flip concatMapStrings cfg.mirroredBoots (args: ''
         ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@

From e6c63e9fc7abda96d657618ffc159fe317786f20 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Thu, 1 Mar 2018 00:00:00 +0000
Subject: [PATCH 1082/2266] flite: 2.0 -> 2.1, switch to fetchFromGitHub,
 enable ALSA

---
 pkgs/development/libraries/flite/default.nix  | 19 ++++++++++++-------
 .../libraries/flite/fix-rpath.patch           |  5 -----
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/flite/fix-rpath.patch

diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 31dad5e255a..0b4172cdc76 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "flite-2.0.0";
+  name = "flite-2.1.0";
 
-  src = fetchurl {
-    url = "http://www.festvox.org/flite/packed/flite-2.0/${name}-release.tar.bz2";
-    sha256 = "04g4r83jh4cl0irc8bg7njngcah7749956v9s6sh552kzmh3i337";
+  src = fetchFromGitHub {
+    owner  = "festvox";
+    repo   = "flite";
+    rev    = "d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e";
+    sha256 = "1kx43jvdln370590gfjhxxz3chxfi6kq18504wmdpljib2l0grjq";
   };
 
-  patches = [ ./fix-rpath.patch ];
+  buildInputs = [ alsaLib ];
 
-  configureFlags = [ "--enable-shared" ];
+  configureFlags = [
+    "--enable-shared"
+    "--with-audio=alsa"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/flite/fix-rpath.patch b/pkgs/development/libraries/flite/fix-rpath.patch
deleted file mode 100644
index be774147c3f..00000000000
--- a/pkgs/development/libraries/flite/fix-rpath.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -81 +80,1 @@ ifdef SHFLAGS
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
-+flite_LIBS_flags += -Wl,-rpath,$(INSTALLLIBDIR) 

From 507d96d35e091f4b5ce751b8f2aedc479e44cf24 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Thu, 1 Mar 2018 00:00:00 +0000
Subject: [PATCH 1083/2266] speech-tools: 2.1 -> 2.4, unbreak

---
 pkgs/development/libraries/speech-tools/default.nix | 11 ++++-------
 pkgs/top-level/all-packages.nix                     |  3 ++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index fba35421355..9113a1efb15 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "speech_tools-${version}";
-  version = "2.1";
+  version = "2.4";
 
   src = fetchurl {
     url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz";
-    sha256 = "1s9bkfgdgyas8v2cr7x3dg0ck1xf9mn1q6a73gwy524sjb6nfqgz";
+    sha256 = "043h4fxfiiqxgwvyyyasylypjkpfzajxd6g5s9wsl69r8hn4ihpv";
   };
 
   buildInputs = [ alsaLib ncurses ];
@@ -27,15 +27,12 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    broken = true;
     description = "Text-to-speech engine";
-    maintainers = with maintainers;
-    [
-      raskin
-    ];
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.free;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://www.festvox.org/packed/festival/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e501b1d9206..cd14c1890b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11400,7 +11400,8 @@ with pkgs;
 
   speechd = callPackage ../development/libraries/speechd { };
 
-  speech_tools = callPackage ../development/libraries/speech-tools {};
+  speech-tools = callPackage ../development/libraries/speech-tools {};
+  speech_tools = speech-tools;
 
   speex = callPackage ../development/libraries/speex {
     fftw = fftwFloat;

From 77864f7346bbf105eed29d59fd3c1e3c00e8a4a3 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Thu, 1 Mar 2018 00:00:00 +0000
Subject: [PATCH 1084/2266] eflite: cleanup expression, switch to fetchpatching
 from debian

---
 .../audio/eflite/buf-overflow.patch           | 22 -----
 .../audio/eflite/cvs-update.patch             | 98 -------------------
 pkgs/applications/audio/eflite/default.nix    | 31 ++++--
 pkgs/applications/audio/eflite/link.patch     | 11 ---
 4 files changed, 25 insertions(+), 137 deletions(-)
 delete mode 100644 pkgs/applications/audio/eflite/buf-overflow.patch
 delete mode 100644 pkgs/applications/audio/eflite/cvs-update.patch
 delete mode 100644 pkgs/applications/audio/eflite/link.patch

diff --git a/pkgs/applications/audio/eflite/buf-overflow.patch b/pkgs/applications/audio/eflite/buf-overflow.patch
deleted file mode 100644
index 8873aa77b0e..00000000000
--- a/pkgs/applications/audio/eflite/buf-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix buffer overflow
-
---- eflite-0.4.1.orig/es.c
-+++ eflite-0.4.1/es.c
-@@ -329,7 +329,7 @@
-   char *p;
- 
-   p = getenv("HOME");
--  sprintf(buf, "%s/.es.conf", p);
-+  snprintf(buf, sizeof(buf), "%s/.es.conf", p);
-   fp = fopen(buf, "r");
-   if (!fp) fp = fopen("/etc/es.conf", "r");
-   if (!fp) return 1;
-@@ -438,7 +438,7 @@
-   char logname[200];
- 
-   if ((flags & 0xffff) > DEBUG) return;
--  sprintf(logname, "%s/es.log", getenv("HOME"));
-+  snprintf(logname, sizeof(logname), "%s/es.log", getenv("HOME"));
-   va_start(arg, text);
-   vsnprintf(buf, 200, text, arg);
-   va_end(arg);
diff --git a/pkgs/applications/audio/eflite/cvs-update.patch b/pkgs/applications/audio/eflite/cvs-update.patch
deleted file mode 100644
index 1ceace83aa5..00000000000
--- a/pkgs/applications/audio/eflite/cvs-update.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- eflite-0.4.1.orig/fs.c
-+++ eflite-0.4.1/fs.c
-@@ -9,7 +9,7 @@
-  * GNU General Public License, as published by the Free Software
-  * Foundation.  Please see the file COPYING for details.
-  *
-- * $Id: fs.c,v 1.19 2007/01/18 23:58:42 mgorse Exp $
-+ * $Id: fs.c,v 1.22 2008/03/05 15:21:43 mgorse Exp $
-  *
-  * Notes:
-  *
-@@ -505,19 +505,6 @@
-   }
- }
- 
--
--
--static void play_audio_close(void *cancel)
--{
--  if (audiodev)
--  {
--	audio_drain(audiodev);
--	close_audiodev();
--	//	usleep(5000);
--  }
--}
--
--
- static inline void determine_playlen(int speed, cst_wave *wptr, int type, int *pl, int *s)
- {
-   int playlen, skip;
-@@ -573,12 +560,12 @@
- 	type = ac[ac_head].type;
- 	WAVE_UNLOCK;
- 	pthread_testcancel();
--	pthread_cleanup_push(play_audio_close, NULL);
--
-+	
- 	es_log(2, "Opening audio device.");
- 	/* We abuse the wave mutex here to avoid being canceled
- 	 * while the audio device is being openned */
- 	WAVE_LOCK;
-+	assert(audiodev == NULL);
- 	audiodev = audio_open(wptr->sample_rate, wptr->num_channels, CST_AUDIO_LINEAR16);
- 	WAVE_UNLOCK;
- 	if (audiodev == NULL)
-@@ -606,8 +593,8 @@
- #ifdef DEBUG
- 	  start_time = get_ticks_count();
- #endif
--	  pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-       audio_write(audiodev, wptr->samples + skip, playlen * 2);
-+      pthread_testcancel();
- 	  es_log(2, "Write took %.2f seconds.", get_ticks_count() - start_time);
- 	}
-     es_log(2, "play: syncing.");
-@@ -617,16 +604,16 @@
-     audio_flush(audiodev);
- 	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
- 	es_log(2, "Flush took %.2f seconds.", get_ticks_count() - start_time);
--    es_log(2, "play: Closing audio device");
--	close_audiodev();
--	pthread_cleanup_pop(0);
--	  pthread_testcancel();
--	  TEXT_LOCK;
-+    	pthread_testcancel();
-+
-+	TEXT_LOCK;
-     time_left -= ((float)playlen) / wptr->sample_rate;
- 	pthread_cond_signal(&text_condition);
- 	TEXT_UNLOCK;
- 
- 	WAVE_LOCK;
-+	es_log(2, "play: Closing audio device");
-+	close_audiodev();
-     ac_destroy(&ac[ac_head]);
- 	ac_head++;
- 	if (ac_head == ac_tail)
-@@ -894,6 +881,7 @@
- 	WAVE_LOCK_NI;
- 	pthread_cond_signal(&wave_condition); // necessary because we inhibit cancellation while waiting
- 	pthread_cancel(wave_thread);
-+	if (audiodev != NULL) audio_drain(audiodev);
- 	WAVE_UNLOCK_NI;
-   }
- 
-@@ -917,7 +905,10 @@
-   }
- 	
-   /* At this point, no thread is running */
--  
-+
-+  // Make sure audio device is closed
-+  close_audiodev();
-+
-   /* Free any wave data */
-   es_log(2, "s_clear: freeing wave data: %d", ac_tail);
-   for (i = 0; i < ac_tail; i++)
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 36fbdbc2cc9..4138a07ec06 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,21 +1,40 @@
-{stdenv,fetchurl,flite,alsaLib,debug ? false}:
+{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
 
 stdenv.mkDerivation rec {
   name = "eflite-${version}";
   version = "0.4.1";
+
   src = fetchurl {
     url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
     sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
   };
+
   buildInputs = [ flite alsaLib ];
-  configureFlags = "flite_dir=${flite} --with-audio=alsa --with-vox=cmu_us_kal16";
+
+  configureFlags = [
+    "flite_dir=${flite}"
+    "--with-audio=alsa"
+    "--with-vox=cmu_us_kal16"
+  ];
+
   patches = [
-    ./buf-overflow.patch
-    ./cvs-update.patch
-    ./link.patch
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update";
+      sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow";
+      sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link";
+      sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc";
+    })
     ./format.patch
-  ]; # Patches are taken from debian.
+  ];
+
   CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2";
+
   meta = {
     homepage = http://eflite.sourceforge.net;
     description = "EFlite is a speech server for screen readers";
diff --git a/pkgs/applications/audio/eflite/link.patch b/pkgs/applications/audio/eflite/link.patch
deleted file mode 100644
index 73c69da965c..00000000000
--- a/pkgs/applications/audio/eflite/link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eflite-0.4.1/Makefile.in	2007-01-19 01:01:09.000000000 +0100
-+++ eflite-0.4.1-new/Makefile.in	2017-03-01 23:25:34.223615492 +0100
-@@ -34,7 +34,7 @@
- 	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
- 
- fs.o: fs.c
--	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
-+	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
- 
- tone.o: tone.c
- 	$(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<

From 30ddce684fde4bb8d3ad1d6a14db6617c1b771f1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 22:21:11 -0700
Subject: [PATCH 1085/2266] opendht: 1.5.0 -> 1.6.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0/bin/dhtnode -h` got 0 exit code
- ran `/nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0/bin/dhtnode --help` got 0 exit code
- ran `/nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0/bin/dhtchat -h` got 0 exit code
- ran `/nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0/bin/dhtchat --help` got 0 exit code
- ran `/nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0/bin/dhtscanner -h` got 0 exit code
- ran `/nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0/bin/dhtscanner --help` got 0 exit code
- found 1.6.0 with grep in /nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0
- found 1.6.0 in filename of file in /nix/store/pr77bpwm850hdynaky1yddn1czy2rwx7-opendht-1.6.0
---
 pkgs/development/libraries/opendht/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 528c19aea5b..46a8ebffbb8 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   name = "opendht-${version}";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = "${version}";
-    sha256 = "0zkxvs3vdlc4yzhfi2jh02bsnhh50fbfigqhnkmbx69lssnkyr05";
+    sha256 = "0ybv41nbh86ricxfv478z4izbxvnvk86csr29c6qf4dinmrysf96";
   };
 
   buildInputs = [

From ea5b22532472e4ec6a6730587783ba4aea86b361 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 22:40:26 -0700
Subject: [PATCH 1086/2266] latte-dock: 0.7.3 -> 0.7.4 (#37030)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.4 with grep in /nix/store/n1ad51hdp3jagm7fx91gp3i580ghid4q-latte-dock-0.7.4
- found 0.7.4 in filename of file in /nix/store/n1ad51hdp3jagm7fx91gp3i580ghid4q-latte-dock-0.7.4
---
 pkgs/applications/misc/latte-dock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 5c21b404f34..1867ec3a9c6 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
 , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }:
 
-let version = "0.7.3"; in
+let version = "0.7.4"; in
 
 mkDerivation {
   name = "latte-dock-${version}";
@@ -10,7 +10,7 @@ mkDerivation {
     owner = "psifidotos";
     repo = "Latte-Dock";
     rev = "v${version}";
-    sha256 = "110bal0dairsvgj624n5k0zabh2qfy9dk560a4wy7icxv0cjh7hg";
+    sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6";
   };
 
   buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];

From ce8649053099a47e033d7811fde9ee3abfedd9ef Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 15 Mar 2018 01:11:10 -0500
Subject: [PATCH 1087/2266] speech-tools: 2.4 -> 2.5.0

---
 pkgs/development/libraries/speech-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 9113a1efb15..11f8ee46969 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gawk, alsaLib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "speech_tools-${version}";
-  version = "2.4";
+  name = "speech_tools-${version}.0";
+  version = "2.5";
 
   src = fetchurl {
     url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz";
-    sha256 = "043h4fxfiiqxgwvyyyasylypjkpfzajxd6g5s9wsl69r8hn4ihpv";
+    sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4";
   };
 
   buildInputs = [ alsaLib ncurses ];

From 92bd681de18ef4f1998bd357183bc499749289c7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 15 Mar 2018 01:23:22 -0500
Subject: [PATCH 1088/2266] speech-tools: is __isnanf, use portable isnan (c99)

---
 pkgs/development/libraries/speech-tools/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 11f8ee46969..8e5ee80b0bf 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
     sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . )
+
+    # c99 makes isnan valid for float and double
+    substituteInPlace include/EST_math.h \
+      --replace '__isnanf(X)' 'isnan(X)'
   '';
 
   installPhase = ''

From 3d509de00b5de65ee75e7c2427fd00b329389493 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 15 Mar 2018 14:24:53 +0800
Subject: [PATCH 1089/2266] terraform: multiple provider updates

---
 .../cluster/terraform/providers/data.nix      | 95 ++++++++++---------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index af359ed1a4d..ce5e9ac048e 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -4,15 +4,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.5.0";
-      sha256  = "14wrp6szg9mh8bxqqjbx0i654lciw09wghm8h3c6x79ayxan5n8x";
+      version = "1.8.1";
+      sha256  = "127070zsy536pdvjpcj0028iwwrcm4s5gbhvhzxb70fhjvi9sj6v";
     };
   archive =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-archive";
-      version = "1.0.0";
-      sha256  = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn";
+      version = "1.0.1";
+      sha256  = "1qxw9c38hsdmxyrrnl7s9iwlzjrwzml2m74bs4iw120gljpqphqz";
     };
   arukas =
     {
@@ -32,8 +32,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.6.0";
-      sha256  = "0x4lrpq00z5ww8awym7p6kwrf17ghai36zj8hr10n4qraf8a9ma6";
+      version = "1.11.0";
+      sha256  = "14r54772qi6c73l50f6gp4j08rd03c2h4v1fwcydfc6kyf23f8k6";
     };
   azure-classic =
     {
@@ -46,8 +46,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.0.0";
-      sha256  = "0grpc7apfn03slkkily8agl8pv6mc0j58ch8fa6jgqcqy6dbd0kh";
+      version = "1.2.0";
+      sha256  = "10j7lk3rrlix04pcnnz25h0bm336nnmf3c2a1760v272sjdph51z";
     };
   bitbucket =
     {
@@ -102,8 +102,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cobbler";
-      version = "1.0.0";
-      sha256  = "0v7j9r2ic3ks2hy80mx5xay05m6r52vclsbbbf9vb0srnrvz21gy";
+      version = "1.0.1";
+      sha256  = "1z0iijfrbbdrgszvc7jlcr4105zragbc0iq8x48vi24yipqgf5a8";
     };
   consul =
     {
@@ -172,15 +172,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-fastly";
-      version = "0.1.3";
-      sha256  = "0q331j91c1kns01yhvbxrq0vf21653ch6fvkzlx61337az7jhky8";
+      version = "0.1.4";
+      sha256  = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k";
     };
   github =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-github";
-      version = "0.1.1";
-      sha256  = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0";
+      version = "1.0.0";
+      sha256  = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb";
     };
   gitlab =
     {
@@ -193,15 +193,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.4.0";
-      sha256  = "0nlm02ibp2w4m38pvmw6r29807863h23y8k00ywmkcr7yiy1zilr";
+      version = "1.7.0";
+      sha256  = "1q38z3gihsbxlra1vzgsg1ss8q24f5vkj6k8pvvqjb2rzqpkk5cm";
     };
   grafana =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-grafana";
-      version = "1.0.0";
-      sha256  = "0fsdin1rd7hah6pp3x568db2mmk66q0fhiplsri7vyj03n3z55v2";
+      version = "1.0.1";
+      sha256  = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns";
     };
   heroku =
     {
@@ -235,8 +235,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-influxdb";
-      version = "0.1.0";
-      sha256  = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
+      version = "1.0.0";
+      sha256  = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9";
     };
   kubernetes =
     {
@@ -291,8 +291,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-newrelic";
-      version = "0.1.1";
-      sha256  = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051";
+      version = "1.0.0";
+      sha256  = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62";
     };
   nomad =
     {
@@ -305,8 +305,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ns1";
-      version = "0.1.0";
-      sha256  = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj";
+      version = "1.0.0";
+      sha256  = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5";
     };
   null =
     {
@@ -326,15 +326,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opc";
-      version = "1.0.1";
-      sha256  = "0r8xczb1vy1h6ka97x7x025d030m7d01r52bbmf2z9sh81hhsa1x";
+      version = "1.1.0";
+      sha256  = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr";
     };
   openstack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-openstack";
-      version = "1.1.0";
-      sha256  = "1w747qbk24b18v6x7l4n08pxnwak395fq1grajpxf3qw6afchjdj";
+      version = "1.3.0";
+      sha256  = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx";
     };
   opentelekomcloud =
     {
@@ -361,22 +361,29 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-packet";
-      version = "1.1.0";
-      sha256  = "0848y78jri1kzd70xcgv0p62yww46d0kr9zpqwh32m866xx5isfi";
+      version = "1.2.0";
+      sha256  = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4";
     };
   pagerduty =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "0.1.2";
-      sha256  = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
+      version = "1.0.0";
+      sha256  = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa";
+    };
+  panos =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-panos";
+      version = "1.0.0";
+      sha256  = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76";
     };
   postgresql =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-postgresql";
-      version = "0.1.0";
-      sha256  = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
+      version = "0.1.1";
+      sha256  = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn";
     };
   powerdns =
     {
@@ -389,8 +396,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-profitbricks";
-      version = "1.0.1";
-      sha256  = "02blr487pbp7myw2l6nib9g1a8vplk9khakxaj9wbg779vp8wvcg";
+      version = "1.1.1";
+      sha256  = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m";
     };
   rabbitmq =
     {
@@ -424,8 +431,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.0.0";
-      sha256  = "0zp9hhvlcn6cpnblwrr03icbagzk745b0lrm5bs23crbnddal905";
+      version = "1.1.0";
+      sha256  = "10ghzwss3n95yln7brzwghkc0gv7bkmyml7zlj7hfbkjr3382m1p";
     };
   softlayer =
     {
@@ -466,15 +473,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tls";
-      version = "1.0.1";
-      sha256  = "0mzm1pkqgcslz3j4an1vpx92hnqa53ly0kp3zix8kp2kfnn17qky";
+      version = "1.1.0";
+      sha256  = "1kzq6al9rzpmk98bmxcf5gjx5s28gfjp1xvdsnd4a113pljn0ddb";
     };
   triton =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-triton";
-      version = "0.4.1";
-      sha256  = "09zljia422afm565d3qm57j5y1n12h52bgyqz6s1s8dmcdygd75g";
+      version = "0.4.2";
+      sha256  = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml";
     };
   ultradns =
     {
@@ -501,7 +508,7 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      version = "1.1.1";
-      sha256  = "1y209bwkk79ycxjl3b6c20n0z2g5d6njna85w68a0w6npk88zva9";
+      version = "1.3.3";
+      sha256  = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7";
     };
 }

From e6ff717b569a4690e8088c86d975aee558e35c6a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 15 Mar 2018 01:23:54 -0500
Subject: [PATCH 1090/2266] speech-tools: run tests

---
 pkgs/development/libraries/speech-tools/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 8e5ee80b0bf..22d66b7e71d 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  doCheck = true;
+
+  checkTarget = "test";
+
   meta = with stdenv.lib; {
     description = "Text-to-speech engine";
     maintainers = with maintainers; [ raskin ];

From b661ecb930269ab8f67ab800b65b4ff1438ed2b2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 00:45:17 -0700
Subject: [PATCH 1091/2266] pgbouncer: 1.7.2 -> 1.8.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/29ywgqx9kl3bv67b4r19yydrvwj29ssb-pgbouncer-1.8.1/bin/pgbouncer -h` got 0 exit code
- ran `/nix/store/29ywgqx9kl3bv67b4r19yydrvwj29ssb-pgbouncer-1.8.1/bin/pgbouncer --help` got 0 exit code
- ran `/nix/store/29ywgqx9kl3bv67b4r19yydrvwj29ssb-pgbouncer-1.8.1/bin/pgbouncer -V` and found version 1.8.1
- ran `/nix/store/29ywgqx9kl3bv67b4r19yydrvwj29ssb-pgbouncer-1.8.1/bin/pgbouncer --version` and found version 1.8.1
- found 1.8.1 with grep in /nix/store/29ywgqx9kl3bv67b4r19yydrvwj29ssb-pgbouncer-1.8.1
- found 1.8.1 in filename of file in /nix/store/29ywgqx9kl3bv67b4r19yydrvwj29ssb-pgbouncer-1.8.1
---
 pkgs/servers/sql/pgbouncer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index 0f7f91b008d..7906546ec1c 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgbouncer-${version}";
-  version = "1.7.2";
+  version = "1.8.1";
 
   src = fetchurl {
     url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
-    sha256 = "de36b318fe4a2f20a5f60d1c5ea62c1ca331f6813d2c484866ecb59265a160ba";
+    sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs";
   };
 
   buildInputs = [ libevent openssl ];

From 07d69bb59189c47ed0ab80ec4c13ca2a0f435861 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 01:00:41 -0700
Subject: [PATCH 1092/2266] pgroonga: 2.0.2 -> 2.0.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.3 with grep in /nix/store/dqrb6v4lfppacrl4x3q7jhdfw344k733-pgroonga-2.0.3
- found 2.0.3 in filename of file in /nix/store/dqrb6v4lfppacrl4x3q7jhdfw344k733-pgroonga-2.0.3
---
 pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index 1e995537c88..24f0610cba3 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "0023747i2x3j50z54l78maq7dya5ldd2sdydn6l5l7k6b6g4yr2d";
+    sha256 = "0jlaxkj33dgr2hgh0f861ja1z53kqw0g1syinl2sacsna2i9pdxy";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 892244dda0da07d8d1e7c63697eed1757fd438de Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 01:16:28 -0700
Subject: [PATCH 1093/2266] picard-tools: 2.17.10 -> 2.17.11

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.17.11 with grep in /nix/store/xmlvcz212yl8bij12jpqibhv8c8mqabs-picard-tools-2.17.11
- found 2.17.11 in filename of file in /nix/store/xmlvcz212yl8bij12jpqibhv8c8mqabs-picard-tools-2.17.11
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index a065fdf4489..ddcfbf00bf9 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.17.10";
+  version = "2.17.11";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0lf9appcs66mxmirzbys09xhq38kpa4ldxwwzrr9y2cklnxjn4hg";
+    sha256 = "1p50bzkwq5hrwal6i679yrkdqkh5hk4bb9l9gdff2x2i761v9y9b";
   };
 
   buildInputs = [ jre makeWrapper ];

From 7b1f515b89f4a0e80e992c1337e502f4e75f351e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 01:33:47 -0700
Subject: [PATCH 1094/2266] pmd: 6.0.1 -> 6.1.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.1.0 with grep in /nix/store/qh8xnf46qfyijvskdznwl08r6js4wg7y-pmd-6.1.0
- found 6.1.0 in filename of file in /nix/store/qh8xnf46qfyijvskdznwl08r6js4wg7y-pmd-6.1.0
---
 pkgs/development/tools/analysis/pmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index cdf59cd867c..a8d4c517a90 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.0.1";
+  version = "6.1.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "13wmmy345p8bzvxdb8ldpkv85m3m8x9qs5f0jjhn0gkn65a988iq";
+    sha256 = "1d2hbsnyvwvawhfh832yy3w93kr4whrk99zpg4q5ws2b2hhdvzv8";
   };
 
   installPhase = ''

From 051807b704605d2a4cd79d6cf497c58a6f90d7fa Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 01:53:41 -0700
Subject: [PATCH 1095/2266] poco: 1.8.1 -> 1.9.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0/bin/cpspc -h` got 0 exit code
- ran `/nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0/bin/cpspc --help` got 0 exit code
- ran `/nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0/bin/cpspc help` got 0 exit code
- ran `/nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0/bin/f2cpsp -h` got 0 exit code
- ran `/nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0/bin/f2cpsp --help` got 0 exit code
- ran `/nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0/bin/f2cpsp help` got 0 exit code
- found 1.9.0 with grep in /nix/store/n66s6hq39pqk83sn77pz2ff02m642hzs-poco-1.9.0
---
 pkgs/development/libraries/poco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index ae232cd531f..d44bc78a533 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "poco-${version}";
 
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
-    sha256 = "1pg48kk0354vsc6j2wnrk893l5xcsr3bjmkgykd3harcnvfqs7l8";
+    sha256 = "11z1i0drbacs7c7d5virc3kz7wh79svd06iffh8j6giikl7vz1q3";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 511b7c0dcb7ac41567395333d43d775ff823a647 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 02:09:41 -0700
Subject: [PATCH 1096/2266] profile-cleaner: 2.36 -> 2.37

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner -h` got 0 exit code
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner --help` got 0 exit code
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner help` got 0 exit code
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner -V` and found version 2.37
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner -v` and found version 2.37
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner --version` and found version 2.37
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner version` and found version 2.37
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner -h` and found version 2.37
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner --help` and found version 2.37
- ran `/nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37/bin/profile-cleaner help` and found version 2.37
- found 2.37 with grep in /nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37
- found 2.37 in filename of file in /nix/store/b8vjlszy2ksb98qnmyyc49p2yhinvcr1-profile-cleaner-2.37
---
 pkgs/tools/misc/profile-cleaner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 0417c8ed0b7..2a34224c126 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
 
 stdenv.mkDerivation rec {
-  version = "2.36";
+  version = "2.37";
   name = "profile-cleaner-${version}";
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-cleaner";
     rev = "v${version}";
-    sha256 = "0vm4ca99dyr6i0sfjsr0w06i0rbmqf40kp37h04bk4c8yassq1zq";
+    sha256 = "1fbsn2xvcjkqhhkhidn04iwc0zha68cpkyc9vs5yly38qr1q238a";
   };
 
   buildInputs = [ makeWrapper ];

From 7c680e1f3940e296969a9c8a87dfbe8781c6a83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 Mar 2018 09:13:08 +0000
Subject: [PATCH 1097/2266] flexget: add disclaimer

---
 pkgs/applications/networking/flexget/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index b828a49c064..9a71f8911c2 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -4,6 +4,11 @@
 
 assert delugeSupport -> deluge != null;
 
+# Flexget have been a trouble maker in the past,
+# if you see flexget breaking when updating packages, don't worry.
+# The current state is that we have no active maintainers for this package.
+# -- Mic92
+
 let
   python' = python.override { inherit packageOverrides; };
 
@@ -62,6 +67,6 @@ buildPythonApplication rec {
     homepage    = https://flexget.com/;
     description = "Multipurpose automation tool for content like torrents";
     license     = licenses.mit;
-    maintainers = with maintainers; [ domenkozar tari ];
+    maintainers = with maintainers; [ ];
   };
 }

From c7e1dff94e1f1c60d6d3b01a41f3fda874bbcf9a Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-devel@meterriblecrew.net>
Date: Thu, 15 Mar 2018 10:14:10 +0100
Subject: [PATCH 1098/2266] nixos/window-managers: actually add evilwm to
 default.nix

Commit 1f2b938 introduced a module for evilwm as a window-manager, but
did not actually add this module to window-manager's default.nix which
renders it useless.
---
 nixos/modules/services/x11/window-managers/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 25ba95fccd7..bc420831ad8 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -12,6 +12,7 @@ in
     ./afterstep.nix
     ./bspwm.nix
     ./dwm.nix
+    ./evilwm.nix
     ./exwm.nix
     ./fluxbox.nix
     ./fvwm.nix

From 52a0fd0dd68ab3d9da3f677012a016c5a866db0d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 02:41:10 -0700
Subject: [PATCH 1099/2266] pshs: 0.3.2 -> 0.3.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs -h` got 0 exit code
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs --help` got 0 exit code
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs -V` and found version 0.3.3
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs -v` and found version 0.3.3
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs --version` and found version 0.3.3
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs -h` and found version 0.3.3
- ran `/nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3/bin/pshs --help` and found version 0.3.3
- found 0.3.3 with grep in /nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3
- found 0.3.3 in filename of file in /nix/store/gvhbbqnlgy8y79fcvprkwdmn0dlihjm5-pshs-0.3.3
---
 pkgs/servers/http/pshs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index c244b3a1000..a0a1addeeeb 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pshs-${version}";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "mgorny";
     repo = "pshs";
     rev = "v${version}";
-    sha256 = "1ffdyv5qiqdg3jq8y91fsml046g88d7fyy2k81yii11jw3yx2js0";
+    sha256 = "04l03myh99npl78y8nss053gnc7k8q60vdbdpml19sshmwaw3fgi";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 5ace59df0ea89d4d89c4f01b8faf23a28f70afea Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 03:21:04 -0700
Subject: [PATCH 1100/2266] qt5ct: 0.34 -> 0.35

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.35 with grep in /nix/store/09w800gzw7r649858m96yq9vi4c7ap46-qt5ct-0.35
- found 0.35 in filename of file in /nix/store/09w800gzw7r649858m96yq9vi4c7ap46-qt5ct-0.35
---
 pkgs/tools/misc/qt5ct/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index e8170edb7f2..c6fdf0a5120 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
-  version = "0.34";
+  version = "0.35";
 
   src = fetchurl {
     url = "mirror://sourceforge/qt5ct/${name}.tar.bz2";
-    sha256 = "0aqbilz7acx077zg5rwf2909xabw16047yjdn9nx2gmhp31y00pl";
+    sha256 = "0xzgd12cvm4vyzl8qax6izdmaf46bf18h055z6k178s8pybm1sqw";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From c37e663ed7ea777d9c9dd8cfc8c31e13623724c5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 03:38:06 -0700
Subject: [PATCH 1101/2266] redir: 3.1 -> 3.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/1d9lg45iqc404f728bdcdr3s3sq9c8wf-redir-3.2/bin/redir -h` got 0 exit code
- ran `/nix/store/1d9lg45iqc404f728bdcdr3s3sq9c8wf-redir-3.2/bin/redir --help` got 0 exit code
- ran `/nix/store/1d9lg45iqc404f728bdcdr3s3sq9c8wf-redir-3.2/bin/redir -v` and found version 3.2
- ran `/nix/store/1d9lg45iqc404f728bdcdr3s3sq9c8wf-redir-3.2/bin/redir --version` and found version 3.2
- found 3.2 with grep in /nix/store/1d9lg45iqc404f728bdcdr3s3sq9c8wf-redir-3.2
- found 3.2 in filename of file in /nix/store/1d9lg45iqc404f728bdcdr3s3sq9c8wf-redir-3.2
---
 pkgs/tools/networking/redir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index a257cb713db..350d31c19da 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "redir-${version}";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "redir";
     rev = "v${version}";
-    sha256 = "1m05dchi15bzz9zfdb7jg59624sx4khp5zq0wf4pzr31s64f69cx";
+    sha256 = "015vxpy6n7xflkq0lgls4f4vw7ynvv2635bwykzglin3v5ssrm2k";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From f2032af769b59bdd7dae9302e7db4a452af96193 Mon Sep 17 00:00:00 2001
From: Max Zerzouri <maxdamantus@gmail.com>
Date: Thu, 15 Mar 2018 19:58:30 +1300
Subject: [PATCH 1102/2266] duktape: fix installation of shared libraries

Now using `make install` to ensure the non-versioned and major-versioned
library symlinks are created.
---
 pkgs/development/interpreters/duktape/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index c54a9d204cb..3cdc89fb3fd 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     install -d $out/bin
     install -m755 duk $out/bin/
     install -d $out/lib
-    install -m755 libduktape* $out/lib/
+    install -d $out/include
+    make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
   '';
   enableParallelBuilding = true;
 

From cff69fdd50173f018c586abb59a15d7bb42b9b41 Mon Sep 17 00:00:00 2001
From: Max Zerzouri <maxdamantus@gmail.com>
Date: Thu, 15 Mar 2018 20:08:24 +1300
Subject: [PATCH 1103/2266] edbrowse: 3.6.1 -> 3.7.2

Unmarked as broken, as the newer version uses duktape rather than an
incompatible version of spidermonkey.
---
 pkgs/applications/editors/edbrowse/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index e5e64a32e97..9ca64678cb9 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchurl, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
 
 stdenv.mkDerivation rec {
   name = "edbrowse-${version}";
-  version = "3.6.1";
+  version = "3.7.2";
 
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ];
+  buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
 
   patchPhase = ''
-    substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
     for i in ./tools/*.pl
     do
       substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
     done
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31";
   makeFlags = "-C src prefix=$(out)";
 
   src = fetchurl {
-    url = "http://edbrowse.org/${name}.zip";
-    sha256 = "1grkn09r31nmvcnm76jkd8aclmd9n5141mpqvb86wndp9pa7gz7q";
+    name = "${name}.tar.gz";
+    url = "https://github.com/CMB/edbrowse/archive/v${version}.tar.gz";
+    sha256 = "1g9cwk4wszahk2m8k34i3rx44yhqfnv67zls0lk5g7jhrhpbf433";
   };
   meta = with stdenv.lib; {
     description = "Command Line Editor Browser";
@@ -35,6 +33,5 @@ stdenv.mkDerivation rec {
     homepage = http://edbrowse.org/;
     maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
     platforms = platforms.linux;
-    broken = true;  # no compatible spidermonkey
   };
 }

From 595e412e04e5d11c0e15a990f068b36c2c1dd3f3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 04:56:44 -0700
Subject: [PATCH 1104/2266] rocksndiamonds: 4.0.1.1 -> 4.0.1.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9xclaqwjhfkghjb7yhkzl0w3gc5l83zg-rocksndiamonds-4.0.1.3/bin/rocksndiamonds -h` got 0 exit code
- ran `/nix/store/9xclaqwjhfkghjb7yhkzl0w3gc5l83zg-rocksndiamonds-4.0.1.3/bin/rocksndiamonds --help` got 0 exit code
- ran `/nix/store/9xclaqwjhfkghjb7yhkzl0w3gc5l83zg-rocksndiamonds-4.0.1.3/bin/rocksndiamonds -V` and found version 4.0.1.3
- ran `/nix/store/9xclaqwjhfkghjb7yhkzl0w3gc5l83zg-rocksndiamonds-4.0.1.3/bin/rocksndiamonds --version` and found version 4.0.1.3
- found 4.0.1.3 with grep in /nix/store/9xclaqwjhfkghjb7yhkzl0w3gc5l83zg-rocksndiamonds-4.0.1.3
---
 pkgs/games/rocksndiamonds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix
index d563a8265b5..7e31202754a 100644
--- a/pkgs/games/rocksndiamonds/default.nix
+++ b/pkgs/games/rocksndiamonds/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
   project = "rocksndiamonds";
-  version = "4.0.1.1";
+  version = "4.0.1.3";
 
   src = fetchurl {
     url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz";
-    sha256 = "0f2m29m53sngg2kv4km91nxbr53rzhchbpqx5dzrv3p5hq1hp936";
+    sha256 = "0y8w96hav7k5qwpm6rvzn3g4czfpsc58dix3x98anqii9l6vwrdd";
   };
 
   desktopItem = makeDesktopItem {

From 893b69a54cb6841f4944dd3bf0791e0361184ef7 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 14 Mar 2018 19:14:34 +0100
Subject: [PATCH 1105/2266] mpv: 0.27.0 -> 0.27.2

---
 pkgs/applications/video/mpv/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b026da6a632..6723c9dfe1f 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -73,21 +73,21 @@ assert drmSupport         -> available libdrm;
 let
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
-  wafVersion = "1.9.8";
+  wafVersion = "1.9.15";
   waf = fetchurl {
     urls = [ "http://waf.io/waf-${wafVersion}"
              "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
-    sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n";
+    sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5";
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.27.0";
+  version = "0.27.2";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v";
+    sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr";
   };
 
   patches = [
@@ -95,11 +95,6 @@ in stdenv.mkDerivation rec {
       url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
       sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
     })
-    (fetchpatch {
-      name = "CVE-2018-6360.patch";
-      url = https://salsa.debian.org/multimedia-team/mpv/raw/ddface85a1adfdfe02ffb25b5ac7fac715213b97/debian/patches/09_ytdl-hook-whitelist-protocols.patch;
-      sha256 = "1gb1lkjbr8rv4v9ji6w5z97kbxbi16dbwk2255ajbvngjrc7vivv";
-    })
   ];
 
   postPatch = ''

From 9b2f74f83135aeef1a55180e46b31df25211b754 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 05:31:30 -0700
Subject: [PATCH 1106/2266] rtv: 1.21.0 -> 1.22.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/.rtv-wrapped -h` got 0 exit code
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/.rtv-wrapped --help` got 0 exit code
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/.rtv-wrapped -V` and found version 1.22.1
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/.rtv-wrapped --version` and found version 1.22.1
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/rtv -h` got 0 exit code
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/rtv --help` got 0 exit code
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/rtv -V` and found version 1.22.1
- ran `/nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1/bin/rtv --version` and found version 1.22.1
- found 1.22.1 with grep in /nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1
- found 1.22.1 in filename of file in /nix/store/mpyc1z74lsma9vfc4b04glvvyfs0l40j-rtv-1.22.1
---
 pkgs/applications/misc/rtv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index c9064d93740..5ca8bfcf5df 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
 
 with pythonPackages;
 buildPythonApplication rec {
-  version = "1.21.0";
+  version = "1.22.1";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "0srm01nrb23hdmj3ripsa9p8nv2cgss3m6and9rdr875qw5ii130";
+    sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4";
   };
 
   # Tests try to access network

From 488835ec6e8f7c115b2bd6ee37d9eaebe0f86485 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 15 Mar 2018 12:41:11 +0100
Subject: [PATCH 1107/2266] conan: Locally pin deps, enable tests

---
 pkgs/development/python-modules/distro/11.nix | 26 --------
 .../python-modules/distro/default.nix         |  1 -
 .../python-modules/node-semver/2.nix          | 21 -------
 .../python-modules/node-semver/default.nix    |  1 -
 .../tools/build-managers/conan/default.nix    | 60 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  4 --
 7 files changed, 46 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/python-modules/distro/11.nix
 delete mode 100644 pkgs/development/python-modules/node-semver/2.nix

diff --git a/pkgs/development/python-modules/distro/11.nix b/pkgs/development/python-modules/distro/11.nix
deleted file mode 100644
index bc9158e1545..00000000000
--- a/pkgs/development/python-modules/distro/11.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
-
-buildPythonPackage rec {
-  name = "${pname}-${version}";
-  pname = "distro";
-  version = "1.1.0";
-
-  buildInputs = [ pytest pytestcov tox];
-
-  checkPhase = ''
-    touch tox.ini
-    tox
-  '';
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/nir0s/distro;
-    description = "Linux Distribution - a Linux OS platform information API.";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nand0p ];
-  };
-}
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index 36264921f64..da6984c9be9 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "distro";
   version = "1.2.0";
 
diff --git a/pkgs/development/python-modules/node-semver/2.nix b/pkgs/development/python-modules/node-semver/2.nix
deleted file mode 100644
index 0ca61bd1351..00000000000
--- a/pkgs/development/python-modules/node-semver/2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
-
-buildPythonPackage rec {
-  name = "${pname}-${version}";
-  version = "0.2.0";
-  pname = "node-semver";
-
-  buildInputs = [ pytest tox ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/podhmo/python-semver;
-    description = "A port of node-semver";
-    license = licenses.mit;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 7351d2edfd3..9e4ba35680a 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "0.3.0";
   pname = "node-semver";
 
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 6350798e108..04d7d93455e 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,29 +1,59 @@
-{ lib, buildPythonApplication, fetchPypi
-, requests, fasteners, pyyaml, pyjwt, colorama, patch
-, bottle, pluginbase, six, distro11, pylint, node-semver2
-, future, pygments, mccabe
-, fetchpatch
-}:
+{ lib, fetchpatch, python }:
 
-buildPythonApplication rec {
-  version = "1.1.1";
+let newPython = python.override {
+  packageOverrides = self: super: {
+    distro = super.distro.overridePythonAttrs (oldAttrs: rec {
+      version = "1.1.0";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
+      };
+    });
+    node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
+      version = "0.2.0";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
+      };
+    });
+  };
+};
+
+in newPython.pkgs.buildPythonApplication rec {
+  version = "1.1.1"; # remove patch below when updating
   pname = "conan";
 
-  src = fetchPypi {
+  src = newPython.pkgs.fetchPypi {
     inherit pname version;
     sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
   };
 
-  propagatedBuildInputs = [
+  checkInputs = with newPython.pkgs; [
+    nose
+    parameterized
+    mock
+    webtest
+    codecov
+  ];
+
+  propagatedBuildInputs = with newPython.pkgs; [
     requests fasteners pyyaml pyjwt colorama patch
-    bottle pluginbase six distro11 pylint node-semver2
+    bottle pluginbase six distro pylint node-semver
     future pygments mccabe
   ];
 
-  # enable tests once all of these pythonPackages available:
-  # [ nose nose_parameterized mock webtest codecov ]
-  # update 2018-03-11: only nose_parameterized is missing
-  doCheck = false;
+  patches = [
+    # already merged, remove with the next package update
+    (fetchpatch {
+      url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch";
+      sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7";
+    })
+  ];
+
+  preCheck = ''
+    export HOME="$TMP/conan-home"
+    mkdir -p "$HOME"
+  '';
 
   meta = with lib; {
     homepage = https://conan.io;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dca7d36ae6d..8c4d2277d07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7589,7 +7589,7 @@ with pkgs;
 
   complexity = callPackage ../development/tools/misc/complexity { };
 
-  conan = pythonPackages.callPackage ../development/tools/build-managers/conan { };
+  conan = callPackage ../development/tools/build-managers/conan { };
 
   cookiecutter = pythonPackages.cookiecutter;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9220b9e98ca..669656d1452 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20953,12 +20953,8 @@ EOF
 
   node-semver = callPackage ../development/python-modules/node-semver { };
 
-  node-semver2 = callPackage ../development/python-modules/node-semver/2.nix { };
-
   distro = callPackage ../development/python-modules/distro { };
 
-  distro11 = callPackage ../development/python-modules/distro/11.nix { };
-
   bz2file =  callPackage ../development/python-modules/bz2file { };
 
   smart_open =  callPackage ../development/python-modules/smart_open { };

From e3db2501f9ec3271d8dd0c76ea7938650cee5589 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 05:49:07 -0700
Subject: [PATCH 1108/2266] s3ql: 2.21 -> 2.26

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql --version` and found version 2.26
- found 2.26 with grep in /nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26
- found 2.26 in filename of file in /nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26
---
 pkgs/tools/backup/s3ql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 66480a2f13a..1bd8ebfd44b 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -3,11 +3,11 @@
 python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
-  version = "2.21";
+  version = "2.26";
 
   src = fetchurl {
     url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d";
+    sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn";
   };
 
   buildInputs = [ which ]; # tests will fail without which

From d081f14580f5559fa7d9b9232f6c39035deb2694 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 15 Mar 2018 12:52:55 +0000
Subject: [PATCH 1109/2266] kubernetes-helm: 2.8.1 -> 2.8.2

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 082b23afcbd..a49ff486d96 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, kubectl }:
 let
-  arch = if stdenv.isLinux
+  isLinux = stdenv.isLinux;
+  arch = if isLinux
          then "linux-amd64"
          else "darwin-amd64";
-  checksum = if stdenv.isLinux
-             then "07bgny8mfdgv9f6zmk31hxhkwy90wr22js21jz679pkz3gmykxvx"
-             else "1f6h96gyhsdb03am586kdqn619h4niwlj29j4bypf3yg2sar4p6x";
+  checksum = if isLinux
+             then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1"
+             else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50";
   pname = "helm";
-  version = "2.8.1";
+  version = "2.8.2";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From f43e06e9f3451efb8d204d91443607edcd9aa829 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 15 Mar 2018 13:52:59 +0100
Subject: [PATCH 1110/2266] itk: 4.11.0 -> 4.12.2, fix build

---
 pkgs/development/libraries/itk/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 3865aa226f9..bb90ec4831a 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,20 +1,13 @@
 { stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
 
 stdenv.mkDerivation rec {
-  name = "itk-4.11.0";
+  name = "itk-4.12.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz;
-    sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6";
+    url = mirror://sourceforge/itk/InsightToolkit-4.12.2.tar.xz;
+    sha256 = "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w";
   };
 
-  # Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be
-  # necessary once we get past ITK 4.11.
-  patches = [ (fetchpatch {
-    url    = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch";
-    sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s";
-  }) ];
-
   cmakeFlags = [
     "-DBUILD_TESTING=OFF"
     "-DBUILD_EXAMPLES=OFF"

From 81f0cf2cd5330c9069bb87ffa4cde6cf22ce1af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:38:41 +0100
Subject: [PATCH 1111/2266] python36Packages.hbmqtt: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index 379aa1c3cf4..ade4111c5a3 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "hbmqtt";
-  version = "0.9.1";
+  version = "0.9.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx";
+    sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c";
   };
 
   propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];

From cdd2593da1788c3547590b4adb8dcd44885d2a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:43:28 +0100
Subject: [PATCH 1112/2266] pythonPackages.idna-ssl: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/idna-ssl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix
index 177e68f6295..b324705a152 100644
--- a/pkgs/development/python-modules/idna-ssl/default.nix
+++ b/pkgs/development/python-modules/idna-ssl/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, idna }:
 
 buildPythonPackage rec {
-  pname = "idna_ssl";
-  version = "1.0.0";
+  pname = "idna-ssl";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1227e44039bd31e02adaeafdbba61281596d623d222643fb021f87f2144ea147";
+    sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979";
   };
 
   propagatedBuildInputs = [ idna ];

From 7dfbb8c53c778c851083a8ae835720208c082fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:44:39 +0100
Subject: [PATCH 1113/2266] pythonPackages.aiohttp: 3.0.5 -> 3.0.9

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 5408fb7b2f2..67bf5a11593 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.0.5";
+  version = "3.0.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb873da531401416acb7045a8f0bdf6555e9c6866989cd977166fae3cbbb954b";
+    sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b";
   };
 
   disabled = pythonOlder "3.5";

From ce6e336842a7371640a0b1c49bb1959163643306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Thu, 15 Mar 2018 14:06:40 +0100
Subject: [PATCH 1114/2266] st: 0.7 -> 0.8

---
 pkgs/applications/misc/st/default.nix            |  6 +++---
 pkgs/applications/misc/st/st-fix-deletekey.patch | 15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/misc/st/st-fix-deletekey.patch

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 59e67fc65e2..4b6873ea33f 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -5,14 +5,14 @@ with stdenv.lib;
 
 let patches' = if patches == null then [] else patches;
 in stdenv.mkDerivation rec {
-  name = "st-0.7";
+  name = "st-0.8";
 
   src = fetchurl {
     url = "http://dl.suckless.org/st/${name}.tar.gz";
-    sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
+    sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
   };
 
-  patches = patches' ++ [ ./st-fix-deletekey.patch ];
+  patches = patches';
 
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
diff --git a/pkgs/applications/misc/st/st-fix-deletekey.patch b/pkgs/applications/misc/st/st-fix-deletekey.patch
deleted file mode 100644
index cf009322053..00000000000
--- a/pkgs/applications/misc/st/st-fix-deletekey.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 1896246..b41747f 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -315,8 +315,8 @@ static Key key[] = {
- 	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0,    0},
- 	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0,    0},
- 	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0,    0},
--	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0,    0},
--	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
-+	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       +1,    0,    0},
-+	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      -1,    0,    0},
- 	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
- 	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0,    0},
- 	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1,    0},

From 0f95d796cf7a626ec1334ba923c4016f54f3a59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Thu, 15 Mar 2018 14:20:31 +0100
Subject: [PATCH 1115/2266] dmenu: 4.7 -> 4.8

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

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 8ef4f3ae897..f8b175eb86a 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.7";
+  name = "dmenu-4.8";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7";
+    sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy";
   };
 
   buildInputs = [ libX11 libXinerama zlib libXft ];

From 4b43f9e588022c93240a43d103519ae186989ba2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 06:20:43 -0700
Subject: [PATCH 1116/2266] sassc: 3.4.8 -> 3.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0/bin/sassc -h` got 0 exit code
- ran `/nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0/bin/sassc --help` got 0 exit code
- ran `/nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0/bin/sassc -v` and found version 3.5.0
- ran `/nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0/bin/sassc --version` and found version 3.5.0
- ran `/nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0/bin/sassc -h` and found version 3.5.0
- ran `/nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0/bin/sassc --help` and found version 3.5.0
- found 3.5.0 with grep in /nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0
- found 3.5.0 in filename of file in /nix/store/jw8q07zqpmpzny6qz3zx2slxjng7lf9i-sassc-3.5.0
---
 pkgs/development/tools/sassc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
index 326fa84f472..5598dc1606d 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/pkgs/development/tools/sassc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sassc-${version}";
-  version = "3.4.8";
+  version = "3.5.0";
 
   src = fetchurl {
     url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
-    sha256 = "02lnibrl6zgczkhvz01bdp0d2b0rbl69dfv5mdnbr4l8km7sa7b1";
+    sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96";
   };
 
   patchPhase = ''

From cfd37eb349d6cd604891b5d90d18365c866c5f10 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 15 Mar 2018 14:28:29 +0100
Subject: [PATCH 1117/2266] grafana: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index b255a153a2b..dbc24e55c20 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.1";
+  version = "5.0.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0nvns6ysnl7a4blcq9iyhhn9nxhk8fpwkfzlyvm8dx6y8hwawlq1";
+    sha256 = "0lwv6k8yp1jpp3ghizvrnnb5zpnsbkyd1i9ggy4gbs68mg8xzp19";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "1zjy4h2w8dghqziafn23msl29yds9w4q0ryywv1sdrzkb1331cyk";
+    sha256 = "06qqi5v9s9ni4a380alsc3f53hvmmypqgm3cc25hl3ld5w3zdlkd";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 607c651b9774163cc3cf87846512ca04c390940f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 06:58:19 -0700
Subject: [PATCH 1118/2266] seafile-client: 6.1.5 -> 6.1.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.1.6 with grep in /nix/store/304wh7gzixm9as2wa2b619jcimn0837k-seafile-client-6.1.6
- found 6.1.6 in filename of file in /nix/store/304wh7gzixm9as2wa2b619jcimn0837k-seafile-client-6.1.6
---
 pkgs/applications/networking/seafile-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 3e637fa0f1c..0d7bdf970f5 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.1.5";
+  version = "6.1.6";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "1ahz55cw2p3s78x5f77drz4h2jhknfzpkk83qd0ggma31q1pnpl9";
+    sha256 = "0r02frlspjq8k0zz1z4wh2sx3jm6b1qby5mxg394sb3rjdxb8jhk";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From 306ee199a77132ee432c9e14823e2a60c29c58fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:48:50 +0100
Subject: [PATCH 1119/2266] home-assistant: 0.63.3 -> 0.65.5

---
 .../home-assistant/component-packages.nix     | 20 ++++++++++++---
 pkgs/servers/home-assistant/default.nix       | 25 ++++++++-----------
 pkgs/servers/home-assistant/frontend.nix      |  8 +++---
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b031f33555..6f5843a8167 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.63.3";
+  version = "0.65.5";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -21,6 +21,7 @@
     "arduino" = ps: with ps; [  ];
     "arlo" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
+    "august" = ps: with ps; [  ];
     "axis" = ps: with ps; [  ];
     "bbb_gpio" = ps: with ps; [  ];
     "binary_sensor.concord232" = ps: with ps; [  ];
@@ -32,10 +33,12 @@
     "binary_sensor.trend" = ps: with ps; [ numpy ];
     "binary_sensor.workday" = ps: with ps; [  ];
     "blink" = ps: with ps; [  ];
+    "bmw_connected_drive" = ps: with ps; [  ];
     "calendar.caldav" = ps: with ps; [  ];
     "calendar.todoist" = ps: with ps; [ todoist ];
     "camera.foscam" = ps: with ps; [  ];
     "camera.onvif" = ps: with ps; [  ];
+    "camera.proxy" = ps: with ps; [ pillow ];
     "camera.synology" = ps: with ps; [  ];
     "camera.uvc" = ps: with ps; [  ];
     "camera.xeoma" = ps: with ps; [  ];
@@ -56,7 +59,7 @@
     "cloud" = ps: with ps; [  ];
     "coinbase" = ps: with ps; [  ];
     "comfoconnect" = ps: with ps; [  ];
-    "conversation" = ps: with ps; [  ];
+    "config.config_entries" = ps: with ps; [  ];
     "cover.myq" = ps: with ps; [  ];
     "daikin" = ps: with ps; [  ];
     "datadog" = ps: with ps; [ datadog ];
@@ -89,6 +92,7 @@
     "dweet" = ps: with ps; [  ];
     "dyson" = ps: with ps; [  ];
     "ecobee" = ps: with ps; [  ];
+    "egardia" = ps: with ps; [  ];
     "eight_sleep" = ps: with ps; [  ];
     "emulated_hue" = ps: with ps; [ aiohttp-cors ];
     "enocean" = ps: with ps; [  ];
@@ -96,12 +100,13 @@
     "fan.xiaomi_miio" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
     "ffmpeg" = ps: with ps; [  ];
-    "frontend" = ps: with ps; [ user-agents ];
+    "frontend" = ps: with ps; [  ];
     "gc100" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client oauth2client ];
     "hdmi_cec" = ps: with ps; [  ];
     "hive" = ps: with ps; [  ];
+    "homekit" = ps: with ps; [  ];
     "homematic" = ps: with ps; [ pyhomematic ];
     "http" = ps: with ps; [ aiohttp-cors ];
     "hue" = ps: with ps; [  ];
@@ -159,6 +164,7 @@
     "media_player.bluesound" = ps: with ps; [ xmltodict ];
     "media_player.braviatv" = ps: with ps; [  ];
     "media_player.cast" = ps: with ps; [ PyChromecast ];
+    "media_player.channels" = ps: with ps; [  ];
     "media_player.clementine" = ps: with ps; [  ];
     "media_player.cmus" = ps: with ps; [  ];
     "media_player.denonavr" = ps: with ps; [  ];
@@ -187,12 +193,14 @@
     "media_player.russound_rnet" = ps: with ps; [  ];
     "media_player.samsungtv" = ps: with ps; [ wakeonlan ];
     "media_player.snapcast" = ps: with ps; [  ];
+    "media_player.songpal" = ps: with ps; [  ];
     "media_player.sonos" = ps: with ps; [  ];
     "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
     "media_player.spotify" = ps: with ps; [  ];
     "media_player.vizio" = ps: with ps; [  ];
     "media_player.vlc" = ps: with ps; [  ];
     "media_player.webostv" = ps: with ps; [ websockets ];
+    "media_player.xiaomi_tv" = ps: with ps; [  ];
     "media_player.yamaha" = ps: with ps; [  ];
     "media_player.yamaha_musiccast" = ps: with ps; [  ];
     "media_player.ziggo_mediabox_xl" = ps: with ps; [  ];
@@ -334,6 +342,7 @@
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
     "sensor.season" = ps: with ps; [ ephem ];
+    "sensor.sense" = ps: with ps; [  ];
     "sensor.sensehat" = ps: with ps; [  ];
     "sensor.serial" = ps: with ps; [  ];
     "sensor.serial_pm" = ps: with ps; [  ];
@@ -342,7 +351,9 @@
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
     "sensor.speedtest" = ps: with ps; [  ];
+    "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
+    "sensor.startca" = ps: with ps; [ xmltodict ];
     "sensor.steam_online" = ps: with ps; [  ];
     "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
     "sensor.swiss_public_transport" = ps: with ps; [  ];
@@ -366,9 +377,11 @@
     "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
     "sensor.yweather" = ps: with ps; [  ];
+    "sensor.zestimate" = ps: with ps; [ xmltodict ];
     "shiftr" = ps: with ps; [ paho-mqtt ];
     "skybell" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
+    "smappee" = ps: with ps; [  ];
     "spc" = ps: with ps; [ websockets ];
     "statsd" = ps: with ps; [ statsd ];
     "switch.acer_projector" = ps: with ps; [ pyserial ];
@@ -408,6 +421,7 @@
     "tts.google" = ps: with ps; [  ];
     "tts.microsoft" = ps: with ps; [  ];
     "twilio" = ps: with ps; [ twilio ];
+    "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
     "upnp" = ps: with ps; [  ];
     "usps" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cb9424ad5cf..bfdfd4a1548 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -7,18 +7,11 @@ let
 
   py = python3.override {
     packageOverrides = self: super: {
-      yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
-        version = "1.1.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "162630v7f98l27h11msk9416lqwm2mpgxh4s636594nlbfs9by3a";
-        };
-      });
       aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "2.3.10";
+        version = "3.0.6";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+          sha256 = "5b588d21b454aaeaf2debf3c4a37f0752fb91a5c15b621deca7e8c49316154fe";
         };
       });
       pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
@@ -29,10 +22,10 @@ let
         };
       });
       voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {
-        version = "0.10.5";
+        version = "0.11.1";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s";
+          sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
         };
       });
       hass-frontend = super.callPackage ./frontend.nix { };
@@ -51,12 +44,14 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.63.3";
+  hassVersion = "0.65.5";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
   version = assert (componentPackages.version == hassVersion); hassVersion;
 
+  disabled = pythonOlder "3.5";
+
   inherit availableComponents;
 
   # PyPI tarball is missing tests/ directory
@@ -64,14 +59,14 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1lrdrn0x8i81vbqxziv5fgcc8ldz7x5r62kfz3nyg4g43rk3dqq8";
+    sha256 = "1jd44y3f31926g08h2zykp9hnigh6yms38mqn3i5gcl01n1n368k";
   };
 
   propagatedBuildInputs = [
     # From setup.py
-    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi attrs
+    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs
     # From http, frontend and recorder components
-    sqlalchemy aiohttp-cors hass-frontend user-agents
+    sqlalchemy aiohttp-cors hass-frontend
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 018405f578d..b6f8826130f 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage, user-agents }:
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180209.0";
+  version = "20180310.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b85f0e833871408a95619ae38d5344701a6466e8f7b5530e718ccc260b68d3ed";
+    sha256 = "5a7cca7ed461d650859df7d036ff4c579366bbcde5eb6407b1aff6a0dbbae2c2";
   };
+
+  propagatedBuildInputs = [ user-agents ];
 }

From 7cf6df89038ac3b271ca7101030830c5d91551f0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 15 Mar 2018 15:50:34 +0300
Subject: [PATCH 1120/2266] nvidiabl: 0.87 -> 2017-09-26

Fix build on newer kernels. Fixes #36356.

Thanks to yorickvP for suggestions and maintainership.
---
 pkgs/os-specific/linux/nvidiabl/default.nix   | 19 ++++++++--------
 .../linux/nvidiabl/linux4compat.patch         | 22 -------------------
 2 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidiabl/linux4compat.patch

diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
index 6f9af040b8a..02161f7133c 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -2,18 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "nvidiabl-${version}-${kernel.version}";
-  version = "0.87";
+  version = "2017-09-26";
 
+  # We use a fork which adds support for newer kernels -- upstream has been abandoned.
   src = fetchFromGitHub {
-    owner = "guillaumezin";
+    owner = "yorickvP";
     repo = "nvidiabl";
-    rev = "v${version}";
-    sha256 = "1hs61dxn84vsyvrd2s899dhgg342mhfkbdn1nkhcvly45hdp2nca";
+    rev = "2d909f4dfceb24ce98479fd571411c6ec3b71bea";
+    sha256 = "0dsar8fsaxwywjh6rbrxkhdp142vqjnsyxfz6bgpbqml6slpiqs1";
   };
 
   hardeningDisable = [ "pic" ];
 
-  patches = [ ./linux4compat.patch ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
   preConfigure = ''
     sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile
@@ -25,11 +26,11 @@ stdenv.mkDerivation rec {
     "KVER=${kernel.modDirVersion}"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
     homepage = https://github.com/guillaumezin/nvidiabl;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    broken = !stdenv.lib.versionOlder kernel.version "4.9";
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ yorickvp ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch
deleted file mode 100644
index ad8236a2b63..00000000000
--- a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001
-From: sonic414 <sonic414@gmail.com>
-Date: Tue, 28 Apr 2015 19:30:15 +0530
-Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0
-
----
- nvidiabl-module.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nvidiabl-module.c b/nvidiabl-module.c
-index b789ea4..b306579 100644
---- a/nvidiabl-module.c
-+++ b/nvidiabl-module.c
-@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
- 	
- 	for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
--		if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
-+		if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
- 			props.type = backlight_type_ids[iii].type;
- 			printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
- 		}

From 525dc15c5a43d503854e53e1bd05a9aa766f662a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 10:51:45 -0400
Subject: [PATCH 1121/2266] linux: 4.14.26 -> 4.14.27

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index cb292092f60..3d950252e1c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.26";
+  version = "4.14.27";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0n3ckh77n81jfgrivhxz17fm2l3mi5yicjg19sc7n0318b2nd94r";
+    sha256 = "1si8l3clpkyhwawrjxz6yzx7xl0v0k6dy1yf5qiwf1hsqx4s8489";
   };
 } // (args.argsOverride or {}))

From 09cb7d73ea9630c545158c711380080df47f6dfe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 10:51:59 -0400
Subject: [PATCH 1122/2266] linux: 4.15.9 -> 4.15.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index d7034e9c790..933339f5818 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.9";
+  version = "4.15.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14j4dpg1qx3bqw040lc6qkm544nz8qw5bpjnvz8ccw9f0jr1b86x";
+    sha256 = "14i6028l1y8y88sw5cbfihzs3wp66vwy33g1598i0dkyf1sbw5cg";
   };
 } // (args.argsOverride or {}))

From a6a75eaa1cde7eca5c559fb06ad10bf2f79c8db8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 09:08:34 -0700
Subject: [PATCH 1123/2266] synthv1: 0.8.6 -> 0.9.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.0 with grep in /nix/store/xn775251xcr8bnkpzqwicv0sq0fv2nb3-synthv1-0.9.0
- found 0.9.0 in filename of file in /nix/store/xn775251xcr8bnkpzqwicv0sq0fv2nb3-synthv1-0.9.0
---
 pkgs/applications/audio/synthv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 651e56d0e8e..53875389a4c 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "141ah1gnv5r2k846v5ay15q9q90h01p74240a56vlxqh20z43g92";
+    sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp";
   };
 
   buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];

From ea1377419c9e3fa4a1fc853d5a1a01a6a1149539 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 15 Mar 2018 09:30:11 -0700
Subject: [PATCH 1124/2266] review comment

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 2b77184f3c9..48a3d1591fc 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     for i in Makefile po/Makefile; do
       substituteInPlace $i --replace "prefix = /usr" "prefix = $out"
     done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) ''
     echo "whois_LDADD += -liconv" >> Makefile
   '';
 

From 3369c0da5e3e99714e4b93031d60122dd8084eab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 17:45:47 +0100
Subject: [PATCH 1125/2266] Revert "splix: move to DRVs over PPDs"

---
 pkgs/misc/cups/drivers/splix/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 53e8a662697..2cdaca8d783 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchsvn, cups, zlib, jbigkit }:
-
+{ stdenv, fetchsvn, fetchurl, cups, zlib }:
 let rev = "315"; in
 stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
-
   src = fetchsvn {
     # We build this from svn, because splix hasn't been in released in several years
     # although the community has been adding some new printer models.
@@ -13,17 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   preBuild = ''
-    makeFlags="$makeFlags CUPSFILTER=$out/lib/cups/filter CUPSDRV=$out/share/cups/drv"
+    makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
   '';
 
-  buildFlags = [ "drv" "all" ];
-
-  makeFlags = [ "DRV_ONLY=1" ];
-
-  buildInputs = [ cups zlib jbigkit ];
+  buildInputs = [cups zlib];
 
   meta = {
-    description = "CUPS drivers for SPL (Samsung Printer Language) printers";
     homepage = http://splix.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];

From 7da70b859cca29316e4b08c2d6e076ab22845403 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 00:42:15 +0800
Subject: [PATCH 1126/2266] firefox-bin: Fix updateScript

`xidel -q` was deprecated in favour of `xidel -q`
---
 pkgs/applications/networking/browsers/firefox-bin/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index ac3f7d1380c..df928f88c38 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -37,7 +37,7 @@ in writeScript "update-${name}" ''
   #    versions or removes release versions if we are looking for beta
   #    versions
   # - this line pick up latest release
-  version=`xidel -q $url --extract "//a" | \
+  version=`xidel -s $url --extract "//a" | \
            sed s"/.$//" | \
            grep "^[0-9]" | \
            sort --version-sort | \

From 88a83f136a7535ae8b82427ae13cc36835365886 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 00:42:22 +0800
Subject: [PATCH 1127/2266] firefox-devedition-bin: 59.0b13 -> 60.0b3

---
 .../firefox-bin/devedition_sources.nix        | 788 +++++++++---------
 1 file changed, 399 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 1bb7ffd1b09..0ad35ee1c1f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,975 +1,985 @@
 {
-  version = "59.0b13";
+  version = "60.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b94b5d17bb2bcdf0997e8e0b8d58cb07a7be671fba4c9a6e42c4954fab5bac2c2243b9f57cb2513db319f0a257561aebd837531f134344b1c51486f66f96ce3e";
+      sha512 = "59a2c232a7551d3f75843bd71f5d1cf804098dc7bf3048bdac03c51d7e7da32b52e10aae2499d28d0dbe6cbfc5b2fde87c0624142ffc4026aeb4e790f927e889";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "10b1db6c1abdfcd1cdfa5465447b70413b411cbee9fb33161bac21c3f47a9222243be4267849008d1bd20486c3d6dc752a57cb9003c2bef4566ff4210f37e388";
+      sha512 = "869b80d3f535c5e63ecc3c91150b5739d5f4d27137e11f279b534645660c761ec95155702c852b5bd915d41381e8f8c11f8631902bd0cc13f310b30d31aefda3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "8d94ad871580dc295783c5f3b7f22c88db3f16f0fe3511a505569571082775dec3edd95c472b17fce9353cd07737450df8a9a44a78f4541c26c9dbbb24f1ebfe";
+      sha512 = "b5f850afa0491da07705ef4e3f48a1aa0a4678744a2a19e6c4f52041f91faa9249362f983b6b0dba030644ff67b065e25315b50d1429b9967211b4873d355a80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9f2cf9ae453fb79dec52c29371af50830b129bd82e190cf93d846042579484adb389ba33690bc5dc5e3a652af3924b70878fc0109d5a6da679d97a48fb3de567";
+      sha512 = "843898c216e1c531151d2e123e1c7b822259915130ac198a7f115dcb11af079f27514fbb2796c00f6059d18d0d7b412ef7758c0a6b9b0e985b5272ef9662cf18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b97ca2803feb8b9afb1b006ac375111a59a26f67ed54ec0bf285452f2b59999f4c99e40b2cc066314ba761de465a7a893de671b50b575464d6f9f5bfa631368f";
+      sha512 = "f02f956b244ad48b94d0c45307d61b92a70d6cf2acd58789fb453287d0f53c47322dd538a0e1b17627a7e568728abb905a835c29c35add401bade4754d987dc0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "1f92d7ad29a89ac7e27181cb67cc956811ec512f48a9b9bb5e35247e4b03bac680dcc900719d1975d476c8ea7f51ad3d21d01aa9fed8f0f4b9ec81a443354575";
+      sha512 = "ab7fd7a674a7292cbd9f79a72129a212c95c8960c2673de52a3b566efebbaaff316820a5f2613394592c4bbe249876197bf4dafd9e84c6cee35858521358a49b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "43a54e6e62e02f792ce7aaae7fdfb4198320baa34c7e1ae76213e10bfe118f6c49a2d8c85536910e5eee7ea2d48b0e15087a906ef01d100a2978f885d0a04515";
+      sha512 = "c9b7e536ea19b74ad5774e95a2195718692a99c7e59a0fd482cba9d7c62250983d0cd7689771db24b86c909df5e52a009e7d97be76807ad21dc5ab838dcf923b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9baeb1245ffca545d6b0ac79b4bed8398406f411cb4a6b7c2f703d32435709521894ffbcba5d31e063dbd0a1c2ed1639656454ba5f69ef5a53c1c3622b5cff21";
+      sha512 = "33d5175f1df479f85d582c8e95255dd42f004c5e53e5a11e31344db85eb1e49c7c83c2b348db840cfee44aedb17d52bdfeef63cb8f3e9a4530a33d34d05c0e5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "57e9db4705224381034f2c11434bf750fa8addc16773a8aa6e761c2a3bc5e583568531acdab844337948bd5ee2e39101a99a32074862f36738ff9c700087227f";
+      sha512 = "8d1f3c82a6543b8ae7ed19e5c6a34525899ca1219e2206ae2a6bf391fefa37447d611ef6896ea5210c1aa54e65edc23548dd76eb13f42b6939624409540729a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f42d8d243a88bf713b82f3fd284e1dbd3a320db37b43d14a11aa6ec98dd5db4e50ac5b014f00495c11204c4732461c9c24f3d3410aec9f33f9cfda6e97d867f6";
+      sha512 = "f1b2f7dc2ca26c0637a3cbf9d649750e2c8c885a40b0767310ca7624d8947c6ba09e6be9529814524c876fb9fb60390f47ed88c131227a14e5af9369456aa363";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "ddcb486b0909bce3c8e917ec504e0f99c366a83385c36f18ddbc0a0456cad295e689ebc7715bfa82aa62b679387b31334000c92c4c7f7223ffdd9390f039ceb9";
+      sha512 = "5c6c8aade30d76f496cfafaf8c0882e72bc10c733486bcbc315ee5ad41565957f67c9b821b5b77424a67619211d5eb959c731beb28117c8b31ea18f9e4516342";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a271350d8d0f87461479fe4bb5b998535ce5ac673e0c8657b820fc50f805cf282141269bd1cb467b0df3c1139362b33b15b4dda5eccaa297894bb400b0e7c6fe";
+      sha512 = "bc7f71477781a9e9cc50e41fd1507293f48892cb2001bd79360ec4ff65e96fca6f69d6d063c9c6e44c0e982717ecbe6a6af05f14485c13816e415b3104d93456";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "a897577f7c233a4e6d905a9e03dd817cf26636dab68deb8c4db13b0101f7317bc55de40a7570d835de3256803901acbdc10041e8cfd0aa21ced140a80bf7c845";
+      sha512 = "645a7bb1a4b5adbd3d7d9e190fe8ac24cb81d311457f426f8592a8427a263a0b8ded1817b8026241b1f3bed8e2e526158c7f1339d4584c1302822bdf21ebe870";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d032ca82efbaf4207759f8e048c5018400dda9e80078fe13c2cfaec542b1d16bea8ba68bf885a6255793b3724c3f1d1b0a79be8028651ffff6ffb85bfb1856e7";
+      sha512 = "12c3d21eb2c7a121080a645a75966caf757e886222c292b4ead3a23278bf35d4242e1440ed5f7eaedf1cc4a7436b6ca2130fd2accb075714c71a1ec31b1dfd06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d3c6c7fc0b505f0ec8f670b314627061b3f829ee04fbdca6301956cd6ba244de194295aa989badf0cf3a015668945a8311f12ac37b39e1caec653380a719238f";
+      sha512 = "8cb1dbe49d8bf0696b6291452a7e389da21dabfd1bca59667038b2fc9647b588ab1632c5d1a8101c1352807c57f42ee1f909c1e1c926321a8583300f99a0934c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e636cb9df591f73f0d9b8d596e997893b92fd6db9692be44e6aaf83b7eda66ecd8e4ebcf8a4c3d451358f3ebc510e51c6ba1a79cdb76dacb21bc1a9904e425b0";
+      sha512 = "06bc6712e27514529dc17379d8fba4537440f7cfa7e84d2b4201386a886030f3b4a098b6230577a36cfa9c9968ac8c1432100a0047f86c0aa32d8fc1971d0122";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "8b4252664548625e4b9e007b88fb6dadfbf2ac5592b6721e37f44a86e11e1b429534b321b8582b5b82b17e3819fd94c45e9d03e5f8faa1eb5e318de22a2e6ee8";
+      sha512 = "123a40d291431478f8fbaa13eb2197f3dc885755a1478519ed599b84fbe086c377b6208226e0409f156fb4d90ca1beb25fd255583018ae605d2aa4c5bf84d258";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "5d2d668d74064dabe2f0a074ee6a101706ac76e0e21129a68d201a6eb627948b911dac86746cface983dc077ac44f68519f81b62e8fa07f097c3b5bfecd88739";
+      sha512 = "4b556676ad9fa3bedb4ae49685344cad23da8c47c68efe986d14166308b6de53cb2f0b696d89e55e9ec1a3e7d523016ee7b87f539d4d6b02facae2014e815858";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8730f4173165b961badf184c7a8e25659e0844eea51c26a7f7bb958ccb43a0b1cb079ce8916a8a58853f7a1489c0464330a8467822c70f6c6b2df510db1460ee";
+      sha512 = "eb53b6c9a000c4b7277d164c39f0d53928fc29527cf35a79c1ad1418f620efc00a16663ca0a59db3ee7a1d51ca9b6652777154827e916fc0346685080ea0bc8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "522459633b1a8638efe961e33c8779eea0c83e51eff1372731389d32c1826ee019c6fbd7e5592a632fb7c07fd85adb3c7ef08200dc087b95568d75d86033dabe";
+      sha512 = "152b9ed4b6674f1f9f83caf6b344d83c8651beec699fdac4a9cca4ee82012bd8c8096b3bd6319a87b8ba3295088d56a2aa8be965940114b2fbbf85e102c63620";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "46ec66ca8cf5a2b299ed1eb21db01b115ca54044adfc74851ac5436ec0d8fdb227fbd9033b14745dcafedea722f63fca3ad1a860efaf9802d717b6f91bb51174";
+      sha512 = "8c498c56a8266389fc43c80971bc379a1c79d6769d8560e2620320f9ca502c420bc5b671be09dd50f67afda11a45b6fc56c17373e562691527190bf8334224d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ac52ba67083f9d411e9e14afe88bb4bfe9850f7509d5ff70812c30ddedd4563e758852dd457fc7c50b285abe0e8423a5b72d8b39dcd9c501e3c692cce3591cca";
+      sha512 = "68a54a00c74b113f2f4c33c92d872c454da2c97e34c81c91e5807d2725415d81a6713b68459dd75a1602f908012d60883f9d483d23fd638dc0d43a75414319d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "c911e4a8b16272d4bc7839b5f13dd4892d68290ed778d72cde95ce110cba5d78df1572868f50222d9adb81df367a564d542c8afb4b1f7ced23e3b9a8a759e4b3";
+      sha512 = "1be7176d5a5708fca376f9146a8ca49debf0e4702365535685d2a3db68628892881b3be3ae3caee972f3839fd48528513131114c5044a31d6468c1e8606a9eeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "67baa5b7bbb55b3732dba842fe6c063a0bac2cefb55f201e6aaab2d11105c50cbba4850cf80c7d99b2e83b32535ad4cb3a95432bb26563592d48ee961cc1ac0c";
+      sha512 = "b9239303030197b776debb5726a25864e54795627f59bfe4c0f24913d56a04b5d4f4f69ae1fd8c56d105e8edb185e64bde96226e043078703c3b5805b507ac4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "3d952efdefd0f8b7886506cbea3359f747854f73d53efe58474a8d31beb396b568849151951c6d0750d116570a8f894c5d6e586b0487e3696cfaf451450ecd3b";
+      sha512 = "4b603bdd4f1b484a87894f3252418753e2f52d6cf298cda6d18bcfaddfae5269ef69ebd0a7e9d85da8ab42ccc4065809ab34a0ee36632c4ee4cc65fe4169cb99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "26ea9b1ddff5518975d49cd851df6951af376d3086b88483e7da9253fc4b427241d77019a8cfc22ba4ffa279af83fbae3c4deca8e43ec085fa366abf44629ba5";
+      sha512 = "e27a814f7408198c200165da2fe6cb40fe0b11626e15d92e8224c12acf1dd133e419bf8f98b09dde3bc505b77750950f568bff295919fd1b38112e879a6694a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "85d260e0dc02a4d3f94c43b4c3425c0ed0c6c9569577faf80f8f7719f368d0c353d59deaad519ccecf9da081b3063721746cdefbef18127ae2eb6d7c9863470a";
+      sha512 = "ef6d2814d1ff70e2799a8a0d5c6aae1f711819db6e816f2e153e84701e93a0a7debe19dd0975a4092d8c179f0ef5fa8f2c53b1d0d046110914634fd3bd2ef301";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "0efb25a3539fce60d2788513ca26f2a2ea48330894fe9468d54e5eac1bce411e72d937eb5997c18f60fc64c9d15ba247664998199655c73f3e9488a84810e4b4";
+      sha512 = "d41bb50097c60e239b539de8b9b08d21552d556e36606078ebe36a48de8e07dbb60b3e2940c0c531f7632efd2206cde2fcc6294a1f3a74a5bed7100c75658c0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "64c1d3945d866649891da16dd16d7d3261d0434e275d44c179d98fabee7eeb35e7fffb6e20b9b6630d60de52559f62d01ab59a5e460a389a17f5d5513296fd5a";
+      sha512 = "d3a2a4aa920c864bbd28dd8cdc091b25d6b8d386f73144d6236ffbe63a99e74af6f6420a82bde6b2f8e35ddeeed0cfc33a1e9aadd425d778878aff3b447aecce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6b63a9fe3f12f4c270dcebe46d9b13082efdc32e94c8d1937e1e5248eaa84e8e0966092e408475bf20014d116509ee773bc91b06be9cd14fd97e64b8269072e7";
+      sha512 = "f66cc73bfe130295e35c44cc2902c3f1ec7b271d673974e13e0d8be630f671ca548943f13c04a01f45cf5523b3e67147ed28a53794e714409cbe2078bdb0dd55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "221f867cf7384f2d5f79906ac68c53b87ac6d11034698a7f390def2008f1acdb944db748b8019a726ad9eb89debf72b4939034057e48ab0a2642d041e3fa2b14";
+      sha512 = "f377f98e9d3b1774372add885bd45900e9d5a792d3b2c9c96f1ba4db0f7f03a7f693e400888c2d98a5fb67d4199f13f2262e0546f5e53491803872cca5e94ba4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "e513f3f871c444c6dfe4af027b31830e78d0d90ee6f199f26b3dc8fac1dbd3293c1ae74f4df735e15cfb4338330665f94c6d1dc4221e9f30250c7aac33ddddfb";
+      sha512 = "ef1b293fc8569a23c2b60a47f65d672334a5ee8d20470460ea6a2972ae7e6be91ecfed3c3f2acdba614e7895060253444fdd805df00cb08a6a2abd4c0d98127d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "074cb42f7b6cb93ff5583834c8ba1f16d92330d241a166983b26c3311c3254a323ab52badc16e9fd3d13e71a783d5aea55674c04c7ff5bb68f60a5deae446954";
+      sha512 = "774ca258ad68a2a6a5c9943e7b9ffac96a54448217125fe61ff11a0ede25c96498f7153f3406c1322a1f83515147402a8b506aa81732f2617e73e388fdd0950f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "901bbb71c4293a6cd7c79210a64349d65fa91c2c2f0bc00da5ceba0a7906c0cdfe00c72d316cfb39604129070d48dc1a30416ae4d6ea2fbf9c3be3511b1a3a39";
+      sha512 = "e29c6aadb5dbb9d456a11ff66d4b17296d6cb4417e4eda85a2666a79d6d2fca65b93cd7ceb385456e950730fa165462df164ffe17ac7696e359d96d08400257f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b70919cdb4f6798253acee401efc6fe22acdce8e12249c59c618b9d2858ccffd398a51c0c77c82ffa4c5a68dc0ac6a9066466f8bb3cb7bbed621ddbe426072ed";
+      sha512 = "487f9e0a439c2738f1eb2c55fa89e56b7829b8c66dc893ecb23f3705d86e1f8bd5948c2ba0ccf3a7eabeda68385371a49dd74b92e3daa2cc7fe07b958134ee60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b3ce427644dd2997d8f21eb60fa1b94c03ab091e79e5c8c908d938ff73871fec81b288d70cd754e03ff9a3758289bd9886077c01b5e3db0458bb7c6f04b11ea1";
+      sha512 = "0e526712e2f203e1ec806216144abfcb9ef96c769f8f736298053a8ad33d6f9e3bc6e6f6b36c4aa93cd45ee8a6370a15e0da6aa312175e142b574db8f5e628ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "6bc8201b78d85d5e5e2dc226628ce03814cea2c9084e5c4bb332b21d50418fcbb5ba656ca3a592e5304bf9fa10b64b32493daf17f6f3363c154b59ff3aaea828";
+      sha512 = "c21112fda5525ff7ded643407fe2be5c6b660449879a80dfd57b1f713c98679062cccc577a42573bc2bea9adecd660551c7f31c6962905cd51e6cb8eb14a22cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "8167a0e36c2ff85a85c9155a47f5530c581fcec9bea1b535b60b8c9e2bc4a370d002f942c9542787a34c76117356e513822cccdf8c02962d0091acec16724001";
+      sha512 = "ed6d0fc2a82ee3c0e14031d58bc2074dde5160492de7920220ac8e72ca995b553ca8c9899d9d8f256287a302bdfbffd65981d64d8c778fbe7e4f55365b6c317a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "b1d8de0f315199bbcae9ae693a04e038dcd24c73b8795f031a595e70fbbb4c79b9fb93ccb1761319010e99a915e3f71a075b2e368731bc530ba59b48873b5b48";
+      sha512 = "345bac14c394a432fa4ace22a439eaf2d16e6e0dfb6dd97e356c2b623000d14675154e34e4537b0f5bcd1e90c1111a263e7ba52a1ef6e81f6c8d0109a6263690";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "2c64c3db99edca9ae722953a48e4df9f106dd485357ec0bd35bfeaf5d35ca72437f38991e2af7fd46fc3653a9907a2f67f6cd931f8d8cd2f55cc56f9bc3a9b99";
+      sha512 = "702f85952d51286576c729c84e2709b32ffa0a1dd03c2911c1b20de7510e1a006531389c2bdbcbc1fd99fd3568db5a4157daed9c65a4be04648872a8200a808a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "29bead26899e8cc33cf47e7e9248493d80a5ddd82fc35e94836f26b627d7343768d427a7ce4e7ebfc70465fba9a5c81bdb56ca7e0e06c788d179c500ee42b44e";
+      sha512 = "8286e8fb299022028cf17466c199badcebb23a9aa743d4c64b2737d3112a5d964fd0b534bec6892aea9d67877dece66c25b1ddf15e08a745924e815064768891";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e3899e1a3fb97df70a29c0a0b314bc871a9625e736249eb9bc056cf0c56a81d1a2a3364ab964078733f5f3f4cb20229a5fb65a4a481e74b1afe2f1282e41894a";
+      sha512 = "598d84026a03835044c8bb57e5f27ddd131a045c49c779a5813d06b789bb062ea2d4ed92f8d5fafeb1b2ed5dafcaa75e9c06f5c8354cbab80fba1d1db6ce61ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ca96796c00ea4f028d833c7b9720de0ce2d77e72b9de85dc6e77fcf83379992abad22ace9201de0d4e45c4c89f8a77bf997228b9667accbeb774d3035276d1f9";
+      sha512 = "a410f8d101396f727920c4fbb91d1ec6885ea98317a1cbe7557d6ae7b40a9e428c6a6482cbfcf4857dd0b652cea8a6b3953fb76455234b2a6938cd55d9f9ccac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "7ebbf4ee67c475d8abc48212b6be0cac569000f386c54d893c863e329b0459e59d2af70c1a9ec5d5d123edef738c84249bd41538eb876e010776cd8920744997";
+      sha512 = "40fe8d2dd6f232ecfb0f48cb93f837cbb9f731c07c11d6c51c44bd596b050be89aadc610dea9782d42fde6ac8779cf72eb6b459df11d6ee1dde8b9960ec13926";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b1ed1fa049df575cdf5e7ec1e0e5e0d70f3fd235ecb969490e4e6ed694db677fb9d561b6d78e798e684df1a918d1660aa5460494639a525e71c5689d7a0d312a";
+      sha512 = "319fe8680ff501e100ae9b3e5a818d6fc69c1dbfff8e11e6ed55d9e25628b7435da4632e5a6b92758a0f2215d79f49f2aa1c1f98029f146af30e1be36dbd47ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "7f2420f9da6b68a461cd7345755b8968b55e7cccf2d89ee1e5133a11486f35fbe20284e1a083c108806f49f61070550222fd82898d8229baa64d2097f448fbf4";
+      sha512 = "a1826847c504931ab1554cfd4af989ab7046eefd9d1a28692a0b39bca390652d6e30d193076fbd59977460f5570b973bce1d0fec8c1ef6195ec70a836cbc5520";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "15394abfe0ff50a85714a601b250530ac8983bd456e6eab5f1cd6551ac19b283433ca68bed8f05874785eceea4e7eaa3eb442193ccd31c9e611cac43a20655e5";
+      sha512 = "3e7b49261d343eca5fb0828d7a5b6d298222e31066a7395d948f34d597642f1580e93852c2824d40262d142e679dd2169a05626721ed7185b5d0ae31759d2b37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "80281f638231443c959e0f8ba8c40a74bd96dc9d5b95a3d15d6a62b04fd308b9f3c4613685098da85d45d6e1f5b0f813b8e9b7d2b6f3fd655dfec5481d184106";
+      sha512 = "e9eb9c11cec68272ab8bb60f0f099c81e4de395736663f47a1221ea089ce651f844c16e3594b1ff39c8f60d3a6cb40a28b08e8df1ccb2d458f138607c3020aba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "1ebfd95939088082786a667284a30426fa98d490eb0fbb0cab1546b46f8f22d2e2f4e58b862c2f11b1c2f2f12efc76348f435230fbbaad8451bf7896f2fecdab";
+      sha512 = "e94899aacd5cb5d893482e99997262f021a8c4670f5696999d78f657d7f6edf60c4f9373efef9c20bd552d7b55cf335e797a6d0c7a975f7223d40ff7c27ddd65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2bb326166ed2f5ed8cc8c67607b817f9acdc760ff94b7cb5078ce45068ba7bf10aed568b1b6bbd68a5882103f490fa0c6aae1f9d66efe46bdcb606cbf4af6f6d";
+      sha512 = "e118054c8a2673cc771d4b2a3f9e4db4195ad487adc51a9e747545271bea4abb241ad264e474b30a03f88056477d0a26a3efd145a67ae2b5f9eb771d04c946e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f73757b9dd8fbe5b079db6399513a01867e3d910ddc35bfe2f7046bdfcde7687c4e90da67ed9fbe829d4007edd6e9745886a458d81da07ca244eb1cde67d9f8e";
+      sha512 = "fec6a82125d6c6d9c42dc36e18553570717233c5a23535feb8264a1f3c4fe766bb1d21def103aaebd92942d0d957810c3e3cd7dfae9c94432b306783855b182e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "60308c41f841ea80554ec084fcfabe002922aa86d67ffd9bd9ed654bfe94b3a5e216ecf2c05e7b409a21d7b86ef07da72738ee94e7b54a1fcc15c056b156d396";
+      sha512 = "376fd767808b561233b14d65fcb39668d66078e2ec7f77005167f505a7393cbfbfecb7a2b643353b4dcf0c06b736d86100ede42d235cdc1983b31648cb683530";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f18aedeb49d25f3d5e87a1121fd3ff42e70473666c7d6d4ef6006d0f7303c9b64568de36435d4cea9196e92523b5d808a4ebcc7bea94f68d90abcb19bf2d6f2b";
+      sha512 = "335007dbee3221ec42fa2dec5d7bfe4a9b4b614eb02d83ba6cc4c37abc6df1f9b5500ec65b326f06fb4225c65127bec8e3ab5d6824285c2e76e6ba5248d0a8ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "40db6321b4793a823b37214d08f4db718f84d4bd4737cd03351100b417e48cddb36ff550a26d7462cc793ce2aeeadaa0b72391701215873707946384e122e6a0";
+      sha512 = "dc587b11b62269e6fc1b02abc4eaf99ed1121f1089f5c42854fbe55abdba7ae44fad1893df6558313ce0c11377b47937bb3acd496106411291a9b91a51947ab8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "3511fe6537af25878518394f460a946e6013ba1ca56042070a2de96c637d9726a7e6b9ce2db8bab7972bd434037db76abff03fbd2380c893f5cb60b2a68c1640";
+      sha512 = "290d192cc9a46b95494e68e1f36c57d6c790554f3d1f05a66e8737a0ee59e26dbf53381a17c17f85c81a674292a4b7708ab5e0cd9f9f4ed8d21eec3bcdab0039";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "8884ea6d19ebe1091768629698fb7d11e34c9d011f9270a603b4530a0be5e8479abd87c2aca0cb6fbb33e944b22a69d3267b69c665fbb9b41b0e54e4f9a25c19";
+      sha512 = "9ff963c28b5a1452c9e08ae7cb5de82991c282c7e5a6621958ac4d797bd74647b9048dac9e34cfe9558cf16fb1bd84f55373cac7b1b336e2f65b4d9635aad3f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "6ec80a671c71d5995812417c17e6a65dc9188238abaf2fcd15d9494b9c98ca3495c4b9be35e16175dc88d93a32d51ef2ab5c8d58683ba564e063a0931d63c25b";
+      sha512 = "4378e5c31835efc3a7215ca74d85408e583e00c8979d4a3e5026e506765b49448d009e8feb5f2a2ba27d7db734d0ce3c0a1679ef1fc330e1637cb764ae7c8578";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3c4ee32ef52f915e0a64a28fdbbc1bb19e80405b63a1d574eaf503431165761d8917c972cf5757b1c104c2cfa9f080ee3c4ba550511b51458f9f9f8894cd4abf";
+      sha512 = "da43aa7ba706d780420cda16d409425be026950a7c71c43327c8271fe6ff13cbcefb179cfdf3c1fe79cceae2d6cee6f9171697fb3bddec3b5589b8b1881d7a61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "f5af79d0aa476e21a93a077f94e8408b28f4a1835596aa34caef4176ab37e201e3cff3c13e96e67687146eb2c6b3443744e43e99bb1766d5b49b789980a6545d";
+      sha512 = "e31a35622a83383f00fc9defbd9d8e39e7819273d0698f802960adc094072427799254ac89f2a4de42070abb1efbc93b9298b4c076161a9478064aba44ca6b05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ddb0cf56afae0de194528dfbedc96714e221d43486907cbce6014731650d8a9bfe8bfc639e27aabd5eeef9824004c140511178b89f8ab46550822950e33608e3";
+      sha512 = "df75c385915e6316d8a4f9d04b4092889636e0de116fc2c33439047ab8340c3e17f87ef23dab3206197a2d807123f62efc61421770583e3f48268d67296cc39f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d2489d3e6f46695ef8e3aa12d01528a289fd687c5840e65d2cd4aa01c122b52ffacc139bff635bbb959c80e686dd8ffa1d0cbe585981048ef7b78ab490a53c8c";
+      sha512 = "2ae471d5cd45b4c2c5af47df903eb550d2d68910c4086767238d8df05027e9221a3619f810c816d1079dc1e0012bbb7176b9a690d229c8dea6f7a088b5fe19d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "e5dabfeeaaec8bca3e8265b395b35ab2f4edab143f14461b9bf63fb9e0261c899e7d87ee194e2da0d4695863c9332b6dee6b8f3334af64832664fafb4c6daac4";
+      sha512 = "01c936ecd336a2b29efd4a63c9f168da42a920a140502c3d5f160fa34f14e62b58a934dc5f102091999768bc2c37077acca8094219462dee72a91ce113f44bec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "309d35b7611336dd11933d7cacc78d1c94813ac6343dc522110bd153d6dffc29eb803601958735789233c0f0163a983d6ddf2072d730a2858a8de808db00e3c8";
+      sha512 = "af11baccc3925a2c877e5833aa0ee24673dcad71faa4e25020da1a62ec7fc3106036c46780fb48012358f8198ba6b56b7143e772427327c110a14c78eebc5b83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "de02f9cbb6f47c3fe16e081aba67c45290fef2c420c29399bb4f0e32c3366957d381190b918723660a7bf9425e02bb290841062b4104498af4ebc35bc3bd3323";
+      sha512 = "b84b2ce4420d4ad9e9e2417dd8435645c67a133a9594cb39df81c63e60e64c9cf33faa2b04b63e508696596185dbaf276b7e08dc27581f46afe10564ef31ff49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "079a38be805c8527e1f17e64598e90eb9e464594656785e125f9daab0d3355268d8d18f28c2fe9ab3e8cfa526c2f9010d0a3b8a673e041ad60a8f5b2b6dc3796";
+      sha512 = "3019e9b26b56a82b08046d3430556eda6ef22bfc576f704aba6a4ac9decc2f317c7a3fc0b1681346a7b9df7be335e899e123c50ab2b6ff6f743ef804a34c988f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "05a087a15ce680f8330070e5717cb32bd42fd7530b48917eb0f47f3608a1d08eb6e99834d20a7b51e4382c16e397ce46db166c49650e3d38112676e3d79b83cd";
+      sha512 = "40af56ea7072beec4893bf9134e16bd5693081396e7cd135e2e51c6cdbf0a7e0dbe6a8a02119a822c71258920bd42ffed1d7f32c0a4cb5cb2c4f7b749e645184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "2ab117abe127794aed26e5c50f65b7d32dc2fb8b46ca4766259df8190a33a7cb0630315b5a9d19a36a902f8caa2d33730a4500585ffb3deabffb65ad53ed7bd6";
+      sha512 = "7934f158163a28de2c4922f690c479d95764c36999d5df45afc56589d62c93aa3d0587535489acd0a2ded2c5ef9c084cac6938c20d08fda91e8fcc0b03c057cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "136b17bf57805f1c5523b8a170b6c0cf70b58760d8c3485d5c2d0bf6480acecf98ecb10de0b97cae79d8d5595b43b4289bbca851edf07844121dcc2e74c1e68a";
+      sha512 = "d7c383bd900e3a2910d3ae599a582b5e6ad26cb6c93618a1c4c34cdcaded45873f995c65805b417da425525b912d6e883455641a844aac21a2471b457c7a608d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4fc566997dc0a55caacd5a2b3a1a8a4d4f691e593da07e19cfc1e47fc6477e32101a5de1d5bfe34741885589eff724c6f2886d18fe208e8e7f6eff5a65fab0eb";
+      sha512 = "48c076fbda7a15e7a36bde08a8036b6987f7450872129506adbd90ae554db50c4d543289dae5260f2358b63192f06e06bfd964a3796caf41a2cac393dbdcb9ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a5bf66f2f9180763534c7d5cfa51fa9d7c9f6b00e01c98245bbc836597f81bf0b07a11baa7ae4e3b5c49864f71f60caea673883d7c93ef3a5b3286b084c00b57";
+      sha512 = "cbd6c317d82a2f19d266381bbaa9ec7d7db0cf9c665d9407c36188f95d4e45a1c97df15b62590be8dbf60347093bef95021c55f584897ade06c3c3cbd111e18e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "900f3975c993fcce0a043989b9dd92d09daca5a0e16f601069ce56183407380685fc3c4106ba38733ad545e4d79487a945ddf192ace54db7c7d97305e7f1f96a";
+      sha512 = "96a88afcf2d3b20b88c3f1550b623dd844d6f6e9d86c4b55af5d857c11dc57b2000de3fa685743e465ce3b89288eb940a3ab8984847566eea27717c8d94385f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-x86_64";
+      sha512 = "f6b77caefeef02b017ee434b256349a0ad954eef10f506ed95d82dc56835c1fda70431617bde9601057928d6c03fd98642cb84a4be81a6c4cd0a0de418f893f9";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "09214aaa9c182013dd12f38b17db33e6b4872dcdb3105db8405bbd068163bb65546620692b5539ccf7bf477929619ddcb438593bd41929489b8842011307cae8";
+      sha512 = "746d3576912f8820fac11335efa1289011aed4681d2725d9f0d1c48001e06d01bdf704503bc5632061786e9360a00c85deabf905dd1a9e48c2fc8ecfbe32d6bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0e09950b757f8af342329c933414a8c8bb26e8759ff47281208f3cf4aebbe6ef8f230e2fae80070649897b52daabc695b4e47a87e4682d3570cd0b12fb4371b7";
+      sha512 = "1fd8b03e844fa4bd010fab41a36769bd3ebe2d09d0b4272d626964e175afb6564b8cc05f7c7c2daf4451edc468276f0d9b69e45d37106895efed75a8284ac288";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "dceeee73fdb4810363feb949792c9fed1e58cd99d64585a8259fd0e0709981de85c174b95317e9fc77667e73bd86faccbcb491cb77b14405553d271092b99989";
+      sha512 = "d48b30585b56ffa8174008dcd8f6c5f82269ca60990bbf5fb327392b4cb56df086f1a87e8027f6e523c36905bb99d9f136450abac6354b13580ebe6d9d13bef1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "111d579b63758bb24995b74e5fac69a299db6caebab05eea1af3b2e86ed12db1a7e7ca4fd3d55e2ee18b7640a316bcd1964df18f8da8753f2b7f089f88bf213d";
+      sha512 = "2ce189f455c839ad1bd701b6faed3dc408a74b463b7282ee09ed01f002b1aa105f158aa25e8b6dd8f26c90801af300961ad025ba4bdd9d1d588ba15cb7fff897";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d62693d19e7463639d0c06a9d07bfc34622f5748b01bf94398fe7195f5d9639344587d81ada0f17ae43f45fa8371f6558b9b468fdddf6677a6ac919e439ac569";
+      sha512 = "be2bda3d0b6017b777b078a0c85c51a77b8400132d65276c65721092f9c3602be0b9c136d630665e063cffcc081246118235181e89e41dff4edeb218fc03954c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ae41b07013bc8908282b6683f5f161dc1e7d90c7373f9b31897c25d7b33da2b7136dc6ff94f9e0b9112de334c3c79c3176dbdedf39f09f0eae1af7809d23b224";
+      sha512 = "0895b75497a40fdcc28663d3dae23913873d01ddc5b0c34192634b0704c7d81512a43306ef8ca25190f7b590cba8d753c59afed151a5761ff18ffca45b6623b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "91b1776539108dc7cf75c6aae2c07153f61ddbaa0a46755dd70e418d0540ff752d6baa29e54cde95aa7bc4c3fc4ad05ac391bb63cd13b8ae8ff54cc4a09e9a2b";
+      sha512 = "dad44023860cd62bb141467ba6eee2624a5184c2a26cd42e3564055548bc074db34ca4aa4f6ed27df02ebd560deecf814e640174101043b1a65f2390b73ff0eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "41b9995ea1002ceff23a785e5e15b8978071554ce65358e68337bd00fb32be101fbf6feab1734f78b665b6f3eb1b25b4fd187a328fbdfe4e70824ee5f8b4800e";
+      sha512 = "7e4a048f64646202b34b19731dd0923f41981b2f1384a7fd2fadda603159d724ba02e1a07d9718a8264a3975c9d778b7ea0c9ad89a8a57032b685489c2bb2b56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e3ef0842002689f2430b8a70e2de709b18690aa8e691494e51c032126302e0c661ac4fdeca11a9249aa6dc94edbeb4276be49c1c30707566d3f5b33737677f3c";
+      sha512 = "f52bb0f7241450beb5b4321554d8d974978ee86913af213246275a44fd2470fe8aa02b1e20cae770298da7381285bf263e3cecce7a59b3b5c4fdec59a03b752e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "92a3ca10270763cc17bbffb9d27286c029a1bbdd02b341748c098161a270b645e07b5939c6cea06d1d9e8c70553e3df887fbc6937f01b336e1676d35e2f15e8f";
+      sha512 = "47b8df4d387f1155944b575cd99a5e3dffdfa241f230c9e76cdfffe0c37390713fa0c64b87f42740c87efbe52fde49f36680f549d953a2977f9db2fef0769980";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "462c88a1112a75404782c189817f52925c11d3e0e46f193b9c3a9446bc01a7675d222881c563a1217971a1d5c7b5f4780b756e6913e2ec96034a0fcfcaf53634";
+      sha512 = "bec6e7592df7cdf1d44b4440a54ce3e7b968dfeccb055952efad14fbc0c40c098cd99b41448fe4d6257cb2f292be0bcc2e3345b851686ce15b5fd1e4be3e1396";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "7d0c93e02f1b71ba5625749c0fa39e3f09349cc2daaf8161248baacdc41794955fef74d5144730972abf0e20d8610795feeb9d47d1419d397a739bf52f3d794c";
+      sha512 = "a26868c2dc5b489a6b6c4085d61d4ac194450f0a987751da1d43fcac4f0a77f4f2feb158730f129d630fc2d3ad09ac2dc7c21a98cfcd7ebfde4f7c1006cbc9cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "dc4271095f23a32c20e1ef7b9356fa5d28feebf6347b31d137744bbb565433b8e0fd6b811a2d0ef024405235f2747875f0457e9d5fbe35467ced4e79852d2087";
+      sha512 = "003c7056023bf71f3bdff0da37f8ae66cb8735598ad6ffe71758cab1dc51f9fbd6abbb82f94b2d783d5298354778690e118977b324f96b7ef4b77870226f6e6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "7e4045f5daca691b38268c721249fd03c43492f1b523465fb5fa9b4652c7d2681f908c71e204916a016683df2423f2f567e8f9f34b836494eeea97e412bae465";
+      sha512 = "1ed62850e036d808e121164a5ccdab32f2c8a25b14b06e6a57a869cb35912a9c64ab61a56820db913612317a3bc0ddc93e2d6a8b1e0b43278aca361742f16406";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "cb2c3763f087f8478abdc8c40e272737e4e3f4bd5a4c9aa39de8a54f950d970479824d32afb21f3d78dd345fe8023045a974d5aa5e4b5169c885da7ce57f668d";
+      sha512 = "2cd3d32932c1243bdf58f1ed138b23f9e954a393f43539e9c01fe4348eb67efc1879d803d1e566dda3317b87c1ed9647c542c45b6c31c9c795fe696cbbc22292";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "34290d4dd472fbd0488882cddc9fc107833a9124d68ae3be554187bc1418c4614d6a3fd0afaeab70d70f29ca588cd6ee3393ec1750590fffbeb1171d110da373";
+      sha512 = "b3e81e97920ca93902e7478ca749f9138b2d8974cb7e7d2496ad29ee82c40cd1d7c2230861d02689ab4ade9525823e52c7c736457cf1c3279dd1ee6ff3876f14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "866b566de668a28e7975e9aabb0122afc58e7fe8ae8b2200af9f1118bd279d03819ab8f8e02ff3182b741e50adac994de33edbe7f611eaa80b81c471ffa0fc75";
+      sha512 = "39779c6af211b751095ffc93c8ddf6402d545ae139ee6f5a492ed8c3b765cdf9ee626045cf189dc908f4599bb3054cbc26e70e24fd66fdc7d44b3e8631f93e7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8dbdd85fdf77c1e8bda711e4400048b42341b34d21b68221e658d03c119f05e78f870121a5f60c354163b797c5fa4213b208a63b73944fbde35eee2728d04a3a";
+      sha512 = "049c3602b06b9fc825e91ab51a7a8e1e8119e88cad178fbe137cbdbc0ca6bace8a3192970172e757bd10e608a030b5f5dda78564fb2269f2468661d95dc8daa1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "e537f0d5843b26f0e16f8c0d2b7930b604a6a2d208ca87cc76bd8b11bb18d38cc8a247c6601c0ce607df0434534e898ca1cb73e062b8b7c4a1cb02c8f41b1ecd";
+      sha512 = "7c4bbdc7edf0d7ab81f3ba959e7ccf9d9df5e6f2f5068e23bd4dd9326aef3124bc95c2f70374853a2ea3816a6d94d6c30db44d81e2647ae5bab8a84bd24e9474";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "8169a900880914dbf76027f3e7a8b7f30a00d729d8178e30c99a108944029640ff9ddfd81a88dc3627c704cfdf2a97daf5cafb6434ff8dd342d27eb72c3d8c1e";
+      sha512 = "67aff8c6cd90d9da7a3ccc84e17f064e57167c7fb253f919a1a64403e6f8e67c6ca1a578a9266f9ecb5b70c6cee22f413df935dd34d2ec349f364a69d843d9b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "8fd7b1f7cc80978f6d0658d265883bc7a4f38462ccebbef8ccd537114b40bd5eacf3195fb193059cd9e1f4a5c926eac5d94bdd611afc1e5a738688461b714ce2";
+      sha512 = "7c2248656469859d2dbf880c94b4bafc62e62a8c84cee589b5837300074ac6cdf95798f4b9d810178abcdb1005d47df6681ed3a414b0b3ba0a3ce90c9ddc53fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "b2a4c15f3b2304ebfb809c3eb654f53c13837feb9ca895c1c8e24a823ba646971df1726ea7c49510a8745f34fc6fbd004fa83b00752bef18cc7ba4f928e34a7e";
+      sha512 = "f2e22d21d78cc09fe834b2e3ecfe33a648340ccf26c76bda307a1842e87d9fbee91fa86a6dab763a477602559fd777078e507445542099885b9aa9859fe56d8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "dd8cd6dc52ff521b70daa4a2b4a67a500fc6149d23da635b453b3f49e79343a64f2cc9206e0ce58fdb2598b3240e36e5180a1ec1f21be5b47251b07eead7b363";
+      sha512 = "e8d45d60913daba14bfd527a6e59fe3b2c028c47425f89928a4933443e3ec608ae744db50326814cbe716a35e632cbaef8573ec523d41fa63cc1133d12227b96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c9c78d72670e5e707bab9d53c38b542e0eeacc9ee4e883f9096881ccccfea339e24aca35ff71c1b2f0bec63396309ad55d65ba42fcd0fbb4f1a3876001412354";
+      sha512 = "c2a32a8dda48dd2e4e01ee23231788188050550c44812460084eb7dd09d042e3af0ae11aa6bacb671046be1effab018fa0a4d601e583910c4d8c5e269963e763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "1427b96d989c898d70c4d8419742a6e647c952951843aaba95668d8e4a02f7972d7e2f1940417a6c605a53f23ce08c52338c1f4ad605256baf4908694281b47a";
+      sha512 = "45e996b79bbc96515b8d2e767a92f25d5814fd035185e34ab1b32d1f319b908663f6334a1d95a0f34550b9416d283d152feecb47f4ee50b40560cde226dbeb3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0a78c8076b21ce6ee385aaf85dec8ca6249eae73e66209003765edea31660f3707cf3ceaea55d75db08746a6a4636ea8bd18ac3a0c0b2265013c501c71166af6";
+      sha512 = "ced9591c578ea8b335b01bf3aee458ae9254e1c744f699789fa54eeea2d8918dba4431ac65369f86e114f2be597395bb34e466fdf5fd291b688a00d99745a41c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "963cdae76d22bc167d5d24f6c6c12705dd095f837cfbac6729cb357bd3a2e348d1841102d969e1446c93b56099087ac26af9454e72126c6d37eae2b1af9d437e";
+      sha512 = "b560c780dbd0776f4833b037f81028ec349681682b6e575229e7149331026356411bc13ee743c0037fd38c15bf86da39756528c432cbdb036487e91ba9eb714a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "5feb546e412702ce7dd12b3d81bf1099499ee8461c4d3ef8d0857b9516b6733902e4c554f43c19bfe36425c55dc98463a2e4f576c5ed692ff23dde051a24f82f";
+      sha512 = "f967733b7fc05009d65387e7bb185f64ad33e8adb659475f4f995f4df686ca47145ee841390834c162c604b27185ecaa225c9ccbb011dfd007355f495403d892";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "55208a195cb846401e1dd6746157d6dd6fea37fa179be33c73af28f4ee2e2a4ae3649ab022dc20c0f678c0741f33cce6cff24bc6383689b804c5c770e648626a";
+      sha512 = "06f27ac999ade5ccbe214052590aead3c7fb07e93348b10632c044c0efa4bffc1524e72c2e96c4d2ab1adcc112900f15f36f1cfd943b52718be6c78ee718c1a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c4e185972857b5e47d6199e89dde4e554c2b636b67cee70be78efd7bd06d6d0efca50309000258f7c499a3dbd5e38f1356c362f3602ee2604d9fa7bdb45e8fad";
+      sha512 = "13a99f40d7062438671c1f1700be98b88b2a612aa88ff546e9c20031e5e3c8d2ed78b801468c63312d82cf91bcafefe48995c57bb2a90c113282b843e0c5c93c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "8e2c8a07665b989389a443539c26017e81f0f88ded862d6293f801989556fcafcc7453d9d6a9d379eaefd7987b7ca3ca365ac26feb672a1bbd1717970b6f9e5a";
+      sha512 = "15427ab80ea609ef48113ae08ffc3e7f43fa375c84d6028b361a38a128a14ace80a974058d1b748f31c308ecdbf08ca9bc3e509db7a1e10ba60421247af26932";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "65fe275638d5b0b4c9d597ea024665ee75570c302296e1b8a4f5b3088ad6f23cc094f9099085ace25814663787bc973339327c1c3ef9b887338f81bafcaebd4a";
+      sha512 = "91a31afcf25deb27bb9ea29c1a859c2b6057f3421ba5cbb971e35b79e76856b5ff76486dc449485fccac13258f004d967886caba10c8531ceaa9b9f867cd0c1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e822f84cecb6b783e6cb3d5bbde521c03d73ac9597533217173f84a62d4fdebe1cddad7ca537b7982498842d333f9e03a41bbcfaee21a7b6d1a4025518fc47df";
+      sha512 = "527f8f14114648dee8079a066bf5baf07d977ace0f6e7d514f0a494aacc7cb91fa0456f45e43ae167537af5f038ed72e44b5b985fc3ddc01a7f61871074033cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "3f682a589e8701c4247aba7d79b2606ed94627f55ba2d39c4d12b97c2bfea9279844797fc79130da59ec04c9e05a722ac3a3345acc65db0a638329e136812053";
+      sha512 = "791e69665bbe33ce84be02caf6f3b304a2012affe6508426cc4daf944c6616e613062265341a3e78b75a88c4a9d70ea5cdfd829d082189564a8905eb6007e86d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8e9dd34afe39d623e8015eb63d6f78f20aa22cb9c1cf97ce0279260325c86f1999fadac0b4e622a55bef1e994ffc6c3e347a91ec1401105b65e0dcc968c578f3";
+      sha512 = "8121500520000276549b13b1179e817a7adccedfefce8727ad3cd45f3257dc404d5a72208b8393fca56ba2d00d3bd19e569ace9b14abc09faf971211c4ce586a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "eb0cbec48a71db923ca6054ec3fe908a9c60f7a21f74e6e18e85a4d7390f5a48c56c08ebb36f57b36bd517446d62a3ccc7556fb33c9203dff0f90dfa020b79d8";
+      sha512 = "f72b870b007c5b25344f384bebb58a4034895d5d7a3f662a8262660f6d8bd4238bf6bbb9620264895fac6991c7d004375c83d37f5595104eda48c4f2df32924a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "bf4300ef92802f8c635aa543156a2310379d8cc8bd1a1821921e4152ba1134b9c72cefd82597499ff3dee3b19cdb6ed7e264628499161ad07497a3e3912603e1";
+      sha512 = "912cce6d5407107b0c99f44229746207ac901c4a533f887e41214ff46aa41f3618c7acbfb38368c67846bf6be80b9714ffb4dd27d1251e19e538abeb21861956";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "aca08a08d8c9c77da57d5aa0f9313c0bc9dd5dd766381c189c361ef4b311e49e462f70b6350dcd9dddd292d0a3dd295f0180444d607a9d33eb402242e34c9ddf";
+      sha512 = "fd344d214b13dcf70f32438ddf2d4ccc9edd58112ff4cea199300f2d59ebcd6ca3a556f88c5dde4bba9af27cb570c985136fd2aba47ef6d9b8b2455a09a44c08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "56334e40e7175a49b77dc44bc2d915ef1836c1a67d71b2449f75073a113c6f87361e176defd412bce60f8d687aa07b527e5588d164e1177fb139a077527241f5";
+      sha512 = "efb5d9f802448e7d16534a586225f1882d429822a595789ffb01ce92d047777ff541535fa094547a1b8724c61acd5a49ea31f9bd976c1f1d5f637ed08aee0665";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "dadfd68b729ec9d8fceb68dc1ee65fd0f00bd2135e8163c993cee34094110be3cdaf856f48c16a0156da395842503bf52a5438795c56caf9d6ea5f4b36961e1c";
+      sha512 = "c2c42d915ce9087bfa3748c4aa1e2a5481174a8a69b3c7fb675c6e5c528c3ed13b7d85a3aace049c75a434f47f35105cad724a94f0642291372e0dd82fdd4abc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "bde96a0f22c762f7d7a877ecefcf876b6161326052110b3f8efb61a67954b93d456acc854901a9af9857005c622ae9d557a647a10fe4e8df6399ee4bd889bcda";
+      sha512 = "8155b335afc8b377e9a4cc12507e0108e02624850211c46e1d9af13488325c06d14c67c12012d46bcb95d0d5f3642a1ddf93161fb6ab0e87ed8a56a82bcb1aa0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "1174c231b511292e4528f59458f26f4ad601b2b4815c30322dd5e151e2d24e1f2fc244cd512e2bd43a46436180f83b25db61f3e8ca38164de130e76fa3415429";
+      sha512 = "cddf96afa80f6935f018b69bde2368f8d4aab03c2669df1df136419e6f9dd7de7c0662530a696f1ff164837225c41a92ea5224c2aadc21e45db8341544c9d78e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "02eb16c001278e637df52a28c5ffa9fd2565ec71b163cddc1cf0e01bc82895226d746474cea36317a43cb2dda7f0bb1e7ea74c1101602220db850bc8b238576c";
+      sha512 = "b8ccb59dd3723b71cecbb1a3b47083f718f39f3f2aa69d5819f99d58b8a9d42902df04712e7aeef34401721f693e2a30b68353df2cb7f07c0e462708beca176a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "58738db35718350a5eb1ff0ebc1fa6a7c49a4d8604fd60bd5dca6fd4718f49ab4817abcdeb30d99d8a5a0eca5374b17dca28134d554eb608c030eb0d2be59cf7";
+      sha512 = "7b2b6da809040f1d0a7b89134a8a9923ff0e43872e5c49a22866db5344e0021722ad38488f11df51ac19910509f854ed7e316f88cb6b03714668e7c580438271";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "3b2e2f745b61a182a6a1c4b1a236e6e3639cacf0c3034dc5ac510e0595cb636b728e8c6f39d5e183a181f54788a64f19c7f3e8288cd73929e4a7b96e760a714d";
+      sha512 = "c4c90865c7703935675619831db10a1935cdd995a0dde10db022890fd31b02c20387157d080c7724bd1e67d639c434db9a5a53291fe0a3c97b07083b909b8714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "f05b7d0c56278b2d4644ceb542efe21ca4a548725ba5162f82b13ba9a122f6dbeb71db227a413c37fd05590868a41fd3e77831824753b140a763514c16aee76f";
+      sha512 = "30d3720e3ed73c312e3d0cabe41bc95df6769a1b61bb9eefe8da358bff5fb2906ad7199f989242a2a8ad84cbc30b3ea8b4dcc8cea125142f1588f50ceb9551ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "af7f98c5461b365724b81b99daf054b5308933debc99cf20eb8f4a0862b27b4024934682f780c09810333799ab297750cf59b4f4a709e0387f8f98ef4fb9947b";
+      sha512 = "4fc63a75904ddad55379c7f6c7d6fef3f882e706c4a6d0cf27e990de5ff0fcb5b852fef3777f524e633040137736cfb1548f87f517e52419089c380801183126";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d8339bfff4843038367a6043eac811138a9d0084dd6d0ba92d0cf23575a6d9780e071bccd281440a496d3d8e0f8dc0b25eca685a3012032dba1bb122d4212ad9";
+      sha512 = "52f0251533b86b39f8ac166de96995e94ed1797effbd74cc487cf8fd42191fb98d04ec099ff850f053b9cd4e4c5188cb64673fb116db1bf18f43dcdfc102f102";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3b6be53409502fbc88498e14129c0ba9d68fed4bdd68833a01fba16d75d61471eabe344a3be487834e6b36205df0584cd09724c650cd2510075a54ea786a4cab";
+      sha512 = "6356befb14fb2a1d244df872912fe339ea0b2dc5148236a71a30b3f4120910fef56abae24e35eb871264db93abf1ea045342881f29e8098902935f7751351754";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "d3fdae13673f4f6c2d6d0e675f2dabbc9880805ffebd03c531fdadd0ccbf7767d434ad8f8cf5c50e385998cfcd0f16433e40fee9b280784eea815ee14c846f70";
+      sha512 = "5522edbd771cf7233e8c805d45610acdc9832a4d76a4c5951f8dc5565810ab8805810e2543a66ca36f454e068411e573f73de3fe21e34e6b32a3349de869c9cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e9d2468d817a93e73a5d547442ca5bd12ee0e7e030b6b63d4d889a8baafa566db6c5a5f8bd2aa4411bda49bf0f8eb0af6f6845ca7297cc0b2b6f5dd25326021c";
+      sha512 = "34a18384fafcd017594b94e8970da2d3521c8d90f3afaab0431a9a0d275630dd64adb892a8609a518217f097a3749ad65db646428cf28bcff5c9d6a03bdbd2a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "173de5049863b8e291fbbfb4cf1d7c04c15bf3b48f9eca1ce3759e1117f6fc64be3e37cd0548e4ad4dc8cf2be8ef6341b7745423a5e39c0d882d040ae9f94623";
+      sha512 = "b518c72b63ebea3d30575548e8ce6f15961d0891918d8e83996bee2fb9dcfd01fff9be4340b67733b356f2b77c0308727b2911317832099561b3e2ad050296dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "bee968fbc414f05b467528c398d8884c0ffe9390fb44c2c9a5d7e9807f63bc58bcd11078ca7db4e98dff470280b066ebbe605f5600d8e43782166b23bfd2a0e3";
+      sha512 = "b1beef1b4049c8b1c828ab1e201161edec47e3e83da40173be576a17d8f269edbc538882f7d5049401cbfeba409c5e668c1781e2a519b88038480993222f01c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "dde6f0790c19fb619dc408eb3a6a9abe8cfb749110fbbc8f408460c3181755d408a7fefe79c8041187891ed45ce374727a54232510ebbae3e9620d207f406b27";
+      sha512 = "e2c4f71b6a8bf6d33dc76217de9215d21f5f1d1712fa981ec8ca8c203895c7ba94190b7be51f89c9fba03148052727cf76449c6130e33ca2d4965ecb5e4194e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "7794d4152d2fdc6d28d6c4607841364fdd5211eb7df56cc0c386a581140d16fb94b5fa26035f9c1b45fbeb3dc02d6fdfcdb51576599717c551416a961ae8e244";
+      sha512 = "136d8600eb4635213d58f7ceb0550d821e937275e849e3f1b7dcc7e7aa4b4d8ad497947187f6ff5979ac5bdd2b677c20a2a3eac7029081436f1c6707010055da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3984aeac5f5d27d0a2e3797b91dfa3b23766fe742fd30b8872bf88010e8852a2bd7390c6180ddceb4685ea3f763ec7acc402eaf11930769c28c8069147fb01c7";
+      sha512 = "8d130eee3db7e528bb6d82870f29fafedf28ef474ddb4a263c41f914997a5e607e048ebe438fd16f687e824ea6917b495563034d4459e1e53c08e613948906c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f4c38298ec6bf715011b631151ae599e94546112e50888d98229818be9551f9c8dbbb4664e99b00d17640406b86ea9496d59fa620fd13be850ca77994d50d9cb";
+      sha512 = "bb484ab3c756bf1c5e591405fa22232f5e0b32cbaf0c0192edd3ff75e80a9f7773edc506c601f8b11593811c14636abff7a50a1cbc0944b664158543b8171052";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "49e5fd356f031bf60952152e4e7fcd0cba651a20178d220d9927089639f783d2b866f79184015074c77606209a1c0a455554a6c9b454c21b46e3a9f083c83777";
+      sha512 = "618668015e76163856467b2603000fed75505bd9e76d1557dd290b7a92da467280ab9ad30fde78f004ab60f883f783faac6293196ed9fd409f9b854e0ddee577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "29c96f619912254b644b479e60a38f1532b140cfb14b83c09e9b1adabbc95ba0b11b6f67b12668f194164d933e1bc4fa4410ceb33ff2511096765d2b447eb434";
+      sha512 = "1445d4f5750b9100c5340c354c9b6c67dd2be5b73500c70def5c1522d0825ff808da868b39a60ec509684e77bcabbdf0816666f14b2dab7d5f48c4b6282ec1c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "80929d60bf83d81e732f2dc0348cee41f43568c8652d16a96a46ae10107f155fdefbd7755c149b1522083e54b96c1fffa84e21007f27f8164663360d662b0c5b";
+      sha512 = "388da3ca86d5c9ba4adbd3ec90834941e2148c57138e6973628caaaa32d44ac8d18f8f2fc584dc43f0302c4c3568d2b6cadb94db40ab0ff24020e4fc3cb4cc7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "313722edf4b082eae40b4eeb2c5b382606095c84e0e112024d07552e1d9ce3a4ca0fa39679f574b8f41074e7e850a94db034b452624caacd98aa3d837662b409";
+      sha512 = "62423703ead40cc91179eccd15f9b4ffef8072ce4f236d3a1685ce666426f8a0bc670da82f360dc8c2dfef4b927ccd408a4466b7382999604abaea11626f9149";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "2b819cb5bf8e1fb80604a98d134a94de735782b8539a89ec4a542b7bb5b795cfad173b26c66c77c9f518ca1edcd3b3946225a7475253bd948f44939453d20d26";
+      sha512 = "162d7d4ac4baed3c16b119ddc5f3b0d71dcbe7e26a3977ea375776a033a9995be45a2069bd50e8bc378168731c983f36bb8b6b7f5551a1e10bcc1b9b3d471b2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "dacde472539682785a79ae2fc01918ffdcd23e630857bf0dffb13eb53651217dc081b8103eccafe62db7b5aaa36c33268e8378bef51a01111249718251b4215e";
+      sha512 = "3fa114a52582387ba51b04729c1c4895b29c33dc743cb9e4593750389cd9d943f96cd127fd2b49448fed527bb1bb36ddf4579ef78502f66925627277f02e46df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "8ce645014642c907d309b965aec5d568bbaae65805a8331ed4726a9d404a1e8a243763c7a92bb85295a541767305560a2e1b5bea93ba6b2f96341e3587105a29";
+      sha512 = "62d16ba8dbb06fa54e1f4d6a383959740a466bfcceddeddb19dec45ace022ed272913d4096b43050bfef3a53c43329499794d5abfa9a6e911fd35a0f8df31cf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "729da9849d664ed6e2cbaeeb89f8b81d1de29b5f28d599d26e0d14e9d1a2daf1b37c8de769435c2dd7a88d8807f76ce7233fe629b0728ee063b02828edf8b984";
+      sha512 = "02fbb3eb9f13a8f340f5fc5c340de563041bfbcd77bc1f7f701b5b5eab6463bce6f3110e962e4c1a0667f3dbadc234511c3ad35718e3d84ea30952a178f56e7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "f4af9658e7e0074ffcbd38ed9c2a8a131e279bc67c86da47f3322d30c5051c4b41cee8d7b61bb7faf9993d8ba41ad151681621525f92b50b88e4680246eaf2ba";
+      sha512 = "10f64025be270572da5d3e35672b2656f902e896bb3cc7fe24e99b514c4647727308609c9e572f89f836fda677ef00b6a3be4ea4844d966437d53124605144b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "30218d1a8b550130520018af0079e9abdb4e78642fceeee25806f739ec079f88a5df0740c44828678d865a7ab242e6805a7d632c41fbc2c3b84f44fd58fd9cfc";
+      sha512 = "8f3db73e145bb4ddc0606bc8adbd228dec27b20c6bb5227897ece926df2759209966c61a2b67d4e6618fc205616c187dfd9e26e63e09ca761b2c9da3d53c113a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "809baa75d75c1cbea94e9934ed9e445d60f3f0cb37b9ecbae851c342f0477731de0fd5f6170c43863035f5e2633ab8cff960729a9f8594c684b23d5819192ee5";
+      sha512 = "f497c48ed108134f02d977eb7f0f9577eddaebacf3f1d177f95b1e481872b94ce9f6f7c5914d6fc1c0464fe999670dbd3a2935ff76d139b49d529b87adbce5eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "440638f35d07edbc4f854924f60f22cb4115634d55e2847867c11391a950c3c792afaf2e35b3090764acd8512117a1a04e77d060ca2d9aec12638d00c2032245";
+      sha512 = "5a827468b04dcc308384e95017980d87249082e894998c77662b4d455bad5e8f91134e9c88ef159f89af974029302249a898ec932e01b4bd4d62c0b79b31718f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "df6b3ab4c53799b6100722fad4f20403d1a1e659b17d66d21f65e98e3b335b0c7ae8a9a099c44bc8952359dee184f9acff836bfecab6cc09c686a7bb3d9d6599";
+      sha512 = "f1bae26c1699036a832a021f0336ecfb8b61a378cf62ed6c8cf10c3a65e6546703474924b5f7145f30c2e9a458545ab6bcb999320a04bbbb65022731a23881b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c3ffb3eaf9d86a42ce281f97cdfc942081d14bc671e28543603e135bdbbb527a004af13df9e7cfdb1846c9cb42d4f2162b8ab63129eb447433ee5f47baad3ed7";
+      sha512 = "3df882e3542af5a1a82e344cde5f55f852f863ec652eb66f49e6f6145cf2eab3ea3b7f5a2170e4ad87a5dea0264f5002eb8d74e4e6e1662e3aece695ec6e405a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "7b1f231f3add4b70b9f1f2d2801237dcaca17e4d0b0e0ce5934a617dd73550db4b36386b1997f835bd4712313fb9ce1752a3a972d77dd0fe8f1fe51364048ca1";
+      sha512 = "235ad09d75274a5299226a99911596b16b6b3facc19a896865dfda2467d2352446187a1ae6b64259ad41089203313b76d8486c869aced85bf8aeab692b860879";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "2d8d1b61a9609d5e69b031e51428cecfea166b8bad1e2c928cde2aeff0a5a105547954235628f3d67031ee6b150d800a2dd09235e69af8e61a5046a80d74cc38";
+      sha512 = "b038b36b0cc8d0be3bb02b6851e9246bb849ba835cdc160c48c53df9ea5e937e0ed57c1d5e6200b11cf7c751b2f0e5cb69543d2e781852a9ae7e612a88a78b5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a8045c13e33f28c136923abcd2131deef56fce717eb0be77ce750f80d1f0617b6b86cb3b123eb2da58bdf543209cc6b6c803cb3dc9a53b3cc6e23c98ce6b678b";
+      sha512 = "12184beb0c93718200e11f17ec53f71062c443881482a2406d558f4c76652e81b2c3c3b9b5750a03a06fc1460a31f0146062e94e6a13736d7654649726c2914a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "4e89147ebe166243ef1a551f7943e3fca44d5005f8b8386728c3d9d82352cbdea004467ba7ccdeea5a4710bb34605217ee2577e1f1c534713fb52fe55aa0bbcd";
+      sha512 = "0237960a4cfe37ac6c88b9df34396c19287c9d8fab62ab6668fd5aac1e2277d9c1a8e468379cd8929a5ccdb5e86828ccc0fc4a33e306203989764745256564eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "5a94e9fb47ff68a2f5a07100acf573d974222446bbea110e11729286b64e59d1a1a9df91b93848b47fa9a8e3e3471d5d4973872ec1c6314b3a76b852459574a7";
+      sha512 = "01acb4ca4726ae3ac8daa21aa0acf33fee71777f5dfdf496608afd8bd33dabb3c84bda1fd9c13230bb7b8c956db2409821f89d4122d9fbb29d8678cd8f9607d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c11b004d02096e950c59f77ada04ba557ac37e9d95994a105b0bd76e8a9193a0e66f0a3efbf724fcebe96e77a5940704c284f79d48f8865ca1907fc2bc7adc1f";
+      sha512 = "b2384c56a236420ba479a8a3e24ffed3b4596e8af8e46b868e718412a05317faa6bc7e0c39410931b31cf464f24300aed3e23c66a7cc3871ed88dbdc31c07aa6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9d98fb24d1c705246d2535a1bcb5ee38d84930ee609d15d350e3eb8bc905d1103e7e1f1cb48642ea6e6b99531e74929497790549e9ee9ef9c597bc8f16a827a1";
+      sha512 = "d6b9e43c73bc9c38e93211abaab22e4f04bb68f31eb8351fdaab6c45bd7b70fa56bdcf3bb87901a569ea9917b59d7054bfeff1776373099268689238136dbadf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "767d109b2e7bfe89a01b923c859d6f3d3f1050922cc84df9aef775cba990a2808bb839ab1b2431b3c6603b41d0e757dbb64b1c766ee150aeb221900bc9e0fedb";
+      sha512 = "d5e303c5182e218e3e9173483e32160e78c9a1ec812142fcaca35f970a043a08d6ecd8e0a4de1ce06fe58569be456d2e44ec5a3ef234d5ebe4fb9c8521d4748c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "3dc103b9a807abf43816db6ee9bcfdeef31dc21b969762a7b1e9f4fa06d5ff6a57cff134382b6d1d578c80d4b902232a7cc79642a68b2e26680887ee172ed11b";
+      sha512 = "2b32e8f2257a4fa7576bafa69ac00b149d30e1114a0a174848deaf4cadbbd6b7073029515ae1b1e5a905bbd2dc53346507e8fb8dbceb625901bb9dc44da3ea85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e7cf35aae82156bdb4dd023e5a7530fa431f41c0e4f270aab89a64a0aa02dda228c92dfc7aa4ff289ccd256c543bfd74622c6d44ccd5b48ceeec880b394d38ec";
+      sha512 = "53a081d779acd8d10e9591c929c5bcdf6122d5a9f53a9b496556d4a4a7efcfad783ace2a99af5cc11ac295b16e1a055658b1b2cabb8385da2a99494f41280b91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "03afeff083f483b274a8526a4418dda8ce7c3773a60354aea26498c7f006445bd6631357213944ecd6996a5a4508b96797d44f16eadc5f1017b7fbc18d0bf3ae";
+      sha512 = "473130d04c3e559159c9801d55961fe261b8f45c593e7b869c31eea4c96f4cfc517a35c2f505c8a45bbc62405bc04d9b1d941614f6d9b3dff6eb8a05d50ed934";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a8d2609029d28f8d2b59815bd8149a2473e06227fe710c77e2e72044663ef90e65105a32a7ada47a6d889d6aa761dbbd903b61ce8dff8100b052b54f35f86b28";
+      sha512 = "4f0661375fd0bdf67356c9b742095878e2288324b23da18c0f9c105c6c0f7d0bd8d4920423f4415ba9b164417936ed8def36fa945538599ca6544abafdade820";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "1d073bff96a15bccf6a59e11a28eb0231983a0392069cc785ba8760827ade0e52f511040941b8e142c6de91621bd928e218ef4832a95439102644670b9be3a9d";
+      sha512 = "cd861dcc4e17ea389a42deb66feada2e614e91eaa8f2911de2c7e7fd66257759f937fcd96b2eb976ca7c605d7ad37cc3648bf67ec944fd93407ab9918553a6bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a69b4ff3b9a452a56e4ecc07c09d6276b26356bf35090cbefe9be419ce4d1a1fd772b7013a13fbe4f39fea495c5191575971db5786d3c1edf1b4ac9acac33323";
+      sha512 = "f1c0a5ecd076df26dc635bf0e6f6f43e4c00135f914b9393462efc6d969dd6ccb662df1c8745478952896950dbd216cb4dc88e0a1fdf4608a926702eefb4d835";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "987863606a8f68fdafc8c61f206db6bd8bc358157f28631fea598872acb5ae0ab6e56259134ef3ea46f5d74d908e49981eb6e8bd80e32a9cf1de77b6086e1ffb";
+      sha512 = "2856270b337da7de6be743e3ec3bd2badafc14920a46d11e2b260daede010588c9634c2badb7b402b0247fb770f8b0c869119a1be8719487689ff48783c35753";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "3466e0bb5ebc426bddc9fa70f4c84b6c07e997119c707a3638b726c335ec8cd58fa9ad038528de4366ac0866b4e535b2a6ba307c0bd42a3590f55ffaf6fe7032";
+      sha512 = "95d8a14c884976c31be1230cc1f08706b8f1032d6727b0a88eddc8d9a2b1941da783d9113dba9963f5a3615d515a7906906779f8dd0d445220ee6aa633c2f6c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "427060dbefd340c2e5e0006b88c40de5a63786afa7dc7449b11493faf66acaa4c17dadccbbe8c44ba4651a4a44d65932a9eb17eb79280e4cbf2d10696077bd0b";
+      sha512 = "c8f5706cb28419c2ed311b37dd4391898e5ea55cc70c3da9018eeb104be696d80e9eb6e22467601e44b3b11d48695479a9448b97b06a37b63d042f22056255f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "d4ad81fa8aa8ab44b63421d16d7cea36d900bf4d374e4c5a167c46e3480b459554672815cc9e54f02aa3a53f1becadf675e730799d57bb4bec4e245a78718aee";
+      sha512 = "db68dedeed06365f5378c91241ba21474fa490234ee2f0e8ce8d5439879bc7e79a6b8a81ba4883c5b6f9eeaa86c8fafb4079681eda5c7c1de13bdb7a6587967e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "c933f92ef6e972c2ede1f67852dcdd47e7f59928a3569c7fb935b538f8145185e2b460242feb6ec58f064c6581e44c046d568ceb1e96b5617821aa1a5cdec7c7";
+      sha512 = "d450c55f00b33546a37cc96b2daad0ff9d9bd74a4c8219fe2e584e683a813e328059851bad48f597c60c0e5afbd15ff5f2547249e9318ed1a4198f8db43ef653";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "49318119e82876c99741b7829946d124db7bcd4833e014996842399bb8cfbd4f2f3374d4910ff208cca558da027dd6a6041c2d66e4026c6f1df4be199e4b9d9e";
+      sha512 = "3da1c044fd4abad499d44fb4e30942f6e92f0bf5b0bc98badf4cd7a4b63a62bf7a6752483964112bbc9fad91ec87ed40cc64fa5cf9c14edebcce22d78600e352";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "2e5e74999bb921e1a78c491f9794ab04efe4f069d2403757797e4aa408c41e6ff3bcaf9d94f786a407fdcd085ce57654a1e7aeb7560192827d6bc01786fde7ee";
+      sha512 = "69090fa168e4acfd16bbf9c0569b2d537570cb798b8d2bc5da26911c1030063ba0f1366b6453810c31038edac5fd6fbd988efec27e923d08ac61a2e2f654be4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a50843752c15dd9ddaa30f51188a4992bf9624f290f3179a95a93ad09c3b5c0080ecde02005264c7364de1d072a73a40159f3fd3b77c481f5f301604d1042db9";
+      sha512 = "86bdce82f04c68e32e581d32ea1dda301e68f39a93d762d4e40a85def20490d54cb62ac4baaa4770236b098bcada9d9767f5a6bde263968919eeb2063e5a6fa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "9e03fcbd2e10345eac1483934eddecf6b0469cad4772787b8e01733283bc7655faffe504a424031e3dcd6fd27cf40148dd0ad82a9c06861f64b38fadc9e189c7";
+      sha512 = "e3089af377c2f5faf97934e40e6abd782b4b518abf1bd6dbc9655dac192523051f11b1e7a016465c76005d42cf5382c21ee02ee65b80cffb00384e0b9f0889e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6c969e22d53d6fb723f5d722e1ac2b3fd6d3970b42a2971eae647a1c1d38a8b5f5456298751ae06e02a17ae619f613459da114ea8d335a29d068aadae30446f3";
+      sha512 = "fa001a1a31036a26dfb3914a24cb882ca3d5065f0687e0bbb4e33814dfa16f5f8f5d9cc44d24e664be7e87a7ef9fe21d2111859150bedc6f30d59e3badf9ad43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "009a49a7cb71bf7876d7c0d52ec1145d0989592a16a560fa76c4223e5d71c3f0523a39202928f00f7499689d030afde1e21808e504291d70ba7cc7e5bc117c91";
+      sha512 = "629a28f9a05c758e1d748206cbd81db22fea7f847b16e42674717ec8ea33c035649d82a9418a691aa31507368fa2ab91590cae207439031703c1a8c8382d6a7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "da95a2bf55806687d77b52cd16d2a03e75d573318eb3a4f8b19720914e13cfcc965975528d21439da87b71bc1ef6aa7506c12afd641100fbd7ab1b58017301c9";
+      sha512 = "5f5065f0bc2a515daf388f70d503743fdd2d55006b4bce58c9c85fdb06644c729eeff3a2ecea9b2a29be1a0f94147838287d9c7624e44df60014a1a99990a050";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-i686";
+      sha512 = "0fcdcd5a965a8cbfdb1d0fab0419588b63b26216f65ca206052c0e36257d6b6d29a4c2639a0f8fe456ff8458e60766670a022c84f18426a60c3f230282206d55";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "b969bdd2d27eb9f5ef28de7537c09d7939534dd6cec2b5a95a32406e6b3c6687f84498f990ad2a353b5e4db38ad7a170649467688dd3fc51cbefbce3253f7a2b";
+      sha512 = "a86b3ed1e28aab56223b1a8ed7d184fb526b75fa27178eedf676909aae0931cbca7948870d50966b08ff7ff3c79efd037ffed31a74f89f25d302c2fbcf8d4952";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7c020da300a1dbe494180fc8299d42432f32b6f473ce4bf47b30105db39789f2ab07c2a883c1443202f39c4dd47eea8221b0484deacff6a90f4eb6cd4b8f164b";
+      sha512 = "8e844efc0fbaec678092e97594aa4afc57b40ed6f8b38685a680aebfa4344ea6813a2bf2a93452e9b24683713493c5dcfb8414ecd51f9e2c334b1a5aab7b447a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ad50c7a6539ee8b2f36f6420b524055f20880bd01cb118d6bef124ea9f1acb83148078972118fd6628394ee0d22215c26a1f9cb5cfec5713d5265229e0bdf681";
+      sha512 = "a74566955c633d173c9da3c0300e8e8e327fc6fbc063bca00b934a2ef8dc4fb75e993e9ef263f2aa4709ba90c33593e990cf2fdb0d6a9fb944145c31e7cbc667";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "4f915c651bcba9581db961e0b5e66c15db0cb72298c5389183f0442e0ed18c84593235fcaba2274ee62ee7ca7998043ef9fba650a476a4017a8e066825cabde9";
+      sha512 = "e7cb5bc617eeba0977a749d5cd16f0787d588e73e20effc0a755bbc85ad9d3d422fbf0114a290a959202b0238848f7f525de8f58fda0035755acaf405fe5fca2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a5d9f49caa6e20afb8410f7668d0c6a71f06f5dd413e004183b82022db92406f752609ba6be05b27d70a8d68e4071e3a42ba5bebb8bf32e3cc074df4ce083bee";
+      sha512 = "f97c705c1973122181052599a81f44710d0a1a9a7369384993b2636653fbeba2fa77a30e2f13e6dd359c6aab28d55a3a0551180b4934bee35ca79201b90d4f23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "50ef735ca5b2987200978e2df10df33ba9fec6be80cbfba63bdc4a6409c6180080740e5e716cfaf4c536c0dc84727431e16c08d91be93abefb214a4887653492";
+      sha512 = "c4a743e2ef548d26e0aca8392323c63d3a55861e5e9dd35f1b1c7fc4ff8b44aa54c5fb9261ea98b0a7ff4ca21edd3ff46e3b8791fda9927cacb9e75440092047";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9b38d3798a880ea76f6f378c0458cd2aeb7887fa53ec89b9f23c6d5ee98ec2b4aed0f3708b1a4fb17b2a818424479643a3706a812cba3291ba7b584392648d8f";
+      sha512 = "9ee0dfddf90dd63dc1069f83ae2d70fa4ceede0ef535369aeebd2629f35b3c54bcdc05ad337910d5e860c39ddbdbd82d3d6c3ac979ee835b16cbb99705594328";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b772760cfddb791eb57c23ebeb05611b311b30041de8f286f639beceedb6482be36ecc183acfac4aa9f280904c2275c123f3e71302aa3b139f863ea01c7c4966";
+      sha512 = "6ecf4202844494e297bc6232d05e9da34dd11ac2a3a19d7014ea54ad27a2accedda42c31fad1144b22f9cc839109deb90bda9592b4081a5ca731f2a5aa5c0237";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "1934317eef2a5af831d7bb9fa493584956a32e28f7e22b7186ef8258abff504adfd936f473c9f2e2b414a880a2d9b6b2b09c9a77b3fd7060ae8e5254083a3a3f";
+      sha512 = "e772139fc6618a7fad213c710582fc9bbc3d63ef364e83f92ff72e66d361e25ab2af750df7b8f53052ee9be8d5ce10cf9883c64f331a219dc3c4f4a633c53ca9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "fb4c68917e17b472a592474e1370719c102072fb70a97ebd18a5f02e5295a1392afea4936c5f79aec041ee6f9ae0056a74233b660f55162b2d84562ef86e5265";
+      sha512 = "169abcdcb9e67b1a1cdb97398a688f0f432c525480e1cb47f7bb85f0bd9cb5fd2c58d8511e1e5fb44e93ffda3917abb34b5babd9ba4cb3fba76cd962eb6da9c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0255e54036f6ca78213414c63d40ca1907d597ac4da1a6f7bddd6bf307d536e710bb9cbb8caefb8f08def99f1fe27f28d22e076f1c7e62fae4ef1cb6d093c51f";
+      sha512 = "94ceddceb154f0fa0f70b7febf3a8741d7fbf85c2345220f9f3afc26622118ea23d4085aaaad6c1be92a01ef5e8c507d4035b70dda0363ea1e362666d3aaccbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "43dd5f557382d9ab69f8a087dbe4d06e71ce68416f7a88a84978d1a6a9144938e12e4b9a50c3c42ff77131be16aee474a4a99f092a95671dbcb76e367f95d280";
+      sha512 = "4c59ab3169489e9411ad97b23116232ea9dc63337bb0ab31b36d5051f39c96fcce3c5e5e23e7ad65cceb93f21d2a194f46a2884e639104fba6bd0e2b89e74592";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "55ad59358e6e84204ea33f7a98436283ea7c843de6ecfe7f9feed24e719fb8fadb5f4de4d236a8f0490e56588f2574d3904093b6b3e9c58b2500fa04f302cc3e";
+      sha512 = "31c31241d1b93fc5b4e8a543b248b92e457e4c454c0a9f2c4a36080560600c331ac68baf2c56b0284547bd32082af6a7bcb5e217f2b0e82a696411a8a340b308";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "871214235400256f86321f95ed1a5d2cfc80bfd892eada49987d6e1330901126922439a55ad03be84a97bc92544ab145892eecc3ac54e350876b7a2e7d2773ad";
+      sha512 = "3358555e67ee43160065b0b0a74ac76b0108eef9e5545a00d891c376e1f75520a982534944fe4e0991da4af076aae3f389527b272309e3bc507692b2b01eb1a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "fd98c7c2c7347f36ddfbf3adf1e3b5059cabbce588785bbb522cc0c43ab061f0d776757633ad801efc53b769374f3f71bb810d07648aba98843ddd2b6bd97322";
+      sha512 = "5a84e72b7e84774e56f13a7edfc32ee7718171616ebdb2d1f031965631b79e08e5a5a392bbcb7a13fea22b8aa87a51a3d21d0ba8c471e507d5cc4171de9508cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4346ffc1367a8892c49a42717056d2ac46b5ad6e577a6b018fc08d673dd570a7ef2de6c6db493ab7f6cda899ac9a90b902c7d79a2ad8d5fc9dbffd8bbd5be32c";
+      sha512 = "ff1221835cbdd6da1697a9f915ead88e8b1f0afe2dc33e001079143424ae8d12dc048985a918133b26c17ba7422dcaa9db873af1bbcf1f4add68a3e07d86497e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "7c361450f296ac828068a97d9d936219bfb588d5dfdd79e8ce05839ea2f9a530736386ce4945d1b740f5582abe1a4c61ba0185632a0ced948d110c867e819d6a";
+      sha512 = "34be87c79fd43f8d1e3da76a7f037f7dca411cbfacd3b7a72420abee9dd2863a85ea38c53d58bdd124d2d3510fcab0328ef1195cc332990b22400b90a6061c05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "7cf88ac5b3f8d3e32d337fed29ee88bfdab1df2c733f8f959c5957dd4c3b9b866792fb56e776915398008f1f804544e0b0d1fdb0cf5fbaa8a81fbbf12f386b7e";
+      sha512 = "78a0814b6bca4267d11be6a180836ef275c41c9b7e29e821ca3559835a5451b689c0a4a7c771d51726641d04e1fbc83a415eecf0b72b8b7ef1c41e0c92ea6dc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "f4816172c5979b7b3bc4bf33084f319bf964876356b08a32d2337e7e5c599596f41f4e4efeb5996a53b462635f4d2ac51bd95978fb0f00fd74596f9203f1d94c";
+      sha512 = "1549118be4af02a05465267fe48720dea903e1199c33980dffea6a59bc90d31009c61b4414ea57f03a59e27182b8fa6e8e6c95eeb97a88426d3b6ff67bdea590";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "143e683fcf134dd6062ab87569798d34de1f3bf53ff2d50a73b35e2cc95d83d02654a047c7530cc5c1e34ddc791ce9d455ffba9f1f93d8b782e0968ef41621b9";
+      sha512 = "f8c1c8b9e97d4c09b70d047c2dc81b9f2b9342014b5e928f11d0705f83915597812d6ea71daf8e315e026f127b18f67161f116bb6139ff135181d25b0bd4ca66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "bb82ed997dd8d2b15f3881325b4f879b8eb49cbbd661da99994a54be21ceaedfa3901fa56214936c5ac05430035e41e9a0ac407afe73db289dc656f70a2199de";
+      sha512 = "afb767b85b674d3c592fb7f6175cceb14f917edd68d2f272b3560450f91dcae5a30c84d9869a08418a727ba6e010364752b52a22f3fe2f0a881ca01cb137306d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "d2db8f09274c73d63729fc32fa8dbe3a51f6421e16a741ea39e6cab1bc3d0e833fedd26678e68ac92aeb2caf01cdc7a02bfa518391ce20f9a0855a498297a001";
+      sha512 = "b33fc09c365ea57136dd53cca5a5bc54a8a5675e37716519a419e0e24286863741660af72cbb73809ae2efa0cad9828d523fced2ffe7c25f7b99781bbf74c382";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5b964331ae4567f12e3241eaf30a6d7d13b4da1bc4cd300a86d8a3a4102c6e8d71af5e6cdebe8a6399a2525345fcba06683c06216779aa2a6f375a56b0c71e53";
+      sha512 = "6a03c39d8736dde23d1d9558b7ba371840a95fd5f74948e63ed4f9b404ed478815950c196bb18788d2b883a68cc4760ce329e8b110e12c355655ca8f52c1ad22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "56556a238bc874e931e56f00879953bee1903ad1f1e67e2ae6dcabb8f65c97a74feda0f98d27f3e0a28b2a813d66d956696f001e08b809901e3bffec246f8f66";
+      sha512 = "1b9b9907386e7efc27c28f602a4915e8b9863f5ef64748f44ea7418f7b48eec512e19e906353abbb92e4a360d8216ec93675aa890fcb9de469dc4d800b0e5a37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "cdf97069df00610f1f964de5aff4dc7134e7cb27768b15177c03b96c486b5856816b685a6acd5308c0e334672d39ed094f35a2bbe8046465f8ce6c9ed803baea";
+      sha512 = "7d97a23fccd265da8403fa842458f4fd36c7316dd8720fb2d2a9a3a6ef1ca47eaa007a72348b8582d891ed2c27200ff40f62cd877dbd72ce213dbb10f64e533f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ad5266e66e06bf5d0dd674e57bb368e66917beda800cf58eeef9b5dafffb2f6272ebfa67e03a3a0ffd2a6d9d273fb3f93e6feee011e8971e760d8af04ec91330";
+      sha512 = "f027e228551efdbe2aebdc1244a4495b31fbe3c713adf4c8078d6cd65997e0701a1813f55208b13a9e51e6e80637c9e6d08571f38f1fa8111b42f6d463e819e6";
     }
     ];
 }

From de08384909bf5204cc4d3ae0faa84e2500f15a2d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 00:42:26 +0800
Subject: [PATCH 1128/2266] firefox-beta-bin: 59.0b13 -> 60.0b3

---
 .../browsers/firefox-bin/beta_sources.nix     | 788 +++++++++---------
 1 file changed, 399 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 224af61bfa4..463b476f8c3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,975 +1,985 @@
 {
-  version = "59.0b13";
+  version = "60.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3385d1c5540bd0066c90fb63b2f18105085092e1d89ae1a0badc9e00f8392f4dc20b65ac6a04f22239332ca1ccef0995df433d656d6b105be03c0129063e7198";
+      sha512 = "803c819fa3085bc868ab3295ee1a6c7a6f7dba69fd5aaeb54244a561c252ae7fa7b710aaa13b7f8b7810145a737dc6d20e76fa35e85f3dad2535614681980245";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1eaa00e379a4f3dbf162edb4a79b3642b8b16a882e6b106475ccbb962072e6148becde4c068f41cf3061741d30ad1cd72e5b04f587eb9ca9483e248e8366a522";
+      sha512 = "7cb3ce289e989ab70a472c6cedf97f925034d5762e2256d6a01c992c3913836c8f8f7e202a013ff128b8a1db97d8e683bdefab19e618c0c819e7a31643eb75bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0cb52af20dcec4785865a479096d211213257ddf19b033a2d9b078727192be9b44eccbb548248e32f0f4a19348b5e8c5ebf27c8dc94f1872d5ebf3e369b74006";
+      sha512 = "f454d77c05721082b759cb550ab2c0f32d7e788ed5eeae2e3706ffea040d5f181245a2c7e9018a2050139606b460dcdcfca92dc73af99e92deb9021ee6be2839";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "099945735a3fe0470eb67f50fe1e2c92f49d7d34b5ca7a1c35167eee05aadf705dc6a3f4fdbeb78ff609c8892ecadd2cb32cf3a11cea6879f734220895172982";
+      sha512 = "d876e0a98aa1a702850b9ab7a3c3b3954e6f376fe7ffa32e6b4e22f5a8d8cc3568b3c70aa636c2af8ef7abf0d05c5d7895b8320ff41fed2c251e0eea06492480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "30efe149f3f941a19d47ed8ebf0eac53997397f550f56d79c548054df8e14cccd5b1b3d1728b5d9f347cb2e373eff2f2f9403c1741f70c43c958b7566d70a55a";
+      sha512 = "e2cc66552357ccae9136b42f93db1c6b521e514ccfebaf65d5b635b6f3a1a62e66113c3b56c50806d77aa8c8cae53240b83f5437b3a28b2bdf735713ead45e1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c962aef0f068f3dcc3c9fe82f670b3a2de132ad761144fa009d052622f6578bb42875e39fc311265709e87aac58fcf62e60b0f0d5f98f05193f385be7296b35d";
+      sha512 = "9334167e1b9f236feb5784bf0be7dda40bf7be9162e57691e605cfd9a9e3e499ce6e5ddd1268574a0e637b5e62a5a74078a8bddd27951ac340c8e38ffbc43f81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "994d995198817480b0f4d198f5a6289d4a380a183b2e350054e6efe1d77ca3dad5c48ce8aeccf5e4813047fca9d856bd392614d7adfe49fac52cd950e05e0bdf";
+      sha512 = "e46010f4d7f76f88569728563000a35ec35fbcf48dd26663f93c774b1c321b5e7f8e0c4bb7c9a75919b01ebe70ca4eb211536714fecadbecc8fa2241c2e6f2ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "48a60eb7e794fdb5f060f2bd0e359d22ee14ac5916819fada7bf939d07b31993dbfeaf58ce6906c40890c4b35e7edb47fa3f0b33f5d327d649ae5fe2417c5bcc";
+      sha512 = "fea813a468c20b99d1b817d57161e699f4860ab1e114204398483b609872972dff379d7abdf20d383ac8432e2f0cd703de71bf44607f3baec6ce206f070f6527";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "caa1de35213a8bc492bdec4b003b7b4b072f268f59ff0ccde04e69b64aefd18ee2ef3bc1fca698be4a38251fe76863f8b613279ac060644d3c84e3191977f2dd";
+      sha512 = "38658a9c361b2ebd57bb6da00a30bf7ff1a071e75b481007ae1b9b30b51d78b60b9d459a4b935c964f2625dd83d90e2e392a2fe1b6ed03e3e7139f669b2d07e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "466bf0e7394dffbac4f58736c51dcabfb1d9634baf73d28af3ccd270bc1267a51b5c31802d48fc225918f8b15fc4291eb5e959802804510f5967db298e6054ae";
+      sha512 = "b17cb97ef70a7667a114c2eb8fa4ab88aa2fdaf09055c1e30e6afc245a4d50eb6f2c3f817d176eabb06d297257f468f1326cc4e17c6a1652f501070780c19e2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "034d37ac4aa1fb38b1aa6181e291e16447a270d5c21196469cbba33be773364614e2d2cae415674588c460a107a06f30a8d8ee663a0c797c621f0d4618c1588f";
+      sha512 = "924bc64e77ff15665cada5f9431d5a34fa71ea0fc57e9d7a57879f52b549bcfdf336af0f11b00861d8b4e8d60aa4c8f7cf0b01d05a5c1bbb0ca4a89a6dfc6caa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "f38c6cc0fc8ab0d0c7504b427c88081b5d8d456510aa6c0a8e1a14b013d9a9502008c4397850fefe3dbfe28d0da57175b1d10824f6feabaacbd6c44a03ed283d";
+      sha512 = "5c85992f95f5b975e63eff88b3595effc4ff74d04610a86c5b27184c24435cc2f3f22df06d1a7e84893ea2a823bfaf7da9f534fbd61d2e54e193764e0c24a19f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e93729b7e94cddc446d035fb35dbfe74a7582bb553095a62b4809c965453a172654aac5268c3238d398a9f46260daf206126782d393938b4863a1efab2a7f78b";
+      sha512 = "66cb534a5d5a770b58da042a92b6536fed714cfde257816e0a4dc611b6ac450ec364df8265e907b7b5482faffc8d5e200a86f40013a7e74f22762170d4c95d35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "fbe2aea772370a83f78bc831d4ad447ba2bfb48b462a085e01aa44aaa517f69002b905523a3ecaf72ad04b41bc0bf0158042ae9d492410e6260bd180e8345699";
+      sha512 = "8486b3d9202fbc4d800cfa33510b645af94b6fb1c6715ec8e18f0cc4d414f87e4902d615b6b46ff0eba5bfb2c2228c05bbf53a927fd9c52ec7f0b1ac4889026f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f272b29b440ed9dd3f520539537b3822f79ea274c9dd887f0bd7b352fd25d54850f8c3d3de77ba23d7498d789c90659c16b68df139c325c48cb5bd23b9dc6fc8";
+      sha512 = "2c46b7aa34ad5eadc9fbb291fb4ca320676e37991863f72bf4cfe2266a6298ba3157d1a0d2fa6a056661ff8474d988e103e8f5b215cdfc4c457c6b7d279461c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "562a7feb664d7fbd1cf46a611cc47b275f730e35af4a5c6860aaec54a5ef3a9ea25b56152b7a6f8b0a239b6c30ba961d1f6584219659a1a35d3395aa9abeda7a";
+      sha512 = "f9be3db1e0436c3dd4fe30fc3e93e05fbb129fb5f666d912115cea17c208ecdaa0427f4446f38f190165b10c3288573574a6abaf20288ff9d68d6fae200af7dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "811773221c9df7778afe17d31bce17a322247ebab55461b34fe3f984afec96ba44cd941a781915433ae54f5eefbe14c9e6fbaff6b690c69db3504c5fe3c1f678";
+      sha512 = "4091caa77bcb1d4602eb0f191949a88cef0e0fac5ab5b601fb987c1e8dd47442e9b2ca30077308fbf57f71fa6cbdb85f67df3187b71b4680ec2a51d558211e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6fc0b8a04ee1a03b8aa7647a409274d642827b284c9e19b11281369b6299b9f4e17cff942f297ffbdacf922cb47df35b5c572d1a33a6450d000d4c373ebc7c03";
+      sha512 = "7880561a54333992252b26124a857eebe745bb683ad9a9f2d34e7dca8c480f0fbebcb27562dd62ee0ab525b27e31013a7dbf0cde389cf8834353b6c3c2e96914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "080b44995281ca69a92c039c8734b16b5a57c28df8b7b076f770f2d360d6945b5b9ff1c30c0e226a84a70ef5c76085ddc5b3b2790131e7797508854e261efa4a";
+      sha512 = "440ec2334dc616da063af952c6a0a4e8966fcaed669d22b75be708800c033287bdfd66759d479bd2085bd601aea7a1bda27067341703da3d6a1c1b305d767384";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "0c37fc3850911499130612465980cb1642c4a7914cffd8d857c6b03e75737992f0e181646050057085a52d7d11654e57c0efacc195b3be377b7fbeadaacf77e9";
+      sha512 = "7b9242da1d9b16c66073bf4cc85d438f2f849b3a0641eebc485b55f4ea3ab750c0bc74952ffbaf80b23840ac375e45984e6cecf7fbd6de5f2405f81b22e23f68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e0e10ddd3f24686790d2d78b9509d1d4dd679588f6c0a9349b35c7d58aab0fc3f914cb139212faa993056997cf805ffb75ee334f8dad6a110b6912b199da3bef";
+      sha512 = "9b88838076dfaf6b1f243940e97d02885b17d5ff82466ebc8fbc9664c95a62e59e305cdff3bacb99739d6077fb6d3742ef2a4106dbf423003c0d75bacc296a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "989b1e7590520271a0e16c1fd02c4b0c85edd53d9d0f6c2dc6e2dcc71b24e53e5ddb58d081e41720bcb54dcdaa8c0b2f8183183adddd6e4da2257dfe71d978e3";
+      sha512 = "f685409b69b27efaf703d248ecec25dd89e52f462bda69d509240a9d1f1480abf2a8849efb9e73bc8056378a0c1e4646f2341f7e84112582e3169eaf7300e3c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f8bd79f3a6e6b7439103699111fba9e5c1534ba643227fcfb07106fc7e6aa5ce8004b7fcfc58a825e73dcde769e9d19dbb35ac1169c587b66bed6a6805390b52";
+      sha512 = "e44ecaded4ada349beac0205e659cce7ac962d7d6cd97040af43c7f904909177bdb4ec38ba7ff57f9aadcefa55b3dd09296af49ae97357d96382f45a3872a963";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "b1eb3804b3f25984afc72756388f538c822d0056d6b6955e92f4eddd975bcefb2dfba22fd343171f3ed33f779c86c5f154928a7f2764242d3ce86530e57b8ae4";
+      sha512 = "99d79640df9b80f380438d18ddf668b22df7ce85f99bbb94234ee3f2d7944c590b22b73430d2c73f3c09c05655356c6549ad1cd33bf5bd6dd619ee427c183715";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "1ea4e0fa24012532cbbcce89b22e5c3131248ef72544bce2de97afc1c104c254a630104d4f2117bf01d217072983296718663e1108e96e86101369d6a66619a0";
+      sha512 = "5597c5d5f1959f7a473094b415b3971d4343b9317fb27e6646be99e6ee8e07e9d97e1cc8e51a77fc63c03760713e9644c6d292e33324d6e599270f424262f6a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "151be2980e61df7e96b47f0d48553da52b54007999734322814f4a0fee269d8bba3831411b5731caa23619033ba80a4265eba02acc228db78ef4c1705e1a7615";
+      sha512 = "331097eeeb0356e3c281ad1bf870252f6a3312a0aea9a52158ee45993b7348fb15896f73b174bcaeac4c1b71631952291683ee6bc8a35b7156cfda280cc951be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "c7b46b7c7fd78cb9bdb5b2fc6e5b0ddb0bbc09bb6e28fbda12ca46b0a0fd8e35660c4d66aeb47fc3b70b725c39e6629f2a0f3a27a9d4991458e5952fc08e819c";
+      sha512 = "5e78bca3a931bf8bcb94d33340dccef6289d32c5ccedc75cd347944e56f5c39f0780b1647924bac8faee94be51de39d93f477a959de4304bcac9f41ae51e52a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "2d79c84179d27e2dbf08637d6302c357438790fd3b02805a0722adb978187cbdde53a4a600c224d2c9c207142550efbc4ef5773218580615af31e0bc42e5ae32";
+      sha512 = "5d8aa24b3c859136b833cd0686cffb73541126d4de14e5be5bc5a70eb6e109fc36e6415af0d2a5c680350d34d0ba13afc21b49e65f9e8a210efe82ff0b8e20b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "38a64984e500e18cb21529e23e803fd33de9ef910b367f39ceb416cb284f61d5bb2717d86bdf0ed74e2320fade42dde89b7a8d4de024ea7e9b9ff95474208e9e";
+      sha512 = "8bd6b551833aceb552c52efc4898546b639349c398abe1c62b6476f18e64de7efa63edd844c3902300014415d78466f461d5f37c5d8335d81c86000127f6901c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "940c57ebf1384150a96bc31c9d7bf900f38f020e42cbb4c9a58d563a95a64005aa5244de17acb9834ffb1d2f39cc9acd4b08e976cfe8e48ea9b3584d2ded1db6";
+      sha512 = "bfb399e2e9086550498f0f954cab9bb061694a190375c4f26bb6d414ad6047bdccf21c83e509da10e2f4b18d20a169cf2d3e2d33d76f20ec0278c4f70c5ded19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "770dc127e21e350873ad17a966c438a10a1eab8637adc11a368bfb3397a61d0411f17452a984aa0b7c62012adc75b193d49936de7775e1c380ad0e1d315f479c";
+      sha512 = "e6611dfd935f95604f694aed4d17844d11a8713045ad529e64a62fd77a06b516994fe4eaf487eb629bacb597cdfb13bf9387ff023dac6cd78c1edc9a8e008975";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "483bbed985b9f1987393e288894e41760f2a69ac7f71c38807ee099928d478d7599d86795462d638f83003b4bc5869a32e13df4ab73ad85219228bf2326aab93";
+      sha512 = "a2d1206cf6ebfe5bf07e4525ca21079024eb3f4aed9c7a7b1a3f9eff416b821def976533698bd2f59c53179ec0c2613be7e80701a1c4216eeceadb8c13b30f47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "70e3d235569a976c3f82f10117e2060bc366382f630cb94fdda89f7f30e2dfb1075393dda29a67a6a3e224d8c2baae0d3727132d4391b261b39819eaad7b7a4c";
+      sha512 = "bd3ca95d7e7b66a70f961eff93fcae884edb8a463fd2f98cdfb11e3925eebf7bb6da66cde6ae4a26d23d31c10396d47331895b8200cc5e854a89704cffbed437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "6e72b77d296a2f4b8d404ca1302ff96ea39c846bf3d38b741acd6e327afab6c6e010980f15502fe5f69ddb0bae06041a343d588aa813f24176c34022a5371551";
+      sha512 = "d47b65f5a863d790b5d6249d2b0201ae625303b48cd6327789ed36ba4f36ad12cc7146ebb03e68185928eda63dac3fc4b29131bc224009d571b0efbf9ca145e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "724271904d24b4d412e6246ce8ece8fed71c6fe3e272551d3040dea3e7326f00f2516d742cdff9751222a141a574624fad4d476bfdd942a572ebf590eea4b1d0";
+      sha512 = "28a574d023f84bb5b5224d9c9d9e62292fc86e6a12fe34045397f16917d19d8f4319d1a08742880367b6fc85a62ae7a09ef29b111709ab4a256740adea2f3bff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "73ed1f28ad9c8b5c9a94ed746b48fe5756c323ecfbc35165b1af8f957331564a8a46403b72ad1e7d0c9e955f88bddd75628bd491a20916d769e410fc7d06671f";
+      sha512 = "b01b97325b0265d060fad86f7cc77bcc14975c51da51639991190cba2f6c6935c48cbde0fd78850d579ea320dd2e9c87edaa0750663e5f0ac234932968fb8847";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "da86d4603f6456d62a2668f86d5eb3b5cfb9bc9454fbea11cce135fa0e215713a73976a71e630c93a6f6235880a08ae036bab6026f64e12847dde3996a4e767b";
+      sha512 = "c0791c6f41097142035cc0a32f8d7c3a14c1975c4f4984db778240169aa48c3e4e89ea46d21c5a206278b34477499806346a47151472ee9b47d596da5eeb4664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "34904ec1e30394e06a14d2f5492fb2d08b66af587ee0823d7ddf6dd0c89407e784342c438f9f2fee85e7bb21888f4003c33c90be51a395d3b4d29050290cfd67";
+      sha512 = "091e89df6c761fb0d3629a430d91fe9dde17cb74aead6395d39377ef7b1038ab75a46e2ecc2517605dde3e512d6cc1fd4fea706ca177b03b6fcc1854ebb99c2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "485c67a32819bebca340240a53767ded9a4af9b8e89a9ddd98913ee2702b799551cae47a1be8ffc13cb3c61121ccc25def8527db622eee4f1f762c88e1517f53";
+      sha512 = "e84f09eaaca7f3eb2c4c8ab10f5fa48853b32a9b7eaec022a4f7cad7ed816d795886954aacca935ac4f44410c63c90e0c9c98f162a7afb517fa8063a1a26bf9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "b1e6704fee7cf35bf24e94db3dac411e4627b88eb5b954d017bd69cc03d598058a4f6a649522e8e56c648fd649c0315ca62fcb77304175753dc0e71ede3848ad";
+      sha512 = "82ee016a8ec7c91708bca2ac498378d240ad45e273d6ac5c4bdecdc2a2f3c042ec5f2f77935ffcb9e391f35c8ffe3876b16ad2200db855818fc889568f0929bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "fb2163796be2756d7c3cb6993e2ce295162e1d407e7673989365848c82017280b3da615dcec32ec6170fd39edd7cac87f9998d54e91b365c7fb88431201c7feb";
+      sha512 = "ecbe89381834657d3fb8d395cb58cb5bd28d9e30e160b50c6052ae49a60f1a58d8d79218f0f76814106575e01b063d9560dfd2a4278bac7db60427310414c6aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f902b115d29654c34f98e1acc15aa173c5881838f42734b5ccbccb388eadbc32167ee35aa07173e62290cd69bab0ec985293e49bcd951b407e9b568e1a126b4a";
+      sha512 = "9cbe123386fe1c15ddb0613f2c2cfc6b0990fa824ffba0bc0c25069c02de1915e82531f5d22253297e97c8362e0fe1e66eaab84387f741b10528838ee2446c29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "5cc246d4807ea49700784c4d4f0995eccac7120c9e3f3c38efa4ddc0835db21f53682ac1921864270079c3dcc39d60ebb5cde7c58dcea9f91f04b81ba2fc41d2";
+      sha512 = "c53e2b950b427a6d2c3ec7ca2c657581f1d4f4bd44b90771475e48f269fc2376ea4cef357e8c4d7d27869766e863b1302a860d4ef104bb664b119971823625aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "3455463f7fad3c893a06b24df9a58a53ffa7f56845dca035b2eff9d98c67f1127ac74492dceb9277c01a47131d95f7b2dbfa23189420c6a3cbfc6c63e8fcd616";
+      sha512 = "4d43bbd65a4c76445a6dd5c35e6cf0013c24dee64289f4074a482d6ede232a86e04f751781dbbd65b18a08a96b4d6f45b5aa72dcf8062a23054755c4c58ce779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "aba2ea135d6114c0615677193641c91e4b047840e9dfa5d2f9eb461cde5d539aeae34179f50038424f82104bad8d31ff6fc0f39e6ec7092ba8f3526781284a19";
+      sha512 = "d35456acb515a56fb411e3df647fba2d1e2f312a0fccb53dcda3ddf68e839fa8f38f78bd73afd63c1cfb8954f65986fb3a7623217ec8d631e36466b531358866";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "05651119089ebe610586abde15515e9a6886fe546c7b2c1260d5c0c0b778448da5d7ffbe30e46d5f32d49ff0f050a97adddb608cbefdc6f2bdddd593b9e2ad28";
+      sha512 = "1197948644964f77108c95b9eb1b4c8132ac1b7503a9423f2d2cac8b52e7f6c2b30c451fa62573437ef74deb47017797e47f1441d60d40a17898717b95eddfe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "6d3b6f30e9450352dedd933c310a8c8ee6858410a653a75f4851743cbaf5fa9a35e8f9d65eb110afa02f6a7025266127d10db3326443289e235be012e34495e7";
+      sha512 = "309b0d6d3f2da1b6539e6243ef9b44dc27f4205a273f7ad82659c9691d0e86cd99ec388b9469f9d97e11f45f534b06a702656f735cce0fd1c95e09a9c7cb38e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "f14f8f554d18adc261a26c55e0c78af833992fdcb1c8c8bb8e4dcd65d8f731b36a663cf02513d7d12d979751aec62d8484a06d8403001e26b5aea304c34c9a65";
+      sha512 = "ee705fe4393f1f07317dfff0732a671007971eb3f0e5d2348532c3b681455ef7d680c5dd20fc8fa41601cb0164b66371ce685b39812684fa89523a97a6361614";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ca3f9e284afc1836a73d8b6afee674daaf4f930f9128ad2aea052a8f0050b4b741726af21a5843ee8579c03b4b456e57f2f6f983f223aae8e2b7ee69231a82cd";
+      sha512 = "ecf7977f395056f0e346bfbfb81a2d74c5ed544c9bd3989e16b2f0dd6d5e3fc3b6fb48977d0b468f2a869efd6929279982a9eec33318c65a61c282996366735a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3356171a15ee94549cfb41eeb601b2f08e4cf286a0c3bdf02a55882df64b819e3159c2ded9601d2f23fc9b49b58cf4f4c53017c5344e9f246f53a5c3b1ed2799";
+      sha512 = "e51e235f2733c54f0af0ac912250b8eeb4277d29151da7a39c342c33cdbe381ee485aff5c2431cfbb088de8fb94c91b510efa8db614607819832ee8b13d86584";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "b1bc75a9f2a4ab2923127514c4b31b679fb5ee5e58223f02cf4b3aae820ebccdc4d41b1d0bbd45ba5bf1dbccbbb2452e95e651417889e8d9acca3bff065630e2";
+      sha512 = "45cb25937c1c791e3e55e9e70c469e28417048842e2993f917a7e7b340a0aa1afb985a8f1e6719ac26c1329299e2d55fa2cfde49c007b8444a97d16423c3920c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f8a8cd7a69367dbc5d19094c530cf3fa75dc996c2ddb6e91d82d788d778ae2d67e05a8e9371417dd618b62fbd1940ea1dd1231aa7e50e9fa0b633da41f9f9b35";
+      sha512 = "f3dd9601b114a0ec45951d187b1fa1e559e778c3033a5b9bc75b02cf49f6856fe77046f4f1a75149a58920414dd5ee0c98801d9dee7992aaa7ea6204deaf7c4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "6bab5af80f51494e6bb6d1813f05c7defe6170964513438781ea8d72afcc90af90792480c61cbec4cc87909867e47364fcaafcaab9b87f75c845d5022d1d8878";
+      sha512 = "b937202e944242c4a35da64add8e4dcd9fb4354d1ecee9144d1cd1dea5f5ac1989ad8e3376099fe60705cf1486b2ef350aebe5d55e440ffaf6d9aa619ccc4def";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "040e8a53f4f0d3ead182edf37afe9275b0e875c479fd2866f52945824d729c47e6af9162af8e67cc9d7540fed394c09c95b5003d61287a74736336a9a4632118";
+      sha512 = "881062e5e027824b5768db1df6aedef73f93721d5f4e4d1de5a31d02b3ac8a6a87ea5ae7889a6ade614180e15189304d529ba03440fc0b030061e1306ca1a02c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "3c34fc69be05029ac47810ccf2e64c358bea58abf5b8bde5e8af076fb87e7b36327fb4be565adea27b992e6c4bba14e678ddc3c71de127adfe0a048f11d33a70";
+      sha512 = "b3939136fb7efd9712acedc71a0d45cc0129367f5a11a2798c788b693e85cecfdfce2b83a1fad2f8bebdaf7e973d963975bbd67c0ce342ba0a4d0d46ff2d01d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "2e6d71df99893d69c29352d9a69176d7d3f2d5f47e95d95e6d65826c7bcbb4ebe855878fcf0c1a33fe4e3e749868f081ba58dd9265f130712dcac86d87fa5a2e";
+      sha512 = "fdb3026d28c507c947f236ec9b44ee2c74f2e4b2df38d0bd23143d9c56c855a19cb99deb087f2253c1692436c1ac25590b78cc3ea713e890ee5d6b3ce70d2cf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "b37754188e3f79a5968d5b2c64c6ec8ebe0afd3252260e33e1be639445377d4f36c3dd2bf3e278d14255bf5964def6a359aa17eb108e8402e35f47ebac460c93";
+      sha512 = "9ee305e8b77eb8caed2e0ec5251f651d16eb7ddd748a23b4c3f17853dfc6018efb8262958f9843fca62799b8ae952b208dc97a4d51977b0e4a81ceefb2575179";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "1f069f59437cdc924e8eb34ce4af4c9de39e28733589f35f7ba7d1d40347164dc4bb8953160436bc5b2228f9c78d097d2c8c46a5e3295c10dd6585575939a133";
+      sha512 = "17533028af974f7b785ee57fbd04e9ff0cb4f952269ebb9fba89a68a8e4af7790628afc74d87c1a338670bf05781cae5ba7cb8422d64055c54b39030a87a6741";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4d4890e1aac3a606eeaaa4379f983d556643201ed209f67e1cad1a5c9518a362630a79e74805b37af9e7adf59523ed267f45537b890752cd59d7f10e1b07e189";
+      sha512 = "e7691565e57153059b7b635bca91e83ce777083920e18d3ad26af960919a7505fad2e6da3bed3c179df0835225a331ad0e855256e87078cd2d023fbf837969e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8212468dd5c7ecd531bf6bc1f2ec83fe41074b0706f73359cf628312d5959ff04dcd13814f5a54b0c74b050cbd02343099ab654ed8f24bf315036f5da36a6b65";
+      sha512 = "001ffeb0a229e1deb751f7a7ae1b70e42b28cb47e321fbd4f89f948302ee31a5cf0ca513d51f978f6482f175dd2099dca46987ff22f72bbf60dc094146aac1aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "456002cac8a82802af2b9a7277f57094bfa69fe03a511b3ab8aae9e74a4e02c90dba69b64f8e0277ce9b78fe254a5fceef31c4684028384655b97651c123b9d1";
+      sha512 = "a96853819e1bd1fa9eae60e18ab1dc6ed304aefe6d13f8cc21ff500cf2415c7f60a623347d3b3632868446e1769aa0b8b0acfaf036281b3d8e838f849535579e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "5307b74b03e68f95de62512edb1bbacd059b7906582bbca41bae83508ae6de12962ee2b27a7046b6eddd0b0521550ee04d77db07ee0d283e9c1f9fccda1ad1b9";
+      sha512 = "abf878e46f44d1516e3d1a0ad873065ceb6025a93b968b71e532ad98d7c977252b703362778b34743dae0b50d3a88238f09876dffe46ce09ca5f2785d48f7cfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "693c0665ee15d3136b3bc2e10404f1504237b3cae9eb7e3f3869de641bb6a1b15311e94da778396bcde8d91589260eb08cccf4cb59446b343e39c15506183ff1";
+      sha512 = "4f201854676008b06b4e790fb7f0ff39648bb14f7813e733038ca9a8acfd5dc2bcf527eb3bb45fdb58def786b0896adf9660c5adeecc1697bf459bb13b63eaa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "5b57c7756477983f153f650cc0611f9e5d07bd53fc741ef489a32434ee5ba716fc4b1162af2b603e7049b08f737eabb4e91c9f90a3058d83ad1c68608f4713ce";
+      sha512 = "6d5ecffeab534b86728a023c6507929e8dcf124e4f02431bcd40dcb5322ecb5ba38e39a1fbbba096fefbb9b0860c571408d8c7f0f90452baf3df9c4ced4e9efc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8c1d7c5434f8fd7321a2140a938b3505d929c1469d93a08c0deddd20578269c6f6d13a2ee42803f753d19873150587b75924c708918f340e7925b7457a68b39a";
+      sha512 = "64ecd4446edf856c8249b18246ec2520b999118d4c0c815da472f50c4dc2434cf504059a2d11c8a72fb1ffeb76e7ff6fa62a55e52d478884f516773511465a06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "cc35a754552dfe2e99004f0b72cdda5b82daebd8ec6eedbb00a9cf64a7f6c51d2c6f2b14b4777117d2cd4f8e585c7a3bb5d81b925c359a35f9873d3a9c5e4bd9";
+      sha512 = "0834f04f6c76ec8780d862e550c5e2bcd65acd7dc9b8629d194bb3407178fa3ae6c47d7f1421136f2966c9826b942c74335452a647e86c7b58b6708cc26c445c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "1772df0d4931024a9256e1a2ec465f193d3351019e397a2708a35317d7a08ffadc4516ff6bbd1cf4efc4b03a4230b628ba2e6b0956763bbedda6bb055a810249";
+      sha512 = "c238708effad87e764a8ad86e08a41574d06a5f7985f8370a7067deb0e6d10c97c395186387f18167a70d28521a811617adfb7aa411084a3a1397465f2de8a3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0f1c60c5e1db28d733093840c1823bc6509dd6bc18a6c514d977d59f03c82ad8a88e114f5ae18fc27d4071eebe3145b91e5a00885b666ee7ed8c1617493f0072";
+      sha512 = "7a1fb23ac7ca6c25e385cb27026064d5d17a613da19cd1b21c0710002a5d5473323d05eef05fb21e3fb1aa89630e38c4838cd211297569885c3aee251f7dd0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "17382dd82ed6bd5e4e948c98b494cbd937654bfbfa834c8c8dd8b33d3f7f85fe1d54f4b1e1eb166b4c3e9798063d25abaa89076379ab3283ef73873145db6db5";
+      sha512 = "306bade19239b1120e1fd8a879dcd98b695d966b94c061c10684e3ce3b9a2a6122d63b86f16cce9611306ef297dfd39003b5ba47ef29fbab33b1dbabc2097e7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "45d50122bb98684d3542a3bd015ea906b4d5cd8998f7b1564548d93b567e947f899e554ab8b6bed72077247ca96c8a4df1bf4d85cbaa795a5bd84bed9b6b9af6";
+      sha512 = "30fc79a7bbba6cd5c75d55c3169e91ac41d2259d77ccfeb4569cd5bfa3c0e7164b0e03e5722949e339197a0b82d9eea1f3de622b958ad75e6dc94ce0d10b7c00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "99a97c7b3570e885003e2e93d641574fcb7aa3d9e96555eaf9baa6376bcb22b702d3bc100514c69cb0d9ef8d690d54afea9ad28f996dcb91cbe2a2f29807cf73";
+      sha512 = "b31169a87228bfd44f144c2c36de4c24165bbbea48d5ab93039108d00a34a68dd31bb61371c472e866639b7e6b448b6c95ea2d9fb40b0c333057390269b9af2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-x86_64";
+      sha512 = "115c549157e802ed556dd8eeeff282dc045888a7da767136ab3568ebbe611924a500dec85cb7c5e5ed3b712f1478e9ea825c658cd8565718db7af04f4eea1e17";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "088fc29280127267909b0900db695db6d6ac51a223755c588e2d88703a07ec4ad5cd9c61e9b7c6f2d5456b15859409045a0f7efc869781994aea010522bf96e7";
+      sha512 = "61bf3b3e09f21d9f8cbebe0cd0ea428a04dd8877be004f32c610b8938f17ddc24d49279f98d9701069855d15ce0c0f8359e6448eeb1681d89ed1e1b69f9196d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "6cbb3780012e9e89767bcad23291f9935836904946b71d3c238478ae30f9c72d12a94b68aaee25079118528c1bfb81f58439c72483f57f49174f43556f50cdd7";
+      sha512 = "31f481aaa9db45b26b6d7236eb501e041cbaabbf47b922563f828f2415451ca5dab896027c4963bb22fa3c6dcdb26f0821e78f337c50cf6e8bb94246de86cb68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "b02fd17e4432c75e10018a61c6d24e156658708bc127874c8f1a27a7b6cc3887feeacbba6047d723883f901666e6352127f8ce447651d78120ccba409470abce";
+      sha512 = "d877f2b0f4f082651092cddde4d1eb27ef261774b8e72de6e87a937a13f55676c8a7c1b978d75412235d89af7bb7773ef1f2f6260f3a7e8f63e3a2f8f769c12e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "e65860c40c362c36732d25f2eac9126d9ba5186343f2de91f33bbfab11d907a7c3968dd5f25664d8c5865c7824b5b754717b9f7a03eb231ba0008151ac7c19f7";
+      sha512 = "f63bae9f41368903b9f87f0afcea69e74df57c355803cdabea540d22c001a42c4147a9d9823b8f0e2f9fd89cda4da831f2777a917a031c94203abbd4b2d6b117";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "847f71e52e133ca383cad419021657e5b17275f9c27468fe18dd34913665c770f4c9a059ea997684bf54dfb96a4ca6802f8e19b2c138410e55482b5762f3dd96";
+      sha512 = "a2692f38c092805471d7892657917be266d1b6e319809e1d506deb136bf14f0c3685a9237c07dd5896a1102c809340370cf95741fb8235e0d9a6a791d167a74b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "337005d811d838545cb6d978dc4cf20afd35aeead11e5adee65fbd0b792b11fd857abe9d49ed14d9efafb7e2e27cdf79110be0b61d6367294072378e27b778aa";
+      sha512 = "4b9099f2159cdbf4868d427ed1baeace54666d9459c6c68e362fd83f1f68fdfe053f5eef387bbb5a721019a13cd66d9fb9ca08899eced3c8b48f1b368b407d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "9c6dff63e8cb8892ca5ebf6050ae8a1fc639923442b7bfc52be3496667b6043598a85ea94f51af8dff27b5ebb59352b4a8c6898066de0b7f49ccd600eff967ac";
+      sha512 = "cd38d40e209c18b545a8b9cdf66ae09f87e09f319a7ec5586d45fd20dbae004a031168c10c3ef851f19976b240491cd230e54a1ab16e6c0d7061eb8762c5758e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "6b2fbaa5c4219288ab02cf376bc48393c6514d26a7c3c4d108b483eec6286101ca01f7399dbc62575fbaf21a4750fbd6b851bdf5cb3af1d5144b99f52e04a0b4";
+      sha512 = "9e108970f376dce2f32ac4d337200b0ea0dd784a4543f54cb864682f988f72e1b8e0c99dff170a3684be65ac5736a2606fa9281e622d1c6068054989dd9e3b94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a152768e04c2e7ee4a501a4a50dd72591f19c3d6b20ea1fb64090f61998ff1ef7d65cde0a39d60d4b594e120b8a65d4bde90c501b839c6a1b8fbd268f02750e1";
+      sha512 = "f3ed96c5c411b5cc1a1cf3ac94d5518e741f3ddfbb7ca3c437aa7746b03b7bcac28c7a4252b74ee3205bc0ace7606b1dc50652e216ccac2ae6c398ef397658a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "36a185b703c18e393dc581d494e90f58ebfa1326b434ad0e9e4cb6d0e44e51687d37db219d6000c7777a76372ce5dfc1428d945546887630206f2929508151e6";
+      sha512 = "36003ba95a33c7296e21f2e254c71f328c0f994d6f384a174789624fc527e9a5c94ee80f8784602fecbd6c8d50531032442c080fd657a6493418714daffdda11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1cb63ce3433f109eb9ffa795de2eb1b7c3dd52a66fb50b45e7e33f8150c034c06f928eb829dabdb7ffdf2d3e89f667e1d315aea566027ad51e288dc2d54046aa";
+      sha512 = "eeae7d7bea78aae2530322060524087886bfed6e0eb90ed9c7be77996e17c658aeb758c7af9577f863016b3dee8d83b7dd5e61f3d283d932aa300ae8de2e3c53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "3d18c86a14c46a09669c9db111292006de1dd8ca8f26fbf0733b6478a3e93212301ceb0ef5824a250ed68b45ddb0fdeb29a0459fedcb1f3145f95974a0c0d39c";
+      sha512 = "9405a8746752fa132cb137f7c6d59a9649f31130ad3ae888cdde419c2f016bf45dbb97ebf13392678453d1506f98d451e9fc7ae92eda4d5d64c0ba443a528568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "05d945d5dcd2e8554ad8c8508f468c16cb9573dc3ae3bcb7a0ae01e11aee1bccc40686e96dc51ef64a380d94f391b6984cc1232ebb47f3f0aeb46913fed31446";
+      sha512 = "3e9491a63956451dc0cc7e2fc1e833f8ab2d49b8c5095300db545391a86aa73ea4ee8b9d7419906a19fcfa7927e27ee89b934aa79f90631b0c5dd1a9ebb0a764";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c9e1ad67ff5e183c9b30f91110e52d8b546585f837dd5fc9c859fc589dee4e49e5da57e4ffa397c3152226217f83e0ab1375a4c36da88a4899b7ebfe99654fa7";
+      sha512 = "a660a0ccf2a47c08834a183c54cd53f134b2421a4a9cef17e59b635c9a8364c007cd5a814c040ff9dbecd2373a31ce551c0df48ef7d8b194b53d5083535161d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8cce3afd623efc0926f75e77f4db3914047755957f7aae01f67215caa1764f047a5af6eab1316d3b6562ad584d152d5cbec32858f9dd2c5403b8069efa555866";
+      sha512 = "cdae561346298b4bb8f85d0dbc6bec471cf755c6c5f89c5a58ef5e15bfd2143729f903b488366f9d9b35c5e3df6f201680e8941db5c0b8d4632efaeb34e93711";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0311bc2738f4e245f78e8e1abd15d7b480ebd6ada25e79c13e2110cee6c789f11326352eac41d0e1a32954045125888cabddfc811f29351e053d45787054442c";
+      sha512 = "6ba067baed3af7a543188f491864c052fc1434d888245f8ad5378eff52afa9313a7a5add5416c14794b5a27a5bac353a3e798a8176eba62f6289d89bee2f3133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "8e986b0741df57e59b5f211c7c3342d6cf7b2916b4591415afac7d747eb97c8dbfbdc3fc4b9fd0a834d16af97109476814919b3fbbd220d66db5e4ad01fa308b";
+      sha512 = "829f8e22039e732fba4d480212d3f7bf3dd39cbb0996475c17e29e442d2a5263f33f4c36a4775ad21f984393f8738dbdeb7e33fdebe97eae0dff01a5be7ff22f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "6524b7b5801bedec93d7cd7da2a7b05bbb3352b7d28399507fe21b72d1c2979389c6d1e51dc968bb7f28d1d0f7f723c93e2970fce90d84b6f9bbe4dfd258a94f";
+      sha512 = "62b6b7d49511b28e67b41a192de49b7dd9d4f806f1df488c850a5da14f8ae0c87bfded01852962f9affb112536a9fdce5ab338b8875ca49798f7c78331dadee9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fad0309059571ac100d92be735fbc307ee1359e1fdb9128166cbd2fddd4caa7543890f85875943d445b71b97d20de6845e7d17336839481ea7624064ef4bed2e";
+      sha512 = "b00eb5696fbc132cffb2053c67ab1456ca394dd2540ed08e4aadb718152ea727f156647e0977ed30ac17701202c184f99e03fab58d7bce03c5030429a733a7fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4769300bb43e9b88314e13a42d0ee760a86bac32fc5e3ada4dd03d33886a8f7c3b572c901a081f017ab0ce46d31f3bb97e8796d4699db0ef582ffc6a6e84fd9d";
+      sha512 = "e81bac0aeb2a5087e252d92fad3aa15d17aed5b818c14c4d32114cb1e2002ef52108aca1e72618ce8b52fd6fcc75bb6a590c78b36a9571caa64956c7d33f7313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ecbe4eadfd031f28cdcf75443d67f14906d497e18037ab2c78e3ec81fd6e0228495ee725c29bf57b1b5d0abcbceff94e72e765dbf38110fc5ad4ecb9ab1873f0";
+      sha512 = "a3b8dbd4e3fb0813d719416a297ba6416fb6a58ded329ab1ae8ed32c29bd7f0721ce35d550db2e02674449da62dfeddfdddc51b822475cef5d4f1c215b7adfef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "ece335699ca00e0296445187a1a96ef6acf34985b8e8996ed0165f45e7648b9af62a4e242a78881e220d5ff1336833bf8025ae78fe6458fa90992a9a0bdb16ef";
+      sha512 = "e5a243e9a32b8dbf48178e20e6f6df2fa779d2fe7c761c3e8b85641a655e41868b86c794d12fe987be4dbafae4577dbb3e45038bfcd6e22ab0a477e8718170c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8fd030682e6d3eef3397d340814dae3d58dc0025b575dbc20c1d5d40ae97f48631ade63be12e03e9dfd8e84e5dc1585cc2cfa0d8a1cf958fee50006a7d1bf27c";
+      sha512 = "3ad5d0adcae8346b771056d92255b57f46badb0023597fc16cfbecf6cb8e9a7246ba3b2c7729bba9e43869f3a882b0daa214d2ba5d0c4f913350ff5c5994ce7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "55ebe55c84883ece28fb6b7771eae6ed47b0dcd5b90974110a7018f39d1ad690302be44a67d0d034ef7b77f985d10cba26d3fad714579aa3d293bd6f36fd0880";
+      sha512 = "e380c47484bd56a7edc648b36008f8fdd95729c341e26543239aa3acb7cb56b41108f1685f4b2840b181c612c0235b3c38d815bd5426b6dffbfbec6eb3b94776";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "fb1176a2c711ec34297a5ddf95a797c4dd5823ee9e898e78c804daa44c16ab78fc84addccd9d83f4171af5dff60302f69236fa92cc584e3985770d6bbe369e57";
+      sha512 = "ce9f7c0e9fd901be27572448ebefbab19749f11c49721dba53adccfc390240e4e1420b75c0cabd2e2e73edc34e6104898ec3372fd7f7072623769bf72db53c33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "226d55ac9bb97fee285ef9fbbe54fee9746cb98a09d1e669761bda08ea6115f2cdd39e1eff0a087f8f46d94139e1906758a8bcdeb74c191c0f453f3705ceaeff";
+      sha512 = "4cb533495ab0fbff75a53b56411ce1c59cc2420dd9c463547f46067577f8b953cc59c3d2f203850f75708f38388591a086335416edbd8787070345bba4af28d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9cf2e615fcc0014b5c40b4113c3be737f5ef7930515dd84a92b8a0d5d6cb90f29c7fe5cab3252cd895558ffb7a6735591ff6cfb8e8125a09455b2139d2d3cacf";
+      sha512 = "aaa9b8dc909d7e50a65d904d9fd7384a94aa365df8d6c8e3852926533c9407f6a08604205ae94914daa74d251b212a9f3707404f945072198141267540314edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "eafd8c098c6092829104ffd870f9803338628cf38cc0525de6beea95d182a8b0a46c9ffc3180798ca06d35bc7822bc18b551b57166d02a53c786299a85c41fcf";
+      sha512 = "2db35215ea1bdc70fdc2c2e8eb576945bb0951b001784ef29fdaf7864c2d00d43122e58b45878e107afa7f0a85bbf332094a8c3cd08c04a5b9ea713fe6e25935";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7b82271ede38e63c86d0d805c486183c52f0ef12b181a8cc57315fce353111497896e884f7eac873f140c25695af4a810fe8b7a7a070d9015f8cae3eef0b3a3d";
+      sha512 = "7020efe3d039e4861355cf56feec7dabf183432f49ec8f10792575a8cf33af0d7cbabad627ecaaee3d47988c2a1261ee62d509d664b4a8ba69d1e6d2b68f292e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "49749432076c90f63697b45fcc8714c6d98a6450ea8ee5d2f850c7a229f65277786784ba00e2ef14622c19a121805a7f07eab7e7dee02a213fd6d44cf10bc783";
+      sha512 = "99939f05878be5a5758f9c45410682761b77fdde6559c31e511139955cfa18811fc0d9e19c2d7da254267b4c3bb6c34378bb26c8ed25f8b957a7e73af10f65fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b8c3d57dc6cc1c00d8edd37eb7c81eca0c2d8f5df318801b111630511968bcf5fd8afb0549cb3618577c95d121a181d4c8ab523a78857826141621ad5c7d26da";
+      sha512 = "74c2f0e8a9e5f9a1052e011a4af950ebc2bc5298661e7094d3776dfbe9b8ce4efdc6c7e0f6371277e530501a6bdc7fc4b5c36983679567d73db1d0434daaaf87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a0b482b610d3d569f1a17d166bd86bb37fe57c1f7d8bad6164c40d509811cf706d818be6add0c3277531f0cf5a18e14eb8ae4a652abe9a45207f62de6f4074a3";
+      sha512 = "ddedd7552c4d85a7f3c3eedc80cb4213a67024351a34df41b0a8a6735cccf3c79f350f2a5621f8324dcbdd9fcc93d979829663d7fadca2367414013efc5d5cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "c1bc3350bdf7f9c16d9b3370d01661c369156e55bfdc7bce0a4a1c1d1b3e7764a691b257984696b021897d47b206f3b21dc692e4de9ab6aa3a47dc12ac2eb9d9";
+      sha512 = "935c0697a13e020589cfb542ff61e5c67a0ca56f5a040d553b0d92f45efc79d7e5a1686e8981a88a01a307ccfe53284e4362850d95a8ad50aa5eae39e351e808";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "b228044ff1a1d581b00a25c3c33ae2059622f80900d0106af9da3a2b99722691e795bd83cdefd64f81ba17928fb74c3e9a79370871d7ea3c50c3747c1dd18046";
+      sha512 = "d8d43189178768267a5d4d66a8ae06918d4ab77cb400e1a40863a42f81ca9e75f9cef82a68f99c8e29edf8e9b3fca5af917ddce2c0f5a9ac257d9be02b3a143a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b60e554d7233d14b6513b815289a81c06a54d9da30dd57f1d595d0210b6229229ae59b3523dc4e3ff4f12693e519898c507c506db65f3f76b3bd475ce6e33d22";
+      sha512 = "31835edca2286977c76544c6885f8b716c67c871276fc9856077d00292eb6130a4d4345ca56e7ae75c392863a598711f69882039145668a95194a65fc33d934c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8a0ee21d78875b5ec34a30140fbfbdc9fe9480cf792d73652fa2479c7446115aa501562c4cab873aa3f45f20802941272596ee4edc91c2927cdac22a887915da";
+      sha512 = "0ba71a5ce4a1966845e1ffbc9e7253980d18ff429e7be9a600c9d3ce1f28eac8350b1401f6a43413e86c8d4a552a2ec3f490dddeca9e34569ffb5cd56cb3c5a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b38841e3b9d6b5ced6e8ab5dbc3510275f2cf0410fcb75ec86a99d31a06d9524c1b2420045bc71bac7b541ff60dc37a79dd5eccda2483a3e92697ce29594be98";
+      sha512 = "1e42024d4f5dab9a8cf37c6c9070617a5f4c631bff3c5cbf66a4a1d5d9e893fc320888bbefa6747a665b6941ecdc266537b539bdb6e165b30da4f832e38bb09d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "df014a91481412ec3c950250d37f8ee006055f1504070e01573c479b5e3f157eaf84a6ab41ab5eef96c94b868e526dfe0f884f36263e36437a1e3269e8b33b43";
+      sha512 = "0189234479d4b7da251571860f71c88d7358609208bce5bc698a969f054226a07442864557ae51c4a25955cca4bcef409f6a8aa347b00a1fe438d53325925ce9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "982567a667735df9fbe86a3c3dedc3103d6b63c81e8e54f70fe9b3d6ba751de1545c1dcf3b902189dbdbbf5bfd5b129186e8f3a09f417a64746c71bb30228c25";
+      sha512 = "03d15323c53d30c52b71a9046370011f39a8a8f2386be45d1bdc014fff1d4ea6efe979a199d3ee63f1fa18b0c7f5ee552e9048863b6454418d89075a70ff9dde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "c6fb02d7867bd2541d37ac52bc92da0357bad6439fac72fde1883b843a14b6c5bcfe3638bfda989e9169d8282624ea43735a167fe78633601545cd04636d2465";
+      sha512 = "ecb246da96e682d5bd0706adbfb2b6448c16c1bef9643db453d3ca17484b1a929c0eeb8f0a1416cf18fd7eba489d897f29a148a41050cb0603121b2c819e0a70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "9b6542199a9e02ac62c604543e2ba72e63847482662992a1a1717de78f3d992d7c70c5476559dce147a1756d25dbbe78720118e607668375757bedcfcb3b919f";
+      sha512 = "1ffe32f481faf8c94450bf873b3391db3546f0692b5697ccfd76ac0fdc493a8fd9278c8c196df1b36468b62ea517fa120acee9bb610a66eb27c69641b4f22167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "912eac4e2b9ea7e48f3270138aedea1847ff7c2998489244beb52125286565423ee287b967d675556204e38cc90b224f88b0830caa03f13fc908649480f8b6a4";
+      sha512 = "9f5754d2cb8ee16cbc901202bb59696bba08848c2ad739fd689b295fc2603ed72803acf344a7756b19fcb046490ad2acb878ad065cfb177e1c5c0df1ddb9d0c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9f9ad35c577fd5d8d387861ace87dbcaa46768a6b16b1351314c1eba98a23ab99de3a3670e54c0b6463be38fbbf347868a4915f2827ecef5fc722c19bde82082";
+      sha512 = "d813571e696ce1d4b404c6167016d591148de7d6e02b8fa1df2da5dcefb55ae71649f3a53485024ad90fd33be94c020433efd7911b6c1f6c25c8380f5819e6e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "53f724c516ebc8d1ac72c8a6f3e21975ccaaf2f7c12382c5483e9755568a1908ddf8448eae34e91c64a1b3d4f73ca7b4f71bd5f3ad36dc14468323599cea1745";
+      sha512 = "1ccc37564d296c42f4b35a2214cc21d1a750e09e0c99555284f769ee7e3da9674377230e9c2467795bcaeccc2745d4ff969c4f5d4dab1bbcb216f7817bd7f100";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "f4332be64f0a87f7afd98788307fedae93021ab3578c7c193e16e6e3a66c2b7468eef75e7bd8ffad4e23b05b47d04a95d56e0a51428ade99e956f97152b1b2c6";
+      sha512 = "be419aedecd14cd7458eb984ffc040f2f9d0316ca1b078adcf4ab0a1ae6f2acb7c04fbf0b43520aa5492ab3c9551aacc59e9c986434d466eb30b48cbcd4e70d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8e6bec92f696e49273b1ba9ef1ee367e7d67db409e2833dc3e76a7cf6de2437f23a7203865262e9e0b355ec8aa09d8ce6a8bccced367108039755fc8bbee5319";
+      sha512 = "41bb68dcc0cee8bbb4050b463648f8f59ed0f1bf4caf701f9c3ab9ba7830caf6655b368798cda6fde6949b4b04ecb1c73637d1db1aff5cfef3bbca7108d9a8c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "fea0097f647d170f04e239668c4f6d3a31d0c0e0a7fabfef909fafe82cd2ae6cfc08166b6d8c55f2e778781bff98055ecb1393fbc21164b699feb3797131d426";
+      sha512 = "42126ac31e47ff7045f43277b80bfb49cd241fc1a00f652eef3f0c2bc2a5de05c4bea6906287bb72dde52f5ecf58726cb3ce8a42081916d3af06b3b621c88647";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "9664ff64be155b308c586b8e170f06004160809c7802674f5c14549a36ad18260e7736f40ce841013a5db9084be83a4e0f44b8c11b69c11f0a34be8bbe7ea11c";
+      sha512 = "3f475233602a09976644ba68472538f85885c54979914dac838be7df912de4818a9afe170e82c8f980555f5da6889db6fc2efacd932eb850bbc4ed6b28a41e2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "ff65f20d9ef9911ac853dcd830b4fdd60790c9c860fcfa3f57791c3d2615624a8ea837342745c7646c1704c04e145c4c5b68c939d49a1fe05d5835e78d141132";
+      sha512 = "e500aee682c57ebe120a312a127801511adcc54c7e19de33e8f80bea457175f6139a7e306cb1bc43d63f6d150fc4c98ed0709a62ffef885b3ff87a768e09cfdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "de76c940a1d3f5ded493455fc979582908368e10035d685fcb2c216dbbe55ca539a3feae8851b6ad97901be6d4a6fce34583ff35c5cc241765ea115ba45b6d8d";
+      sha512 = "850d44141894ca1a5d98fe9e3391a4ce4f8fc3c0db3dff5c1b7eb7b75085add18c03da6984f433597102c77374133b2b4b48262d4ffa3abac8de6424feb6c3dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "4268e22b96f9195444bca4fbeffc1d47f1ed93c3001115f532f3bec1bbf788fb72c99d5d7f6ee427c19b103602e35e98354784aa13368f0df53b52fc9a8d9c5e";
+      sha512 = "ee8bd8595897d43db06e8c3e3247c33910c4665111f1e2a0101af5eaebda726a44167fae82bae309d391de1901057b97901d1ee6162163bcb565c630b1d72974";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "143cbedbdb18aeed78a1805591011b2dcd2837ed950aa2579d34d4006aeaaa85a84ceaccefd8b14e1d4695469d0cd8088261927e80eb5bdc6df4ef1ee5e07350";
+      sha512 = "be5d83bf8f06e55bd0a23a9e3338368cd4cb7f2126d88782d4916da3b866a72a6c0da213f3151ea09df4902000db55883aa12aee5e3f5e512507217cc01c5678";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "6fe0857c8615720b5f268297c1809148943a25b1549f294ac83db6bf3315f7984de7b9b9921fffd0505f2d956fcfcba6b90e0f14d0a25e7e1c52a89f13eb2079";
+      sha512 = "0291d7a79dd44ef0491043da2af90c8caf576ba8cae370d3c69f6c7fe866748ebcb68888da9cb5e144745a97e0b519d46fd2f57cbbcf19d3157ef5c3e2d4b3e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "93817b6399e451a99317b1981c033cb9ed46b673ce00fb6014e384be250ec64b5f32625d9e1b79e80e4c38a203a32f4f4716c76bbf2df130a3d7be1604a91106";
+      sha512 = "490ce118948632d6b64d8c4157da8ac3665239ae7db5ed4cf6e176b35812d8a73ae535b93bbc6f4243c4f8ad8f0108162b8bfc0ed89d8f74c85b51aab977897c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "c6ed809031bb31dfe29a5fa9af201b59eabd59b286d0b7d69063c98682f603a3b6995eed553ae1db2f433b3ccd85e1a9e0ee94e14ec63f2e428e317335137538";
+      sha512 = "ee6b365694b32964e17c15d37a621732185af437750bf6b78297c298931f1fa7e3477fe944dc52da6a8d8f6c2a4ee13340a37a5efd43d6c7d1a7ac4ff7be9502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9e688803943cafff591e9f675a864447964cbb2f0441db212e9152e88edae83331d913094053c2af49db9caf0341c7e6194ff6f54c48ba6931e4b5ef4222399a";
+      sha512 = "f82a8e742f0605326cf4edacf5f3875d9de5aa8b77c67567b42898fd5b86575ca4e34fe11ad3274b53ee951a4fee4ba3a1050b075e105d675175b58169b1a02e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "47cd9810a14f512857cd6b11cb839800f0335c17cbe6ecd29c22b765f475891bdf07f9756f5a9258233c16389543f4bd662f767636823bc578744323bc56eb37";
+      sha512 = "16e9db59eb9ac08f14c5cf36496ed6425c210e5ab71bc290e72239b7ef6b38070e000d889e5747763e78bc6bcaeed4bce0c45bc0a3f60d5b27a87038ba311035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "357c1be02050c9871f54b444c7cea4b56a3834779e239aebfacb00feac0960197cee9837ad127cd5e617423b44ab13ca1d1a4aa4d75d52ea59a4d8caec64cdeb";
+      sha512 = "a6ddad3597feae0418e0bae57ecc507372da5a97b71048c2381272dc30e85109880cd56639f2089996cc5f652ca3b97f51c0d3022c1e16ecb3b143865db1d326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "5b35389950b1e5913c0a8177348f314235fab8560663abc59ab09c360ac02857e3387e77be119d2c126ef000ee52c9ba1b408d9b760158dab751e03a618863eb";
+      sha512 = "9701cc05e02c4cd1f28f056c5b19ba19bf4ff459df7a8fd185864a4b0d5686280669d4eeba38b20570d01459e5e0080b2faa7118a18bc2da36f99a452f7f12f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d9a0cedad0e8715bb86031797639ffe28ba2b5846531b6712de5b1ad2dda60f1279ecb34570b172091e4e245f09e8cf3bcc62478f7cfb02a38043bbceb7b2d6b";
+      sha512 = "9d00704ac0b02ea27a06c0339b4937aaeb40cf50e3ec6390c3c56270cee589e480a7b7f014fd03d86db970cb70e67b762ad4b728ecfbdaebea1ea2fcb6a25bb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b850891b14e1aeee6779687f558160d21f1618da6e6b8133b5701a2076a8b91a283af711c0107fb9862e4c76dab318c6be9f19c03fd4567c67530f573003bd0d";
+      sha512 = "33b0201e80bcca259edf60618e582b1c0ae0be1527ec105a81d972201a6439c9b8eb39fbcf9498adccfe79193dbcf98b7863c62bb0f230c0fe9912062522cf49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "cc37b6614980a31fcc11a5b964a08a900661ca1057ea8ae486ac7dd6ada72adde58ae1839dd9797e6aeda28e657d4d763c94a906f745fbedf8fa9423e3d83061";
+      sha512 = "b8de8b7f0aa9a399e8df81169567df5c3d4d20d40cb913749fe848bdd81e61eb5f0120b9836526c65ef58700120cac28fd43d2d8ea65d6ba28658bfc4b08a954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "2d078d00cb4fda65ac14abc3ab5e4a4a0c203f12e64f726843751884b51bbb15bafb15cc1dc76cfc587428a7348a6886d3f41a125129235432bed16ea2b53f94";
+      sha512 = "e10cbd32691c5797ecd2894b12d71568108c5ef48792ba8dc620b09b7f4819f6f5ab7ff41928861d7297bf2c72e1269b001afb8bf550ebef3f66a1c9caf7ef0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "74fc1848fbfc826e18a60b34dfe61b056636561927aa96e2c789d26dd72b9adff32ed445c62fe62b877b28945ea5a0007224deabae1d264dbf3ad61c5b38493b";
+      sha512 = "45a04cf4dd3007cf8976d27be5b318a978e04100b4121a63e9d5feb11d3208fef85cfbff27d71e0f46b7f70bdaad26a9a588aa7c89adac61e8ff87e3db46df64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "9ff0b453c118cd48cb3455690755cba41d39ab81cad52d2f6ae6ce26589f5d09ecc6506acda66b5a0b79e0c53ce51d9875eac646cf31b9643baacc8866dbf50d";
+      sha512 = "77406b8edd59e48099675d3f2c9abe6f53259645f718d465aaa6f11ee12afc88a0577baa5f9e3f0efff54c025510d4ec4b4277f35401d8cd8fad212c1aa7c215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6b4c85b78808d1c28869363a0760aa63bb6aef022734b5c4bd77035e68faaaacb8501d296ae32bdf70e4a0c8c001978be13bf596e6e87c6d209fe0766b40bf33";
+      sha512 = "0978497ed23eacc9e18bd348e115266d4cc2d16ec51255cce2d93f7faa4d335067961e59ff44a7dc3adbf36dc96aa1b8383127d617a82dfb22b374a92e2cadf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "860423153134eb53a0ea7cc1e77f3e9ef03fe50ba59bff939b082e41ee015f464ea76ceb93400f91b8cdf2288fa64382f44b735a42ae4b805c3b7ea9d9dd4c40";
+      sha512 = "6458a6352c72db89496426dfcd9fad79cffa357d129fd3fba80a13ca2c903d9846820f453e0f480758bacc1fe0d3254a2e8f29c94db00a139402c83869974602";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "10eb3db2c96e3c9b157890abd5cc83ee852a530d4f3f11b043049e11458bf52f2d3dc3ea2e8f1a0352f9541177130e07293f1d008f6d89fef734a8bfe65c247c";
+      sha512 = "f60cd6e3fa1d51e4f02044bea5af0a48f6c5a37865fa96238712eca362ab3ee9d5900b421ff2c0b1da30ac221455196940f62a3393a28fcf2f756a6830562797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "e55dcd464c1c99613842a3b98d7ea2404f516be7ffa92765021e0fda65a4f961b470af53f672d61b0579d18618dc84d0f851158fa773800163ee8cbbb6cf73cb";
+      sha512 = "4ac19276ff52f8ec8bb939ee87cec2b462e8c9e056bf6b00b2099fba0fdeb23602ba3dba0a4b93e03acfed82e3d6e6e9846d8881efaea61361badd88ad119738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ff166b9bd88bb607eb5e06ace5015a76fba9ff8c70967bb043efc52d6eedec8f1eb2fb720a85e19ef3994ce5a1de081b624fac37fea2ec7d88236aae829cdc8c";
+      sha512 = "a463e9edf4ebeedc1be086d43ce798e0556f852c3e8f10f8b935424fce6e9af3dc7912d4e4a5bf1f3e6d9855588cad9454035cd3b67f303713bdb203379d64ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "679258efd864a674a471674ef4cdb241f1ebbd9713c7017c28fb528065b52ab658413269f346415ee14268664bd667f53db618290ad971fcc24d33e957605eba";
+      sha512 = "7f55648abf6547e236551d7409e598702c00bd17a844c46ac53fca70c433983bdcca8728902f8f040e5a8ee456bd339c15daf99eb06e93fa6145e983205e8b77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "51758c4e4c57495a6a44bafba54b1ee376139258f1451e51cfb68aacc5990253ed7fe1ebd0639d9f8c1fd7ca59c344c330333d5da6b2b992fe9da576fb251aa1";
+      sha512 = "41c3e4981e582c3c2ed24b3e463fad58d6e57d60d5336dad79c568f821d03f5f1183cd16e6886f136ee19d27cf0a2c3e066385f1f653a4de37c82ec9dabb77e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "419e445b1d97710047a80e74645fa1504766e4d89d5bd616f98cc4a50c936b60e4c1b32202b13f4703e4edafe13be13a2eef1fa22ae77ebb1432f12463a977b2";
+      sha512 = "1bbbcfce541ebabebbde96b76b9ad20caf5d88f018b8d81be0eb6887d1ac45f278f71032c8e48901ea527bcbb5b97da2e0c30c4ee644cbce3e4f2b913ad623ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "59084fde1fc58ef1ed14db350281b6c4d3fc0abf08f349c69083e2185b4441dca760e288ec861ff97fb1f4a12942f65f16fd4fc6ad78a7e006def5000ac28cac";
+      sha512 = "6006e946d16d59e584f5bba96c0016ff0f82205b8581d5d43f8e1789a3b3f14a8104019c85847b4c9b13673b47b48dfe7ac572c12e08f7a7593b2ce404bdf75e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "a97dc85473478c00a35767dc725030fd55a285b707ba0627ec6413c51c64d5f24891b6a9fefb17aa54a4bfa42cc6625e77df8942af66e44de1fccaa7fb4aca9d";
+      sha512 = "3391a9dcd336b26d069c609f1806d0ea98bd9bd85688c006a5ff271a494d33d3d5f969122c12f845348bbe6065ceef5a67516816f307ab7409ee68a282d4fded";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1ebd9ce8b8285597ce3ec93e30ba3d8564f400c6c1716e8e7e043342cb2c69c391dfca71ffd62ccfb1c9a6719f107d869fb1f4caac18308b0d33a912139297c6";
+      sha512 = "5026484442691f9d5b2c7c22759b8ce43cbcf19b5ce91644341fa18039f851d812fdeae64eb71fa27e016237aab33e3fd0ca6621c723e0c56b9156165d5d88dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e96beacb71274940a491fe68c3b12e2c65672bc3a3fa45f3e8b1febd72acfd601856c109bf3a1027e9690803ef4112611fc571b7e7e51a01fef1b0a0f2a638fb";
+      sha512 = "64726b0dfd6ef6f2823249d794a1f7fa8bb31dbf54e120f13aeaa7aaf9ac56860b388e2cb6c1f51f33d4dade9d703ca323493570a98cde38adb4ff7d5ce76f8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f1ba3a7c77da4f4d6ec8c48ce3353356eedb83dd16f342ffbc5df602922c098ad7ac48c6414ac9a0aa029d3d504412c7c614a63b85bc36f172663f2dc65ed66c";
+      sha512 = "08b0c2fa6fcf3caf7174bad1268e1ae8c3ab3273f4d6780c6aafba7ef68b7cf0535010aaa2af2af17b91ab48f979af2d37a57e980c4c6fd0b3bab04b020d8cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5a63064d45cdead33f387c3f9f053abc659c02b957d3c7edc9b319defa0c6c5e36aa9134257ded94c102511d382c366cacc3c744280194e7a7c1d920966c692d";
+      sha512 = "f7fa6326c1c10de051727d4c83eac04c633f730a08dbdbad3de228d30b0f57a0b158891c910348083279807bc9ae7eeb43ce0a317fce338c1c84553a3498002f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1c9d970798a8cd1e7fc302e479e1609d919bf098aacc4ac398e1287e598d33e396f37cdd521e65ac1ce828d1aa690765c1d5b407aff6835f53c725d4cdf29237";
+      sha512 = "1f020762f8b8cdbf35b316ab041f16243d6df19ea84457b68b6a969e5ae504dc58886adb2d28267cbb6b09cf3664db4a8b0d475ab6b0cd382deff5f15e627f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e9aba1a5ac3a4aaee4623b62abc22e387539041c940b316cabfe89fb0320d30e1a063c72a0247fd364f8f32c5c02ca4431012c74795d4cbadfb96f2f7fd673ea";
+      sha512 = "3859b99a6ad2a14c176d19db4ccd3ca2ec36e57a92661af12636b111f6cb39c64c871066bf5334df90884ef103ff6be5d982e1603dca8feb98bc0ba53b02f9b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "92547aff76f0d0a124e82c9a6e6b91f66b1126d23f652423333513f618bc674d879cb777447963717663b91e23cabb687de730129fd5af9daca2055ee2dd78f2";
+      sha512 = "c168e337f050b09fb8006b550781a6da6cce79a3fdcb21a51c6d584b45569e872480d6a950e56442e755c9fb5fa7b8a8760525977ad13fe4372f67738e48484f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "d3bfcf0ff2b91b3023c30a7cdd0ff568f4b98f36012ec3368f52b4cfd3f6bb5e0295078f2b45f121b251f03c5b9072bd4c742fc5d225d21ce72026012f1abf77";
+      sha512 = "b59318bb6ed70da73f6803319bc606ada26a371c22e561f6460d2968da013bcd976602dc5b30e6b44af8225a44cfb62a121d5c215cf693196e7ccc5b23548b84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "d651f789418fe39b1611f0e5a24be58d9602209f285d1d0db62d33b93bae34e542fb9b59d09c96b2c14891119bd0ed20500e0cbe0e24e86ed9801af4072bd7fa";
+      sha512 = "35191d28de35f4e37ae8184ecb3c16f2ecf10cd8dc451f8f79471d480c3cc885c48abfe5723cc367625ab9fce570b79ef5898457c98198b1ca34905cf195c7a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "fa9c21f3c81617a275c8fe15f142707bb4227ae6ccd5895262309e771c221c121d01bc57af39d2b45891e689bc6fd6a34c51ace106a35cbab176f98b60c5ef49";
+      sha512 = "4db053b433dd7adbcfa5794b276c7c107d0601bccc8c85cebca4796b18d0c8001ad1ba413c4c1f755e281c1ea16eacbf722f04e4d600ec77bb9ee13bc5fa12d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f934a730d3e22c3b49f7bbd3d4ebec5efae8f637ca39f72276644b7e80d082f87620f58c76c86cf542b3123a88abb58a29fb781c40ae897902bc0854635e0fef";
+      sha512 = "0c32453132f2a220d47337c55ab41211f6b3af64f9c365f7cabb4386399fc877f670193f72157cfb7b9d6cc8410346d33af3546609c00530fafba0c7fc07e480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "afdd6675ba2bfc18eb4fec5c63f9ed394fbaaa3800097843925c2c8c76a29a4de10e3c7c4fbf4897067e73f551d549bbc93550fe8a7f8c78878a61d67c414764";
+      sha512 = "796d5f0459f2cb67e5fd7e763a0b30009097aaf6bc6767c21fd32bb18ec45fbdbe600384dfcf296a6c29bf8347d2e922165a1e3e9853ef59ecfcbf56715d122e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "a52776efbcedf14f1e3878d3ef06e27eacd39c55ef7ca743c99429f7b8e24000def5535cf082226fe337deb2ebe1ac94f8f42a0b0d855c099b6fea4c4980d971";
+      sha512 = "189620d864ffd79b78942ddc177d9749285cfb9f3c289a1b3c8fdf7cceeef9d3695ef586bc07845476304bebfa8af285bdcb0d150e7d1e5661d2fd4bde46db5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "601500f68a5b9fa8297a0d7cb612f3bdc8f5910d3a76d2adbcdcc468c4f2beac24d7f85701ee20fe98a0d6a024c4ebb8dffde33ecf113da2f833e10d18395528";
+      sha512 = "d17696909f8d3c3016c270d1dbd2c537acbba8846105ec88c46f337cb97ac05372a1acb4ec0120bf9fee35b5e3f72b65235b6f062120d63e61ff20c37e09dde1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "1163bf2a97011e86401dd429834ac0be699c9dfca2c8a90bcdd79c54537d5f56e6ff8c788e5dcb599a0d094a6405b84f6f0de6fcbeb9210c53fef98220399733";
+      sha512 = "dd0f67d9b205490f1205a6d33eea76c18bea40372f08ad84bf6e8ab4ab9e1abd71ef2ff729d692bed8204ed374c13f191e04f8140acacdc373eb897122ac93e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "76e48c4b910532d5b94d099994341bced12a9db673af6baabc75cb786b59ec033662873d532ebe7266f1af4cca799fb4d468150551ea875b5f3c78d0155eff60";
+      sha512 = "9da4f47e384a45b976de48967bafdad35b2ba418e2d6e260ba3c6859be2d0b67251099093071f4c0c93b61d877ac1316cbf6a217926c77cc35841ec7a4b9a160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "1e2d3e00b04fa231b5fd8d52e624dfe6d4bf22474896c68e6c54b61a9c363c72535853a93c5695ded4cd1c1ff56c7f690c5716f22aaf2a2b7f652c31084372ef";
+      sha512 = "5698c5c4f0db7d7b9725bada6951519a87a960aec8424e4c725826fdb7316a0b69c891ca32ce7d53d43a2839f7e523a573bed85892428047c41c4e122e168dda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "7ee2c4581657472b0747ab4a0e188485ab67d4ce9a14b0a5ad27c45c7f5abc9e021723f4af8aa80ac698ced75cda9043e685cb568c3fc20f34c507cb1f375952";
+      sha512 = "beb075342de69736b207ac5a7e804575843f700b5bd4166885391cc667616ebc11aac255b1a1d897d607f673d0dd4cc0c7cde0b5c3dfb5a3e492373c63a06d70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "99d0718cd52cbd9483a8d19541dc6ca2d3c6546a08690a30c61d18f71cd9620aa7ec5080925c9115c5f96fde1887bbd1dae6e93e05f461da8c06ffb29841c753";
+      sha512 = "ca5632727eb2f99fe4cb08e151ce270330652ee7ba267c3fddc7ab4213b2b210f3cd4077e528026dde4bcc7e40cfdbcae16bbeb9448942736691c16f37ad302f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "db9d211a189398ccadabd82d6a51f60e3c5d5c4e3d2581e172681e7313f8fc2783b7488486b0f4b4b3d32acf891ec2e99f32cd995584073a03891db95adcddbb";
+      sha512 = "548f91230ab8d36e60289b6b22a985f1a9d5af286330734add837a1d75e021713316975cb09afd2157133cf702dd32e9e8b4f1fc07e2d92fb64961ea8583b453";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a3fc5b7f6209e348236449b3c66a7fef1b230421f66392c8c149d32d4c7d2d606ed9ecc972d58d132682ae1c415bafe410e218d2dbcf7ef183b658e2b5d54f01";
+      sha512 = "063c0746ba10471a6014413a374768ccad89eddee8d2abf5cf3680fcecaf396676fc9629095d6629fede3e13bf72b7e7a096814771986b2c73ca0084cb767970";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f701240e3c4c5f112ca9076aa83d3d399c0e65be600ea7baf6c4b2b232b90e1c8c56a358c10302986a945256dde3f1f9397a8c0aad3ff35f8582e0dd6972f3a1";
+      sha512 = "6a8e52f2f318ee0d4518dbddc7ef8c80bb4fd2e0f7b5a962571f5f7bda24bd81c04c712b4a0e121ba3084ded4d5320f0258618e5bae333869b8a1e13f6aa6fdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-i686";
+      sha512 = "ffe5948bdad294311b5e57a417fd47e8c719cb1c918ffc3113a90c922610cad6d1c0ab26fb4c369a89f4968e4781a425fa2de895b39395f84cdc91727cb76ae3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "b912565bccfd31b9f32742a83353f7d97a3ff272e05cbfeb5153bfb4b26479404ef559b0e0b7c1636c5d41a81d409522c5726a38622f26f3719a076946cef076";
+      sha512 = "c57ea4d7168069797601ecc5f809dfb1af98a197f3a277caedcdcaab93f7e245e7020d8317a60ccd3e5696fa72f13b1a62c51f6eb78e608e943f05614f47d9f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "4fec18f06be41273f84c16213de8e4877dd4dc378ba051a761fbcdd8aebbaf937bed1d547c976b8da3a2b377d3878bfd00c8e3c2ec9fb40b1442e12dc395836a";
+      sha512 = "858b988345519cd645d8b812ab2dc13ad886aa6cd8cfec594369d890d162664871a4728119f257179aeb1b16eaf317db71863fb59120ca51c31d74dd535aaee4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "0fbd127500ceedc19c160764a2a61f3fb788e54b029c2728b50a7a35b1a51d430a67bec739ea623621c05cb64d1e35fc9044da6c5403054d51baf141baeb732c";
+      sha512 = "8154d4883a05426d6ea6956d280d73f5bb9f4be10a95ae0909e74bfc0a82af418fd01d847be2afcf91866b2f26e616d40d5a90f7a483510b16ac611926ea1f24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5b960fe9614152e27da77c659cbc198b8b7eda777e3ae188a80c79f96f775330354f3a76f409b022408905dc4bdfb102acca42227cca1e0e20811644dcf14c34";
+      sha512 = "10dcda386ec18b02d365ef3c0f6659dc18002d1620e7b1e8426d2f128aef983389fda0779b6bc46b47bbe500069ad7331d0180ad2d0d0e539da317a4581f397c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "7bca9e76dce8eaa92e9c6836cb07614e0b7cd520ce085d245de8b64499c8972cfd9ef74e3b04744446e5ba5c34be7c1b39fbc1d6828f411ffc2b1a1133bdd993";
+      sha512 = "13ee97b06dac091a7c162353117cb9c4e6761229b015b61c61ea253f6ebf39049cfcabaf297519da4819de478707d79d679578965e4d8c123bfa3d9ac4cac7a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9770c6ece4f52557bcb47dabc717b9e422f915feeb5bd4d02debf4b4e2bd9708dc4da81c1e918335b8a9813b567df229eff83cf8dc413e1287dfa6dd57c704db";
+      sha512 = "ff97a465cd036b16960997e367ef1d6705599888e89988007afb17628ff8efd8c312e3cf10570e5796cfbef0576cdb3984ed0228f3601be40cf40433d7fb344c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "43df1f25801a0bdbf0d47327264b8c4ac6eb8c10e5e48ca5993b9aff92f3c6c97a2d289073cda0a52a81d72c384a62a8f233b7b155a424378f06fb7706eebc04";
+      sha512 = "d6c4e54b0f65b26651cdf1cffdce5945d2b9ab47e1344f18a57ddeadd472287f8bfe3db150ba17ae342fc6ff2cfe70d6f067b9ce69875f20adc86bfae1c82e39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "9d0ac601df2827191c8ad44d88b5bb5b46dcdda85281ae73090ef735c9e9895e2eabb36aac1d095a0cedac525b315f588ea5f64163b5ec6328412ac29046c0a0";
+      sha512 = "8f0c4ee9a619114cc244872940a6224c29bf1121369ca448ef828e5295def03d483a0e36264cd4c174148a182e60ea561e73761f07172d5c99952f39392988ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f45e432475757cbfe66a5ef12071a95bf74c1ae6c357165f2caff119c677974a53c66ad92e7c951c4ebe41ca82b7ed25fdc308698b03a6c2aa686df0b173cae4";
+      sha512 = "a963c1f43ee578f078ada5d7a4bbdf104f3de01d910171e44be284ba7c2acb88e101a3f154e344800d38feb2571ec8694dc1c19427e167ffa0fa71656579bb72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a4e0e3db886326d6ce74a2a47d8e9d7b80e2090a425cc7dd3a386835ee4c5ae525c597ec8aae603ca638f4a742f517559b821a58b5396799742481f7f859cdf9";
+      sha512 = "8621b33463145af2390fc4dd08443576070a008ec3119e9a28761ab46cbcdec537ea773f6d0004c5ec6ebd9a823d4ad3f358bddcabbf153b62a0e2c5046495f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3e83fd71a7620c4d58dca6437fddaffec172405bc10ca7e7df2a7c1f34ca5f3f3dcf139112fa5ca608c911d08b30d08cb55854d2edb84b9f59d14e459d9bdc84";
+      sha512 = "b1e6b26af9101b3f6b6de836fbb618b75f58dd18137c1899847e0b0e59795c94f24f35515e24ef77be25825a3ed1921fe78d230989c71f59a21eaaffaad7d23b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "eadcba6770e85c50394ce85def8915c7d819521e2ae8025a79a1888280278c23c0a41846705a3450dfe3548b1154a84fd17a1c971478e4746143b2d4d3925749";
+      sha512 = "e56acfc28ea49ec19e93aa36cc470baf7188e9ee2817bee6e57fc37d99c953925123981da0455af7375b7d8d4a2273c9f63a91a03a454d29b96d2964fb5d7616";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "861148e9080b230884b8cbb415e116da836d367b7c6b8e3edbe55e2275f03697dd0219d2c30d01375abe023e99e0547abb7d47e7bc29dc68af7ea05a2849dc92";
+      sha512 = "76c69116f962c4f41df1e4a0bc8015307f424ef86513f88c972c2d61b533bfa5bbb07e7a540c91bafba7313cc53b0c5002d9be0b2bbd483a4801a3874a7b4229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "242794c64aeb0f350d83a22e12225e723822b70f79e629c41715d3e47c7c482ac9b089c71d08e9d1674da0eb0f4c122257d4570989c59d5d2d3877385fa95268";
+      sha512 = "bb500d84058a6451158f0cd4cc6c057eb3fdc1d65bd438112f5df8396425d7113ddb96e833ee9ccf5345fa2cb6f089a0a19f46ad264ba5e6d579b943329d5561";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ece418ecc310406da2e8bd583468435d0e6cd4eade1f0334b867c71806ccccd2781c22482caca04c8924978907b2fb654660944df4bbd31be8eb13b0bfaa42a7";
+      sha512 = "0e6e5424e797a1c5870fb64aaf5b7d84d26d9bd31d74894efd5c7e326c0582a4ce30e7610c463c313c6cfbfd36f3d518a60577862e56638fcfd0cfb8accf4629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8bcb70380c63c5b6363e4b13caf4462031f990455f9e2d2f47b4621ac9cada5f05de4d1e5d1e2c65437aae2533867bb81399768577f9d68c58e300712c96c91d";
+      sha512 = "9d0b3a76660ae382564bc43268341225aa36d3241908fe727550529fea39066ed924ffd59193cac882d8aa0e306b2608a78d6d11d398e6ff81a9059158af3c84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "40aeec3c324bbde19bf6566532d995706fb9c603222265713133d967735ace95a80af0dbb8401f8589a78332958e0c02745ae5e99030cb5b8e990d87ff441241";
+      sha512 = "556436ce9648c7adf9470495ab8a2ccc33864e92c2e41f4a7af7c476b249035e4e55a43a888ae19e03e6b42fb931767dd1683f7c444a29aff79f931388fb7437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "1368b907c43cc93387ddf74d86c2e04e1c2e0e867217de11595662921a48abf9660030f54bdc7961df90b50729e9ea0d0d2e634d9f4b9773d9b8da75517b961e";
+      sha512 = "cbbdc94b148fecee3b71bcd23af09354fa4dd453af01167adb8ced16b9499afced409dee7c1a23e02aeda9a452c1a3eb36510ba0b5bd8879cb2f7ed4aaa39bf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a9019b3bc55a87bc20cc06907f2fc24eb7ccbdb397ad39bdbc5bea4bb3a3eeb23cfeba68dec1bfed66fdfa42ab281c41447b2ce848b38410b84f53be7a8ff9b9";
+      sha512 = "b21e8aa88ebf570aef2752a2b186347794df3677c4e3a1248b20b94a43e5eb2961545309f0b47b2445601256cb18f277caaa330c9ab12106fa5ab963c6c15226";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a09122c768e3c90a4a5278f800c1e41ee566792e5c3a29d8f2d37cd1b647fa5160376564b0f3fee08d93627b8fd5b084fb66ecf34500a73f9a0a726a353758f2";
+      sha512 = "29edf3dcc7194e6fd0d5d27f354705cd25afc1fe53149964d8131844f1b1c3f0a477c0115a291d78a9d5a370e4918d39fd6fb6c5f5b3ef150bae6052b2acc382";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "8e4d3bad6652afa436f690ea934cdf5feddf2dea13dad1637b4ce244256d3823afb6e23a511b38e8a467c324539c8cfa0113a3897cec00a475072ba0325c7403";
+      sha512 = "3460c285dbc67cac93b6ab4f477b25b56ab0ffbbad20c302d0901578c045e0f65dd65767de468b5f6b594e69837374405a1338bba7d67e0d8447c76f4b99a704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "1e532a744f4969b1d6df7f5d9d958cced92ae996a123aca3de97c35ec5b3d597db62c3da2191bc5b3bea172c6c5d1f1bea93ee2127fa417a43e4550cdb1c3b82";
+      sha512 = "85ef101a19505520b5f0c15c47ab3699b0dbdc65031ed12b000ccead70a0efccd489d8b0a7140d9d3cf93f906136e63cc51b62de160800b2dfd7dd25e035dba0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5f9980b4d1fbb7b620021fe1aa80d2aed5cefc4c5be8716ece73697428cb157c79c052aee7a9ebe505a811da5c9a01fd789b27ae1fa8b11292d5a44ec28adb5d";
+      sha512 = "9de749c7e72264b48609d0485790048052394400ccc91dc0dbcddfecef2a6c81ab2035354aa15d3f0293339a086099e68d414f703a32b00a6c50a4f360c665fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "e8a9cbc9df298c53b54b6c3ed1b75b87f668ae7feb11a911c4e90b3d925b4e818f7a5f8c50e22cf5ca399324e41aafc436abbe787fc68d0b41fbbd9c0fd99502";
+      sha512 = "d33b836d739967701a95776a7b19c1b0d6ca681ff3e471defbfa1a25c8bfad681dffde12f92d04ad2a47433a245326f0cbd0efa0654b45ae5ad6eec7efe5ba36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "e7d0c0a7f8bfcb63a2d3d1164917ee8ecb2a0fe74871437723edf381cd2bb5888c86bc9708ddbf94383569ff5b6703f3dadbc0cbb5afe56e70130dd4df4340c1";
+      sha512 = "5d8754131064ce271f708b30c658cb16c360b083deb62095a3a6639e547ae672cc3554300105fc6a1a947b71e732a612bd208bdb5a5a8da2d59da63c1e9be9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "09bacdd45bbe517dfd7c30b20307e1fe50ffd97be349fa778cc977af64a976326f4bbae30baefab714ccbe8160e5ebc375b7f409d8c8e2d18a7615481abee811";
+      sha512 = "e3dfd19dc6fbccaf4b300a44eafd8f9b10ba9838f8650569df5a397204c2374fd797b00b257a6b7e775ee2f9a5ec46ab37e1fdb0008ec35207b17fdb6f407223";
     }
     ];
 }

From 408f6b2843b44109d09f3ad2787fc49c75d99776 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 01:14:12 +0800
Subject: [PATCH 1129/2266] pythonPackages.pycurl: Move to separate file

---
 .../python-modules/pycurl/default.nix         | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 29 +-------------
 2 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/pycurl/default.nix

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
new file mode 100644
index 00000000000..e1d9158a4f7
--- /dev/null
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage
+, isPyPy
+, fetchPypi
+, curl
+, openssl
+, bottle
+, pytest
+, nose
+, flaky
+}:
+
+buildPythonPackage rec {
+  pname = "pycurl";
+  version = "7.43.0.1";
+  disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
+  };
+
+  buildInputs = [ curl openssl.out ];
+
+  checkInputs = [ bottle pytest nose flaky ];
+
+  checkPhase = ''
+    py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
+  '';
+
+  preConfigure = ''
+    substituteInPlace setup.py --replace '--static-libs' '--libs'
+    export PYCURL_SSL_LIBRARY=openssl
+  '';
+
+  meta = {
+    homepage = http://pycurl.sourceforge.net/;
+    description = "Python wrapper for libcurl";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6dc0e18cba..305de7c0266 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12943,34 +12943,7 @@ in {
 
   };
 
-  pycurl = buildPythonPackage (rec {
-    pname = "pycurl";
-    version = "7.43.0.1";
-    disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
-    };
-
-    buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
-
-    checkInputs = with self; [ bottle pytest nose flaky ];
-
-    checkPhase = ''
-      py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
-    '';
-
-    preConfigure = ''
-      substituteInPlace setup.py --replace '--static-libs' '--libs'
-      export PYCURL_SSL_LIBRARY=openssl
-    '';
-
-    meta = {
-      homepage = http://pycurl.sourceforge.net/;
-      description = "Python wrapper for libcurl";
-    };
-  });
+  pycurl = callPackage ../development/python-modules/pycurl { };
 
   pycurl2 = buildPythonPackage (rec {
     name = "pycurl2-7.20.0";

From 5087dd449db07da4a3bf77fa4f9bf5ba8a553c78 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 10:21:25 -0700
Subject: [PATCH 1130/2266] tmuxp: 1.3.5 -> 1.4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0/bin/.tmuxp-wrapped --help` got 0 exit code
- ran `/nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0/bin/.tmuxp-wrapped -V` and found version 1.4.0
- ran `/nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0/bin/.tmuxp-wrapped --version` and found version 1.4.0
- ran `/nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0/bin/tmuxp --help` got 0 exit code
- ran `/nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0/bin/tmuxp -V` and found version 1.4.0
- ran `/nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0/bin/tmuxp --version` and found version 1.4.0
- found 1.4.0 with grep in /nix/store/pi67w2329w1lc8wbzbbvkvjcy2jrk09z-tmuxp-1.4.0
---
 pkgs/tools/misc/tmuxp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 33a4ebd70b3..3932e06192e 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.3.5";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bdbbbf5980d6ec21838396a46cd5b599787e8540782b8e2e3f20d2135560a5d3";
+    sha256 = "1ghi6w0cfgs94zlz304q37h3lga2jalfm0hqi3g2060zfdnb96n7";
   };
 
   postPatch = ''

From f6cdd2f5f7def7c275fa81645509830ac709eb69 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 10:04:45 -0700
Subject: [PATCH 1131/2266] time: 1.8 -> 1.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time --help` got 0 exit code
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time -V` and found version 1.9
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time --version` and found version 1.9
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time --help` and found version 1.9
- found 1.9 with grep in /nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9
---
 pkgs/tools/misc/time/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index cce7614b904..892afb4ee1c 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "time-${version}";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "mirror://gnu/time/${name}.tar.gz";
-    sha256 = "06rfg8dn0q2r8pdq8i6brrs6rqrsgvkwbbl4kfx3a6lnal0m8bwa";
+    sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v";
   };
 
   meta = {

From 3e78f03c6be5775875421fc867bc57b24bd895d2 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 16 Mar 2018 02:29:45 +0900
Subject: [PATCH 1132/2266] vboot_reference: 20171023 -> 20180311

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

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index ba885555cde..b252b74a0bd 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }:
 
 stdenv.mkDerivation rec {
-  version = "20171023";
-  checkout = "8122e0b8b13794";
+  version = "20180311";
+  checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7";
 
   name = "vboot_reference-${version}";
 
   src = fetchgit {
     url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
     rev = "${checkout}";
-    sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7";
+    sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d46a4b98298254e1eaf79d1c895eb392258c48d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 18:28:41 +0100
Subject: [PATCH 1133/2266] R: 3.4.3 -> 3.4.4

---
 pkgs/applications/science/math/R/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 7bd19cfc520..a9b2de1a00c 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.4.3";
+  name = "R-3.4.4";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "09pl0w01fr09bsrwd7nz2r5psysj0z93w4chz3hm2havvqqvhg3s";
+    sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";
   };
 
   buildInputs = [

From 1ad75d0c501fb757c7bceb346efe130bad48db1f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 13 Mar 2018 19:33:59 +0100
Subject: [PATCH 1134/2266] gitea: enable and configure postgres service if
 selected as database

---
 nixos/modules/services/misc/gitea.nix | 38 +++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index f0b44b7bede..458d0087dbd 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -4,6 +4,8 @@ with lib;
 
 let
   cfg = config.services.gitea;
+  pg = config.services.postgresql;
+  usePostgresql = cfg.database.type == "postgres";
   configFile = pkgs.writeText "app.ini" ''
     APP_NAME = ${cfg.appName}
     RUN_USER = ${cfg.user}
@@ -16,6 +18,9 @@ let
     USER = ${cfg.database.user}
     PASSWD = #dbpass#
     PATH = ${cfg.database.path}
+    ${optionalString usePostgresql ''
+      SSL_MODE = disable
+    ''}
 
     [repository]
     ROOT = ${cfg.repositoryRoot}
@@ -82,7 +87,7 @@ in
 
         port = mkOption {
           type = types.int;
-          default = 3306;
+          default = (if !usePostgresql then 3306 else pg.port);
           description = "Database host port.";
         };
 
@@ -123,6 +128,15 @@ in
           default = "${cfg.stateDir}/data/gitea.db";
           description = "Path to the sqlite3 database file.";
         };
+
+        createDatabase = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to create a local postgresql database automatically.
+            This only applies if database type "postgres" is selected.
+          '';
+        };
       };
 
       appName = mkOption {
@@ -186,10 +200,11 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.postgresql.enable = mkIf usePostgresql (mkDefault true);
 
     systemd.services.gitea = {
       description = "gitea";
-      after = [ "network.target" ];
+      after = [ "network.target" "postgresql.service" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.gitea.bin ];
 
@@ -231,12 +246,31 @@ in
           mkdir -p ${cfg.stateDir}/conf
           cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
         fi
+      '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
+        if ! test -e "${cfg.stateDir}/db-created"; then
+          echo "CREATE ROLE ${cfg.database.user}
+                  WITH ENCRYPTED PASSWORD '$(head -n1 ${cfg.database.passwordFile})'
+                  NOCREATEDB NOCREATEROLE LOGIN"   |
+            ${pkgs.sudo}/bin/sudo -u ${pg.superUser} ${pg.package}/bin/psql
+          ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
+            ${pg.package}/bin/createdb             \
+            --owner=${cfg.database.user}           \
+            --encoding=UTF8                        \
+            --lc-collate=C                         \
+            --lc-ctype=C                           \
+            --template=template0                   \
+            ${cfg.database.name}
+          touch "${cfg.stateDir}/db-created"
+        fi
+      '' + ''
+        chown ${cfg.user} -R ${cfg.stateDir}
       '';
 
       serviceConfig = {
         Type = "simple";
         User = cfg.user;
         WorkingDirectory = cfg.stateDir;
+        PermissionsStartOnly = true;
         ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
         Restart = "always";
       };

From 4332e697df4c4cff32528869798b1a4b7c42229c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 10:37:55 -0700
Subject: [PATCH 1135/2266] teyjus: actually update to 2.1

Note, the version in the source of this release is still 2.0-b2

https://github.com/teyjus/teyjus/issues/117 tracks asking upstream to
release versions with new version numbers.
---
 pkgs/development/compilers/teyjus/default.nix          | 10 +++++++---
 .../development/compilers/teyjus/fix-lex-to-flex.patch | 10 ++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 53ab4ec0e85..04efe1a9134 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, omake, ocaml, flex, bison }:
 
+let
+  version = "2.1";
+in
+
 stdenv.mkDerivation {
-  name = "teyjus-2.1";
+  name = "teyjus-${version}";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz";
-    sha256 = "0llhm5nrfyj7ihz2qq1q9ijrh6y4f8vl39mpfkkad5bh1m3gp2gm";
+    url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz";
+    sha256 = "0393wpg8v1vvarqy2xh4fdmrwlrl6jaj960kql7cq79mb9p3m269";
   };
 
   patches = [ ./fix-lex-to-flex.patch ];
diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
index d2da1d3facc..fa82d80633a 100644
--- a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
+++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
@@ -1,9 +1,9 @@
 diff --git a/source/OMakefile b/source/OMakefile
-index 6b19d84..095b8b6 100644
+index e6bd37e..1bbc0a8 100644
 --- a/source/OMakefile
 +++ b/source/OMakefile
-@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront
- DEP_MAIN = $(FNT)/dependfront
+@@ -184,6 +184,12 @@ DEP_MAIN = $(FNT)/dependfront
+ PAR_MAIN = $(FNT)/parsefront
  
  ############################################################
 +# Nixpkgs specific changes
@@ -15,9 +15,11 @@ index 6b19d84..095b8b6 100644
  # Platform specific changes
  #
  
+@@ -194,7 +200,6 @@ if $(mem $(SYSNAME), Linux)
+ 
  if $(mem $(OSTYPE), Cygwin Win32)
      YACC = bison -by
 -    LEX = flex
-     CFLAGS += -mno-cygwin
+     CC = i686-pc-mingw32-gcc
      INC_C[] += $(INC)/byteswap $(INC)/search
      export

From 854ab33b52732f45ad6ae844e49e23a030b15c89 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 11:19:08 -0700
Subject: [PATCH 1136/2266] uget: 2.2.0 -> 2.2.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/uget-gtk -h` got 0 exit code
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/uget-gtk --help` got 0 exit code
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/uget-gtk -V` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/uget-gtk --version` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/uget-gtk -h` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/uget-gtk --help` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/.uget-gtk-wrapped -h` got 0 exit code
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/.uget-gtk-wrapped --help` got 0 exit code
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/.uget-gtk-wrapped -V` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/.uget-gtk-wrapped --version` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/.uget-gtk-wrapped -h` and found version 2.2.1
- ran `/nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1/bin/.uget-gtk-wrapped --help` and found version 2.2.1
- found 2.2.1 with grep in /nix/store/ycadchyn77y6aqxnvp5jkhjv0nw6jqi0-uget-2.2.1
---
 pkgs/tools/networking/uget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index 620584ab1df..6779d864ce2 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "uget-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/urlget/${name}.tar.gz";
-    sha256 = "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m";
+    sha256 = "0dlrjhnm1pg2vwmp7nl2xv1aia5hyirb3021rl46x859k63zap24";
   };
 
   nativeBuildInputs = [

From 52dce0fb38987cd87cab91db1150bfe192f6c3bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:38:57 +0100
Subject: [PATCH 1137/2266] R: update the CRAN and BIOC package sets

---
 .../r-modules/bioc-annotation-packages.nix    |    1 +
 pkgs/development/r-modules/bioc-packages.nix  |   88 +-
 pkgs/development/r-modules/cran-packages.nix  | 1105 +++++++++--------
 3 files changed, 643 insertions(+), 551 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix
index 6707dd1e3c7..c4d6897b998 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/pkgs/development/r-modules/bioc-annotation-packages.nix
@@ -131,6 +131,7 @@ in with self; {
   IlluminaHumanMethylationEPICanno_ilm10b3_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b3.hg19"; version="0.6.0"; sha256="1rdkvbpbz8a8bd9ipycfmgn8a3x519abhwywka21ii9ziv3s6ah6"; depends=[minfi]; };
   IlluminaHumanMethylationEPICanno_ilm10b4_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b4.hg19"; version="0.6.0"; sha256="0687b4k8hwfc18qgdd9ypv1skp37jd204fszba0gmrv3dc92i09c"; depends=[minfi]; };
   IlluminaHumanMethylationEPICmanifest = derive2 { name="IlluminaHumanMethylationEPICmanifest"; version="0.3.0"; sha256="0alhjda5g186z8b1nsmnpfswrlj7prdz8mkwx60wkkl6hkcnk6p3"; depends=[minfi]; };
+  JASPAR2018 = derive2 { name="JASPAR2018"; version="1.0.0"; sha256="1j82wsayzn6zn7irihpc8jivvwfsdrckik0ypajsv3pgrb5b3naa"; depends=[]; };
   JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.3"; sha256="04lvcmm4ybxkfwgbiwcnpyj6kpbd0gd7jz6ijlbbvv6zdgdmvykb"; depends=[AnnotationDbi org_Hs_eg_db]; };
   KEGG_db = derive2 { name="KEGG.db"; version="3.2.3"; sha256="0qv9in1nmnqcbjxh0y45x33xyw9zdp4jf5hmlvcsh1pclcq4dsh2"; depends=[AnnotationDbi]; };
   LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.3"; sha256="0960gy5p4ybs5zs6251cgc3nk5a9gsh1nh23gkbkr3gc8jddinfm"; depends=[AnnotationDbi org_Hs_eg_db]; };
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 06f1d81d8a9..2d98b23a867 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -23,7 +23,7 @@ in with self; {
   ASSET = derive2 { name="ASSET"; version="1.16.0"; sha256="12863h5f7ib3p26ghim2h0l7zn51y3624rihsybj5lpycnxkam9q"; depends=[MASS msm mvtnorm rmeta tmvnsim]; };
   ASSIGN = derive2 { name="ASSIGN"; version="1.14.0"; sha256="12g1dh35azv1z5bc7n7gyr0vnyyi2r2jrvi6x0gyikbdszxwfysx"; depends=[ggplot2 gplots msm Rlab sva]; };
   ASpli = derive2 { name="ASpli"; version="1.4.0"; sha256="19v9p4brgrzijin759n1q8zjrlksrzhmczi1nwhsjgbg47f35vs7"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; };
-  ATACseqQC = derive2 { name="ATACseqQC"; version="1.2.8"; sha256="11l1cpfcadhdrcy5qdmq9gd18if8rs5xw4b5m0ky8gxgxmfpd2wq"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges limma motifStack randomForest Rsamtools rtracklayer S4Vectors]; };
+  ATACseqQC = derive2 { name="ATACseqQC"; version="1.2.10"; sha256="0f1j89an2rckjrmvvmy6crmrgz2jxgmmajhx333crl8jjqi1aqm8"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges limma motifStack randomForest Rsamtools rtracklayer S4Vectors]; };
   AUCell = derive2 { name="AUCell"; version="1.0.0"; sha256="0b6az665vpdkp82xcr4xgric3nw9204g47rj4316s30l5w5l1j2v"; depends=[data_table GSEABase mixtools R_utils SummarizedExperiment]; };
   AffyCompatible = derive2 { name="AffyCompatible"; version="1.38.0"; sha256="1lxxpldgrsl0nf63cfhbqpraylfb3118y4j8q4xknr7x8pj95gns"; depends=[Biostrings RCurl XML]; };
   AffyExpress = derive2 { name="AffyExpress"; version="1.44.0"; sha256="0nwvgkh9nc9gag9dh85g3x4d5125p00c9jc55knpr11jraj2xifw"; depends=[affy limma]; };
@@ -54,7 +54,7 @@ in with self; {
   BEclear = derive2 { name="BEclear"; version="1.10.0"; sha256="1skkqzph89lx9cwlgyd2xmn1808sn5byfa8mqdq6w60j6vwplpzn"; depends=[Matrix snowfall]; };
   BGmix = derive2 { name="BGmix"; version="1.38.0"; sha256="1778bm1hx8bw00n0l3d5jvfldc7hqmpg2w1nbsc3c017rd1l2ryk"; depends=[KernSmooth]; };
   BHC = derive2 { name="BHC"; version="1.30.0"; sha256="0j8sb6ifq2nxvlarm1zqa89yzfs3si4w43ily9nnbmlnhngr6d0m"; depends=[]; };
-  BLMA = derive2 { name="BLMA"; version="1.3.2"; sha256="1dwhhqsvah7ds7v2jd2khkabcg7222g2bfi0q5dd1xqkd15mq0j3"; depends=[Biobase graph GSA limma PADOG ROntoTools]; };
+  BLMA = derive2 { name="BLMA"; version="1.3.3"; sha256="1qxj3izpv4pphq515kqq5qcsg1p847knpm961pcipmikbzxrvfqw"; depends=[Biobase graph GSA limma PADOG ROntoTools]; };
   BPRMeth = derive2 { name="BPRMeth"; version="1.4.0"; sha256="0b7p2z69zjxrza2qfgpg6dfk96r9gfjm3v4qzafjy0hrbcfi2d74"; depends=[assertthat data_table doParallel e1071 earth foreach GenomicRanges IRanges MASS randomForest S4Vectors]; };
   BRAIN = derive2 { name="BRAIN"; version="1.24.0"; sha256="0cxci3clyz98r8vx6cq49ypc3s3bkhx8rx0h60r54va6gbp1j2lm"; depends=[Biostrings lattice PolynomF]; };
   BSgenome = derive2 { name="BSgenome"; version="1.46.0"; sha256="1jbzq7lm2iajajn2bifxnkss0k9fdvgqr30mral17cbhp5f6w4lq"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
@@ -69,7 +69,7 @@ in with self; {
   BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.4.0"; sha256="1dkch2md8fi23i3pg90rzxy185v6953jhz4l2icgglxhp15ydmfp"; depends=[Biobase]; };
   BayesPeak = derive2 { name="BayesPeak"; version="1.30.0"; sha256="1f8r1z7mmh40nrfqj1b3drjli6zb6hm645a9xi39claid2kvfh9z"; depends=[IRanges]; };
   BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.30.0"; sha256="153ks6bbhqzdkl88wvszjg5f67hr0gnf1mnhn6crq7i3pjy1jw0m"; depends=[]; };
-  BgeeDB = derive2 { name="BgeeDB"; version="2.4.0"; sha256="1jha16jqbj5jzanky16ihn0sqvx0k50hh1p5xw1m4ssi86dnx42x"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
+  BgeeDB = derive2 { name="BgeeDB"; version="2.5.0"; sha256="08q93yk0hb4sbavk7i1z2qdklhl87f70ywr7xnq26r5frxcpcxm6"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
   BiGGR = derive2 { name="BiGGR"; version="1.14.0"; sha256="1frxzj99qh94ll1xsvvnmgnfai7wfzchsqdrk2s0cp7z40yng13b"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; };
   BiRewire = derive2 { name="BiRewire"; version="3.10.0"; sha256="08z2h5fq1nm192s2vwzv1q6sp82axkk81p05bib71wl5vg0j5fpk"; depends=[igraph Matrix slam tsne]; };
   BiSeq = derive2 { name="BiSeq"; version="1.18.0"; sha256="0277lknj60gniwx4vr3ffd46gldzgjr7lbw8xy5xzdd0wa45wanz"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
@@ -106,7 +106,7 @@ in with self; {
   CATALYST = derive2 { name="CATALYST"; version="1.2.0"; sha256="1q31zzi15q2z46wsk3p4fvq8imxjkyywi849h5jyrvnxhca28mbz"; depends=[drc flowCore ggplot2 gridExtra matrixStats plotly RColorBrewer reshape2]; };
   CAnD = derive2 { name="CAnD"; version="1.10.0"; sha256="17nzlplz9d8dhzm546bznwmz20p7lxnsvq35qd09a3rdcf1abz77"; depends=[ggplot2 reshape]; };
   CCPROMISE = derive2 { name="CCPROMISE"; version="1.4.0"; sha256="0r0aardhmz76zd5lj1qzwyva8la0jv9wczfmak3r0pp2axaw13yr"; depends=[Biobase CCP GSEABase PROMISE]; };
-  CEMiTool = derive2 { name="CEMiTool"; version="1.0.1"; sha256="1pqdnyxmpcp5gjf2w00cf1msbc96d8q9vdqbafg4x2fv83m9ivbq"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
+  CEMiTool = derive2 { name="CEMiTool"; version="1.0.3"; sha256="07ighg7y1rpx00xylg1yhd03fvs2yi215rfyii8ckzwf8l9829l4"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
   CFAssay = derive2 { name="CFAssay"; version="1.12.0"; sha256="01yakrkpbs43013936rh8qd4giiz7y7cp9jrdx9i4p6h5h8jzj28"; depends=[]; };
   CGEN = derive2 { name="CGEN"; version="3.14.0"; sha256="14s1j2h5cb2gfgn73yvb933ng63cr9i8lx8hisd0g8lcfi2b5rxw"; depends=[mvtnorm survival]; };
   CGHbase = derive2 { name="CGHbase"; version="1.38.0"; sha256="0fynvcsjdbgp69i0nxrc8ni58rhb1kx9k5r3nb91n9i8s43gjqlm"; depends=[Biobase marray]; };
@@ -152,9 +152,9 @@ in with self; {
   ChIPQC = derive2 { name="ChIPQC"; version="1.14.0"; sha256="1nnmgzad7kzydrmz374f9xvf8s13q6vhanz93v6d9jqh6jnd5di0"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
   ChIPXpress = derive2 { name="ChIPXpress"; version="1.22.0"; sha256="0wcs7gw0kgvbk1f4i8j9cr8kwv1lj45zv9q069cify78rdb106rb"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
   ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.0.0"; sha256="02w4k41wx9cqfk0zjzcv8vdfgwv9rswijmdrsbmcpbrmbwn2jlxi"; depends=[Biostrings BSgenome GenomicRanges IRanges RcppRoll S4Vectors]; };
-  ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.2.0"; sha256="0n0bpwiff3lbirvmzbamjvxa2957wsl0kixfh1hnsr0hqgs3swqf"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
+  ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.3.2"; sha256="0hh7ppc4fsil7vczng897dkzz2a1x0s2j2qvw1v2g8hm82mv070k"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
   ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.12.7"; sha256="1zab489d7a6bh6ylc68x6yn47gdkmr7p3677grx9l2qafrryjr04"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools S4Vectors seqinr SummarizedExperiment VennDiagram]; };
-  ChIPseeker = derive2 { name="ChIPseeker"; version="1.14.1"; sha256="1819hny2azpj3wpp09yyqllx668p98ja3ds5a65c0hxy8vbmjxpz"; depends=[AnnotationDbi BiocGenerics boot DOSE dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
+  ChIPseeker = derive2 { name="ChIPseeker"; version="1.14.2"; sha256="1db2k7j0rr9q8jlfxlji62zyhzfh7yhsacyg1dj5sgwbhhn0xliy"; depends=[AnnotationDbi BiocGenerics boot DOSE dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
   ChIPseqR = derive2 { name="ChIPseqR"; version="1.32.0"; sha256="0igqlfr5grhkr7dsdyg3c31d3r1wpn413vxmzlckiimfwdi35rqv"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
   ChIPsim = derive2 { name="ChIPsim"; version="1.32.0"; sha256="01kmhzyvnp03v9xydm9xrrkdmlf5dpsnzzcf13i9r03x3m44r4ga"; depends=[Biostrings IRanges ShortRead XVector]; };
   ChemmineOB = derive2 { name="ChemmineOB"; version="1.16.2"; sha256="0zrg6f5cg54f1bpwjhx2h97w267jr2gyncgfyjs7njkjwwrl9ads"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
@@ -179,7 +179,7 @@ in with self; {
   CoverageView = derive2 { name="CoverageView"; version="1.16.0"; sha256="1091mxiclb3zhr48bdj7z8gi3v69l4w25cfpfbxhhp70rffn9xfr"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
   CrispRVariants = derive2 { name="CrispRVariants"; version="1.6.0"; sha256="15za6ysnnjfwmiq2dhbpr3kww6c2jvc2y1mf8rfpqx56bd1dh3cb"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
   CytoML = derive2 { name="CytoML"; version="1.4.1"; sha256="1jj79adwrzwx012xvw3czv0m94jc3j2ibpijdfbz8fpjhynrzwqb"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; };
-  DAPAR = derive2 { name="DAPAR"; version="1.10.3"; sha256="1xkfw2zjy8wj8x5mddyzw1632zhb2dvdnqp5ikmf1n1bi1mq0ya4"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr foreach ggplot2 gplots graph highcharter imp4p impute imputeLCMD knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes tidyr tmvtnorm vioplot]; };
+  DAPAR = derive2 { name="DAPAR"; version="1.10.4"; sha256="15ghdx2yccsk98bmynljiwdfkjjfqafq62wc87zsgydql59c10kh"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr foreach ggplot2 gplots graph highcharter imp4p impute imputeLCMD knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes tidyr tmvtnorm vioplot]; };
   DART = derive2 { name="DART"; version="1.26.0"; sha256="15hqsdi7pa1qn5c5af2izhf609c7lmb0zsv2qwyc9xbf7dn42qmf"; depends=[igraph]; };
   DASC = derive2 { name="DASC"; version="0.99.11"; sha256="1wm43kgvq3wkwp8hmz70m9c7yxxjsanpqxvcm6x63bna02ysb90y"; depends=[Biobase cvxclustr NMF]; };
   DBChIP = derive2 { name="DBChIP"; version="1.22.0"; sha256="07psmmvcdl4r5m71kccd9rd3vk521ilhwmcll37pfrmb16s1856x"; depends=[DESeq edgeR]; };
@@ -193,7 +193,7 @@ in with self; {
   DEP = derive2 { name="DEP"; version="1.0.1"; sha256="0glkq6xlhcsr364zl4nkc7g3gnscv0yb3kcyvhzgm3bbfvd9q7ac"; depends=[assertthat Biobase broom circlize ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; };
   DESeq = derive2 { name="DESeq"; version="1.30.0"; sha256="0mn5w3cy16iwwk8zxs7za6aa6cnrca75z0g45zd5zh1py5d7nfv9"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
   DESeq2 = derive2 { name="DESeq2"; version="1.18.1"; sha256="1iyimg1s0x5pdmvl8x08s8h0v019y0nhjzs50chagbpk2x91fsmv"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-  DEXSeq = derive2 { name="DEXSeq"; version="1.24.2"; sha256="18nh8ynxirfwkmc4sawdxgl7w1sl9ny5zpv8zbhv9vi5vgb8pxmj"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
+  DEXSeq = derive2 { name="DEXSeq"; version="1.24.3"; sha256="0xip73hlbr3zry9d7ly9vvvsbb3xjcmfa09lr9fdy528dwjrf084"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
   DEsubs = derive2 { name="DEsubs"; version="1.4.0"; sha256="1i9blymzj18r9646vac9grrjxw6xar8m6chn1dgdila17jag1wlp"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; };
   DFP = derive2 { name="DFP"; version="1.36.0"; sha256="117gmzcgr9wr9wb7g0rm7wlrakd76ys1frhmhx1k6ps97ibxlz1k"; depends=[Biobase]; };
   DMCHMM = derive2 { name="DMCHMM"; version="1.0.0"; sha256="1y0wmxks51h0d21v8g4mryq7kzq49khhpa88fbhza9xp2bmwk358"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
@@ -255,7 +255,7 @@ in with self; {
   FGNet = derive2 { name="FGNet"; version="3.12.0"; sha256="1f33k7dx7f97kzjpq1jvs614vjsyg3yd03s2y7xxwhydmx02n7vs"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
   FISHalyseR = derive2 { name="FISHalyseR"; version="1.12.0"; sha256="07q5paypybw8qq17wyl7qqlrdy5kfg2k24rj2ic4gjgb6qiic38b"; depends=[abind EBImage]; };
   FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.14.0"; sha256="1nyw8h4kjddn75878adhlilwjnm4wlyhksyp2ygx6cm35fbqa2v3"; depends=[fda MASS]; };
-  FamAgg = derive2 { name="FamAgg"; version="1.6.0"; sha256="0p87aidqbzdwhihsnaammv1i5yb0rvhs0xrjlmq64z6q9ffj7k32"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
+  FamAgg = derive2 { name="FamAgg"; version="1.6.1"; sha256="02fy27g8vi9byhnfav0121291jbwiypnj1r9i56hbgwwzplqbr5z"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
   FindMyFriends = derive2 { name="FindMyFriends"; version="1.8.0"; sha256="13f6hdjn4l5xfrdskq2abpzczxcm8sy71fqpfj6hsxzj06fz9a36"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
   FitHiC = derive2 { name="FitHiC"; version="1.4.0"; sha256="12ylhrppi051m7nqsgq95kzd9g9wmp34i0zzfi55cjqawlpx7c6n"; depends=[data_table fdrtool Rcpp]; };
   FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.10.0"; sha256="0mgqnmznqpy8ikzg1829bjgxnznm43wkgirhpgfskdxfzr4zqs3a"; depends=[jsonlite RCurl XML]; };
@@ -270,7 +270,7 @@ in with self; {
   GENESIS = derive2 { name="GENESIS"; version="2.8.1"; sha256="0w3xrw6a1fkcp49nyarkp4yykjk79gqq7rzwixdk4363d5pnm7gp"; depends=[Biobase BiocGenerics gdsfmt GenomicRanges graph GWASTools IRanges S4Vectors SeqArray SeqVarTools]; };
   GENIE3 = derive2 { name="GENIE3"; version="1.0.0"; sha256="1lxbkhlvb082nrmlq2b57chi0vpyaqwj56ngbzli8qdmp1gz4qd3"; depends=[reshape2]; };
   GEOmetadb = derive2 { name="GEOmetadb"; version="1.40.0"; sha256="003inwm8qkjdaihlx4009nwj3rgjn3xdk0m8k696qhniq99gcd0a"; depends=[GEOquery RSQLite]; };
-  GEOquery = derive2 { name="GEOquery"; version="2.46.14"; sha256="12m6l95qjip33rw97qymc2i0wpmdmsvswlcp93b3gssxslpzkqzi"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; };
+  GEOquery = derive2 { name="GEOquery"; version="2.46.15"; sha256="1l5vcksida44zkrqvrp9krqd4yhn6xh24y9jfvkyjvhq4x8fl18z"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; };
   GEOsearch = derive2 { name="GEOsearch"; version="1.1.4"; sha256="0k0vn99rz2821gswb834nn9ib099a152y2828ka7qvhag4shzdy9"; depends=[org_Hs_eg_db org_Mm_eg_db RCurl]; };
   GEOsubmission = derive2 { name="GEOsubmission"; version="1.30.0"; sha256="0sl9m7lk7jczpcfhn50yn322v1s65d9swjidcnzk3ydv47z419p8"; depends=[affy Biobase]; };
   GEWIST = derive2 { name="GEWIST"; version="1.22.0"; sha256="0lfm19s4z5j7zhpzhfa7rqdz09ip05cf2zbnsqv9widdmkcw2wnk"; depends=[car]; };
@@ -323,7 +323,7 @@ in with self; {
   GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.30.3"; sha256="010vn8hlwbnw12pd1d8pv6m12yp3xwx557gba5rbjq9p4qypnn3z"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RMySQL RSQLite rtracklayer S4Vectors XVector]; };
   GenomicFiles = derive2 { name="GenomicFiles"; version="1.14.0"; sha256="0r0wmrs5jycf1kckhnc2sgjmp336srlcjdkpbb1ymm7kazdd0s9n"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
   GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.12.0"; sha256="0f0ki2zsaxg6f4qr47xgyhxm6jvms0s1zab7f0vcnw8jd7vhmnzn"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
-  GenomicRanges = derive2 { name="GenomicRanges"; version="1.30.2"; sha256="0c3r155603vb4zjs3adqa72770bh8karc11y8gl62l1m24jrkbnj"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+  GenomicRanges = derive2 { name="GenomicRanges"; version="1.30.3"; sha256="07cszc9ri94nzk4dffwnsj247ih6pchnrzrvnb0q4dkk33gwy8n1"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
   GenomicScores = derive2 { name="GenomicScores"; version="1.2.2"; sha256="0g6i90vn29pasiqbq0088bgdisr356539z94scv7cila968inh7n"; depends=[AnnotationHub Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors XML]; };
   GenomicTuples = derive2 { name="GenomicTuples"; version="1.12.0"; sha256="0962l9204vm5x7vcqzlvlgblhdczwp4zbq4i262gqh79lnx4yq1y"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
   Genominator = derive2 { name="Genominator"; version="1.32.0"; sha256="1gh56xyfgx5f8rb0wbpvkg8h2q1ci2qf3ngkg3sficn65pbj9iha"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
@@ -517,7 +517,7 @@ in with self; {
   PCAN = derive2 { name="PCAN"; version="1.6.0"; sha256="0inm1kfi9xvd3jhqivxh4vzc6vsijh1z7fwzsqb35rlbi2cl7snd"; depends=[BiocParallel]; };
   PCpheno = derive2 { name="PCpheno"; version="1.40.0"; sha256="1sgw116qif7w52va7qg8n51a40nvmhybvgr5nxlvgvrwylkhqfai"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
   PECA = derive2 { name="PECA"; version="1.14.0"; sha256="1c3nbsvng951fsg9vk3yki215f3abgsxqhd025gyvs120nw4c9kv"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
-  PGA = derive2 { name="PGA"; version="1.8.0"; sha256="0x410vnwgdzdkx2i9pqj22mv8jzflswl35a6xkhkr0in47hgz806"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; };
+  PGA = derive2 { name="PGA"; version="1.8.1"; sha256="14lm4ab7lib80wmkim4j72n4msmbx7nhlbv349cxrpc9k0dxmycm"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; };
   PGSEA = derive2 { name="PGSEA"; version="1.52.0"; sha256="1g0kfhrvq8hv4lpwq3p3p6fkm2bmfjmkfw9312jrwnbjj0hfwd34"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
   PICS = derive2 { name="PICS"; version="2.22.0"; sha256="0jb4hzswiyrqpnazfpd6wd11gdlmv18za7fyr4slxv0rc9rkf8qm"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
   PING = derive2 { name="PING"; version="2.22.0"; sha256="1lvbl3g2m643nypc0nfmhjpfv4zl7qk457kg9i7y7l1lzqwqsk0s"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
@@ -545,7 +545,7 @@ in with self; {
   Polyfit = derive2 { name="Polyfit"; version="1.12.0"; sha256="1gkn6g5hwa8ss156armxam9ky5fd7dj0k3gh1b0gy5plpzzyzv1h"; depends=[DESeq]; };
   Prize = derive2 { name="Prize"; version="1.8.0"; sha256="1vaf4n69pb2sa6fd79988picz08d3c46cjmxfr5qf7hxay9lbwc6"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
   ProCoNA = derive2 { name="ProCoNA"; version="1.16.0"; sha256="06jlzcr9b6nfrlgb1wqxp7r2z8042ygjx4d2z7jzg07hqn3gymjz"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
-  Prostar = derive2 { name="Prostar"; version="1.10.4"; sha256="12kdq40qnd7a1x0qcwfjiim03sh5hi9pix61mwdmmq0zc7pg54s3"; depends=[DAPAR DAPARdata data_table DT highcharter htmlwidgets rhandsontable shiny shinyAce shinyjs webshot]; };
+  Prostar = derive2 { name="Prostar"; version="1.10.5"; sha256="1z9qli85if894j6s4a21yq6990hamz3ql1399m2wjjzka3w8kd29"; depends=[DAPAR DAPARdata data_table DT highcharter htmlwidgets rhandsontable shiny shinyAce shinyjs webshot]; };
   ProtGenerics = derive2 { name="ProtGenerics"; version="1.10.0"; sha256="16ijp50448wnabp43klx943rhdvh7x45hvy7cnpq1s4dckxhhyni"; depends=[]; };
   ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.8.0"; sha256="1myd5gqr3nmbp6f1n7ilp6qjcfgm401frm4ldvxbjyppxh6m1wh5"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
   PureCN = derive2 { name="PureCN"; version="1.8.1"; sha256="12wpqwz771vzz5yad67d9j1jhgi5ccxngyqcjcddqwsiws65prwc"; depends=[BiocGenerics Biostrings data_table DNAcopy edgeR futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges limma RColorBrewer Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; };
@@ -562,7 +562,7 @@ in with self; {
   RBGL = derive2 { name="RBGL"; version="1.54.0"; sha256="18jad23i3899ypv4bg3l47cvvs3qnj1pqis2p9x0135yv5y6wnv7"; depends=[graph]; };
   RBM = derive2 { name="RBM"; version="1.10.0"; sha256="1nqmf9yiaam767f2wkwggnw6v0rymszx7chnkis0xbdsllzqb0j4"; depends=[limma marray]; };
   RBioinf = derive2 { name="RBioinf"; version="1.38.0"; sha256="01qk9ddk8bm9sl70rlwgmrkz2y7dnqzrhi13hhh0ii62s0z0gdwh"; depends=[graph]; };
-  RCAS = derive2 { name="RCAS"; version="1.4.2"; sha256="0d8mm3f0lxdvngldlazql2vcfv3w7172ari0g2lp3cj101d7pyd3"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
+  RCAS = derive2 { name="RCAS"; version="1.4.3"; sha256="0ajnhi8i9p755lr0l2j5j52d5j6rsilrjhm3zrjr1zsgwqm2an6z"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
   RCASPAR = derive2 { name="RCASPAR"; version="1.24.0"; sha256="1v19pv81q0g965mks88ablznzhcdk3kfd7j2dgxx4r12bl1afawg"; depends=[]; };
   RCy3 = derive2 { name="RCy3"; version="1.8.0"; sha256="09p66zxh82j5pcjz1zn3cg43rpsp0gnkwja836m6g1i450zrialv"; depends=[graph httr RCurl RJSONIO]; };
   RCyjs = derive2 { name="RCyjs"; version="1.10.0"; sha256="0vlyh32byw49j3vfw0avknixflpjs5h599xxlbf2zc6irvncg1wg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
@@ -610,7 +610,7 @@ in with self; {
   Rariant = derive2 { name="Rariant"; version="1.14.0"; sha256="1kfw2gfvdgzi5ldarmmwnksgg256vfaripcridlsb2pgwzay52k4"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
   RbcBook1 = derive2 { name="RbcBook1"; version="1.46.0"; sha256="0qj8zvhq9cq3akdl6zpspvvz9jlvc0lxrn4ap7qd984406jihyg4"; depends=[Biobase graph rpart]; };
   Rbowtie = derive2 { name="Rbowtie"; version="1.18.0"; sha256="0v3x9i6wmps7x0zpvgimzfwarg4246nbk4cpa1kim46r5jkl5m4v"; depends=[]; };
-  Rbowtie2 = derive2 { name="Rbowtie2"; version="1.0.1"; sha256="1xplrih6sijbwj24k4lb0cml5pmyszmw5jzkaii5m3vign6m7wmh"; depends=[]; };
+  Rbowtie2 = derive2 { name="Rbowtie2"; version="1.0.2"; sha256="1cc2z55qzp3psnhii0d71dmb71d0s3wzl8dsyxyxcr95clp4irsi"; depends=[]; };
   Rcade = derive2 { name="Rcade"; version="1.20.0"; sha256="0awsdg6wfm6hykj96s8cgz2mhn2i4jl1yabg7xfj0nmd776gv5fa"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; };
   Rchemcpp = derive2 { name="Rchemcpp"; version="2.16.0"; sha256="1k5rgk944x0xy0y7l4fba1gfbiq6vnpbgmwwm520vv061v9g72nz"; depends=[ChemmineR Rcpp]; };
   RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.18.0"; sha256="0lghahggrh3142rn9f2rnh517740d62bh7rc97zd2sjk3rfdb761"; depends=[flowType graph Rgraphviz sfsmisc]; };
@@ -632,7 +632,7 @@ in with self; {
   Risa = derive2 { name="Risa"; version="1.20.0"; sha256="10ypbd9qwh1rk27fwm8naf3gl05w9zlw79qyr55pk5m6x5lnn9cb"; depends=[affy Biobase biocViews Rcpp xcms]; };
   Rmagpie = derive2 { name="Rmagpie"; version="1.34.0"; sha256="1hvv8pps0q7xnsl33rammqvyj191j5gs78r2333jgscxnw4byqb7"; depends=[Biobase e1071 kernlab pamr]; };
   RmiR = derive2 { name="RmiR"; version="1.34.0"; sha256="10n8i7qirbd8xrb73ccxyj7c6bi1szx263nwjh8w2j9x4dgzx22x"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
-  RnBeads = derive2 { name="RnBeads"; version="1.10.7"; sha256="1rlxa161sgbz7p59svihk2ym70d1c5yi02rcajgp0fraf8ln8xhc"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; };
+  RnBeads = derive2 { name="RnBeads"; version="1.10.8"; sha256="1kawb781y7pscbmll69pzk4gnb0xz3s8llj3icy3c8y0arkg98xz"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; };
   RnaSeqGeneEdgeRQL = derive2 { name="RnaSeqGeneEdgeRQL"; version="1.1.0"; sha256="06i2fy89wck0jhpc174d81ka7jim8gjamjk0ym1j0fh3ldiw9yvm"; depends=[edgeR GO_db gplots org_Mm_eg_db]; };
   RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.10.0"; sha256="1r0bn121bf5fcp4im4hm2c6rccgf7fb1vvxj2iri8ippc2k60d2c"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
   Rnits = derive2 { name="Rnits"; version="1.12.0"; sha256="00ddzbjms9wpiinc021s4b50wbzdafnml96ngsmi7rd8ipr3k3vp"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
@@ -689,7 +689,7 @@ in with self; {
   SeqGSEA = derive2 { name="SeqGSEA"; version="1.18.0"; sha256="1vaqa6jkvwxpbqnz9wz3i6p26mky6d7d704cjv5as67j04v99b2a"; depends=[Biobase biomaRt DESeq doParallel]; };
   SeqSQC = derive2 { name="SeqSQC"; version="1.0.0"; sha256="0qj1y9zsjxkh08jkw80hl62072viincq1pvcz9r3i0m28nhk7pg5"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; };
   SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.0"; sha256="14n70xzj91f4rshl0kx549rqzy9rrv5mv0b0xvj891i8anxahb2n"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; };
-  ShortRead = derive2 { name="ShortRead"; version="1.36.0"; sha256="06mknlsmd4hnaxzdjapgvp2kgdnf9w103y500dsac5jgsz4vwzcz"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
+  ShortRead = derive2 { name="ShortRead"; version="1.36.1"; sha256="1cyv47632m9ljkxfsvnvmd19sb607ys5kz8fwh6v39dnw16g0a6m"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
   SigCheck = derive2 { name="SigCheck"; version="2.10.0"; sha256="1k2xmb7jcjbdxafr8fspf9pbc0jwcll914lqc42gvhhjq6rnf8q4"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
   SigFuge = derive2 { name="SigFuge"; version="1.16.0"; sha256="0ddy6bayb05gsgh06p5awhjwyx57z0l8fb5x6p0dci2fgzy6gr4f"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
   SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.16.0"; sha256="0jkd78wl5ksm05qjmsx7s8aznh3kfpi34yvxaxv763pqjqzkxa82"; depends=[Biobase limma mclust Ringo]; };
@@ -840,7 +840,7 @@ in with self; {
   cghMCR = derive2 { name="cghMCR"; version="1.36.0"; sha256="10c6cnm2qbg0gb3klfv1xlwhbzj9x6aimxg7jnz29fgnn3xnd8cs"; depends=[BiocGenerics CNTools DNAcopy limma]; };
   charm = derive2 { name="charm"; version="2.24.0"; sha256="0zr96pwq7zd45lffl67fxvzrxhmjk8pmh8rfawhc7mmazds2ip9a"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
   chimera = derive2 { name="chimera"; version="1.20.0"; sha256="0z50pwynvyx2gc619b7w6chwdb7pxs2gf1ywh9vp7vzghkdv0wx4"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  chimeraviz = derive2 { name="chimeraviz"; version="1.4.2"; sha256="1qqv2wzagq5kf4xijrvcm17bb1qgjjp2kx4fm2a8ky1rcwf50251"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db plyr RCircos RColorBrewer readr Rgraphviz rmarkdown Rsamtools S4Vectors]; };
+  chimeraviz = derive2 { name="chimeraviz"; version="1.4.3"; sha256="1jwgra30lqi4zyyda2xcy7zkgnbidlxqfhh48bq8scfym0b34kjf"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db plyr RCircos RColorBrewer readr Rgraphviz rmarkdown Rsamtools S4Vectors]; };
   chipenrich = derive2 { name="chipenrich"; version="2.2.0"; sha256="0q24il68grjqdxpy7qjk6lw6l5zlmw6yybrbrbb8l42gljyi6s74"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; };
   chipseq = derive2 { name="chipseq"; version="1.28.0"; sha256="1ymcq77krwjzrkzzcw7i9909cmkqa7c0675z9wzvrrk81hgdssfq"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
   chopsticks = derive2 { name="chopsticks"; version="1.42.0"; sha256="0awwk8k7vnsc0c1ic17m2mhmpin0s0ijd2gn7my9yysqzld9sncd"; depends=[survival]; };
@@ -913,7 +913,7 @@ in with self; {
   derfinder = derive2 { name="derfinder"; version="1.12.6"; sha256="1bp8qw3m5crncwz586b4f4w1x0kcm6r39md3w8il2d9xlvjvmml0"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
   derfinderHelper = derive2 { name="derfinderHelper"; version="1.12.0"; sha256="06aj2h98vm27pc1laxi7pjxhwxm756scl2r9d8f1x1gsg2aa0k1b"; depends=[IRanges Matrix S4Vectors]; };
   derfinderPlot = derive2 { name="derfinderPlot"; version="1.12.3"; sha256="1p0pqy2rdd4lmz91gyxwcm1gpnyb89qzy9j9fsm1jy84iaanan40"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; };
-  destiny = derive2 { name="destiny"; version="2.6.1"; sha256="1gyjh9lgqql67zsm4zz4lg77kdw5wbgkl9mraaww1aich167aqfl"; depends=[Biobase BiocGenerics ggplot2 Hmisc igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother VIM]; };
+  destiny = derive2 { name="destiny"; version="2.6.2"; sha256="18id35mjlwnavqi04lzr47vj6y3j8y8g1rxb6hdc6dklajnvyyln"; depends=[Biobase BiocGenerics ggplot2 Hmisc igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother VIM]; };
   dexus = derive2 { name="dexus"; version="1.18.0"; sha256="1l9x51w1q58zvh53slcmw8rbb2v1sii380acap1frp4idi56wmig"; depends=[BiocGenerics]; };
   diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.60.0"; sha256="0bfs3n9crca46q0cgkpknl4xf5vc4dr5anly9kn77prb1zp9b0p3"; depends=[minpack_lm]; };
   diffHic = derive2 { name="diffHic"; version="1.10.0"; sha256="0j7vmgpxakzk3gazdy06xhpcqnb19pib0jxfz67nc7fgkyrmhzqi"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
@@ -930,7 +930,7 @@ in with self; {
   easyRNASeq = derive2 { name="easyRNASeq"; version="2.14.0"; sha256="11l0bj9wcp5k0a5nq0adn4w891cllfdn7qrqg76k7klx5h0p37bx"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
   ecolitk = derive2 { name="ecolitk"; version="1.50.0"; sha256="0xagah7nrj6dghl2ib75l8wlwj7kzdssnlbpjdwhm67nsys3hvx4"; depends=[Biobase]; };
   edge = derive2 { name="edge"; version="2.10.0"; sha256="1knr03yiw0cq0kj9hklmkaap4qiphm2ph51bjn1m5cn7nyckramz"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
-  edgeR = derive2 { name="edgeR"; version="3.20.8"; sha256="0g7bj6w61blw3m22hw9rc01n554k9qkjizh7njr3j4shmhads58d"; depends=[limma locfit Rcpp]; };
+  edgeR = derive2 { name="edgeR"; version="3.20.9"; sha256="0y52snwbz37xzdd7gihdkqczbndlfzmmypv6hri3ymjyfmlx6qaw"; depends=[limma locfit Rcpp]; };
   eegc = derive2 { name="eegc"; version="1.4.0"; sha256="1v3586qddx1l74ha083x36m3lqdblrhmwd63k22jzfpkh30adz09"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; };
   eiR = derive2 { name="eiR"; version="1.18.0"; sha256="1ypd7yq9c6mqp7nm984dm60qzvwy4qb81zrp2mvp7g87c5vdj2a3"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; };
   eisa = derive2 { name="eisa"; version="1.30.0"; sha256="11ydmv5kddq75sknbax1aiyxq60rx146qa7pd3m09axjzvk83mq5"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
@@ -945,7 +945,7 @@ in with self; {
   epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.6.0"; sha256="0rbd2kmdi0y97mx72gkg93s97slfig1k1bgcv5maknsqqqcwzz8j"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
   erccdashboard = derive2 { name="erccdashboard"; version="1.12.0"; sha256="07dc80l8618rlv3sywr0gp9i49kq66i9glx3md2r0k5c4l67mw37"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; };
   erma = derive2 { name="erma"; version="0.10.0"; sha256="0gcfs9g8vvdv5vmq9b21kd8sq5mizjj49nfzd4in9zvp4b9v7x1g"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; };
-  esATAC = derive2 { name="esATAC"; version="1.0.19"; sha256="1ikihh939c8iqm9w582s0kjmnh7yqgnj3dq8y8vfvpbill4f2zyd"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
+  esATAC = derive2 { name="esATAC"; version="1.0.23"; sha256="1g2pai0b98dfnng4h7w2xs73qp2dqacmx8x3ackqi6a515x0cyaf"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
   esetVis = derive2 { name="esetVis"; version="1.4.0"; sha256="1yb238lxy8sqmxim3zd25rp642cpz8p25vdffjlija2wivq8phn1"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
   eudysbiome = derive2 { name="eudysbiome"; version="1.8.0"; sha256="13ayrigzy55h6an3am9f77r6mzcvyfcpxpby71xilhaf6mjhyj39"; depends=[Biostrings plyr R_utils Rsamtools]; };
   exomeCopy = derive2 { name="exomeCopy"; version="1.24.0"; sha256="17rpa7mck2rrivrv5vqk4abb094v79v8dbzh6n5dj4hnw53b9wif"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
@@ -971,7 +971,7 @@ in with self; {
   flowCL = derive2 { name="flowCL"; version="1.16.2"; sha256="1zaic9cf7xw4qmdcrhi9a9zcxvxlnn9iii0a6lnwwkpsspgn1bnj"; depends=[graph Rgraphviz SPARQL]; };
   flowClean = derive2 { name="flowClean"; version="1.16.0"; sha256="1crpgaw1bilvgcyr93c2qx6jbx18ca52dzr6r8cqznlfxdnz48jj"; depends=[bit changepoint flowCore sfsmisc]; };
   flowClust = derive2 { name="flowClust"; version="3.16.0"; sha256="1c8ppgy4i42l250m71ri3gbw8mw1yw2saplx9wrhnykvwxnsx210"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-  flowCore = derive2 { name="flowCore"; version="1.44.1"; sha256="1ain06wjny8f5khpf6cmz683rzq1jfidk4p3mz1v5ybw54dxvl7z"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
+  flowCore = derive2 { name="flowCore"; version="1.44.2"; sha256="09vp822nrhyfxibwh22g2rdl4yv6n4w1rm7hy9hkz8rsbpbdbwv4"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
   flowCyBar = derive2 { name="flowCyBar"; version="1.14.0"; sha256="06wzxlw02x5nzn5qc91yjawrmimsns2kmw4rm3rgbh10d4qh8r09"; depends=[gplots vegan]; };
   flowDensity = derive2 { name="flowDensity"; version="1.12.0"; sha256="1df181ilq7mnwlfvyjjvgd262f2sq09c5wg5fpf531m5jiaj6qpk"; depends=[car flowCore flowWorkspace GEOmap gplots RFOC rgeos sp]; };
   flowFP = derive2 { name="flowFP"; version="1.36.0"; sha256="0kpw90pxappz3mbidfqjv8l6cpc4qg2hgi1wqh4rzx8b2bdl5a8f"; depends=[Biobase BiocGenerics flowCore flowViz]; };
@@ -981,7 +981,7 @@ in with self; {
   flowMeans = derive2 { name="flowMeans"; version="1.38.0"; sha256="0mqgblmfili3nxnfz5h0hrhdl6wz4ylnslyx17kw7pyd0wskd26v"; depends=[Biobase feature flowCore rrcov]; };
   flowMerge = derive2 { name="flowMerge"; version="2.26.0"; sha256="0lpgipgrirhc5i5qzby1krg7vbd4jg566y3i5k18lxsccws12zx6"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
   flowPeaks = derive2 { name="flowPeaks"; version="1.22.0"; sha256="0cs0sbs9cx3syjv3dhl9b56s8ccpb00cwz9z18j31yaijl1h13vi"; depends=[]; };
-  flowPloidy = derive2 { name="flowPloidy"; version="1.4.1"; sha256="1iqyc6b8lp22lr4xik4ibixc4x6grxvmg18bp2dflp6xkyy7vrq5"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
+  flowPloidy = derive2 { name="flowPloidy"; version="1.4.2"; sha256="15z3laz0g3agv9dhga29myhmri5w6ivj10rivq4r0kv7lql1wzlx"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
   flowPlots = derive2 { name="flowPlots"; version="1.26.0"; sha256="0bg523vxnk3kjwwplqykamdfqmyr7b0laxkml06rfr0rbj5lcdc5"; depends=[]; };
   flowQ = derive2 { name="flowQ"; version="1.38.0"; sha256="1vxc7fn747x7i2v0nv821nx9z1d5d4dyd6fa0vbmn7smjkbdxbzd"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
   flowQB = derive2 { name="flowQB"; version="2.6.0"; sha256="04hjsswngbxi40rxcb13hzvzm8y7yzpr6qzwhnishp0a5614rzka"; depends=[extremevalues flowCore]; };
@@ -992,7 +992,7 @@ in with self; {
   flowUtils = derive2 { name="flowUtils"; version="1.42.0"; sha256="0d4ab30xp722h9avi785wj8z1qz7dy65z5faqf3jc6j6v40bzikq"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
   flowVS = derive2 { name="flowVS"; version="1.10.0"; sha256="07vcqcxzd9cw4hvc1yld2v05zcxqs5p9spka2l80pmsjr0aij043"; depends=[flowCore flowStats flowViz]; };
   flowViz = derive2 { name="flowViz"; version="1.42.0"; sha256="1fbr0snid9vgb133sb5dwkk469n465p8r490r67vsmm8wqsf6iyl"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-  flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.5"; sha256="1j1gq3izyngjbspy6c8l8wjdhv3jm21i6aqv8sz262z2g9krqdyf"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
+  flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.6"; sha256="11r9c9h1ffp3i1p7gw0f93l5g30waawl7f2vbyh06p5mcr732dmp"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
   flowcatchR = derive2 { name="flowcatchR"; version="1.12.0"; sha256="0i6r86b1g98kaw8nhbnjjrw8gw6vvhfpr5r7dn4whl4hwlizc5qx"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
   fmcsR = derive2 { name="fmcsR"; version="1.20.0"; sha256="0cbbil337zbb968zibkysrmpc8bwlpn7rl908zyvzvj8v11lxzcc"; depends=[BiocGenerics ChemmineR RUnit]; };
   focalCall = derive2 { name="focalCall"; version="1.12.0"; sha256="07lb0ijdsryd31dxp5fgp393p9f21b7in3rnf9j43qn8wmz48hnl"; depends=[CGHcall]; };
@@ -1017,7 +1017,7 @@ in with self; {
   geNetClassifier = derive2 { name="geNetClassifier"; version="1.18.0"; sha256="14qvrjbcvkqp2azfqi33y7pwg4wlf1vabddbirinw73za5b4jf48"; depends=[Biobase e1071 EBarrays minet]; };
   geecc = derive2 { name="geecc"; version="1.12.0"; sha256="1njvcwfdbpvmvvx8lcfw0baigjldr0v0rkqbk2rhb0h6wsiljfm2"; depends=[gplots hypergea MASS Rcpp]; };
   genArise = derive2 { name="genArise"; version="1.54.0"; sha256="101dammhv29w78cm2xylln4s7rzcy6sqw44navzs260xccdipxab"; depends=[locfit tkrplot xtable]; };
-  genbankr = derive2 { name="genbankr"; version="1.6.0"; sha256="0yy9mjcd354g7gw73rx00q079xjaaka20imn3afmxv80gprhss5f"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
+  genbankr = derive2 { name="genbankr"; version="1.6.1"; sha256="1f88ix4c4pfy5hhc2wlj2zrdz1jjfzzkrj4swk34ril24gf6av2z"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
   geneAttribution = derive2 { name="geneAttribution"; version="1.4.0"; sha256="11p8zqmmcfccl0fnyjm5kv8rbasamj6mra3bvk5jxsi4cqmbx9wx"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; };
   geneClassifiers = derive2 { name="geneClassifiers"; version="1.2.0"; sha256="1canrqw0g6v32vy2p2xd4pz6kw5k2zyzgff5ii0p86w519dzg16v"; depends=[Biobase BiocGenerics]; };
   geneRecommender = derive2 { name="geneRecommender"; version="1.50.0"; sha256="16cf2zkjffmdr2lhm7b4ckcw6p0kx40whw36m6y9510i8pmzy3y9"; depends=[Biobase]; };
@@ -1035,9 +1035,9 @@ in with self; {
   genotypeeval = derive2 { name="genotypeeval"; version="1.10.0"; sha256="1pff2n1s350j6i7klsnwqlizkdvvfpyqqrvc7kq5gj7yh508dxy9"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer Rtsne VariantAnnotation]; };
   genphen = derive2 { name="genphen"; version="1.6.0"; sha256="0m1g1hfhhbq3xjdr2fjf3wbng6d953kci965h298c168dv3864k6"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; };
   gespeR = derive2 { name="gespeR"; version="1.10.0"; sha256="09xd080b08bfpqqbha4rxn4vmglv7c5asd4gibfjgjkasd78g40m"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
-  ggbio = derive2 { name="ggbio"; version="1.26.0"; sha256="1bqxfqy0hff87ax92z4lfbjz01ndrz7x8pzm6dlkdmi52p30krm9"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  ggbio = derive2 { name="ggbio"; version="1.26.1"; sha256="1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
   ggcyto = derive2 { name="ggcyto"; version="1.6.1"; sha256="07rsg673hnrn1kf82nb59sxa925hjlb3qnjwlxvzlr2lzs958rcd"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
-  ggtree = derive2 { name="ggtree"; version="1.10.4"; sha256="1ja6ynzhqyrf4gl0haf18h36zwrc0cj9969an94c23h4ksppw0m1"; depends=[ape ggplot2 magrittr rvcheck scales tidyr treeio]; };
+  ggtree = derive2 { name="ggtree"; version="1.10.5"; sha256="1gkfjgihykkvqrhvzhr5brwzsgva0mxvfpa664k08jan9brjg22f"; depends=[ape ggplot2 magrittr rvcheck scales tidyr treeio]; };
   girafe = derive2 { name="girafe"; version="1.30.0"; sha256="0k8fjn7d1hxwin0vywly7vc570048i7nckhyw9j4cind6fi6f75v"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
   globalSeq = derive2 { name="globalSeq"; version="1.6.0"; sha256="19aws180r5gwxrz6xmfgic0mp8piki2qmzrxyy1f75866blk3r4f"; depends=[]; };
   globaltest = derive2 { name="globaltest"; version="5.32.0"; sha256="1fk9yk6n3aqigcly5zsb0jnb6jmdbn3jgbp1wyv6sby124sr4hmr"; depends=[annotate AnnotationDbi Biobase survival]; };
@@ -1095,7 +1095,7 @@ in with self; {
   iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.36.0"; sha256="096qnp9wisc4hnpgy37a4h1xb1f01kqc9rhrhfkp25wkf1yxgwmi"; depends=[BMA leaps survival]; };
   ivygapSE = derive2 { name="ivygapSE"; version="1.0.0"; sha256="1y82cm0xmddhfz12iqqwpq9ifaml3r0yxs4c3cvp6k2c0wlhl173"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; };
   joda = derive2 { name="joda"; version="1.26.0"; sha256="0qwfkq40zl16lngrmhw8lxx1qn5lh076nl6bydrzksvh1bjs78b6"; depends=[bgmm RBGL]; };
-  karyoploteR = derive2 { name="karyoploteR"; version="1.4.1"; sha256="0sq6iinign7ndw2wg1gfz7chbalyqycb8j0cai6zakaxjxav2dsc"; depends=[bezier biovizBase digest GenomeInfoDb GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; };
+  karyoploteR = derive2 { name="karyoploteR"; version="1.4.2"; sha256="18g6dm6bl5qyr50gydlvq948cmvg21iyb6l33cyh7p4haajf7xaa"; depends=[bezier biovizBase digest GenomeInfoDb GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; };
   kebabs = derive2 { name="kebabs"; version="1.12.0"; sha256="1mbymzrbwzzfd5ygf8fk89igv7x0damgskri39fj913aqifgkf42"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
   keggorthology = derive2 { name="keggorthology"; version="2.30.0"; sha256="117s7b32nkv95adh2j91b87r90svhfb91ag28brsq3r333m2q8cn"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
   kimod = derive2 { name="kimod"; version="1.6.0"; sha256="0mb9bv6bz7k27vs8rl26kh2zm8mvpkgzqhgc471lp4qz8f4fsbxc"; depends=[Biobase cluster]; };
@@ -1103,7 +1103,7 @@ in with self; {
   ldblock = derive2 { name="ldblock"; version="1.8.0"; sha256="18nfsixh6d2wfrb9laqsgly5w1frzihhak683k0p8fdf51h4aqba"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; };
   les = derive2 { name="les"; version="1.28.0"; sha256="0xy7ggc2b20i1c78mww84xvc0jhbinxn00nbfvnbw997vjqr7r79"; depends=[boot fdrtool gplots RColorBrewer]; };
   lfa = derive2 { name="lfa"; version="1.8.0"; sha256="06w0032wwqm2cxid7brb6iq6bkhqc5x3a08wwyjbib6lnj5n7rvh"; depends=[corpcor]; };
-  limma = derive2 { name="limma"; version="3.34.8"; sha256="0bmxsgz2yll83sd3wbxsrsfd35468igb0d8lldym0d0lqfz906bw"; depends=[]; };
+  limma = derive2 { name="limma"; version="3.34.9"; sha256="1y2fm61g5i0fn0j3l31xvwh9zww9bpkc4nwzb1d0yv1cag20jkdc"; depends=[]; };
   limmaGUI = derive2 { name="limmaGUI"; version="1.54.0"; sha256="1mhqxy4bfb38lp57wrm6jm57xbwhqz6z78cxjdjr8r9inysddjlp"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
   lmdme = derive2 { name="lmdme"; version="1.20.0"; sha256="1742ffw592cpp0bxd38g4k51h28iaax995lzmgxb3di6kj6h8an3"; depends=[limma pls stemHypoxia]; };
   logicFS = derive2 { name="logicFS"; version="1.48.0"; sha256="1qkbc6xgmppicg30613ak0dy8fn1irq6n8kf2qvwd95y210zlcfv"; depends=[LogicReg mcbiopi]; };
@@ -1121,7 +1121,7 @@ in with self; {
   maanova = derive2 { name="maanova"; version="1.48.0"; sha256="1vvjk6y8mp5h7l8yk4f1y48jx5k9fl9s12x2mgsbap306paw860q"; depends=[Biobase]; };
   macat = derive2 { name="macat"; version="1.52.0"; sha256="168jw5bi1nbj2dfhipnvja7w0avmiw6vrvdany73d41fvigmagj5"; depends=[annotate Biobase]; };
   made4 = derive2 { name="made4"; version="1.52.0"; sha256="1ns7f47l7ig2fm95l67ppym5gbkbr8lp18vx51pqwjg8r5rvj9sc"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maftools = derive2 { name="maftools"; version="1.4.21"; sha256="0xcqfnp7qx9gr5nr8bd00cqa7b1d32nb14cj0ymhazsyd2ja9wv5"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
+  maftools = derive2 { name="maftools"; version="1.4.25"; sha256="0k4ry5pnh3lxyzkab094wpjiaqjrymq9hbgpz8xv9g67fhg2g8ah"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
   maigesPack = derive2 { name="maigesPack"; version="1.42.0"; sha256="1c92kkr2rmfydckmbvri8g0lzz1v3hx93zpmb1pwrnlfpm01j95j"; depends=[convert graph limma marray]; };
   makecdfenv = derive2 { name="makecdfenv"; version="1.54.0"; sha256="17fmzd12acdpq3vfnqrafmmg5jcmdgkf83mrqjpw92zah2w8490a"; depends=[affy affyio Biobase zlibbioc]; };
   manta = derive2 { name="manta"; version="1.24.0"; sha256="060x5rdzkx882pa8x9w7j3sgj0clar6w35yblbcggq579r9jpx06"; depends=[caroline edgeR Hmisc]; };
@@ -1160,7 +1160,7 @@ in with self; {
   methyvim = derive2 { name="methyvim"; version="1.0.0"; sha256="1hz6c4bdgslxrbkr0q9fx6ffrrilxcanm8f5alady5qndm4vmiw1"; depends=[BiocGenerics BiocParallel bumphunter cluster doFuture dplyr future GenomeInfoDb ggplot2 gridExtra gtools IRanges limma magrittr minfi SummarizedExperiment superheat tmle wesanderson]; };
   mfa = derive2 { name="mfa"; version="1.0.0"; sha256="17mwf4p4cr4xz1g32p4j0jaxvzfvjzilyrl9nv686nr7cplgkbgp"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; };
   mgsa = derive2 { name="mgsa"; version="1.26.0"; sha256="087hmvrrd5x1s6198g9q8nwrpd36zywg39dl4l6x8qkr7zgjzakb"; depends=[gplots]; };
-  miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.0.0"; sha256="0nx31s6lq6270qj0lx0f8f14959vwhfcyzs1n9h3rs0jwagr41kx"; depends=[]; };
+  miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.0.4"; sha256="1cjjikbw6anb1cgwl4718lv1k5acc2fhl6c0gmszdl16x8z2yyz1"; depends=[]; };
   miRLAB = derive2 { name="miRLAB"; version="1.8.0"; sha256="0fj96h1xan56sc71ycc4c5b2q7chncsknmdlj318lz95mydbiwdv"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
   miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.6.0"; sha256="1chsigqmfxajd8gll2rq7ccbrsgp9k0cddn4ds4zkiiz6a79iiww"; depends=[AnnotationDbi DBI miRBaseVersions_db]; };
   miRNApath = derive2 { name="miRNApath"; version="1.38.0"; sha256="11137kg0a1l8z2aiz6qisg1gq21rpgzhwr4z8dg0bkh9137jwnx8"; depends=[]; };
@@ -1169,7 +1169,7 @@ in with self; {
   miRmine = derive2 { name="miRmine"; version="1.0.0"; sha256="09sxjj2pj4s03dqqphywyhvmk3q2gvdn2nph5nplqwny6q9m2i1v"; depends=[SummarizedExperiment]; };
   miRsponge = derive2 { name="miRsponge"; version="1.2.0"; sha256="0c3213hpf78ynqlaj12p0j9172gvlrhrx4rn4kmr6g1ja9xk80k7"; depends=[clusterProfiler corpcor DOSE igraph ProNet ReactomePA survival varhandle]; };
   microRNA = derive2 { name="microRNA"; version="1.36.0"; sha256="0mc81fy9y3jgc3ll074ksmw72d8yp29pyaankn3na24r96lfcxnj"; depends=[Biostrings]; };
-  microbiome = derive2 { name="microbiome"; version="1.0.0"; sha256="13hfia6y1bnzx68gkbb9jhpg9m4mbjn6js69zmhg68c3s7l7s1lk"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; };
+  microbiome = derive2 { name="microbiome"; version="1.0.2"; sha256="185igm8dr5irc4bhgjflkxax0gk4lgm3zznqazv378j435194xgh"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; };
   mimager = derive2 { name="mimager"; version="1.2.0"; sha256="14r0h676nhsbg175hj7jmkp1ny5wfhykmy2jm2s9qgdsfrgacgv2"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; };
   minet = derive2 { name="minet"; version="3.36.0"; sha256="1ig9kwh7fvhpglxkda9l5nkaz3rmhl6bc006h6mrz9hl130vmnn8"; depends=[infotheo]; };
   minfi = derive2 { name="minfi"; version="1.24.0"; sha256="1pk5savz9ziarx2iajqnck4vjmh3bnrmzy5m06vx3vmcww46ddi7"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter data_table genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
@@ -1177,10 +1177,10 @@ in with self; {
   missMethyl = derive2 { name="missMethyl"; version="1.12.0"; sha256="1fvpny7x56l55zhgabm6al2i2n0hix7fp7d01bzirsn7chxpwny3"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
   mitoODE = derive2 { name="mitoODE"; version="1.16.0"; sha256="11kyihynbl3kcrngv8dhiqn3ghpkvv0xi35pf8np2p41zdhbrpyv"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
   mogsa = derive2 { name="mogsa"; version="1.12.2"; sha256="0a29q9jak4vr05ngh2pcsfifa9i6p086acjk2qrzwnc3lcfm00bm"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
-  monocle = derive2 { name="monocle"; version="2.6.1"; sha256="1s3g488jyb0lbdsx4jkpzfl47kpcrnmn2n3bi85if1jmgvlxahvv"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
+  monocle = derive2 { name="monocle"; version="2.6.3"; sha256="1qag8q6wy1wf1zx16h2lwki6rn4nxkjff7yhpn8m30hp3v01fvhn"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
   mosaics = derive2 { name="mosaics"; version="2.16.0"; sha256="08q48zakyfydrj8vix3a5w0j4ix5h1hpqccv0jxgj55gpdc062kj"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
   motifRG = derive2 { name="motifRG"; version="1.22.0"; sha256="193zl2rlzwxv9p9q5i7rilj3w05ndqfyp9bdpvagp5s5cin4hf44"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
-  motifStack = derive2 { name="motifStack"; version="1.22.2"; sha256="05kbp0j0hqpx22fn47r4fcws3hgv5j0496n5srwz1qdlm10igs23"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
+  motifStack = derive2 { name="motifStack"; version="1.22.4"; sha256="13wrpdgyhzrqdp7k0d7iym2pjjla46rh3i1qwm34j22n7j0pxs8x"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
   motifbreakR = derive2 { name="motifbreakR"; version="1.8.0"; sha256="1jfff6jgvrylhnpyc5zq1fah33xq8vf7hypv22vg7js6m8bmcx5j"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
   motifcounter = derive2 { name="motifcounter"; version="1.2.1"; sha256="1k47yca1w59w0k7w4cxahhq4r2jyb8vflpzmrl7wnypb4lf9mbc0"; depends=[Biostrings]; };
   motifmatchr = derive2 { name="motifmatchr"; version="1.0.1"; sha256="0a7hg307f274n8vxknl0381xpvgphsim07pk7dnh0af3a63lh2ji"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; };
@@ -1196,7 +1196,7 @@ in with self; {
   multiscan = derive2 { name="multiscan"; version="1.38.0"; sha256="07fb0a7kn8bjvq9cx4dvdjrf92830vwpz5n31mgk58aw3vg3mz66"; depends=[Biobase]; };
   multtest = derive2 { name="multtest"; version="2.34.0"; sha256="0n11rd49xl2vn3ldmfips7d3yb70l8npjcqsxyswr9ypjhgzkv9j"; depends=[Biobase BiocGenerics MASS survival]; };
   muscle = derive2 { name="muscle"; version="3.20.0"; sha256="16kawdvm08hag2kghdn438z0ysby67p989v3xlcf9r8f62isw6b7"; depends=[Biostrings]; };
-  mvGST = derive2 { name="mvGST"; version="1.12.0"; sha256="12fm1xgini0l5x2xbp9qkxigdvii7yjdwww420bn7ymz4z97865c"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; };
+  mvGST = derive2 { name="mvGST"; version="1.12.2"; sha256="132s30c116gmbimzf1jw70p0pz4fv6lbfqb90sxnzbqvb8alvs0h"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; };
   mygene = derive2 { name="mygene"; version="1.14.0"; sha256="0qqkpsqk99575rc49kj7s5yl22jb96gmk47i5lm700qi4v9fyim4"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
   myvariant = derive2 { name="myvariant"; version="1.8.0"; sha256="1r4hqy5jz4xqswj3pfzxmncjapjmcksbx428f7lfncj844198g1q"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
   mzID = derive2 { name="mzID"; version="1.16.0"; sha256="0yk70dka56zd8w62f03ggx3mandj91gfa767h9ajj0sd3mjmfqb9"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
@@ -1278,7 +1278,7 @@ in with self; {
   plw = derive2 { name="plw"; version="1.38.0"; sha256="1mys9rslhc3rb23wbvlnxwl4dcca2m395bxfg7i4217hvzai7b25"; depends=[affy MASS]; };
   pmm = derive2 { name="pmm"; version="1.10.0"; sha256="1bzmh0p0c649sqp1lhz8zdqh4k7b3n78akgn2wlhawjbx3lb5f6i"; depends=[lme4]; };
   podkat = derive2 { name="podkat"; version="1.10.0"; sha256="0c93gnrcw8rwq9r4f7kkpsdjflarwixjpadaa05w98vqa9x5ycc4"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
-  polyester = derive2 { name="polyester"; version="1.14.0"; sha256="1pxlkncfnrd15l1n4j5mj04in9pr6fxmxcwlrsqrqn58x4hk4kxs"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
+  polyester = derive2 { name="polyester"; version="1.14.1"; sha256="10dj2qy5b94qd0j0rm7a6j50zqaxdjjwy583cgci158cf8s8y915"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
   ppiStats = derive2 { name="ppiStats"; version="1.44.0"; sha256="14xrvcfbp177mpdlzi2kxmv0v9j93i4r1xsw06fr3gw9a7l6zg3r"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
   pqsfinder = derive2 { name="pqsfinder"; version="1.6.3"; sha256="0rf0sjd1gsdvn1qilckp5y9vb7j3wgs9h12gcxcjfrcaax8b3h6h"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; };
   prada = derive2 { name="prada"; version="1.54.0"; sha256="19f8h411mzbrim1wvncr7wa3ah0qc1vy9kzcbx64pcif2xfb5qin"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
@@ -1329,7 +1329,7 @@ in with self; {
   rcellminer = derive2 { name="rcellminer"; version="2.0.0"; sha256="1y5rzv9ggfxgyy4z5hm7awd8zb8n57qr2954p2j4ikhj62b6h6z2"; depends=[Biobase fingerprint ggplot2 gplots rcdk rcellminerData shiny stringr]; };
   readat = derive2 { name="readat"; version="1.4.0"; sha256="10pib536kmkpi3ij8cccxyap7zw0q1jfd1bcv4c38vn04jm3smaa"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_sets assertive_types Biobase data_table dplyr magrittr openxlsx pathological reshape2 stringi SummarizedExperiment testthat tidyr]; };
   reb = derive2 { name="reb"; version="1.56.0"; sha256="0sh9r77r2s3fmkbkwrazl705dqwr2wh0mx34pxhjfvfic0jc1r5x"; depends=[Biobase idiogram]; };
-  recount = derive2 { name="recount"; version="1.4.4"; sha256="1pm7p4qfnqajmm8ym5bq71hi8bjrm6xjax838x79b67d825nhsw9"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
+  recount = derive2 { name="recount"; version="1.4.6"; sha256="0gqv59rm9k5kcfiq99vxz9g86p2vy7znq5cd84bc7hg6qkva1ah0"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
   recoup = derive2 { name="recoup"; version="1.6.0"; sha256="09i0c2wv9c6hqc4mq6kklp0maqskpfxj871j44256dxlfh81xm3b"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
   regionReport = derive2 { name="regionReport"; version="1.12.2"; sha256="1fvkmd2yfkvkj44ldywr1z0l1cn7c64nq3920fhlarqygv92d7xx"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
   regioneR = derive2 { name="regioneR"; version="1.10.0"; sha256="1vprp3l929hwzmvgskbhawfgnrymwc9n2rxd16rgagnv1dxnjxfp"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; };
@@ -1339,7 +1339,7 @@ in with self; {
   rfPred = derive2 { name="rfPred"; version="1.16.0"; sha256="1m79rykh534iss41nw62j0dyx6v0vqk543m7dlgl7zm2kpyzdpc3"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
   rgsepd = derive2 { name="rgsepd"; version="1.10.0"; sha256="0r1adlc7dxwnm8h6nh4w05z3bffvr10cch7i68a7dli968yza2vj"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
   rhdf5 = derive2 { name="rhdf5"; version="2.22.0"; sha256="145858qg1xan6imxcbprzq3yn3mdf532aahdr6cibvdjg47hs4c1"; depends=[zlibbioc]; };
-  rhdf5client = derive2 { name="rhdf5client"; version="1.0.6"; sha256="1h2dvz4rx11gsxj2fy61jwbkxgdx1jq0xahxyq7mclkbc4p8v4xy"; depends=[httr rjson S4Vectors]; };
+  rhdf5client = derive2 { name="rhdf5client"; version="1.0.7"; sha256="0hq812larfzim4cpq26mx6ckcrpz6p1m55xl2z9dk7zwqapnd2ri"; depends=[httr rjson S4Vectors]; };
   riboSeqR = derive2 { name="riboSeqR"; version="1.12.0"; sha256="0fg2zn5az1djdjnsrli26rl53ljrrjzmspx02dmgwf1a7nm7qmfz"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; };
   rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.36.0"; sha256="0y0mxzs24jz9nxcvjxymj0zxjfn1rlx3d8dzvdmfn98lbgyzm4dv"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
   rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.8.0"; sha256="050dc6asknh8snk6xkvpp5ivyikalslsawadh11lnw5wb4fixmhm"; depends=[RColorBrewer]; };
@@ -1369,7 +1369,7 @@ in with self; {
   scmap = derive2 { name="scmap"; version="1.1.5"; sha256="0jqgk9sjb5bp5gbzq14vsif5gd5ry4213glvnpmhgqm23hmwbfhi"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; };
   scone = derive2 { name="scone"; version="1.2.0"; sha256="1xq48d3z78p54iclb1ii074i7f88qfzh5djfiyrwf3k6gsapadfi"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; };
   scoreInvHap = derive2 { name="scoreInvHap"; version="1.0.0"; sha256="04q2rs1gw7v97lwcialyswqzl0kd5c5298v60cm6wha25i6lwgbs"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; };
-  scran = derive2 { name="scran"; version="1.6.7"; sha256="0zfm5i8xrnzb3894xygqd6zkbwaa2x3z74wbxw39fcjhyhxv2hmb"; depends=[beachmat BiocGenerics BiocParallel DT dynamicTreeCut edgeR FNN ggplot2 igraph limma Matrix Rcpp Rhdf5lib S4Vectors scater shiny SingleCellExperiment statmod SummarizedExperiment viridis zoo]; };
+  scran = derive2 { name="scran"; version="1.6.9"; sha256="0cs64cnf0xjcgmawr210y99j3gxs6aqgh8081n9827kkqnx2y5dm"; depends=[beachmat BiocGenerics BiocParallel DT dynamicTreeCut edgeR FNN ggplot2 igraph limma Matrix Rcpp Rhdf5lib S4Vectors scater shiny SingleCellExperiment statmod SummarizedExperiment viridis zoo]; };
   scsR = derive2 { name="scsR"; version="1.14.0"; sha256="05xqrv1babqvlvr4m5k0r7yy4fbr0y46f3i4v4zcjilda1qf54pb"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
   segmentSeq = derive2 { name="segmentSeq"; version="2.12.0"; sha256="0jqdddzrxahf6i7cmaay5v9ig9969avhv8ddh72v6ndfphlkfb64"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
   semisup = derive2 { name="semisup"; version="1.2.0"; sha256="14q2p38a8r4ry8swwi88k96rchmcnplknq1a62lvm98k09k1887r"; depends=[SummarizedExperiment VGAM]; };
@@ -1441,15 +1441,15 @@ in with self; {
   timescape = derive2 { name="timescape"; version="1.2.0"; sha256="0v3a7gn2d852h8m0053a57w153z4nlmp5mb5g96kjw06vvwr71jd"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; };
   tkWidgets = derive2 { name="tkWidgets"; version="1.56.0"; sha256="0z1vd0nymyvvrn5jc97q33y9xl6w8pd4wzb6yyfjg8jy85kswfgf"; depends=[DynDoc widgetTools]; };
   tofsims = derive2 { name="tofsims"; version="1.6.0"; sha256="1zpq0c01fqm3yl2mkvx1yl2ajj2a933wa6h7hinrh3mdyix8pzrn"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
-  topGO = derive2 { name="topGO"; version="2.30.0"; sha256="1hqffz5qp7glxdvjp37005g8qk5nam3f9wpf6d1wjnzpar04f3dz"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
+  topGO = derive2 { name="topGO"; version="2.30.1"; sha256="1cgz4knxr328xfqlhl6ypxl6x86rfrlqz748kn94ainxjzz55i6x"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
   topdownr = derive2 { name="topdownr"; version="1.0.0"; sha256="1yshm8a6dirnmda5ydx1ksndbbcrqlp25lrj1rqxnaclqb9xn0g2"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR S4Vectors]; };
   trackViewer = derive2 { name="trackViewer"; version="1.14.1"; sha256="029yff299x23imqyk62cmxcsvdx34a6b4l9zp4p46iq3jb841h66"; depends=[AnnotationDbi GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz htmlwidgets IRanges pbapply Rsamtools rtracklayer S4Vectors scales]; };
   tracktables = derive2 { name="tracktables"; version="1.12.0"; sha256="02l5n4sbwzig5kdnjyhhqpiwskaf8f4pqkra3m511vrqfpmd39f3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
   transcriptR = derive2 { name="transcriptR"; version="1.6.0"; sha256="0malha3w4vm21bmqdvn8y9q37m0ilghbyzmwgayvx9lvy3mfnk2s"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
   transcriptogramer = derive2 { name="transcriptogramer"; version="1.0.0"; sha256="08yab83dkwjwbbgf05k05c32yn74ls8xy7lm3yr39sb3nfqmra9n"; depends=[biomaRt data_table doSNOW foreach igraph limma progress RedeR snow topGO]; };
   traseR = derive2 { name="traseR"; version="1.8.0"; sha256="1zqcz7w8pwc2vzjr137iv1bpfddh17kvmqaz7hgs9z1962704l0y"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
-  treeio = derive2 { name="treeio"; version="1.2.1"; sha256="1m36jqdn9png95zy0n19x4p6ggc8f9sz9708l1kf8as8bhan9rlx"; depends=[ape ggplot2 jsonlite magrittr rvcheck]; };
-  trena = derive2 { name="trena"; version="1.0.0"; sha256="0b7bwm5xfav3m0gnz4mnc6959ha0larqpzlny3r8kxj4gx6cql4j"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 stringr vbsr]; };
+  treeio = derive2 { name="treeio"; version="1.2.2"; sha256="1m92hrfgy3lca7x674qp41j2x4gpanfvvc7gsmxw3d1q7fwqlvwl"; depends=[ape ggplot2 jsonlite magrittr rvcheck]; };
+  trena = derive2 { name="trena"; version="1.0.3"; sha256="1yk88mc3lcgm75wzqgl6xz4f1vk1i5q9qybr5m7s71m4dvwszgpb"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 stringr vbsr]; };
   triform = derive2 { name="triform"; version="1.20.0"; sha256="09hlnkrbzgk0vn1jcbja2i0hv54pfr2nzf33ik0rabrvv75zhb46"; depends=[BiocGenerics IRanges yaml]; };
   trigger = derive2 { name="trigger"; version="1.24.0"; sha256="16r7b0wy37pbylz9ch6516nygpxrb31qm42i8amh04jy60zw64rw"; depends=[corpcor qtl qvalue sva]; };
   trio = derive2 { name="trio"; version="3.16.0"; sha256="1bw0cy95qrzmg6qiy9j8n4ydi734z3q78l1pnaxagdk1ji5ab577"; depends=[]; };
@@ -1467,14 +1467,14 @@ in with self; {
   vsn = derive2 { name="vsn"; version="3.46.0"; sha256="18y62phzirj75gg6v5l41jwybmk23ia6w7qhch0kxc4bl2rysw6j"; depends=[affy Biobase ggplot2 lattice limma]; };
   vtpnet = derive2 { name="vtpnet"; version="0.18.0"; sha256="02nws97nmlrpzwb5jqm3fmg38mp1qdf41hzwmmprhfhsymnmc4ch"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
   vulcan = derive2 { name="vulcan"; version="1.0.0"; sha256="1yxm6yg7d65wh9rl6k5b6831y4hr5l9nnmfi0azxz1h4x1ghqbdj"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; };
-  wateRmelon = derive2 { name="wateRmelon"; version="1.22.0"; sha256="1043wwkavdkdwlps5hcqn6hi2jk8w1m1lfb8fp6i4yp82r82zn5h"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
+  wateRmelon = derive2 { name="wateRmelon"; version="1.22.1"; sha256="08imbxhs4ikm6panz3y64b24d2ghy1s2ksgd8siff53hg2v59rqr"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
   wavClusteR = derive2 { name="wavClusteR"; version="2.11.0"; sha256="0f1lk45a9yqr0ysjq8kjpqys8qln2b8ix03nywcqnkl1lk2b5ymi"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
   waveTiling = derive2 { name="waveTiling"; version="1.20.0"; sha256="1dlz548vjnarz15mscmj56jp2hn810w0dy7xprxx22n51h7kb7jg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
   weaver = derive2 { name="weaver"; version="1.44.0"; sha256="06fg8z4gp2mabiy9jrfwkrrz1r4qzzgjk3lxj6d53ii2xhq95vy6"; depends=[codetools digest]; };
   webbioc = derive2 { name="webbioc"; version="1.50.0"; sha256="1kg6apnhq97ypmpx6qm2f7wip81f910mjlg9kmd9zzmhnkrhqamd"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
   widgetTools = derive2 { name="widgetTools"; version="1.56.0"; sha256="0xkasd8z4sy9dsb2r7k3x2vhbqh9md39bz3qqwjsz8hgl6f0ggsr"; depends=[]; };
   wiggleplotr = derive2 { name="wiggleplotr"; version="1.2.0"; sha256="1scqvmh16y6c81qlvfa8y9z47p8wl4lccq0sm5wy4jay6zch8mn2"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; };
-  xcms = derive2 { name="xcms"; version="3.0.0"; sha256="0yy45y7shh70ql8wrpr8bjqsx7i30hjqdgvwaxv4kypf4pxy7rx0"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer S4Vectors]; };
+  xcms = derive2 { name="xcms"; version="3.0.2"; sha256="0qk9mjg4qdv88vmcsdalf59za46ifikxp7snwf5a6n3jaykzx4xl"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer S4Vectors]; };
   xmapbridge = derive2 { name="xmapbridge"; version="1.36.0"; sha256="0jv07kgjh3jkk61bw92kr3s10sai427f93r5j5hjzjhn6wzpahqy"; depends=[]; };
   xps = derive2 { name="xps"; version="1.38.0"; sha256="1xmsbjkcy04nz1npbr2bia1p4x4q6b55mmk0vqkphjl6x93dw6c8"; depends=[]; };
   yamss = derive2 { name="yamss"; version="1.4.0"; sha256="08mq0f27if86wacck1317fhm6gchxqzbj2vj9sxasr865jdzr1r9"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index c91df83d229..8e8085fdece 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2018-02-20"; };
+let derive2 = derive { snapshot = "2018-03-12"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -18,7 +18,7 @@ in with self; {
   ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
   ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
   ACEt = derive2 { name="ACEt"; version="1.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; };
-  ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.5"; sha256="0jcwpqr6snvzi55zn24aiqzbbjqpq0h6fiw8m0d01120pna21ks3"; depends=[filematrix]; };
+  ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.6"; sha256="049xjv2ym35bbn43zwi68cq27fwdh404vp0r2ca5gxgmmx8kj1cz"; depends=[filematrix]; };
   ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; };
   ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; };
@@ -27,7 +27,7 @@ in with self; {
   ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
   ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
-  ADMM = derive2 { name="ADMM"; version="0.2.1"; sha256="1km9xqglx77nizix9cik7f4y3q0nybff3r6xw9pn1k1kcmm9qjhj"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
+  ADMM = derive2 { name="ADMM"; version="0.2.2"; sha256="0rwszi152nm6rrmgh23js2cv0yfrsa6vky4gmrgszxgx8sw221v9"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
   ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; };
   ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
@@ -57,9 +57,10 @@ in with self; {
   AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="0.1.0"; sha256="0wqz9akk5340k0z5791dh8zmh7bfrj7ln05xlw548dql47w0xnrk"; depends=[]; };
   AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
   AMIAS = derive2 { name="AMIAS"; version="1.0.1"; sha256="17ay7dgi2c7ybps337ngyc1lg6fy84lxvkqfrr8nf5rjapw8mg6w"; depends=[limSolve Matrix zoo]; };
-  AMModels = derive2 { name="AMModels"; version="0.1.2"; sha256="0503vwagrlg14f8n15p7jsz25mvmjinr1cyns24hpp4y2fgbc56s"; depends=[unmarked]; };
+  AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; depends=[unmarked]; };
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
+  AMR = derive2 { name="AMR"; version="0.1.0"; sha256="1vp2l4xfd44sy14fqir2d7kq8835np6hnrzdhqkwxh5vjw8wkfyx"; depends=[dplyr reshape2 rvest xml2]; };
   ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; };
   ANN2 = derive2 { name="ANN2"; version="1.5"; sha256="17b0dv1dl4kni7yvrrwk65cadk6f7qk7505r27j9v530pffyv1k3"; depends=[Rcpp RcppArmadillo robustbase]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
@@ -97,6 +98,7 @@ in with self; {
   AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; };
   AbSim = derive2 { name="AbSim"; version="0.2.4"; sha256="0n90zbm5nsb9ric92p0mp3a4nzivdh8m8dls18051v2dbn5h4z1v"; depends=[ape poweRlaw]; };
   AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5.1"; sha256="15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w"; depends=[Biobase DESeq limma Rcpp RcppArmadillo]; };
+  Ac3net = derive2 { name="Ac3net"; version="1.2.2"; sha256="1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"; depends=[data_table]; };
   AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-5"; sha256="18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x"; depends=[]; };
   AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.1"; sha256="16rmwz51fy84w83vwnq2nv9mcrp4gi9ciirj5555gl1224b9i2am"; depends=[seewave tuneR zoo]; };
   AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; };
@@ -213,6 +215,7 @@ in with self; {
   BClustLonG = derive2 { name="BClustLonG"; version="0.1.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
   BDgraph = derive2 { name="BDgraph"; version="2.44"; sha256="055pmjf8pgfqih6bxjj34gz7gj78y4z3kldy561z7mi443kwphq6"; depends=[igraph Matrix]; };
+  BEACH = derive2 { name="BEACH"; version="1.2.1"; sha256="0a6xwczw3d2jnksb5lpf7j859pnyfxcab4kfv4v7lmf9iasbyyf5"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
   BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
@@ -230,8 +233,9 @@ in with self; {
   BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.3-18"; sha256="0cf5nbqcfvx76v1iia2d48j6dg9sqscmjrl0r835xbssiv9xk5w4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; };
   BIGL = derive2 { name="BIGL"; version="1.1.1"; sha256="008f3x0hkmifra1wcv56hxjjf2rqc9qxsbpi23aq4pgk7mxdaax7"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
+  BINCOR = derive2 { name="BINCOR"; version="0.1.0"; sha256="0fzynq85zbjybylxrpk89sq4l1ccm8k4z1bn25b6rgnz5m18r8hs"; depends=[pracma]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
-  BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; };
+  BIOMASS = derive2 { name="BIOMASS"; version="1.2"; sha256="1d9rwgh0ws27yd0p2la7pn49sb71lh9bg4f42fpx448ah8dimw17"; depends=[httr jsonlite minpack_lm msm raster]; };
   BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; };
   BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
   BIS = derive2 { name="BIS"; version="0.1.0"; sha256="0m9wvz4vg9vpw6dxjdxzi3vbkflvs4041xjrpic5jngw0jv8fjz0"; depends=[dplyr readr rvest tidyr xml2]; };
@@ -243,14 +247,13 @@ in with self; {
   BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; };
   BMA = derive2 { name="BMA"; version="3.18.7"; sha256="095iwlbjklg1pkp5jiw0srg7jh9cn50g8z4namrs4xsmlh7if65z"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; };
-  BMN = derive2 { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
   BMRBr = derive2 { name="BMRBr"; version="0.1.0"; sha256="1z54annplzydnxvwd0rkhcw5rmfx8r99k28ld5rgh22xq3zdq825"; depends=[rvest xml2]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
   BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; };
   BMhyb = derive2 { name="BMhyb"; version="1.5.2"; sha256="0sf12xibr22i3pqdb7zay1mmgfnvqxdlimsbd8y5pi4ybiqz8bl8"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; };
   BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; };
-  BMisc = derive2 { name="BMisc"; version="1.1.1"; sha256="1ckliy7pnpx47dqmd6msd5496ddrj05j49al866av5zg9qsr7z4s"; depends=[formula_tools]; };
+  BMisc = derive2 { name="BMisc"; version="1.2.0"; sha256="0mfwa3614xgvlwl44r9p3ic34z9q9qilnhvb8p95s40xi622wphy"; depends=[formula_tools plm]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; };
   BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; };
@@ -260,7 +263,7 @@ in with self; {
   BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; };
   BNSP = derive2 { name="BNSP"; version="2.0.2"; sha256="0vapcf8qxcdmragbmwai4yddpmwwm79mksf4zcych0d4a0ij39h6"; depends=[coda ggplot2 gridExtra plot3D threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-  BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; };
+  BOIN = derive2 { name="BOIN"; version="2.6"; sha256="0vg7rfypkqy8l0q9zyqhbciangv744rvylv9741rk87mdiwgjr8k"; depends=[Iso]; };
   BPEC = derive2 { name="BPEC"; version="1.1"; sha256="14bkpmi1rmpl728nb7kmbmd687s5cvlzj181cxzwcaz3yb8x58nw"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; };
   BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; };
   BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; };
@@ -292,7 +295,7 @@ in with self; {
   BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; };
   BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; };
   Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
-  Barycenter = derive2 { name="Barycenter"; version="1.2"; sha256="077b66pj60sryjnd6zkwqdd5hvbqh4pj8r65k4jb2rjvlbqyxln8"; depends=[Rcpp RcppArmadillo]; };
+  Barycenter = derive2 { name="Barycenter"; version="1.3"; sha256="1xrcbr80az80h9hx1ik9cxi86j9j9663iv62kgkh6lknafl3mmh5"; depends=[Rcpp RcppArmadillo]; };
   BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; };
   BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.0"; sha256="0jjw7iqlyasyivssmkwkn97al9k8l6bs57zkjwf7hjrj36jfa4x1"; depends=[curl dplyr quantmod rvest stringr tidyr XML]; };
   BatchJobs = derive2 { name="BatchJobs"; version="1.7"; sha256="035658marnw57p4f38g99rwmvmb6hpbq0fhlxp3qbw22zfnnkvs9"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; };
@@ -333,7 +336,7 @@ in with self; {
   BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
   BayesVarSel = derive2 { name="BayesVarSel"; version="1.8.0"; sha256="1sf18m4p8zaw2s5fv4p9s99n1n0cgzscgfhm5ngkzif43kwz1l6n"; depends=[MASS mvtnorm]; };
   BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; };
-  BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
+  BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-0"; sha256="1w5v2z39wm04s1j0vjw7kvgnkgf423qk2yzxdkpf38x47za2wrfh"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
   BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; };
   BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.3"; sha256="1lli3v922cvp1kwg4sllgvm4rnb972anlpl0lklqk3aqi7ff6flw"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard]; };
@@ -342,7 +345,7 @@ in with self; {
   Bayesthresh = derive2 { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[coda lme4 MASS matrixcalc mvtnorm VGAM]; };
   BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
-  Bchron = derive2 { name="Bchron"; version="4.2.6"; sha256="0i77a72cq6ddpfgs2p0f3bskb03428jxxyq8chjyirsws1amzp92"; depends=[coda ellipse inline MASS mclust]; };
+  Bchron = derive2 { name="Bchron"; version="4.2.7"; sha256="13zqwl4a6wg0163c3qnfnxlljh6yndim0qcz617hxka5iib74afs"; depends=[coda ellipse inline MASS mclust]; };
   Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; };
   BeSS = derive2 { name="BeSS"; version="1.0.5"; sha256="1gq0zfrzkh2cndly7amhjy0qnfb60lsj7izmdlf2m8h7yrcicjzv"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
   Benchmarking = derive2 { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
@@ -382,7 +385,7 @@ in with self; {
   BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
   Biocomb = derive2 { name="Biocomb"; version="0.3"; sha256="0shhsljg0knfp83b3hrs2c674sqx2348h5m99jhf19jf1i98pf1k"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
-  BiodiversityR = derive2 { name="BiodiversityR"; version="2.9-1"; sha256="16v21svrkhpxd4qb1ayh29c0zrfqm4m4fzfsg1zaw07ham2x1y90"; depends=[Rcmdr vegan]; };
+  BiodiversityR = derive2 { name="BiodiversityR"; version="2.9-2"; sha256="15wa7la36mfr9fi8cahvrkcd5n5gjiar66mj1c1gsaazjwqsfw6n"; depends=[Rcmdr vegan]; };
   Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
   Bioi = derive2 { name="Bioi"; version="0.2.9"; sha256="0kvqvvaws1zc3npxvl3jqidak24n5y8n98ml44mkbh7c5n296z2p"; depends=[assertthat dplyr igraph Rcpp]; };
   Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; };
@@ -395,12 +398,13 @@ in with self; {
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
   Blaunet = derive2 { name="Blaunet"; version="2.0.7"; sha256="19p2rqbg44pi0dz2iimjgr69zyrjf0dfsic6spph81dyrri1zyvh"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; };
+  Blendstat = derive2 { name="Blendstat"; version="1.0.1"; sha256="1riw2g114xar6ix1q97701lbbsgc55c1q73nrdvwm0raicjxhisi"; depends=[lattice MASS]; };
   BlockFeST = derive2 { name="BlockFeST"; version="1.3"; sha256="062x7lrcpkd15j3ar58j1gssbd0h66dym7c004jf0k040dkk0z43"; depends=[BASIX]; };
   BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
-  BoSSA = derive2 { name="BoSSA"; version="3.1"; sha256="1d6g7rfmva09y0nzh99y7wwbk7kac50xvk6il65iwfln2427v9ns"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
+  BoSSA = derive2 { name="BoSSA"; version="3.2"; sha256="03m4l77mq1h7vxfwkkp2r9acnbwd46mq85z27iizmwixnh81pgxy"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
-  Bolstad = derive2 { name="Bolstad"; version="0.2-36"; sha256="0y33664wkl0z61v6k8j9ww4a8kb1mlaaq9ippp9qggdjgbqc8rqz"; depends=[mvtnorm]; };
+  Bolstad = derive2 { name="Bolstad"; version="0.2-37"; sha256="12ivpaqx46yhvpnmncvprn4dkqgk7aqfjyvi69j8v31c1al9h5d3"; depends=[mvtnorm]; };
   Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
   BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; };
   BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; };
@@ -448,6 +452,7 @@ in with self; {
   CATkit = derive2 { name="CATkit"; version="3.2.3"; sha256="1vl60m6x3mqgghqzpxq8aalpjpcagamjk5zg62mqpwx0vgdwv2fy"; depends=[assertr magic MASS png rtf season signal]; };
   CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
   CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; };
+  CBPS = derive2 { name="CBPS"; version="0.18"; sha256="0dd63s9nrgra51w005j35scbswbknqgv9ppawh0311hpr7anrir9"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
   CCM = derive2 { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
@@ -455,10 +460,11 @@ in with self; {
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
   CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
+  CDECRetrieve = derive2 { name="CDECRetrieve"; version="0.1.0"; sha256="059pppiczvnfm4shyac6myzbq1vyz2pl7mxq225sy9ppdf813y61"; depends=[dplyr httr lazyeval lubridate magrittr purrr readr roxygen2 rvest stringr tibble tidyr xml2]; };
   CDF_PSIdekick = derive2 { name="CDF.PSIdekick"; version="1.2"; sha256="1h2d5xh7zj3d8r63qndvd5c8z52byn1852b51zmj6ypc90fil25x"; depends=[Rcpp]; };
   CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive2 { name="CDM"; version="6.0-101"; sha256="0vybxqbbdxi9bvs8a1wmra6i468ivqmp5kwb5lz1qvlb41r1gc15"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="6.1-10"; sha256="00c25k4hliqc4w15njasp0azsyy1x13h7y3kh1b9dl3qkpqs5r2z"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
@@ -495,7 +501,6 @@ in with self; {
   CNLTreg = derive2 { name="CNLTreg"; version="0.1"; sha256="1fjc45kv2nm902vpfynfxj0n7nm2prazm44nhg2m30vd6l1ijisv"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1"; sha256="0s98ckg6ms3kh49b8la2d8rsdb0m4m0v8gdbj48nqxncdvg25qk4"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-  CNVassoc = derive2 { name="CNVassoc"; version="2.2"; sha256="0rvb5sl7kfyb9jp07w4zk8817s9xld9b2cb0m33lrs4kbsv7rpnx"; depends=[CNVassocData mclust mixdist survival]; };
   CNVassocData = derive2 { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
   CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
   CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; };
@@ -513,7 +518,7 @@ in with self; {
   COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; };
   COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; };
   CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; };
-  CPBayes = derive2 { name="CPBayes"; version="0.2.0"; sha256="1h4mipvmcjhs1s1dqbibxz2sf73psbwplgc5ki65y5654yqc26pl"; depends=[forestplot MASS]; };
+  CPBayes = derive2 { name="CPBayes"; version="0.3.0"; sha256="1vzh9sgij194j7kiwjgba7xsqffiif9zamj9gdv2lk91wdcqaxid"; depends=[forestplot MASS]; };
   CPE = derive2 { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[rms survival]; };
   CPHshape = derive2 { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; };
   CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind mvtnorm plyr]; };
@@ -540,7 +545,7 @@ in with self; {
   CVST = derive2 { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
   CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
   CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
-  CVXR = derive2 { name="CVXR"; version="0.94-4"; sha256="0cnipvmrsikfy16sbnvypnhhpn4v8xczrnjnqgc3wkp454znqqhi"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; };
+  CVXR = derive2 { name="CVXR"; version="0.95"; sha256="1sf8n27w7dlix55bc5rdrrn361yc6xslwykd1vj51zh908c5as1w"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; };
   CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
@@ -580,8 +585,9 @@ in with self; {
   ChoR = derive2 { name="ChoR"; version="0.0-3"; sha256="085p604zbk4l88q4ig2fnfhadxvsssyjl2r48g8s99yx49cvd9sx"; depends=[commonsMath rJava]; };
   ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
+  CholWishart = derive2 { name="CholWishart"; version="0.9.0"; sha256="123m7byr4rcmg9h91g1p1v1aby5qpaidnjid9vg4gr1ywhbvjh63"; depends=[]; };
   CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; };
-  CircMLE = derive2 { name="CircMLE"; version="0.2.0"; sha256="1zqpn3viwb0364pcrc6nfjd25fvn3bmniqnkvqiccwdlfncqqsvq"; depends=[circular]; };
+  CircMLE = derive2 { name="CircMLE"; version="0.2.1"; sha256="031pmfyqwif16am7h1csk1dg9vhy0jgdc8w4z60kqqsgf3yk6il9"; depends=[circular]; };
   CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; };
   CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; };
   CircStats = derive2 { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[boot MASS]; };
@@ -606,7 +612,7 @@ in with self; {
   ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; };
   Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.1"; sha256="18is8aa496qr7afmyqy12s267ans0hhzy0xs8nzr3qp70mwrbbh1"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr tibble]; };
   ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.3"; sha256="1znyj39mwdi02xhypvr2fsx2yp45w8br7r8qkn831d6fza5pkcyc"; depends=[]; };
-  ClusterR = derive2 { name="ClusterR"; version="1.1.0"; sha256="1bin170587cs8awpvjb8g2nvzqklscg8n39lhhayn33wshmbdd8s"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.1.1"; sha256="0b9x0a1s0d9nnkkcm417xsaciwb66771s14ir6n6mm7yq1g6x417"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
   ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
@@ -642,7 +648,7 @@ in with self; {
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
   CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; };
   Compind = derive2 { name="Compind"; version="2.0"; sha256="1qadyl96c9cmk1i763gc055hgv414ha59418lqk183kwl5sgbqy5"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; };
-  Compositional = derive2 { name="Compositional"; version="2.8"; sha256="13658sa6x058ldvhawvwypi7pzija633bm3q6bb0pw7alirdabd1"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
+  Compositional = derive2 { name="Compositional"; version="2.9"; sha256="1vmnckp17hl3yr4qfpisavmfcvvsnh3d6v721dgns9a93cqs30z0"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
   ConR = derive2 { name="ConR"; version="1.2.1"; sha256="0k6761x5dfibbbzfzmkc73ahfmw54d5rpj0rj32232qdlk48hqk5"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
@@ -661,14 +667,13 @@ in with self; {
   ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
   ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.0.0"; sha256="0ndb7k2lfv6014a7c61a2mmcsywpa478lk6fh7d0jkv55hmnzvs9"; depends=[lmtest sandwich]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
-  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-2"; sha256="18l25hllw4f8pgcj5vrqinjqs1qns74bnw7cnq24p9pcdp218zkg"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; };
+  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-6"; sha256="1jhyb9hw10cpsac6jyrp21g9habpy0mqglg1aq6qyi59c4n95b46"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
   CorReg = derive2 { name="CorReg"; version="1.2.1"; sha256="1c7vvlxza0r9r07rr464y3kfkrnzz15l4jc7s727wjrw2az8rnpy"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
-  CorShrink = derive2 { name="CorShrink"; version="0.1.1"; sha256="0jk9wwdb0i4swx269k1zp38lfzshy6r8js8np63b4r5zxxkaw5am"; depends=[ashr Matrix reshape2 SQUAREM]; };
   Corbi = derive2 { name="Corbi"; version="0.4-2"; sha256="0h088iplryaipnfp8svw3djh016z23lv66q51gfbqpvchvjdwypw"; depends=[CRF Matrix mpmi]; };
   CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; };
   CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
@@ -719,13 +724,15 @@ in with self; {
   DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; };
   DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; };
   DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; };
+  DALEX = derive2 { name="DALEX"; version="0.1.1"; sha256="0nafdpfiawmlv6v43i4glhq1p3aaqph5f8ikcvi75l44n1rwkazk"; depends=[ALEPlot breakDown ggplot2 pdp]; };
   DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; };
   DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
   DAMisc = derive2 { name="DAMisc"; version="1.4-3"; sha256="1hic53vi7mj4fvggxjl4d3j4zw8wwczh6pldyi8idrhm45hw2nh4"; depends=[boot car effects gdata lattice MASS nnet pscl QRM sm VGAM xtable]; };
+  DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; };
   DATforDCEMRI = derive2 { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; };
   DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
-  DBI = derive2 { name="DBI"; version="0.7"; sha256="04fyrxdpqcygg5wviy637y6lgk64xqjjq31lvv4hwqj5kbaxamr5"; depends=[]; };
+  DBI = derive2 { name="DBI"; version="0.8"; sha256="16nf8flxr5vdz8yrpprfbzydy3ajixkp9hc8ibd9n7r9nc29waym"; depends=[]; };
   DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; depends=[blob DBI desc hms R6 testthat withr]; };
   DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
   DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
@@ -737,7 +744,7 @@ in with self; {
   DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; };
   DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
-  DClusterm = derive2 { name="DClusterm"; version="0.1"; sha256="0xkl4677vqy4sdkm0fczscqszjxk1kfmlbzdgm88shcnjzjg71d8"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
+  DClusterm = derive2 { name="DClusterm"; version="0.2"; sha256="0bnl9ic8q7mrb2508c5g2fkpp7wbhasivgvhldqnbqn2lyy8l76a"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
   DDD = derive2 { name="DDD"; version="3.6"; sha256="0lkij10z6bviay2dg6k5pmb9ddg4smcz96fkww0qx8h636zd2xlq"; depends=[ade4 ape deSolve expoRkit Matrix phytools pracma SparseM subplex]; };
   DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
   DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; };
@@ -754,7 +761,9 @@ in with self; {
   DEploid = derive2 { name="DEploid"; version="0.4.4"; sha256="1hcn54mn1kil6kg77j4aij15h69fnmp40d6xxfgijjcgydp211bf"; depends=[magrittr plotly Rcpp scales]; };
   DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; };
   DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; };
+  DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
+  DHS_rates = derive2 { name="DHS.rates"; version="0.2.0"; sha256="0fhbsylm0j6s4ah5iam2rc0c716zljhqf8l87n3gll5kfh08427x"; depends=[reshape survey]; };
   DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; };
   DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; };
   DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; };
@@ -820,7 +829,7 @@ in with self; {
   DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
   DataVisualizations = derive2 { name="DataVisualizations"; version="0.9.2"; sha256="0np64vbk878i52gbh7gs1pklqy60zpa7n44ir7mxqyw3v50bvp8s"; depends=[AdaptGauss ggplot2 magrittr Rcpp RcppArmadillo]; };
-  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.0.0"; sha256="1xnqc0b3w8sqafbwmwd6pdm78p3ip1d3nfkp6jb081by49qjxiw6"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
+  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.0.1"; sha256="0j7l8jgm19gbi5xprhy1brqaghm4r1a7qy0wkcjb3i46as3v9dyj"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
   Datasmith = derive2 { name="Datasmith"; version="1.0-1"; sha256="1ba23b8a931pvml2dzw0zkm40akcl2lb6rps6bffrl7lvxiy35y1"; depends=[igraph lbfgs MASS Matrix nloptr truncnorm vegan]; };
   Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
   DeLorean = derive2 { name="DeLorean"; version="1.3.0"; sha256="0bsmrpraaks4nsjdbhn1npvybb29pxiby8sdimv36nqpb1fyjgpk"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; };
@@ -844,7 +853,7 @@ in with self; {
   DepthProc = derive2 { name="DepthProc"; version="2.0.2"; sha256="0n9hs6fp047gnd8y87rzx5qcr3hqg3pdck97hcbzkd8jsi1b1daw"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
   Deriv = derive2 { name="Deriv"; version="3.8.4"; sha256="1la2afxr9nilb32s3nc1j3spxzgcqn48aywq96pckpjk8vypsjyy"; depends=[]; };
   DescTools = derive2 { name="DescTools"; version="0.99.23"; sha256="0y3br8s2kvvi552xv5ir2av810l8qknc06hw9x6bryjxj42ywa4i"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
-  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="0.9.2"; sha256="1bznlg7p1b7n510rg5rji6qmmpdwgh4nazh1mps7r9rjhjp4w0qq"; depends=[DescTools rstudioapi]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.0"; sha256="1qyxbnmr2dycyfivdyvdqcbpk993q9glrixgp64pflx3sqz91yyk"; depends=[DescTools rstudioapi]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; };
   DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.2.1"; sha256="0mb33ihqr8jj1ispykvyc7jn1wyaagb535ya5jgwlqrians41ihc"; depends=[jsonlite RCurl reshape]; };
   DetMCD = derive2 { name="DetMCD"; version="0.0.4"; sha256="0jdwwx15k8g3f5izcswsj28nfdw3n50x710mc938031yn7hjmkhg"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
@@ -852,7 +861,7 @@ in with self; {
   DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; };
-  DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.2"; sha256="0fz6d1j4jkymdz94rad96wsjzw653zz3hi6p3n6nhacv2b2j97fw"; depends=[downloader dplyr htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
+  DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.0"; sha256="0zik8j50yfxgzdv2cf6q80kw8nb5y55l9sbrp60qc08r3fp6s61b"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
   DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; };
   DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; };
   DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; };
@@ -868,6 +877,7 @@ in with self; {
   DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
+  DirectEffects = derive2 { name="DirectEffects"; version="0.1"; sha256="0c9inxn624c5rxa86d8r8jhsrm42rcsm4xxrwg7h3lvpairiyil2"; depends=[Formula]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
   DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; };
   Directional = derive2 { name="Directional"; version="3.0"; sha256="08m6yg2jpz8fcdw4dlbpb1679d72q059ab2sgc3wj53m7vqirm4a"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
@@ -887,8 +897,8 @@ in with self; {
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
-  DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.10"; sha256="0823r0bdpiz8k8cma07si6knjk7d7yx3k2jr9g9lzvz6nzn4021h"; depends=[DoE_base]; };
-  DoE_base = derive2 { name="DoE.base"; version="0.31"; sha256="0kr9d8ga6dif02gzn6z72n46a85n2kx933m16ja6gpa3wmp3x2wh"; depends=[combinat conf_design lattice MASS numbers vcd]; };
+  DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.11"; sha256="0plwvji2rrxmjnf61mj1ijglc9z62n26ijqsf65s35c19qv2g0y1"; depends=[DoE_base]; };
+  DoE_base = derive2 { name="DoE.base"; version="0.32"; sha256="1qy3n8m9y9h4cv3p6vdjifv7118rmqqxshk7sqls0m4xr3vyzwv5"; depends=[combinat conf_design lattice MASS numbers vcd]; };
   DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.9"; sha256="0l4dxb0f4ql5k3x1avfzs1w54qwjxfp8rl9h9vg6p1zhbkz4qz06"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
@@ -926,7 +936,7 @@ in with self; {
   EDA = derive2 { name="EDA"; version="1.0.1"; sha256="13qyi7yh1xqsyyvd51j5dl6dx4xh6kr97pz5v4wn46nbx6vna0dk"; depends=[ggplot2]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
-  EDMeasure = derive2 { name="EDMeasure"; version="1.1.0"; sha256="1q9k0wp3wi7sqgcn3j74r8q525q0kbcx4nlm8i0frzpb75yak7ab"; depends=[dHSIC energy rBayesianOptimization]; };
+  EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; };
   EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
   EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; };
   EFAutilities = derive2 { name="EFAutilities"; version="1.2.1"; sha256="1hgmj9zk9mwqwmqila1ana6jzqg55aj535pkrzai2y6yq45dvfh9"; depends=[GPArotation mvtnorm plyr]; };
@@ -941,7 +951,6 @@ in with self; {
   EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
   EL2Surv = derive2 { name="EL2Surv"; version="1.0"; sha256="1vrm0w9rmy4vfkpzq804p216cxw4vvp91g77k4vvzv4z87gkqfhq"; depends=[survival]; };
   ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; };
-  ELMSurv = derive2 { name="ELMSurv"; version="0.4"; sha256="0vziygjvs50wih318jvksj4z4mn1r35xx200p7ywf2a39xmr4490"; depends=[Rcpp RcppArmadillo survival]; };
   ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; };
   ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; };
   EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
@@ -974,7 +983,7 @@ in with self; {
   ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; };
   ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; };
   ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; };
-  ETAS = derive2 { name="ETAS"; version="0.4.3"; sha256="08i8i3az5f4nb6cwfyilc0dk84j6i3f3k6bxr2k1lrds1rqx0fla"; depends=[fields lattice maps Rcpp spatstat]; };
+  ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; depends=[fields goftest lattice maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; };
   EValue = derive2 { name="EValue"; version="1.1.1"; sha256="0fdihngqgl2m7385ih08zzh9y38aal1d9lv7358qf0z68i9bgfa2"; depends=[ggplot2 metafor]; };
@@ -1014,7 +1023,6 @@ in with self; {
   Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; };
   EmiStatR = derive2 { name="EmiStatR"; version="1.2.0.6"; sha256="1ygi3rz4xc7y0m1jd23g3li62br7fs0dcm6fj8kha5q93xn6yvrx"; depends=[doParallel foreach lattice shiny xts zoo]; };
   EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.3.6"; sha256="0fiwvdzcyz6ayzqfa6j2ygpab1cwbi04gd2c2g1j9qbdq95myipa"; depends=[ggplot2 gridExtra]; };
-  EnQuireR = derive2 { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; };
   EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; };
   EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
   EnsCat = derive2 { name="EnsCat"; version="1.1"; sha256="1rp354fqq2ihjrmqw9j1qdy86md80xml5sgh2zbyabw3zddmgyn2"; depends=[dendextend ggdendro ggplot2 seqinr]; };
@@ -1029,13 +1037,13 @@ in with self; {
   EnvStats = derive2 { name="EnvStats"; version="2.3.0"; sha256="0f0sda26in2a25vq8xr6pkskjk10q2pg463h9c1xap3bghq4xgc3"; depends=[ggplot2 MASS nortest]; };
   EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.24"; sha256="0vrcp7i5mhxfx1401zpzjbkbbyqd873mzjcvfz0bwcxrk4a5gld7"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; };
+  Epi = derive2 { name="Epi"; version="2.26"; sha256="0c54nvcyjvsmzmk326avbi69vbpw9vlvcqh8c6j32byiwj251ans"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; };
   EpiCurve = derive2 { name="EpiCurve"; version="2.0-1"; sha256="15y6nlinw3ppi4bn8xpsrch1avn7642f06lcsv2bjyi1carhfqkw"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-  EpiILM = derive2 { name="EpiILM"; version="1.4.1"; sha256="01cp02c6ylx17cwvzs22zh7p18ggyqzrky5393xbjxqlwraf970n"; depends=[coda]; };
+  EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; };
   EpiILMCT = derive2 { name="EpiILMCT"; version="1.0"; sha256="1s7f4g1d44mqp475z5cn97dqv6b1caxmfq1p6gr1w7jvgq0dfqp5"; depends=[]; };
   EpiModel = derive2 { name="EpiModel"; version="1.6.1"; sha256="0jmwrpcfrfwrw5zwvwl0cv961nvqfvxjggx93iyc8z8bd6mf1wba"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
   EpiStats = derive2 { name="EpiStats"; version="1.0"; sha256="17i8i3v8qpwas4h6g8sbdl42syg20fm22c7p1bnv4nzx28p9yzhy"; depends=[dplyr epiR]; };
@@ -1075,6 +1083,7 @@ in with self; {
   FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
   FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
   FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; };
+  FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; };
   FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; };
   FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; };
   FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; };
@@ -1101,7 +1110,6 @@ in with self; {
   FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
   FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; };
   FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; };
-  FKF = derive2 { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
   FLIM = derive2 { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[MASS zoo]; };
   FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
@@ -1139,7 +1147,7 @@ in with self; {
   FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
-  FactoClass = derive2 { name="FactoClass"; version="1.1.6"; sha256="0wkz1kvpsl4z688y9qwp3hlycn66vbsl85s70wwv8ww12z3dwpcd"; depends=[ade4 KernSmooth scatterplot3d xtable]; };
+  FactoClass = derive2 { name="FactoClass"; version="1.2.4"; sha256="0rzbzl32hk4mrs6njm4cnj84ifsf52ms5khy43m9bfmwwmadbilr"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
   FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.1"; sha256="09fnlqwnijg94yfm3q41pdck9yxaq037m7421g4hdxaigljjb6ml"; depends=[FactoMineR rmarkdown rrcov]; };
   FactoMineR = derive2 { name="FactoMineR"; version="1.39"; sha256="12m0yi4w3iw07gx8viwvy8v8l1qh3qr7ghv39cdb2g0zgmnivfxh"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
   FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; };
@@ -1185,6 +1193,7 @@ in with self; {
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
   FixedPoint = derive2 { name="FixedPoint"; version="0.2"; sha256="1gmh9ipv010q4lgpnka1rwfza5c7llgjpn7yvcsvlxglmplh8969"; depends=[MASS]; };
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
+  FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
   FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; };
   FlowScreen = derive2 { name="FlowScreen"; version="1.2.4"; sha256="0lp5andxzcs2wyhgwp44ss6b3jjqzf7qy0w9a0yiqxby3h58szwd"; depends=[changepoint evir zyp]; };
@@ -1207,12 +1216,13 @@ in with self; {
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.4.4"; sha256="0wcxs70xkp2dlk3vrp4jw1vvjivdyv1q4iinmavvzhxhf3qpv1am"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.5"; sha256="0m9w5v9pdi84r5z2rzcr0v1fn3ycx5d344ab67c9984j55p8pqpj"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
   Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
   FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
+  FusionLearn = derive2 { name="FusionLearn"; version="0.1.0"; sha256="03x21dpl72dkd4cmmaqdh42hwbdpp5c5ib79ig8pkv196231r5dn"; depends=[]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; };
   FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; };
   FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-5"; sha256="1achmsc107b26d266q0vmip8vi3qaa5z0p183z2fjdm7zh9ch6ag"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
@@ -1242,10 +1252,10 @@ in with self; {
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
   GBJ = derive2 { name="GBJ"; version="0.5.0"; sha256="07wrydd2vlvwc56hgcrqbass0d0qamn3rg5vsf9bamxa6pcg9s53"; depends=[BH mvtnorm Rcpp SKAT]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-  GCD = derive2 { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
+  GCD = derive2 { name="GCD"; version="4.0.0"; sha256="05cn9g9pahx5g9qh2lyqqlaafd1jji9awi9wx6r9hm09g4bmqrba"; depends=[]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalignR = derive2 { name="GCalignR"; version="1.0.1"; sha256="1p1zxf5s75ckyj7a61n43ix314p3b99knyg6z5d4sn5n417h2m42"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
-  GD = derive2 { name="GD"; version="1.1"; sha256="1gl2d04xlpn31940z75zbcnv6a3bdcc37bl4yq6hqph4snxbnbgk"; depends=[BAMMtools ggplot2]; };
+  GD = derive2 { name="GD"; version="1.2"; sha256="10csmsf4xkd3w73nskd1sxm8c9i0rlrsxyb4dmjrv8l207cc80pb"; depends=[BAMMtools ggplot2 reshape2]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
@@ -1266,7 +1276,7 @@ in with self; {
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
   GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
   GFD = derive2 { name="GFD"; version="0.2.5"; sha256="14bhqk5hi9w2078nn382ksgw37bx5r1jadizcrwbisglccxa0ncd"; depends=[magic MASS Matrix plotrix plyr]; };
-  GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.1"; sha256="1p7nklc9n5g7qbms8kbg08mp7zvgd4f58h7sa13571mmwbw3xmwd"; depends=[cmprsk joint_Cox]; };
+  GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.2"; sha256="0xxxjhhngc23ac891pn6hwn4y4wqil4xb83s7pq92izz5mb05q96"; depends=[cmprsk joint_Cox]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
   GGIR = derive2 { name="GGIR"; version="1.5-17"; sha256="0p452p9xcbd0r9w2aqdiw4i740xxxbgi9hk4k5xqifdlkfg4gvmb"; depends=[data_table Rcpp]; };
@@ -1312,7 +1322,7 @@ in with self; {
   GPrank = derive2 { name="GPrank"; version="0.1.2"; sha256="0z9xhydnq04p872zl7glxhndmijjihfgffl6bijc9a0rs95zaacd"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
   GPseq = derive2 { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
   GPvam = derive2 { name="GPvam"; version="3.0-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
-  GRANBase = derive2 { name="GRANBase"; version="1.6.5"; sha256="05alk1mcpwxd3p50mpl5q40ddy86a5fi8x02n31im1bpgfg21ypc"; depends=[covr dplyr hexSticker htmlTable jsonlite RCurl sendmailR stringi switchr]; };
+  GRANBase = derive2 { name="GRANBase"; version="1.6.8"; sha256="1pcm0fy3jwwaifd4m7qyil1miaxmi6v7glp2krbkngp6f8qb0bph"; depends=[covr dplyr hexSticker htmlTable jsonlite RCurl sendmailR stringi switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; };
   GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
   GROAN = derive2 { name="GROAN"; version="1.1.0"; sha256="06xcbdcg3rmb9939d9ansy75jn0axy0c36rmgjhcji8gf959kmyz"; depends=[plyr rrBLUP]; };
@@ -1324,7 +1334,7 @@ in with self; {
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
   GSCAD = derive2 { name="GSCAD"; version="0.1.0"; sha256="0a5smd1prfi6n58ghhz5v81p88v3cnmk2v6r0nn9gy7sa1r2z8xc"; depends=[fields Matrix Rcpp RcppArmadillo]; };
   GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="1.5"; sha256="0r1fgwk1v11bwq83a64cgmxh5snw3mnaq4mlgi0h4n5f1yjgg5wj"; depends=[memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="1.6"; sha256="0zvj91a3sbpgy4988xzmz6xa73rn8b2hkh67jryahm2l5azigsng"; depends=[coin memoise rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
@@ -1357,7 +1367,6 @@ in with self; {
   GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
   GenAlgo = derive2 { name="GenAlgo"; version="2.1.3"; sha256="00lr13kvkmw7zgg6b67yba0qym24vqb09xm94rwh2wd5mbh2fh2v"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
-  GenCAT = derive2 { name="GenCAT"; version="1.0.3"; sha256="1rzhp4aypdryr7hrqazax3lzfkxqhls5cf8zsjjip8jb701x46hf"; depends=[doParallel dplyr foreach ggplot2]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; };
@@ -1385,12 +1394,11 @@ in with self; {
   GerminaR = derive2 { name="GerminaR"; version="1.2"; sha256="10x22xl3r93i5mc6w7m5mqm3z386dsffwrb8h9c1bznrnynnsy63"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; };
   GetDFPData = derive2 { name="GetDFPData"; version="0.6"; sha256="19srfls3fmxbjhwhsc3r76n34ls8s5940d831j4n93f4lzq33wyp"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
   GetHFData = derive2 { name="GetHFData"; version="1.5"; sha256="1lm2k37y86fn45hhvyswj60dql0m33kia0wirs3zc981s4nsxp0i"; depends=[curl dplyr lubridate RCurl readr stringr]; };
-  GetITRData = derive2 { name="GetITRData"; version="0.6"; sha256="0llsx4x6h2a89ka8q7jf8cx77f6v2knjm7sr16dqwsm91rzg3yc2"; depends=[BETS curl dplyr readr reshape2 stringr tibble xlsx XML]; };
+  GetITRData = derive2 { name="GetITRData"; version="0.7"; sha256="0cmqbncd5bjxgb1r9yvdv2hkx4qdmnpn2a62bgndnaya1yk5050l"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
   GetLattesData = derive2 { name="GetLattesData"; version="0.9"; sha256="1rqhs8039m3ar76nail7gavw6678zs20r9dg98rp5igqx5jjys73"; depends=[curl dplyr readr stringdist stringr XML]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
   GetTDData = derive2 { name="GetTDData"; version="1.3.1"; sha256="1a8f22nxs85g2zznh1ma37lmycypg8f7d5kdhyb5vrirvrpi5p05"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; };
   GetoptLong = derive2 { name="GetoptLong"; version="0.1.6"; sha256="1d98gcvlvp9nz5lbnzr0kkpc2hbkx74hlhrnybqhg1gdwc3g09pm"; depends=[GlobalOptions rjson]; };
-  GiANT = derive2 { name="GiANT"; version="1.2"; sha256="0h9jx2vpgpzlinf6v9mxj260r22nlqml8xnd2jknw36j5imim57w"; depends=[]; };
   GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; };
   GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
@@ -1414,7 +1422,7 @@ in with self; {
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; };
-  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.0"; sha256="00a2lcqrj17ckw4npkvm3sxydfn2lyvs7pzpccy3xnzrr006ibsx"; depends=[rJava]; };
+  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.1"; sha256="0r6b8hzzx0ja0skp4w4s49jpkkjbb3an62vp74qh5sf2wi1hx9x6"; depends=[rJava]; };
   GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; };
   Greg = derive2 { name="Greg"; version="1.2"; sha256="19bzv2nknahzbdnl7n0pcnavsdlwgkprc0yk3ksqllfawnvi39f9"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
   Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; };
@@ -1450,7 +1458,7 @@ in with self; {
   HHG = derive2 { name="HHG"; version="2.2"; sha256="114nfpdjdisryil9l8cws885qdskgrjm2cclx543hh4cdhpnkxnp"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIBPwned = derive2 { name="HIBPwned"; version="0.1.6"; sha256="0ym62n1rmi8pjj37cxbrdmih7530nhmy77gxb8yylppjf3rikci4"; depends=[httr jsonlite ratelimitr urltools]; };
-  HIMA = derive2 { name="HIMA"; version="1.0.5"; sha256="00wf7qblc5f0qp84zc6b25hn0bnbhj6a57h5h6hz1wadqyhnyzjz"; depends=[doParallel foreach iterators ncvreg]; };
+  HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; };
   HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
   HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
   HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; };
@@ -1530,7 +1538,7 @@ in with self; {
   IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; };
   IATscores = derive2 { name="IATscores"; version="0.2.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; };
   IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; };
-  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.1-2"; sha256="1vb8i1xck65135pnlqbyh6y2a5w9n7spvxzyzb7323x1mv161157"; depends=[lsa tidyr]; };
+  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.2-5"; sha256="1b5fsrbqycz8zgpxk3vc48cba7vb818rw5hgmf92q11azm4n1q5s"; depends=[lsa tidyr]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
   IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
   IBDsim = derive2 { name="IBDsim"; version="0.9-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; };
@@ -1549,8 +1557,8 @@ in with self; {
   ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
   ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
   ICRanks = derive2 { name="ICRanks"; version="1.3"; sha256="0n8gyqlwx38v2lfx7r49h43k2f4z4ml78x3lq0sc952n4rckzgiv"; depends=[multcomp Rcpp]; };
-  ICS = derive2 { name="ICS"; version="1.3-0"; sha256="0r5lf8km77h29lcpi7z0hkmy4vh0p5m7p2xbxsxj6w9hsgyanv72"; depends=[mvtnorm survey]; };
-  ICSNP = derive2 { name="ICSNP"; version="1.1-0"; sha256="1g7n8jlilg36hm989s5x18kf8jqn5wy98xi9jmnqkqpds4ff217y"; depends=[ICS mvtnorm]; };
+  ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; };
+  ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; };
   ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; };
   ICSShiny = derive2 { name="ICSShiny"; version="0.4"; sha256="02qcph5ax4gwz44zq8riv4yl4h0wdiwgxv7m96cpdh7gwfhwzgzr"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; };
   ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
@@ -1563,13 +1571,14 @@ in with self; {
   IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
+  IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; };
   IDmining = derive2 { name="IDmining"; version="1.0.3"; sha256="1kvnp0y0837cgvjjwv2rmh64vksa7c6ififs60w7g05l690fkb9v"; depends=[data_table doParallel foreach]; };
   IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
   IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
   IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; };
   IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; };
   IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; };
-  ILS = derive2 { name="ILS"; version="0.1.0"; sha256="18phs1q28mpwvwnzn0hgjxy978f7n4c3p94jxjp0sy3as67hqphp"; depends=[depthTools fda_usc MASS multcomp]; };
+  ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; };
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
   IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; };
   IMIFA = derive2 { name="IMIFA"; version="1.3.1"; sha256="1xk2l1zk7arrbb8lxs5s03pjapks98xx8dfpic8qmha3qjlav90c"; depends=[abind e1071 matrixStats mclust mvnfast plotrix Rfast slam viridis]; };
@@ -1636,12 +1645,10 @@ in with self; {
   InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; };
   IntClust = derive2 { name="IntClust"; version="0.0.2"; sha256="1n0ywickky1w5m8swfidiprdnkrv0mrh9z5294bimxj5ppi1yl8v"; depends=[a4Core ade4 analogue Biobase cluster e1071 FactoMineR ggplot2 gplots gridExtra gtools limma lsa plotrix pls plyr prodlim SNFtool]; };
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
-  IntNMF = derive2 { name="IntNMF"; version="1.1"; sha256="0bw6ycf7zrbfh8dfpgva1a51nazkvwlq7pxdhpp1j1mhabwm2nq2"; depends=[cluster InterSIM MASS mclust NMF]; };
   IntegrateBs = derive2 { name="IntegrateBs"; version="0.1.0"; sha256="1pkx4wpahd1sabzx55law3710x3vbh9yi6kii8gs2xfq3cb1llmq"; depends=[]; };
   IntegratedJM = derive2 { name="IntegratedJM"; version="1.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; depends=[Biobase ggplot2 nlme]; };
   IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.8"; sha256="0y3hagjx3pzhqyqm3pydl3s3f1g9d5yb2w3ybxll11913p3gll3i"; depends=[bootstrap caTools ggplot2 limSolve MultivariateRandomForest Rcpp]; };
-  InterSIM = derive2 { name="InterSIM"; version="2.1"; sha256="092fw918qq8pahyxxznabkdfrb8700bpkkq96zj8ihpkx2ngkxln"; depends=[MASS NMF]; };
-  InterVA4 = derive2 { name="InterVA4"; version="1.7.4"; sha256="0mlcn8mlrwgb54iclvadjwgpgav3zfm1y513bn2gypafq7x3bk81"; depends=[]; };
+  InterVA4 = derive2 { name="InterVA4"; version="1.7.5"; sha256="0la99ylx8fnn4kpqa364nhs12y2hzp3sm0awsx5sfdv6n7m9js33"; depends=[]; };
   Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
   Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; };
@@ -1662,11 +1669,11 @@ in with self; {
   IsoplotR = derive2 { name="IsoplotR"; version="1.0"; sha256="0cf2y81s2sc2jqbr431hjv5i347m1q5c5dxrak7ns7s8d902729y"; depends=[MASS]; };
   IsoriX = derive2 { name="IsoriX"; version="0.7"; sha256="0b94s94axrqgv3dm9dbkdnh6imlzn245f2pi7wbj99nqhwa47ynb"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
-  JADE = derive2 { name="JADE"; version="2.0-0"; sha256="15bcq6r2iargxkb0pdbqkwrrn2rs7hc3y5fxjm5mb377513sdz5j"; depends=[clue]; };
+  JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; };
   JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
   JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
   JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; };
-  JFE = derive2 { name="JFE"; version="1.0"; sha256="18hp457m0ylk19rj3kamb1j8nn09i6i8ybk4hma7gaahy4vp9vy2"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS PerformanceAnalytics quantmod tcltk2 timeDate timeSeries xts zoo]; };
+  JFE = derive2 { name="JFE"; version="1.2"; sha256="1jfdphn9435f9nmwnb4x2wj8fv7c2i432n9wyvrlqcm424ql0cml"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS PerformanceAnalytics quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; };
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
   JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
   JGR = derive2 { name="JGR"; version="1.8-4"; sha256="0zfjfqlfrsz4wjdq78zasvgd3ldgcx20h16bbar1l7wv843j71ym"; depends=[JavaGD rJava]; };
@@ -1689,7 +1696,7 @@ in with self; {
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
-  JuliaCall = derive2 { name="JuliaCall"; version="0.11.1"; sha256="0i2kvqys7gwabvxk5p2n6n6fpbmbwqkli1p7lqmnkfxvm4x2ayyf"; depends=[inline R6]; };
+  JuliaCall = derive2 { name="JuliaCall"; version="0.12.1"; sha256="1qw5qq35z525wrfrqlawm16bm4p0yzcabp2yzk8piiyhqpd7cma6"; depends=[R6 Rcpp]; };
   JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; };
   JuniperKernel = derive2 { name="JuniperKernel"; version="1.2.3.0"; sha256="17r4ssjjayvnp9fp9jalklp3p8dadyx5hvi9z3bh3sw4b7kx4lyd"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
@@ -1697,7 +1704,7 @@ in with self; {
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
   KFAS = derive2 { name="KFAS"; version="1.3.1"; sha256="0hnf9ljy19hng7cvr0qixcf8h9z2spp5c9512gfm9c7zn6802k54"; depends=[]; };
   KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
-  KGode = derive2 { name="KGode"; version="1.0.0"; sha256="0ikcx43kw83ppbjdm6syhmx5fs5jsr4hyhjvilgqkyr0kx1h6wag"; depends=[mvtnorm pracma pspline R6]; };
+  KGode = derive2 { name="KGode"; version="1.0.1"; sha256="05g8zr3jm13cl6wk9m693gxa3fn5cjppm56j7ih4zzswzk9b67h9"; depends=[mvtnorm pracma pspline R6]; };
   KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
   KMgene = derive2 { name="KMgene"; version="1.2"; sha256="1yj9l1mqhvyhicyycnkd639q3zkrx15ba11z9911l4c0gql8syf1"; depends=[CompQuadForm coxme kinship2 MASS Matrix mgcv nlme survival]; };
   KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
@@ -1708,7 +1715,7 @@ in with self; {
   KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; };
   KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; };
   KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; };
-  KScorrect = derive2 { name="KScorrect"; version="1.2.0"; sha256="1rymzllm97z22xwsn5wbn02c0xp0kfdp73mk9jrk81hfdpd15p4i"; depends=[MASS mclust]; };
+  KScorrect = derive2 { name="KScorrect"; version="1.2.3"; sha256="1i69glkyi3ydzfgd8d6zrbgjq7gy9laq00jdppbqnl13i1n14sp7"; depends=[MASS mclust]; };
   KSgeneral = derive2 { name="KSgeneral"; version="0.1.0"; sha256="19rrm411c2fvx4bxi9qc6v9spqpf52k08i7gvhici9dx2hhm3134"; depends=[dgof MASS Rcpp]; };
   KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.1"; sha256="0l2kgh9bflag5s056ib8fkajl56yr8c0qsmd9ma56i9ay7i540da"; depends=[irr shiny]; };
@@ -1726,7 +1733,7 @@ in with self; {
   KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
   KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; };
   Kpart = derive2 { name="Kpart"; version="1.2.1"; sha256="0jx5rqiw0y9hc1czg75iy4jvd993d7dri90s4iiskbg6x6z65mi9"; depends=[leaps]; };
-  KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.0"; sha256="0vw95py3pk2r9kxvf6v4fq8m5zm9fr83acwxg3m8x6bvq51layma"; depends=[dplyr ggplot2 magrittr tibble]; };
+  KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; };
   KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
   L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
   LAGOSNE = derive2 { name="LAGOSNE"; version="1.1.0"; sha256="08sf4mm40gv9mr57pxsl1b62s2dqvbvrhy2irzqspyqk5ai2aw0m"; depends=[curl dplyr lazyeval magrittr purrr rappdirs sf stringr]; };
@@ -1744,7 +1751,7 @@ in with self; {
   LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; };
   LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; };
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
-  LDRTools = derive2 { name="LDRTools"; version="0.2"; sha256="0k4j3l21n8b3nvhmfjhwhs3klw09a0dz6cl6gmi2yx7jr21ar6xc"; depends=[]; };
+  LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; };
   LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; };
   LDheatmap = derive2 { name="LDheatmap"; version="0.99-2"; sha256="0n80l4wl9rs4ps8h2bjpar5nidq7bg05d6675wiwanx24q6fc0bs"; depends=[chopsticks genetics]; };
   LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
@@ -1762,9 +1769,10 @@ in with self; {
   LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; };
   LINselect = derive2 { name="LINselect"; version="1.1"; sha256="1dx97pnfwlv6w00qp8b2ah8jl1arfh39x1vzry8zrxgxisq407wq"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; };
   LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
+  LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; };
   LLSR = derive2 { name="LLSR"; version="0.0.2.0"; sha256="0nxp1sfnhgf0iqfhwqvr7a0mvs3swsj2l0shcyrb3zliyd23g5ax"; depends=[digest ggtern rootSolve svDialogs XLConnect]; };
   LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; };
-  LMest = derive2 { name="LMest"; version="2.4.1"; sha256="06ak1aqk2sg4brdb09g3x7gkjbb3p11fwwnin3h67j8wh510ihyi"; depends=[MASS MultiLCIRT]; };
+  LMest = derive2 { name="LMest"; version="2.4.2"; sha256="0a0azn3lyy0n1882c0zxf7f1b0h26rcck8mmsbh2wxg7r3nckkrd"; depends=[MASS MultiLCIRT]; };
   LMfilteR = derive2 { name="LMfilteR"; version="0.1.1"; sha256="0wjrnzki6mnar3lxfr2mcvk98b58qkqpbb9xx7vgrw567g1ga1ig"; depends=[MASS]; };
   LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; };
   LNIRT = derive2 { name="LNIRT"; version="0.2.0"; sha256="02gaqn2pixry6qgybwszsv60pk6hzdd51axchkq3ma3gb6biw4fv"; depends=[MASS]; };
@@ -1791,7 +1799,7 @@ in with self; {
   LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.1.4"; sha256="1gfd890vr31ab37xbx7yhwbqk6y659d0dqyir7vrgma48cd0nidv"; depends=[abind car DiceKriging kSamples LSDinterface randtoolbox rgenoud sensitivity tseries]; };
   LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
   LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; };
-  LSRS = derive2 { name="LSRS"; version="0.1.0"; sha256="13xfh2v0xnsvvxayvl9mkhdzd5x3qqdlqsa109z3j9yrhs3615ha"; depends=[]; };
+  LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; };
   LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; };
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
@@ -1845,7 +1853,6 @@ in with self; {
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
   LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
-  LogicOpt = derive2 { name="LogicOpt"; version="1.0.0"; sha256="15wcc2655vn1yz9gwxmqm9n1lmybk2gf4nlwz4i02kk4gabdazz0"; depends=[]; };
   LogicReg = derive2 { name="LogicReg"; version="1.5.9"; sha256="0rxzhbf51psdj7wb2dcah16y8f5q7y8p0yybz54rm00d1qagl6nq"; depends=[survival]; };
   LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
   LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
@@ -1856,7 +1863,7 @@ in with self; {
   LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; };
   LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; };
   LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.7.5"; sha256="07v78diyjvbymwidpa9f5bykaafczv0f88f6r926mk949sj1ici4"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.8.2"; sha256="0fk7vmgp0ws31azl7hazx925ddksqfgsmfwz2akfhbzi1y4bys3m"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
   MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.2"; sha256="11031gmc6zrhn6vdzza4qqvwc48h09kbvkikqznqr9hhkysv7c11"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
@@ -1873,7 +1880,7 @@ in with self; {
   MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
   MARSS = derive2 { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
   MARX = derive2 { name="MARX"; version="0.1"; sha256="1yanv7q5l8ybw3mh0rvhxyqi2sp8w4b9vnas7lpqflc06j4nnv4p"; depends=[fBasics matlab stabledist tseries]; };
-  MASS = derive2 { name="MASS"; version="7.3-48"; sha256="02q95ba909p2gxnzfp295ipxjnv14f7bm55nicxwn2kj8hizpzqd"; depends=[]; };
+  MASS = derive2 { name="MASS"; version="7.3-49"; sha256="1yjbnj1p4z0vw84wga8q5fyqiw4n6r7pc6rdwam7vsbiamyzfcqs"; depends=[]; };
   MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; };
   MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
   MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
@@ -1951,16 +1958,15 @@ in with self; {
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
   MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-  MKmisc = derive2 { name="MKmisc"; version="0.993"; sha256="0zhscicwcppwhpylax69ablkfllgf6f4fmp1gb7yi2cm59f94ny1"; depends=[RColorBrewer robustbase]; };
+  MKmisc = derive2 { name="MKmisc"; version="1.0"; sha256="1ykzj9flq1nx8k7aybd2sh5rd8a2hzk4gwz0iqqsl18k1khzbdla"; depends=[ggplot2 RColorBrewer robustbase]; };
   ML_MSBD = derive2 { name="ML.MSBD"; version="1.0.0"; sha256="1myr4pnznkypb7jjpyr5iv4yh29q9kv6g8gmfh9x3wy96xy15wmz"; depends=[ape]; };
   MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; };
   MLCM = derive2 { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
   MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
   MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; };
-  MLML2R = derive2 { name="MLML2R"; version="0.1.0"; sha256="11mnwmbfs3dmjcf2bmg04rivp26021gjd56rdkzgrv439p8aq8rs"; depends=[]; };
+  MLML2R = derive2 { name="MLML2R"; version="0.2.0"; sha256="1r8a2sbv7c0xhdacg3gm3x5iml713xbc54c26q5rqx7mdnhsjiqk"; depends=[]; };
   MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; };
-  MLRMPA = derive2 { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
   MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; };
   MM = derive2 { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; };
   MM2S = derive2 { name="MM2S"; version="1.0.5"; sha256="0h10cbsdnndllwq4cb4aamjy104ckvn01skh7rixa1iqdndac9fx"; depends=[GSVA kknn lattice pheatmap]; };
@@ -1969,7 +1975,7 @@ in with self; {
   MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
   MMS = derive2 { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
   MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; };
-  MNM = derive2 { name="MNM"; version="1.0-2"; sha256="10ikn53filbl5qnwp9d54ds2wmzjgxp5xkkp694q75r5crl4wv65"; depends=[ellipse ICS ICSNP SpatialNP]; };
+  MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; };
   MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; };
   MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
   MOCCA = derive2 { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
@@ -1990,6 +1996,7 @@ in with self; {
   MPSEM = derive2 { name="MPSEM"; version="0.3-3"; sha256="0ir1zlg0vz0nfdair3apa737dw4078lbxyk932755d3rj0cm20c3"; depends=[ape MASS]; };
   MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
   MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
+  MPsychoR = derive2 { name="MPsychoR"; version="0.10-6"; sha256="0lxfsxcry5r619cw751m5wn8wgf08j41cgan67xswn42ir7prdpx"; depends=[]; };
   MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
   MRFA = derive2 { name="MRFA"; version="0.2"; sha256="1ld9bchldx4y8g0zp2nr6r439f9vqy5xcr9bkv4g4vphm2c5zq72"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; };
@@ -2004,7 +2011,7 @@ in with self; {
   MSBVAR = derive2 { name="MSBVAR"; version="0.9-3"; sha256="0ybkkl3hfff2jgz4a0z105bb0v6jl4dkkqmdg382and8w0mc496c"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; };
   MSCMT = derive2 { name="MSCMT"; version="1.3.2"; sha256="00s4wwggc70w6cg94ff853jnw5hcln6i0719n4xr92cpxaa7irnw"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
   MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
-  MSGARCH = derive2 { name="MSGARCH"; version="2.0"; sha256="16mzsdb5dsbg5sjnmg1clqqy505wx87wgkwc3yzd0i6by681jwq6"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
+  MSGARCH = derive2 { name="MSGARCH"; version="2.1"; sha256="0z4fp37x65ggbn8kx0xbdwq1x18z93azr36smpfqxaykiiwwfa22"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
@@ -2026,7 +2033,7 @@ in with self; {
   MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
   MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
   MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; };
-  MVN = derive2 { name="MVN"; version="4.0.2"; sha256="0k8fbhnw2lbjgafab4m6j7nkzclj1226fdiv8bmv5vcm6g82nb19"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
+  MVN = derive2 { name="MVN"; version="5.0"; sha256="1rpb9hxi4g87h6gvg6qdvk3f208cdayikmb8ib499ax3wv1zszhy"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
   MVR = derive2 { name="MVR"; version="1.32.0"; sha256="18arp9xh9dflbmc5zxafy132mnz5xwc6kb9hv51njz602kms70qg"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
   MVar_pt = derive2 { name="MVar.pt"; version="1.9.9"; sha256="1lhy66k9x9ymj03d4f7wi6rdx60bwgy6gfv49jq3vr4cj8dv22i9"; depends=[]; };
@@ -2073,7 +2080,7 @@ in with self; {
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.6"; sha256="0cx2bkz5m96dirqknfsi9944rhnn14wwdimw1hq1p8c073z40i7a"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
   Mega2R = derive2 { name="Mega2R"; version="1.0.0"; sha256="1rprbn7pkp0haahf34d1w7pmzn6hv8ci93gfp68hpyxxi6qm61g0"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; };
-  MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.2.2"; sha256="0hwmixcby68a6p6vrq0jy9g6ky26q94haz7m9drzf50zzkv5df0g"; depends=[ggplot2 knitr plotly rmarkdown robustbase stargazer]; };
+  MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.3.0"; sha256="1nnj4nmzrvdj2arq74bg5ckhmll2z9ydnd75ds48njbhxla2645l"; depends=[ggplot2 iterpc knitr Matrix plotly rmarkdown robustbase]; };
   MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
   MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
@@ -2221,7 +2228,7 @@ in with self; {
   NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
-  NMF = derive2 { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
+  NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
   NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; };
   NMOF = derive2 { name="NMOF"; version="1.2-2"; sha256="03286pp57m7imbgw334r34yg7c5zbaw3d1qxr0sbhmc2jxvv1arm"; depends=[]; };
@@ -2246,7 +2253,7 @@ in with self; {
   NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
   NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; };
-  NSM3 = derive2 { name="NSM3"; version="1.10"; sha256="118pp3a11w4wyjq18jm3f7xy79l5jyjsyxgkyxbwsrr7lvplqzb2"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
+  NSM3 = derive2 { name="NSM3"; version="1.11"; sha256="0lnmzpmh3i4lh5lfba6rhacf4zadbcrs7ify354h5245j0gxp1bv"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; };
   NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.1"; sha256="1grz2yxrklqglw9027c8k01jnb42p453fcd38arw4wd85y5hbam4"; depends=[snowfall]; };
@@ -2287,10 +2294,10 @@ in with self; {
   NonCompart = derive2 { name="NonCompart"; version="0.3.3"; sha256="0f66p122rdibn8k79wjhvslgankhxk4dq9sfvq0gcabmi1skfqgq"; depends=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
   Nonpareil = derive2 { name="Nonpareil"; version="3.3"; sha256="0bli88salj7mxmnh3b8wims1jlfzlq2lxd4kn2bp2vi58ij9v9pm"; depends=[]; };
-  NormPsy = derive2 { name="NormPsy"; version="1.0.5"; sha256="0zhv6p9ffm2g02nr302j3qc6mrk5n4xxznircgbp4jx7hcj7cf1m"; depends=[lcmm]; };
+  NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; };
   NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; };
   NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
-  NormalizeMets = derive2 { name="NormalizeMets"; version="0.22"; sha256="1vhmdr3rbqxhp28zv7r8hzvmrrxq58rpj5n1az9pqmh6a9si678s"; depends=[AUC Biobase crmn DiffCorr e1071 GGally ggplot2 gplots htmlwidgets impute limma metabolomics MetNorm plotly RGtk2 statTarget]; };
+  NormalizeMets = derive2 { name="NormalizeMets"; version="0.24"; sha256="0n75swaybsggrawplkncb1vnnyy2imz1b4wy74crdgfg02bzzz2r"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
   Numero = derive2 { name="Numero"; version="1.0.3"; sha256="1jj269b5cw7w4bgp6qvh0b3kpj32fjpsb2nbhyhjlkf7m03gnwwv"; depends=[Rcpp]; };
@@ -2343,7 +2350,7 @@ in with self; {
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
   OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
   OpenImageR = derive2 { name="OpenImageR"; version="1.0.8"; sha256="1j7p1wrzznrisbzw8j1qsxyyv3zr5hk6q9yxw97y6lrfh3c26ig1"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
-  OpenML = derive2 { name="OpenML"; version="1.7"; sha256="052pm43pnjil3v8wx429bz13xc90hyqx2hz33zrq0sjdsx9zpi6k"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
+  OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
   OpenMx = derive2 { name="OpenMx"; version="2.8.3"; sha256="0kz1x3x43jf326x7l8lb7rlnng4r5cp11vrs1pnnxkmbhqzbbwy8"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
@@ -2353,6 +2360,7 @@ in with self; {
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
   OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; };
+  OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.2"; sha256="0yf3wk0y650cyp5x8jvjr4ncq34phka8z0r9zk9cjn1k0ic2zmjc"; depends=[car clisymbols crayon dplyr e1071 lme4 MASS nnet nortest rpart]; };
   OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; };
   OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
   OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; };
@@ -2373,7 +2381,7 @@ in with self; {
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
   OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; };
   P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
-  PAC = derive2 { name="PAC"; version="1.0.9"; sha256="1757wpy92hhk1gpzm719kkhh31qkn0a2cbagyn3pnx5vklywfzz1"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
+  PAC = derive2 { name="PAC"; version="1.0.10"; sha256="0cr34vjd6dr5jkbv1hhd7ln35ih8h62fmz2q8h2plbxaww88zcjf"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
   PAFit = derive2 { name="PAFit"; version="1.0.0.3"; sha256="0s9zxr9368cf6skskqb2q67jkynzm4s3qp07i0m1zrmn9142hw9z"; depends=[igraph magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
@@ -2430,7 +2438,7 @@ in with self; {
   PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; };
   PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; };
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
-  PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; };
+  PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; };
   PKNCA = derive2 { name="PKNCA"; version="0.8.4"; sha256="013b4d74virwjpxq20m566ya85q31aq6bdgk5fpjrwh5ja6805ka"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; };
   PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; };
@@ -2452,6 +2460,7 @@ in with self; {
   POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; };
   POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; };
   PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; };
+  PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
   PPCI = derive2 { name="PPCI"; version="0.1.1"; sha256="1f3jmrkszjq6ajbl0kjf5rghiliim96wz53mfrjjvpc6piajs5ym"; depends=[rARPACK]; };
   PPforest = derive2 { name="PPforest"; version="0.1.0"; sha256="1s0g8icyx30sih2xbdihp9xbmygfgd1hs642qdl5559fqshylbzs"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
@@ -2486,7 +2495,7 @@ in with self; {
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
   PWEALL = derive2 { name="PWEALL"; version="1.2.0"; sha256="0h7azgns88qwgdp41v35v6293xqs2hksbr82p15n754ci2hsvzja"; depends=[survival]; };
-  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.10"; sha256="1c32bf7wlsmj0wqwcd6v4ghfrj6snaqa6q3a09p1gbvxd7mzs731"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; };
+  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.16"; sha256="015zqbq9wsg0wc1y5s4x8vc7klkfa928xcl23v732vy28j0jf20h"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; };
   PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; };
   Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
   PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
@@ -2507,7 +2516,7 @@ in with self; {
   ParamHelpers = derive2 { name="ParamHelpers"; version="1.10"; sha256="0nzsl3hby4dhnp7rw47zjmdrrfsgp5w1ai9fpw3bgc4k5sk9nql0"; depends=[BBmisc checkmate]; };
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
-  PartCensReg = derive2 { name="PartCensReg"; version="1.38"; sha256="16f64w7ngaj37n8imqqh50w15lrknr0w45ns7bg75lnap9y2qhml"; depends=[Matrix optimx ssym]; };
+  PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; };
   Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="1.0"; sha256="1wwfq0zwf2b2wlq4pwhw92d02f715l7bkc0si7gndk0mp2pibcrx"; depends=[]; };
   PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; };
   PatternClass = derive2 { name="PatternClass"; version="1.7.1"; sha256="11r4p4s2pm0c4fmnpijzz5srhpai444mbx5nszhkssfsp9rh7cm9"; depends=[SDMTools]; };
@@ -2530,7 +2539,7 @@ in with self; {
   PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; };
   PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
-  PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
+  PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.5.2"; sha256="01bgm57z079g6r505w3bj293zkbd49fwa8sg55z87vizwavipml6"; depends=[quadprog xts zoo]; };
   PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; };
   PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
   PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; };
@@ -2564,7 +2573,7 @@ in with self; {
   PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.3"; sha256="122z4mqig8hrqlislmazcpjg6q47pmi1pmpw93kyg81016p2gmxi"; depends=[corpcor GenOrd Matrix mvtnorm]; };
   PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.4"; sha256="14xmq1rcx901fd96aivq6m2vrcj8h1p1pxwkfjpn5dh4kqfy7921"; depends=[BB corpcor GenOrd MASS Matrix]; };
   PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.5"; sha256="03jgd2f7wvk7nhpkzrbjx8y4ymwgf53hxbz89ydmjk039flsp6x6"; depends=[corpcor GenOrd Matrix mvtnorm psych]; };
-  PoisNonNor = derive2 { name="PoisNonNor"; version="1.4"; sha256="1hmgwk6lr9pm06qp2n27n6j3i8q4m8zrc1hy061pix13k4idagz1"; depends=[BB corpcor MASS Matrix]; };
+  PoisNonNor = derive2 { name="PoisNonNor"; version="1.5"; sha256="1078lfq8y5gsklmgj0jharqpgw7w0yqhc0l4xvkjhr0ifvigmd0h"; depends=[BB corpcor MASS Matrix]; };
   PoisNor = derive2 { name="PoisNor"; version="1.2"; sha256="0jpndpxajv598lpk2bx0np0yzfh1k903hpdadr4labpbjmr4pfrr"; depends=[corpcor Matrix mvtnorm]; };
   PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
   PoloniexR = derive2 { name="PoloniexR"; version="0.0.1"; sha256="1qik272z5lmzv9k1kfr5v0m8sydbdhbrc732n1zpwnqc1spfqb20"; depends=[anytime digest httr jsonlite RApiDatetime xts zoo]; };
@@ -2602,8 +2611,8 @@ in with self; {
   PrevMap = derive2 { name="PrevMap"; version="1.4.1"; sha256="1hmvfk5zpflwncaiy2rr0jr2gr2gk66na6ks82b6dfgk8xdc8xmk"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
-  ProFit = derive2 { name="ProFit"; version="1.1.0"; sha256="1r6afjz4ynds5aykn3vzg7k5pqqnsfbki8s4z49fv1y0gnr77zac"; depends=[celestial fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; };
-  ProFound = derive2 { name="ProFound"; version="1.0.0"; sha256="1qv6bzd800xs26j49hsqv324nz2981imf2hnllf0rgpxcf382nhi"; depends=[celestial data_table FITSio magicaxis]; };
+  ProFit = derive2 { name="ProFit"; version="1.1.1"; sha256="0krnxdf9dddry4a5k1dag43va7lii1ykk0857kk1dfnl56sm3l51"; depends=[celestial fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; };
+  ProFound = derive2 { name="ProFound"; version="1.0.1"; sha256="0ym8ggzm0b8zpfsq8xjjnwa09826gssaqhrqjyq88pwbhzh0y4pl"; depends=[celestial data_table FITSio magicaxis]; };
   ProNet = derive2 { name="ProNet"; version="1.0.0"; sha256="10r0gcxv0djrw99nd6a1jrnwvqmidw10ll645gvkp8l39li0107n"; depends=[igraph linkcomm MCL Rcpp]; };
   ProTrackR = derive2 { name="ProTrackR"; version="0.3.5"; sha256="19ilj03w5jpc1hw5avyb780iy3rdbby3kliym0si2zv6gyi9k541"; depends=[audio lattice signal tuneR XML]; };
   ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
@@ -2615,7 +2624,7 @@ in with self; {
   ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.8"; sha256="0kagahw30m0drlda75hgwbpp7cqrxyf1512ar56qlgm8z73hab3n"; depends=[]; };
   ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.6"; sha256="0hx8v18m0wymbjjccy8sm34sqchs9gsf6piyhbs50nm00dqiamv6"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; };
   ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.0"; sha256="1baf4v9c2pqqmlgxs1jf7fhwqbsw0l1g7rdiia21acxix2j3b7wj"; depends=[]; };
-  PropCIs = derive2 { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; };
+  PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; };
   PropClust = derive2 { name="PropClust"; version="1.4-3"; sha256="0k1wn62vlrddzhknyjpizpqxzrgl38frncql3mrlwakkn0kh8l5z"; depends=[dynamicTreeCut flashClust]; };
   PropScrRand = derive2 { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
   ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; };
@@ -2644,7 +2653,6 @@ in with self; {
   QGglmm = derive2 { name="QGglmm"; version="0.6.0"; sha256="1n53qba6y1hcxg1ry8bp41mgcycckli9q2syippvd7xdlq3srhqd"; depends=[mvtnorm R2Cuba]; };
   QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; };
   QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; };
-  QNB = derive2 { name="QNB"; version="1.1.11"; sha256="03sqp4pzidg4d1qk1jzxk3w3zvb21939fvvwr7pgmy6da4bbhhs6"; depends=[exomePeak GenomicFeatures locfit Rsamtools]; };
   QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; };
   QPot = derive2 { name="QPot"; version="1.1"; sha256="1ivkk5wdd1lp6v4hwmpr9g230kd7zgmj0vnv5fw0svwpb8zzz14x"; depends=[MASS]; };
   QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; };
@@ -2662,6 +2670,7 @@ in with self; {
   QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
   Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; };
+  QuantNorm = derive2 { name="QuantNorm"; version="1.0.3"; sha256="1kc8qfa5fwdmk4nfzlkd22968zn44ggr65ysm1l31bhbgjh59ly3"; depends=[]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
   QuantTools = derive2 { name="QuantTools"; version="0.5.6"; sha256="0ykfxrg4chq4n24spfj2v6cqiw5y7wps2rmnd0150fa6fqk7nd2k"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
@@ -2712,7 +2721,7 @@ in with self; {
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; };
   RATest = derive2 { name="RATest"; version="0.1.2"; sha256="0cxb82kzmywgslf6hfjl6v015s64jh483bzxnhph420mcp3ysbfk"; depends=[ggplot2 gridExtra quantreg]; };
-  RAdwords = derive2 { name="RAdwords"; version="0.1.14"; sha256="18pnq248fy2i0an0r9liky2bqs0gdpjmw7b564hjpbkhin3fw669"; depends=[RCurl rjson]; };
+  RAdwords = derive2 { name="RAdwords"; version="0.1.15"; sha256="0f0j5fllkxwa63gpwgaks0sbsq9a68jw6g9djydq4c3jfzw1sqyl"; depends=[RCurl rjson]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
   RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; };
@@ -2722,11 +2731,10 @@ in with self; {
   RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
   RBesT = derive2 { name="RBesT"; version="1.3-3"; sha256="0pink9jza2pfm1vqmzgp0pcyg9a4ak4c9igcxj692np82mv8hi0j"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
   RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; };
-  RCALI = derive2 { name="RCALI"; version="0.2-18"; sha256="1d9pgkkghkzciawlzlggqk6qp9bh0akwgh1hc47akcnjvqlvxjd2"; depends=[splancs]; };
   RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; };
   RCMIP5 = derive2 { name="RCMIP5"; version="1.2.0"; sha256="0bwp1ln0y48g2d0bj9b47y0rlwffzv0pi6gjfzv4sg5anhswc9x7"; depends=[abind assertthat digest dplyr Matrix]; };
   RCPmod = derive2 { name="RCPmod"; version="2.186"; sha256="0qxk6236xq391czyr043wn8rfml70gkc0xa6vz24s768gxmdk46l"; depends=[fishMod glmnet gtools MASS]; };
-  RCRnorm = derive2 { name="RCRnorm"; version="0.0.1"; sha256="0ac09d0rib4znyfilmq6555snd3bhwlysrqsdnh4qbpkdv3bhp61"; depends=[truncnorm]; };
+  RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; };
   RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
   RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; };
   RCircos = derive2 { name="RCircos"; version="1.2.0"; sha256="0jj4jj9qnj7pils99hzw9yx5bwi182q4afdsqh7w7d9kzhp6xl3z"; depends=[]; };
@@ -2738,6 +2746,7 @@ in with self; {
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.10"; sha256="02pyh6kvsfbwgccf8v77aa3ky21kps1rpgaii20wmridrgqj90vg"; depends=[bitops]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.1.1"; sha256="070k93aj694jyvjmr5rbdzkdmi1sx69fild06dqf8idrkh3i2a55"; depends=[httr]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
   RDS = derive2 { name="RDS"; version="0.8-1"; sha256="18xn0ci35xs2myzj8rny6pp08cn8ljl3l4fdgaqp05fphgb5fh8j"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; };
@@ -2753,6 +2762,7 @@ in with self; {
   REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
+  REIDS = derive2 { name="REIDS"; version="0.0.1"; sha256="1pzbwmbz2agqlj28qpm7msahnk5viih5bqkimq3j8wp2pp580gwz"; depends=[aroma_affymetrix aroma_core data_table lmtest MCMCpack RColorBrewer]; };
   REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; };
   REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; };
   REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
@@ -2777,7 +2787,7 @@ in with self; {
   RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; };
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
-  RGF = derive2 { name="RGF"; version="1.0.0"; sha256="12x6nc7hvq16sg63b09xl2vxjd9cffxdl811ly2pmpr3i123h7fq"; depends=[Matrix R6 reticulate]; };
+  RGF = derive2 { name="RGF"; version="1.0.1"; sha256="1kj67sc10khzl9xxk8ss366hcnmqiad0ap1xsc738ya6bv4xrr5w"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; };
@@ -2836,7 +2846,7 @@ in with self; {
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.6-3"; sha256="025fg36jwq44y5m7msmjql3m0avc0hl0iw49wap0fvmzy5qn24qq"; depends=[base64enc jsonlite RCurl uuid]; };
   RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-  RMySQL = derive2 { name="RMySQL"; version="0.10.13"; sha256="1j0vr2l4s02cg2hzgr3pla96pjj4h85sxw28lidy58rg5awnsf82"; depends=[DBI]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.14"; sha256="01891kn263b02y6addgpy3gn5axg7m10bqbqv7dg9yx9k85am590"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
   RNAsmc = derive2 { name="RNAsmc"; version="0.1.0"; sha256="02r8y43hrhjyhmim2yf7s4c46q8ys6b8qla9vwjqpmx5104v5v5g"; depends=[RRNA]; };
   RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; };
@@ -2848,7 +2858,7 @@ in with self; {
   RNRCS = derive2 { name="RNRCS"; version="0.2.0"; sha256="1wg7ld6g94wby5lagf68h19qgx2mf0pc8rfvmnz4fac7xpdsg9s8"; depends=[ggplot2 magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
   RNeXML = derive2 { name="RNeXML"; version="2.0.8"; sha256="0ikdv60nkhiv70x1crd21xd92iq2gshj6248m896v1l276513g5j"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
-  RNentropy = derive2 { name="RNentropy"; version="1.1.2"; sha256="1xypz5whmjjqpg1zsd398v2y6adhh1js270355did397cmsgskk6"; depends=[]; };
+  RNentropy = derive2 { name="RNentropy"; version="1.2.0"; sha256="19zbjy2xrrsz674qhi6dfzppsgfdy9hp93bqj14p1w3z6smh0k8c"; depends=[]; };
   RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; };
   RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; };
@@ -2922,7 +2932,7 @@ in with self; {
   RRreg = derive2 { name="RRreg"; version="0.6.5"; sha256="1hn69zqcafiq1fb38fl4gah90kim8pc2m35sbi1cgkgcbzz1vg16"; depends=[doParallel foreach lme4]; };
   RSA = derive2 { name="RSA"; version="0.9.11"; sha256="1hsjy755r78my6ib9s9da7mibcjxd5svh2kq0v7a466m60cyfrss"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
-  RSAGA = derive2 { name="RSAGA"; version="0.94-5"; sha256="0lbvy1p6wcxnn70149wcpmfy2ijk6g37ka452dxm0w0zpg0zga1w"; depends=[gstat plyr shapefiles]; };
+  RSAGA = derive2 { name="RSAGA"; version="1.0.0"; sha256="1023br8q0i6w18kmn261kf4ql32061hq7xngl1w5mamvvp17d6b1"; depends=[gstat plyr rgdal sf shapefiles]; };
   RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
   RSCABS = derive2 { name="RSCABS"; version="0.9.2"; sha256="13l4ql40ahm06yi5a9zys62h5452fchkkhlhqh9gzh3pbpyjawgc"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
   RSDA = derive2 { name="RSDA"; version="2.0.3"; sha256="18rka6g93yksgnwgzy4planjvsmc4d5xzf4fxarv57v6frg37y98"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; };
@@ -3022,8 +3032,8 @@ in with self; {
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
   Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; };
   Rclusterpp = derive2 { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
-  Rcmdr = derive2 { name="Rcmdr"; version="2.4-1"; sha256="1rm4vxc8bx2pnblprcxfnnmynig368xp4p4slhprnxvp8f61z9z9"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
-  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-7"; sha256="0s323wdqjbk15a9zsmhigixh06ayrwb7hgzscb9d2aq0ww6jgl2k"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
+  Rcmdr = derive2 { name="Rcmdr"; version="2.4-2"; sha256="0027s3g7wzjaqnx3yhn9whpxsrvz7ar70r1a0lwd5hs6g008m8ja"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
+  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-8"; sha256="1lc26k2f6r37id85baii7rr5m36vy34p6xxl1fjs87s94zifkfsp"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
   RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
   RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
@@ -3037,7 +3047,7 @@ in with self; {
   RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; };
   RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-46"; sha256="0bl9nq89ga16rxlf411lbm5qsx28f1axxwchr5rp46n0h15d0d3f"; depends=[HH lattice mgcv Rcmdr]; };
   RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; };
-  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-4"; sha256="0lmsd76q31bg2j8jd5p0891wi8cxibpjqx0196177w3y9kgcj3s1"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
+  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-5"; sha256="069kpvhflk0rwwll0vyxfdrln1lzr1zhzfzm39si63ji6v7l6msb"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
   RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.1"; sha256="0c3mcr8bmmbpxsqm8zfy07cbyglnq5466nafbglfs5m0z836yz9i"; depends=[ordinal Rcmdr]; };
   RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.8"; sha256="1s7947zvrhjrc7vchvaajp2q7xdqfg5vsmg6r7ym416cqq39i5kd"; depends=[MASS mixlm phia pls Rcmdr xtable]; };
@@ -3050,7 +3060,7 @@ in with self; {
   RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
   RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
   RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-2"; sha256="1gg6gi0l0vzcp29c3s8law68bgyms0hczpk41wzzcvvvkhdbr7xi"; depends=[car randtests Rcmdr TeachingDemos tseries]; };
-  RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.4"; sha256="1f5swkwlii0wgw38m0pzziycqdhh2v00bxnr7815pdmr2yx0frqr"; depends=[Rcmdr]; };
+  RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
   RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; };
@@ -3072,13 +3082,14 @@ in with self; {
   Rcpp = derive2 { name="Rcpp"; version="0.12.15"; sha256="1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; };
-  RcppAlgos = derive2 { name="RcppAlgos"; version="0.2.5"; sha256="1fy8iwyd6z5q59v0c2xkw8nlccwpr0mn026p5iqii93d87pg8q1j"; depends=[Rcpp]; };
+  RcppAlgos = derive2 { name="RcppAlgos"; version="1.0.1"; sha256="0668anb3kjw3h71n2hjqqjrmiz4dwrgw71ikviq0imw2v5030392"; depends=[Rcpp]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.10"; sha256="08s86ak26zybawry6l6l30k1lakc71k2j58539h70dnrmsd15jna"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.8.300.1.0"; sha256="0p6cbnwxgzigf7n5qhqvxdr3nd3pq3c2qq6pskqz7avzf813fy83"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.8.400.0.0"; sha256="11y2ksf46zw6fcz0kk70szyfn7qqxwwd33xylrxvnyb7ldmbc5yr"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppBlaze = derive2 { name="RcppBlaze"; version="0.2.2"; sha256="0hi7gh7xlmdcyzxsis8wl841d6czbcgb8qdg8y822am1mvc0wmb7"; depends=[BH Matrix Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; };
   RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.8"; sha256="0fwz942pd1r7jcxwqjbagcai153kv7csflhg7agwhxyj49m97i82"; depends=[Rcpp]; };
+  RcppCWB = derive2 { name="RcppCWB"; version="0.1.7"; sha256="13iax4kr5gchm483gib3cdjcbvkymhiwbpnj705c325fbsfk5rj7"; depends=[Rcpp]; };
   RcppClassic = derive2 { name="RcppClassic"; version="0.9.9"; sha256="102gi1l6hxdkz50iy9xbpb57iy5j7flv78sdq36pn9zi8x4k8k95"; depends=[Rcpp]; };
   RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
   RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; };
@@ -3094,7 +3105,7 @@ in with self; {
   RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; };
   RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.1"; sha256="0pd5jgv24yskxzp76c3i6lkpq9npdgw1i15dcf02v9h43q8n1s9s"; depends=[BH Rcpp]; };
   RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-2"; sha256="0j0hvwsbidahk2zx3zk7fhc6m9cca27iq3ivx7vdvggz8iqzszrz"; depends=[Rcpp RcppEigen]; };
-  RcppParallel = derive2 { name="RcppParallel"; version="4.3.20.2"; sha256="0g1fpdaaihxklc0pycbl3rsb94y79nm9pcc0xsvvqrq6ahi2433i"; depends=[BH]; };
+  RcppParallel = derive2 { name="RcppParallel"; version="4.4.0"; sha256="1gjqmkzsi1fi0vss1nvq6i77j3aixdxd047mw9vf4l60z2ypr3h1"; depends=[BH]; };
   RcppProgress = derive2 { name="RcppProgress"; version="0.4"; sha256="09ayw6d69i0lplmaj5md25p5hn1nmiyp6a4sh60v93nrrs1cq7iv"; depends=[devtools Rcpp]; };
   RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; };
   RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; };
@@ -3109,15 +3120,16 @@ in with self; {
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
   RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.4"; sha256="16wdsm0zzn6q0h29a1w8yjn4zxvrirsws6h31k0ljgprsn3jjhz4"; depends=[Rcpp RcppGSL]; };
   Rcrawler = derive2 { name="Rcrawler"; version="0.1.7-0"; sha256="0r8s3d4dby9vn0qc5lbhab4vh3yl5yifi7ipxafsgffdxislnsdw"; depends=[data_table doParallel foreach httr selectr xml2]; };
+  Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
-  Rcssplot = derive2 { name="Rcssplot"; version="0.2.0.0"; sha256="0pv1yzpsc68bahfxh5h79xmh798a22nk6i88gj1s81sp7l5fbqlm"; depends=[]; };
+  Rcssplot = derive2 { name="Rcssplot"; version="0.3.0"; sha256="1qwrwzyqbwwwjf2zx6712q6wj629vf9rjrgscf0fim10fa6k5grn"; depends=[]; };
   Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; };
   Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.2"; sha256="1hkqy97mh68yzkh4bawjrgf1rlhkh3jz2ky84rg3wgz1mkvrrsx2"; depends=[formatR roxygen2]; };
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
-  Rdimtools = derive2 { name="Rdimtools"; version="0.3.1"; sha256="1rqb6by2h3w07k9hvsk18xwkmw7d58gj58r4lk99yk0n91ix6l0p"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; };
+  Rdimtools = derive2 { name="Rdimtools"; version="0.3.2"; sha256="0wk6sv2ahxscy4nsk826c9rlq8vxgnflg9banwdxhs6qlqhipnlb"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; };
   Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
   Rdpack = derive2 { name="Rdpack"; version="0.5-5"; sha256="19rib96758r2zkq4wlys0gfj60zff34gv1wpb8d7pa34h81gpi9p"; depends=[bibtex gbRd]; };
-  Rdrools = derive2 { name="Rdrools"; version="1.0.2"; sha256="1xn46lp6kgj6bns5nwjx4s8a3iif1g38iwf58hsrbqjhyygqvdzv"; depends=[Rdroolsjars rJava]; };
+  Rdrools = derive2 { name="Rdrools"; version="1.0.3"; sha256="1y805j2xrv8kgh42s5lig07mb76fcz5yrxal0zaykj16cvid8287"; depends=[Rdroolsjars rJava]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
   Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
@@ -3157,15 +3169,16 @@ in with self; {
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.8.6"; sha256="0hfc3pwf01zc9zbz8zyhlinx9967fy2lp59i2nmln0ax47dvzlfn"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.8.8"; sha256="0hbzkdi180l004y1l6v0nd6zp7rn45wx4ahaqnrm67pa366j500p"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
+  Rfmtool = derive2 { name="Rfmtool"; version="2.0.0"; sha256="1a8s4a4mdblzy76ljslfvz8zav2639plhby0ib5ccjnpz2sxhc7s"; depends=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
   Rgb = derive2 { name="Rgb"; version="1.5.1"; sha256="136mhxwnw7jkfnmb5gxjr2xfnly79xfp6a6f9c8lj7s6wrgkl02a"; depends=[]; };
   Rgbp = derive2 { name="Rgbp"; version="1.1.2"; sha256="1g5v22zjgykzcg5jk7fi03xfn3jzz1yf38izjzhx2433d97hasr7"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-3"; sha256="03v4cav465dkznm7d3bwwpx3qprhq25sp1rb5ncx2lka6inr1vzd"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
   RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.1"; sha256="0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"; depends=[png]; };
-  Rgretl = derive2 { name="Rgretl"; version="0.1.6"; sha256="0m835fh6am7b5bwfhisqmsi31cchlh4vy6n0kfac0lv657sz9rf7"; depends=[]; };
+  Rgretl = derive2 { name="Rgretl"; version="0.2.1"; sha256="07a83nmx3q0yl7fbwqmkmnzxm5rrh8p4nrayv3rj18s1r98i4jph"; depends=[lubridate png xml2]; };
   Rhpc = derive2 { name="Rhpc"; version="0.18-12"; sha256="095mrr6g05y9g8h88k1nf19zmjvg8hnmf5b3r6krqs4cxhp2qls2"; depends=[]; };
   RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-12"; sha256="14qypi76h73iv3xwbb860r4f7516jyb88j92lmkifw03x86lx2b3"; depends=[]; };
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
@@ -3182,13 +3195,13 @@ in with self; {
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
   Rlabkey = derive2 { name="Rlabkey"; version="2.2.0"; sha256="1gzywhbdkd4f392fasa91ral8wg7jr51b4n1kll7r8hvyjz7bmgy"; depends=[httr Rcpp rjson]; };
-  Rlda = derive2 { name="Rlda"; version="0.2.3"; sha256="1p1a6zzxbzhsq74k5vc5w7gq1qpzxccbn2y3svdads0sgk037mmx"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
+  Rlda = derive2 { name="Rlda"; version="0.2.4"; sha256="01dh6x0yh9y7q8c8qy0zkkn2y18wzg5y90v4gcawdb1adz46izg2"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.0"; sha256="0nnkblrgycvfwn0lb9j92f5wpln69kk54z4irwi35rrfl31f689m"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; };
   Rlinsolve = derive2 { name="Rlinsolve"; version="0.2.0"; sha256="08ib0jjqicscn4mx5yv25q0x66iycx8jhazvjb47nqvn24mirprp"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
   Rmalschains = derive2 { name="Rmalschains"; version="0.2-3"; sha256="1gh0f385s1nq12mk6a5l3nj1gd2mc6jzd66lisnxbcip25s4b8pb"; depends=[Rcpp]; };
-  RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.16.0"; sha256="1h3850p1gdnr10x5gwqc45gk0vxbmq9j15prlm0m99xgcmk2pmxc"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster tibble tidyr zoo]; };
+  RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.16.1"; sha256="1z1i43imm0ch5ki7m5pxyjcxl280zmfzv8nizraf73zw852gzhb2"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; };
   RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; };
   Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
   Rmixmod = derive2 { name="Rmixmod"; version="2.1.1"; sha256="1m5yab7wq343bzg8xszbrlif3cd4d1x7xcqh82czkxbfni1gz7j7"; depends=[Rcpp]; };
@@ -3211,6 +3224,7 @@ in with self; {
   RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
   Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; };
+  RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.0"; sha256="1pkgwglnb68563hiirkagz33jfksbzj3cvdyv13brrzx6jzcvw11"; depends=[Rcpp RcppEigen RobustGaSP]; };
   RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.4"; sha256="1zq62vx5bq2wbdh9irmcfpbpr83qqr9m9icbpksxc8bp9zdsdzkq"; depends=[Rcpp RcppEigen]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
@@ -3230,14 +3244,14 @@ in with self; {
   Rprofet = derive2 { name="Rprofet"; version="1.1.0"; sha256="1aflqic2jfx9y6mxj155n0900xp20g1lliq8ad4nd4z2k0rfcpi2"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf]; };
   Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
   Rramas = derive2 { name="Rramas"; version="0.1-5"; sha256="0wy0flzp68mikq4v9k5pv6hbzx0w9mpa74dwx79i3iiddn0ylby6"; depends=[diagram]; };
-  Rraven = derive2 { name="Rraven"; version="1.0.1"; sha256="14sq6zk6k8kgcr3blrpi3asqd0gjc17b8v5siaj8r25vj4q0qzfc"; depends=[dplyr kableExtra pbapply vegan warbleR]; };
+  Rraven = derive2 { name="Rraven"; version="1.0.2"; sha256="0mhf0vv58la1xh8vc31ak1wfi47zsqbjgxy7zz4bjk90g6110jyp"; depends=[doParallel dplyr foreach kableExtra pbapply pbmcapply vegan warbleR]; };
   Rrdrand = derive2 { name="Rrdrand"; version="0.1-15"; sha256="1i7snj33p44v43bz57x1887ing8h02xrf86rv7q0qijj198qf7dr"; depends=[]; };
   Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; };
   Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; };
   Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
   RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; };
   Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; };
-  Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.4.1"; sha256="09x4mw5mn7vz16xlmhyzhplwpvpkwcc7ppxg32vv2h2z35wvhabc"; depends=[kohonen Rcpp]; };
+  Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.1"; sha256="09dsiic9bfy1yq7bwspidn6w21vff3jay8812abydz1l1fz4qv5i"; depends=[kohonen Rcpp]; };
   Rssa = derive2 { name="Rssa"; version="1.0"; sha256="0alh0vq3qqzrn1kklqfp52qknasfq6yzk2dprz3g9pyq05qhmhlw"; depends=[forecast lattice svd]; };
   Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; };
   Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; depends=[]; };
@@ -3245,7 +3259,7 @@ in with self; {
   Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; };
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
   Rtsne = derive2 { name="Rtsne"; version="0.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; depends=[Rcpp]; };
-  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.5"; sha256="1pra2xa1gbg2yijlb9pjnkg3vxs5z35mfk110i7dblai9l59xwq6"; depends=[]; };
+  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.6"; sha256="18pi42n8zdrahwazcf553clqf0j1ngndb9vg5y71zcdwwphg7caf"; depends=[]; };
   Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; };
   RtutoR = derive2 { name="RtutoR"; version="1.1"; sha256="132vyqkzjzwms9sbw6dmkqqk45si89r0xvy477xl98k14a2q4jlw"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes plotly ReporteRs rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; };
   Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; };
@@ -3270,7 +3284,6 @@ in with self; {
   SADISA = derive2 { name="SADISA"; version="1.0"; sha256="0v68k6pwcr2hfsffkcrvpgfwciwir2jsg3q1kvr0ka5iiizpliz3"; depends=[DDD pracma subplex]; };
   SAENET = derive2 { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
   SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; };
-  SAGA = derive2 { name="SAGA"; version="2.0.0"; sha256="022q8hagc38mfakh02cyvf49as2rps1my9iy2xcg8qhrr2czzmy8"; depends=[plotrix viridis]; };
   SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; };
   SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; };
   SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
@@ -3284,7 +3297,7 @@ in with self; {
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
   SASmarkdown = derive2 { name="SASmarkdown"; version="0.4.3"; sha256="0jc21ylflvv4snik13731acxh9zw79s7hpswk58p2wzvavq8k9zn"; depends=[knitr]; };
   SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
-  SASxport = derive2 { name="SASxport"; version="1.5.7"; sha256="1y3hh77c69s65wnar3x40wj3msqjpvspdyy368hgfg8ljkdl3pk2"; depends=[Hmisc stringi]; };
+  SASxport = derive2 { name="SASxport"; version="1.6.0"; sha256="1g8sfi61im9i04whybwqq4rl6glisbziqaag1mdfqykxryakjf04"; depends=[Hmisc stringi]; };
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
   SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
   SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; };
@@ -3298,9 +3311,9 @@ in with self; {
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
   SCORPIUS = derive2 { name="SCORPIUS"; version="1.0"; sha256="1ipqscj20qkqik5gsiramsv18ld4k5g9w0gllf1izjimrlrnqc6n"; depends=[dplyr fitdistrplus ggplot2 magrittr MASS mclust pbapply pheatmap princurve purrr ranger RColorBrewer Rcpp reshape2 testthat tidyr TSP]; };
   SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; };
-  SCRT = derive2 { name="SCRT"; version="1.2.1"; sha256="09d9ghviskg1ifjgqcgdlcp1p3w09bpkixvbxqr4354rq31kwf21"; depends=[]; };
+  SCRT = derive2 { name="SCRT"; version="1.2.2"; sha256="1x6bzcgb5blavj4zdw4jam5r8yad3plyfzk31vz9pjv39784k229"; depends=[]; };
   SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; };
-  SCperf = derive2 { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; };
+  SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; };
   SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
   SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; };
   SDEFSR = derive2 { name="SDEFSR"; version="0.7.1.0"; sha256="1pknkda7iaq5247557b93kc3cf2ih7b3wpqpkqyfgfay3ci9kg16"; depends=[]; };
@@ -3329,7 +3342,6 @@ in with self; {
   SHELF = derive2 { name="SHELF"; version="1.3.0"; sha256="0qhkp1ypbimiq9r8yv95bipbmhm7b38ibbk9nmhdckrr6ymd2w35"; depends=[ggExtra ggplot2 MASS shiny tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
   SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; };
-  SIBERG = derive2 { name="SIBERG"; version="2.0.1"; sha256="0679npp89d6xqs95c2kj95dbbp2v4g933ppkcn315siw2s553nv5"; depends=[mclust]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
   SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
   SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
@@ -3395,13 +3407,13 @@ in with self; {
   SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
   SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
-  SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.0"; sha256="0620nw9i1li52q0h5ygqs5zjl9ciblz3qdx31i3qwbz2c1gza9hy"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; };
+  SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.1"; sha256="1b8rawkcq15r4cyji245x59l1m3qkj0n31nhs1bjd3286zpdcg7b"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; };
   SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; };
   SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; };
   SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQRL = derive2 { name="SQRL"; version="0.1.1"; sha256="15sfw00ff2bil9y0y0dwzjqwqgh5h3266ny6clvgpsx4hsczzsmr"; depends=[RODBC]; };
+  SQRL = derive2 { name="SQRL"; version="0.2.1"; sha256="01nad4j2q20agi62zay0n731ljwgil7ql0gick5s7f9khhciilf6"; depends=[RODBC]; };
   SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
@@ -3427,7 +3439,7 @@ in with self; {
   STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   SUMMER = derive2 { name="SUMMER"; version="0.1.0"; sha256="14dq64h931l8r4pfhdg3i8wabb08n1fnnp8ql1bmhl1z4dqbggfl"; depends=[classInt ggplot2 maptools RColorBrewer sp spdep survey survival]; };
-  SVMMaj = derive2 { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
+  SVMMaj = derive2 { name="SVMMaj"; version="0.2-8"; sha256="13d9v1l85md1v6qyfrdc3l36yanw5canskngjr1sh0hmyla182bz"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
   SWMPr = derive2 { name="SWMPr"; version="2.3.0"; sha256="1z6gg8ih1m5nxm1kilpwxj4xvlbyqr67la7idrfa722y6f6264rf"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
@@ -3476,7 +3488,8 @@ in with self; {
   SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; };
   SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-0"; sha256="098w4kcd6xsgwi996plm06nmyg8f7sg9wjphymmfl29k5y2zyz4s"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; };
   SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; };
-  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.4"; sha256="0wk40lhx2bjyfl8gcv9g1c3bm7kf3b12pfdb0zk22vcp2flr0mci"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
+  SeqBayesDesign = derive2 { name="SeqBayesDesign"; version="0.1.0"; sha256="0426v7lf7z0r8lc9clwnq6n977m27cd7l218i5dfssllkv17h88k"; depends=[MASS Rcpp]; };
+  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.6"; sha256="0y06am4q9cgf8cfycw9ym5qys0g99ks3cfxgk0mss34i5vhbfjfr"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; };
@@ -3491,7 +3504,7 @@ in with self; {
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; };
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
-  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.3"; sha256="1l7x1aw1nfjcwv3b47x3hr5yvdhbxyn8gxipwx5asr6gc62jxlqf"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; };
+  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.6"; sha256="126rvy7pra60fz7pmc6n9liahhwrq313gbqrkvcpcwdv807l39c8"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
   ShortForm = derive2 { name="ShortForm"; version="0.3.0"; sha256="03yxn535yv11l5ckw26jd0maf2k0xpvichid5vwn0vb1f6ryk1xn"; depends=[lavaan MplusAutomation]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; };
@@ -3507,6 +3520,7 @@ in with self; {
   SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; };
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
   SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.5.0"; sha256="10afb3k4rvsmgfx6m1csb0pvnjba1d896llfh3ksmjzxglmvslgw"; depends=[evd]; };
+  SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.0"; sha256="1fq1gjjjs2d91lvvpwlw1xqcr1kw10qzybzphpy6hniq1xx00nnj"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; };
   SimDesign = derive2 { name="SimDesign"; version="1.9"; sha256="1pwci1n7psrsv4mbl1mw3806cilmf3y9v507cdlzcd8jxl354vj7"; depends=[foreach pbapply plyr]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
   SimInf = derive2 { name="SimInf"; version="5.1.0"; sha256="0ylkz6vybwza7fk24f4gybwm4afp0kcx0hlbl05jpif9gmwx6n3s"; depends=[Matrix]; };
@@ -3557,8 +3571,9 @@ in with self; {
   SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; };
   SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
   SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
+  SourceSet = derive2 { name="SourceSet"; version="0.1.0"; sha256="0vibh0v9j8sfsh8535g03q8m28881fagkkra8xxazf3zv5197p11"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; };
   SoyNAM = derive2 { name="SoyNAM"; version="1.4"; sha256="0b48nm3xgvzws9222fmq07chqx4yllz4qjgzxg156s0waxfrjjfi"; depends=[lme4 NAM reshape2]; };
-  SpATS = derive2 { name="SpATS"; version="1.0-6"; sha256="04ahj3haaxrpxijxcq2n922li3g6az29ibsmdhxf72dnr5v2qn63"; depends=[data_table fields plot3Drgl spam]; };
+  SpATS = derive2 { name="SpATS"; version="1.0-7"; sha256="0gnv0hw5h4fin4vy6q8rjb1pry3c1vs0djkhbbkjvh52ycwlxjm7"; depends=[data_table fields plot3Drgl spam]; };
   SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
   SpaDES = derive2 { name="SpaDES"; version="2.0.1"; sha256="00l05kc7mgip41r8yqq3nk2mr5i0acal2b4man5lsgb5vblp4ij9"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; };
   SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.1"; sha256="0sipgq00lacy7yk81crr8h7xfm4vs4h66w6rqsll8i7di19g13cj"; depends=[devtools magrittr miniUI rstudioapi shiny SpaDES_core stringi]; };
@@ -3566,14 +3581,16 @@ in with self; {
   SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.1.1"; sha256="0qfwcgy0nx4754zqi8fhk6q11yv9c5w6pa0wds6szga53hwwdi8g"; depends=[bit checkmate CircStats data_table digest fastdigest fastmatch ff ffbase fpCompare httr magrittr quickPlot RandomFields raster Rcpp reproducible sp]; };
   SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
+  SparkR = derive2 { name="SparkR"; version="2.3.0"; sha256="0dm4yqpppf2chpcsgsj812vx8mzgmwsc4jwkilrpgxfr6s54imgi"; depends=[]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; };
   SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
   SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
   SparseLearner = derive2 { name="SparseLearner"; version="1.0-2"; sha256="1qxycxpch2m2yyk97210gdzsizhlinc0hkhk5ak00rdgkrsxxc0k"; depends=[glmnet lqa mlbench qgraph RankAggreg SIS SiZer]; };
   SparseM = derive2 { name="SparseM"; version="1.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; };
   SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; };
+  SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; };
   SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.2"; sha256="1xm29ybbdxspj2ylkkd9qh17sizz1gkc3l34y3d0ivmxz64vn6pj"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; };
-  SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.2"; sha256="0v694bmfgwhpz2072f7gshqasd2vywvrbk5ncwq74xk5qrcpx9i7"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; };
   SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
@@ -3593,7 +3610,7 @@ in with self; {
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; };
   SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; };
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
-  SqlRender = derive2 { name="SqlRender"; version="1.4.6"; sha256="13ykdm3lf4jxyjxa5rspgssi92c0fmpv011dx4qnbpc4yzglqbgb"; depends=[rJava]; };
+  SqlRender = derive2 { name="SqlRender"; version="1.4.8"; sha256="08q9h6aca7vzgy1ipvghvrspdvmzlgmvhjgibcn38lfyl09xyfas"; depends=[rJava]; };
   StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; };
   StMoMo = derive2 { name="StMoMo"; version="0.4.0"; sha256="0zkcp19a76dm29fba5r96dxly709sic2k5p9hzc70cvwjhwhfr7v"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; };
   StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
@@ -3660,13 +3677,14 @@ in with self; {
   SwissAir = derive2 { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
   SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
   SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; };
+  SympluR = derive2 { name="SympluR"; version="0.1.0"; sha256="11ni1x2k24b8g62gga0wvfxhjjf0pm4bir8sjspk97sii4l19037"; depends=[httr jsonlite plyr]; };
   SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; };
   SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; };
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="2.8-21"; sha256="1iv2nqbf0k3d0cs79imf22hg7rk26q7kr7kasglvlw5gmc07cnwx"; depends=[CDM coda mvtnorm Rcpp RcppArmadillo sfsmisc]; };
+  TAM = derive2 { name="TAM"; version="2.9-35"; sha256="0n49g642xn3c82843l03rhksjbdq81bibj084aihw1nnby1l67k4"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; };
@@ -3708,7 +3726,7 @@ in with self; {
   TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
   TOSTER = derive2 { name="TOSTER"; version="0.3"; sha256="0yjvxb2a2vx1zjg8sqsbz5p1qpnv6kbxrnkz76m08s3hn6ql4jpx"; depends=[ggplot2 jmvcore R6]; };
-  TP_idm = derive2 { name="TP.idm"; version="1.2"; sha256="08n5bgc7gw1cbn9q7kd6jfxcwmb5mfjmdmhkhr35fi5ah21a57mh"; depends=[]; };
+  TP_idm = derive2 { name="TP.idm"; version="1.3"; sha256="1j1s48342kg2lvydfy0250lyyzchj9qr6qi7d4rwy5xpvx8sy2b0"; depends=[]; };
   TPD = derive2 { name="TPD"; version="0.1.2"; sha256="1h8lgcrlsk68x2y01vgcn7dpq5q5180khz4csr8jbscbcdwljcl9"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
@@ -3734,6 +3752,7 @@ in with self; {
   TSSQLite = derive2 { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[DBI RSQLite tframe tframePlus TSdbi TSsql]; };
   TSTr = derive2 { name="TSTr"; version="1.2"; sha256="0nljkqsrwzg7i82arpfrz2k9m1k1akin1akf01c5cadxq4rgarsf"; depends=[data_table stringdist stringr]; };
   TSTutorial = derive2 { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
+  TSVC = derive2 { name="TSVC"; version="1.0.0"; sha256="1v2402shrsdighnhrphvqnsnwq0y4rpx7hg4bxpzqhcma5a3z1r2"; depends=[plotrix]; };
   TSclust = derive2 { name="TSclust"; version="1.2.4"; sha256="0dh6bybr5298cjz9fxfz7wbkp7f45d3r2zl9fb0wgngb6bd0cwfl"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc wmtsa]; };
   TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
   TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; };
@@ -3747,7 +3766,7 @@ in with self; {
   TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
   TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; };
   TSstudio = derive2 { name="TSstudio"; version="0.1.1"; sha256="1myvih5kd9pliczddjscqlq811dswqh9d8an8p5bi12h31w9pp30"; depends=[forecast lubridate magrittr plotly reshape2 xts zoo]; };
-  TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.3"; sha256="0a1v0lsfcn32w5rwcjwmvh0rghamwr5a76rx3npa6kv0dymnvhxf"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 zoo]; };
+  TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.4"; sha256="0r79qbmn4z9v4f4g737xs3mhc4dp6s6llkcz6c3hihwnq1vrvd7h"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt tcltk2 zoo]; };
   TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; };
   TTR = derive2 { name="TTR"; version="0.23-3"; sha256="07r62ngyzjl4aszdxnr3n6bnbcgcap32yhd430jsilicg8n06di1"; depends=[curl xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
@@ -3760,7 +3779,7 @@ in with self; {
   TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; };
   TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
-  Tariff = derive2 { name="Tariff"; version="1.0.2"; sha256="0x139hhjjc1iyx9m3h5vdjh57q5kbc6x1mzjysz0ibnqpvhanjb2"; depends=[]; };
+  Tariff = derive2 { name="Tariff"; version="1.0.3"; sha256="1z1yzy4f9k0zxa6zx1vp5axgjszics5wa8niy6087jz3r7y2bwph"; depends=[]; };
   TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
   TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; };
   Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; };
@@ -3811,15 +3830,16 @@ in with self; {
   TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.2"; sha256="1k2s3syx27vma5k0qcfx2579jyaxmx7crizkvz3wplhzdwag7wbk"; depends=[cluster RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
+  TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
   TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.5"; sha256="0zdni9zqz3yy5ac2xfn3x2ad2lsmm7aw67nshv2sis828f9bsj9x"; depends=[geosphere ggplot2 magrittr rgdal rgeos RPostgreSQL sp spacetime trajectories xts]; };
   TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
   TransferEntropy = derive2 { name="TransferEntropy"; version="1.4"; sha256="0620axdj6qyskf7xszrs8j5d2l73ns4bgbdg03fvr8i7jmq70zb8"; depends=[BH Rcpp]; };
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
-  TreeBUGS = derive2 { name="TreeBUGS"; version="1.3.0"; sha256="0k1z3c5vlgwwkalf2a35q6qqxg9nhkj9101jiqq408dlkahcl32f"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
+  TreeBUGS = derive2 { name="TreeBUGS"; version="1.3.1"; sha256="0zwbp7z31hw6krwhf21wpy5ryfhf0hhipjrsmvbrb7d4sx9am2vb"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
-  TreeSearch = derive2 { name="TreeSearch"; version="0.0.6"; sha256="1v8mczvh2m5mrmhsgpajhmb7bmlplyraa2q08w6nz6fs5g9zg01c"; depends=[ape phangorn]; };
+  TreeSearch = derive2 { name="TreeSearch"; version="0.0.8"; sha256="1w65pw2qj5jcpg2v41kyhp0zq7pr56rxw1vrshxcpwxlwjj1sii6"; depends=[ape memoise phangorn R_cache Rdpack]; };
   TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; };
@@ -3858,7 +3878,7 @@ in with self; {
   Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; };
   Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
-  UncertainInterval = derive2 { name="UncertainInterval"; version="0.3.0"; sha256="09x52g691qqsphy2sppm3852gak0ammsan4x306vd16yz9z0zlb2"; depends=[nloptr reshape2 rootSolve]; };
+  UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.6"; sha256="17xirpichh4c9qajkz4xywd8881wqdni6d3pqvsy2h13fvidb83q"; depends=[nloptr reshape2 rootSolve]; };
   UniDOE = derive2 { name="UniDOE"; version="1.0.1"; sha256="1hjraksvxvxz4xbrq97x6xf3r0f90c484ix92zapylyxvkifx628"; depends=[Rcpp]; };
   UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; };
   Unicode = derive2 { name="Unicode"; version="10.0.0-1"; sha256="1kj4b29gj3p0wzlzxqn7lwzabair6np705va0nxissfybpmwalgk"; depends=[]; };
@@ -3871,7 +3891,6 @@ in with self; {
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
   VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; };
   VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
-  VBmix = derive2 { name="VBmix"; version="0.3.2"; sha256="09kgllh8wbsgx9ykv95igczy4hi8d8grvffvdkp2zygdiyvkhsxa"; depends=[lattice mnormt pixmap]; };
   VCA = derive2 { name="VCA"; version="1.3.3"; sha256="03ibvn3a6bbgq36a1ibhi4givdnba6d0qcfbpbdxkz5masn1r23q"; depends=[lme4 Matrix numDeriv]; };
   VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
   VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; };
@@ -3890,7 +3909,7 @@ in with self; {
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
   VSURF = derive2 { name="VSURF"; version="1.0.3"; sha256="0fgy1qk1jkrnil4cirkp2lj21xjwbpgjgxqrsjs321s69rw2dy1j"; depends=[doParallel foreach randomForest rpart]; };
-  VTrack = derive2 { name="VTrack"; version="1.11"; sha256="1w8zp7l60mwzppg3gqq0zv5a065y0vdrp2v0x0yl4a8jq0zlvppx"; depends=[doParallel foreach plotKML sp spacetime]; };
+  VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; };
   VWPre = derive2 { name="VWPre"; version="1.0.1"; sha256="1q6i1ijw9sx5k9k1gpmhsm99hwgsj6kjkak3lnq7458563vd640m"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
@@ -3898,17 +3917,16 @@ in with self; {
   VarSelLCM = derive2 { name="VarSelLCM"; version="2.0.1"; sha256="08kpnppa5mm1xjbdgl354py9jy57x4r0nbv8z4skzc1k972qrgy9"; depends=[mgcv Rcpp RcppArmadillo]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
   VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; };
-  VariABEL = derive2 { name="VariABEL"; version="0.9-2.1"; sha256="00k08mvd09rpplakvid6qal1zdxaj1bxn4d2ivpnqihisf7nxqbs"; depends=[]; };
   VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; };
   VarianceGamma = derive2 { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; };
   Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
   VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; };
   VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
-  VennDiagram = derive2 { name="VennDiagram"; version="1.6.18"; sha256="05vhsk5ylspa6b919gk9v4rbwm9sc4lsfq0wz308a8dilkg8cqpa"; depends=[futile_logger]; };
+  VennDiagram = derive2 { name="VennDiagram"; version="1.6.19"; sha256="0f0kw5rvxl6v39yhgrz819hk1j0xd48iz5wfl91qd1vjw1kg9fn2"; depends=[futile_logger]; };
   VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; };
   VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; };
-  VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.5"; sha256="18v5llajhfp9nrmyzg6n2mgm7vbjk698m4y55x9xrq29hkb4mhad"; depends=[Rcpp]; };
+  VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; };
   VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.2.0"; sha256="1vx72pn3fl27mjsa48kz5j1sj1bkjq8q0ifs5dxdfrcdswfqhjcw"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
   ViSiElse = derive2 { name="ViSiElse"; version="1.2.0"; sha256="0k5hhzyjws0haawx2r2c0rxjbjdfx821x0jmj88786q6x67x86n0"; depends=[chron colorspace Matrix stringr]; };
   VideoComparison = derive2 { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
@@ -3925,7 +3943,7 @@ in with self; {
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
   WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
-  WGCNA = derive2 { name="WGCNA"; version="1.62"; sha256="0c52rp09gqphz6g5x9jzkdcsyvfrknq0dkq9saslgy8q8ap974vx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; };
+  WGCNA = derive2 { name="WGCNA"; version="1.63"; sha256="1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; };
   WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; };
   WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; };
   WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
@@ -3947,6 +3965,7 @@ in with self; {
   WaveletComp = derive2 { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
   WebGestaltR = derive2 { name="WebGestaltR"; version="0.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.3.1"; sha256="0iadn4hpmfpih75nz17kligh3avjzs1cfi3pkkgx378ml64kdz8m"; depends=[cobalt]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
@@ -3968,7 +3987,7 @@ in with self; {
   WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="0.6.2"; sha256="1k5nmg8mg8m9salcb0jr87ws548ydc597v8m94y4qrrfchy623rg"; depends=[dplyr httr jsonlite]; };
   XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; };
-  XGR = derive2 { name="XGR"; version="1.1.1"; sha256="1m1nr8ass1spkxf5rc1hj53f98xhad4l2xafjim0284q0l01qn2r"; depends=[BiocGenerics dnet dplyr GenomicRanges GenomicScores ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; };
+  XGR = derive2 { name="XGR"; version="1.1.2"; sha256="0zvqsd7ff8a46w58qklp2w0w785y8nhpx4mcvp27r0k8j9y5yji7"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
   XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; };
   XLConnect = derive2 { name="XLConnect"; version="0.2-14"; sha256="06c88rkyavjv3p90hr3cz4y9jx3g6ik3sannjynjnms7d793w0fi"; depends=[rJava XLConnectJars]; };
@@ -3988,14 +4007,13 @@ in with self; {
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
   YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
-  YplantQMC = derive2 { name="YplantQMC"; version="0.6-6"; sha256="153sznajgp4bjsjhn3xk6kbp68ihswdc48gn0y3wmg5xa15yrqlk"; depends=[geometry gplots LeafAngle maps rgl]; };
   YuGene = derive2 { name="YuGene"; version="1.1.5"; sha256="1f1bia1q1z2rzp4pw218zglf02x1m9zpz5gqllrd77ggw8ilqfjc"; depends=[mixOmics]; };
   ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; };
   ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
   ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
   ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
-  Zelig = derive2 { name="Zelig"; version="5.1.5"; sha256="0lzcin7maz4drn9w3z841kay4ik6rr4ab2l2s56mcj1f0p6ng7pd"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
+  Zelig = derive2 { name="Zelig"; version="5.1.6"; sha256="142kjmgma25pvr525y0mjiwivnmq8y8s1abw4kyqipcmphmgh3an"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
   ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; };
   ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; };
   ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; };
@@ -4037,7 +4055,7 @@ in with self; {
   acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
   acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; };
   acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; };
-  acs = derive2 { name="acs"; version="2.1.2"; sha256="0nvfqknvbzv99pljxv54csrkyvqvr03grskxpqa3aghq6ilj0zyv"; depends=[httr plyr stringr XML]; };
+  acs = derive2 { name="acs"; version="2.1.3"; sha256="1r6lywjhdi53873c2hl670hbaycrlycaps5pll2i9czr1phlv0rj"; depends=[httr plyr stringr XML]; };
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
   activity = derive2 { name="activity"; version="1.1"; sha256="1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx"; depends=[circular overlap pbapply]; };
@@ -4061,7 +4079,7 @@ in with self; {
   addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; };
   ade4 = derive2 { name="ade4"; version="1.7-10"; sha256="0zk81x0yn30gbyc0jpzyw1nxd08ccihl6vyk0ijvj3aw3nr5flc6"; depends=[MASS]; };
   ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; };
-  adeba = derive2 { name="adeba"; version="1.0.2"; sha256="12zs6rh7sl1fsf8q20hgqms5pykmysnb9mfcwf9x63g44yi26dj4"; depends=[pdist Rcpp]; };
+  adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; };
   adegenet = derive2 { name="adegenet"; version="2.1.1"; sha256="0ynfblp0hbd3dp3k86fn1wyhqr28lk6hs2bg4q7gyf0sfdfzwhrh"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
   adegraphics = derive2 { name="adegraphics"; version="1.0-9"; sha256="1fscmisvfd3j9fy1562pjsfpgx16fhr5xwmkzmssxhgyia19f4sr"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitat = derive2 { name="adehabitat"; version="1.8.20"; sha256="18z4a8168a2c7248s15hwkjj70dzlkif360cy28jry4a61cm6d81"; depends=[ade4 shapefiles sp tkrplot]; };
@@ -4072,7 +4090,7 @@ in with self; {
   adephylo = derive2 { name="adephylo"; version="1.1-11"; sha256="06pnrycc7562h17gxbli935289a48na3p4vpb2w96i5cbrjg4jqm"; depends=[ade4 adegenet ape phylobase]; };
   adepro = derive2 { name="adepro"; version="2.0.0"; sha256="0q9h7wmkgdnbhg2ygw32jl0bm2vrl32ig2nci9pphgwpsfzb34jq"; depends=[audio Cairo MASS shape shiny shinyBS]; };
   adespatial = derive2 { name="adespatial"; version="0.1-1"; sha256="19i83s19sbvjm5k0gkw8awz359q67rr3768icsjd118fji45dvg0"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep]; };
-  adfExplorer = derive2 { name="adfExplorer"; version="0.1.2"; sha256="0jgh5378ky3bng1zmrvw898ni2nr0lnw9ngkkjxq3i5syp889b09"; depends=[]; };
+  adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; };
   adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; };
   adimpro = derive2 { name="adimpro"; version="0.8.2"; sha256="0nfzk9pp4p16c1nvpidngag96r845376h8ljh7m6p6rhk9fs4jdw"; depends=[awsMethods]; };
   adiv = derive2 { name="adiv"; version="1.1"; sha256="12m8p1agahzck1nm8j765wacc6vrl0pa31wld4rqxl7c2pvhs7f4"; depends=[ade4 adegraphics adephylo ape cluster phylobase]; };
@@ -4103,7 +4121,7 @@ in with self; {
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
   ahnr = derive2 { name="ahnr"; version="0.2.0"; sha256="0bfy7xxfxfzhv4yl9dlsyl304673p23r2h0lz3lv75iqp2gbzdjr"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; };
-  ahp = derive2 { name="ahp"; version="0.2.11"; sha256="09n06k5dmmpw6h6s51x9xy6rkk54fswss8pflh3v9nprbx7vzx4i"; depends=[data_tree DiagrammeR formattable yaml]; };
+  ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; };
   aiRthermo = derive2 { name="aiRthermo"; version="1.1"; sha256="0i3sq7i37i82ad70z2mai09rxzk4kk27hfg5jjbh6pajwzyn5yri"; depends=[]; };
   aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
@@ -4115,7 +4133,7 @@ in with self; {
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
   alakazam = derive2 { name="alakazam"; version="0.2.8"; sha256="0lilldxynwhp1i538k3xb9c73956agxj6v8zickxkba1sx4k5zrc"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; };
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
-  alfred = derive2 { name="alfred"; version="0.1.4"; sha256="1g4l0fz0lw34ffp6spx535zfrgkgwm41qrn0bg3lpl1kx9m3i2ir"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
+  alfred = derive2 { name="alfred"; version="0.1.5"; sha256="0slqmfv5nsjb463n86qf540dd8airzqc98946kbs24xmyi9npyb8"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
   algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; };
   algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
   alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; };
@@ -4138,6 +4156,7 @@ in with self; {
   ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
   ameco = derive2 { name="ameco"; version="0.2.8"; sha256="1i2ap11z1awalw71hai719xh57banpfgj1nllca66zf781x80di9"; depends=[]; };
   amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
+  amelie = derive2 { name="amelie"; version="0.1.0"; sha256="19cn8rhc5lzy9x9wslljjdnmli76bnam2yg5v9l87jvzb712vl6p"; depends=[]; };
   amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; };
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
@@ -4153,24 +4172,21 @@ in with self; {
   anchoredDistr = derive2 { name="anchoredDistr"; version="1.0.3"; sha256="07q4np0zryb49cpi7w5iz0qna63cyp9nz13d8ws6x9ccg417r99a"; depends=[DBI dplyr ggplot2 np plyr reshape2 Rmisc RSQLite]; };
   anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; };
   andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
-  anesrake = derive2 { name="anesrake"; version="0.75"; sha256="1blq1blyq122jlj2yp8l7gam49q6h1wg6c9v0kkfkmnh5dwgz3mm"; depends=[Hmisc weights]; };
   anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; };
   angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; };
-  aniDom = derive2 { name="aniDom"; version="0.1.2"; sha256="0lmq7k2l7nk120m96wj8zdsw03dqfvhz9y9miizrhl8db9nw9qka"; depends=[rptR]; };
+  aniDom = derive2 { name="aniDom"; version="0.1.3"; sha256="1xjbj9d6kv5nprsh1z58gbi338f7sj7dimgvy92j6n1xbrlh83p5"; depends=[rptR]; };
   anim_plots = derive2 { name="anim.plots"; version="0.2"; sha256="1plpi90qzk4ng0sm77fvqyv1063w67axvdc29q5nvz4h6v4j7ks3"; depends=[animation]; };
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
   animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; };
-  anipaths = derive2 { name="anipaths"; version="0.8.0"; sha256="1czs8s4kb1a0s25bd4nv1w1p52wxr4q5zfch5xgp766rgfpahylr"; depends=[animation knitr RColorBrewer rgdal scales sp]; };
+  anipaths = derive2 { name="anipaths"; version="0.9.3"; sha256="0pip9vhp3d4c6i6l9cmdds3nwaf8cspqviff6q7xng0ib8mi995n"; depends=[animation knitr mgcv RColorBrewer rgdal scales sp]; };
   annovarR = derive2 { name="annovarR"; version="1.0.0"; sha256="0l2csp06m5f3i1b4h0pvl8mmzx25c0b411c5sdc3qszirbplh038"; depends=[AnnotationDbi BioInstaller configr data_table DBI futile_logger glue ngstk RMySQL RSQLite stringi stringr vcfR]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
-  anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.4"; sha256="0a9m9bxz9v9xx19lq8yih727p7zy25ndfamwajzgh0zvx394h0jz"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; };
+  anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.5"; sha256="132wb0xz04zib3x7802b2q546rkf097rsxyi9mi86g6vv7yyw9z1"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
   anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; };
-  antaresProcessing = derive2 { name="antaresProcessing"; version="0.13"; sha256="0v6jyvw2bxjagbkcd08w6rxdws34idqd938726c0s36cj1a583n5"; depends=[antaresRead data_table]; };
-  antaresRead = derive2 { name="antaresRead"; version="2.0.2"; sha256="0rilfd8f8wc57ai8s1xl4h346y3qdgspa8j694nnj9n4zss30ycb"; depends=[data_table lubridate plyr shiny stringr]; };
-  antaresViz = derive2 { name="antaresViz"; version="0.12.0"; sha256="0066kidfkiyqw6fzkvi40hdpy25djvni9s0q69c8gjvzrh84i5p5"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly raster rgeos shiny sp spMaps webshot]; };
-  antitrust = derive2 { name="antitrust"; version="0.98"; sha256="1n8js5hwl96a76g50mq69hsf46v6ajf3s7kr19pfrqnp3jgi3gk3"; depends=[BB evd ggplot2 MASS numDeriv]; };
+  antaresRead = derive2 { name="antaresRead"; version="2.1.0"; sha256="1khvwh55gfd62avaj9vl709nrcykyc4zn11fxikbqqgwm9mq7835"; depends=[data_table lubridate plyr shiny stringr]; };
+  antitrust = derive2 { name="antitrust"; version="0.99"; sha256="0j76kbb8l0n3lq74nacymgilf4xzs8g1x2g1jw55v6avqnwyps6p"; depends=[BB evd ggplot2 MASS numDeriv rhandsontable shiny]; };
   antiword = derive2 { name="antiword"; version="1.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; };
   anytime = derive2 { name="anytime"; version="0.3.0"; sha256="1byhgplskj17d0gib9sajfnzyv8p9slgq1vy8fq9j2ibirl86a91"; depends=[BH RApiDatetime Rcpp]; };
   aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
@@ -4181,7 +4197,7 @@ in with self; {
   apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
   apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
   apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; };
-  apaTables = derive2 { name="apaTables"; version="1.5.1"; sha256="1ajff635vvypi457wk55bp8kddm80hg2af3hayp3rvjvdk8a8fjv"; depends=[broom car dplyr MBESS]; };
+  apaTables = derive2 { name="apaTables"; version="2.0.2"; sha256="0b3vaknj0a9znrgr98v35ka0lf5y1wcy1x0yv249gysikncn9mjc"; depends=[boot broom car dplyr tibble]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
   apcluster = derive2 { name="apcluster"; version="1.4.5"; sha256="0ipg5m3d7fnbvvlavbv8q8ixyrcgdspzwkv00q93f4biybza27x6"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
@@ -4209,7 +4225,7 @@ in with self; {
   aqp = derive2 { name="aqp"; version="1.15"; sha256="0hgz2m3nn45marvx49n62xmq1d1xhy9cf6wb829cvxczisvlakgy"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
   aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
-  arc = derive2 { name="arc"; version="1.1.3"; sha256="1p186f769vqhd36l5bivm1yi5kjgv9fjmlafjx0ibyascbcz131h"; depends=[arules discretization Matrix R_utils]; };
+  arc = derive2 { name="arc"; version="1.1.4"; sha256="1qzj5bzn2dfssjz1r464ys7c0wab0la23hcrbjbmn93iqm2a648g"; depends=[arules discretization Matrix R_utils]; };
   archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="3.0"; sha256="0yh9asf45l2fxxm67vg9snaqbvs1bb24lm2xsrb6xrr62avdrqlq"; depends=[rgl sp TDA XML]; };
@@ -4235,8 +4251,8 @@ in with self; {
   ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
   arsenal = derive2 { name="arsenal"; version="1.0.0"; sha256="0fv3zq0i28sbdvwh589c27j4k734vr90aik3gxdablgasrhdjfza"; depends=[testthat]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.5-5"; sha256="05v3sin5w4b28ms34mvk3ha59c74pq20afrlq41ylfxxzffrljar"; depends=[Matrix]; };
-  arulesCBA = derive2 { name="arulesCBA"; version="1.1.2"; sha256="0c37cffb89gsyv5shpgiksrh5hi2lzdqsk7xl8lxzz6mnv4v1xrj"; depends=[arules caret Matrix testthat]; };
+  arules = derive2 { name="arules"; version="1.6-0"; sha256="14gbq5k2zkx4wc7kkfazz313ngij89qp1xmyxfg3nq3v1s84c3sl"; depends=[Matrix]; };
+  arulesCBA = derive2 { name="arulesCBA"; version="1.1.3"; sha256="0dpa9v8xksq21lyv6g7m81ccpd08lq816vfy5ga8g3blkg1qfrf2"; depends=[arules caret discretization Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; };
   arulesViz = derive2 { name="arulesViz"; version="1.3-0"; sha256="0k9lq1w0cdk9mlbr5mwh87qrzank1nd8bwlymv4xyi7xm5y6wq4l"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; };
@@ -4250,7 +4266,7 @@ in with self; {
   asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; };
   asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; };
   ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; };
-  ashr = derive2 { name="ashr"; version="2.0.5"; sha256="0blr19ipcanwjxizilkd8hb37dlhb6idjcw2lf0ll8pkd2l68f5z"; depends=[assertthat doParallel etrunct foreach pscl Rcpp SQUAREM truncnorm]; };
+  ashr = derive2 { name="ashr"; version="2.2-7"; sha256="1bgkzab7f7fqi259vxrpkxq8yzhh1sl3mqdzc73dk54c5849b2pz"; depends=[assertthat doParallel etrunct foreach Matrix pscl Rcpp SQUAREM truncnorm]; };
   asht = derive2 { name="asht"; version="0.9.3"; sha256="075gzxly8sqkbwnznxcr4z3zs1qvlyl8c4ishgxk035ik1w6p16n"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
   aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
   asnipe = derive2 { name="asnipe"; version="1.1.8"; sha256="10pza52bcfdj9412hr69lcv4n43y0n91hfkbq8338fsqpad98ilz"; depends=[MASS Matrix]; };
@@ -4275,7 +4291,7 @@ in with self; {
   assertive_sets = derive2 { name="assertive.sets"; version="0.0-3"; sha256="1cqvh2syvh5b6d85h601zjmsdbbf3h8q98ids4dfl4frdshpasc7"; depends=[assertive_base]; };
   assertive_strings = derive2 { name="assertive.strings"; version="0.0-3"; sha256="0n6jrk88670g4ym0r8ii40a08a90z1xadj8wcryk8h0nl04dchfm"; depends=[assertive_base assertive_types stringi]; };
   assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; };
-  assertr = derive2 { name="assertr"; version="2.0.2.2"; sha256="0l2sjj9amhpkd8mg88mfs82gy0v84brkk8504mkjcaz7j2j9s3l5"; depends=[dplyr lazyeval MASS]; };
+  assertr = derive2 { name="assertr"; version="2.5"; sha256="17j5aw19cp9csbxhf277yrr4vlr2c5sk70v9a4fnch0c2q14l5f3"; depends=[dplyr lazyeval MASS rlang]; };
   assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; };
   assignPOP = derive2 { name="assignPOP"; version="1.1.3"; sha256="12ldcm1v1s311n3c9sysaw5ba2z8yrzrf95rl7ip6fl2q8g0fv6b"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
   assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
@@ -4343,7 +4359,7 @@ in with self; {
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
   bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
   bReeze = derive2 { name="bReeze"; version="0.4-2"; sha256="04zapsxb4lsi85m9qgrsm49yasf0b8wk0djdpa7xks4hjvmskfhq"; depends=[]; };
-  bWGR = derive2 { name="bWGR"; version="1.5"; sha256="0pa7g5dnnakgxzial0xf03pvmcfplx40cdfvmmyv2fcjrq2d85jd"; depends=[Rcpp]; };
+  bWGR = derive2 { name="bWGR"; version="1.5.1"; sha256="0dkpj9xskflnhqr92bi54cg3qckjja1jj5vjypzijikwqimz879h"; depends=[Rcpp]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; };
@@ -4369,14 +4385,14 @@ in with self; {
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
   bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
-  bartMachine = derive2 { name="bartMachine"; version="1.2.3"; sha256="15bv7q64ifjdg5ppx7vp3i3agil6dwirk5cf02lc243hmlg5lk1i"; depends=[bartMachineJARs car missForest randomForest rJava]; };
-  bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.0"; sha256="1vnicq9amayxh69jqgly8jm7hvgjr22kvm1g6y2n7vphz70p9cq9"; depends=[rJava]; };
+  bartMachine = derive2 { name="bartMachine"; version="1.2.4"; sha256="09w3gb7lh12ls8hmmnssvmlmp3lkbr2j0jqdihfb6049cgl31m60"; depends=[bartMachineJARs car missForest randomForest rJava]; };
+  bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; };
   basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; };
   base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; };
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
-  base64url = derive2 { name="base64url"; version="1.2"; sha256="1dmpb6cyabs6fqnbwshyws107p961203wic7his6zywsn9axymfc"; depends=[backports]; };
+  base64url = derive2 { name="base64url"; version="1.3"; sha256="1azik4yqafay4m2panbnyyf7cq5qb2qjv74ikhb8rljbsgv2xchd"; depends=[backports]; };
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
-  basefun = derive2 { name="basefun"; version="0.0-39"; sha256="1ylp9x2k275y30k2p7rljmwq0lfj7vb36d1fh4lvmaazci9dqz6c"; depends=[Matrix orthopolynom polynom variables]; };
+  basefun = derive2 { name="basefun"; version="1.0-0"; sha256="1a2ksmxki1jg0g9359zxzxignpcz7lcahqf6k3nclv7s0p22vb42"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
   basicTrendline = derive2 { name="basicTrendline"; version="1.0.1"; sha256="0rsmlp70ylpkqv437jcy3skwbfkj4xwkpjb2q79b9n8kw2ir0716"; depends=[]; };
   basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; };
@@ -4406,7 +4422,7 @@ in with self; {
   bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
   bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; };
-  bayeslm = derive2 { name="bayeslm"; version="0.6.0"; sha256="1pdkrmmlk9wbkw5mmqg43g31kpfnaxks6p5xasv1vf617wc9hj7b"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
+  bayeslm = derive2 { name="bayeslm"; version="0.7.0"; sha256="132dli5lfxdghiz6g9jlzvbb71il0yv679947xrzfy68hln85d40"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
   bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; };
@@ -4443,9 +4459,10 @@ in with self; {
   bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-3"; sha256="17ddvz4gnih7rx0lr1gzk280xyh6x796cf2x794dvplpiiq83skh"; depends=[]; };
   bdvis = derive2 { name="bdvis"; version="0.2.20"; sha256="1iif70s17d9nh6bylm9s0ky70qx441n56h953gz4hxp7rb5dly31"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; };
   bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; };
-  bea_R = derive2 { name="bea.R"; version="1.0.4"; sha256="16y2hgw9pi849hz6c280wj53ncbq442szp27kp9jpr21iy827298"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; };
+  bea_R = derive2 { name="bea.R"; version="1.0.6"; sha256="15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; };
   beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
   beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
+  beadplexr = derive2 { name="beadplexr"; version="0.1.0"; sha256="1aw75v4bjxrf22x0bm57qqp6r7cz8zmkd1hmk4amlxypbxd2479f"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; };
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
   beanz = derive2 { name="beanz"; version="2.1"; sha256="0lnjaka2cmkgc7id8njclmmkjb22v6gz9bkncq5n6zidawrczqp0"; depends=[BH loo Rcpp RcppEigen rstan StanHeaders survival]; };
   beast = derive2 { name="beast"; version="1.0"; sha256="1j4afp8cm6psxqidanvcfqrz6zy1klkzjkm7ia5w5qlvgll2micz"; depends=[RColorBrewer]; };
@@ -4454,6 +4471,7 @@ in with self; {
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
   beginr = derive2 { name="beginr"; version="0.1.0"; sha256="0zi2c6agkxx6aq7ih2c1z4r93fsjmqp2iymxllld0d7jcpp5qbv6"; depends=[cranlogs jsonlite]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
+  belg = derive2 { name="belg"; version="0.1.1"; sha256="0bbp413q6y24g05xsk49lpz7b2i6n9fb791h05ml39x8r9lapif6"; depends=[Rcpp RcppArmadillo]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
   benchmarkme = derive2 { name="benchmarkme"; version="0.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; };
@@ -4469,7 +4487,7 @@ in with self; {
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
   betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
-  betapart = derive2 { name="betapart"; version="1.4-1"; sha256="1ldz6hr08vsgvz0h9ilsm5ab5fyppjpnz215lhri80x7biym3c0q"; depends=[ape geometry picante rcdd]; };
+  betapart = derive2 { name="betapart"; version="1.5.0"; sha256="0hk016hpdb927d142rfa13kjwhgzki1fy4xqbwdphzwv37nyxag7"; depends=[ape geometry picante rcdd]; };
   betaper = derive2 { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
   betareg = derive2 { name="betareg"; version="3.1-0"; sha256="05s5lszj22186xhvk0dxgz4vqfvmss40pbh147mwqkz1h48z5pf7"; depends=[flexmix Formula lmtest modeltools sandwich]; };
   betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; };
@@ -4493,7 +4511,7 @@ in with self; {
   biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; };
   biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
   bifactorial = derive2 { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; };
-  bife = derive2 { name="bife"; version="0.4"; sha256="1h3r5vigs2ghga84smx492m0v9aq6gynnw5r23n20kkbiscv1fxk"; depends=[Formula Rcpp RcppArmadillo]; };
+  bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; };
   bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
   bigKRLS = derive2 { name="bigKRLS"; version="2.0.4"; sha256="027p1v89fpi2rgxca035nyzk51dxv0x04sy3mqb5z38rvj8r08k9"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
@@ -4516,7 +4534,7 @@ in with self; {
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; };
   bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
-  bikedata = derive2 { name="bikedata"; version="0.1.0"; sha256="1vhjk8gbip4p6x0i4qw1m3wzic40v6qkj50zm6l44qgqcjkj699m"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp reshape2 RSQLite tibble xml2]; };
+  bikedata = derive2 { name="bikedata"; version="0.1.1"; sha256="0vs1cal05a80zjz6gqfsxs616dqrq47vgk91mrdhca3b95ywxyfq"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl reshape2 RSQLite tibble xml2]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; };
   bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
   billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; };
@@ -4536,6 +4554,7 @@ in with self; {
   bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; };
   binhf = derive2 { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[adlift wavethresh]; };
   binman = derive2 { name="binman"; version="0.1.0"; sha256="103f74gm124vw4rwbfrd5dlgca3v83kqd8m5j9z3ma3snh788mkx"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; };
+  binneR = derive2 { name="binneR"; version="1.1.1"; sha256="07cfcp9jj5bks8kmxvir9y9z7fj44hvy1wyrg4jy029dvkz8g2ki"; depends=[dplyr magrittr mzR plyr tidyr]; };
   binnednp = derive2 { name="binnednp"; version="0.1.0"; sha256="0cfgz6828b2525dmph5n4zxdgkbx0nsrm4k2azhw1xfi3pz4z6ga"; depends=[fitdistrplus kedd mclust nor1mix Rcpp Rdpack]; };
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
   binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; };
@@ -4663,17 +4682,19 @@ in with self; {
   bpca = derive2 { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; };
   bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; };
   bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
+  bpnreg = derive2 { name="bpnreg"; version="1.0.0"; sha256="0mpwrhbbbw8m3cz0fl0x9j9m3n9zfdamnw83mmg4bjd0wmxkkm90"; depends=[BH haven MASS Rcpp RcppArmadillo]; };
   bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; };
   bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; };
+  braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; };
   braidReports = derive2 { name="braidReports"; version="0.5.3"; sha256="107c9lrzb55dw5pal8qqpn8is3nrh19vfngx3zcfpmc49f06kskq"; depends=[braidrm ggplot2]; };
   braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; };
-  brainGraph = derive2 { name="brainGraph"; version="2.0.0"; sha256="016ck3fqwfzj6jhxkqqlsj5mv16fy8k72ykwvm2biy5pwgbapwsa"; depends=[abind ade4 boot cairoDevice data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix mediation oro_nifti permute RcppEigen RGtk2 scales]; };
+  brainGraph = derive2 { name="brainGraph"; version="2.0.2"; sha256="14jj4da2l92fgv924a8s4kw39vhxafaxj6pgwpxw86d5bqmc994g"; depends=[abind ade4 boot cairoDevice data_table expm foreach ggplot2 ggrepel gridExtra Hmisc igraph MASS Matrix mediation oro_nifti permute RcppEigen RGtk2 scales]; };
   brainR = derive2 { name="brainR"; version="1.5.1"; sha256="0ih4vwy445ciyyvf8snm42vg7rzzf6vn9qkbhj0yyd8sy88mgyss"; depends=[misc3d oro_nifti rgl]; };
   brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
   brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; };
   brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; };
   brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; };
-  breakDown = derive2 { name="breakDown"; version="0.1.3"; sha256="19vfwacbq7hvbsc42679pmd1d0n2d0m62k87qm157xmlbag6anv9"; depends=[ggplot2 ranger]; };
+  breakDown = derive2 { name="breakDown"; version="0.1.4"; sha256="0mxn38pg95ih2p2gk2nayzwn6h8dhvsk46g0ndrhrr3l9nkbij3w"; depends=[ggplot2]; };
   breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
   breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; };
   breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; };
@@ -4682,7 +4703,7 @@ in with self; {
   breathteststan = derive2 { name="breathteststan"; version="0.4.0"; sha256="13wqb33gvzmjpgzqyyadydz5hnqcran80azaxbixj7wga0c35pqq"; depends=[BH breathtestcore dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; };
   brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
   brglm = derive2 { name="brglm"; version="0.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; };
-  brglm2 = derive2 { name="brglm2"; version="0.1.6"; sha256="02zahv1kssxwz9xhb1dpc1558rmgmbpgn62xic3yvn05sixn6y6j"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; };
+  brglm2 = derive2 { name="brglm2"; version="0.1.7"; sha256="04hfvb0s6xjswv9f1z2aa80j490jcpf3jlplb4s576hc3fd8qqda"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; };
   bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
   bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; };
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
@@ -4703,7 +4724,7 @@ in with self; {
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
-  bsplinePsd = derive2 { name="bsplinePsd"; version="0.1.0"; sha256="1sicbrammayy56fa72jjygxiqxri93kglpyalhm30llsdm4jic33"; depends=[Rcpp]; };
+  bsplinePsd = derive2 { name="bsplinePsd"; version="0.2.0"; sha256="0fxm53sdlxjrvwvlihar8iwzin7ajkzvnm3h3nbzh37lf00gz0sb"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.0"; sha256="1hpjrmsn66brf1hpwfmg55jbpwbhvkz7sbr160z1cgq3hdhqm7r8"; depends=[htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
   bssm = derive2 { name="bssm"; version="0.1.4"; sha256="0wrai7s5sdjykiz8c5qrlcscm1awfz9cjaggarrs83h9fcs3n38x"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
@@ -4737,6 +4758,7 @@ in with self; {
   cRegulome = derive2 { name="cRegulome"; version="0.1.0"; sha256="0yf5kx583k483rs3vw614qfv92k3c8gld8vsw16j1vlsbrasbiah"; depends=[DBI dplyr ggplot2 ggridges httr magrittr purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; };
   cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; };
   ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; };
+  caRamel = derive2 { name="caRamel"; version="1.0"; sha256="0al4yk77a4bh8rjdpl841bnnjvs0sjyxqswqwik1n6y0bfr8f7pl"; depends=[geometry]; };
   caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
   caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
   cablecuttr = derive2 { name="cablecuttr"; version="0.1.1"; sha256="1v3zhaxkp1h6lack2qk0v4zxh6fd0ymjnikw6bs7k540w2vrbs1g"; depends=[httr jsonlite]; };
@@ -4770,6 +4792,7 @@ in with self; {
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
   car = derive2 { name="car"; version="2.1-6"; sha256="14l4d9j87xnb0bz2wgqqbxnlnbcdfb5vx2fw6kdxj91kyrk6lhnj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
   carData = derive2 { name="carData"; version="3.0-0"; sha256="1ggz4py77bgwlpl6rsv7vlxj1kjs6c10dskizwwjps910r76pd79"; depends=[]; };
+  carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; };
   carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; };
   cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
@@ -4804,8 +4827,9 @@ in with self; {
   cattonum = derive2 { name="cattonum"; version="0.0.1"; sha256="04vayxycv9w5ssw69gifb1y15jkz294wia5s386wyz3bz0sf3fn6"; depends=[rlang tidyselect]; };
   causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
-  causaleffect = derive2 { name="causaleffect"; version="1.3.6"; sha256="1kk68qlps0r40f3v4lb7njzg81igjp10jfinncxnn7gwyx58px83"; depends=[ggm igraph XML]; };
+  causaleffect = derive2 { name="causaleffect"; version="1.3.7"; sha256="0j7k1g2s6akwbqrijbfkxsad94knjj5mz5lkwwwfr1bpxs719916"; depends=[ggm igraph XML]; };
   causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
+  causalweight = derive2 { name="causalweight"; version="0.1.0"; sha256="1hig92w18vsyfpv1kvgymk37ik7rw7ql80p886b3s6vwdz8z0r3j"; depends=[mvtnorm np]; };
   cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; };
   cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; };
   cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
@@ -4830,7 +4854,7 @@ in with self; {
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.7.0"; sha256="00yc3q28y20l2ppqxy6h53p9fvwhvpkc8m7csmp2lizqh787i2cc"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
-  cdfquantreg = derive2 { name="cdfquantreg"; version="1.1.3"; sha256="08l9kg4rclgh29r8cyk3d0619k4mkw2vj1phiyww4qr1dn5ssnda"; depends=[Formula MASS pracma]; };
+  cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.0"; sha256="1z9a2rivi1i56369hkz94azfhyqch8wph819lgrxlrr4mcpl6k2p"; depends=[Formula MASS pracma]; };
   cdlTools = derive2 { name="cdlTools"; version="0.11"; sha256="0jqr0j6hwqwx574659i3mfzf4hcmmxfd3x28d52dwgpwsv0r10gn"; depends=[raster RCurl rgdal XML]; };
   cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; };
   cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; };
@@ -4871,6 +4895,7 @@ in with self; {
   cghFLasso = derive2 { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
   cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; };
   cgmanalysis = derive2 { name="cgmanalysis"; version="1.3"; sha256="0fb93czybl9rpndvz3lykfiwksa154vdrmils8c8l688c62gyq55"; depends=[gdata pracma zoo]; };
+  chandwich = derive2 { name="chandwich"; version="1.0.0"; sha256="05x9mg33yl4d9kh5sc4lqi00hwnxdhfg2m0dkm5q0jynkhap7bmz"; depends=[numDeriv]; };
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
   changepoint_np = derive2 { name="changepoint.np"; version="0.0.2"; sha256="03i4l59h8cr6bizbqn288x9r85kvaz1dyhkv5fsj1189qpdi9m88"; depends=[changepoint zoo]; };
   changepointsHD = derive2 { name="changepointsHD"; version="0.3.0"; sha256="05zmypz2jz55m9avzg63dmp7fpcgi7jpc9vf2fv0kywcvf2wz5ym"; depends=[Rcpp RcppArmadillo]; };
@@ -4881,7 +4906,7 @@ in with self; {
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
   checkmate = derive2 { name="checkmate"; version="1.8.5"; sha256="1q6igk50lq4fp5d3imgcn1j063h3gsp214ra4nlf534hf4wjlkg9"; depends=[backports]; };
   checkpoint = derive2 { name="checkpoint"; version="0.4.3"; sha256="0r7v7ijyq92yd95ssxxbdlp5dv1sd09yvxr8c0yihf48kzw65s63"; depends=[]; };
-  checkr = derive2 { name="checkr"; version="0.0.2"; sha256="04gj2smibvkanglxv8vby4gwj9wfq44a8zclqvimp5hfb0ay12ny"; depends=[]; };
+  checkr = derive2 { name="checkr"; version="0.1.0"; sha256="01071y7jgvang5yi00304wr4p4040b8fc4ncfj6qfmk0bc97h51b"; depends=[]; };
   cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; };
   chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; };
   chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; };
@@ -4906,12 +4931,13 @@ in with self; {
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chron = derive2 { name="chron"; version="2.3-52"; sha256="185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4"; depends=[]; };
-  chunkR = derive2 { name="chunkR"; version="1.1.0"; sha256="1yq37dyc0k00w3579wcw314zdjbr9ybzb2ih8mpbznz4li2pa2br"; depends=[Rcpp]; };
+  chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; };
   chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; };
   ciTools = derive2 { name="ciTools"; version="0.3.0"; sha256="0mqrnln7iz6jm30nh1qb2457icaz3hcqmgqbj8m61z0sf6jj9pd7"; depends=[arm boot dplyr lme4 magrittr MASS tibble]; };
   cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; };
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
   cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
+  circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; };
   circlize = derive2 { name="circlize"; version="0.4.3"; sha256="0pg947gkryygikfbv6admx8gsg02b6g219j6a1sdnqij2908yxna"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
   cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; };
@@ -4942,7 +4968,7 @@ in with self; {
   cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; };
   cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; };
   clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; };
-  clespr = derive2 { name="clespr"; version="1.0.1"; sha256="0f1vcd4y2ixpwywp5mi9jvf6r1099ajqba9sbkq7rc6f0y32wcpj"; depends=[AER doParallel foreach magic MASS pbivnorm survival]; };
+  clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; };
   clhs = derive2 { name="clhs"; version="0.5-7"; sha256="0n7zy8wf78lka1l0zm42zxwi24bvavfy3irfqcnz5nslqkg61il2"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
   cli = derive2 { name="cli"; version="1.0.0"; sha256="07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg"; depends=[assertthat crayon]; };
   clickR = derive2 { name="clickR"; version="0.3.38"; sha256="1qlc4lz2y2ls5qx1rqiswl5qr5qqkn6l30cp5ikhzr3ffvwp3nym"; depends=[beeswarm boot brms lme4 lmerTest ReporteRs xtable]; };
@@ -4965,7 +4991,7 @@ in with self; {
   clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
   clogitLasso = derive2 { name="clogitLasso"; version="1.0.1"; sha256="1mm815w31n0jvbh2rwq15ja1mzvjaz1x846xq1949aj4pb692zrl"; depends=[foreach lassoshooting]; };
   clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
-  clordr = derive2 { name="clordr"; version="1.0.2"; sha256="1jpkspppwcsflr7pz45zd8vnpax1idmkvfcai63vqik4ig0snfaj"; depends=[MASS numDeriv pbivnorm]; };
+  clordr = derive2 { name="clordr"; version="1.2.0"; sha256="0i04wx3gablbhc8g6591pgb13hhj4gr9jbswv477x3s3rw30mv6s"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
@@ -5001,7 +5027,7 @@ in with self; {
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
-  cmm = derive2 { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; };
+  cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; };
   cmna = derive2 { name="cmna"; version="1.0.0"; sha256="1x4w47j39p2f2n4jxrp4r1vw6gvpqzkgr5h158s18z26zllpvrnr"; depends=[]; };
   cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; };
   cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
@@ -5017,6 +5043,7 @@ in with self; {
   coala = derive2 { name="coala"; version="0.5.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; };
+  cobalt = derive2 { name="cobalt"; version="3.2.1"; sha256="1ip8d2inr3369iq4bpx52fbvfwy31c0mzg1rpydj8x4m3jfh83fz"; depends=[ggplot2 ggstance]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
   cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; };
   cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; };
@@ -5047,7 +5074,8 @@ in with self; {
   collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.6"; sha256="1l02rk1lmm2ac9rr5p1633y1chc203cr9mhlc9s95bv12791i5zb"; depends=[data_tree htmlwidgets]; };
   collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; };
   collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; };
-  coloc = derive2 { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; };
+  colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
+  coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
   colorSpec = derive2 { name="colorSpec"; version="0.6-2"; sha256="153jps1l0wv0b726b0l7bhsg7g45jdfsralg6k8nvyij4yw1dqi1"; depends=[MASS]; };
   colordistance = derive2 { name="colordistance"; version="0.8.0"; sha256="0fqj8apgfvk021cs1m79nk9kx294zxbj55jqylcrg3hadxy4plkf"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; };
@@ -5067,7 +5095,7 @@ in with self; {
   colourvision = derive2 { name="colourvision"; version="2.0"; sha256="0gxhdyajrmnks1ivbnhxl37ivq4h3figp5kgk6g2wdn80i2b8k1a"; depends=[Matrix rgl]; };
   colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; };
   colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; };
-  comato = derive2 { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
+  comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
   combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
   combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; };
   comclim = derive2 { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
@@ -5077,7 +5105,7 @@ in with self; {
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
   commonmark = derive2 { name="commonmark"; version="1.4"; sha256="1vb8r9khpvcf0q7acv8rsplfjjwcll302bg5kp596cvn6aacypl6"; depends=[]; };
   commonsMath = derive2 { name="commonsMath"; version="1.1"; sha256="0v9jlk75ihh8yjhq5ybighvndp0hn1d6rqh78jkh4g6ylhbpvcw0"; depends=[]; };
-  comorbidity = derive2 { name="comorbidity"; version="0.0.3"; sha256="1j991wjavgalpwsjzb6bq2h2my1p7mvw8ziqka3kzr173plgmkq7"; depends=[checkmate]; };
+  comorbidity = derive2 { name="comorbidity"; version="0.1.0"; sha256="0j2znk4w4vr1swnqp2pldhzrg28sb13ykzan15l1c1p3yg8pp35w"; depends=[checkmate]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
@@ -5095,7 +5123,7 @@ in with self; {
   complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; };
   compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
   compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; };
-  compound_Cox = derive2 { name="compound.Cox"; version="3.7"; sha256="029r8v26ch8ps8d5pcg7y789sagsgm49xadwrcpjj87126hjh435"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.8"; sha256="0sskkcillpdxyibph4y35nhk67zmxylbql8igy5lq2r86wfsrp5a"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
   comtradr = derive2 { name="comtradr"; version="0.1.0"; sha256="0az61xsrwzr4g1s6g52vm9fivh985c6s06y3rb1c9ic0my385zhx"; depends=[httr jsonlite magrittr purrr]; };
   concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; };
@@ -5115,13 +5143,13 @@ in with self; {
   condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; };
   condvis = derive2 { name="condvis"; version="0.4-2"; sha256="0l515wpsmh7g4q4w29gb1gv5kafwzfhb8as0ml8vbbrh6xcgmz9q"; depends=[MASS]; };
   coneproj = derive2 { name="coneproj"; version="1.12"; sha256="1937sf7b9s2y421gf2srjjdpv2knxrr03xyq5vg5j77z73kh9s6d"; depends=[Rcpp RcppArmadillo]; };
+  conf = derive2 { name="conf"; version="1.0"; sha256="0skfmk1vz8ry52l811rxnk6a8hicajza8m5ycfg7p0xb8ssyj6gi"; depends=[]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
   config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; };
-  configr = derive2 { name="configr"; version="0.3.2"; sha256="114gdxpy167dljfsnm52w62nvgsi0v8nghjfvrc1r7fgg148v5cr"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
+  configr = derive2 { name="configr"; version="0.3.2.1"; sha256="184iafdsj0k8i4n877g00fsnqmdq7k4y1azwn4d18gq2l7kg3qn1"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
-  conformal = derive2 { name="conformal"; version="0.2"; sha256="13d8yv8l333n3m8kl2sdnd0m5b7gjixkqjlpfj312fk9nxvqdbcg"; depends=[caret e1071 ggplot2 randomForest]; };
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
   confreq = derive2 { name="confreq"; version="1.5.1"; sha256="0gy6d1kffb1w86ifldswb9krxyc2p646g9yjlfm1h243qlp52sfa"; depends=[gmp]; };
   congressbr = derive2 { name="congressbr"; version="0.1.1"; sha256="1kfpyrakbri9zqggcfy7flxyfpf85w5gqxi0p249qjw5khz8nkz5"; depends=[dplyr httr lubridate magrittr pscl purrr stringi stringr tibble tidyr xml2]; };
@@ -5148,7 +5176,7 @@ in with self; {
   cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; };
   coop = derive2 { name="coop"; version="0.6-1"; sha256="1hr78w7qlslpwnrz9mk6w4p5qa8sxhkzans5givy5hf9qkykn0dp"; depends=[]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
-  copBasic = derive2 { name="copBasic"; version="2.0.6"; sha256="13sy2zxndfgxsmzrsiv8pm7xih1wbr3gkzlqgzp2qwswqpp3kxl5"; depends=[lmomco randtoolbox]; };
+  copBasic = derive2 { name="copBasic"; version="2.0.7"; sha256="05fikcba2nmr7lphdc17nlrhxqyv8mw81q26fycwhagmahbsm2ag"; depends=[lmomco randtoolbox]; };
   copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
   cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; };
   coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; };
@@ -5182,7 +5210,7 @@ in with self; {
   corrr = derive2 { name="corrr"; version="0.2.1"; sha256="1d04nk92fjmk4kc5zipjqjhhmb1w97kid7l2jz5a8pkwiccn5byc"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr seriation tibble tidyr]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
-  cosa = derive2 { name="cosa"; version="1.0.0"; sha256="1hrqjz3wvq1i1j69n8gpxfm8rzxqwwkfr4gwby5qcnlnq0ip2by8"; depends=[nloptr]; };
+  cosa = derive2 { name="cosa"; version="1.1.0"; sha256="1fdyxc3c5wknxkjmz9xcyf4yri8nh0zkim1prn3xgblwab98b5sv"; depends=[nloptr]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
   cosinor2 = derive2 { name="cosinor2"; version="0.1.0"; sha256="0pxkkp8dxhzqp2v3pfzigh1ka7ardf168k5p41z289xgar9p33g0"; depends=[cosinor ggplot2 Hmisc matrixStats]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
@@ -5214,7 +5242,7 @@ in with self; {
   coxme = derive2 { name="coxme"; version="2.2-7"; sha256="0jbaw055whbbxwx6y0gggj5i9rlr787nyknwgqdf1dnzrfzm69v7"; depends=[bdsmatrix Matrix nlme survival]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
   coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
-  coxphf = derive2 { name="coxphf"; version="1.12"; sha256="0vsdpbpc18fm6dwiqjwclgimwng34xqzy2mqbcijs6p7h1j124a0"; depends=[survival]; };
+  coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; };
   coxphw = derive2 { name="coxphw"; version="4.0.0"; sha256="02xiwrvc3gbwwjcz9kwy2g91jrjpawch5r4pq6l4lyvl556w296l"; depends=[survival]; };
   coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
   coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
@@ -5228,7 +5256,8 @@ in with self; {
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; };
-  cpt = derive2 { name="cpt"; version="0.9"; sha256="03nvxkwwvqmzpphax4zfij6jvh26x4bsl3mn2xr4mbr7cjb2x12w"; depends=[MASS nnet randomForest]; };
+  cpt = derive2 { name="cpt"; version="1.0"; sha256="0cfjsni8m3sx2vh5cxiwqh50gl65nag5zp757jy75sx44rky63m8"; depends=[glmnet MASS nnet randomForest]; };
+  cptcity = derive2 { name="cptcity"; version="1.0.0"; sha256="0gvgjy8m5bcihkcxzdzvxxawpk74zvd185ds28vbwvdibx8kjvph"; depends=[]; };
   cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
   cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; };
@@ -5255,7 +5284,7 @@ in with self; {
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   crochet = derive2 { name="crochet"; version="2.0.1"; sha256="1il29hnnx3kwjvsnirvm5vxdd04x94qn4526411cw0syyqqlbnp8"; depends=[]; };
-  cronR = derive2 { name="cronR"; version="0.3.0"; sha256="0nyjgxgvasqv8g9cvkzii0jsr15x5i76waz5hzzsjar5mwq6vq8h"; depends=[digest]; };
+  cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
   cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
@@ -5275,11 +5304,11 @@ in with self; {
   crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; };
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
-  crul = derive2 { name="crul"; version="0.5.0"; sha256="096jwl1674h1vi0plmqjy9k8w0fqnqhkig3kxf3cc4g7kz3ih5j7"; depends=[curl httpcode mime R6 urltools]; };
+  crul = derive2 { name="crul"; version="0.5.2"; sha256="0sfjv8jrb5x85b4dicp7789xxa0g6y89sfd96war84yidmh2a6z0"; depends=[curl httpcode mime R6 urltools]; };
   crunch = derive2 { name="crunch"; version="1.20.0"; sha256="1hsya10ba6mb3xd1lvbn2d74g9glm0l98fbh130phq5wdnn8lpx9"; depends=[crayon curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; };
   cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; };
-  crypto = derive2 { name="crypto"; version="0.1.3"; sha256="0q5q2rx49185ckwr5czr4ia9j9060d1j6mz4bdvz3sl86qnllgsp"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest xml2]; };
+  crypto = derive2 { name="crypto"; version="0.1.4"; sha256="1b3i0f2ll6cj5z8xmws1g6c8zgwz1ip9qwgi205ncxc0nq9xlqlc"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
   csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; };
@@ -5306,7 +5335,7 @@ in with self; {
   ctv = derive2 { name="ctv"; version="0.8-4"; sha256="0yl20b1j8c11b1g0q6qv0wsaivxpikwslhky4lckbm3rwbn5vbb2"; depends=[]; };
   cubature = derive2 { name="cubature"; version="1.3-11"; sha256="06f6gsvbb732p80r6hxvzh4ik546icxfvx21dyh65ypmw3kgm64k"; depends=[Rcpp]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
-  cubing = derive2 { name="cubing"; version="1.0-1"; sha256="00vqhh2kif9phwxs26xnizsy6mhdaaa97wyizw80g9wyh9c2r7n9"; depends=[rgl]; };
+  cubing = derive2 { name="cubing"; version="1.0-2"; sha256="00fch9vgxcaasxgrz79x21wb54yspnw5ysdjcdfym4qjknh9m3b6"; depends=[rgl]; };
   cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
   cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
   cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
@@ -5370,7 +5399,7 @@ in with self; {
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
   dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
   data_table = derive2 { name="data.table"; version="1.10.4-3"; sha256="12caklgr19vy9wprdks6zh825vr1iw1cajgwcnbpyvmijqdlz2xs"; depends=[]; };
-  data_tree = derive2 { name="data.tree"; version="0.7.4"; sha256="0yyk5sc07i987k77advpsjk2kdnral9x85bsd8rrl0x7i2cjdbhf"; depends=[DiagrammeR R6 stringr]; };
+  data_tree = derive2 { name="data.tree"; version="0.7.5"; sha256="07mavj30pqgk831dw5nj0z0jri6fq8wx9a6nyx0q873if7q3j52w"; depends=[DiagrammeR R6 stringr]; };
   data_world = derive2 { name="data.world"; version="1.2.0"; sha256="0bw1yi5qwnm3fx8d7j2q9r9fyzf4c10z3m4yxs1srp3z77i8v6d9"; depends=[dwapi httr ini miniUI shiny stringi]; };
   data360r = derive2 { name="data360r"; version="1.0.1"; sha256="1g245zg70ch81zjmd1ng16lks38qr0a6m63y582w558mza7v148g"; depends=[curl data_table jsonlite reshape2]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.1"; sha256="06nba2yir2yz1189bsag9yavdf9hfmpswxdy92dlnbz9d27jjsic"; depends=[dplyr knitr markdown stringi]; };
@@ -5386,6 +5415,7 @@ in with self; {
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datafsm = derive2 { name="datafsm"; version="0.2.1"; sha256="16l6ssprsvnpzxlfnqj7r061x700704s5gdci5x9ixdjmglakmdd"; depends=[caret GA Rcpp]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
+  datamaps = derive2 { name="datamaps"; version="0.0.1"; sha256="1y44adffpwwfv905qmwx1kkmakh6vfyvrblgjjaqqssp6v597wrq"; depends=[htmlwidgets magrittr]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; };
   dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
@@ -5403,27 +5433,27 @@ in with self; {
   dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
   date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; };
   datetime = derive2 { name="datetime"; version="0.1.2"; sha256="0qbd1makidkbpr26wkxchnb8rpwzm4l42j4vipwwmfwv3gpslmjx"; depends=[]; };
-  datetimeutils = derive2 { name="datetimeutils"; version="0.2-7"; sha256="1ql44k6s0pskc7kg28aly9k7ncl58gzs80d9gpwyjdhrgimimcxk"; depends=[]; };
+  datetimeutils = derive2 { name="datetimeutils"; version="0.2-12"; sha256="023jxsih2zlfv9yldn68cbrdl7jw5rpbz4cc9y0z530bb1fs8d1k"; depends=[]; };
   datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; };
   dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; };
   dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; };
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
-  dbarts = derive2 { name="dbarts"; version="0.8-7"; sha256="0wmwg8g8xy83yv4wpdpas3jjs5jxx258wh9463q30a8hnr3izc0l"; depends=[]; };
+  dbarts = derive2 { name="dbarts"; version="0.9-1"; sha256="15z70wzkp88r5djq9y6ckj2yqkasbbz0zfx7mmc6w8an7j8flhdg"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
   dbhydroR = derive2 { name="dbhydroR"; version="0.2-4"; sha256="189yzc7nchl31203jadf6qs3w1d3s01ifn9y6403c11qm4y63fpf"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
   dbmss = derive2 { name="dbmss"; version="2.5-1"; sha256="1giwbzjgz2qiry9mmqyby1jxpdsxaifv1p227i9jyq9d46gs9qiy"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
-  dbplot = derive2 { name="dbplot"; version="0.2.0"; sha256="1yc75bqc0na44jrkmabbdvjhhcqz0cd09k1bgxh0wrg52h829ni5"; depends=[dplyr rlang]; };
+  dbplot = derive2 { name="dbplot"; version="0.2.1"; sha256="1ksjxvq8y5n5vwnpvxwbdmcywnld9fnkmq63ckcv7nbgbiyi5wgw"; depends=[dplyr ggplot2 rlang]; };
   dbplyr = derive2 { name="dbplyr"; version="1.2.1"; sha256="1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
   dbscan = derive2 { name="dbscan"; version="1.1-1"; sha256="09rh3x4g3xv5f1p8wbc847z8khj7v2r5vz9yf1lfdiy23q2w3xp1"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
   dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; };
   dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
   dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
-  dclone = derive2 { name="dclone"; version="2.1-3"; sha256="15jm5vsdpy4fzgrn1xgv4mjp02jblc7jba3d3375g5vfhzrm3zva"; depends=[coda Matrix rjags snow]; };
+  dclone = derive2 { name="dclone"; version="2.2-0"; sha256="05myb01ypnhf9wdk3i8s9xldn8ihvw7gf4ajqld886nvc306rfkv"; depends=[coda Matrix rjags]; };
   dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; };
   dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; };
   dcmodify = derive2 { name="dcmodify"; version="0.1.1"; sha256="1a909v6jhihwwmq7lzv2xazrkfa1553kbrjsbjfsh1qrqdiam3sr"; depends=[settings validate yaml]; };
@@ -5458,7 +5488,6 @@ in with self; {
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
   default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; };
   deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; };
-  defrostR = derive2 { name="defrostR"; version="1.1.0"; sha256="03asq36kd37592bjfb4mq0wfh2nkymrz1rxpq67ny1cq2159s83j"; depends=[XML]; };
   degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
   degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
   deisotoper = derive2 { name="deisotoper"; version="0.0.3"; sha256="1263cgwzgl3dnv1y9qhzjl4b7r69h59x38ggb7c8zn7g6qbdc0kc"; depends=[rJava]; };
@@ -5485,7 +5514,7 @@ in with self; {
   densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; };
   densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; };
   denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
-  depend_truncation = derive2 { name="depend.truncation"; version="2.8"; sha256="1157m2cpa35aymkwx98vkdlg33ngbsyszk8r30988w636nhs2gh6"; depends=[mvtnorm]; };
+  depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; };
   depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; depends=[abind circular rgl]; };
@@ -5545,14 +5574,14 @@ in with self; {
   diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
   diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
-  diceR = derive2 { name="diceR"; version="0.3.2"; sha256="1mhn34p0m0iaz9z4xy20z48nrnrh84i1bdhl48zmnwx165vbg392"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen largeVis magrittr mclust NMF progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
+  diceR = derive2 { name="diceR"; version="0.4.0"; sha256="1pxkwrbm69b97jia7nc18sprvxqxwwvvvzmxh147wgpqlmgqq47m"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen largeVis magrittr mclust NNLM pheatmap progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
   didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; };
   dief = derive2 { name="dief"; version="1.1"; sha256="0x3dwlfi130wmbsmm8vf66qxqn001b07yaiq6mp1s707dnl131mc"; depends=[flux fmsb ggplot2 plyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
   diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; };
-  difNLR = derive2 { name="difNLR"; version="1.1.1"; sha256="14sgya6s8i6r6861dcwwiv8scwvxgk780yka1vlzsqg9bsklcyi9"; depends=[CTT ggplot2 msm nnet reshape2]; };
+  difNLR = derive2 { name="difNLR"; version="1.2.1"; sha256="102b6hczmvm2pn0ld1pmqjc1pyvbgq1zk1whrgvai35c6qba40r2"; depends=[CTT ggplot2 msm nnet reshape2]; };
   difR = derive2 { name="difR"; version="4.7"; sha256="17i8l4z7dw8nfr4b5pc72l1qm7byjcflh58kasafx9kxyvfgz258"; depends=[lme4 ltm]; };
   difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; };
   diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
@@ -5561,6 +5590,7 @@ in with self; {
   diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; };
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
   diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
+  diffee = derive2 { name="diffee"; version="1.0.0"; sha256="0phkiq14qajif1nymfymwnhkdrlcx4xnk9mnyf5wgrkgywssgz21"; depends=[igraph]; };
   diffobj = derive2 { name="diffobj"; version="0.1.9"; sha256="1adqn472qbwrfb8m2iy3sfvj2n8g3d4h6xc3hqxpbv03yyfia2c2"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
@@ -5587,7 +5617,6 @@ in with self; {
   discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; };
   disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
   disclapmix = derive2 { name="disclapmix"; version="1.6.2"; sha256="01pn8hy3xbf1b1fbbsd4n2hv7gs97zalgq858xsrr4a0nqrvxmn5"; depends=[cluster disclap Rcpp]; };
-  disco = derive2 { name="disco"; version="0.5"; sha256="1rjylqmijc8yg20hkhqh24asxzs2g55dgbh4scp60nsf2lnw1pz8"; depends=[ggplot2 RColorBrewer tmod]; };
   discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; };
   discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
   discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; };
@@ -5637,16 +5666,17 @@ in with self; {
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
   dlmodeler = derive2 { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
   dlnm = derive2 { name="dlnm"; version="2.3.4"; sha256="08k9x29iakgnzf4zbj6bgv6i4812mhbgraxm468wvv8ia574dm1m"; depends=[mgcv nlme tsModel]; };
-  dlsem = derive2 { name="dlsem"; version="2.1"; sha256="17azc4b8lxy7bcsrpki17nbc4imyfzvq6fmvngw80xjxlc316agx"; depends=[graph gRbase Rgraphviz]; };
+  dlsem = derive2 { name="dlsem"; version="2.2"; sha256="05ph3zqh2300b1qm6awwixiyg33rjym1m3l943cvgc036axa7smk"; depends=[graph gRbase Rgraphviz]; };
   dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
-  dma = derive2 { name="dma"; version="1.3-0"; sha256="12gjrk0dp5w49wf0zkwc16vf8hd82822k88zb9fax3dklwm1dd3p"; depends=[MASS mnormt]; };
+  dma = derive2 { name="dma"; version="1.3-1"; sha256="0azask61cmkklly32nbpw9rq03v0g976i7shhvawxj20dh4h1jz9"; depends=[MASS mnormt]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
   dmm = derive2 { name="dmm"; version="2.1-3"; sha256="0hxd4k721imicnc97h319gxs6n4plyl9y9sr5hc7pwas543dm7k3"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
   dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; };
   dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
-  dnet = derive2 { name="dnet"; version="1.1.2"; sha256="0y31cj55ry3xv4p7hy3maynk6ds8kmmgr2fd5afqhlrjkfry7zan"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
+  dnet = derive2 { name="dnet"; version="1.1.3"; sha256="1av4kbcbhpj1ivz6ln26p80z5fd170971mrcy59zm67h6kdi56az"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   dng = derive2 { name="dng"; version="0.1.1"; sha256="04r06k6mmif7kbpham52dq2zv5rijjnsdc3sgxz6kbh5mqdn6jfq"; depends=[Rcpp]; };
+  dnr = derive2 { name="dnr"; version="0.3.2"; sha256="0f5xahd86x196mg7c9zrhxj7c8cg7mrnd4nzyr02xcym6cff6vqm"; depends=[arm ergm glmnet igraph network sna]; };
   doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; };
   doFuture = derive2 { name="doFuture"; version="0.6.0"; sha256="04pvs2h1ibdbl6cph30rvdn5vzj9afllvh8f0iy64pgy83vls790"; depends=[foreach future iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; };
@@ -5657,6 +5687,7 @@ in with self; {
   doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; };
   dobson = derive2 { name="dobson"; version="0.2"; sha256="1fyf4dyzpg6hqdvr8n4ncs4dny8mg23nxbd49jd3mrlajszzg0vp"; depends=[]; };
   docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; };
+  dockerfiler = derive2 { name="dockerfiler"; version="0.1.0"; sha256="16y70blrv9crmgrcnq6dk3bjk73ajlkxv72xj3qrmw78zjy5an19"; depends=[attempt glue R6]; };
   docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; };
   docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; };
   docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; };
@@ -5683,7 +5714,7 @@ in with self; {
   dplR = derive2 { name="dplR"; version="1.6.7"; sha256="0i4s4anklia0bnygqrkk35gnc972qfnvzr3sfzwz7jxghigw7k8l"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
   dplyr = derive2 { name="dplyr"; version="0.7.4"; sha256="1hm8ml7yaraag1ak6kvz2mxx6if568c759ix8a1n9d7va03wj7vv"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; };
-  dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.1.1"; sha256="1fbvfd02zp408knv1ryjs4nwg8zi5vbbpgn7gxqiyzwbfqizkkqy"; depends=[bit64 DBI dbplyr dplyr odbc]; };
+  dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.2.0"; sha256="1flhsl4c1hws2ccrf81y4lybdz9dsbmws9zdpiry9h98h3rlaxp8"; depends=[bit64 cli crayon DBI dbplyr dplyr odbc purrr rstudioapi tidyverse]; };
   dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
@@ -5721,7 +5752,7 @@ in with self; {
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="5.2.0"; sha256="0wabb6mhc0h73lpxjg29hdb9kpy7gdp6mddhdwcgc560v5skyqd8"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 rngtools RSpectra]; };
+  dtwclust = derive2 { name="dtwclust"; version="5.3.0"; sha256="0p6v7d7lp5fsbky5c1qcss2cxx4x5w0ass0ami15aijdb8154qyf"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
   dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
   dub = derive2 { name="dub"; version="0.1.0"; sha256="0sdk8sppjcfx2bsngpngm2446warsnipzzw4yz5z4jpickp52ay0"; depends=[]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
@@ -5732,7 +5763,7 @@ in with self; {
   dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
   dvmisc = derive2 { name="dvmisc"; version="1.1.2"; sha256="1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh"; depends=[MASS rbenchmark Rcpp]; };
   dvn = derive2 { name="dvn"; version="0.3.5"; sha256="04di2gpdacivvd9bi96w6145k280s8blavdhi1w3rw4c7sc3hag2"; depends=[RCurl XML]; };
-  dwapi = derive2 { name="dwapi"; version="0.1.2"; sha256="09crawhd0i94h6c091w1h72nay931xadhmiiy84x4pgvvj2nq6qq"; depends=[httr readr rjson xml2]; };
+  dwapi = derive2 { name="dwapi"; version="0.1.3"; sha256="149v1yjnrdbqjg7cpnanm1jv1dcpzqy264qk5dx8wvw9kdc5h3b8"; depends=[httr jsonlite readr rjson xml2]; };
   dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; };
   dygraphs = derive2 { name="dygraphs"; version="1.1.1.4"; sha256="0vwg9q7xrwxkm92d55ik9gdky42bj3jlh6fi4jzwyl5nfdswklb9"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
   dyn = derive2 { name="dyn"; version="0.2-9.3"; sha256="00h75kqfpr77jhppnpxvykbdcmsmsb2vl2527xzq10wkvm7gfpvv"; depends=[zoo]; };
@@ -5744,6 +5775,7 @@ in with self; {
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; };
   dynamichazard = derive2 { name="dynamichazard"; version="0.5.1"; sha256="11lx88g0rizwxa4rfmaz9b2g8p7nnzgiqz5b0gqsc4dvz92i74fg"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; };
+  dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
   dyncomp = derive2 { name="dyncomp"; version="0.0.1-5"; sha256="1626z5523s4igw55fw97lplfgg9mzf4np8imrarkligslvc5q8ip"; depends=[zoo]; };
   dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; };
@@ -5758,17 +5790,17 @@ in with self; {
   dynsurv = derive2 { name="dynsurv"; version="0.3-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
   e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; };
   eAnalytics = derive2 { name="eAnalytics"; version="0.1.3"; sha256="1lrkmfs2sq9p2n7g528jf6wxixqk08w468nckkij2mprhrccjjj6"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard]; };
-  eDMA = derive2 { name="eDMA"; version="1.4-0"; sha256="1nkbl6yywffb8q0x6ajymh1hpmkq038dc3a7xvw9szcjfrfbhw9v"; depends=[Rcpp RcppArmadillo xts zoo]; };
+  eDMA = derive2 { name="eDMA"; version="1.5-0"; sha256="111iphlcxfy891xwxma7h8qylazwxhx6srffid4i167kd1dibkak"; depends=[Rcpp RcppArmadillo xts zoo]; };
   eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; };
   eLNNpaired = derive2 { name="eLNNpaired"; version="0.2.3"; sha256="08nck2p5npyw264kgcqmgx5rx7c3h9v892f90xlcd1dnb7dqlan3"; depends=[Biobase globaltest GSEAlm iCheck samr]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
   ePCR = derive2 { name="ePCR"; version="0.9.9-4"; sha256="0lnkb4zffn62vbx8hh953z9zh0plj8l15cc1k3x936zblzgd226r"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; };
-  eRm = derive2 { name="eRm"; version="0.15-7"; sha256="0x8cqcwgn8znd9w9vkxcacf097rziyb511wzcfmhhadidiilk0x3"; depends=[lattice MASS Matrix]; };
+  eRm = derive2 { name="eRm"; version="0.16-0"; sha256="18shx4jjvymhzdab1qvlfqnmg49mwllyw3v46j9v19dy6h9l3n8m"; depends=[lattice MASS Matrix]; };
   eVenn = derive2 { name="eVenn"; version="2.4"; sha256="1qs5qsrc89kb6w6xqc8jdxkih6h48zprvavffdqhxq4ab4i1nvbf"; depends=[]; };
   eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
   earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; };
   earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
-  earth = derive2 { name="earth"; version="4.6.0"; sha256="1inpspp2giq24ypm60k297s6lfm4kxfwqrx2ycxyyl4syl1sqw4b"; depends=[plotmo TeachingDemos]; };
+  earth = derive2 { name="earth"; version="4.6.1"; sha256="0hrbpa0qvhsdrdi06p0kdl2mw0n84sxcrqk96f6rh7cb6j8bm9bg"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
   easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; };
   easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; };
@@ -5808,7 +5840,7 @@ in with self; {
   ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; };
   ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
   ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; };
-  ecospace = derive2 { name="ecospace"; version="1.2.3"; sha256="1zfd1m4snpy17i751i2fgxdqxmz6xv5aa66c24wnvd8cq4i8qkm0"; depends=[FD]; };
+  ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; };
   ecospat = derive2 { name="ecospat"; version="2.2.0"; sha256="0awzhzl90j72jxp7qk5q5vqmgyccbkw2rbw0jrhjvlwkr5q9gyvx"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; };
   ecotox = derive2 { name="ecotox"; version="1.3.0"; sha256="05k3hdz25kw28222bnlk814b2rlwq2f6b5kdqxqls9wdfvdknij3"; depends=[ggplot2]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
@@ -5823,7 +5855,7 @@ in with self; {
   edeaR = derive2 { name="edeaR"; version="0.7.2"; sha256="0k043g2qrm58l7dvb2ylpg76wcznkr4p4vp2p3b4hhg1hzq8zccf"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; };
   edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; };
   edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; };
-  edfReader = derive2 { name="edfReader"; version="1.1.2"; sha256="02cclg549z6samhkraaknsmqvk0yxxcf4s9qpbcxb2cl9fcj1cjr"; depends=[]; };
+  edfReader = derive2 { name="edfReader"; version="1.2.0"; sha256="0r4918swpfddz246kkvy10a07s178zmwp7m4ydxvi8di6iga76hk"; depends=[]; };
   edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
   edgar = derive2 { name="edgar"; version="1.0.9"; sha256="1jh0aaizirj4i4kc6gq9kkpa1xdqxbjhj7fys8ap1xxxx6nfpcnf"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; };
   edgarWebR = derive2 { name="edgarWebR"; version="0.3.1"; sha256="0gakrgag7rm18njhrs7bq99mv7yn7yxis9yscz88va16dqdp17l8"; depends=[httr xml2]; };
@@ -5832,7 +5864,7 @@ in with self; {
   edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; };
   editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; };
   editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
-  edpclient = derive2 { name="edpclient"; version="0.2.0"; sha256="090yp94j3mm7g6lyc9vs8l1zhimnh9cizf55gw3g7ffqma2pl1rs"; depends=[httr ini jsonlite plyr]; };
+  edpclient = derive2 { name="edpclient"; version="0.3.1"; sha256="0czvwyp7z27cydsjwf3xrk88g62vsllgfcwrq13ylgki7zw5gclj"; depends=[httr ini jsonlite plyr]; };
   edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; };
   edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; };
   educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; };
@@ -5864,6 +5896,7 @@ in with self; {
   eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
   eive = derive2 { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; };
   eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
+  eixport = derive2 { name="eixport"; version="0.3.0"; sha256="1ykv5jqri4zkshawck3lfl6jrzw24k27gwhi02rckzbrg2nb3909"; depends=[ncdf4 raster sf sp]; };
   elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; };
   elastic = derive2 { name="elastic"; version="0.8.0"; sha256="17aqf0a3spwh8k7s3kgnccbgad3sr3w63if96piygjz0lxgc7kzs"; depends=[curl httr jsonlite]; };
   elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
@@ -5871,7 +5904,8 @@ in with self; {
   elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.1"; sha256="1x20w13hkpnf1kjvml99a9q1w162f6703ccqvcqy6z0vamcvylw8"; depends=[httr jsonlite]; };
   elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
-  elect = derive2 { name="elect"; version="1.1"; sha256="1lr4c08r3pc3qy7g9csppfp0m79z9b0wvk6lf5dyp1yaf9k6phk0"; depends=[msm nnet]; };
+  elect = derive2 { name="elect"; version="1.1.1"; sha256="025h69qsify0v3bsr9082wjdkglmarkjaqqkwr8j826466617n1v"; depends=[msm nnet]; };
+  elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; };
   electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; };
   electoral = derive2 { name="electoral"; version="0.1.0"; sha256="0y4kkxm8vmj4gsan6qyhg28b0b6hgl4fghslk21d8w5w6syln4kh"; depends=[dplyr ineq tibble]; };
   elementR = derive2 { name="elementR"; version="1.3.5"; sha256="1b9f601r0gdcyclr23rf33skbbvh7lnr4nlmgcwxixkfsg8mabs9"; depends=[abind colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
@@ -5893,7 +5927,7 @@ in with self; {
   emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
-  emmeans = derive2 { name="emmeans"; version="1.1"; sha256="191kxk3va7xaxf4gad3ndxck449nci45n3jxfbw68m0kwk0h97qi"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.1.2"; sha256="12gkg2r7g1n481mvry354az5gzqji7rsl43jrmvq504sqyg4z41n"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
   emojifont = derive2 { name="emojifont"; version="0.5.1"; sha256="0i4id9631ah5vzkzh6zfxgk55b2ppnbgabp1w2ivy29i0nji9wk4"; depends=[ggplot2 proto showtext sysfonts]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
@@ -5905,7 +5939,7 @@ in with self; {
   emuR = derive2 { name="emuR"; version="0.2.3"; sha256="04nxrg95qgwc5ss139bgjcsxkarwzkxy132dz0vk3sq7sddnagws"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RCurl RSQLite stringr uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
   enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; };
-  enc = derive2 { name="enc"; version="0.1"; sha256="03l8zhamq243h9ghl6nwvvxigzbz4xzkbd5sqafx1rlg69ds67f0"; depends=[]; };
+  enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; };
   encode = derive2 { name="encode"; version="0.3.3"; sha256="01jippva8gfbg3bq6g1sz8mpmglywg4mkb4k44bfspiv60bmv98f"; depends=[]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
@@ -5929,7 +5963,7 @@ in with self; {
   entropart = derive2 { name="entropart"; version="1.5-3"; sha256="02jzcqb7sqg9fcf2vi4myki9mgdsx0jwyf535zzh124h1bwz3f3y"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; };
-  enveomics_R = derive2 { name="enveomics.R"; version="1.1.7"; sha256="1mcq37i8k4s15909dln8hvc4wkjwbbjx1054grm8174vl4mhpqvq"; depends=[fitdistrplus investr modeest sn]; };
+  enveomics_R = derive2 { name="enveomics.R"; version="1.2.0"; sha256="0bbm16k2i9lwm662hsglv3a5mf367bgxh25c87cvvfxafrbd67wj"; depends=[fitdistrplus investr modeest sn]; };
   enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; };
   enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
@@ -5954,7 +5988,7 @@ in with self; {
   epitab = derive2 { name="epitab"; version="0.2.1"; sha256="0q8fxxx7ddzaj8dxxlsh1a2gxf6byw5041mr7abac9yjjga2kz97"; depends=[kableExtra knitr MASS survival xml2]; };
   epitable = derive2 { name="epitable"; version="0.1.2"; sha256="1g0ab5bah7v52mzsyfxdv8azmpz66pipbc15q3vpvvhl3gjhsaik"; depends=[broom dplyr htmlTable magrittr purrr readr rlang stringr survival tidyr tidyverse]; };
   epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; };
-  epitrix = derive2 { name="epitrix"; version="0.1.1"; sha256="1qskgwfh5l3v5pysbs1na0ahfc3qklls8fg9fp0yc0rizym6avhr"; depends=[digest distcrete stringi]; };
+  epitrix = derive2 { name="epitrix"; version="0.1.2"; sha256="1fnmcpjbbk645s7q2jcccjv0q20z8hlzr8sl0jh6d00jrgk8qif4"; depends=[digest distcrete stringi]; };
   eply = derive2 { name="eply"; version="0.1.0"; sha256="18q40n06gbqg5cs0jknlxk5x0pwcbjnfb27ysmbf76s826qdc8gh"; depends=[magrittr]; };
   epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
@@ -5992,7 +6026,7 @@ in with self; {
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
   esmprep = derive2 { name="esmprep"; version="0.1.3"; sha256="0s5ij63v3v9hx1xnl8ygbnxbgik65yd8xn3irpbvc41mp9spgcdz"; depends=[lubridate]; };
   esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; };
-  ess = derive2 { name="ess"; version="0.0.1"; sha256="1696rps3abznfb1bvyp1pymw0p48f13lw9wfqdiy049wh4kqm96l"; depends=[haven httr stringr XML xml2]; };
+  ess = derive2 { name="ess"; version="0.1.1"; sha256="1i94sfg8r9mnzcmyddq3zb56gwkgqdclyx90a5plpyy5insk13d7"; depends=[haven httr rvest stringr tibble xml2]; };
   essHist = derive2 { name="essHist"; version="1.0.1"; sha256="0xnf5cxc7x3chs508am9qhnavz89fim10ffkn8mp1b29jdw88aax"; depends=[Rcpp]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; };
@@ -6026,6 +6060,7 @@ in with self; {
   eventdataR = derive2 { name="eventdataR"; version="0.1.2"; sha256="0f0w5cir3hc01ag9l69y27cfp6bgh1ikk4n99z7pb16373ficjjw"; depends=[]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
   eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; };
+  evidence = derive2 { name="evidence"; version="0.8.8"; sha256="1bfdwl41yqvhc3jg0xddwaw7h0s7qa4xfz2i94jh6wa247r51gwf"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
   evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; };
   evir = derive2 { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
   evmix = derive2 { name="evmix"; version="2.9"; sha256="1w1mm858515hnjpq2yjj0x05skyprhnvbpyif4mdcm24blyb81di"; depends=[gsl MASS SparseM]; };
@@ -6037,7 +6072,7 @@ in with self; {
   evtree = derive2 { name="evtree"; version="1.0-6"; sha256="0nvk78haghvp6vw6936di0bd5gfv603nxzgw3i647i68291wav0f"; depends=[partykit]; };
   ewoc = derive2 { name="ewoc"; version="0.2.0"; sha256="0kanx14fhcbqz6gpyj7628vgy9fwz3ji5mkd4107b8pgpz2hkg00"; depends=[coda doParallel foreach Formula ggplot2 rjags]; };
   exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; };
-  exact2x2 = derive2 { name="exact2x2"; version="1.5.2"; sha256="12m3kaxdrf4bsw7lrylk15nimhy4sgmjbnlqm684y2kyvii9yrg0"; depends=[exactci ssanv]; };
+  exact2x2 = derive2 { name="exact2x2"; version="1.6.2"; sha256="172g6ahgd7j42bjidp6svjl70ws3bz58vb8vxgnalii6awcizkcm"; depends=[exactci ssanv]; };
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-29"; sha256="0sj4bf0sab2rsgh967i5jl7ml2l1niydqmyn7c6ybai1gavsdpi1"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
@@ -6050,7 +6085,7 @@ in with self; {
   exifr = derive2 { name="exifr"; version="0.2.1"; sha256="0969ip7vwhs3r9zwy5l1gqg886yl4gfw8ss2frnq9nmqpn1ib1v2"; depends=[curl dplyr jsonlite purrr tibble]; };
   exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; };
   expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; };
-  expands = derive2 { name="expands"; version="2.0.0"; sha256="1ai269sic10hzw70whwv477yfgx5nhz4m06dfg373jp6i7vi5p9x"; depends=[ape flexmix matlab moments rJava]; };
+  expands = derive2 { name="expands"; version="2.1.0"; sha256="0870jbjk2yzddvs57fdnl4psy55r6rjdbs7w7jc7s3vrzdsziwxa"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
   experiment = derive2 { name="experiment"; version="1.1-2"; sha256="1wswfxfk3b5gvdxb6i3mzx66i1qszvb9alfwhv95y0dr5q6vss1w"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
   expint = derive2 { name="expint"; version="0.1-4"; sha256="17vp7znbxlf5zb944snmnml2w42avj9k70fisb8az047i3kdbvfh"; depends=[]; };
@@ -6122,7 +6157,7 @@ in with self; {
   facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; };
   factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
   factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; };
-  factorMerger = derive2 { name="factorMerger"; version="0.3.2"; sha256="1drrzrazay0w42ls9r2bsbygmyah0hdpmlap8zmsjqnbl0xp6sq6"; depends=[agricolae colorRamps dplyr ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
+  factorMerger = derive2 { name="factorMerger"; version="0.3.5"; sha256="0j5bjn8jmmdxr88aiw3i46frphkn4s5a54iqz6hcqq70cgg91cj4"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
   factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
   factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
@@ -6149,14 +6184,14 @@ in with self; {
   fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
   fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
-  fastDummies = derive2 { name="fastDummies"; version="1.0.0"; sha256="05jkgjd4aavy7631xczqvag51afyvr80ki1w6caznx5fc4z53wfb"; depends=[data_table]; };
+  fastDummies = derive2 { name="fastDummies"; version="1.1.0"; sha256="0ns1279sxfiv5ll4faag36ldc5v40l48li36kqr1bb09s3sx9p9w"; depends=[data_table tibble]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
   fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
   fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; };
   fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; };
   fastLink = derive2 { name="fastLink"; version="0.3.1"; sha256="0d77z88vv8gw1hp3cpnx481yn7p5y4nq3qzsv63bifad0msnqixy"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
-  fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; };
+  fastM = derive2 { name="fastM"; version="0.0-3"; sha256="1gyrkci6iv7j4aymy2qlwjshmigiff5x7kqjsh1yjzd43jg9ij86"; depends=[Rcpp RcppArmadillo]; };
   fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; };
   fastR2 = derive2 { name="fastR2"; version="0.2.0"; sha256="1xwa4v0j2n0qxn1prhc9x0sz53fhsfbg2m1a6kfdp7cpvvk46pw5"; depends=[dplyr ggformula ggplot2 lattice magrittr maxLik miscTools mosaic numDeriv]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
@@ -6175,7 +6210,7 @@ in with self; {
   fastrtext = derive2 { name="fastrtext"; version="0.2.5"; sha256="0zbd2sxzarxic90d2pkbn7fak5gyb81b180m91f784smb3sx1p1j"; depends=[assertthat Rcpp]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
   fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.2"; sha256="1xqr4azc5gsr7kcm8qzwjpjy72w1b111i61wbm35vns9r38a6cxz"; depends=[kinship2 multgee]; };
-  fauxpas = derive2 { name="fauxpas"; version="0.1.0"; sha256="1mi19zrgkx25g8j1f948n0ps27dn0rr2jqnhf15w73lpsjbwvi54"; depends=[httpcode R6 whisker]; };
+  fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; };
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
   fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
   fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
@@ -6194,7 +6229,7 @@ in with self; {
   fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; };
   fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; };
   fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
-  fdapace = derive2 { name="fdapace"; version="0.3.0"; sha256="1r4s20spsiags7z8hyvbvi9gxjxs4v8hfnrqya872shagk9iadyl"; depends=[Hmisc Matrix numDeriv pracma Rcpp RcppEigen]; };
+  fdapace = derive2 { name="fdapace"; version="0.4.0"; sha256="09qwl1bkcrfaxk0938v0ddd8aiyf0vi6619rpsg7f82rbc5i73mp"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; };
   fdasrvf = derive2 { name="fdasrvf"; version="1.8.3"; sha256="1lqyadg17ddd3vksbaxc7bpwvk0afsd59rfg0n5wrgvhbd473s0y"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat viridisLite]; };
   fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
   fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; };
@@ -6208,6 +6243,7 @@ in with self; {
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
   features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
   featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; };
+  febr = derive2 { name="febr"; version="1.0-0"; sha256="0c0kgj31n2z2qqbga9waqrrm6xxksi27c6riyp1c57z4wjais860"; depends=[cellranger dplyr glue googlesheets knitr pedometrics readr sp stringr xlsx]; };
   fecR = derive2 { name="fecR"; version="0.0.2"; sha256="1p4166cxajapm158aqbz9p7m8c8dqga1infl6y6wazjnayaib3cb"; depends=[lubridate plyr]; };
   fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; };
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
@@ -6234,17 +6270,18 @@ in with self; {
   filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; };
   filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
   filelock = derive2 { name="filelock"; version="1.0.1"; sha256="11mmq296zg62gnxjk7dyr866kihihmsjpfg6bcc7hv6ivh4812nn"; depends=[]; };
-  filematrix = derive2 { name="filematrix"; version="1.2"; sha256="1n8gy1fh0af3b43y7c1139lxyjn75fi2pdsn3c5mm4iscfmarl0r"; depends=[]; };
+  filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; };
   filenamer = derive2 { name="filenamer"; version="0.2.2"; sha256="0289qpy4891fb71fa4bhc8wp4g7n1sw1kis5k5irdyyzmsa9dfhn"; depends=[]; };
   fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
-  filesstrings = derive2 { name="filesstrings"; version="2.0.4"; sha256="14qx9jiqg7vs340ss4vlg5jgald7pl111bnvv8279bdgjilrd4yf"; depends=[checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; };
+  filesstrings = derive2 { name="filesstrings"; version="2.1.0"; sha256="1ik6m0ks6k1fhmpd3fk9z4mav3f8hs7si84vjcg8jk37xxqhfnd8"; depends=[checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; };
   filling = derive2 { name="filling"; version="0.1.0"; sha256="0avlfl06nd8wn76ydii09ng2fqp92d4n9v2y5vg16m3my58l0srd"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
   financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
   finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; };
   findR = derive2 { name="findR"; version="0.2.0"; sha256="03xkp8akjaciv2cl1przzz56nc3ma8l7pr4k0c3w2y0sivkmawdk"; depends=[pdftools]; };
   findpython = derive2 { name="findpython"; version="1.0.3"; sha256="1y08jk2ffmkf9zpwiz2xymjhfwqvls9vzsnq62v278ghw9d571jl"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
+  fingerPro = derive2 { name="fingerPro"; version="1.0"; sha256="17r23x8cdllr8slk56dsmrwc4ns69b3cqy59mxxbsjnhjl3di6x8"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL reshape rgl scales]; };
   fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; };
   fingertipsR = derive2 { name="fingertipsR"; version="0.1.5"; sha256="0g1r2mrivnfv7icba1y9lx5h2a3swmd41ry2064n82l05iaw9wsp"; depends=[dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
@@ -6258,13 +6295,14 @@ in with self; {
   fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; };
   fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
   fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
+  fitODBOD = derive2 { name="fitODBOD"; version="1.1.0"; sha256="15ylldlq12mrw06pzww54hsl8nb9krs5w1cgh037km9sndsswvji"; depends=[hypergeo]; };
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
   fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; };
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
   fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-9"; sha256="18x9454g598d54763k3hvi33iszifk7sxvhd1zg5r8z1vpixx3z6"; depends=[MASS survival]; };
   fitplc = derive2 { name="fitplc"; version="1.1-7"; sha256="1dffgqsml6cj6ayqdpr0330kj8v57jwi3pgchb8v98rainygsyfw"; depends=[car nlme]; };
   fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; };
-  fitur = derive2 { name="fitur"; version="0.5.20"; sha256="1iv8vzbhjlv72rcby0n2615bi8jn1wykwlf7n0i85wqaw04di4lr"; depends=[actuar e1071 fitdistrplus ggplot2]; };
+  fitur = derive2 { name="fitur"; version="0.5.25"; sha256="0f33c4mg0257s9c0qldryihaq8p3y07j2nwghjpqhi3rv4mrg2xf"; depends=[actuar e1071 fitdistrplus ggplot2]; };
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
@@ -6299,9 +6337,11 @@ in with self; {
   flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; };
   flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
+  fluxweb = derive2 { name="fluxweb"; version="0.1.0"; sha256="1fwxqm8pn9h0bl1cpvz9rx56zsvxz22la5bj8yrrkbg3m8jdzgvi"; depends=[]; };
   fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
+  fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.0"; sha256="15n2vjfriicg3mijzkz55w54xyq0h8zjchhlgdxsycysqv59lxag"; depends=[geometry MASS mclust mvtnorm]; };
   fmri = derive2 { name="fmri"; version="1.7-2"; sha256="1ifp0fkmr0bj5vkg9vh0lk74f04fk0zc90vknmjmxd2hbdb5kh4r"; depends=[awsMethods metafor nlme]; };
   fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; };
   fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; };
@@ -6309,7 +6349,7 @@ in with self; {
   fmt = derive2 { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; };
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
-  foghorn = derive2 { name="foghorn"; version="1.0.0"; sha256="0agnryzh3clcb0mz1nx6f9shkl6cx98v7mmbkj6mpk3xxilxa87n"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
+  foghorn = derive2 { name="foghorn"; version="1.0.1"; sha256="14g82mvh7ylqdms5si3xna1zy5jfxjksv5v2ijikjz40iddxmh5s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
   fold = derive2 { name="fold"; version="0.2.5"; sha256="1h7vx8saq4mbmylh1zgldm8n17i8waq8fgr5d4q68553xmazws41"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec tidyr]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
   fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
@@ -6320,6 +6360,7 @@ in with self; {
   foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
   forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
   forcats = derive2 { name="forcats"; version="0.3.0"; sha256="0mxn1hng43zdjh1v8shd80hrszrqahcpaqxs1s1sif0qxh84d0cm"; depends=[magrittr rlang tibble]; };
+  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.2"; sha256="1wr99jq8a0cbc7n5sdzr0gwnxsv8sjqy1x1lrazxswyj49xc06i4"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
   foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
   forecast = derive2 { name="forecast"; version="8.2"; sha256="04mqx1szm22lhiqzncm8ad0kyqhv1y4d6v02gn70d78kxmjangzb"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
@@ -6334,9 +6375,10 @@ in with self; {
   forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; };
   forestmodel = derive2 { name="forestmodel"; version="0.4.3"; sha256="1v1m8dvird2r1jqig492msqpp9sb4s79bhgnrs9y2c0ba46jzykh"; depends=[broom dplyr ggplot2 lazyeval]; };
   forestplot = derive2 { name="forestplot"; version="1.7.2"; sha256="1cqk0fwpbn4an6xn28kpvqmcp3mgv8isg8dy755sv5fkqzzjz1dg"; depends=[checkmate magrittr]; };
+  forestr = derive2 { name="forestr"; version="1.0.1"; sha256="0m26x7ngl89ngk1qhg50npmwli2npmjs9pfb9rg5hmx4fzr8k63i"; depends=[dplyr ggplot2 plyr]; };
   formatR = derive2 { name="formatR"; version="1.5"; sha256="19sd23vgs4ac0fwlw40j3676k6mramb0ajlq8hdw23kjwdx1jk47"; depends=[]; };
   formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; };
-  formula_tools = derive2 { name="formula.tools"; version="1.6.8"; sha256="10j7cgzdfkpqnxy9jpw5yd1bwrz55yi8b1zn144wwqb779l2c5yn"; depends=[operator_tools]; };
+  formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; };
   formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
@@ -6352,7 +6394,7 @@ in with self; {
   fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
   fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; };
-  fpp2 = derive2 { name="fpp2"; version="2.1"; sha256="1plnp946r48f058g3i31865jmlxh6xn4yfbwwdfiqqxvsk7jz66l"; depends=[expsmooth fma forecast ggplot2]; };
+  fpp2 = derive2 { name="fpp2"; version="2.2"; sha256="1mjd8mk169k47mb3cjgd72zgjivrh4kr1yclxxxdds3bm1jh2x8l"; depends=[expsmooth fma forecast ggplot2]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
@@ -6388,7 +6430,7 @@ in with self; {
   frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
   fs = derive2 { name="fs"; version="1.1.0"; sha256="1rcpji6qygjm75y51gb6x0vg0fjnvkl3x734d6dgd50xal59blb9"; depends=[Rcpp]; };
-  fscaret = derive2 { name="fscaret"; version="0.9.4.2"; sha256="08lrkxkfraw67dhcpg53dg1w7lpxzpqhz0l71vpn21xlk8iqgjw8"; depends=[caret gsubfn hmeasure]; };
+  fscaret = derive2 { name="fscaret"; version="0.9.4.3"; sha256="1miqg7rd3q11aksbjf0nswwnxb7c2p2f0b85nmnwm11snbf1gg8s"; depends=[caret gsubfn hmeasure]; };
   fsdaR = derive2 { name="fsdaR"; version="0.2-21"; sha256="121khfqy1ixqp86cl3cngc40zxjpd4nm5k0lk558nxcfgyyzvx8y"; depends=[rJava robustbase]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
   fslr = derive2 { name="fslr"; version="2.17.3"; sha256="1g7z1jsj89kqyclb3qdc7c6dgn18jqjmrxpxi62llkixhqg21yha"; depends=[matrixStats neurobase oro_nifti R_utils]; };
@@ -6405,7 +6447,7 @@ in with self; {
   fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; };
   fulltext = derive2 { name="fulltext"; version="1.0.1"; sha256="08pwasz1rpnnq81mvaldjiqv79wbvw5ma89skk95h0k2pbahblka"; depends=[aRxiv crminer crul data_table hoardr httr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble whisker xml2]; };
   fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
-  funData = derive2 { name="funData"; version="1.1"; sha256="0qr3rwa4z6173px9wqb17wcdfsnjgfqvfwwpzi8sldgmvq3l7dfg"; depends=[abind fields foreach]; };
+  funData = derive2 { name="funData"; version="1.2"; sha256="0y3ar26d6hxc4bg263qjqfb92ivhkphzizhz91wrzbfxha9dcrzz"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
   funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
   funModeling = derive2 { name="funModeling"; version="1.6.7"; sha256="0blanw0aw7qvcs6a8ryaqvi322gaz65g6flijkbssf681im9pmjr"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
@@ -6416,7 +6458,7 @@ in with self; {
   funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
   fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
-  funrar = derive2 { name="funrar"; version="1.2.1"; sha256="0zhrn0s75p4fnjwn2779avhlzg5y3in2il2s1qaaiq3mj368vpmn"; depends=[cluster dplyr]; };
+  funrar = derive2 { name="funrar"; version="1.2.2"; sha256="179kxhwkd431d2n917mzjnr5qvh09f0hdm2c78lww4ijb54dhn0l"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="5.0"; sha256="0xq0n3939rsrz7dna4d3d7mrpxad2xswnblsc4a88nbq6cmx5c70"; depends=[dbscan Jmisc Kendall]; };
   furniture = derive2 { name="furniture"; version="1.7.3"; sha256="1bayp2cfd3vacy83jf9x5l2kp4dr2kvfx9zvmw7z2z03lfmjj841"; depends=[knitr]; };
@@ -6438,8 +6480,8 @@ in with self; {
   fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
   fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; };
   fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.5"; sha256="1ifhvdzn0rs8gxqmpz8w1prxg3pxs5jqx5lh0r4i5rai49qjy3sb"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; };
-  fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.3"; sha256="16l2vwx5yxwbm7lhb4a1ypgx8kl2rrdc02qkh59lblhzya1jiid8"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
-  fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.2"; sha256="08pgyyihc1m4myl10l07vw45lisw36aaypyh5fv9zzm3lw6w6w36"; depends=[R6 reticulate]; };
+  fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.4"; sha256="06r103hshc6xcjllv5qfiw3i1ddz4c8svy0i4j0avnffaarlc2wa"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
+  fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; };
   fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
   fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; };
@@ -6468,13 +6510,13 @@ in with self; {
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-7"; sha256="02jrv5x7s3jm2ajpdvgsp4zkn65gjy96rvgdxhf9smp1kb6llzg0"; depends=[digest]; };
   gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; };
   gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-5"; sha256="1g0p7bl76rkkrixzw4b1s99gyvi8b5a4vbnsj2wmy7y9grbzndkm"; depends=[digest gWidgets2 memoise]; };
-  gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-85"; sha256="0qxfpajs7a5bv057x743ha8gpvgkg6qxpjdayr45264i64ygfwn0"; depends=[cairoDevice gWidgets RGtk2]; };
+  gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-86"; sha256="0b1xqffbzxlaaaqf1vzfl0a7b6wnnslsp8v5fbxblv7w951rsc4m"; depends=[cairoDevice gWidgets RGtk2]; };
   gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
   gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
   gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; };
   gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; };
   galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; };
-  gam = derive2 { name="gam"; version="1.14-4"; sha256="13ma6zkqf1xlyrjlp228b2kq6pgh3fg9a7xmy3r3p0y40zvxfrba"; depends=[foreach]; };
+  gam = derive2 { name="gam"; version="1.15"; sha256="1w6icadyfyqlkz5qijwifa3z96d460m88k8b2iaqj0cf6agmydhy"; depends=[foreach]; };
   gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
   gamRR = derive2 { name="gamRR"; version="0.3.0"; sha256="07zgh6hxkqxrw5da1pbscl8z8hzbgc5ipkzmpimimxa0i9g04c4h"; depends=[boot mgcv]; };
   gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
@@ -6527,7 +6569,7 @@ in with self; {
   gcKrig = derive2 { name="gcKrig"; version="1.1.1"; sha256="0bfxwi3ahhgyn1mh00b27iwz3cgabz74r00q4bhl45wjps4vngc3"; depends=[Rcpp RcppArmadillo]; };
   gcbd = derive2 { name="gcbd"; version="0.2.6"; sha256="1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia"; depends=[DBI lattice Matrix plyr reshape RSQLite]; };
   gcdnet = derive2 { name="gcdnet"; version="1.0.5"; sha256="159dl8v1n7s9wnfrjb6f0b3ssblkqgbfzs15vjxhc8xkz0jp9z1c"; depends=[Matrix]; };
-  gcerisk = derive2 { name="gcerisk"; version="17.10.17"; sha256="0l5yasy7bqmcah0fb3j8nafsb79f2s3wdb7jill9mwns00icb6sl"; depends=[cmprsk ggplot2 survival]; };
+  gcerisk = derive2 { name="gcerisk"; version="18.02.22"; sha256="1wy9l4s17ji5xj1cxjnb59qz3242yjs4zp76fy3rg1m0k7ib52vg"; depends=[cmprsk ggplot2 survival]; };
   gcite = derive2 { name="gcite"; version="0.9.2"; sha256="1xwnf8hsakzqg5nm5c14zw239scd2dl9rfd02mj5xp6548qwxrz9"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; };
   gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
   gcmr = derive2 { name="gcmr"; version="1.0.0"; sha256="13xja7rh2wkmi2j7yxrkj99sl96mlcgkp3v5aagnz140jx3jibsx"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
@@ -6541,7 +6583,7 @@ in with self; {
   gdns = derive2 { name="gdns"; version="0.2.1"; sha256="0dvrknhx0d00yi429zjdcs3ghgbpfjhrclkn6cicd049qdp4q396"; depends=[dplyr httr jsonlite purrr stringi tibble]; };
   gdpc = derive2 { name="gdpc"; version="1.0.3"; sha256="0qc9wl7zxqwzigvzpm0nyx735ah8ascmcwd0yays5mqc74iqqx3b"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
   gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; };
-  gdtools = derive2 { name="gdtools"; version="0.1.6"; sha256="103wnc8sq0iwcnj4j14hd420d2dqdyf13s3f25icsznrlyzdkhf5"; depends=[Rcpp withr]; };
+  gdtools = derive2 { name="gdtools"; version="0.1.7"; sha256="122k9spymawfnfyksxyapwq9cigydy5nrjwhrwrhy3qkax3aycf6"; depends=[Rcpp withr]; };
   gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; };
   gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
@@ -6558,7 +6600,6 @@ in with self; {
   gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; };
   gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; };
   genBaRcode = derive2 { name="genBaRcode"; version="1.0.0"; sha256="0313kyhy9bg9rabxk2jdgxq2brhj2kkiq0xyd3mlq6j9c626pqi8"; depends=[ape Biostrings ggnetwork ggplot2 igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist visNetwork]; };
-  genBart = derive2 { name="genBart"; version="1.0.0"; sha256="0ykmpisp6s1bam09srn7zxrqv5ma55l5x143nj46y8lw91zhmi9n"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; };
   genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
   genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
   genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; };
@@ -6566,7 +6607,7 @@ in with self; {
   genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; };
   gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; };
   gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
-  gender = derive2 { name="gender"; version="0.5.1"; sha256="0qiwqnpk2pzwvvvnnny0wmmrix1aq3kwnk6n9jyvqzh0v9bzd65g"; depends=[dplyr httr jsonlite]; };
+  gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; };
   genderBR = derive2 { name="genderBR"; version="1.0.1"; sha256="1sbxp0wz138xxcv31xz411gp7krzghvfmjfg5hmv66l8014s6s6c"; depends=[dplyr httr jsonlite]; };
   genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; };
   gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; };
@@ -6606,6 +6647,7 @@ in with self; {
   geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
   geofacet = derive2 { name="geofacet"; version="0.1.5"; sha256="1fx7qgvyqkm8728ai1nd7kgj295q46jlps56zwvlvlzhqy437p5n"; depends=[ggplot2 gtable]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
+  geogrid = derive2 { name="geogrid"; version="0.1.0"; sha256="1aiar70cy8rf7hc7kwc2g3p02x3zmp6nf9vfjjrjm94mb7yr8s48"; depends=[Rcpp RcppArmadillo rgeos sf sp]; };
   geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; depends=[Rcpp]; };
   geojson = derive2 { name="geojson"; version="0.2.0"; sha256="1xvbkdaaf55x015pflvcdy06ayrmhqi3my0sdqb48z129rdbr3i7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
   geojsonR = derive2 { name="geojsonR"; version="1.0.4"; sha256="0248lb1kgj43czp5z4q7dcrq6ra0jhq62q9x79mgyb83bqn940h8"; depends=[R6 Rcpp RcppArmadillo]; };
@@ -6637,13 +6679,13 @@ in with self; {
   geotopbricks = derive2 { name="geotopbricks"; version="1.4"; sha256="1jqkdhljf0syfvkcy7wgaccrhp3hfx0kymw3vyckhmf1dkwbjvyj"; depends=[raster rgdal stringr zoo]; };
   geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; };
   geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; };
-  gepaf = derive2 { name="gepaf"; version="0.1.0"; sha256="0ld7r0dkap7bpmb2fc8x0pzffvnlzp2q1bndx4l2ffiyygsq6f72"; depends=[bitops]; };
+  gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; };
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; };
   getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.2"; sha256="14rw7pdcan4bdjfb16z3h0acx2s8l34vywsp4nn8l1pmmsvgqpap"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
   getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; };
-  getTBinR = derive2 { name="getTBinR"; version="0.5.2"; sha256="0rgjsfvrg3llpj5mnyrypm57yli680i5ir3fw1dgyh40p8pmaks0"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble viridis]; };
+  getTBinR = derive2 { name="getTBinR"; version="0.5.3"; sha256="0yn8abdixckp32yicp1b5bqmdl4l9s3f67jb8d70yy77kyckzw3m"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble viridis]; };
   getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; };
@@ -6651,7 +6693,7 @@ in with self; {
   gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
-  gfer = derive2 { name="gfer"; version="0.1.9"; sha256="0dlcwqllhmh5gxfcldjm7z4nancl0avxl3b3xk603mzc7qkrr63j"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
+  gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
   gfmR = derive2 { name="gfmR"; version="1.0-1"; sha256="1irzkiq93wh4yphq8x1v2a7plcrskb8fs36qjaa0qhyhvhn0f57i"; depends=[faraway nnet]; };
   ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
   ggExtra = derive2 { name="ggExtra"; version="0.7"; sha256="0vygac13cjcq63f57zd28jyla09za58r77kq1mmsa4qx4dxyfsbl"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; };
@@ -6677,7 +6719,7 @@ in with self; {
   ggfittext = derive2 { name="ggfittext"; version="0.5.0"; sha256="0ih6mqg53y5iaiq003wbzp6qqx4844yh5z9zw5d0k7gqclprmpn5"; depends=[ggplot2 stringi]; };
   ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
   ggformula = derive2 { name="ggformula"; version="0.6.2"; sha256="08smdd3s8dh3qjcm25v8h1r8pfvlfvkymnbhlyw4bymq479g4w0j"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; };
-  ggfortify = derive2 { name="ggfortify"; version="0.4.2"; sha256="0xw30mkcsrigbkcqp68h51vjj9pd9fdly5j85j9q6cx22qj59jr9"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
+  ggfortify = derive2 { name="ggfortify"; version="0.4.3"; sha256="031fq82g7n9r9mvvh1sqbhq8m0swkha0vl78rkgkmzbrp88lkvqg"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
   gggenes = derive2 { name="gggenes"; version="0.2.0"; sha256="1s3lkdl9wmhcdra90bv8zzb16h2sdmpr15x8c3d0gfw7yir6prj2"; depends=[ggplot2]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
@@ -6742,7 +6784,7 @@ in with self; {
   gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
   givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; };
-  gjam = derive2 { name="gjam"; version="2.1.8"; sha256="1232sdmdndxk0bxr1q9jx4gld9spb7mxybxkp9w1abv9391h91fp"; depends=[MASS RANN Rcpp RcppArmadillo]; };
+  gjam = derive2 { name="gjam"; version="2.1.9"; sha256="05xi8wf1bp75irdklgxbx5clik0l1bpykl30hvda0dxp6qyrzm4w"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; };
   gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; };
   glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; };
@@ -6758,6 +6800,7 @@ in with self; {
   gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
   gllvm = derive2 { name="gllvm"; version="0.1.0"; sha256="13ca5ms6bbrj3ny5n438v5ma0d7ccnghysz7c8452cpdq8sn87iy"; depends=[fishMod MASS Matrix mvabund mvtnorm Rcpp RcppEigen statmod TMB]; };
   glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; };
+  glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
   glm_predict = derive2 { name="glm.predict"; version="3.0-0"; sha256="1kqh8g7mrpfnzklk23x7ckbn5p2qcw951cg4s9gnlncggby864ig"; depends=[MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.1.3"; sha256="0mmvba1ccmykm2k02ysjbiqj1lwzdwrbxr1hq1kn1gl97xlarp2x"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
@@ -6767,7 +6810,7 @@ in with self; {
   glmertree = derive2 { name="glmertree"; version="0.1-1"; sha256="0wfpx7y6x9ll86av399i7vaycjjbgmmmh78wy77cbq0gkp1rzb47"; depends=[Formula lme4 partykit]; };
   glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
   glmlep = derive2 { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-  glmm = derive2 { name="glmm"; version="1.2.2"; sha256="052vdsgr05xyy7cp7bphidl795234alsrv1lwh8p698kdd3ykiv5"; depends=[Matrix mvtnorm trust]; };
+  glmm = derive2 { name="glmm"; version="1.2.3"; sha256="0cxlcx09a5vypv6kkcfvfjdpz2rnxhay0pjv6q53hdmbshmchbmj"; depends=[digest Matrix mvtnorm trust]; };
   glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; };
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
   glmmML = derive2 { name="glmmML"; version="1.0.2"; sha256="0ndvp7a7dxq6ygdwzq783ci1y0zb4xwnj6g4w1cm8zvqak8dxjdb"; depends=[]; };
@@ -6791,7 +6834,6 @@ in with self; {
   glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
   glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
   glue = derive2 { name="glue"; version="1.2.0"; sha256="0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr"; depends=[]; };
-  glycanr = derive2 { name="glycanr"; version="0.3.0"; sha256="1s3xhg31xc3x4gzxjpn9mbb7dw4m49na2mdlgr5wh1z9gxdc06pa"; depends=[coin dplyr ggplot2 tidyr]; };
   gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; };
   gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; };
   gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; };
@@ -6870,7 +6912,7 @@ in with self; {
   graphql = derive2 { name="graphql"; version="1.4"; sha256="103vggx9273dg4fkrhik4p1vj8qh7gxavyh933qxhajpmhnfhksh"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
-  grattan = derive2 { name="grattan"; version="1.5.3.5"; sha256="0cbgxjrw461zf8axsnl7rhi19gcji9s9d0h5s1bd89930l7ldqfg"; depends=[assertthat data_table fastmatch forecast hutils magrittr Rcpp RcppParallel rsdmx zoo]; };
+  grattan = derive2 { name="grattan"; version="1.5.3.7"; sha256="0lvmypw77za3nafq6mqasfhbhci59mq7cia9y988czs9fs9l3858"; depends=[assertthat data_table fastmatch forecast hutils magrittr Rcpp rsdmx zoo]; };
   gravity = derive2 { name="gravity"; version="0.6"; sha256="15ngk6a5f6xjvisk6ma625iaw4ybg7722xgmnr4rnlmsgm95v668"; depends=[censReg glm2 lmtest MASS multiwayvcov sandwich survival]; };
   grec = derive2 { name="grec"; version="1.1.1"; sha256="1qn1vbhlw42wqg9vj5plb12pg9xskn32z27ifyzm4kggp1vckgbf"; depends=[imagine raster]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
@@ -6881,7 +6923,7 @@ in with self; {
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; };
-  gridGraphics = derive2 { name="gridGraphics"; version="0.2"; sha256="1lxqr257gqyasln8j0538jyb9q0s6i72cxx8i6sya7w7dwgrv1xp"; depends=[]; };
+  gridGraphics = derive2 { name="gridGraphics"; version="0.2-1"; sha256="1ly6fxnac9g5p3dwxfscz95whaxvc2r713fi36x526yhaayj7xwj"; depends=[]; };
   gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
   gridSVG = derive2 { name="gridSVG"; version="1.6-0"; sha256="06nxp0h6clsfxcx5lf11sgzq7v4ijbynh6hldbnpm6pqwn18hb0j"; depends=[jsonlite XML]; };
   gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
@@ -6936,13 +6978,14 @@ in with self; {
   gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; };
   gtools = derive2 { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
-  gtrendsR = derive2 { name="gtrendsR"; version="1.4.0"; sha256="06vanvg2790fd78ag11kiajbgbgbwac64q7yg7f3chbfiv4cdnab"; depends=[anytime curl ggplot2 jsonlite]; };
+  gtrendsR = derive2 { name="gtrendsR"; version="1.4.1"; sha256="08zfh73viv9p1c4qmw3jnywa5xzbm39kfi60whl0w5pvh3q9pksf"; depends=[anytime curl ggplot2 jsonlite]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
   gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
   gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
   gutenbergr = derive2 { name="gutenbergr"; version="0.1.4"; sha256="1xf9h0ikfzgq6bzzxa7wih29cgbfk6lgdv041fprxbd9rz38agi9"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
   gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; };
+  gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; };
   gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
   gvlma = derive2 { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
   gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; };
@@ -6956,13 +6999,12 @@ in with self; {
   h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; };
   hBayesDM = derive2 { name="hBayesDM"; version="0.5.0"; sha256="174z98jvi04df04lpdxh3j8lmjvgrg287nxfnrcvjkibc0jiss4m"; depends=[ggplot2 loo Rcpp rstan rstantools]; };
   hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; };
-  hNMF = derive2 { name="hNMF"; version="0.4"; sha256="1ivj9danq3mp6mkrm6mdd529rmzb0qhl38lgij76ma2j9fkw35zq"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
   hR = derive2 { name="hR"; version="0.1.1"; sha256="18a9nhnsw7va1ambj2lc99ralhildc3a2l6xpilfanig4pg7cq08"; depends=[data_tree reshape2 visNetwork]; };
   hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
   hamlet = derive2 { name="hamlet"; version="0.9.5-2"; sha256="1fj7bqn6g127kan4l1pnv0qvzsgxqiixjaf3yn0g3cwawyzqixmv"; depends=[]; };
-  hansard = derive2 { name="hansard"; version="0.5.5"; sha256="00bhqbi1z1m9zn1a3qfvyid1hvi7qh3nqr2bxcihy3f9mi8k4a0i"; depends=[dplyr httr jsonlite lubridate stringi tibble tidyr]; };
+  hansard = derive2 { name="hansard"; version="0.6.0"; sha256="13h68b300c4lkqbl5gw4hkqcbb2ikvan4hx8092ds995514rg4x8"; depends=[dplyr httr jsonlite lubridate stringi tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
   haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
   haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; };
@@ -6999,6 +7041,7 @@ in with self; {
   hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
   hdm = derive2 { name="hdm"; version="0.2.3"; sha256="0nj7pbkygzbiraw1b3pqv3bnkjhi1a0h48q0zgkcq8y79kj2f8cl"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
+  hdme = derive2 { name="hdme"; version="0.1.0"; sha256="1wq4kl7dc853v8v1wgihayrd50x5asx5r190lq6flm2ssqd1m6nm"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; };
   hdnom = derive2 { name="hdnom"; version="4.9"; sha256="11yzjfp6b4apn0nyqmi0qm5rd8xy49w6hwwiq7p566mxqy32i2j2"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
   hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; };
   hdrcde = derive2 { name="hdrcde"; version="3.2"; sha256="1901mg2k2ch9fzn1n9k0kmxkgd1m4pxvrda7mv0mp64nf4mx43xw"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; };
@@ -7028,7 +7071,7 @@ in with self; {
   hetmeta = derive2 { name="hetmeta"; version="0.1.0"; sha256="023bdjsv0ibisz47vaap9yamzjna4hhndk3haw2g1cm92wnrdra5"; depends=[metafor]; };
   hett = derive2 { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[lattice MASS]; };
   heuristica = derive2 { name="heuristica"; version="1.0.1"; sha256="1myivlqw6a8wh97ma9lrpgvaqb0vn4kj8yp9r4z5vc4pxgmm48g6"; depends=[Hmisc]; };
-  hexSticker = derive2 { name="hexSticker"; version="0.4.2"; sha256="1dhxx8g1yv22wkzz4alpxrgg1rhribq70yxgpn01yq7jbhn2vyk0"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
+  hexSticker = derive2 { name="hexSticker"; version="0.4.3"; sha256="0f3zm6z0gsq2ps5zv0z4d8z6v5ncgpamnpl8a9l022klqifkg6x1"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; };
   hexView = derive2 { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; };
   hexbin = derive2 { name="hexbin"; version="1.27.2"; sha256="0lpfl0015lg5x7lvv9dr302bca22c7fs91pnd896ypgpzqg7pm26"; depends=[lattice]; };
   hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; };
@@ -7051,10 +7094,10 @@ in with self; {
   hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; };
   hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; };
   highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
-  highSCREEN = derive2 { name="highSCREEN"; version="0.1"; sha256="0g2pcxdg5fix63jqpddqnldalg95x7ghvmbfr1ijjwi9m3ki2bby"; depends=[gplots]; };
+  highSCREEN = derive2 { name="highSCREEN"; version="0.2"; sha256="0lgwxavshqd826g1zmjakhxlbngbhrc36nc8wsh9nakklx4nq9g4"; depends=[gplots]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
   highcharter = derive2 { name="highcharter"; version="0.5.0"; sha256="1myypff80mxcgc3j0sflalhqz344c2zz2p90aarli1pbys9v8ynp"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlist stringr tibble tidyr xts zoo]; };
-  highfrequency = derive2 { name="highfrequency"; version="0.5.2"; sha256="1bjqjf4ki7r21mwlhrd83v8k6lknrypkl9wrax9ccr7fln7ha7wn"; depends=[BMS chron cubature FKF MASS mvtnorm numDeriv robustbase rugarch sandwich timeDate xts zoo]; };
+  highfrequency = derive2 { name="highfrequency"; version="0.5.3"; sha256="1d218504ghg8d3cwmsxwkznxpr2wy5li062i2lynbxzrhrk59i0l"; depends=[chron cubature MASS mvtnorm numDeriv robustbase sandwich timeDate xts zoo]; };
   highlight = derive2 { name="highlight"; version="0.4.7.2"; sha256="0xc1akglgby3qd6c9y2rhcd0gpfihx5jvakji38vzlxb1m21sn10"; depends=[]; };
   highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
@@ -7075,10 +7118,10 @@ in with self; {
   hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; };
   hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
-  hmi = derive2 { name="hmi"; version="0.9.5"; sha256="10ss4a8ywmmsxdsial1jxcydj1fg28qmbmxv9bhdw2zf1clacmbp"; depends=[boot coda linLIR lme4 lmtest MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; };
+  hmi = derive2 { name="hmi"; version="0.9.10"; sha256="1swbzxykf4mwgahadi5l1xy06h4ivpc4gq3izshg6fvgrapbg1r5"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; };
   hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; };
   hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
-  hms = derive2 { name="hms"; version="0.4.1"; sha256="0vr7k3a7k52a5yf67bwzl88lkjz09v1avw5axdk1y9v3nz33zl2h"; depends=[pkgconfig rlang]; };
+  hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; };
   hnp = derive2 { name="hnp"; version="1.2-4"; sha256="14w2n95pgi5h71fag4ndrc82z7q26za99vj5z99rv19l5jkvmd46"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; };
   hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; };
@@ -7125,7 +7168,7 @@ in with self; {
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; };
   httptest = derive2 { name="httptest"; version="3.0.0"; sha256="1k75i84ajka0abc8x51w74dldb0z9i08dlqbkcdby25465k01l8r"; depends=[digest httr jsonlite testthat]; };
-  httpuv = derive2 { name="httpuv"; version="1.3.5"; sha256="1sg4f223zfyd265b28rlhsn3b6mqflcpnmya98cjmjncmy9vjdj3"; depends=[Rcpp]; };
+  httpuv = derive2 { name="httpuv"; version="1.3.6.2"; sha256="0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f"; depends=[Rcpp]; };
   httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; };
   hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
@@ -7136,8 +7179,8 @@ in with self; {
   hunspell = derive2 { name="hunspell"; version="2.9"; sha256="10186544s6nyd2ba470idxrxsl788dkmr1g1ri8x2n1lky9zmrik"; depends=[digest Rcpp]; };
   hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
-  hutils = derive2 { name="hutils"; version="0.10.0"; sha256="0wic5s6k0pqsv41kpjwz6a48kh3ha0xw5y9zfa3zj4y7w8l2w94d"; depends=[data_table fastmatch magrittr]; };
-  huxtable = derive2 { name="huxtable"; version="2.0.2"; sha256="1qj83gcfg204gqjsd1vh32wd4p5jhfyf764vhapii6iswrddzv4d"; depends=[assertthat dplyr glue htmltools knitr lazyeval rmarkdown stringr tibble]; };
+  hutils = derive2 { name="hutils"; version="1.0.0"; sha256="0s30wiyn8j37hi4lzs1w1lcvg8dskmbi4z396wpq3ixjvna0cfxv"; depends=[data_table fastmatch magrittr]; };
+  huxtable = derive2 { name="huxtable"; version="3.0.0"; sha256="0vb596x9c6hhnrdpqvj0x8fawaizn9yhqp8b6i13n93synyv93gy"; depends=[assertthat dplyr glue htmltools knitr lazyeval rmarkdown stringr tibble tidyselect]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
@@ -7155,7 +7198,7 @@ in with self; {
   hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
   hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; };
   hyper2 = derive2 { name="hyper2"; version="1.0-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; depends=[partitions Rcpp]; };
-  hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.3"; sha256="0ayhq7w23azwjing2l4spfydmx7g615g3c5fm6fw1an660mzsgd2"; depends=[doParallel foreach iterators randomForest unbalanced]; };
+  hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.4"; sha256="0mqymg4326cjvcz9qvlfdsydfqgd6szfzy89llr5mwz2s3arnv6j"; depends=[doParallel foreach iterators randomForest unbalanced]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.99-20171005"; sha256="0rhn9f4faxscwrip14ndymaddc5nfd6pyrhgwkwm8hf680wdrhbl"; depends=[ggplot2 lattice latticeExtra testthat]; };
   hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; };
   hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; };
@@ -7172,7 +7215,7 @@ in with self; {
   iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; };
   iC10 = derive2 { name="iC10"; version="1.1.3"; sha256="19dlrwj47zmdgmvzjfs5qa9fqq8g9ywhgy5mqbp99n7d9hg4ybxh"; depends=[iC10TrainingData pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
-  iClick = derive2 { name="iClick"; version="1.3"; sha256="052pjfxj11ay1yki89hdbbj550snppicmh8z85wlgf70amxhyq5k"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries]; };
+  iClick = derive2 { name="iClick"; version="1.4"; sha256="1j1mk4w1m90f90ijxdiw67sycxms4mqljcmsic81m2pq228l8zd5"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
   iDINGO = derive2 { name="iDINGO"; version="1.0.2"; sha256="041yvp3nzk3ipjlx17xcn9yiwr1hlns0pd3vzqrck5v9glnp4sbr"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; };
   iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; };
@@ -7206,14 +7249,14 @@ in with self; {
   ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; depends=[mgcv]; };
   ic_infer = derive2 { name="ic.infer"; version="1.1-6"; sha256="14vcwx5592br4zky9mq82akwk8pfiz7p1rx2jvyb48prrs2mm9gy"; depends=[boot kappalab mvtnorm quadprog]; };
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
-  icRSF = derive2 { name="icRSF"; version="1.1"; sha256="0yrlwf6p3k0i9vjm4zmf585cfv39ihchkyz9jfi4lzdh15msrzlx"; depends=[icensmis Rcpp]; };
+  icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; };
   ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; };
   icaOcularCorrection = derive2 { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; };
   icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.1.0"; sha256="1xw0mz3ipkfz1jsjzwjnrm0af1gs31js7nvgy79cxqz31955zjww"; depends=[Rcpp RcppArmadillo]; };
-  icd = derive2 { name="icd"; version="2.3.1"; sha256="15clnf5zbbqj4z5dgmx2wkn8jqmd8msryc555hk339d1662j41zd"; depends=[checkmate magrittr Rcpp testthat]; };
+  icd = derive2 { name="icd"; version="2.4.1"; sha256="1ygik4kd8ip4n8vjy2n6idj3cnc966sx41sckcqbjsqdsv5g5ghc"; depends=[checkmate magrittr Rcpp testthat]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
   icenReg = derive2 { name="icenReg"; version="2.0.7"; sha256="1fc6l3mqnm4rcg49bk2plfa011g7nay71gzd4nxnjisifmw6qi2s"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; };
@@ -7238,9 +7281,10 @@ in with self; {
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
   idm = derive2 { name="idm"; version="1.8.1"; sha256="14cy1gv12wjpsv5jih7pgq5d36gfpdc56ih4mc6hx638qkkyk87z"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
-  idmTPreg = derive2 { name="idmTPreg"; version="1.0"; sha256="0lqig005zln84670pglifnhc9g4nz7g7gfkl476a4q4q920pn9ll"; depends=[doParallel foreach survival]; };
+  idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; };
+  idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; };
   ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; };
   ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
   iemisc = derive2 { name="iemisc"; version="0.9.6"; sha256="0yr2pqklj3qjlmkk2sc5rgi8dfnm9jdaagzh2dhm05lharhfzy6d"; depends=[data_table fpCompare gsubfn iemiscdata pracma r_import zoo]; };
@@ -7252,7 +7296,7 @@ in with self; {
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
-  igraph = derive2 { name="igraph"; version="1.1.2"; sha256="1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9"; depends=[irlba magrittr Matrix pkgconfig]; };
+  igraph = derive2 { name="igraph"; version="1.2.1"; sha256="1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m"; depends=[magrittr Matrix pkgconfig]; };
   igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
   igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; };
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
@@ -7332,7 +7376,7 @@ in with self; {
   intRegGOF = derive2 { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
   intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; };
   intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
-  intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[automap gstat intamap spatstat spcosa]; };
+  intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; };
   intccr = derive2 { name="intccr"; version="0.2.0"; sha256="0sm66c0ivvky01k5v28k7rc6ba15jpnalhgc019nbrly1s5kyqcy"; depends=[alabama doParallel foreach]; };
   integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
@@ -7382,6 +7426,7 @@ in with self; {
   iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
   ipumsr = derive2 { name="ipumsr"; version="0.1.1"; sha256="0bms1jl1hwqcz6awdgs0wpxvxgsydrvfmp10qnhglh52nckf0dyb"; depends=[dplyr haven purrr raster Rcpp readr rlang stringr tibble tidyr xml2]; };
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
+  ipwErrorY = derive2 { name="ipwErrorY"; version="1.0"; sha256="1n1j1crxnnfkg38drgg8rhc13y6s8hcsr5g0f6hi4v680dgrkhmp"; depends=[nleqslv]; };
   iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; };
   iqspr = derive2 { name="iqspr"; version="2.3"; sha256="190d0mc36l3ggh62km3z7ylhi9f0wp4brkwmm72qjqbm1przvk0w"; depends=[doParallel fingerprint ggplot2 glmnet gridExtra kernlab ranger rBayesianOptimization rcdk tictoc xgboost]; };
   irace = derive2 { name="irace"; version="2.4"; sha256="07xzg4jcq0rjdq1drs3xh02y29z1gmkjkw54apmaqzc0s1pwzkk4"; depends=[]; };
@@ -7392,12 +7437,14 @@ in with self; {
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
+  irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; };
   isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; };
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
   isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
   island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; };
   ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; };
+  isni = derive2 { name="isni"; version="0.1"; sha256="0xqz5ha6ca02xk5n0c8awx8m7zibrb6h2mwwsr44jchdb3dj39sr"; depends=[matrixcalc mvtnorm nlme nnet numDeriv]; };
   isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; };
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
@@ -7405,11 +7452,10 @@ in with self; {
   isoph = derive2 { name="isoph"; version="1.1.2"; sha256="1qw98cnil3rb9d3vbii8drca744qig6bfd3rc74dxm23cj86f66g"; depends=[Iso survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
-  issueReporter = derive2 { name="issueReporter"; version="0.1.0"; sha256="18s35f5d30vivmlcg0ycni3r8mrf4gnn7x10qdcnpisrlsjx6jbd"; depends=[httpuv httr jsonlite rmarkdown tint]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
   italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; };
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
-  itcSegment = derive2 { name="itcSegment"; version="0.6"; sha256="0wzp84p6cysk2488p9g9p0r8950ry5wqg13kd34yixzp9m3rx0w4"; depends=[maptools raster rgeos sp]; };
+  itcSegment = derive2 { name="itcSegment"; version="0.7"; sha256="15im0aqnl73c7gg6v4al40mappfsb4axfxclpzmdganvr6fccvay"; depends=[maptools raster rgeos sp]; };
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
   iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
   iterators = derive2 { name="iterators"; version="1.0.9"; sha256="16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"; depends=[]; };
@@ -7419,14 +7465,14 @@ in with self; {
   itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
   itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; };
   itsmr = derive2 { name="itsmr"; version="1.8"; sha256="1w2sjdw9s4smsqdbjabj9jjync0fb931aajjbqhm49cx0g72hi8g"; depends=[]; };
-  itunesr = derive2 { name="itunesr"; version="0.1"; sha256="0vfn3vvbfl0ckgr50449xffj8726wsa120ibppbzhalp8rb6hq4a"; depends=[curl jsonlite lubridate xml2]; };
+  itunesr = derive2 { name="itunesr"; version="0.1.1"; sha256="1h6yyqcmvm9dfwscmq5ghqi3r4fdracw1n206058j9bdjpakxqkl"; depends=[curl jsonlite lubridate xml2]; };
   ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
   ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
   ivlewbel = derive2 { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
   ivmodel = derive2 { name="ivmodel"; version="1.7.1"; sha256="0v8alqn141s9rymk29xqmdx7gpp8ivz4525afvarxmp9sm2rqq0q"; depends=[Formula ggplot2 Matrix reshape2]; };
   ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
-  ivprobit = derive2 { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
+  ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; };
   ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; };
@@ -7439,7 +7485,7 @@ in with self; {
   janitor = derive2 { name="janitor"; version="0.3.1"; sha256="0s2inn0apzwrvm5dvvdh36n9fhhrwvfbs6f3fn6byrbd713xl7rq"; depends=[dplyr magrittr tidyr]; };
   jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; };
   jcext = derive2 { name="jcext"; version="0.1"; sha256="18vmf57l2kv3rvi6laqp948m8mjkdxdy0vi4xp68480b2mjmvij1"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; };
-  jcolors = derive2 { name="jcolors"; version="0.0.1"; sha256="0a5p8778s14rk7xsivmb0g0c4kzdvbhyxsl8v1lk3cpq6898zv2d"; depends=[ggplot2 scales]; };
+  jcolors = derive2 { name="jcolors"; version="0.0.2"; sha256="0d71sdvj7hwafj0sx2z1nyza5j2lfd8y5yj1p94yrw32wi7b89jn"; depends=[ggplot2 scales]; };
   jdx = derive2 { name="jdx"; version="0.1.2"; sha256="0963h1ppasw5psxgxzav0mnwc5gq0ah5xv5cyhnm8d1a66svn6pw"; depends=[rJava]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
   jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; };
@@ -7454,6 +7500,7 @@ in with self; {
   joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; };
   joineR = derive2 { name="joineR"; version="1.2.3"; sha256="0cg7bfn0hb7ayx2s7myja5qzdvsbzyk8fbb1x5z0fp21gyrpfz18"; depends=[lattice MASS nlme statmod survival]; };
   joineRML = derive2 { name="joineRML"; version="0.4.1"; sha256="08zl6wv6yvk2cgp6ln2i9ziip0mjr4jrfpb1y75ln5wi00dbna3x"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; };
+  joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; };
   joint_Cox = derive2 { name="joint.Cox"; version="2.14"; sha256="0k9v1v4zbv0952zyp7xv5gkmnihfswpsqzp684f9y6n6xcg3v8fx"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
@@ -7462,7 +7509,7 @@ in with self; {
   jomo = derive2 { name="jomo"; version="2.5-3"; sha256="1ig6r4sc4c2vf3h51by78610c5yqd7ap8gqcf0hswn3h2zsf6vm8"; depends=[lme4 survival]; };
   jose = derive2 { name="jose"; version="0.1"; sha256="1cvrjcx902pbh9xryph1kilmyf0rmbk671jvqd19a2kfwpcw7gqc"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
-  jpmesh = derive2 { name="jpmesh"; version="1.0.1"; sha256="1c8swlqjaaq4jqhs0cda704c17ykk80vmqnlxrizfl87qvvl5ak6"; depends=[dplyr leaflet miniUI purrr readr rlang sf shiny tibble tidyr]; };
+  jpmesh = derive2 { name="jpmesh"; version="1.1.0"; sha256="01f0020ghl1f5fsri54gni15b36fg9vkr4xj43vy881sv11c5yr8"; depends=[dplyr leaflet miniUI purrr rlang sf shiny tibble tidyr units]; };
   jpndistrict = derive2 { name="jpndistrict"; version="0.3.0"; sha256="0vnawpkrkhv0vjvw49ldn86qy07pqsdw7mmq13h3l4qw5jmfsd9i"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr readr rlang sf shiny stringi tibble tidyr]; };
   jqr = derive2 { name="jqr"; version="1.0.0"; sha256="1jdr3wb1fd2zjmmdicqhskgk7xbn5y6998fi9szj86p8smfckl74"; depends=[lazyeval magrittr]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
@@ -7494,6 +7541,7 @@ in with self; {
   kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; };
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
   kdecopula = derive2 { name="kdecopula"; version="0.9.1"; sha256="0qbrm4b2ijyp7fmljz8m918zkv5aywm549lbwjk3rk8isvaac10m"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
+  kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kdevine = derive2 { name="kdevine"; version="0.4.1"; sha256="0ci51dn7jhz9swlywiqj3inkk4329argm63lhkyvcbj2kd2rjay1"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; };
   kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; };
@@ -7501,7 +7549,7 @@ in with self; {
   kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; };
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
   kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; };
-  keras = derive2 { name="keras"; version="2.1.3"; sha256="02pzwl6z06f36njns8kirngqzkk3f1bwzifk05xm41ry9rppa5l3"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
+  keras = derive2 { name="keras"; version="2.1.4"; sha256="1z08fi5a0hxw96xj95w9k0d918b1yvqixlv0szqbdrd5dqnfj0xa"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
   kerasformula = derive2 { name="kerasformula"; version="0.1.1"; sha256="0c19208y9v8a1w4p54z7yng5vvmb6h79fs0a20ij98ngys9afbwz"; depends=[dplyr keras Matrix]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
@@ -7543,6 +7591,7 @@ in with self; {
   kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; };
   kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; };
   kmed = derive2 { name="kmed"; version="0.0.1"; sha256="0vcks4n0dpfd5cl5b8mhvhw6r2f3y12jn3d3j3dkj2grxmb9lh4c"; depends=[ggplot2]; };
+  kmer = derive2 { name="kmer"; version="1.0.0"; sha256="0zknmcmv96bq0yqmmbshjwwh7vy2iwks4masmglayx7jw323n9cx"; depends=[openssl phylogram Rcpp]; };
   kmi = derive2 { name="kmi"; version="0.5.3"; sha256="0b3nibvi0skrx3mjfzypqmdqx8s9zkn11f0ljscqpjr28idx4hr0"; depends=[mitools survival]; };
   kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; };
   kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; };
@@ -7551,17 +7600,17 @@ in with self; {
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
   knitcitations = derive2 { name="knitcitations"; version="1.0.8"; sha256="07h8d5cp52qcm0912c55j59k2p3c7s4af87qa7a9hafhgimnsdiv"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.19"; sha256="1gyj9bw90h4h9rc9k1iqrnzirm2f8mj45zi8bkjc6rp610vlh63j"; depends=[evaluate highr markdown stringr yaml]; };
+  knitr = derive2 { name="knitr"; version="1.20"; sha256="1408dm25cxahk2clff8hlajaqdj5v1gs40nm3q6rf0ghd82hj93v"; depends=[evaluate highr markdown stringr yaml]; };
   knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.1"; sha256="089147g7nqp99rwdxxsfmklsrwc8aia09sr8ndmrc335r33v6r6p"; depends=[knitr markdown rmarkdown]; };
-  knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.0.0"; sha256="18r025j4c6m0c8rir3cskc4dymnxybl076ghy6a9iy38in58v547"; depends=[R_oo R6]; };
+  knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
   knockoff = derive2 { name="knockoff"; version="0.3.0"; sha256="0irqbidp00rh07xsfyyv5d3ksa4fn9vv49rsy8ah2gb9y41iy046"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
+  knor = derive2 { name="knor"; version="0.0-5"; sha256="19wjrcmfam1ck5vbidksmy923d5p5llikjxn0v248vzfz96ia1yc"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; };
   koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; };
-  kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; };
   kofdata = derive2 { name="kofdata"; version="0.1.3"; sha256="135fkfciya8d215iv0ir7kmd01w7rlzqfcif5jz918skrv2p9mcl"; depends=[httr jsonlite xts zoo]; };
   kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
   kohonen = derive2 { name="kohonen"; version="3.0.4"; sha256="1aq98qbmbzsdyimhn28qiyqfrwkwq70qmm5yhx0rvhjq53bn9622"; depends=[MASS Rcpp]; };
@@ -7579,7 +7628,7 @@ in with self; {
   kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; };
   kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
   ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; };
-  kst = derive2 { name="kst"; version="0.3-0"; sha256="0q181gzs4xcmsyrljlsh2rmqggs62lwrnnqsmra3qq3ya18clhzz"; depends=[proxy relations sets]; };
+  kst = derive2 { name="kst"; version="0.3-1"; sha256="1b4lqjg9j91qhr5gk0y1xsyfbhgaixza7qw6kl05yz88p6m7p35z"; depends=[proxy relations sets]; };
   kstIO = derive2 { name="kstIO"; version="0.1-0"; sha256="04s8lyg7622zcq947qlx5brwf1an7icg94i5di8vwjp7d8zgczq6"; depends=[MASS pks sets stringr]; };
   ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
@@ -7621,19 +7670,20 @@ in with self; {
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
   languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.3"; sha256="1sh3k8xw88pm93wmpy1qi44i8pv5b5g6ajzas36bdi1bqm8cqzax"; depends=[attempt curl httr rjson]; };
+  languageserver = derive2 { name="languageserver"; version="0.1.0"; sha256="05ph152xrw8qmnb1mwqsq2qx11d6f4g57v9qp1mxi6y11wl21rxq"; depends=[callr jsonlite lintr R6 repr stringr]; };
   lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; };
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
   largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
   largeVis = derive2 { name="largeVis"; version="0.2.1.1"; sha256="14jgfykvawcqmb94zwpss246ljbwf4qdgmpwwfsnplrxs7agycb5"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; };
   lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
   lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; };
-  lassopv = derive2 { name="lassopv"; version="0.1.3"; sha256="07b7n74z4jvrirf0rc0sbvz9nm2s2s22mb8y973iwpf0i7fqxq2c"; depends=[lars]; };
+  lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
   lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; };
   latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; };
   latentnet = derive2 { name="latentnet"; version="2.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
-  later = derive2 { name="later"; version="0.6"; sha256="1x7qvzfz6ijpbnrj0vx9axkcsj08qqpyahnaxmyhsgpijx9pp8hx"; depends=[BH Rcpp rlang]; };
+  later = derive2 { name="later"; version="0.7.1"; sha256="0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz"; depends=[BH Rcpp rlang]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   latexpdf = derive2 { name="latexpdf"; version="0.1.3"; sha256="1zsdz3nvhifxbhp69nigq1crgm39g6gmc8xl5akp5jdidmzyrh84"; depends=[]; };
   lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
@@ -7671,7 +7721,7 @@ in with self; {
   ldatuning = derive2 { name="ldatuning"; version="0.2.0"; sha256="18nm4hj7733c1cp03hyddnivhiiyv7ndnw9m6j3af019jjmvf215"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
   ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; };
   ldbounds = derive2 { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
-  ldhmm = derive2 { name="ldhmm"; version="0.4.2"; sha256="0kfhb53p1pzgbn8v7hy3sqb0q04hrm7cbykv7bml0hn30z4r8hjx"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
+  ldhmm = derive2 { name="ldhmm"; version="0.4.5"; sha256="1pax1hl0h07nc9d34pf0jqgpcxr7y7dpqcm2hlclrmsinhj9q8vi"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
   ldlasso = derive2 { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
   ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
   ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.1"; sha256="152dlphxxzllgf7al8k34qcfg6n8ajxqym62i61ahbbgjlcd0x9r"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix qvalue RBGL robustbase VGAM]; };
@@ -7689,7 +7739,7 @@ in with self; {
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
   learningCurve = derive2 { name="learningCurve"; version="1.1.1"; sha256="1rvh6i3vmwrff491k9w551402m3i9sra8rzkljgk9b5fmw7hk5ki"; depends=[ggplot2 gridExtra scales tidyverse]; };
   learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
-  learnr = derive2 { name="learnr"; version="0.9.1"; sha256="0ac2w4l8pkcamd33pzcimca9wj2j57fqii33c1ddar4vflcn4xw6"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
+  learnr = derive2 { name="learnr"; version="0.9.2"; sha256="1z04c1djg7ghsl7p9ypc6k5m7snahnmjy10xmrzqfayx1wkfkn9n"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
   learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
   learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
   lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
@@ -7734,16 +7784,17 @@ in with self; {
   likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; };
   likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
   limSolve = derive2 { name="limSolve"; version="1.5.5.3"; sha256="1ll6ir42h3g2fzf0wqai213bm82gpwjj2hfma2np3mz024sc09rg"; depends=[lpSolve MASS quadprog]; };
-  lime = derive2 { name="lime"; version="0.3.1"; sha256="0c81kmjp0s8fl8x4qsgqq6547zf5gvwhllrrryabirz4nxz2x1nl"; depends=[assertthat ggplot2 glmnet htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringdist stringi]; };
+  lime = derive2 { name="lime"; version="0.4.0"; sha256="0hml1f3fq21s45h1cg3qi4w7vdfdxcsz8q4h1429gbppbdanz9i1"; depends=[assertthat ggplot2 glmnet gower htmlwidgets magick Matrix Rcpp RcppEigen shiny shinythemes stringdist stringi]; };
   limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
   linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; };
   linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
   linbin = derive2 { name="linbin"; version="0.1.2"; sha256="0shw976nlryjvmvnyyiycchqs7zcg5flalywm1ymnv62nw3n55xs"; depends=[]; };
   lindia = derive2 { name="lindia"; version="0.9"; sha256="1qma8wr0fkwx03x971crkh8cfc8z4374py1r1wvszj9wzi4vfp5r"; depends=[ggplot2 gridExtra MASS]; };
   linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; };
+  linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; };
   linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; };
   lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.0.11"; sha256="1cn1q7n1kf4llhzxq0ixrd8n8izksrxczr4h6q7923imjiaclv2n"; depends=[leaflet leaflet_minicharts magrittr MASS rowr sp stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.12"; sha256="03rjnr4hy7im88pawrd86nas0fzkgz3mnzdc8rclcfbbv1vyzxf5"; depends=[leaflet leaflet_minicharts magrittr MASS rowr sp stringdist]; };
   link2GI = derive2 { name="link2GI"; version="0.3-0"; sha256="0jzk1p9cygcw0xz9hqfzx74acl4ymn3jmcjj0dxrmknsvfdzcl2d"; depends=[gdalUtils raster rgdal rgrass7 RSAGA sf sp]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
   linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
@@ -7799,12 +7850,11 @@ in with self; {
   lmom = derive2 { name="lmom"; version="2.6"; sha256="0wxlclzypg6dnvk09k26pdgn3nijl06xsa9rny5l03xzar01mz5s"; depends=[]; };
   lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; };
   lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; };
-  lmomco = derive2 { name="lmomco"; version="2.2.9"; sha256="17dgzvf1rrxw3xplwvsy6dsx31b6k6f17g20zbmrh6xv3fnfb86r"; depends=[goftest Lmoments MASS]; };
+  lmomco = derive2 { name="lmomco"; version="2.3.1"; sha256="0nyl18kipsab4ka5ywbmw28kkr6i09w4lc9pa96m1fh765zghjxi"; depends=[goftest Lmoments MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.1"; sha256="1r4g7482iz4b7jk0gj169bj96ip2wyrff1ndkwhf0qzg6r6vqa8d"; depends=[]; };
   lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; };
   lmvar = derive2 { name="lmvar"; version="1.4.0"; sha256="0pwpsdmqjlj79ybx5rw82qgkjzak941d9vvdzwipjh8n51mcvwcd"; depends=[Matrix matrixcalc maxLik]; };
   loa = derive2 { name="loa"; version="0.2.43.3"; sha256="0krrv5sicm4xvgilri8nwby6jlidx375b4sk273hxq7bhayw4hqq"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
-  localdepth = derive2 { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
   localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; };
   localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
   locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
@@ -7822,6 +7872,7 @@ in with self; {
   logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
   logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; };
   logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
+  loggit = derive2 { name="loggit"; version="1.0.0"; sha256="1h2m4a55v54nvgh665rzhxhzjqkky6lx0f8f43zqh7l152z7bsh2"; depends=[dplyr jsonlite]; };
   logiBin = derive2 { name="logiBin"; version="0.1.0"; sha256="146jh5cpydpvv8g3ccrglm88zp8sam4airw521cxcfyg5v8qvdqs"; depends=[data_table doParallel foreach iterators partykit]; };
   logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; };
   logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; };
@@ -7846,11 +7897,12 @@ in with self; {
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
   loo = derive2 { name="loo"; version="1.1.0"; sha256="0nh1jbrvm33v28gbys8sh6v4cxfzfd85561gz380b4kaahn2089l"; depends=[matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
-  loon = derive2 { name="loon"; version="1.1.0"; sha256="1yqbv91sk241n4rv35g374015wy4hricpm5k8r78aaqdhzgl0539"; depends=[]; };
+  loon = derive2 { name="loon"; version="1.1.1"; sha256="023vrnbn4pikiq6l57phwy9zy1lp6vxrkinrffaxwicvaj58c931"; depends=[]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
   loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
   lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; };
   lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
+  lori = derive2 { name="lori"; version="0.1.0"; sha256="1sqwfai0h776i3g0gxqfagisayv428gzw9540d90nzbrg9vkj28j"; depends=[ade4 FactoMineR glmnet lars lattice logmult NLRoot pdist psych svd]; };
   lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; };
   lpSolve = derive2 { name="lpSolve"; version="5.6.13"; sha256="13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m"; depends=[]; };
   lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; };
@@ -7876,7 +7928,7 @@ in with self; {
   lsgl = derive2 { name="lsgl"; version="1.3.6"; sha256="0zkv5xgwrnwx0w0qpzsg7krd7fdnlr3a85q64xj1wx0gd578dqq6"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
   lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; };
-  lslx = derive2 { name="lslx"; version="0.6.1"; sha256="0zl3gcxc0410zm88kdzqywrqsas7vas4w7mxs2ad6wcclf33dwb5"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
+  lslx = derive2 { name="lslx"; version="0.6.2"; sha256="0girzjmkmqym5bnw492991smyhvlz7xw70n8hlswpa4lw3x15q2n"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
   lsmeans = derive2 { name="lsmeans"; version="2.27-61"; sha256="0qw4lkgaynld56ywvdyy5nqvq7c6r2v24gsy54rkcw2n4xhlnahm"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
   lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
@@ -7890,7 +7942,7 @@ in with self; {
   ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
   ltsk = derive2 { name="ltsk"; version="1.0.5"; sha256="0x142w2l6qaqw1kmx5kix7lkadaw2kl8dqx11d091vqj2imi9wlr"; depends=[fields gstat sp]; };
   ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
-  lubridate = derive2 { name="lubridate"; version="1.7.2"; sha256="0k417a1xp5gxf77ycbnx5apzpc5d25sjm83ss7wmqpbnhnr5dcav"; depends=[Rcpp stringr]; };
+  lubridate = derive2 { name="lubridate"; version="1.7.3"; sha256="1pzkqfiahnsdm3zx46asgn8fw43vlxvbh7r4cn70c7ffmxabzzrc"; depends=[Rcpp stringr]; };
   luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
   lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; };
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
@@ -7909,7 +7961,6 @@ in with self; {
   lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; };
   m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; };
   m2r = derive2 { name="m2r"; version="1.0.0"; sha256="07zrqhva00jsp9da9ryzi8pjdrwri2mw0mqgg91r3rnl7id8safq"; depends=[gmp memoise mpoly pryr stringr]; };
-  m4fe = derive2 { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; };
   mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
   mBvs = derive2 { name="mBvs"; version="1.1"; sha256="0nkm0yyzl3ajjfhprnkr7d4mkvwd86lf6ic9cyqx76isfwwz3wyq"; depends=[]; };
   mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; };
@@ -7942,7 +7993,7 @@ in with self; {
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="1.6"; sha256="1xkhg4g7n5g0ri852nbdb19lnqfl16g1w08qpn5riy6fah2vrhd1"; depends=[curl knitr magrittr Rcpp]; };
+  magick = derive2 { name="magick"; version="1.7"; sha256="09dcgfbpp6lls943yps3qaylrs6n9dd1svwab5rmwj0fa4ph2by4"; depends=[curl knitr magrittr Rcpp]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
@@ -7963,7 +8014,7 @@ in with self; {
   mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
   mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; };
-  mapedit = derive2 { name="mapedit"; version="0.3.2"; sha256="0x1jyll45kx1q3bq3visyq75jvinhw3h0yy1n1rams61vvxrqfxk"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
+  mapedit = derive2 { name="mapedit"; version="0.4.1"; sha256="1dy87kmwra917716r99hp139fbxy3z0cx03cw61b832isizd0b51"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
   mapfuser = derive2 { name="mapfuser"; version="0.1.2"; sha256="1q7l6rfs6dv76ifizfqq4pdpjpb2zwzd3vvrnhdzh8vw2mrlqcjg"; depends=[doParallel dplyr foreach ggplot2 igraph lazyeval LPmerge mgcv plotly stringi tidyr visNetwork]; };
   mapmisc = derive2 { name="mapmisc"; version="1.7.0"; sha256="0m8a0zzdrmqkkv9clfar9acij80fmanqny08g9xlir14620aq38c"; depends=[raster sp]; };
@@ -7996,7 +8047,7 @@ in with self; {
   matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; };
   matchMulti = derive2 { name="matchMulti"; version="1.1.6"; sha256="05nkrncrf7vq2bmqbhm9n6p6cyb4drbhjrrfdcw6qcdgvh3bbiy0"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
   matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; };
-  matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-4"; sha256="1qp876xnqrr4rz9a8xc0hw3rzfhjw9nl4qmzcrr9r03xj2dn9i1p"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
+  matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-5"; sha256="083gnqjxvzgqd0lvg13qwzw3cp1imp4xn2nacspfxqg4878jjpn3"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
   matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; };
   matconv = derive2 { name="matconv"; version="0.3.2"; sha256="0vnmqz5vzv5n0cfpgr30gkl0pv8p2b5cp3ap6mn01sxd671lx38z"; depends=[]; };
   mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; };
@@ -8009,9 +8060,10 @@ in with self; {
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
   matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
   matrixStats = derive2 { name="matrixStats"; version="0.53.1"; sha256="0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z"; depends=[]; };
+  matrixTests = derive2 { name="matrixTests"; version="0.1.0"; sha256="0784wfp14z7lh6ylzgh9kvzs5gwapfs7ksx63jf3qwb95zfwyixx"; depends=[matrixStats]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; };
-  matrixsampling = derive2 { name="matrixsampling"; version="1.0.0"; sha256="0bjqdf19alzv33d9b037y135hqfp9n6z35m9j7j95h27gpna5wbc"; depends=[keep]; };
+  matrixsampling = derive2 { name="matrixsampling"; version="1.1.0"; sha256="1q0vcail34iwxc0wnwg2nw9n710fsjg5lgil5hib74vwrww1x1h7"; depends=[keep]; };
   mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; };
   maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; };
   maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; };
@@ -8061,7 +8113,7 @@ in with self; {
   mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; };
   mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
   mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; };
-  mctest = derive2 { name="mctest"; version="1.1.1"; sha256="048xpn14pjpc2s5fjdbni8z4pahnkq753zvibs2p8wiqzynnqib8"; depends=[]; };
+  mctest = derive2 { name="mctest"; version="1.2"; sha256="0rsyqdfsmyvjgns7z2vj24n91ziaz45q4vidk48ay3acfam8i274"; depends=[]; };
   md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; };
   md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; };
   mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; depends=[class]; };
@@ -8079,7 +8131,7 @@ in with self; {
   meaRtools = derive2 { name="meaRtools"; version="1.0.2"; sha256="1xxw0aq4k5z4i3ndja1rxl9calb8hmp4jv9l79zm33vdlggpkxzg"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
   meanShiftR = derive2 { name="meanShiftR"; version="0.51"; sha256="0qcciayriygfwkb15n863amcpcfl97fr1sarwm3d269idf5m7w6x"; depends=[]; };
   meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; };
-  measuRing = derive2 { name="measuRing"; version="0.4.2"; sha256="07asz2kninbmj9vci2w20a7cfbwfa1srvmb2dlzccdivjmrd5wnq"; depends=[dplR pastecs png tiff]; };
+  measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; };
   measurements = derive2 { name="measurements"; version="1.1.0"; sha256="1zi6mpwyxycbphq48s7vfc8gm76nidpa2gafp0jxiv56rwpv3jc3"; depends=[]; };
   meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
@@ -8089,14 +8141,15 @@ in with self; {
   medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; };
   medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; };
   medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; };
+  meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; };
   mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; };
   mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; };
   meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; };
   mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; };
   meltt = derive2 { name="meltt"; version="0.3.3"; sha256="08qifdpk0c9digpayw1d9h2p9q4nyrlihg8kjqacirb5wh39wr6r"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; };
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
-  mem = derive2 { name="mem"; version="2.11"; sha256="1m0s587flc0psafm1fp1dsi7g4l03plhyzx2x74axihzyh2b5dbb"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; };
-  memapp = derive2 { name="memapp"; version="2.7"; sha256="14njpab2bsrpzpdhf45ckjq6fpscwr27xixw151m670wr8r01a6w"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
+  mem = derive2 { name="mem"; version="2.12"; sha256="0075i2mbkck06bljck44d26ys68p8vjfb1jhgzrjy1sv2g2w0qa8"; depends=[boot dplyr ggplot2 mclust RColorBrewer reshape2 sm stringr tidyr]; };
+  memapp = derive2 { name="memapp"; version="2.8"; sha256="0y5wl0rv1s8dgxhb0q42wy5rlj4smw9pz7a4j23195llql8lfc9m"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
   meme = derive2 { name="meme"; version="0.1.1"; sha256="102z3zgfldggcykb7wlmw0wbdas6jbpvy2kfdps0wky3j552ir95"; depends=[ggplot2 magick showtext sysfonts]; };
   memery = derive2 { name="memery"; version="0.4.2"; sha256="0wfp3hf567a1q6mhrsgn4hr8x52yp4na8783f2d19hm0c3r4z51q"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
@@ -8134,9 +8187,9 @@ in with self; {
   metamisc = derive2 { name="metamisc"; version="0.1.8"; sha256="06dzjnrbxqkb0d0zcdxg8fyadsbq0f0fca4xifjz16yjz1047n5k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; };
   metansue = derive2 { name="metansue"; version="2.0"; sha256="102cddahlzm0b76y6pr7jxqxf28j6y3hsjd17fpnyvrwnzhqbz5m"; depends=[]; };
   metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; };
-  metaplot = derive2 { name="metaplot"; version="0.4.1"; sha256="1spi3zrrysdxrq355rzqrvdai8hkx1dbaryxx4bdn6f2nn7p3nd2"; depends=[dplyr encode lattice magrittr rlang tidyr]; };
+  metaplot = derive2 { name="metaplot"; version="0.4.6"; sha256="1qh7v7s8jrdpjzyw41zjlwv8dlq7k49zi2h5slk0jfa9jd635w4x"; depends=[dplyr encode lattice magrittr rlang tidyr]; };
   metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; };
-  metaplus = derive2 { name="metaplus"; version="0.7-9"; sha256="1hrczccszx9jcgifwg6wsigsbm8ih4xjr00knb0rxyygijk38c82"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
+  metaplus = derive2 { name="metaplus"; version="0.7-10"; sha256="066w0klii6a82mq4kdzbx3ccshmsxikym9x8w288pjw92r2z2cfn"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metasens = derive2 { name="metasens"; version="0.3-2"; sha256="1wxp6gzq3wmas8hm8vqxclawxkc4p8dw2apzmg0nciqvas6dzic8"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
@@ -8145,11 +8198,11 @@ in with self; {
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
   meteoForecast = derive2 { name="meteoForecast"; version="0.51"; sha256="1k5m561b6hpqvzrg5l16523ig1rxcsi4s172jmya039cwyk8mqfp"; depends=[ncdf4 raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
-  meteoland = derive2 { name="meteoland"; version="0.6.7"; sha256="0b3hf25dxiaxjj6v9wprysbvr2m6f3vlldy77civq5fkkibx9pzi"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
+  meteoland = derive2 { name="meteoland"; version="0.7.1"; sha256="1nsn4z3gbkcdhgyn13fjcpsyb0lb85kiyy6fhirlnw63dwr56a2l"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
   metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
   metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
   mets = derive2 { name="mets"; version="1.2.3"; sha256="1f1mqpzpvh5vb8b8w72q13jhk978bcvwipf4bx3kzzgsf6yfxk5s"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
-  mev = derive2 { name="mev"; version="1.10"; sha256="0kidgghwjc81rx2vb8y1iiwvlfxafv7r11n3zz1gb7705w6ynw1m"; depends=[boot evd gmm ismev nleqslv numDeriv Rcpp RcppArmadillo rootSolve]; };
+  mev = derive2 { name="mev"; version="1.11"; sha256="0iqcslnchap8zh4s3bllqqb8z0klpzg2pn8ays1xk66lj5ywl390"; depends=[boot evd gmm ismev nleqslv nloptr numDeriv Rcpp RcppArmadillo revdbayes rootSolve]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   mexhaz = derive2 { name="mexhaz"; version="1.4"; sha256="1c3n8g93pb38dw45ls6wh81giqw7zkksh2rmpbw46ink23ks12ij"; depends=[MASS numDeriv statmod survival]; };
   mfGARCH = derive2 { name="mfGARCH"; version="0.1.2"; sha256="08gkba5v8l0867rrxakn7js11v1yj7qp9vmzbjmri9hjcm02s44a"; depends=[numDeriv Rcpp zoo]; };
@@ -8163,7 +8216,7 @@ in with self; {
   mgm = derive2 { name="mgm"; version="1.2-2"; sha256="0n0db6np7i0lycvis9pc1bsnzam4nrr9qzlwimz7d8pp7gm313xn"; depends=[glmnet Hmisc matrixcalc stringr]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
   mgraph = derive2 { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
-  mgsub = derive2 { name="mgsub"; version="1.0.0"; sha256="0aj00ch96kii1r053yqi8g44i64jdyigqnrzrwm6xsf1l2ms3v59"; depends=[]; };
+  mgsub = derive2 { name="mgsub"; version="1.5.0"; sha256="03w40vs3vfyrksnzbawyvp02kwrmn7cqhlv6xhfzfbh8jmz55wvr"; depends=[]; };
   mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; };
   mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; };
   mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
@@ -8181,10 +8234,10 @@ in with self; {
   micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; };
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
   mice = derive2 { name="mice"; version="2.46.0"; sha256="1gjvlk67zvgipfczsca8zqk97vg3sivv82hblsdwp14s7smhjcax"; depends=[lattice MASS nnet Rcpp rpart survival]; };
-  miceExt = derive2 { name="miceExt"; version="1.0.0"; sha256="0rfmnrm04ir16zjbf6pfg25yxnyn5k47yiixp2k0vs86j1sf25v1"; depends=[mice RANN RANN_L1]; };
+  miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; };
   miceadds = derive2 { name="miceadds"; version="2.9-15"; sha256="03jvs643cq23y5fj1ffilqr9bi7g4blk7c0bh7nvrpjx5sscqjck"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
   micemd = derive2 { name="micemd"; version="1.2.0"; sha256="0l4qzhkxy43xwgfqp2c638fimixdrm94hgiabfds3sc1vbxma4r8"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
-  micompr = derive2 { name="micompr"; version="1.0.2"; sha256="1hmxi5wz7vfnvawh50zk316gr3ry59m820ddj2v9p7cxq21hwv9i"; depends=[]; };
+  micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; };
   microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
   microbenchmark = derive2 { name="microbenchmark"; version="1.4-4"; sha256="0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"; depends=[]; };
@@ -8224,7 +8277,7 @@ in with self; {
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
   mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; };
   mirt = derive2 { name="mirt"; version="1.26.3"; sha256="1jzvxcq7s179vi5cwrxkcqzffl2pyay5abnvlgazhabzf4150sml"; depends=[GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
-  mirtCAT = derive2 { name="mirtCAT"; version="1.6.1"; sha256="00jy27ilv1fw9ijhcyyi2lnxghyjb0dhpcqf1dqc6wi61wf5pagk"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
+  mirtCAT = derive2 { name="mirtCAT"; version="1.7"; sha256="038jp680hn17q8hcz346j4i0p913h7gbkqfswn0ygf1kwgsz1mpa"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; };
   miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; };
@@ -8276,7 +8329,7 @@ in with self; {
   mlVAR = derive2 { name="mlVAR"; version="0.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; };
   mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; };
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-  mlbgameday = derive2 { name="mlbgameday"; version="0.0.1"; sha256="1w0rzdbldsv1440vjnx9g2jz6b458gxsk55lmc8n8x16wz45cd2b"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr xml2]; };
+  mlbgameday = derive2 { name="mlbgameday"; version="0.1.0"; sha256="1d339hr7iys8qlw6m0zbvpcw4b1k04504k6l1xz63ijdgpyr593y"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr xml2]; };
   mldr = derive2 { name="mldr"; version="0.4.0"; sha256="1nx21yyxfaiyxpbjkc5sif6pis5v2skisxcxdqk4479h54qzwlj3"; depends=[circlize shiny XML]; };
   mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.0"; sha256="0kbfaf39vkhvscw47bkx2mmc6cmgwz1cys62iiw3yb6kvkzddr3s"; depends=[]; };
   mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
@@ -8292,25 +8345,26 @@ in with self; {
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
   mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.11"; sha256="1fs62xzxgk75k3b4wkxh2qkij03m5i1bbmacgffwq4xak3mr64ma"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival]; };
+  mlr = derive2 { name="mlr"; version="2.12"; sha256="0qf1yl487jmg7w85vjd7wdky8agysi1xlvl20dnqrn2cms4h1q6g"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
   mlrMBO = derive2 { name="mlrMBO"; version="1.1.1"; sha256="1r6p5ph7nyqs6cqqsg04mass1zppys75n8448lv6iadlm499jzg8"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
-  mlt = derive2 { name="mlt"; version="0.2-1"; sha256="0ir792clkfzvxl2w1r0akbp7isi7jspq3blhkrzh2rsf15x48fha"; depends=[alabama basefun BB numDeriv quadprog sandwich survival variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="0.2-1"; sha256="08va5gfsl71ijrrij0kyr7icjbpfm0wxfvp0554sxvmca75bqqcl"; depends=[mlt numDeriv]; };
+  mlt = derive2 { name="mlt"; version="1.0-0"; sha256="0vbja0sxjg3a5gpa8wwnj1fvr8kkvkpzhim6lssvyy7kcb44fcya"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
+  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-0"; sha256="1shhf5pk90cfia51a0qnbg8pvvv5n86d3mjy961rjs1wj30vj3yd"; depends=[mlt numDeriv]; };
   mltools = derive2 { name="mltools"; version="0.3.4"; sha256="18dxhims684a6fk44nrzdnry8dpxs69wim8kd7zamp8zdhy38kyy"; depends=[data_table Matrix]; };
-  mlxR = derive2 { name="mlxR"; version="3.2.0"; sha256="1a0104h4b0qag20xv5sg8m4b0ndvz843lnc4jypfxns3bi5k4v1m"; depends=[ggplot2 Rcpp XML]; };
-  mma = derive2 { name="mma"; version="6.0-0"; sha256="1wb6d8943yfi85d6s1bk8j853lkni4yk876pnjziq16x93lgkjsv"; depends=[car doParallel foreach gbm gplots plotrix survival]; };
+  mlxR = derive2 { name="mlxR"; version="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; };
+  mma = derive2 { name="mma"; version="6.1-0"; sha256="1rrnm7szlaly8klqgi8wdh5qvfx4kx5bkl1q2y9y6zjpxmb4zvi6"; depends=[car doParallel foreach gbm gplots plotrix survival]; };
   mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; };
   mmap = derive2 { name="mmap"; version="0.6-15"; sha256="0p3dsq0vffb0x0i8xh8p1r0b2hwk4zfi6nbwsi3cyaj1m7dzm0fh"; depends=[]; };
   mmapcharr = derive2 { name="mmapcharr"; version="0.1.0"; sha256="0szabsacbqm51jw4q4pg304vvgqsqna5c7q1sh3f54za6dddmyxw"; depends=[BH Rcpp]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
-  mmcm = derive2 { name="mmcm"; version="1.2-6"; sha256="0lk2lk8j4hq6shw3vpq53gvh2w1gwkayvgfny4i04k5fglbwivg7"; depends=[mvtnorm]; };
+  mmcm = derive2 { name="mmcm"; version="1.2-7"; sha256="11dgb8crz5pjpx66cxxzn4lg58jbaxxhfqlcw3hdp9wpvyqjh3sb"; depends=[mvtnorm OpenMPController]; };
   mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; };
   mme = derive2 { name="mme"; version="0.1-5"; sha256="07k1xagwpyzsrlc00y9xlaxcpwdhz55v567i7fzvqa96ical8nlf"; depends=[MASS Matrix]; };
   mmeln = derive2 { name="mmeln"; version="1.2"; sha256="1kcfq5y2fzsrbjyvh6dfp734ly7alj9vrjikzadlz33s7wjanh79"; depends=[]; };
   mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; };
   mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
   mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
+  mmmgee = derive2 { name="mmmgee"; version="1.11"; sha256="0q7gf8r48vw4rxq7b848hcfz9iqw89sld4ra33n6kb2jqczv49xi"; depends=[Matrix mvtnorm]; };
   mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
   mmpf = derive2 { name="mmpf"; version="0.0.4"; sha256="1lskpnhqiimf7ch5xg5f0mpvhxy18a5w9daxpp4133vx1dydm4c2"; depends=[checkmate data_table]; };
   mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; };
@@ -8343,7 +8397,7 @@ in with self; {
   moderndive = derive2 { name="moderndive"; version="0.1.1"; sha256="11xxklaqizlx36nyx3nzj9xkszg99qsmjqmr59z235h4wkrw8xg3"; depends=[assertive broom dplyr formula_tools janitor knitr magrittr rlang stringr tibble]; };
   modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; };
   modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; };
-  modifiedmk = derive2 { name="modifiedmk"; version="0.1.1"; sha256="1hn079nxgn1h8p89r93g8zxhpr0l6x9c6jzvvs8wmyvh7s9yahla"; depends=[]; };
+  modifiedmk = derive2 { name="modifiedmk"; version="0.1.2"; sha256="1ajllhv33sdqa6bdylb6hs68kkk75qa1abv6kmnfix9k2g0bqlxq"; depends=[]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
   modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
@@ -8357,7 +8411,7 @@ in with self; {
   mombf = derive2 { name="mombf"; version="1.9.6"; sha256="01qvgxiw0wqp7j4l1qkdy88fvmydz5il09k6nrblbq0sfjf0khmq"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
   momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; };
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
-  momentuHMM = derive2 { name="momentuHMM"; version="1.3.0"; sha256="0cbdmx1rq4524xphc3ncjfz5gqdp5k2zmndg1fifqzjc2n3qki9l"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat LaplacesDemon MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp survival]; };
+  momentuHMM = derive2 { name="momentuHMM"; version="1.4.0"; sha256="0dfnxq16a2hyy1a4w7v55f6mp62xhldwsj2v54yw4s2d21dqir4y"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat LaplacesDemon MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo sp survival]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
   mongolite = derive2 { name="mongolite"; version="1.5"; sha256="06qry561kdg4lxvdayghmhmgb94sqy16gxjp081xnmya0vqf9wjy"; depends=[jsonlite openssl]; };
@@ -8433,13 +8487,14 @@ in with self; {
   msde = derive2 { name="msde"; version="1.0.3"; sha256="18l5ca4s1ryyb9i0zsb03klm53f25klwyg171dqkn5z4bqwznp2m"; depends=[Rcpp RcppProgress]; };
   mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
   msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
+  msgpack = derive2 { name="msgpack"; version="1.0"; sha256="1j1nnca9nm3l1r4wjjlb15zr8p6zw1lcgyj4383ndy156bbh1f5a"; depends=[]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
   msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; };
   msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; };
-  msma = derive2 { name="msma"; version="0.7"; sha256="0rrxxva71j8gk25hi6hycnyrhrdc0skcaj1bnmh029cqhjl3qma5"; depends=[mvtnorm]; };
+  msma = derive2 { name="msma"; version="1.0"; sha256="1pq1m8hrvpfjh89wiz4f3jlzlp620clxzash5061zbhm0xjmxjpd"; depends=[mvtnorm]; };
   msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; };
@@ -8463,7 +8518,7 @@ in with self; {
   multcomp = derive2 { name="multcomp"; version="1.4-8"; sha256="0fm78g4zjc6ank316qfw977864shmy890znn4fahwc8jjdhpc252"; depends=[codetools mvtnorm sandwich survival TH_data]; };
   multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
   multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
-  multfisher = derive2 { name="multfisher"; version="1.0"; sha256="1pc3f6f87n29cb4caszp4arpy33pc3a0iwmrqinhyw66xjnqm8qp"; depends=[]; };
+  multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; };
   multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; };
   multiApply = derive2 { name="multiApply"; version="1.0.0"; sha256="1hlrh5v52ym226dg4by0hxbkbpv4qsmmbaraxiyywsmwh3nx2fw8"; depends=[abind doParallel foreach plyr]; };
   multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
@@ -8485,7 +8540,7 @@ in with self; {
   multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
   multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
   multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
-  multimode = derive2 { name="multimode"; version="1.0"; sha256="00cv1h3qrk1wgkvq69kqis0jb3yhpcsrww80y6gh8ziyr6kcwx1f"; depends=[diptest ks rootSolve]; };
+  multimode = derive2 { name="multimode"; version="1.1"; sha256="0dhzpvw71szyw454gi7460yr46j1vas109xgwyz9h6kwm6gi5ysn"; depends=[diptest ks rootSolve]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
   multinet = derive2 { name="multinet"; version="1.1.1"; sha256="13f7gqf45ydnyiv36gwcrc8mgv5gy61fak0in7f8bss4bvfldbxx"; depends=[igraph Rcpp]; };
   multinets = derive2 { name="multinets"; version="0.2.0"; sha256="05m0xin8wxshmwb3b9cgsvi8037wvmirbyyim1xxx2ppfwrdr2a6"; depends=[igraph Rcpp]; };
@@ -8537,7 +8592,7 @@ in with self; {
   mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; };
   mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; };
   mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
-  mvmeta = derive2 { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
+  mvmeta = derive2 { name="mvmeta"; version="0.4.11"; sha256="1h1393s7xdi4sv461srsard6w961mcxxmxq9mkmfsgw5hdmkwkr2"; depends=[]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
   mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; };
   mvnfast = derive2 { name="mvnfast"; version="0.2.5"; sha256="122zjzr0v4943cax10lp6flwfv479mncvalaj09kb173s5rgmf91"; depends=[BH Rcpp RcppArmadillo]; };
@@ -8573,13 +8628,14 @@ in with self; {
   nabor = derive2 { name="nabor"; version="0.4.7"; sha256="16dxnvq6yxlrignzvxjdwzwm32fn2a8bsjqjsg5qz94ir7g3pzm6"; depends=[BH Rcpp RcppEigen]; };
   nadiv = derive2 { name="nadiv"; version="2.14.3.1"; sha256="08276bakyrn9d9vh08yzan60kigsihwfhgx788gwp6pk8v6m25wa"; depends=[Matrix]; };
   naivebayes = derive2 { name="naivebayes"; version="0.9.2"; sha256="0xmgcvvhfh7v8afi8fywaldawbx3s5hwgpvyyp2c9m6nrhw1kknl"; depends=[]; };
+  naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; };
   namedCapture = derive2 { name="namedCapture"; version="2017.06.01"; sha256="14zimn3wbavbkwra8vfmqdm1q5bmlmsbg0b29cjly5dd4zlfzzb0"; depends=[]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
   naniar = derive2 { name="naniar"; version="0.2.0"; sha256="04r3yfv6sv1yrwl4vasn5nxr0bn6fwdjk2zyx4p7vy8kfcw24300"; depends=[dplyr forcats ggplot2 glue magrittr purrr purrrlyr rlang tibble tidyr viridis visdat]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanotime = derive2 { name="nanotime"; version="0.2.0"; sha256="138qz844sczgzzl8vn5079590hnq96w7jdbn851cpw64gmq21r4w"; depends=[bit64 RcppCCTZ zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
-  nardl = derive2 { name="nardl"; version="0.1.2"; sha256="16qac9qgmv96iwsr5xbg24x4a1livpjb9qmfd0i8m3nv6858c7ah"; depends=[car Formula lmtest matlab strucchange tseries]; };
+  nardl = derive2 { name="nardl"; version="0.1.3"; sha256="1361bh94m4dzcijg1929av88sni4f5ccwwyxsrg7kcxdxl3zhqp0"; depends=[Formula gtools matlab strucchange tseries]; };
   narray = derive2 { name="narray"; version="0.4.0"; sha256="0cr0y8mqwprxk0bv9160xvqxgvqkihn3avzsjm6ccivvb8zlkqxv"; depends=[reshape2 stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
@@ -8601,16 +8657,17 @@ in with self; {
   ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; };
   ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
   ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; };
-  ncf = derive2 { name="ncf"; version="1.1-7"; sha256="0r3xhpinkcnkzc855q8ddd889v12snx4n1g8jyw9cnmrki8n2hxh"; depends=[]; };
+  ncf = derive2 { name="ncf"; version="1.1-8"; sha256="1hnx6k21ss1mp4llzbfxpsv2y7z1nxf4c46rwq3qpmvqhnw6hh9s"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
   ncmeta = derive2 { name="ncmeta"; version="0.0.2"; sha256="1qr0zfyy8g3zrmvg6i6b7sfvl3lavr391rqgf6pqhslg7i9cgpiz"; depends=[dplyr rlang RNetCDF tibble]; };
+  ncpen = derive2 { name="ncpen"; version="0.2.0"; sha256="1wrpscd9n7z9lz7537qyy4rn4pjznlb8zwb79kkzmnfvyj21fi1r"; depends=[Rcpp RcppArmadillo]; };
   ncvreg = derive2 { name="ncvreg"; version="3.9-1"; sha256="1v71r2k25n28lhpqsgzaaw48w1gwn0yjbir64hx5lchdbvd5k1j3"; depends=[]; };
-  ndjson = derive2 { name="ndjson"; version="0.5.0"; sha256="1ivwr9wm45ivk4jcc39hgqsyhilpisyhccks093iisx51vhxjjl0"; depends=[data_table dplyr dtplyr Rcpp]; };
+  ndjson = derive2 { name="ndjson"; version="0.6.0"; sha256="0w7a587q45hkzmjhzlyrhk0hw4c8avkfzf4ai0wib5qk3al8gk6n"; depends=[data_table dplyr dtplyr Rcpp]; };
   ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; };
   ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
   nearfar = derive2 { name="nearfar"; version="1.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; };
   neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
-  neat = derive2 { name="neat"; version="1.1.2"; sha256="13y81cnf3j1cncfr5ii3xbk2k11yi3wqgr54dlfzyfzlah26zp5p"; depends=[igraph]; };
+  neat = derive2 { name="neat"; version="1.1.3"; sha256="0d8igx576jhi7f666nwn0wpdyvin974k5cfm7wdszzbnpng5961k"; depends=[igraph]; };
   neatmaps = derive2 { name="neatmaps"; version="1.0.7"; sha256="07nr8c5i1s3sba4l2123vb50b1cgn1qjdckwmyjwwai1yb3smkag"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; };
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
@@ -8678,6 +8735,7 @@ in with self; {
   nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
   nlreg = derive2 { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
+  nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; };
   nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
   nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
   nlsem = derive2 { name="nlsem"; version="0.8"; sha256="0q3wk7x67mh2447ah807djyklia2x2d45krsskffynazm83msnj9"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; };
@@ -8694,6 +8752,7 @@ in with self; {
   nmathresh = derive2 { name="nmathresh"; version="0.1.2"; sha256="1ldxhk2ry3m8q0881fis403r303n431csmp0gp4785mafy476b5h"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
   nmfem = derive2 { name="nmfem"; version="1.0.0"; sha256="0bkw27b59knppfh4qnhrcs2j0mpxak7iyb7lskccv6ibym2kvljw"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
   nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; };
+  nmslibR = derive2 { name="nmslibR"; version="1.0.0"; sha256="12022g9jww718bqpp7yaapafnjxj29sx7mircj8a7zwww58a7v0q"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; };
   nmw = derive2 { name="nmw"; version="0.1.2"; sha256="1p2h13g0ss0v2jy0ii0r0qgf8i1f0dc8zhii05k2vr6cbiapslv3"; depends=[numDeriv]; };
   nneo = derive2 { name="nneo"; version="0.1.0"; sha256="0jaaz15y1csh3bwmzp7mgx86m3f0w3ykzb8qdvg8ak2grxw3wl6a"; depends=[crul data_table fauxpas jsonlite tibble]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
@@ -8742,7 +8801,7 @@ in with self; {
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
   novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
-  nowcasting = derive2 { name="nowcasting"; version="0.1.1"; sha256="02f6sd6baq5rqjfiz8a95zlgkijbs85l993wvlbma09kr54f1c3q"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL xts zoo]; };
+  nowcasting = derive2 { name="nowcasting"; version="0.1.2"; sha256="08f45k0z5k9fmf1k9sjg71jrnlvalkylimby8plqqxiza05ga25b"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL xts zoo]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   np = derive2 { name="np"; version="0.60-6"; sha256="1y72x5j9j9mcgcy2xizk31gl843hfkngxdn8s4qw7yhw2qj79hsr"; depends=[boot cubature quantreg]; };
   npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; };
@@ -8796,12 +8855,13 @@ in with self; {
   nycflights13 = derive2 { name="nycflights13"; version="0.2.2"; sha256="1857pwyhb5gvbdxv934nlc50n4ai7njm89js7b7ywfg7mhgha4yc"; depends=[tibble]; };
   nyctaxi = derive2 { name="nyctaxi"; version="0.0.1"; sha256="187fs819g45f8irx2s9bgwnzr00lyamfv2ra88kyb8q2cq1icwwy"; depends=[DBI dplyr etl rlang stringr]; };
   nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; };
-  nzpullover = derive2 { name="nzpullover"; version="0.0.2"; sha256="0c50854dhvjmhh8c34w9w0r8v8wk5j8bi6j81m5wpcd2jxrkbw4f"; depends=[]; };
+  nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; };
   oXim = derive2 { name="oXim"; version="1.2.1"; sha256="1qjscjq5v50v7kwbmiz1niylwpnh20g5qldyxn7fw0kkqs398sk0"; depends=[gstat imagine R_matlab sp]; };
   oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
   oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
   oai = derive2 { name="oai"; version="0.2.2"; sha256="0q1w29wrppi5sfabdw8px7zr92bgri3jhy0y7dhi46xggxfg9vm1"; depends=[httr plyr stringr tibble xml2]; };
   oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; };
+  oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; };
   oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; };
   obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; };
   objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
@@ -8831,6 +8891,7 @@ in with self; {
   oem = derive2 { name="oem"; version="2.0.7"; sha256="12z6cgkm8yyk9dz3s1bswccn7vrvca2wiqz0ylr65q88ws828snz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
   officer = derive2 { name="officer"; version="0.2.1"; sha256="0l8xj6zsklh2dyl6kn4piv5wjalqm1ifakxh31zfz714s9w0y8qj"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp uuid xml2 zip]; };
   oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; };
+  ohtadstats = derive2 { name="ohtadstats"; version="1.0"; sha256="1wpil3ag7vzinz4ky7jpzny88a4ycfifbhayyib9cldk8d0mbcgh"; depends=[lattice]; };
   oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
   okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
@@ -8846,24 +8907,26 @@ in with self; {
   onewaytests = derive2 { name="onewaytests"; version="1.6"; sha256="0xxqsqnk0s9w0xjj3ixghm9d1yg9fhq5lc5xyicfimnigb13hddl"; depends=[car ggplot2 moments nortest]; };
   onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
+  onlineVAR = derive2 { name="onlineVAR"; version="0.1-0"; sha256="1hqriwrlxhbi5v5wpqxfvvcb6np1iaarb3zf84ykfzi4llqqgz24"; depends=[lattice]; };
   onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; };
+  onnx = derive2 { name="onnx"; version="0.0.1"; sha256="0yzvgcpqad19sw9mhh3dfci1cqa7p3i1ssmpjyycy7rkqq8kb0xs"; depends=[reticulate]; };
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.4"; sha256="168m4jdwbzv8lpimx9063306691hnfdjmdhb5y8195d9vcq049jr"; depends=[]; };
   ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
   oompaBase = derive2 { name="oompaBase"; version="3.2.5"; sha256="0269jmdw236jy008ic6iwg9y2fq674alqvd5zdvy1k2grxm72hvw"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  openEBGM = derive2 { name="openEBGM"; version="0.3.0"; sha256="04wj9z3w7dvdk818iv0xdqlkrc83frsf5sh1xs8bnbp6g0781jqn"; depends=[data_table ggplot2]; };
+  openEBGM = derive2 { name="openEBGM"; version="0.4.0"; sha256="0293cy1p3nh4q37qjjkzxivk6lw5sqs6n93hlmvr93ywz4h4wvyf"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; };
   openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; };
   openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
-  openair = derive2 { name="openair"; version="2.1-5"; sha256="19fqg05swsxqs19gi125h9xq43s44fxg51q05y4fhgsvxbvd7aj9"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj MASS mgcv plyr RColorBrewer Rcpp reshape2]; };
+  openair = derive2 { name="openair"; version="2.2-3"; sha256="0gp5q84r6psqd3900f74dm0qgiig6vhnm5400nbwjm0arp1jlyp7"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
   opencpu = derive2 { name="opencpu"; version="2.0.5"; sha256="1bs2z3y2zc3aqzfjh6bq3qrpzm106f5xhw7lbyng1bpcp4rch6y3"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
   opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; };
   openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; };
-  openssl = derive2 { name="openssl"; version="1.0"; sha256="1j8smqrb79lnaf2n9icksjiy641fcazsbkhmgg916s3nnyjngjz3"; depends=[]; };
+  openssl = derive2 { name="openssl"; version="1.0.1"; sha256="1qyql5gpwf88bkm1qarjhbqbq4hn6w0d8j4pxb5x7i96is30ap30"; depends=[]; };
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
   openxlsx = derive2 { name="openxlsx"; version="4.0.17"; sha256="1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi"; depends=[Rcpp]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
@@ -8920,13 +8983,12 @@ in with self; {
   ordinalCont = derive2 { name="ordinalCont"; version="1.3.0"; sha256="0zi9cfvkb811hhcplp159zpnmmk4rs0nid19gi4g9g3dgn9pa296"; depends=[boot]; };
   ordinalForest = derive2 { name="ordinalForest"; version="2.1"; sha256="1ancr7xdwhbqq3rj5hijrkjbrcaih8rqcx5r41mykrrp1k1s55dd"; depends=[combinat ggplot2 Rcpp]; };
   ordinalNet = derive2 { name="ordinalNet"; version="2.4"; sha256="0c9k3p62d482sl0vg94xm6hllk2mic2nd1c5m4vhci5ycavqzdd3"; depends=[]; };
-  ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.3"; sha256="0ki91l6vvfxpzq7zgl3d08r5pzx47jxkgf7g0g95580xx2q7n7zx"; depends=[survival]; };
   ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; };
   ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
   orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; };
   orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
-  origami = derive2 { name="origami"; version="0.8.0"; sha256="09sw2chrb4bl285cvnhnjf3idbxdriqj17c8w510j7qs22jlnywb"; depends=[abind data_table future listenv]; };
+  origami = derive2 { name="origami"; version="1.0.0"; sha256="0692n4javr0lwxcd0b83sbbhxbmxxs41sjvlsq5bc5l7n140qaca"; depends=[abind data_table future future_apply listenv]; };
   originr = derive2 { name="originr"; version="0.2.0"; sha256="06n5qshk4dq6ac4prnhzymz7gcmp6m2zdc8d9d13ii7n7xa0ymx2"; depends=[data_table httr jsonlite taxize xml2]; };
   orloca = derive2 { name="orloca"; version="4.3"; sha256="0mc337rjmdhrg6aw2pyiz68y311d6znh9ppl4k0v0rgavapw2aml"; depends=[png ucminf]; };
   orloca_es = derive2 { name="orloca.es"; version="4.3"; sha256="1yqwvzqlk70jfr9qb50g7xb4spnff4yg5rc9lw37zx13lnn4kcva"; depends=[orloca]; };
@@ -8944,7 +9006,7 @@ in with self; {
   oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; };
   osi = derive2 { name="osi"; version="0.1.0"; sha256="1wzkvsqifk0g29jnpvykn26myq27pxll3glqlp74djkz0rbpv7aa"; depends=[httr]; };
   osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-  osmdata = derive2 { name="osmdata"; version="0.0.5"; sha256="12zfpgp4x5akh25w1f01g5rv4nqqzn2wwysak4vvwh8h7iha0ajc"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
+  osmdata = derive2 { name="osmdata"; version="0.0.6"; sha256="1sjaqsj0jxipg00raj20gszzjspgpy9ja37rfkx6jpaa2wh3ii87"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
   osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; };
   osrm = derive2 { name="osrm"; version="3.1.0"; sha256="12gbgjp3hq0vg0wf6xq0l9wgq0h6w4l0bfwmlnyhq26z9n08a1lq"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
@@ -8953,7 +9015,7 @@ in with self; {
   otvPlots = derive2 { name="otvPlots"; version="0.2.0"; sha256="1halgpk5ld5ihz0da69wf72l0624r73h2wjc0zjn8b8kw1v9xgzs"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
   ouch = derive2 { name="ouch"; version="2.11-1"; sha256="0xkwwi62vdahlcg3k32zb1nfwsx87zdssk79mvcxgfsw9bw4gahx"; depends=[subplex]; };
   outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; };
-  outbreaker2 = derive2 { name="outbreaker2"; version="1.0-0"; sha256="0s1i3z36x8bbpa8a35qbyr5qy9n6715v9v6by7mr24wj735bncgk"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; };
+  outbreaker2 = derive2 { name="outbreaker2"; version="1.0.1"; sha256="1v49i9z4kx9l485ib5q91s4z6r03lyijzjrr9zyjgham59rncyij"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; };
   outbreaks = derive2 { name="outbreaks"; version="1.3.0"; sha256="1k0g9x6wvdw8lkpjiv8z1ijp6pg5hri3gawx7zfpnm05g6ncvg81"; depends=[]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
@@ -8984,7 +9046,7 @@ in with self; {
   packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; };
   packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; };
   packcircles = derive2 { name="packcircles"; version="0.3.1"; sha256="0f2y651i96sa7b7mfxg5kinmhhzvcv18lia74fdpdnmc6fxlxg17"; depends=[Rcpp]; };
-  packrat = derive2 { name="packrat"; version="0.4.8-1"; sha256="1wvjyvb7yy6hq188msqzf8qa00lhll865jp939byc6d4zpscm0x2"; depends=[]; };
+  packrat = derive2 { name="packrat"; version="0.4.9"; sha256="1l0p59h0w0qdg5vlgq93932hpkidg6kd9cwg3ckn3vwms4sh2p7x"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; };
   paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; };
   pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
@@ -9004,7 +9066,7 @@ in with self; {
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
   paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; };
   paleobioDB = derive2 { name="paleobioDB"; version="0.5.0"; sha256="195w0jzg8bhlqbsd3shi161wqr9cff6q85ik0x8w4laazzxs0jhr"; depends=[gtools maps plyr raster RCurl rjson scales]; };
-  paleofire = derive2 { name="paleofire"; version="1.2.0"; sha256="10wsb8pxk842ifak4mkmhrinllrjy68vvzc9yq074x3vcxbvv509"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
+  paleofire = derive2 { name="paleofire"; version="1.2.1"; sha256="0f2bvwc370fjpacv4ipjr1gk6l4ni3lg6da2549zn6hqca0hyjis"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
   paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; };
   paleotree = derive2 { name="paleotree"; version="3.0.0"; sha256="1nk7j3l310c9wh5mqf0zw4cg6wmvx4c8pl06ahkknx3imslar96q"; depends=[ape phangorn phytools]; };
   palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; };
@@ -9049,9 +9111,10 @@ in with self; {
   parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
-  partialAR = derive2 { name="partialAR"; version="1.0.10"; sha256="18hw0azhvd3737wi5cy8ympwfrj6ag01w1a4csy6kl2kifldg6b7"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; };
-  partialCI = derive2 { name="partialCI"; version="1.1.0"; sha256="00gdr25zz327iscasm74bxj0k6h94m59qwaf9vf8xcqfpp0n22wa"; depends=[data_table FKF ggplot2 glmnet MASS partialAR Rcpp TTR zoo]; };
+  partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; };
+  partialCI = derive2 { name="partialCI"; version="1.1.1"; sha256="07c3484v8axqxss877dvb6d5gh4vrr8dbvcqgq2xgwb6wcs59nyy"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
   partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
+  particles = derive2 { name="particles"; version="0.2.1"; sha256="0rhxn3c62x3xc9lcy7xbg6r7pgfylan7cz24v8i9icjhl7xfswmv"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; };
   partitionComparison = derive2 { name="partitionComparison"; version="0.2.3"; sha256="1p0f08za30kpmj9ky4jw6i3nl38i7xrslwsj60ih7gvph2jd39ix"; depends=[lpSolve Rdpack]; };
   partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
   partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
@@ -9073,6 +9136,7 @@ in with self; {
   patentsview = derive2 { name="patentsview"; version="0.2.0"; sha256="1n599ksd4vdpfxdlq8bfc0h94v76qbsrrpd5p0q1c6cl083fvvzq"; depends=[httr jsonlite]; };
   pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
+  pathfindR = derive2 { name="pathfindR"; version="1.0.0"; sha256="1wwl7cxgdrvcyrzyv1jrhhp850fc512585ih5g24jmrfr6n0422h"; depends=[AnnotationDbi DBI doParallel foreach knitr org_Hs_eg_db pathview rmarkdown shiny]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
   pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
   pathological = derive2 { name="pathological"; version="0.1-2"; sha256="07g7ps6zfxi98y98kwas95rr5ybfd4bpih5mhkjafc7bn99254n2"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_reflection assertive_strings assertive_types magrittr plyr stringi]; };
@@ -9096,6 +9160,7 @@ in with self; {
   pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-2"; sha256="0dzwwffinn9bbb73dmmh88c374f9057bl0a8dq97fbv63j4a5qpc"; depends=[]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
+  pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; };
   pbmcapply = derive2 { name="pbmcapply"; version="1.2.4"; sha256="0wh0ljy9nbb7ifh06bf79hwc2ci9482hdppgpa1zpz8x2mgyvy04"; depends=[future]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
@@ -9105,9 +9170,8 @@ in with self; {
   pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; };
   pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; };
-  pcadapt = derive2 { name="pcadapt"; version="3.0.4"; sha256="031ql3xppjkqrm17bvccj61hyf38skjb4qv6rs0l1h2ib8jql8ka"; depends=[ggplot2 MASS robust vcfR]; };
   pcalg = derive2 { name="pcalg"; version="2.5-0"; sha256="002y7b0r750nbnrg8w53q2fyvk13jk4jrqlf3f2777qw7si5vmz3"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
-  pccc = derive2 { name="pccc"; version="1.0.0"; sha256="1z9vr6r5mnk73gk5p4qk7mnmn065b55kbsgr414nrkii0in6g0sp"; depends=[dplyr Rcpp]; };
+  pccc = derive2 { name="pccc"; version="1.0.1"; sha256="1br157yip3cizd05rgw22shrvjz2jrd6kad3dkswayksx8wrnvhz"; depends=[dplyr Rcpp]; };
   pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; };
   pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; };
   pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; };
@@ -9138,7 +9202,7 @@ in with self; {
   pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; };
   pec = derive2 { name="pec"; version="2.5.4"; sha256="1gi8vvdj3mwpi5rgfqci1lan1a34nbcyyypwa171sfj7j1m770r3"; depends=[foreach prodlim rms survival timereg]; };
-  pedantics = derive2 { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; };
+  pedantics = derive2 { name="pedantics"; version="1.6"; sha256="08d13igjprqb8l2i8y07rn8pdq6bvjy8bf2ccpixv34d8cg5758j"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; };
   pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
@@ -9155,7 +9219,7 @@ in with self; {
   pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
   pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; };
   pendensity = derive2 { name="pendensity"; version="0.2.10"; sha256="023gl993jniv5r8l9nkaha7v6k2rb1hxm7z543dpr4186kjbi7zl"; depends=[fda lattice]; };
-  pense = derive2 { name="pense"; version="1.0.8"; sha256="0qlqlgk9hl7x3937k397kany7rq8ffi837771sk5rccidiawm9bg"; depends=[Matrix Rcpp RcppArmadillo robustbase]; };
+  pense = derive2 { name="pense"; version="1.2.0"; sha256="0wilfjhkj5hrgm7mak1hvlk07wrr3f774w26vyvbwlm8xsxxsbzz"; depends=[Matrix Rcpp RcppArmadillo robustbase]; };
   pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; };
   peperr = derive2 { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
   peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; };
@@ -9176,7 +9240,7 @@ in with self; {
   permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
-  personalized = derive2 { name="personalized"; version="0.1.3"; sha256="0xi13mcwr9h0fxb4ihfvjp7xvakskfvlcbbcfk4bvxfwp6yv7vv7"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
+  personalized = derive2 { name="personalized"; version="0.1.4"; sha256="0w6qvkbzpbsyjvsgadx59h49im4c03x8kyd39z2w825vznds9xmz"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
   personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; };
   perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
   perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
@@ -9189,17 +9253,16 @@ in with self; {
   pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
   pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; };
   pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; };
-  pgirmess = derive2 { name="pgirmess"; version="1.6.7"; sha256="1an7isajb4h04i2sfnssnxfi61v17fh803ddf8hmcfqkpig4yi6p"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
+  pgirmess = derive2 { name="pgirmess"; version="1.6.8"; sha256="1sy5jf356mylsr0bjmvdykcv1ssf60v4bnrsqjdqsrry9a7iyp7g"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
   pglm = derive2 { name="pglm"; version="0.2-1"; sha256="14hnlidf62kzcf83jc7k17n4hjjaj82scdwh8a7qxd056vygkqx2"; depends=[maxLik plm statmod]; };
   pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
   pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; };
   pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
-  ph2bayes = derive2 { name="ph2bayes"; version="0.0.1"; sha256="09ns3i5dgbn8573g4sism6d3y8jp26icy21l8d8px91jfhlx7kxv"; depends=[Rcpp]; };
+  ph2bayes = derive2 { name="ph2bayes"; version="0.0.2"; sha256="1xm7930gycxrz308dnfnp023yidqik52sbrli35f3773mnfcid2g"; depends=[Rcpp]; };
   ph2bye = derive2 { name="ph2bye"; version="0.1.4"; sha256="0h5d8d4bagkp6g0nb67cb225ki5p1amnclnfj6afgdcsli5clr67"; depends=[animation nleqslv Rcpp VGAM]; };
   ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; };
   phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
   phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
-  phantom = derive2 { name="phantom"; version="0.1.2"; sha256="15b770awvzjp8x44psifngnvsn2fs8s43v2lxj336r6k2iswpc9x"; depends=[gplots MASS NMF RColorBrewer Rcpp RcppArmadillo]; };
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
   phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
   phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
@@ -9211,7 +9274,7 @@ in with self; {
   pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; };
   phenoCDM = derive2 { name="phenoCDM"; version="0.0.2"; sha256="07fmljdn5dg9v2mv0k7hjk7xlldhvzvcxia8vda0xkpn3hlrriid"; depends=[rjags]; };
   phenology = derive2 { name="phenology"; version="6.0.3"; sha256="17idd9znwmgsa6wzijc4ahvlld4qp6sihyg3cdv91gfl0yjd51w1"; depends=[HelpersMG lmf numDeriv optimx]; };
-  phenomap = derive2 { name="phenomap"; version="1.0.1"; sha256="1v25aga9lnph3z8pn887a5phl720a3mpk96bmxvjy89633rvjxk4"; depends=[dplyr phenex plyr raster rgdal stringr]; };
+  phenomap = derive2 { name="phenomap"; version="1.2.0"; sha256="1lz0sjpk8nj9v2fxqzwhcdppjy3hafb3ag2lbi3v85lc9ngwccdd"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; };
   phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; };
   phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; };
   philentropy = derive2 { name="philentropy"; version="0.0.3"; sha256="00fpbmxg8m8apjb6cdrhh9rw3vp1j65ccvsqj1xlfcn1x5l1h3h8"; depends=[dplyr KernSmooth Rcpp]; };
@@ -9220,12 +9283,14 @@ in with self; {
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
   phonics = derive2 { name="phonics"; version="1.0.0"; sha256="02bkw589iijlzbw0cbg9qhq99jij2p92cqrxa77chkly4naqkqds"; depends=[BH Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.18-1"; sha256="0sn6avmic8vad6xs84hbw4scmrififn398gz0qmnbgbld3qqbxjq"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
+  photobiology = derive2 { name="photobiology"; version="0.9.19"; sha256="1islzlsj37y41c30r1cqmi646596n5b2swx8csxl0l1lrz0h8nnd"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
   photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.4.4"; sha256="14aiw5jxd6wnngy1rbbm85l0yx64nxrancal017wvr5n867c32d6"; depends=[photobiology]; };
   photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.13"; sha256="1zagvdaiv8d5frwki20wwvbyw4a9in3k8560janbmd161xh13ii0"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 tibble]; };
   photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; };
-  photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.1"; sha256="19pzb12qisv5hy7rps0dp9bq8zanpyr2yn41i6rd8hk80fknjha6"; depends=[photobiology]; };
+  photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.2"; sha256="0fcin04xc2k39qdipslqd3w3bsd8yl3xlvg7mlgm3aphfwg4hnmj"; depends=[photobiology]; };
   photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; };
+  photobiologySensors = derive2 { name="photobiologySensors"; version="0.4.0"; sha256="1d0rphlx6k2hqvmhndbw143djsfr4fmwjih3s37bhksc2dn7nh2v"; depends=[photobiology]; };
+  photobiologySun = derive2 { name="photobiologySun"; version="0.4.0"; sha256="0aczf1ki623pflsnn08z0nrsx7wwn67b8ql08ar08rpk1bj93nfy"; depends=[photobiology]; };
   photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.2"; sha256="0l1784xi9hzsxmiqipv0zkb4lq1xd9f890rzsgsjb0km6js5x3q7"; depends=[photobiology]; };
   phrasemachine = derive2 { name="phrasemachine"; version="1.1.2"; sha256="1145c8ymarhbza8253rw4ybnq0k5pcckqxpdcr8s2y23pj182r1p"; depends=[NLP openNLP stringr]; };
   phreeqc = derive2 { name="phreeqc"; version="3.3.10"; sha256="0hcdjj1wgfknqf5yx50b9vz5f72siw4dslyvk2xbrfnwbzzz4qib"; depends=[]; };
@@ -9236,7 +9301,7 @@ in with self; {
   phyclust = derive2 { name="phyclust"; version="0.1-22"; sha256="0c3w1vafhcshnh5lkb6bykk6w7w91qigz3sf215zqmrra1acri0d"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
   phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; };
-  phyloTop = derive2 { name="phyloTop"; version="2.1.0"; sha256="1a6r4fd2zv5napvdj2lqljccwsnd5mjkd1wzl18hvx7qzxvrna8c"; depends=[ape igraph NHPoisson phylobase]; };
+  phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; depends=[ape igraph NHPoisson phylobase]; };
   phylobase = derive2 { name="phylobase"; version="0.8.4"; sha256="00hh53ibr7ddck4rl1rz9bpjsvjym040c5f78l1yizv6q9rakhfp"; depends=[ade4 ape Rcpp rncl RNeXML]; };
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; };
   phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
@@ -9260,7 +9325,7 @@ in with self; {
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
   piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; };
   pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; };
-  pillar = derive2 { name="pillar"; version="1.1.0"; sha256="1gh3j2pbbf5y4d5nyqnlr0x27jjyvjjspcccmw61airs1n6rx8jq"; depends=[cli crayon rlang utf8]; };
+  pillar = derive2 { name="pillar"; version="1.2.1"; sha256="1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd"; depends=[cli crayon rlang utf8]; };
   pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; };
   pinbasic = derive2 { name="pinbasic"; version="1.2.0"; sha256="1sn4q9g2pw8z6gyxi302bd7p578ldy1g6419w56z7jgv7m8n7g73"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
@@ -9279,7 +9344,7 @@ in with self; {
   pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; };
   pivottabler = derive2 { name="pivottabler"; version="0.4.0"; sha256="1q7gmfrqx3sn32q9rrr0y3hywq0fvm5gs5d3jj6mqcbs53jqvzqc"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
   pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; };
-  pixiedust = derive2 { name="pixiedust"; version="0.8.1"; sha256="1cpxsh3y9k66mkmks7mn3q4zjix1i8jc0dl62wrwwsp379vxcc3r"; depends=[broom checkmate dplyr Hmisc htmltools knitr magrittr scales stringr tidyr]; };
+  pixiedust = derive2 { name="pixiedust"; version="0.8.2"; sha256="0p04bs0p52k38qn1mv7qcsyilqbcaq3gnksvk9ij8j6r2qr4l8h4"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; };
   pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
   pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; };
   pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; };
@@ -9298,7 +9363,7 @@ in with self; {
   plantecophys = derive2 { name="plantecophys"; version="1.3-2"; sha256="1jj9rkhdmcnmp6fzbxmkfwmsdx2w7v923rv0xn5c5iv7wys7vwfm"; depends=[]; };
   plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; };
   plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; };
-  platetools = derive2 { name="platetools"; version="0.0.2"; sha256="0xan3h3djhgjbqn8f7yzlkm25l0fzq86zhb5xwfib4yajnb2dspa"; depends=[dplyr ggplot2 plyr RColorBrewer]; };
+  platetools = derive2 { name="platetools"; version="0.1.0"; sha256="1cx01hspha59w1vd33kv8prapjinfipv1ikli97zhxrcs45r6v07"; depends=[dplyr ggplot2 plyr RColorBrewer]; };
   playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
   pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; };
   pleio = derive2 { name="pleio"; version="1.5"; sha256="1y9nkv5bzfkzbl373405v3xq54nz37wjz9zkxfzl8ggr5i9lcbqy"; depends=[Matrix rms]; };
@@ -9322,7 +9387,7 @@ in with self; {
   plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; };
   plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
   plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; };
-  plotmo = derive2 { name="plotmo"; version="3.3.4"; sha256="1j2nc6n5kv6zvxwlr1cr1shxdcihw7d5k7z0a90phmdp834x8agy"; depends=[plotrix TeachingDemos]; };
+  plotmo = derive2 { name="plotmo"; version="3.3.5"; sha256="1hiak4gg73ifml24mx1bjhgwqx9706v2mk5pxh59jvbrrc6mzvf4"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
   plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; };
   plotrix = derive2 { name="plotrix"; version="3.7"; sha256="0rw81n9p3d2i03b4pgcfj5blryc94f29bm9a4j9bnp5h8qjj6pry"; depends=[]; };
@@ -9346,8 +9411,8 @@ in with self; {
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
   plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; };
-  pmap = derive2 { name="pmap"; version="0.3.2"; sha256="0mg3h4j0icnl58844b04vgl3yi18j92457da7s7cx79w0a2zpcsq"; depends=[data_table DiagrammeR dplyr stringr]; };
-  pmatch = derive2 { name="pmatch"; version="0.1.1"; sha256="1vksygllism4dbdds3r5gikxjrq4mg9s21k3srpq05jk4s3j2xgh"; depends=[dplyr glue purrr rlang tibble]; };
+  pmap = derive2 { name="pmap"; version="0.6.0"; sha256="1g7das8bbp31r6syzn3zbxb8han1lqs9zpija7z8w2jpbw7gj4lb"; depends=[data_table DiagrammeR dplyr lubridate shiny stringr]; };
+  pmatch = derive2 { name="pmatch"; version="0.1.2"; sha256="1sbd02q2jqjqnh269m9f83mk0vbhh4mqqv0p23p6rj6gz0wljz9c"; depends=[dplyr glue purrr rlang tibble]; };
   pmc = derive2 { name="pmc"; version="1.0.2"; sha256="1pamxg2cwyg36w0xnggrv5w03lb12l25z2da7xm1jvr17h0ipqmh"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
@@ -9360,7 +9425,7 @@ in with self; {
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
   poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
-  pocrm = derive2 { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
+  pocrm = derive2 { name="pocrm"; version="0.11"; sha256="04snn7k8baf2ymjzr3zkxd425r5dq9h6abr5dm10mhfjqj1njpq0"; depends=[dfcrm nnet]; };
   poibin = derive2 { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
@@ -9376,7 +9441,7 @@ in with self; {
   polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
   poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
   politeness = derive2 { name="politeness"; version="0.2.2"; sha256="06h4g9xbk5dbaqzhybqc0mppa61ypb7ryi6hghqnqyj32y8r6dbr"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
-  pollen = derive2 { name="pollen"; version="0.53.00"; sha256="0gkmy5g16794zrr21g6yap0k4xl1bvsq5npyivsdflvvrg985nzw"; depends=[dplyr lubridate purrr]; };
+  pollen = derive2 { name="pollen"; version="0.70.0"; sha256="1hk9sjxzwglj98ryic3m80lajzv1klnq9dl6i97c8f0ihbf97zdq"; depends=[dplyr lubridate purrr]; };
   pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; };
   polmineR = derive2 { name="polmineR"; version="0.7.5"; sha256="0yz2c915jrf3dqadi6px9jidfwr4jd23rjrpas4xg4m6dx0f70jm"; depends=[data_table DT jsonlite Matrix pbapply R6 slam tm]; };
   polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
@@ -9399,7 +9464,7 @@ in with self; {
   pomp = derive2 { name="pomp"; version="1.16"; sha256="1ns1ygza76dqrrscm7ajv3pbf5wgvcfsfbjxc20b50z30zjm7712"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
   pompom = derive2 { name="pompom"; version="0.1.4"; sha256="0j37gq6lfccypclhrp7w3yfgsjbhfgqwg7x87r6rgywz6b3fnsgh"; depends=[ggplot2 lavaan qgraph reshape2]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
-  pool = derive2 { name="pool"; version="0.1.3"; sha256="0ca51zi6nx62dlrg0156a6iilrfmvq6hz6hx83qrd5g7wmjmpkrp"; depends=[DBI dbplyr dplyr later R6]; };
+  pool = derive2 { name="pool"; version="0.1.4"; sha256="0k209n40l2kwahy7b6hjwj1l19pdhnnq36jzxjmhv5zdad7dmckq"; depends=[DBI dbplyr dplyr later R6]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
   popEpi = derive2 { name="popEpi"; version="0.4.4"; sha256="010nsb3jlz769i8srkd3528a52h9gpw7q7gn4vraz9nx8g8585bs"; depends=[data_table Epi survival]; };
@@ -9434,11 +9499,12 @@ in with self; {
   powerlmm = derive2 { name="powerlmm"; version="0.1.0"; sha256="0fsd3h94va5hn0nqxdalchw02s4daxq8dlgdxb5a4nigg64lfkm2"; depends=[ggplot2 ggsci gridExtra lme4 lmerTest MASS Matrix pbmcapply scales testthat]; };
   powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
   powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; };
-  ppcSpatial = derive2 { name="ppcSpatial"; version="0.1.0"; sha256="0dcp94g5b2wcw388z100kaz8m48xxzi9rjaypj9pdjx3mwh0bxmj"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; };
+  ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; };
   ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; };
   ppclust = derive2 { name="ppclust"; version="0.1.1"; sha256="10fcyayda634lg5g992g21casqx5k0jni9r30km5rczzib7cz9gg"; depends=[inaparc MASS]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GO_db GOSemSim igraph]; };
+  ppitables = derive2 { name="ppitables"; version="0.1.2"; sha256="1hw25zvvbmc6vxbhcrpz9xkwc6lbc9v1r77fil3gv2wm5n672s4h"; depends=[]; };
   ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
   pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
@@ -9450,7 +9516,7 @@ in with self; {
   prais = derive2 { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
   praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
-  praznik = derive2 { name="praznik"; version="3.0.0"; sha256="0fxs7nvpg8vifc5x48g1lr7cpi0v24rnl28fjiwq5730hypmm8nj"; depends=[]; };
+  praznik = derive2 { name="praznik"; version="4.1.0"; sha256="1f652s1gpc2sw2i9xd4ga22kpdbihwpkb3a8csvycm07dhgynv03"; depends=[]; };
   prc = derive2 { name="prc"; version="2018.1-31"; sha256="0xvf1f202qwpjb1kh469jk45l592q7bfzngyi8ifry94bi7mphp7"; depends=[kyotil nlme]; };
   prcbench = derive2 { name="prcbench"; version="0.7.3"; sha256="0xdmwjhxpcdaiqawhmlpr4ddlx22xk3rywa70jpm1vk5hc9pwivk"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
@@ -9522,20 +9588,20 @@ in with self; {
   profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
   proftools = derive2 { name="proftools"; version="0.99-2"; sha256="1vx0270sgx15dl6x3nnx13v5y4c0m18yvrhiycl429zky0jzxfr0"; depends=[]; };
-  profvis = derive2 { name="profvis"; version="0.3.4"; sha256="0kx184gxhacnhk6kfj650v4a5bzlgfwls7y9rn813diyg60xbmzh"; depends=[htmlwidgets stringr]; };
+  profvis = derive2 { name="profvis"; version="0.3.5"; sha256="0wkpmjlrfrvrn0pp81n7cbxg8xzi796d0mxfi1v7m41x6z43fm6a"; depends=[htmlwidgets stringr]; };
   progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; };
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   progress = derive2 { name="progress"; version="1.1.2"; sha256="1fxakchfjr5vj59s9sxynd7crpz97xj42438rmkhkf3rjpyspx59"; depends=[prettyunits R6]; };
   proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
   projections = derive2 { name="projections"; version="0.0.1"; sha256="1qrgazxdihzp1i4aghkwkh6q5g1all39bvd83gwh4hj9pxm2w5zy"; depends=[distcrete ggplot2 incidence]; };
-  projector = derive2 { name="projector"; version="0.0.1"; sha256="0l3nfy5s3xj4cl96h74ss6ndpir33kk3gj4q1fjd5invx6f75spx"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; };
-  projmanr = derive2 { name="projmanr"; version="0.1.0"; sha256="0mfp1b00a5ndw7011q3jivxm8bsykm6q7pm7dplmqffgs0p3drvv"; depends=[ggplot2 igraph R6 tidyr]; };
+  projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; };
+  projmanr = derive2 { name="projmanr"; version="0.1.1"; sha256="0mmfmp5qf4r75q4hjbra2pxym77m16g28n94z5yj2qdzq46hgl4c"; depends=[ggplot2 igraph R6 tidyr]; };
   projpred = derive2 { name="projpred"; version="0.7.0"; sha256="1n2lwzc3hvjr4d6csc2nqlxqcrr979h52lfvbr81alybkg1nbqch"; depends=[ggplot2 loo Rcpp RcppArmadillo rstan rstanarm]; };
   promote = derive2 { name="promote"; version="1.0.1"; sha256="1f8f5rm25fx4146hf3rds2lb7qpfz17fa5r2a1f4s3q5p86svgqn"; depends=[httr jsonlite stringr]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; };
   propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
   propagate = derive2 { name="propagate"; version="1.0-5"; sha256="168ya3a74fjqwl9bzsb3ywzypb90h8snymgvxryrx7plrfcmwlav"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
-  properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; };
+  properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; };
   prophet = derive2 { name="prophet"; version="0.2.1"; sha256="10qd3w9jgk3d53465005b0di2lxa6cg67lj81fzmf2h919ai9i5m"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
   propr = derive2 { name="propr"; version="3.1.4"; sha256="1hggj926zphhg6v09bbrv77rp11bg6vciy3xfnkqi2hakjw3ak59"; depends=[fastcluster ggplot2 igraph Rcpp]; };
@@ -9592,6 +9658,7 @@ in with self; {
   pubh = derive2 { name="pubh"; version="0.1.7"; sha256="0dha3adlbrxgkamlb5i2lcnqcsspqb30fmj0f2zhz0bh4i83lznb"; depends=[bookdown car descr Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival visreg]; };
   pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.11"; sha256="01b4dd28x3a25d0s8k0dwbcr6asaqh2b9c4fddg683i54q483lkd"; depends=[boot R2HTML RCurl XML]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
+  pulsar = derive2 { name="pulsar"; version="0.3.1"; sha256="0y72wpxa9rqjzyqrfpl1sa06zpx6rbxi4jfncxzac8m534l5l7l5"; depends=[Matrix]; };
   pulver = derive2 { name="pulver"; version="0.1.1"; sha256="0zj3a66hjing4a87lvhxlvdp72kpn0s2d6r5kc0pi06ls04r8sax"; depends=[DatABEL Rcpp]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
@@ -9603,7 +9670,7 @@ in with self; {
   pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; };
   pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
   pweight = derive2 { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; };
-  pwr = derive2 { name="pwr"; version="1.2-1"; sha256="0k3jzx7jjgzha3vkpknj9nvx4yqlc9rq0mw25shvzi0xbr1y2cdb"; depends=[]; };
+  pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; };
   pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; };
   pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; };
   pwrFDR = derive2 { name="pwrFDR"; version="1.85"; sha256="1al8dh5h32lipnqfa823wwx7nsrz8z3fadl7hz4qvj8vpfijpz1i"; depends=[]; };
@@ -9628,7 +9695,7 @@ in with self; {
   qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
   qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
   qdap = derive2 { name="qdap"; version="2.2.9"; sha256="19jlh6k3vw6c20xfygn20dgs86h2a16imn23afgxlfggbazwxjyd"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
-  qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
+  qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; };
   qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; };
   qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; };
   qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
@@ -9638,7 +9705,7 @@ in with self; {
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
   qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
   qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; };
-  qicharts2 = derive2 { name="qicharts2"; version="0.3.0"; sha256="0z9ym2pzl1psqp67hd69vmq729xzdhr9lcrxk2dv387547xhf3h1"; depends=[dplyr ggplot2 scales]; };
+  qicharts2 = derive2 { name="qicharts2"; version="0.4.0"; sha256="0dd7jn7g7b85yvq39ykl75jdixk3dpinscsizxqwcfcjyhpvszq6"; depends=[dplyr ggplot2 scales]; };
   qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
   qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; };
@@ -9668,8 +9735,8 @@ in with self; {
   qrng = derive2 { name="qrng"; version="0.0-3"; sha256="0xdhmcqvgjmrf4c72x76yz5kp0jiysy8q6f67lix1h4mvzr4q2qd"; depends=[]; };
   qrnn = derive2 { name="qrnn"; version="2.0.2"; sha256="0w4gzignkfrx220fk9j4by0ibr4r9s66il0f43k6abf0czvqdxx4"; depends=[]; };
   qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; };
-  qtbase = derive2 { name="qtbase"; version="1.0.12"; sha256="0j3nzmh4xj0mzwlh9dsc3296yqbkhzn6qhzb8ismhi0bmx5hjydj"; depends=[]; };
-  qte = derive2 { name="qte"; version="1.2.0"; sha256="1l911z52v3jp0b2agvwfny8d4yq0llrdp873j4mw696x50awj8py"; depends=[BMisc formula_tools ggplot2 Hmisc quantreg texreg]; };
+  qtbase = derive2 { name="qtbase"; version="1.0.13"; sha256="0bi3lxhnfj4pzhc11yd580zmfn9wnkbvag5rlm2g7c9i2dsi0inj"; depends=[]; };
+  qte = derive2 { name="qte"; version="1.2.1"; sha256="1skl7a4dqxfj8p2d1wpan4j7bmr1l5aqyxlzl9qmbx0brf9r5gk4"; depends=[BMisc formula_tools ggplot2 Hmisc pbapply quantreg texreg]; };
   qtl = derive2 { name="qtl"; version="1.42-8"; sha256="1l528dwvfpdlr05imrrm4rq32axp6hld9nqm6mm43kn5n7z2f5k6"; depends=[]; };
   qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
   qtlbook = derive2 { name="qtlbook"; version="0.18-6"; sha256="0kbz7icp6fzl2bgk50fcg8x704aijpz3xbqrzraj7qa3z8gakaj6"; depends=[qtl]; };
@@ -9692,7 +9759,7 @@ in with self; {
   qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; };
   quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  quanteda = derive2 { name="quanteda"; version="1.0.0"; sha256="099bwlfz3g7nyn59js9bkmvxq7yl13i8p89a54piz4xzqasy7xx3"; depends=[data_table digest extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi wordcloud XML yaml]; };
+  quanteda = derive2 { name="quanteda"; version="1.1.1"; sha256="1yi59lr968y6l7v537xc6p50yi9y7hgyg5lwghqqgk13glg6zmbg"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi XML yaml]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
   quantmod = derive2 { name="quantmod"; version="0.4-12"; sha256="0y7gh0k1s10vdsfch8777avbhf99mc9crikvx7ahqrw0j631vmhq"; depends=[curl TTR xts zoo]; };
@@ -9700,7 +9767,7 @@ in with self; {
   quantreg = derive2 { name="quantreg"; version="5.35"; sha256="18f3qxv1j1bqmq55hzssz8mnp5ww4flhy80rm2v1rk0mmg9paz7m"; depends=[Matrix MatrixModels SparseM]; };
   quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; };
   quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; };
-  quantregGrowth = derive2 { name="quantregGrowth"; version="0.3-2"; sha256="1ga3qn8g7r465dlxl8wmvz1vlpq5639kmawancsgkm77f316wpzf"; depends=[quantreg]; };
+  quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-0"; sha256="0lscz07k14z1mgxdgi7j0nd5098x6p4hsm9qzw8fgnsz4xgm5qxn"; depends=[quantreg]; };
   quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; };
   quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; };
   quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; };
@@ -9873,15 +9940,15 @@ in with self; {
   rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; };
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
   raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; };
-  rbacon = derive2 { name="rbacon"; version="2.3.2"; sha256="1bzqrgqw3dbkyz7pl3lk2g83w31i09msqd063b411y9c61cx98ik"; depends=[coda Rcpp]; };
+  rbacon = derive2 { name="rbacon"; version="2.3.3"; sha256="0kkj4ylvk7gsbzzqdg8b66kp4mn99k8yzmgml7z0nkll0lr54srk"; depends=[coda Rcpp]; };
   rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; };
-  rbcb = derive2 { name="rbcb"; version="0.1.2"; sha256="01jbjjnkic8jiy0361b1pnin9d5ssxfnf33k8fc95fw8k02j300k"; depends=[httr jsonlite tibble xml2 xts]; };
+  rbcb = derive2 { name="rbcb"; version="0.1.3"; sha256="0bghbxrgy4lpxyazqlm90i42dav1kjca02l2nmw320v01rvw5qvd"; depends=[httr jsonlite tibble xml2 xts]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
   rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
   rbgm = derive2 { name="rbgm"; version="0.0.4"; sha256="0sqi42vz3fdgp7gpa4jjh8dxz3iwwagw9in70jpz6fc18ivizkp1"; depends=[dplyr geosphere raster sp tibble]; };
   rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
-  rbi = derive2 { name="rbi"; version="0.8.0"; sha256="0hizf3mffp72pgzkwsdg2dw0p0dfbnbb80jv3gmayvg7kkq1nabv"; depends=[data_table ncdf4 reshape2]; };
-  rbiouml = derive2 { name="rbiouml"; version="1.7"; sha256="0bk0pvx0rfk74s7lbr8lc664yplfky94j1ym098w029045k233pi"; depends=[RCurl RJSONIO]; };
+  rbi = derive2 { name="rbi"; version="0.9.0"; sha256="0am6r8dy3nfahprkyvap73x3b6vxgc604v7mf9wbb9vwjja00xzp"; depends=[data_table ncdf4 reshape2]; };
+  rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; };
   rbison = derive2 { name="rbison"; version="0.5.4"; sha256="0l3653q7bfda9lw1isnx6gdd7l5b8aldqgc2hppg2wh2k004rnf6"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; };
   rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
   rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
@@ -9912,7 +9979,6 @@ in with self; {
   rcongresso = derive2 { name="rcongresso"; version="0.3.2"; sha256="15b7m1z5lr66kwhl8v8k2car4id9ssd0ypz75z259v8c1w0k7xkl"; depends=[dplyr httr jsonlite magrittr tibble tidyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; };
-  rcqp = derive2 { name="rcqp"; version="0.4"; sha256="1jpzp3cs17bwfabzg7jffa3hni867mjw8yxi0igxicrbz56j33jb"; depends=[plyr]; };
   rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
   rcrossref = derive2 { name="rcrossref"; version="0.8.0"; sha256="01k3jpd6awan8r4kc5wjw0did30i2bafzjr8mwaaqv87gni2yiyf"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; };
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
@@ -9929,6 +9995,7 @@ in with self; {
   rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
   rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
+  rdflib = derive2 { name="rdflib"; version="0.1.0"; sha256="1xq378nfvbk8b2nbnr6yswqr351pgli7jcmhcr1ipynkl93rl5qm"; depends=[jsonld readr redland stringi]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
   rdist = derive2 { name="rdist"; version="0.0.2"; sha256="0rwv8brambwki3jzpq250lk0k7nmvlzm80szy4nkhdl2zxwriv0a"; depends=[Rcpp RcppArmadillo]; };
   rdiversity = derive2 { name="rdiversity"; version="1.0"; sha256="0x6s9028v4xcc54yy4977yqw5mrsbqlrm5b9drj05c64mavhm4sq"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; };
@@ -9944,7 +10011,7 @@ in with self; {
   re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
   reReg = derive2 { name="reReg"; version="1.1-1"; sha256="1pjzh9r7488d39a5s0hkymzxh79zc1kp2ag2cp037v3j65mifbin"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; };
-  reactR = derive2 { name="reactR"; version="0.1.4"; sha256="12ixd0i9yamvgn5y11vyq627nmr83s3q5xaa9l7sj3mns8x657ap"; depends=[htmltools]; };
+  reactR = derive2 { name="reactR"; version="0.2.0"; sha256="17jdcby95fxfa3imalllnqsp16py5vqqj4y0za4wli91vd37555q"; depends=[htmltools]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
   readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; };
   readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; };
@@ -9965,7 +10032,7 @@ in with self; {
   realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.9.3"; sha256="1dw1az7wzkhxcc8ixcmdxrlc4hzi2c4093brvj1m4z44mrw28vws"; depends=[mvtnorm]; };
+  rebmix = derive2 { name="rebmix"; version="2.10.0"; sha256="0n9s3xklrlzw6mb798q8p395506baj0pxp6n9lj9hhfibbgjif1c"; depends=[mvtnorm]; };
   rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
   rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; };
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
@@ -9975,7 +10042,7 @@ in with self; {
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
   recipes = derive2 { name="recipes"; version="0.1.2"; sha256="1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyselect timeDate]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-  recmap = derive2 { name="recmap"; version="0.5.24"; sha256="0ijs331f9x6r2qamx5b47x4wblz2pg7k5b7593hdwhiiwzh5c0ly"; depends=[GA Rcpp sp]; };
+  recmap = derive2 { name="recmap"; version="0.5.26"; sha256="02fvl275k4455yw5n31fxb2jhiaciki4i7zzzks166gz33rc0dwy"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
   recombinator = derive2 { name="recombinator"; version="1.0.0"; sha256="0amcpicsk270l9h7qgv764wp09phsffdpi4adcxrsrwiwm274ibw"; depends=[crayon]; };
   recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; };
@@ -10016,7 +10083,7 @@ in with self; {
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
   regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; };
   regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; };
-  regsem = derive2 { name="regsem"; version="1.0.6"; sha256="1r5arckzx5a307vn8l4z8npzymw8cyzpj40dpnm5pmcc5ihidl4a"; depends=[lavaan Rcpp RcppArmadillo]; };
+  regsem = derive2 { name="regsem"; version="1.1.2"; sha256="0d843h1kv78hsn48ibci6w7y69yqd3q32bidgsqs5dxk980kxcsk"; depends=[lavaan Rcpp RcppArmadillo]; };
   regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
@@ -10025,12 +10092,13 @@ in with self; {
   rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; };
   reinforcelearn = derive2 { name="reinforcelearn"; version="0.1.0"; sha256="025v8flr8q2p473kz760vywczhvx8b4lakm6rasr9ijgxpbd2jpn"; depends=[checkmate nnet purrr R6]; };
   reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; };
+  reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; };
   rel = derive2 { name="rel"; version="1.3.1"; sha256="1a3gffa9jgfm92q0ba9slwdp8r1n5kycywxp0jbjkpvkdpmacnd4"; depends=[]; };
   relMix = derive2 { name="relMix"; version="1.2.3"; sha256="07fcbvhxdfa94ixxvnrkhlm0xxz7wa1lv7xdjp97ajxxp9fy69yl"; depends=[Familias gWidgets paramlink tkrplot]; };
   relSim = derive2 { name="relSim"; version="0.2-9"; sha256="0qy1fy7xclzaqwhxpclllpypac41s406jc413cgd4jss5c87k4c4"; depends=[multicool Rcpp xtable]; };
   rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; };
-  relaimpo = derive2 { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[boot corpcor MASS mitools survey]; };
+  relaimpo = derive2 { name="relaimpo"; version="2.2-3"; sha256="0pbffalyhmfigyynkl6il60dyyf2aw1i71sncwrqcp18qgx4bxq9"; depends=[boot corpcor MASS mitools survey]; };
   relatable = derive2 { name="relatable"; version="1.0.0"; sha256="0147gin6dn76gg7gassar64f0w2gny1sh0k60v7914qhb4sj4s7i"; depends=[compare]; };
   relations = derive2 { name="relations"; version="0.6-7"; sha256="1c16sb4v5n44nichwizilqs491rddn8kpf8qrqw54khj5zzg6w52"; depends=[cluster sets slam]; };
   relax = derive2 { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
@@ -10050,7 +10118,7 @@ in with self; {
   remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; };
   remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; };
   remotes = derive2 { name="remotes"; version="1.1.1"; sha256="07sxlwd09jzlfn7xakw9hwkr9k970lw2mnl0l3rpb5w71968km98"; depends=[]; };
-  rentrez = derive2 { name="rentrez"; version="1.2.0"; sha256="0kqfwz3mx9j9g966nmndlckk30dir1w4kkqblc3qa4f6mzifbrzv"; depends=[httr jsonlite XML]; };
+  rentrez = derive2 { name="rentrez"; version="1.2.1"; sha256="115ffrmsg755ynfwywql7xkcnlvv8ch4nlr1ab11i5923fz6vkvl"; depends=[httr jsonlite XML]; };
   repeated = derive2 { name="repeated"; version="1.1.0"; sha256="0cdyzhhv89186q5nwablcjbqvm7ncq2w5d09iidbajrac9wd1y60"; depends=[rmutil]; };
   repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; };
   repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
@@ -10103,12 +10171,12 @@ in with self; {
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
   revengc = derive2 { name="revengc"; version="1.0.0"; sha256="0ccbw61xqjf9y15ghhzx57q3l48xpw9pq2nb11nrqapp5w3f9vzy"; depends=[stringr]; };
   revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; };
-  revtools = derive2 { name="revtools"; version="0.2.1"; sha256="0awyyc9f1yvf9yz5slffgm1r2jrnx14ldcqxa32lhj3ig95dm6p9"; depends=[ade4 modeltools plotly shiny shinycssloaders shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
+  revtools = derive2 { name="revtools"; version="0.2.2"; sha256="0sn7k5vcp09vp6j1bf879jrig382ayhfnwp569z9dxgdh7s18v6n"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; };
   rexpokit = derive2 { name="rexpokit"; version="0.26.2"; sha256="0jydx3rlsbdn74gx2is1x6gsb4b64wqbc5jw2sb4xflvvhxfci67"; depends=[Rcpp]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; };
-  rfUtilities = derive2 { name="rfUtilities"; version="2.1-2"; sha256="06vad0m83586dnh7c6qjpi1rsifd67zb2zzdjxcj0bdpvwbaqapd"; depends=[randomForest]; };
+  rfUtilities = derive2 { name="rfUtilities"; version="2.1-3"; sha256="0vnhvdkqqqn894abznw97j07gwdvvmvk8vsf4aaxx9yzk44cnk5g"; depends=[cluster randomForest]; };
   rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
   rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
@@ -10133,9 +10201,9 @@ in with self; {
   rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; };
   rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
   rgl = derive2 { name="rgl"; version="0.99.9"; sha256="1rv4gq03mbx62v4kyj83y5kh1f77d68aqwmdb00r8szqlx5w5gdm"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr shiny]; };
-  rglobi = derive2 { name="rglobi"; version="0.2.12"; sha256="0gfq9nrv381m3lfmfy57ib58y6kv5vicgrypr8jvrghwyfcdqppg"; depends=[RCurl rjson]; };
+  rglobi = derive2 { name="rglobi"; version="0.2.13"; sha256="15hqcmh8r6lsc60139f9q9kyspkys61q0y39i5wq86lsq6i3q4js"; depends=[RCurl rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
-  rgr = derive2 { name="rgr"; version="1.1.14"; sha256="1g5ssxfamghl7d8smlb9zwk31zf5m090y9f88nripad4k9l58fkl"; depends=[fastICA MASS]; };
+  rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; };
   rgrass7 = derive2 { name="rgrass7"; version="0.1-10"; sha256="0w5vy8163xlfmdrpyp00x25wwq4jnaspzggpvj160azigndsc1kr"; depends=[sp XML]; };
   rgw = derive2 { name="rgw"; version="0.1.0"; sha256="12f7bsfg24cld9y47jyqxswgc1bk4adbhhdpycapinbcfhyzc91p"; depends=[]; };
   rhandsontable = derive2 { name="rhandsontable"; version="0.3.6"; sha256="1n631vffbfi8mgbcjgav1209ryj88igb17h73xvjdmglh5f0s6dz"; depends=[htmlwidgets jsonlite magrittr]; };
@@ -10184,7 +10252,7 @@ in with self; {
   rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
-  rlang = derive2 { name="rlang"; version="0.1.6"; sha256="1x62assn8m7cd0q75r809gxsdqmxmd2br1xz53ykzhrfz3j768kp"; depends=[]; };
+  rlang = derive2 { name="rlang"; version="0.2.0"; sha256="0f87fhw5pj6s2zjdxnpnd7pwn78czdz71b0xhm5adqg1p38sfwj8"; depends=[]; };
   rlas = derive2 { name="rlas"; version="1.1.9"; sha256="1c8sc277jiij1j5sb3wsjdm1pxlp0ia3a39xqzglvmlcnlvcygbq"; depends=[data_table Rcpp]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
@@ -10198,10 +10266,10 @@ in with self; {
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
   rmapshaper = derive2 { name="rmapshaper"; version="0.3.0"; sha256="0v7p8wqgjymidavyq9lfl6kzlpn5ybfc9lqhsaxbxcc9hb80xjxz"; depends=[geojsonio geojsonlint rgdal sp V8]; };
   rmapzen = derive2 { name="rmapzen"; version="0.3.3"; sha256="0rz3wwy8dbb2620gy07aib2aad6ds001vf47bxrj3vzrxp5h448i"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.8"; sha256="0q1y1qx87xp6vf9h7mfl77rqhmd01xl53l9ap9qj99bfvpabb572"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="1.9"; sha256="0wq6kbhrkv3fhcy4hg5yyv9gdvf8gr4nsjwdifs4ih8lnn0dmdyb"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; };
   rmcfs = derive2 { name="rmcfs"; version="1.2.9"; sha256="1ar2dsxjf0a6ij91d380arlh9wlywqpfaii80bk6mrq4xg6qy4b0"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
-  rmcorr = derive2 { name="rmcorr"; version="0.2.0"; sha256="0s356ly6d46fv28q176ahz2y0w8igmgcy2li0mi4wkj5gnc0yxx4"; depends=[psych RColorBrewer]; };
+  rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
   rmda = derive2 { name="rmda"; version="1.4"; sha256="0agh4mrs8mjjb7hc41r59mbnq0h873fmykljla1cbf4ikhxwjihf"; depends=[caret MASS pander reshape]; };
   rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
@@ -10211,7 +10279,7 @@ in with self; {
   rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
-  rmonad = derive2 { name="rmonad"; version="0.4.0"; sha256="060hw8ijwnmizzma3q4jy5knif2djzc4x4aahbrv2kaqz157mva2"; depends=[glue igraph magrittr pryr uuid]; };
+  rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; };
   rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; };
   rmpw = derive2 { name="rmpw"; version="0.0.3"; sha256="1iidiq0pz88wgh155hfy8mw0cwwwcl77zshcjrbw11zpx6p8qy94"; depends=[gtools MASS]; };
   rms = derive2 { name="rms"; version="5.1-2"; sha256="01wjxlqfz6l1bdsvxqq0lsbps0k86hx3ayb6fl2n2hxccvsfxkzi"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
@@ -10233,13 +10301,14 @@ in with self; {
   rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; };
   rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
   rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
+  rnr = derive2 { name="rnr"; version="0.1.0"; sha256="1209gayyn98zdkwv51liq62b2xvza6xndfqkpc73w5dgj1rqn343"; depends=[assertthat purrr]; };
   rnrfa = derive2 { name="rnrfa"; version="1.3.0"; sha256="1zrj7y0qh57r7r9c5pspz238w0j1kaicd2l6vcg92lgxi8b9i558"; depends=[ggmap ggplot2 httr plyr rjson sp stringr xml2 xts]; };
   roadoi = derive2 { name="roadoi"; version="0.4.1"; sha256="1g4x1gkcrq8pd5vdikhf16ghgd990hhb1m387r2smz21v993cfk8"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
   roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; };
   robCompositions = derive2 { name="robCompositions"; version="2.0.6"; sha256="1r74w6ssq9fhjain02hr9sz0x2j1fi1waw7319gls69kp73b51hw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
   robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
-  robets = derive2 { name="robets"; version="1.3"; sha256="123f08h763ifd2ydh1hp3jp6gqnc12cia9ndlp8jxkck8l3pnwkh"; depends=[forecast Rcpp]; };
+  robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
   robis = derive2 { name="robis"; version="1.0.0"; sha256="02spxy33vh675dvhx2v6f06hxzcwfrsmkzb6yk5h30xp21blqv4g"; depends=[dplyr httr jsonlite leaflet]; };
   robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; };
@@ -10269,7 +10338,7 @@ in with self; {
   rockchalk = derive2 { name="rockchalk"; version="1.8.110"; sha256="1991g4vslbanz6swvj76bwfc7xpnrcwqwr59xn8nzf7kkb721w6a"; depends=[car lme4 MASS]; };
   rococo = derive2 { name="rococo"; version="1.1.5"; sha256="062pj62haf0xw74p6c1dd20ipcxka8nn0mxsq490d22kqwm4vf5a"; depends=[Rcpp]; };
   rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
-  rodeo = derive2 { name="rodeo"; version="0.7.1"; sha256="0q76dnwc5bixbl2wh6km7085rivfzjpzl6c3w48wq5b23k1v7pfr"; depends=[deSolve R6]; };
+  rodeo = derive2 { name="rodeo"; version="0.7.4"; sha256="16yzj12m9wvcrqxc33rpbyzbq019swi5jxnbda9crfwjdvafaa0d"; depends=[deSolve R6]; };
   rodham = derive2 { name="rodham"; version="0.1.1"; sha256="15mrlx7azvwkwjgfplvs5fhk2nwlg9pay2l99q327p8hx87jr8ra"; depends=[jsonlite plyr splitstackshape stringr tibble]; };
   roll = derive2 { name="roll"; version="1.0.7"; sha256="059n1pl7692grzv4pmnj8s6cs2zi98lr1s5zi9pxg5vpw7r6h2v9"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; };
@@ -10281,14 +10350,14 @@ in with self; {
   rootWishart = derive2 { name="rootWishart"; version="0.4.0"; sha256="028k1h6vibbcnmh35kg0z388c991k8v78ac0fbrv1k2ajqrrl4lg"; depends=[BH Rcpp RcppEigen]; };
   roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; };
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
-  ropenaq = derive2 { name="ropenaq"; version="0.2.5"; sha256="0rvp41c4px773w29m9483rbkv3y365n8n6gf969mzbdpvx90pyql"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
+  ropenaq = derive2 { name="ropenaq"; version="0.2.6"; sha256="065p4c8l4bqxy00clbjhad8hqw4gg2h2c00b06n2fa5n70z0akgq"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
   ropercenter = derive2 { name="ropercenter"; version="0.1.0"; sha256="0rp2dwdkl3qlwm8di0q184ppr77zs6i7njyr305pnxmbad119w9d"; depends=[dplyr foreign haven httr rvest stringr xml2]; };
   rorcid = derive2 { name="rorcid"; version="0.4.0"; sha256="1diz14b5jzs9i4khyykq58cbgz87qraivv9lhq5nrrrfi2gryl9r"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; };
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.9.0"; sha256="0pnrfc0dcbh5r3qwfwyb0q063bzwpw4ga60965y5qyxz64cyx74r"; depends=[httr jsonlite]; };
   rosm = derive2 { name="rosm"; version="0.2.2"; sha256="0carzc8rn8997vdqgcf7a6lcpmw7dldhnh6n0rjyb09and8yca7r"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; };
-  rospca = derive2 { name="rospca"; version="1.0.3"; sha256="0nnqwvjsavxp7ci8xpvkri8ff9xwlcdvx33k32vf1sywr86mr1xs"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
+  rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
   rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
@@ -10299,7 +10368,7 @@ in with self; {
   roxygen2 = derive2 { name="roxygen2"; version="6.0.1"; sha256="0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj"; depends=[brew commonmark desc digest R6 Rcpp stringi stringr xml2]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
   rpanel = derive2 { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
-  rpart = derive2 { name="rpart"; version="4.1-12"; sha256="177p03w4m0qshb3sqkdyixim3f44g2an31v3vlbjmpzjvd5ff6yq"; depends=[]; };
+  rpart = derive2 { name="rpart"; version="4.1-13"; sha256="0k29qx3k3pj5sgrpg0p47yd8i811rmdakaw57bigpq1449asc4cf"; depends=[]; };
   rpart_plot = derive2 { name="rpart.plot"; version="2.1.2"; sha256="1hn8s0fawwsr6j4m7wf38q7a608bjf9v1w706p49a08189baqdxz"; depends=[rpart]; };
   rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
@@ -10310,8 +10379,9 @@ in with self; {
   rpdo = derive2 { name="rpdo"; version="0.2.3"; sha256="150kd9pvfr7msrh55vsqcj8lv994izlvhxf4g5n1qbzdcaqsdjzp"; depends=[checkr]; };
   rpf = derive2 { name="rpf"; version="0.56"; sha256="089n2mmczvvwga8ak3l0p326qsp83d0cz03lc6fhx6a9w5vhl67i"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; };
-  rpgm = derive2 { name="rpgm"; version="1.1.1"; sha256="07zynn6rzpi651i3nyfgyv4wbxkmxhr1cjhmqn7i0zcb11yv20dc"; depends=[]; };
+  rpgm = derive2 { name="rpgm"; version="1.1.2"; sha256="0pbja877gb3mn7m78lfdl217dm7qsrblq6gwrjh5wbv1nd532hvz"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; };
+  rphylotastic = derive2 { name="rphylotastic"; version="0.0.4"; sha256="1as3cndbrnby70qbi43q8v5gpyr8fpms30jwsarizwwbdrxbjgw9"; depends=[ape httr jsonlite phylobase rentrez]; };
   rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; };
   rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; };
   rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; };
@@ -10322,7 +10392,7 @@ in with self; {
   rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; };
   rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; };
   rpostgis = derive2 { name="rpostgis"; version="1.4.0"; sha256="0rgi7ax2n2fln12501zshwaz23nns9qk4vy1ylnaqb4bg0x30gn4"; depends=[DBI raster rgeos RPostgreSQL sp]; };
-  rpostgisLT = derive2 { name="rpostgisLT"; version="0.5.0"; sha256="0dvzprhwdqm763b0n82vzj4blns9chlcpp7wkrsm1w67zakn02mk"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; };
+  rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; };
   rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; };
   rprev = derive2 { name="rprev"; version="0.2.4"; sha256="1krrplgi2qfcm5kdz2am8fq8kjx67gjwxyd4ylf406r18xbvjd1d"; depends=[doParallel dplyr foreach ggplot2 lazyeval magrittr rms survival tidyr]; };
   rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
@@ -10334,7 +10404,7 @@ in with self; {
   rptR = derive2 { name="rptR"; version="0.9.21"; sha256="0wqh9d372s2222qm5w0wx77l2sj7zvdnl7zvxcn5wfs3cz84fj15"; depends=[lme4 pbapply]; };
   rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; };
   rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; };
-  rquery = derive2 { name="rquery"; version="0.3.1"; sha256="1lgcky7rh7awabp4rfmn55c3dhfpkxqhnz2phq1ph727x5kldw22"; depends=[DBI RSQLite wrapr]; };
+  rquery = derive2 { name="rquery"; version="0.4.0"; sha256="080q99q5bkhdxbnd2xg3mjpyvj3ad2lvvay845h50s9c9gpsn9wp"; depends=[DBI RSQLite wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
@@ -10350,7 +10420,7 @@ in with self; {
   rrepast = derive2 { name="rrepast"; version="0.6.0"; sha256="1d6nk6437c4bxbyvpzdlgd1kxh651979m0k7aadi9fl77i5k2x3w"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
   rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; };
   rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
-  rroad = derive2 { name="rroad"; version="0.0.4"; sha256="1zs21j6rhdab8qrw2ybxnj8lyvbzmxs4zzfskh4npd22w5yy597c"; depends=[]; };
+  rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; };
   rrpack = derive2 { name="rrpack"; version="0.1-7"; sha256="0svrw2ik59hjyfb0kag4nv8ilcaz7irmkp7ndbxxn0jg7dacb411"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; };
   rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; };
   rsMove = derive2 { name="rsMove"; version="0.2.3"; sha256="0s256ifiq76rakabw2jn5jslsdd0r55cy7hm55214pgjfq8fiqpi"; depends=[caret gdalUtils ggplot2 raster RCurl rgdal sp]; };
@@ -10359,9 +10429,9 @@ in with self; {
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
   rscala = derive2 { name="rscala"; version="2.5.1"; sha256="0az638dlg7nqhj7xf1bwcpv9anqqcif8ni4a8q68lcn2sxb4wamp"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
-  rsconnect = derive2 { name="rsconnect"; version="0.8.5"; sha256="0y2sajcw1yngig06l7bxzcw993jbx13fl47fag9fa4f70qpnnwmq"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
+  rsconnect = derive2 { name="rsconnect"; version="0.8.8"; sha256="019phwamg2irb0ak9y0sn25ihi0a9sfdpa02dz9x0bhpcg55x0li"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
   rscopus = derive2 { name="rscopus"; version="0.5.3"; sha256="1d6265ffmhd6ajlp607y5jy77nqgcrdym6w1j8vnil0705z3swzb"; depends=[httr plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.6.0"; sha256="142i64faqindaqd14yylbs2ynxg8n5rzl4w0ya0lxv8kwkj0fg75"; depends=[dplyr httr jsonlite lazyeval magrittr]; };
+  rscorecard = derive2 { name="rscorecard"; version="0.7.0"; sha256="02bjkk03cppd88dljxj72lngwryhbbffvin8h3fkl7jkcaccsq1z"; depends=[dplyr httr jsonlite lazyeval magrittr]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-11"; sha256="06sjkjl9y2fg2yz740a1z5zn4afnjfv1nsykszxsnwn7s23rxi31"; depends=[plyr RCurl XML]; };
   rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; };
@@ -10370,7 +10440,7 @@ in with self; {
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
   rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
   rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; };
-  rsimsum = derive2 { name="rsimsum"; version="0.2.0"; sha256="14vx8h404sbdplqd71jawh82r937y9hap7dc2xpc246qnqd03i9f"; depends=[checkmate ggplot2]; };
+  rsimsum = derive2 { name="rsimsum"; version="0.3.0"; sha256="11zc6ga4d4i9bilmbfinkanv3fkz8xpcikc38mxf88lv9jfv0kx1"; depends=[checkmate ggplot2]; };
   rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; };
   rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.9"; sha256="1rj2qdlv44hbv1ipv7hdpssn90ypp6bfc7nqdaf9dak0bd6khwni"; depends=[estimability]; };
@@ -10378,7 +10448,7 @@ in with self; {
   rsoi = derive2 { name="rsoi"; version="0.3.0"; sha256="0syl90akbbg50pyhsa4nyq2r4psi2n6qg48a4nxprgz412n8rjbv"; depends=[dplyr lubridate readr]; };
   rsolr = derive2 { name="rsolr"; version="0.0.8"; sha256="1swhg7hnkdphnw0d9jrzn18nk2v5a6ny7n652fh8d0k88a27xx4d"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
   rspa = derive2 { name="rspa"; version="0.2.1"; sha256="0m3h25jxfccdqy4gf3cls4wcdpw580yfmb3lvw4ndfva8lj2q6sy"; depends=[lintools validate]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.2.2"; sha256="0ji7890ba6ry553kgffsgsqmk5lawg3jyd4y6y59a2a4ysvvwq8z"; depends=[h2o sparklyr]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.2.3"; sha256="1dskwni79hrskwmlvlbm4v9fy59bvzgcjqwsdqk31iz3xfaanj39"; depends=[h2o sparklyr]; };
   rsq = derive2 { name="rsq"; version="1.0.1"; sha256="1c7604g48rcsbfk66xfwia1jaxlqsjiw19zx9pg51n8d6c0l17zb"; depends=[MASS]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
@@ -10410,9 +10480,9 @@ in with self; {
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
   rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; };
   rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; };
-  rtip = derive2 { name="rtip"; version="1.0.0"; sha256="1xkw0m4fnwbsqqyhvxhsia3hlpjb2qhs6y0c4g7f7qa7f0ibcbja"; depends=[boot ggplot2 mvtnorm plyr]; };
+  rtip = derive2 { name="rtip"; version="1.1.0"; sha256="1fpxg85lhdvc68rr13x1w7k9s7j0cwsc18gc579bd44jqpgfkw72"; depends=[boot ggplot2 mvtnorm plyr]; };
   rtk = derive2 { name="rtk"; version="0.2.5.4"; sha256="1nh757l4ih5pmmh7b84ca1f5wpz9mcksdb0a4rvs2hhgap38ihg9"; depends=[Rcpp]; };
-  rtkore = derive2 { name="rtkore"; version="1.5.0"; sha256="15hz9cmc1i9lnifh8bbgr5r8dacn0l38zhn3ldc6wxphn7j8h075"; depends=[Rcpp]; };
+  rtkore = derive2 { name="rtkore"; version="1.5.1"; sha256="03vmgrsil5yrrs3ndgqvfcwv9plcawc8v2y2x9nwcashxg40djn6"; depends=[Rcpp]; };
   rtop = derive2 { name="rtop"; version="0.5-13"; sha256="1md9sgsmbc3jv1lc4l6r26830k9vjljjqpzzna4s23bn6ky7glgp"; depends=[gstat rgdal sp]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
   rtrim = derive2 { name="rtrim"; version="1.0.1"; sha256="134j5sv9dvcq1n37rry7615nr3pa54by6r7ss7fagcmy4lnma2ps"; depends=[]; };
@@ -10425,10 +10495,11 @@ in with self; {
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
   rucrdtw = derive2 { name="rucrdtw"; version="0.1.3"; sha256="0wbh9zbgqf5bk1ix5qry18lhgdqk90pn5xnv401268gldjy4z777"; depends=[Rcpp]; };
   rugarch = derive2 { name="rugarch"; version="1.4-0"; sha256="0b0rq88v93945g7pr6xin7wfdm8zl2vw8hxwa2kfak4xnrrprsyy"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
-  ruler = derive2 { name="ruler"; version="0.1.1"; sha256="02h931ycsblwxjss9zwim4bxpqfgnyac1sblplcai085nq7fd30h"; depends=[dplyr keyholder rlang tidyr]; };
+  ruler = derive2 { name="ruler"; version="0.1.2"; sha256="1d0vf505fyinq4k2lfcvsii9fxs2xygfj5hrcwd566arpd2wkg7m"; depends=[dplyr keyholder rlang tidyr]; };
   runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
   runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; };
   rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
+  rusk = derive2 { name="rusk"; version="0.1"; sha256="05ci4f0k2b54sqf0h6j38h3kkq3r27klva0hfg968snr9bb6v0wv"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
   rust = derive2 { name="rust"; version="1.3.4"; sha256="1jb970kskl2wdhqcjbxl8gh986abdy96jbipnsdi3656ic5dxivn"; depends=[Rcpp RcppArmadillo spatstat]; };
   ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; };
   rv = derive2 { name="rv"; version="2.3.2"; sha256="108s9q19h5ypxb9w4a8nk97js261izag1sf75g4xfqblwxxrbflc"; depends=[]; };
@@ -10440,7 +10511,7 @@ in with self; {
   rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; };
   rvg = derive2 { name="rvg"; version="0.1.8"; sha256="03hank94b5d1spig9jzrm5h2xbipi8skwqjg8sfwxwy5sjyrbaam"; depends=[gdtools officer Rcpp xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
-  rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.5.1.0"; sha256="122h7nncgkgq0qchb5apiicwx94zr40i7fwm7x1718qxi7npz8wh"; depends=[BH lattice Rcpp RcppEigen RcppThread]; };
+  rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.7.1.0"; sha256="1w3nwxpvmmkcvyymhz434xh6srjc87hj824bcjydmavx221ncf6p"; depends=[BH lattice Rcpp RcppEigen RcppThread]; };
   rwalkr = derive2 { name="rwalkr"; version="0.3.2"; sha256="0vp7iizc6bn3y30vcrvksy91aiid52q01vgzjphc5m5sy99gsxj2"; depends=[dplyr httr tibble tidyr]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
   rwc = derive2 { name="rwc"; version="1.1"; sha256="0gdpskj87wjnpas90i3iqn1qv6frrki2xqiyyakg3zpaviw1imag"; depends=[MASS Matrix mvtnorm raster]; };
@@ -10465,7 +10536,8 @@ in with self; {
   sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; };
   sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
   sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; };
-  sNPLS = derive2 { name="sNPLS"; version="0.3.0"; sha256="0qb7l42hxi3sgdmc52j5hr9gz7fv5jx9qrwcyspzq671s4d1zsq1"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; };
+  sGMRFmix = derive2 { name="sGMRFmix"; version="0.1.3"; sha256="19kfcg36yvwcsq24cn16s5zv9l42rnd9yk2p85j40d6f00ncivkr"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; };
+  sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; };
   sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
@@ -10517,6 +10589,7 @@ in with self; {
   sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
   sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
   sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
+  sbpiper = derive2 { name="sbpiper"; version="1.5.0"; sha256="0ighjp1934y3f6myl60fjxman7333yi9fnhhk3d5xgazsfb8bnnp"; depends=[colorRamps data_table ggplot2 Hmisc reshape2 scales stringr]; };
   sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; };
   sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; };
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
@@ -10531,7 +10604,7 @@ in with self; {
   scape = derive2 { name="scape"; version="2.3-1"; sha256="0maccnkhn7wf6brwnb5b7nh2yx3afx0h7kji2475mvg19909mddq"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; };
-  scatterD3 = derive2 { name="scatterD3"; version="0.8.1"; sha256="1fyk2z8ari73nbah2r4c677nm3v0whfia6sh39gr674cczp6vc8q"; depends=[digest ellipse htmlwidgets]; };
+  scatterD3 = derive2 { name="scatterD3"; version="0.8.2"; sha256="1cfh060ffwxy33b1f7n8mba1sbbwgx28mqn08im16dqbphkcmx1z"; depends=[digest ellipse htmlwidgets]; };
   scatterpie = derive2 { name="scatterpie"; version="0.0.8"; sha256="1dfwz83hxdms7qglsz540wszzcd5hfmjzw440c93jgi18n6kx9s4"; depends=[ggforce ggplot2 tidyr]; };
   scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-40"; sha256="0ababcj87kx7860mica9y2ydlhskxmgj9n46crx036cila512jc2"; depends=[]; };
   scclust = derive2 { name="scclust"; version="0.1.1"; sha256="1bml4qyyspwaqxzwjhqy8i450614p3f3dj0s0qdkv6psa60h0w5z"; depends=[distances]; };
@@ -10574,6 +10647,7 @@ in with self; {
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
   sdef = derive2 { name="sdef"; version="1.6"; sha256="1y1l5fl7lh636kyvc2hwssdnifl055nrz3riplj4qqw88lkm1mk8"; depends=[]; };
+  sdm = derive2 { name="sdm"; version="1.0-46"; sha256="14z8336yxja1j7mx8xszqqi6s24nk6r5bycmw8h01wvq4rqgxi4g"; depends=[raster sp]; };
   sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.6"; sha256="1kbgv5x5ilzccafl20x86fi9f7jqxnccvb8k7dy8q41s9n36qwfs"; depends=[R_utils raster rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.3.8"; sha256="10c962wbzgl2zpz7yx5kpryldbbq76qrd5pnz4rlmbaa9kfg08s5"; depends=[]; };
@@ -10583,7 +10657,7 @@ in with self; {
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
   sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; };
   seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; };
-  seacarb = derive2 { name="seacarb"; version="3.2.4"; sha256="06r4grcdvm252nnln03pzqll9xqx1r3piaaxi81vfzs4w6gq1c94"; depends=[gsw oce]; };
+  seacarb = derive2 { name="seacarb"; version="3.2.6"; sha256="1036hrmgv7xn0khddbfdg0p9d4hmhhxxb3fd7fysjmzlk7k7naqb"; depends=[gsw oce]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
@@ -10593,7 +10667,7 @@ in with self; {
   seasonal = derive2 { name="seasonal"; version="1.6.1"; sha256="1nvavn84f2zb0f6n352br52wcrcmnxv6vprzcpymrnzik7pyp8y6"; depends=[x13binary]; };
   seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; };
   seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
-  secr = derive2 { name="secr"; version="3.1.3"; sha256="0py8qk141q0h8pkw40w3l4pjhwpn8pa8k2s8qgligvnnmyzp7z00"; depends=[abind MASS mgcv nlme raster sp stringr]; };
+  secr = derive2 { name="secr"; version="3.1.5"; sha256="1sxapy8h1kx4fk405j6nanvdl5g9gz4arg0v15cmhb4plij3mg3c"; depends=[abind MASS mgcv nlme raster sp stringr]; };
   secrdesign = derive2 { name="secrdesign"; version="2.5.4"; sha256="1kbqgdjpyns11ag16rgw9n6mvmjgdypk9lv3yzwf4kynds46wbbk"; depends=[abind secr]; };
   secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; };
   secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; };
@@ -10602,8 +10676,9 @@ in with self; {
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; };
   seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; };
   seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; };
-  seewave = derive2 { name="seewave"; version="2.0.5"; sha256="1ml0jcqb6i6v0xgarvzg51rgax6lsf6y2255jq1kfz4v8n39vnh0"; depends=[tuneR]; };
+  seewave = derive2 { name="seewave"; version="2.1.0"; sha256="0i0zhvgl64fwpabnwvfdxndmw5whhh2fd4lhpg399w4rzrwzv92y"; depends=[tuneR]; };
   seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
+  segclust2d = derive2 { name="segclust2d"; version="0.1.0"; sha256="0kymw36cvakx84c96npkbnsvv0a1s82773ib5c802ybvkb2r1k9p"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
@@ -10614,7 +10689,7 @@ in with self; {
   selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
   selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; };
-  selectr = derive2 { name="selectr"; version="0.3-1"; sha256="0jc946456qp3g2icaifrqn4z7z5pn23rfw77796aa8mmlkp7qkyv"; depends=[stringr]; };
+  selectr = derive2 { name="selectr"; version="0.3-2"; sha256="0kdrj64rqg4z6hg92y9r2h602a2i73r5rnlpg23ys33d5d32n8jy"; depends=[stringr]; };
   selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
   seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; };
   selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
@@ -10650,7 +10725,7 @@ in with self; {
   sentometrics = derive2 { name="sentometrics"; version="0.2"; sha256="0pndbas1xya2pnriil94r0pp6zjd44flhsqimdgmi7w5k87wlabf"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll sentimentr stringi zoo]; };
   seoR = derive2 { name="seoR"; version="0.1.0"; sha256="0aa74a9vi176ap4ap44sjm8lm3025dss067sm5lgc4b73a6ph75p"; depends=[digest dplyr httr igraph jsonlite RCurl readr robotstxt rvest stringr XML xml2]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
-  seplyr = derive2 { name="seplyr"; version="0.5.3"; sha256="0xk3pqirgz49y94nk5karb939xbg7zxfalm1pkaj603arpi8y6am"; depends=[DBI dbplyr dplyr rlang RSQLite wrapr]; };
+  seplyr = derive2 { name="seplyr"; version="0.5.4"; sha256="1ha3cxz5wql9bsw4japc5kj2c42mkk0g1yb141hpxpqq1c416gd1"; depends=[DBI dbplyr dplyr rlang RSQLite wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
   seqHMM = derive2 { name="seqHMM"; version="1.0.8"; sha256="1zr70ym32isav13wsb7zv4gv3bn04qi0dn5k0fqjbdcw36m5hfi8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
@@ -10684,7 +10759,7 @@ in with self; {
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
   sfdct = derive2 { name="sfdct"; version="0.0.5"; sha256="02di504pcv423wk40ap8k18b2q759x8f5wsp8kkbwks54j42s69a"; depends=[dplyr RTriangle sf sp tibble]; };
   sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
-  sfsmisc = derive2 { name="sfsmisc"; version="1.1-1"; sha256="0jzmbywlyzfxs7hlmyd0iynghfc9qp5sa5lnhr73y8r360yv1ahf"; depends=[]; };
+  sfsmisc = derive2 { name="sfsmisc"; version="1.1-2"; sha256="0cgq2h11ngkzd6p34k6mqjnvlvc5vj4lnqrl64k05lb391j391w0"; depends=[]; };
   sft = derive2 { name="sft"; version="2.2-0"; sha256="0d1yiimc899i09yyrv1x40ixqss87xjpy08ab16h9faxd4bsk3y2"; depends=[fda SuppDists]; };
   sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; };
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
@@ -10694,12 +10769,12 @@ in with self; {
   sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; };
   sglg = derive2 { name="sglg"; version="0.1.2"; sha256="0wqjw466j3j5ipjgp18978g7fwb2fvzxhfv2bp4dqdazmxrjyyqm"; depends=[Formula robustloggamma ssym survival]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
-  sgmcmc = derive2 { name="sgmcmc"; version="0.2.0"; sha256="1jqk6bic8g5zsdxa9f6w6j6ha6dnghfdi61cyy9vi94xsmkbkv66"; depends=[tensorflow]; };
+  sgmcmc = derive2 { name="sgmcmc"; version="0.2.1"; sha256="13wgc6rd6knmcw8nj12j43qqjsipxf702a4cycsnn9z7jlaxzszh"; depends=[tensorflow]; };
   sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
   shades = derive2 { name="shades"; version="1.1.0"; sha256="0ajdpwisfax96mc3w1akjlkk36b6gni1aprxqvqlwlw8bmgsmj4p"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.4.5"; sha256="00g82dwzmawb6v7x9sphs7vmmpjmzb4mvhw76x96wnasskqlrcpc"; depends=[raster rgeos sp]; };
+  shadow = derive2 { name="shadow"; version="0.5.0"; sha256="0a5flgc3r5psbsig3dns4pr1fyvkhmb7gh17sb5r4vm8w202p98y"; depends=[plyr raster rgeos sp]; };
   shadowtext = derive2 { name="shadowtext"; version="0.0.2"; sha256="17ccylxnl6837cf81fwkgywjmqizmcm6mhqak10sl5apnqm5n1nl"; depends=[ggplot2]; };
   shallot = derive2 { name="shallot"; version="0.4.3"; sha256="1rxx15qma6sbi4h2iv90ym4r22lwh64z495psrxv624w1zjypbvf"; depends=[commonsMath rscala]; };
   shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; };
@@ -10712,7 +10787,7 @@ in with self; {
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
   shazam = derive2 { name="shazam"; version="0.1.8"; sha256="0j953zf0wigr645a52088ajrchhr7xlf891hybbx8pvspj240f3y"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
   shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; };
-  shiftR = derive2 { name="shiftR"; version="1.2"; sha256="02aa7lpw050rraiajlmyzhmnrz0m3nlc9j5y4rw0k2whglk23j2j"; depends=[]; };
+  shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; };
   shiny = derive2 { name="shiny"; version="1.0.5"; sha256="0hps6nlyffh685smsm9sd0rdmip0y8v7hgv6a4hqlq7kf8zmzqi0"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
   shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.1"; sha256="0jd00z817cccz3wfhcmz61wsy5fjw6yyan2ywkf06xqcdpnr8iwh"; depends=[htmltools htmlwidgets purrr shiny]; };
   shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; };
@@ -10735,7 +10810,7 @@ in with self; {
   shinydashboard = derive2 { name="shinydashboard"; version="0.6.1"; sha256="14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy"; depends=[htmltools shiny]; };
   shinyjqui = derive2 { name="shinyjqui"; version="0.2.0"; sha256="07ijd5psywlkfrz54d4q68bwij1as4ai0360fya8ikngkwg393mj"; depends=[htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; };
-  shinymaterial = derive2 { name="shinymaterial"; version="0.5.1"; sha256="1bk4n2zzhiziwfqzpl3b9ybm52mfv1z2f00kyy6d6qvpjwr9qzy2"; depends=[shiny]; };
+  shinymaterial = derive2 { name="shinymaterial"; version="0.5.2"; sha256="1xdvk8icnzc156bdn6782qgj1dgzc8v22b8qhfnxabxxgpap5nm9"; depends=[shiny]; };
   shinystan = derive2 { name="shinystan"; version="2.4.0"; sha256="18bdh2h6grlwfx6p00214p7cgzg7zfhbvnkd1dmxihp9wf4l80af"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
   shinythemes = derive2 { name="shinythemes"; version="1.1.1"; sha256="0i220y051dq763idh1j5zhpb5cpv3jr11jd9akmry9aadyys5pz6"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
@@ -10756,7 +10831,7 @@ in with self; {
   sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
   sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
-  sigQC = derive2 { name="sigQC"; version="0.1.11"; sha256="1mnvpkak37br406ixsn65g0snimf3iiql5yfbwflazw3sz5q11kz"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS moments nnet RankProd]; };
+  sigQC = derive2 { name="sigQC"; version="0.1.12"; sha256="1m7vywpmrwlldgdg9d8vjlfxkdnhcaz3w5vbkyljd9qfsqbwaipz"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; };
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
   sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
   sigmaNet = derive2 { name="sigmaNet"; version="1.0.3"; sha256="0b9p5kgcbpzb83s0vgmfwmh15lvsfz5q0yk5wl16rxyiqqg2nxag"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; };
@@ -10767,7 +10842,7 @@ in with self; {
   sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; };
   sigr = derive2 { name="sigr"; version="0.2.3"; sha256="1kyj8xizswwg5agv4ac296pqvxxq3kla537z10qvg16ilskbqny5"; depends=[pwr]; };
   siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; };
-  sim1000G = derive2 { name="sim1000G"; version="1.38"; sha256="0sc5gsbcvj9vv0sysg9pg0lkh9f8w8mdxpxaf2a1h9x7c9wrx2m7"; depends=[hapsim MASS readr stringr]; };
+  sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
   simLife = derive2 { name="simLife"; version="0.3"; sha256="0bqhixr4zg7mwgxdsjk0h5a82dyfkhiv9xafw43w2bpnmyxywdia"; depends=[splancs unfoldr]; };
@@ -10787,9 +10862,9 @@ in with self; {
   simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
   simglm = derive2 { name="simglm"; version="0.6.0"; sha256="1kmi5lpx8m14iz0i9z8811cp6fq2x700qsxn6rxrkxbq88a5mdss"; depends=[dplyr Matrix purrr tibble tidyr]; };
-  simmer = derive2 { name="simmer"; version="3.6.5"; sha256="1vkicav2642il5php26qdji8kji0jrg42x9p5gyzy6fnih6jimnz"; depends=[BH codetools magrittr R6 Rcpp]; };
+  simmer = derive2 { name="simmer"; version="3.7.0"; sha256="1jirp7bl5a0mfc0hg495mxfz5cjdigg2dzwj8rbc9qkgibfvfnih"; depends=[BH codetools magrittr R6 Rcpp]; };
   simmer_bricks = derive2 { name="simmer.bricks"; version="0.1.0"; sha256="1sb1ayh56sbgs4p0r3frjjfn4vcdr43xm85lvb9aqk3wmj2lddqy"; depends=[simmer]; };
-  simmer_plot = derive2 { name="simmer.plot"; version="0.1.12"; sha256="1519l3zj7jmjr8yv12ah61r6m7vyjxbnyajqdhvl388bix30dn6w"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
+  simmer_plot = derive2 { name="simmer.plot"; version="0.1.13"; sha256="0afp4il95dmdgw815rk0c3cyf56gli237v4i716l4agag5l1rp60"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
   simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; };
   simpleCache = derive2 { name="simpleCache"; version="0.3.1"; sha256="14jrsfxcrndfgi7yl5frfsyixxkhagc7cfav8h6mf6apfxx0v1ls"; depends=[]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
@@ -10804,7 +10879,7 @@ in with self; {
   simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; };
   simsem = derive2 { name="simsem"; version="0.5-13"; sha256="0v6gbfp4659gbpzc1vffg687c8bcd45ddb7jhd0bgx66m28853kk"; depends=[lavaan]; };
   simstudy = derive2 { name="simstudy"; version="0.1.8"; sha256="0n8wq8xw4vlpcz6qlqkza9zwd3nkbmhs8nw2gzz64q9blzcp69mw"; depends=[data_table mvnfast Rcpp]; };
-  simsurv = derive2 { name="simsurv"; version="0.1.0"; sha256="08w5kbzx3wlksl17kjg9j4dj1f40ddm32mafi75y5c8bwgcfzqzy"; depends=[]; };
+  simsurv = derive2 { name="simsurv"; version="0.2.0"; sha256="16rg13chr78c8d8y1s29zkcz6s0v7zgv5jzq4309xbnw8w7h7y8m"; depends=[]; };
   simtimer = derive2 { name="simtimer"; version="3.0.0"; sha256="0hfp652s97dz07fs92gfsaiwd6pwg95qsvr6qjwj1k5d3h6hzf8y"; depends=[]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
   simule = derive2 { name="simule"; version="1.2.0"; sha256="09lhd0q0xn15v0j172749rih3p2qgn3sbprhj2az9s4fm9752az3"; depends=[igraph lpSolve pcaPP]; };
@@ -10826,7 +10901,7 @@ in with self; {
   sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; };
   sjPlot = derive2 { name="sjPlot"; version="2.4.1"; sha256="0aazxrqsbp5jsd5yfm6hrx17rmlqbh5vs314xms7g620aj383zrh"; depends=[arm broom dplyr effects forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjlabelled = derive2 { name="sjlabelled"; version="1.0.7"; sha256="1c2xk4ykf88h601c9ka8mjmk5fn91z2gcl2wx78492npipdxifmw"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.0.8"; sha256="1hhcv5d5jbrd9wv9hdvck40wdpr4nr6hr972ng5w2wbh7bikvgqg"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble]; };
   sjmisc = derive2 { name="sjmisc"; version="2.7.0"; sha256="1bni8ppvabzjx94hd8ygp14n2g6a8qhjvnimm0v7pqbf7czmpapy"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; };
   sjstats = derive2 { name="sjstats"; version="0.14.1"; sha256="10siniyy1nqsacayyl7p35yc9gmdh5rjlwzv8aywid2a1ld13lfs"; depends=[bayesplot broom cli coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
@@ -10846,7 +10921,7 @@ in with self; {
   sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; };
   sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
   slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; };
-  slickR = derive2 { name="slickR"; version="0.2.2"; sha256="0whgfvdn0sgx9lgz9nxmabvr6363k243zfxxmn9wfrjwgkrhbm56"; depends=[base64enc htmlwidgets xml2]; };
+  slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools htmlwidgets xml2]; };
   slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; };
   slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
   slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; };
@@ -10861,7 +10936,7 @@ in with self; {
   smapr = derive2 { name="smapr"; version="0.1.1"; sha256="0ci0j26nsgl4yi0b0bhxqgpn281ml5clhih2nl7hm5l8nybdyp3q"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
   smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; };
   smatr = derive2 { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; };
-  smbinning = derive2 { name="smbinning"; version="0.5"; sha256="1ac3apbkmhwvm0fds92j82r63krj94m69g0sid2v9mimdq30k25i"; depends=[Formula gsubfn partykit sqldf]; };
+  smbinning = derive2 { name="smbinning"; version="0.6"; sha256="13izdq2pl7hi8ppzmpmiiz4pmc43m63ixjrbj9lwa371vx60ndmh"; depends=[Formula gsubfn partykit sqldf]; };
   smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
   smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; };
   smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
@@ -10875,7 +10950,7 @@ in with self; {
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
   smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
-  smooth = derive2 { name="smooth"; version="2.4.0"; sha256="1492zbfhpijpdikb260m02rv876gc4xr3py645x760icyz7h9fpx"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="2.4.1"; sha256="1iv34nzvz0y2cwlhq7ddm2ym0mdkp7jqxbfik2l64r4mfm8l0k8h"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.2"; sha256="06f0d4bjygpgcayzg9cxcb5plhsls0ljla2mrmjnjxpq8g3c3cl8"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothSurv = derive2 { name="smoothSurv"; version="2.0"; sha256="0ypgmqf7mj0x0ibid9qx6cbqn4cpig8333g095b64297bf0syvjc"; depends=[survival]; };
@@ -10884,12 +10959,13 @@ in with self; {
   smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
   smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
   smotefamily = derive2 { name="smotefamily"; version="1.2"; sha256="166gqwqljips2r0030m3q44zmxlnxcpb9hmwbg1bk3dqk9gfl8ra"; depends=[]; };
+  smovie = derive2 { name="smovie"; version="1.0.0"; sha256="07sf9nxanfkcp42bv4x12vrlsdr2nnyfgdm6bhcfpggavd4s8r9q"; depends=[revdbayes rpanel SuppDists]; };
   smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
   sn = derive2 { name="sn"; version="1.5-1"; sha256="0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
-  snakecase = derive2 { name="snakecase"; version="0.8.1"; sha256="0vpzvdb1acph9xs52lw7hhd3a58lm5k9fmgkw70fijsrciihz6ns"; depends=[magrittr purrr stringi stringr]; };
+  snakecase = derive2 { name="snakecase"; version="0.9.0"; sha256="02s3avsdvdmqfrwlliw90yza8rq2wlf56iwpvj36a2qkzxg54b6a"; depends=[stringi stringr]; };
   snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
   snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
@@ -10911,7 +10987,7 @@ in with self; {
   sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; };
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
   social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
-  socialmixr = derive2 { name="socialmixr"; version="0.1.1"; sha256="1immpjc4p7xjc4ghhb3l4wilacg6h0gpihmhx60309gi1snz23ai"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015]; };
+  socialmixr = derive2 { name="socialmixr"; version="0.1.2"; sha256="0cj8l1gl7c9hk3hpznfqhblmh79qvi9866713sry538f3kkv897c"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
   sodavis = derive2 { name="sodavis"; version="1.0"; sha256="1mhmrg7c0chwjw117pzjya5y0ml8mm9ps5b64q5cjchlxr8900nx"; depends=[MASS mvtnorm nnet]; };
   sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
   sofa = derive2 { name="sofa"; version="0.3.0"; sha256="10f01a23bq6a30f95cilfan588dg0bg36y7g14q46rmcz15cqbrx"; depends=[crul jsonlite mime R6]; };
@@ -10938,7 +11014,7 @@ in with self; {
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="3.2"; sha256="0kqk04db3s3c9ba1gy4k2gj4s6lzyns3lmj463d9v9gpk5wwq77m"; depends=[data_table lattice MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="3.3"; sha256="1r83inm3b32gqaq2n39pj65h86lr9hxl7ciixqx90pxv15gr6xng"; depends=[data_table lattice MASS Matrix]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
@@ -10954,8 +11030,8 @@ in with self; {
   sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; };
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
   sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; };
-  soundecology = derive2 { name="soundecology"; version="1.3.2"; sha256="1ig04hdxwailsp4lv5y9q73x7vb6hl4dw9zlb05gbccvid5vmdsh"; depends=[ineq oce pracma seewave tuneR vegan]; };
-  soundgen = derive2 { name="soundgen"; version="1.1.2"; sha256="13n3gr3hwy3ph9kb4fmx87qwndijxf04nvy13sjaazmvq9q9dfbg"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
+  soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; };
+  soundgen = derive2 { name="soundgen"; version="1.2.0"; sha256="1k6my6lcwy36fa25glyd8vfr3b57fwx7nz4s24bkf40vp0vkpsc2"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; };
   sourcetools = derive2 { name="sourcetools"; version="0.1.6"; sha256="0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"; depends=[]; };
@@ -10964,7 +11040,7 @@ in with self; {
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
   spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; };
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.2"; sha256="0m1432gkjkkqmzhksv19yca1wyvp5vjwcmpavhiik4ghfx72rgrr"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
-  spData = derive2 { name="spData"; version="0.2.7.4"; sha256="1gkzcd9sy7ca2s8xa45vn0j4ismb28i8vjskw2fldfl3aglss4qp"; depends=[]; };
+  spData = derive2 { name="spData"; version="0.2.8.1"; sha256="0lbrgc701w8x248cmpl3pwngb9kjz1dqxfplrnr3jpyl9d3qkqv4"; depends=[]; };
   spMC = derive2 { name="spMC"; version="0.3.9"; sha256="10cvha5j2pi3b2qiq3jbrc10yi84a595zlg0wshx3wrzxb1rim85"; depends=[]; };
   spMaps = derive2 { name="spMaps"; version="0.2"; sha256="1rrrkbj9bvs217dgvwm686zczcwjqcbq0x268cwl6qnsm39mxzzf"; depends=[raster rgeos sp]; };
   spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; };
@@ -10987,7 +11063,7 @@ in with self; {
   spam64 = derive2 { name="spam64"; version="2.1-2"; sha256="15cjdz71fh04hcqjn93lnnqbmyfgm67p1x5lyiiq3wz7k1fk5a0h"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.3.2"; sha256="1dg4wnvxhybhagag9xx27af6760dlclaivx27mfxywfha312xfpn"; depends=[magrittr xml2]; };
-  spant = derive2 { name="spant"; version="0.7.0"; sha256="1lcv8lblc6arbmjxy6mskr2iprxij7b4sgn7xm9imvcqx5jibzjq"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd tkrplot]; };
+  spant = derive2 { name="spant"; version="0.9.0"; sha256="0cfvi5pxg1wg9kl9rxrarbb3jaxwjfwy34lmg1yy5nj8ld8lzlfc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd tkrplot]; };
   sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
   spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
@@ -10999,7 +11075,7 @@ in with self; {
   sparklyr = derive2 { name="sparklyr"; version="0.7.0"; sha256="0lyn5xlz7a826dmlihn6jp2kq72abr3jy0ylsa4lvk9sj3acy988"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; };
-  sparr = derive2 { name="sparr"; version="2.1-14"; sha256="1zj94csfb59sk1klc6j34sfj5a9khm62qbpk33jwlkb9slvm5fcx"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
+  sparr = derive2 { name="sparr"; version="2.2-11"; sha256="01li60cybv9kg54zkc9rh4ra6danzbnap9rx59pgfj7zkhs2phmn"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
   sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
   sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; };
   sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.0"; sha256="0r7080d2s5vrcwi4h11iiapmdl0l59kd0j8r1avmw9x0d0qw6lh8"; depends=[data_table MASS Matrix mgcv refund]; };
@@ -11029,7 +11105,7 @@ in with self; {
   spatial_tools = derive2 { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[abind doParallel foreach iterators mmap raster rgdal]; };
   spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; };
   spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; };
-  spatialEco = derive2 { name="spatialEco"; version="1.0-0"; sha256="0q65gcrbd62bbxlqr7338jm9ra6iq1b5gccb221w98860d2wjz9x"; depends=[cluster MASS RANN raster RCurl readr rgdal rgeos rms SDMTools sp SpatialPack spatstat spdep yaImpute]; };
+  spatialEco = derive2 { name="spatialEco"; version="1.1-0"; sha256="1cvll6z775w8nvl5q5p62qgp3j2d0kcdb2avqwcqybk23jlxl7dr"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; };
   spatialTailDep = derive2 { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; };
   spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; };
   spatialkernel = derive2 { name="spatialkernel"; version="0.4-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; };
@@ -11056,7 +11132,7 @@ in with self; {
   spduration = derive2 { name="spduration"; version="0.17.0"; sha256="1s41rs5nbdrknn6ag7zn8ds3203q2x5z5mb9vf80y6ba6w3ksr32"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
   spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-  speaq = derive2 { name="speaq"; version="2.1.0"; sha256="1alwqwxx5mmmlqwj5dz9dzzwxcs8hyz85kkmj3ajb3wp09z5dhaq"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
+  speaq = derive2 { name="speaq"; version="2.2.0"; sha256="1y6sa639b2pcxcd2lh9ivfllvc734pmb0bv63hcnr74f8nmn3ywf"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
   spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
   speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; };
@@ -11068,7 +11144,7 @@ in with self; {
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
   spectrolab = derive2 { name="spectrolab"; version="0.0.4"; sha256="1vmrpszjwl9iq8z6p8rhh560l79iya6rah7jld8ykvm9irwdf15h"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
-  spef = derive2 { name="spef"; version="1.0-6"; sha256="1an9p914p457bm4wl82bpqa8jq9ibyrrc1jnm5ppr5ww5qp6yifq"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
+  spef = derive2 { name="spef"; version="1.0-7"; sha256="006qp0qsqrlbbbv4b86ikqz1ig0php0cahqz4c9n3js1kxwsdi7d"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
   speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
   spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
   spelling = derive2 { name="spelling"; version="1.1"; sha256="10zhzbpyjw5lkg4iyjwgs5xp2c8bgwyzjg146fcml6cjs6xhl8ni"; depends=[commonmark hunspell knitr xml2]; };
@@ -11099,7 +11175,7 @@ in with self; {
   splithalf = derive2 { name="splithalf"; version="0.2.0"; sha256="1bpw8mw88aryk4n0bdm4f356wsix6npdpl91qfbwayhdh0g5302f"; depends=[plyr]; };
   splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
   splm = derive2 { name="splm"; version="1.4-10"; sha256="0zz28mfs84nqyvl1l0ba7yrhgcxxzw1v0542jc39h4pr537yz1nc"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
-  splot = derive2 { name="splot"; version="0.3.1"; sha256="030r2l7nlypjb9ycnvsds73vqymxbj28l290ia4hvfrfadqnfcb0"; depends=[]; };
+  splot = derive2 { name="splot"; version="0.3.2"; sha256="1nix7pzqlla3iga99pw9jqcylg4j5xpfrf94y0abzpy3z4gq3kgc"; depends=[]; };
   spls = derive2 { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; };
   splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; };
   splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-137"; sha256="0bpzv6a05hnqnnz2znnkb3f34r56krhc595zjnn82azxj4a53njh"; depends=[]; };
@@ -11112,6 +11188,7 @@ in with self; {
   spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
   spotifyr = derive2 { name="spotifyr"; version="1.0.0"; sha256="1f7sv6qc8bim8vkcsma96zdzd1ci73dpag2dp27mqjcbh716xfy0"; depends=[dplyr httr lubridate purrr tidyr]; };
+  spp = derive2 { name="spp"; version="1.15.3"; sha256="1wn7a6aznxyvr6kwgf3bd8c1n1pxm4b43km3pgfw8mf2vx69cynd"; depends=[BH caTools Rcpp Rsamtools]; };
   sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
   spray = derive2 { name="spray"; version="1.0-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
@@ -11135,7 +11212,7 @@ in with self; {
   squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
   srp = derive2 { name="srp"; version="1.0.0"; sha256="10mpyy8q419dw0zd96l0z8lkxpcyn1l5fvnyvr3n0lyl6jmf91sy"; depends=[fda mgcv]; };
-  srvyr = derive2 { name="srvyr"; version="0.3.0"; sha256="1xxkrr15ihybgr2kv93p1plf6g8bpc2d227bwskxqx9pg7ga3cxf"; depends=[dplyr magrittr rlang survey tibble]; };
+  srvyr = derive2 { name="srvyr"; version="0.3.1"; sha256="1xad4n3bpldaaci83mvpfa8sq6bh0ll5k1fgrapwb8142hvk6m13"; depends=[dplyr magrittr rlang survey tibble]; };
   ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
   ssa = derive2 { name="ssa"; version="1.2.1"; sha256="10x58c57pa9x6svm4h4xrss72ikin9lpf3ihjwmnkgnaicvsd0bx"; depends=[iterators]; };
   ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
@@ -11160,7 +11237,7 @@ in with self; {
   st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
   stR = derive2 { name="stR"; version="0.3"; sha256="0zad25s9wp4lapkww3rdbqsd4y7p8xhz9is7avq400srxakinx7n"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
-  stability = derive2 { name="stability"; version="0.1.0"; sha256="1hknyxzl376pvjvmbbv5fszqq2xrg154c3y5j9hy31a9402yb8xi"; depends=[dplyr lme4 magrittr matrixStats reshape2]; };
+  stability = derive2 { name="stability"; version="0.2.0"; sha256="154dp26aghznibnp9h7j86hi30caylvyxp87jkf2p7cb4l3qn5r4"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
   stable = derive2 { name="stable"; version="1.1.2"; sha256="11irpn0qfblzskdr71991jlmdrbqqqpszppn5pii3lr5hflqqr1d"; depends=[rmutil]; };
   stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; };
   stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
@@ -11173,6 +11250,7 @@ in with self; {
   stampr = derive2 { name="stampr"; version="0.1"; sha256="1w7zp5n41gzahv4psdgw5a5mylcxlf12931fnjz0q2cwqj9cwql5"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
   standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; };
   stapler = derive2 { name="stapler"; version="0.6.5"; sha256="0xhwlm3iyxxmaaf0smj8g5zdawb51d7dc636czbvk5g551g7wfdb"; depends=[matrixStats RNifti]; };
+  staplr = derive2 { name="staplr"; version="1.1.0"; sha256="08kk1zi89ggyli05y7lr1vhq4xszjp6z5jscaaknp38gav7jd5lc"; depends=[]; };
   stargazer = derive2 { name="stargazer"; version="5.2.1"; sha256="1nfmb8qka6qxhjagk1a9am43dgnp39fy4cjbygivzp2hlzy22f46"; depends=[]; };
   starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
   starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; };
@@ -11184,6 +11262,7 @@ in with self; {
   statcheck = derive2 { name="statcheck"; version="1.2.2"; sha256="0bcv8klp75q8hlmwhax9lxx9i0kbhsz8442acbhxh5fn2pn2x9jm"; depends=[ggplot2 plyr]; };
   statcomp = derive2 { name="statcomp"; version="0.0.1.1000"; sha256="0ac4s8a955ka0rs2a3k93aq2cxzrc48ai0sl9kn4yaqcw1arv2ap"; depends=[zoo]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
+  states = derive2 { name="states"; version="0.2.0"; sha256="0gwisvzww7jl0n5ck8rnnw4ikr8gyq94m3362sdjmic9h7318f03"; depends=[dplyr lubridate]; };
   statesRcontiguous = derive2 { name="statesRcontiguous"; version="0.1.0"; sha256="0yzi6ycfj4cc4q0zzzckdz65wp9m4yx6fi7kp9nssj9pj6a8xlrp"; depends=[dplyr magrittr sf]; };
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
   statip = derive2 { name="statip"; version="0.1.5"; sha256="1gyn86kg96yrs9drc23xabf4s8ii32hgjla310sy6pd7c97bwqgf"; depends=[bazar dplyr]; };
@@ -11195,7 +11274,7 @@ in with self; {
   statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; };
   statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; };
   stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; };
-  stdReg = derive2 { name="stdReg"; version="2.2.0"; sha256="166f0icz2gmnyp5fd824gylksjizyp2rm2h6i59h8q6brq3r79q8"; depends=[data_table numDeriv survival]; };
+  stdReg = derive2 { name="stdReg"; version="3.0.0"; sha256="0mjn2zvpadxm3q5kw4v3jpfmx94chjxdf8n1m7c4dm7gfaj0q38x"; depends=[data_table drgee numDeriv survival]; };
   stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; };
   stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; };
   steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; };
@@ -11215,17 +11294,18 @@ in with self; {
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
   stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; };
   stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; };
-  stoRy = derive2 { name="stoRy"; version="0.1.1"; sha256="0ymk5skzsga0jr9chl52njlb23803a7cij0iaw6crssdf3sk226s"; depends=[data_tree R6]; };
+  stminsights = derive2 { name="stminsights"; version="0.1.2"; sha256="17vpkrhhv8k5wyyrnc2hza175p51yl2nghvv9y2ymq27x4r2xq5c"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
+  stoRy = derive2 { name="stoRy"; version="0.1.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree R6]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
   stochvol = derive2 { name="stochvol"; version="1.3.3"; sha256="0cg61djjfw4jmq71g8kddrihdy9n2vlpzlf7kl2f3p8njc1f8kk2"; depends=[coda Rcpp RcppArmadillo]; };
-  stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
+  stocks = derive2 { name="stocks"; version="1.1.2"; sha256="1i77cg4vmmc362ixqqkz48wipsszmb1z8pjrh713d27726nhj3ig"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp zoo]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
   stopwords = derive2 { name="stopwords"; version="0.9.0"; sha256="050v3hq1wd3w83zrp76nv6n67qsf5fss2cbihb6waijancm7zfzh"; depends=[ISOcodes]; };
   stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
   storr = derive2 { name="storr"; version="1.1.3"; sha256="0rmljnlnbi5jdxbh5mzxgkq9aa3mm46kl04jlasyng8pv3prxj1v"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; };
-  stplanr = derive2 { name="stplanr"; version="0.2.2"; sha256="1yl2x73y39d4405qis22bhqb1afiwdra8h034k6y2jjgwi3l34yy"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; };
+  stplanr = derive2 { name="stplanr"; version="0.2.3"; sha256="1h6vflcb9pmfl2h3rny3p79isrd5gkp0cblvwi2yfvxi2ll5axp9"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; };
   stpm = derive2 { name="stpm"; version="1.6.8"; sha256="0gifkrpp8n4r31i4dfvjfq7w0l6jfid43i94ygqwwv0ca583aw4y"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
   stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; };
@@ -11262,7 +11342,7 @@ in with self; {
   stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; };
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; };
-  styler = derive2 { name="styler"; version="1.0.0"; sha256="03wpxq3gxfid96n1q8rgpz4sfl4y2j7g7dbjvjxgj1nalsg9lav7"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; };
+  styler = derive2 { name="styler"; version="1.0.1"; sha256="01iy3p0jn57c2glq2a5wh7ds3fyxlmcjpvxnmafvvvlhca73zw88"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; };
   stylo = derive2 { name="stylo"; version="0.6.5"; sha256="15y7iwk1w9kkdhpbgbvi1cqzza4jgw8zxsp3xbqzhm4qaf4kymia"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
   subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; };
@@ -11290,7 +11370,7 @@ in with self; {
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
   summarytools = derive2 { name="summarytools"; version="0.8.2"; sha256="014hxyk0r87j5prqdckxy7h41agk2p1w1kxzl0a3pxwbj1j0r2fh"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; };
   sunburstR = derive2 { name="sunburstR"; version="1.0.3"; sha256="0xxxi01klrm7kspi588n4h5zdzhph5vihs26n2x8fdm2k82jyjp9"; depends=[d3r dplyr htmltools htmlwidgets]; };
-  suncalc = derive2 { name="suncalc"; version="0.3"; sha256="1x7k4rpl6f1arq4z76zfx3nv0d0b4x3q6sk0jz5d4azq0i364nx9"; depends=[V8]; };
+  suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; depends=[V8]; };
   supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; };
   supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
   supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
@@ -11298,6 +11378,7 @@ in with self; {
   superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; };
   superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; };
   superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; };
+  supernova = derive2 { name="supernova"; version="1.0"; sha256="18hyfq7gqx9n4s95yymkazyif9gzscrgfckis0s7hbban08iimpr"; depends=[]; };
   superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
   supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; };
   support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; };
@@ -11330,7 +11411,7 @@ in with self; {
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="2.9"; sha256="0ad4122m78hbzhkkaspzpr62bl59w1j8z0qa67slqljjldhq1akv"; depends=[data_table laeken]; };
   survidm = derive2 { name="survidm"; version="1.0.0"; sha256="13iwl687g4qps6s3d8x0xr916b2ja6487dwnyqwc3nwr6gadqicw"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; };
-  survivALL = derive2 { name="survivALL"; version="0.9.1"; sha256="0l32p64a1izsrcplx09wlisca3daysl5cx2vhh4k08sxizyg90c1"; depends=[Biobase broom cowplot data_table desiR ggplot2 ggthemes magrittr pander png readr survcomp survival survsim testthat viridis]; };
+  survivALL = derive2 { name="survivALL"; version="0.9.2"; sha256="0mqmlmip6lr1d6i8yj4kc1zzj5jvvqrkipqxlprsrqbwni2ipp7l"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; };
   survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
@@ -11346,14 +11427,14 @@ in with self; {
   svHttp = derive2 { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; };
   svIDE = derive2 { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; };
   svKomodo = derive2 { name="svKomodo"; version="0.9-63"; sha256="0x2774lhckhg8kw6plsn6dpks3b3fisb0psa03p7di7jx8vrkg5n"; depends=[svMisc]; };
-  svMisc = derive2 { name="svMisc"; version="1.0-1"; sha256="17prhh92zbibkkdqyqdg8bp4fvsmj6ziaii3fxq3z0vnl6gj9p86"; depends=[]; };
+  svMisc = derive2 { name="svMisc"; version="1.0-2"; sha256="1a5wlz1csq6y2bqiznz14dlx5jc8z3x882yi2v82hinn647vn4m8"; depends=[]; };
   svSocket = derive2 { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; };
   svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; };
   svTools = derive2 { name="svTools"; version="0.9-4"; sha256="0szr5dcxjsh5p1nkszvmj0vmi9x70d656hfvhmqf0wyjwv63vp90"; depends=[codetools svMisc]; };
   svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; };
   svWidgets = derive2 { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; };
   svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
-  svars = derive2 { name="svars"; version="1.1.1"; sha256="1hd052xksciwqqviwr29ch8s85ci8j15c8dqrbdra803lllfkngf"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA tsDyn vars]; };
+  svars = derive2 { name="svars"; version="1.1.2"; sha256="1d3dk4vn5l46xw5nh7k63v35phzvy9ixmbz0d2znl2nm05ih7gyy"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA tsDyn vars]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
   svd = derive2 { name="svd"; version="0.4.1"; sha256="00plnwrjnp3majssr3qbz2zp25z9cfivgpggyfvy4lnc4av5qn3g"; depends=[]; };
   svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; };
@@ -11372,19 +11453,17 @@ in with self; {
   swamp = derive2 { name="swamp"; version="1.3.1"; sha256="1l4rk79hbggn31y5skslqsz9bv7lmya4q5ligki3x1677345hyhv"; depends=[amap gplots impute MASS]; };
   swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; };
   swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; };
-  sweep = derive2 { name="sweep"; version="0.2.0"; sha256="11hyv48hldacdbi7avvgmrqk9andjkabdswf1blfb4qyc2z0199v"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
+  sweep = derive2 { name="sweep"; version="0.2.1"; sha256="0v6166p1h14klf1avqvry8jj3as498qnydksy0da8q1bp1sy007f"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
   swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
-  switchr = derive2 { name="switchr"; version="0.12.6"; sha256="0i5xcjhjnqk3qbmc8kr7q8khrjvqdp7yy8yydkz6pmjgzwkyw9hs"; depends=[RCurl RJSONIO]; };
-  switchrGist = derive2 { name="switchrGist"; version="0.2.2"; sha256="1mzlwnldapzmykfmz51dwr258iizmrrzi5bj84gdjbbg80r3s5ds"; depends=[gistr httpuv RJSONIO switchr]; };
-  swmmr = derive2 { name="swmmr"; version="0.7.0"; sha256="1155gdsgbhr9fabsf5b63f47zicqj02yjm0fpgbbf3ds550s0hq8"; depends=[Rcpp xts]; };
+  switchr = derive2 { name="switchr"; version="0.12.7"; sha256="1ymvghjvbrbsgn49mp8f9n4kv81626pa4pv05hrx813ly8h30mmq"; depends=[RCurl RJSONIO]; };
+  swmmr = derive2 { name="swmmr"; version="0.8.0"; sha256="0cyr5x8k6agrgflqp14lxbas0yslwkz432ks71svqhdrl7dd5sg2"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; };
   sybil = derive2 { name="sybil"; version="2.0.4"; sha256="0iyqr9iyb4bydmzjzrc721nzf5q36p2i3zciai9rzjlwx2mdw930"; depends=[lattice Matrix]; };
   sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
   sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
-  sybilSBML = derive2 { name="sybilSBML"; version="3.0.1"; sha256="1dzx1cdvi4fvdqf5hliwwk3gn5ig2wzzxv2gr92760p9c84hmmrj"; depends=[Matrix sybil]; };
   sybilccFBA = derive2 { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
   sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; };
   sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; };
@@ -11428,13 +11507,15 @@ in with self; {
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
   tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
+  tailr = derive2 { name="tailr"; version="0.1.0"; sha256="1i7dvmmqrg2hylf5n1kwr5m6xc3ydcvfi5fx2dx9zapsv9bhlr4v"; depends=[glue rlang]; };
   tangram = derive2 { name="tangram"; version="0.3.2"; sha256="1dyfyl608k6a7vx9w0s2r6jr0y430qvkqkrrv24wav7snza4d5q2"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
   tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; };
   tau = derive2 { name="tau"; version="0.0-20"; sha256="1inpqc2cz1vvjkmp8h3jpjvnvj0y5cwbbj92jlq0322w5w45vip9"; depends=[]; };
+  tauturri = derive2 { name="tauturri"; version="0.1.1"; sha256="0v0p1avrx9vgnrli4zp6figm3s9265k9yny0acblbjlmz3z8smai"; depends=[httr magrittr plyr purrr tibble]; };
   tawny = derive2 { name="tawny"; version="2.1.6"; sha256="0s6p0nnz1rpcnn2yfj1vvl54g57d8rv5s4y09azwz1z5ls7vnnlv"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
   tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
   taxa = derive2 { name="taxa"; version="0.2.0"; sha256="16jif3s5xf4cawwkhpmjrwb0c4ycmwicrshd5m0arlkcfmq85623"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; };
-  taxize = derive2 { name="taxize"; version="0.9.0"; sha256="07r56nhwqm3rny9d4g7h2azrxad6mg8dpfx9pxmyz5acl5g5xd32"; depends=[ape bold data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2]; };
+  taxize = derive2 { name="taxize"; version="0.9.2"; sha256="15xv9j644a9zcbywx57ba6x6rsdj0pywdq58zak2fyx7c7fwpahm"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; };
   taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; };
   taxlist = derive2 { name="taxlist"; version="0.1.3"; sha256="0lsphap7brl67y458x29843wkxvvf2ppjn1crz4hby7wmn1psarx"; depends=[foreign taxize vegdata]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; };
@@ -11465,14 +11546,14 @@ in with self; {
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
   tensorBF = derive2 { name="tensorBF"; version="1.0.1"; sha256="1rnsff1ypwhn5z0xsxyk2z7jl6igscma1a0w613i81qf37iy81ba"; depends=[tensor]; };
-  tensorBSS = derive2 { name="tensorBSS"; version="0.3.3"; sha256="1frda6k2jx6gjvnhkk7xjj8pbnc20jk0l8fzjsvgn40wf82xs3ff"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; };
+  tensorBSS = derive2 { name="tensorBSS"; version="0.3.4"; sha256="0wh14qy7fa7klb7yy272d16cvgfgnrf25wba3bqbpral9pv5nkmv"; depends=[ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
   tensorflow = derive2 { name="tensorflow"; version="1.5"; sha256="00g5fdr0ij2ximmqgd7a1hz66462lkjf4q6pn0knkhxcgp7jv8nn"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
   tensorr = derive2 { name="tensorr"; version="0.1.0"; sha256="00zqklz3hqjv20giwqnd1d62x5hdm620hfdkn1x75i87dv92qn8m"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
   tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; };
   tergm = derive2 { name="tergm"; version="3.4.1"; sha256="10sanqbnqdyqafjjcwm99zfnpgrv18z4y2rgaq5wqq7nni184hfm"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
   termstrc = derive2 { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; };
   ternvis = derive2 { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; };
-  tesseract = derive2 { name="tesseract"; version="1.9"; sha256="0lrqh8s8xnz8yz52fjn9h8jv0xpf3nmkk7ic3zvlq96msa089szi"; depends=[curl digest rappdirs Rcpp stringr xml2]; };
+  tesseract = derive2 { name="tesseract"; version="2.0"; sha256="0dps8nji7rx5vfa9g2kmdh3vgm9f61dbainl4arrqngcr5fglpnf"; depends=[curl digest pdftools rappdirs Rcpp tibble]; };
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
@@ -11488,10 +11569,11 @@ in with self; {
   textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; };
   textclean = derive2 { name="textclean"; version="0.6.3"; sha256="0i6linb782257clkdpl7rv354myl9wc1417ad2glhh53lgcprfk2"; depends=[data_table english lexicon qdapRegex stringi textshape]; };
   texteffect = derive2 { name="texteffect"; version="0.1"; sha256="0fwcbz7bpynvcivac16z77j8d398bf7vl4l8sppi9yvg72l0k94w"; depends=[boot ggplot2 MASS]; };
+  textfeatures = derive2 { name="textfeatures"; version="0.1.1"; sha256="0pcs3nax21npb5blbwrmzl7q85ya8n7vgjn83z2abjr80gj3f5lj"; depends=[dplyr rlang tibble]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
   textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; };
   textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; };
-  textmineR = derive2 { name="textmineR"; version="2.1"; sha256="1bnpnwpgnqcm22hhxmhqm445brry9cq3bzqkk51zj14q38sccx31"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
+  textmineR = derive2 { name="textmineR"; version="2.1.1"; sha256="15cs2x8cn1766inqck3bdfig0wngwny689bwmjrs5w66618007ji"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
   textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; };
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
   textrank = derive2 { name="textrank"; version="0.2.0"; sha256="0s2mnid3dha3nyyc9abhb36vlij4bg0024i9ay4pvvy4l1x947gr"; depends=[data_table digest igraph]; };
@@ -11518,6 +11600,7 @@ in with self; {
   theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; };
   thgenetics = derive2 { name="thgenetics"; version="0.3-4.1"; sha256="05g5rwdpnd1b4h1lay2l1s0ns2q6a7sav8d4zrxaqgzhaafnpxyv"; depends=[]; };
   thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; };
+  thinkr = derive2 { name="thinkr"; version="0.11"; sha256="1rr90q91nn406n2sbn3k9q5y1mjcb4i4ixsp05mh38r9qjkbirhk"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr ReporteRs stringi stringr tidyr XLConnect]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
   threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
@@ -11536,17 +11619,18 @@ in with self; {
   tidycensus = derive2 { name="tidycensus"; version="0.4.1"; sha256="1ay6qw25r809fpgs0fsvblgsrpi91ph82mm2w21vj59gba1bkr71"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; };
   tidygraph = derive2 { name="tidygraph"; version="1.1.0"; sha256="1cqmii1pia5s8cj1hfm5jh4qgg9dn65dcb666bqfhq51nzgwy6b4"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; };
-  tidyhydat = derive2 { name="tidyhydat"; version="0.3.2"; sha256="0an22qpxz5sjg4grh54swp62px5428rk553flz73h0islp6wqnq6"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr RSQLite tibble tidyr]; };
+  tidyhydat = derive2 { name="tidyhydat"; version="0.3.3"; sha256="01l4dwsrrmfavskbqxcq5v1ykggk363nn0m0nf6ks51xdr7lckf5"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr RSQLite tibble tidyr]; };
+  tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; };
   tidyinftheo = derive2 { name="tidyinftheo"; version="0.2.1"; sha256="1lh1smhnfg5x35ans3rlj6nvrqwkaiac3ycy7r8wz5h9fhlri3pg"; depends=[dplyr ggplot2 infotheo magrittr purrr rlang tibble tidyselect tidyverse]; };
   tidyposterior = derive2 { name="tidyposterior"; version="0.0.1"; sha256="09q2j6kjwqphdzi60w26mlax9fnmndw7s3fsxfcj0pjjl8688w52"; depends=[broom dplyr ggplot2 purrr rlang rsample rstanarm tibble tidyr]; };
-  tidypredict = derive2 { name="tidypredict"; version="0.1.0"; sha256="1dvyzckndn3hjfylp38mi27lq4f9w87ra5rx5r177qni8ybifiyz"; depends=[dplyr purrr rlang tibble tidyr]; };
+  tidypredict = derive2 { name="tidypredict"; version="0.2.0"; sha256="1hq9xzaa234679qvf02nc5w8l21yh1f3dhl76zxzqc7na7chn13k"; depends=[dplyr purrr rlang tibble tidyr]; };
   tidyquant = derive2 { name="tidyquant"; version="0.5.4"; sha256="1ip3vivn6x0ip2y4izq4cz5lh31ygsymkvbb4jqvb8dj5wywr2hq"; depends=[alphavantager broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries timetk tseries TTR xml2 xts zoo]; };
   tidyr = derive2 { name="tidyr"; version="0.8.0"; sha256="1qjpbj1a2vw6nw4hdb6fgassnrxrdpqwf9a8i6wqnv3wxvjb6zqb"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
-  tidyselect = derive2 { name="tidyselect"; version="0.2.3"; sha256="0b0w30yq30c7bwpaghp3hp0nncqwcmvrra9j58fhx9jihay3l68c"; depends=[glue purrr Rcpp rlang]; };
+  tidyselect = derive2 { name="tidyselect"; version="0.2.4"; sha256="1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"; depends=[glue purrr Rcpp rlang]; };
   tidystats = derive2 { name="tidystats"; version="0.1"; sha256="0dy4yqdc0y8pmix29100x80q828rapnq9y3qn2p6rs763c7canmr"; depends=[dplyr magrittr purrr readr tibble tidyr]; };
   tidystringdist = derive2 { name="tidystringdist"; version="0.1.2"; sha256="1jk5yqkjf33arbbfgfzk7ym943gy95n3yncybmvwbjsff07qpmaw"; depends=[attempt dplyr magrittr purrr rlang stringdist]; };
   tidytext = derive2 { name="tidytext"; version="0.1.7"; sha256="1pvf46z1jiwi1j0z917mml1cg9527zkdckh8h3d1ks4wawz099a9"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
-  tidytree = derive2 { name="tidytree"; version="0.1.6"; sha256="0x9lwgnsz7iz1xdaiz7q9cff1v7888fi5yb6d65lqcgzlc2ipxbz"; depends=[ape dplyr lazyeval magrittr tibble]; };
+  tidytree = derive2 { name="tidytree"; version="0.1.7"; sha256="1hf4xzdaww9vbh7ii88p43fpd8344zvqnw20ylvx58f7p82yl23b"; depends=[ape dplyr lazyeval magrittr tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
   tidyxl = derive2 { name="tidyxl"; version="1.0.0"; sha256="1bsvxsz24qbk9wca8kh4qrb4fi22i49vpciq1pm5c48jb11bjb6b"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
@@ -11558,11 +11642,10 @@ in with self; {
   tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; };
   tigris = derive2 { name="tigris"; version="0.6.2"; sha256="0m4zramm38111rzifh0lqyly2dgdfgg5y39sns2rp8x1n0b69bc2"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
   tikzDevice = derive2 { name="tikzDevice"; version="0.10-1.2"; sha256="1rwxmjwmjr1dssg9dx7rc6nz11225pz2ac9rhp8581slwzw79icl"; depends=[filehash png]; };
-  tileHMM = derive2 { name="tileHMM"; version="1.0-7"; sha256="1ks4b6h15982jh3ls9fz8hq9ac1wf5hfjsvdqcmnba8n3m5zm651"; depends=[corpcor st]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
   tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; };
   time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
-  timeDate = derive2 { name="timeDate"; version="3042.101"; sha256="0vcckaw1gqz3j4v69r9jn41vlmk5a5c7572xam1nl75ki5v4r3bc"; depends=[]; };
+  timeDate = derive2 { name="timeDate"; version="3043.102"; sha256="0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"; depends=[]; };
   timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
   timeSeq = derive2 { name="timeSeq"; version="1.0.3"; sha256="1jdmcbghqmp9phfx7bii8nfqdc10f1nqmi1mk70n0fysm6cdvhn6"; depends=[gss lattice pheatmap reshape]; };
   timeSeries = derive2 { name="timeSeries"; version="3042.102"; sha256="185hmd70hida6i12mxbrccapkpwb6jhf6cmcfbz8bc3sv9h3q5gs"; depends=[timeDate]; };
@@ -11579,17 +11662,18 @@ in with self; {
   timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
   timevis = derive2 { name="timevis"; version="0.4"; sha256="08caa5gilh1c0z41lm3ghf6cpnlsdjfm1v7ha73jxv1655kznmpx"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; };
   timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; };
-  timsac = derive2 { name="timsac"; version="1.3.5"; sha256="1p2fwizq95fhbw0jk23sy0qgkkkab0iy37sw71krpm0dzrgi6lj0"; depends=[]; };
+  timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; };
   tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; };
   tint = derive2 { name="tint"; version="0.0.5"; sha256="1283rik1ynnhy40lm1dipmwzihsy0pdn383k9m1yczl2fqf1qcfi"; depends=[htmltools knitr rmarkdown]; };
   tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; };
-  tinytex = derive2 { name="tinytex"; version="0.3"; sha256="0mhxlr4709mca9jshnah5i7yjyy6k12s933619p7p9c8nbqj39cn"; depends=[]; };
+  tinytex = derive2 { name="tinytex"; version="0.4"; sha256="0ipmv5jrp6kkfj4m4zvhfys54x34zi15lzdxbgzmnil9lyn391zm"; depends=[]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
   tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; };
   tis = derive2 { name="tis"; version="1.34"; sha256="01bpl8q2n49wpr2gghkcv1zf16b3375xa71mv0q7wwn0da3n7m0n"; depends=[]; };
   titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; };
   titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; };
   titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; };
+  tkRplotR = derive2 { name="tkRplotR"; version="0.1.1"; sha256="0fr30c2xjgpjh0pkqv0m7g413wkzzffbak7ak26k7bsi2ls341qa"; depends=[]; };
   tkrgl = derive2 { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; };
   tkrplot = derive2 { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
   tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
@@ -11606,12 +11690,12 @@ in with self; {
   tmap = derive2 { name="tmap"; version="1.11-1"; sha256="0day8hy210a2v2ps9pqcv4mnlx39h7dcj47hkyjsm76qlcdccv3l"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
   tmaptools = derive2 { name="tmaptools"; version="1.2-3"; sha256="08m8dir5k7da72fp3hcsb055alwzpbxr2f9lxmhdbk991bmwacjr"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; };
   tmbstan = derive2 { name="tmbstan"; version="1.0.0"; sha256="01x1nw0mlbpsldrd6hx2g040d9slrhk7hm2pm1v7pci3vxgbpgy9"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
-  tmcn = derive2 { name="tmcn"; version="0.2-8"; sha256="0msgjz32yizl7kfy33mzxjgfj7q3pd0wdly0xzvcmkc254q41bq7"; depends=[]; };
+  tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
   tmle = derive2 { name="tmle"; version="1.3.0"; sha256="0krnf2mzxmcb105gsx1b0gpc009lv27s0brh6sa1sm87a76p6dqd"; depends=[SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
   tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; };
-  tmod = derive2 { name="tmod"; version="0.31"; sha256="1qqzngqnj4vk170ild34fpzsnpb1125zisf6xx5hp8q899z88q81"; depends=[beeswarm pca3d plotwidgets tagcloud XML]; };
+  tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; depends=[beeswarm plotwidgets tagcloud XML]; };
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
   tmuxr = derive2 { name="tmuxr"; version="0.1.0"; sha256="0njd1wdk11bni0pinplyzywqlmswkq2xq7qid68v4s93q9069zn6"; depends=[magrittr purrr stringr]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; };
@@ -11644,12 +11728,14 @@ in with self; {
   track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; };
   trackdem = derive2 { name="trackdem"; version="0.3.1"; sha256="10qq9217mpd4abhkwsh4yjzpi06qpqa5rnwhxls6yzmymf9apngl"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
   trackeR = derive2 { name="trackeR"; version="1.0.0"; sha256="0z200jlkgcdxwss0ckbh3vqcfw56fi7pivr9vzf4rkwyf2n6v25s"; depends=[fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; };
+  trackr = derive2 { name="trackr"; version="0.7.5"; sha256="1achrnkqnpdjp2vr1s7xsl8fdfdyifgv5vr00b3xq9pkr4jggj6z"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools knitr lattice miniUI RJSONIO rmarkdown rsolr shiny]; };
   tractor_base = derive2 { name="tractor.base"; version="3.1.0"; sha256="0d3hkxqygyh02v63wny32zdxpsn6m6q8i1630zl1mhrbvq3kmqr5"; depends=[ore reportr]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
   trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; };
   trajr = derive2 { name="trajr"; version="1.0.0"; sha256="1q17lgwgxn9j3ym1vikrnnyqf61ri3vl7jqq3f1fvy2280nac0s8"; depends=[plotrix signal]; };
+  tram = derive2 { name="tram"; version="0.2-0"; sha256="02jbgp011qbinyjwdmj0nc2mpphmqlhm0dvvs7x2lfngrw1fw163"; depends=[basefun Formula mlt multcomp sandwich survival variables]; };
   tranSurv = derive2 { name="tranSurv"; version="1.1-4"; sha256="1vsp12x4h0s1lba1kf7n0v71kgm1dz6cjfp8lffm4ps80nahs63l"; depends=[rootSolve SQUAREM survival]; };
   transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
@@ -11658,8 +11744,9 @@ in with self; {
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
   transport = derive2 { name="transport"; version="0.9-4"; sha256="0ham0cla4qwfd6fqyckpdl2n2gm3qnl7ry1xi9kjvbajlcc0xwi2"; depends=[Rcpp]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
-  treatSens = derive2 { name="treatSens"; version="2.1.2"; sha256="0zqpx0lwx3vzbwi55n0517zs5vn4zlaf66js506vxnzf1dzx2h0a"; depends=[BH dbarts mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
+  treatSens = derive2 { name="treatSens"; version="2.1.3"; sha256="159dpd4wg0i4cidg40lad665sm3j4qch8d1y3k9chwggbhcad5jn"; depends=[BH dbarts lme4 mvtnorm nlme Rcpp RcppEigen]; };
   tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; };
+  tree_bins = derive2 { name="tree.bins"; version="0.1.0"; sha256="0cqpvh9cbnsk4qv886n2sc1v1s51z4m6aj0ydqzijvy6ckigbiij"; depends=[data_table dplyr rpart rpart_utils]; };
   treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; };
   treeDA = derive2 { name="treeDA"; version="0.0.2"; sha256="0ldk7g0bfs8y0znivhj8db5si7glxawicc5zvapbf8d9djlaxxga"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
   treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
@@ -11671,7 +11758,7 @@ in with self; {
   treemapify = derive2 { name="treemapify"; version="2.4.0"; sha256="1cg8jwlls3r3kjlmmxcm9id2spsn5ggsjrw0826ih2khdlnjc0jy"; depends=[ggfittext ggplot2 plyr]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
   treeplyr = derive2 { name="treeplyr"; version="0.1.3"; sha256="00fkmmzivwy603grfbwdabsik1swkyba7sbwcjzxbgsmx3s472g6"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
-  treespace = derive2 { name="treespace"; version="1.1.1"; sha256="112qic2wxvkcd533hs6bvzzbb7abpylgm9m2bqp1mirrngz3gxp8"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp RLumShiny scatterD3 shiny shinyBS]; };
+  treespace = derive2 { name="treespace"; version="1.1.2"; sha256="0am3ssdxf8v98hffncrg1zdpgcr79gvvr6z2mara04r0rxk86kaw"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp RLumShiny scatterD3 shiny shinyBS]; };
   treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; };
   trelliscope = derive2 { name="trelliscope"; version="0.9.8"; sha256="1581ss5c3f7mnv6s3p9f8kfwnks0l80kxwpxv9mq61w3lf9fksm2"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; };
   trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; };
@@ -11698,7 +11785,7 @@ in with self; {
   truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; };
   truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; };
   truncgof = derive2 { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
-  truncnorm = derive2 { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; };
+  truncnorm = derive2 { name="truncnorm"; version="1.0-8"; sha256="0zn88wdd58223kibk085rhsikl4yhlrwiyq109hzjg06hy6lwmj9"; depends=[]; };
   truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.1"; sha256="07xkif11s3mdp4fmhl6zks6p2kdy4fdys2wpa8ibqpc6gd50vhvn"; depends=[Matrix Rcpp RcppEigen]; };
@@ -11715,14 +11802,14 @@ in with self; {
   tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; };
   tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
-  tsensembler = derive2 { name="tsensembler"; version="0.0.2"; sha256="0yhm6vayh1yjrvki04f86xvxmrl9pcj92z0gzwyh0j1cqp48sh79"; depends=[Cubist earth gbm glmnet kernlab nnet pls ranger RcppRoll xts zoo]; };
+  tsensembler = derive2 { name="tsensembler"; version="0.0.3"; sha256="0f4n2w18cii19ls3706cw0kc2gky2x5nh2sz92f5k2smg28dhia4"; depends=[Cubist earth forecast gbm glmnet kernlab nnet pls ranger RcppRoll softImpute xts zoo]; };
   tseries = derive2 { name="tseries"; version="0.10-43"; sha256="1yjxhj7l1p2przczl6frggfcr5iwda9lbcsmh0y75gbbbps14yf2"; depends=[quadprog quantmod zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
   tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
   tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
   tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.1.2"; sha256="17khhah6vpb4ld3yvvbczx9vkdnilazgdifh0ldnbdw5131bsr34"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
+  tsibble = derive2 { name="tsibble"; version="0.1.3"; sha256="08m4k14hiab6nsqrc6qdnjvgqqngyjdv1m81dyk9v4p6l7x24rsj"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; };
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
@@ -11738,7 +11825,7 @@ in with self; {
   tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; };
   ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
   ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
-  tuber = derive2 { name="tuber"; version="0.9.4"; sha256="0fa4mpvm4mlscnhfbgrj6zxfjf26scv08nihnfi0k3f67jiwdlg5"; depends=[httr plyr]; };
+  tuber = derive2 { name="tuber"; version="0.9.5"; sha256="0519qsgs8cnhd5qx5amh8rz6qa7fhryf5i9wjr38zrlrzvksqblh"; depends=[dplyr httr plyr purrr]; };
   tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; };
   tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.0"; sha256="0pxsnvzh5gy5dsdsqsmq8hkr597dnnv60b5dw7bqw493lavk2ccm"; depends=[]; };
   tufte = derive2 { name="tufte"; version="0.3"; sha256="1fpv9ilf8ajynz38ny0abfnq20xzpgwbxaxj8ijwy8viki893bd0"; depends=[htmltools knitr rmarkdown xfun]; };
@@ -11768,7 +11855,7 @@ in with self; {
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
-  uGMAR = derive2 { name="uGMAR"; version="1.0.2"; sha256="09k3g0rnaf7gkczgak8biajnql5fjv32dv59y0ncd8zvv0d9i77q"; depends=[Brobdingnag]; };
+  uGMAR = derive2 { name="uGMAR"; version="2.0.0"; sha256="1qgbqqn70n5m0bw8nppzvf0gwgwic7iaidmp9xpmp4mpliybq2j0"; depends=[Brobdingnag]; };
   uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
   uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; };
   uavRmp = derive2 { name="uavRmp"; version="0.5.3"; sha256="05annx1vzpssxf5ycrgk2dizgl83zbwvl2x3bj8r5d8w5lvlpwrb"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
@@ -11825,7 +11912,7 @@ in with self; {
   usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; };
   useful = derive2 { name="useful"; version="1.2.3"; sha256="016fwnjrnq44m71jmiy8cpzncja77pii2ag2ir85jdk4fzgckn7l"; depends=[dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
   userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.0"; sha256="14wdy74mj9rzlpmrsy3b4fda5f2sx078w1k1lgahz0yra3bypl3k"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; };
-  usethis = derive2 { name="usethis"; version="1.2.0"; sha256="0y8nw2kcwnygkwxbdshf9czlf6064fs4h54hvr3j1nbv4a479i68"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; };
+  usethis = derive2 { name="usethis"; version="1.3.0"; sha256="0r61pf8qisjvrshm6jpcb76ck1v79s7lg9zwdgad4fasyyrzrcx2"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; };
   usmap = derive2 { name="usmap"; version="0.2.1"; sha256="0ilg8fzrxpljdly8xkniirqa3lw74kfark75pv071aa4l6xkiwlg"; depends=[]; };
@@ -11859,7 +11946,7 @@ in with self; {
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
   vardpoor = derive2 { name="vardpoor"; version="0.9.11"; sha256="0ij45lq3dgvxm2nf6n8amd4si7giajnwlzq0lia568zfisdw4k0l"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.2"; sha256="1lbhwkkp9dyfhby6s4q3b6wy13wfqdjw3q21kq6k08rz7lsi0wny"; depends=[]; };
-  variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; };
+  variables = derive2 { name="variables"; version="1.0-0"; sha256="0i1nmrbps1snyzdwlki7sfxf2vpqghd9ap8pmy235d5r399jmpkb"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
   variosig = derive2 { name="variosig"; version="0.1"; sha256="191d4f52z686s8xbx7aw9c3qjp77iri43l52n8nxjgfjl877x5m4"; depends=[geoR gstat sp]; };
   vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
@@ -11883,7 +11970,7 @@ in with self; {
   vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
   vegtable = derive2 { name="vegtable"; version="0.1.1"; sha256="0vpkfagkvwkij4kn4zxxiddbnw1qxv6dajjlis4byl766606xi1v"; depends=[foreign plotKML qdapRegex sp taxlist vegdata]; };
-  vein = derive2 { name="vein"; version="0.2.3"; sha256="0sidixipn8kc2i3n9qlgk76rqvxriz1z1ms2pmicv0qnj1a5pwgp"; depends=[raster rgdal rgeos sp units]; };
+  vein = derive2 { name="vein"; version="0.3.9"; sha256="1h5j7fa0c7q1p3fj3pr98f4y1dc4n2r6gm0a8rddv4m8nf2cjgq7"; depends=[data_table sf sp units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; };
   velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; };
   vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
@@ -11896,7 +11983,7 @@ in with self; {
   vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
   vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
-  vetr = derive2 { name="vetr"; version="0.2.2"; sha256="1nnaciddgla2r2910w3z5rpkjsyf61chidq3spnyq17qyhi98b96"; depends=[]; };
+  vetr = derive2 { name="vetr"; version="0.2.3"; sha256="1b35j8zzaj626dgz34hlprgsplnnskpl6zw3vppw27nnds7fdlh8"; depends=[]; };
   vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
@@ -11911,7 +11998,7 @@ in with self; {
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
   visNetwork = derive2 { name="visNetwork"; version="2.0.3"; sha256="0bs6war8m6vnzyhmzfmry5sfc5v1crq8i8r8nn70shf19k7pabmw"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
   visdat = derive2 { name="visdat"; version="0.1.0"; sha256="1r009jlg3wwg06j5066c09567q24986c74f0cd68kcbmihaxngbx"; depends=[dplyr ggplot2 magrittr purrr tidyr]; };
-  visreg = derive2 { name="visreg"; version="2.4-1"; sha256="1lkp668ni5p7k0vzcr75p1bsc1pyg0j0sghagdjb11abinmfzsm1"; depends=[lattice]; };
+  visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; };
   vistime = derive2 { name="vistime"; version="0.4.0"; sha256="0fahih28q7lyywnm4mri9macdx4c5b3c5djmg557f7dxlyhhjw0l"; depends=[plotly RColorBrewer]; };
   visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
@@ -11919,6 +12006,7 @@ in with self; {
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
   vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
+  vlad = derive2 { name="vlad"; version="0.1.0"; sha256="0gdp9488ir6zsnwaf0zb1n4qivafccqky7i867vjc2zb9nnji6a9"; depends=[Rcpp RcppArmadillo]; };
   vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; };
   vmsbase = derive2 { name="vmsbase"; version="2.1.3"; sha256="1y4r1f6miwxx3q8pajyh202wvjz08w6291jvpv723qyxa6z1r69a"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
   vocaldia = derive2 { name="vocaldia"; version="0.8.2"; sha256="15314sq2gbi1z47ppvy8y3ljjk12jq4k5a1dfyi56h2lpzrc76ny"; depends=[]; };
@@ -11927,7 +12015,7 @@ in with self; {
   vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; };
   voteogram = derive2 { name="voteogram"; version="0.2.0"; sha256="0m4j7iz7mc6z536vk0kmqfd8ank87ingv5vnjl7mn62r53c5fbsf"; depends=[dplyr ggplot2 jsonlite scales]; };
   vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; };
-  vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; };
+  vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; };
   vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; };
   voxel = derive2 { name="voxel"; version="1.3.2"; sha256="0sixcan3v5nczmrrxn56rw5dqjq8xx7z3cp18j23jq26mvq4nm34"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; };
   vpc = derive2 { name="vpc"; version="1.0.1"; sha256="0zxiakls7wi0278f6v74xdcaw500am8gfs8lp7cciaxnw2clvsbv"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; };
@@ -11936,7 +12024,7 @@ in with self; {
   vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
   vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
   vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; };
-  vtreat = derive2 { name="vtreat"; version="1.0.2"; sha256="17w1iy0bypdyaci6yjfbqhdwvnbacn9kpb1i28k3664c96qm8gs7"; depends=[]; };
+  vtreat = derive2 { name="vtreat"; version="1.0.3"; sha256="04kicd7jxvcnvd0n9ssxv3jsi075wass30l3jg0ikdr3kc899vfs"; depends=[]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; };
   wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; };
@@ -11944,7 +12032,7 @@ in with self; {
   wNNSel = derive2 { name="wNNSel"; version="0.1"; sha256="19j2yz6lvkxpmjr0vv6pjc7j1c02y0hb3gay5sy1y0xk706aggb5"; depends=[]; };
   wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; };
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
-  wTO = derive2 { name="wTO"; version="1.4.2"; sha256="05mbf6dpl9p1b583kl9gfjqh8xlzdkyagdalhkh6jahcmg9f1fcy"; depends=[data_table igraph magrittr plyr reshape2 som visNetwork]; };
+  wTO = derive2 { name="wTO"; version="1.5"; sha256="0zz89r60fq47gdd08p29xxsx22097ynz1zrc4zmkv5z99wsmsssp"; depends=[data_table igraph magrittr plyr reshape2 som visNetwork]; };
   waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; };
   waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
@@ -11976,6 +12064,7 @@ in with self; {
   wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; };
   wbs = derive2 { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; };
   wbstats = derive2 { name="wbstats"; version="0.2"; sha256="0rfc9c6892jq7y17dwp6vsn62ggnac964xndmxq3mip6k2pk8yi0"; depends=[httr jsonlite tidyr]; };
+  wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; };
   wdman = derive2 { name="wdman"; version="0.2.2"; sha256="1a6zav82w0krk0ncm5b79ahy2hc0xakg9i1m2143ih5p6zvcm5m0"; depends=[assertthat binman semver subprocess yaml]; };
   weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; };
@@ -11983,7 +12072,7 @@ in with self; {
   webchem = derive2 { name="webchem"; version="0.3.0"; sha256="11ryyniqcf6pa5avc5qks0hpksmapk3564bjva86626vml0mixby"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
   webdriver = derive2 { name="webdriver"; version="1.0.4"; sha256="0k031f26iihk2dxypqvfi60bhpj78yhwvhbmxqv7yrpa8s6j5flm"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage]; };
   webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
-  webmockr = derive2 { name="webmockr"; version="0.1.0"; sha256="0jfjn0y62rrwx88vhx4xfgsf36f147b3yzwvpyshxwvxn9khza5i"; depends=[curl jsonlite lazyeval magrittr R6 urltools]; };
+  webmockr = derive2 { name="webmockr"; version="0.2.0"; sha256="1zzfam380gy1d3k909ixbk61gmmv0w1x17qz8avrrnjlvqbp9gmn"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
   websearchr = derive2 { name="websearchr"; version="0.0.2"; sha256="1yf8ch86khg5syppcxs94mxgc3i5623qyhzh174nssw1wzyqb9ba"; depends=[]; };
@@ -12005,17 +12094,18 @@ in with self; {
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
   wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
-  wgeesel = derive2 { name="wgeesel"; version="1.4"; sha256="0d49j24jmk6n7fzzdvhc9fxi8yb1shghf7fc7jvm3cahhjffxay2"; depends=[bindata geepack MASS PoisNor]; };
+  wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; };
   wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
+  whitening = derive2 { name="whitening"; version="1.0.0"; sha256="0vncjbrw9gafplz6r02x0j1fnrfvxq027h1pqcbdwqykjzg0zcym"; depends=[corpcor]; };
   whoami = derive2 { name="whoami"; version="1.1.2"; sha256="1wkgh8mxm2ci5ylwppbh38sx5fm5rsm06bimdpc07z35bz4825xg"; depends=[httr jsonlite]; };
   whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; };
   wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; };
   widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
   widenet = derive2 { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
   widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; };
-  widyr = derive2 { name="widyr"; version="0.1.0"; sha256="0vy34phli9jynjdwss8cpadaaizh9bhc1h0amsblc0il6xanviqm"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
+  widyr = derive2 { name="widyr"; version="0.1.1"; sha256="14r1qiq4i7lmn3i76aa0d9wcjw1jclm1jf371j25s92w8z36mdln"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
   wikilake = derive2 { name="wikilake"; version="0.3"; sha256="1y4vinm8gxyj6x36nb4xzhx1yf96x1nwlzzhvj4g36rbcix7dn6q"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; };
@@ -12024,7 +12114,7 @@ in with self; {
   wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
   wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
-  windfarmGA = derive2 { name="windfarmGA"; version="1.1.1"; sha256="1fns58q8bzsa6z8dghqs41xiv331pl75d4awrfgwslbg3lrd2x49"; depends=[calibrate data_table dplyr geoR ggplot2 googleVis gstat gtools leaflet maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
+  windfarmGA = derive2 { name="windfarmGA"; version="1.2"; sha256="1g1m7q8gdkd4mawdxi06lsalhii2ymzqlmxfdqhp2cnvj4k7fqby"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
   wiqid = derive2 { name="wiqid"; version="0.1.3"; sha256="06six8w77lf9rc49hnr42xgn2jvhb84wvqgi08ns22yn4z2iz9pz"; depends=[coda HDInterval MASS truncnorm]; };
@@ -12034,20 +12124,21 @@ in with self; {
   wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; };
   wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
   wmtsa = derive2 { name="wmtsa"; version="2.0-3"; sha256="1q436krz5p1f4a7a7sya6a9rh9x9mi8zzcgq66gbk9w9w4hcqcj6"; depends=[ifultools MASS splus2R]; };
-  wnl = derive2 { name="wnl"; version="0.3.2"; sha256="1gqp2rrfn4971f12fbf90habk2zqb0hw92nf5c6vvvyx1zad7m81"; depends=[numDeriv]; };
+  wmwpow = derive2 { name="wmwpow"; version="0.1.0"; sha256="0hvim7b9zn6h6w6m6hgil919nkzkn8676x8b2f3lbmm8m7dwm3lq"; depends=[lamW MASS smoothmest]; };
+  wnl = derive2 { name="wnl"; version="0.3.3"; sha256="1dcq7xicsbwwlw8f2g1f2q4b4ph0w5kjs3108cfg12yww0qjl4ss"; depends=[numDeriv]; };
   wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
   woeBinning = derive2 { name="woeBinning"; version="0.1.5"; sha256="04pw32vng31v1n4r1g1fisvv8cacxmcx7m65vw4a2byamp2d25yq"; depends=[]; };
   woeR = derive2 { name="woeR"; version="0.1.3"; sha256="15bdhgjq39svzaqzmfykyaq4r543lq15jf0sz8m9bwjv2c6vlx5l"; depends=[dplyr]; };
   womblR = derive2 { name="womblR"; version="1.0.2"; sha256="0cnggwi47pmyjqz78vcvdzv3kpss6v4h404w2d7dii0zfqjr7bpk"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
   wooldridge = derive2 { name="wooldridge"; version="1.2.0"; sha256="1ib7qqmzybk7a171ny0zszh1lw2zgqyz35rb7g6y4ign2ng9ml9k"; depends=[]; };
-  word_alignment = derive2 { name="word.alignment"; version="1.0.8"; sha256="0f8fxz7qhj618bz16mmwm3fhrd9p0idsx6pj0cdx72dkvfgkdwn0"; depends=[data_table openxlsx quanteda]; };
+  word_alignment = derive2 { name="word.alignment"; version="1.0.9"; sha256="02dy4a9agfb99rjbqxy35nf11bpxyjcq15bnyzjkbvcy0ppfgz0l"; depends=[data_table openxlsx quanteda]; };
   wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
   wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; };
   wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
   wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; };
   wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
-  worldmet = derive2 { name="worldmet"; version="0.8.3"; sha256="0pz4kh11y93gad4jhpyzqz66sma1ngvavmpy4ki4z1dcry452yvs"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; };
+  worldmet = derive2 { name="worldmet"; version="0.8.4"; sha256="15crnmlcj1yi9rm35n8f34jprms24r2xwx550zz627bdvq4vmam4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; };
   worms = derive2 { name="worms"; version="0.2.1"; sha256="0qxij56wvhlz9pgc1wp5nr3yi2r0h0r7xvlhhvsflch60gprpi1s"; depends=[httr plyr]; };
   worrms = derive2 { name="worrms"; version="0.2.0"; sha256="1mqv2j9235pqdwqnw11b0zdv763wf9wqjqpf3p6fxpmki24j7xk6"; depends=[crul data_table jsonlite tibble]; };
   wosr = derive2 { name="wosr"; version="0.1.0"; sha256="0j3srk8siiip192w6wdc2w9azbhpdxyrzgyinwmi1z58xqmi9c38"; depends=[httr jsonlite pbapply xml2]; };
@@ -12060,7 +12151,7 @@ in with self; {
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.1.1"; sha256="01v41qcsdpdisvccagba3l67834r6k0lhlalwna7lrvwx008cd9s"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.2.0"; sha256="1dagjsbi75gplzkc44p4jqjbh3plp0kw9dz060kqsf0y7z6dk9vh"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.6"; sha256="1f6yyw6mmwc267cd9v17k6n4fhymi0y201bm6ii56rcw86n4ix77"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   writexl = derive2 { name="writexl"; version="0.2"; sha256="0hclrbn21sc0ifd2c5xfww84jf47412wzs86a73swxxjzcbrkg5k"; depends=[]; };
@@ -12103,9 +12194,9 @@ in with self; {
   xml2 = derive2 { name="xml2"; version="1.2.0"; sha256="154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha"; depends=[Rcpp]; };
   xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.1"; sha256="0q9d4l3p4ypc0qswnjwrd3as9bx9f1niixsc19y1msva51sg5h39"; depends=[]; };
   xmrr = derive2 { name="xmrr"; version="1.0.1"; sha256="0h5861mym7k7xkby6zilcxq8i3yr06kcaam5pzi2y0q85iycb88f"; depends=[dplyr ggplot2 tidyr]; };
-  xoi = derive2 { name="xoi"; version="0.66-9"; sha256="1kd9s9afq5shsaqhrxai9yz60a9imyy5np76fjpkjgyz56kbk6nr"; depends=[qtl]; };
+  xoi = derive2 { name="xoi"; version="0.67-4"; sha256="180zzc81d883qzl1xgj88d9aslqmsgdvv8w1mx2613h1rkirkpdp"; depends=[qtl]; };
   xpose = derive2 { name="xpose"; version="0.4.2"; sha256="11k07z76fpp4fvp3kfx1jc7bx1mwc1xfwyp46xwfhgfbazbvyfd7"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; };
-  xpose4 = derive2 { name="xpose4"; version="4.6.0"; sha256="1pyzpb6ddvpm3nx49brkam6afzhvf7jg8xnijg9jwd2qfijp8lav"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; };
+  xpose4 = derive2 { name="xpose4"; version="4.6.1"; sha256="1722ai8r94dmy4d2r728iir0hl2b2gmym8xjsqscfc6jw070734i"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; };
   xptr = derive2 { name="xptr"; version="1.1"; sha256="12yvgbwm311hap3kk24wdx5zz084h0lhkj9k10mjzqp4a6aayi88"; depends=[]; };
   xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; };
   xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
@@ -12124,7 +12215,7 @@ in with self; {
   yaImpute = derive2 { name="yaImpute"; version="1.0-29"; sha256="1zxl4l54y9f9lmi17hlhsbsc4f1qb0dnnl5dg9frhq6bhw2lqxqb"; depends=[]; };
   yacca = derive2 { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
-  yaml = derive2 { name="yaml"; version="2.1.16"; sha256="1xlsmqal607w6c9rx86061y1fwpbyd5lqp9bad5n7cc9a0blpnkm"; depends=[]; };
+  yaml = derive2 { name="yaml"; version="2.1.18"; sha256="15m4q5krfqg0avvqg9i2g6ns4757lk6zbyrwbx5c5bgh51glvd8v"; depends=[]; };
   yardstick = derive2 { name="yardstick"; version="0.0.1"; sha256="165czwi62nrhhci06fb0rfpk2gki94aiyl4wlflmgpzmspmgz7m8"; depends=[broom dplyr MLmetrics pROC rlang tibble tidyr tidyselect]; };
   yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; };
   yasp = derive2 { name="yasp"; version="0.1.0"; sha256="082w1l0892v0vrvfmc1ssgy9ccj30hcrg7m56x61spgcmckfshy4"; depends=[]; };
@@ -12145,16 +12236,16 @@ in with self; {
   zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; };
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
-  zenplots = derive2 { name="zenplots"; version="0.0-2"; sha256="09dp2d89wnvvqkfz7w1fzs8gyq7ryyxsn2h5mgzbm1spd3dmychw"; depends=[graph loon MASS PairViz]; };
+  zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; };
   zetadiv = derive2 { name="zetadiv"; version="1.0.1"; sha256="0a50xj7bgb2w3yx2ghpwq2y2hkilxx0dchhscspzjalyw77jhxvp"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
   zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };
-  ziphsmm = derive2 { name="ziphsmm"; version="2.0.1"; sha256="1q1ack3b6ppyp946f56lhrad1839dzv36qsk58czym46pbpdid4l"; depends=[Rcpp RcppArmadillo]; };
+  ziphsmm = derive2 { name="ziphsmm"; version="2.0.2"; sha256="0ki9slsrh9skb23svc9m5a0gbzf4crhgrricr0swr97n5h9xfzkw"; depends=[Rcpp RcppArmadillo]; };
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
-  zoib = derive2 { name="zoib"; version="1.4.2"; sha256="0gdbcnxlm9m88c2av4zy0k3yvm2cvg24804xnsi0mwfgwmnngdh5"; depends=[abind coda Formula matrixcalc rjags]; };
+  zoib = derive2 { name="zoib"; version="1.5.0"; sha256="133d5qxhv5vlxb9f1lh0zsmcb7ycbr42hjynzmd8f5fd91x8k43i"; depends=[abind coda Formula matrixcalc rjags]; };
   zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; };
   zoo = derive2 { name="zoo"; version="1.8-1"; sha256="16nc5jnpkf5j9vgq3pzssv7knj30mi055wj7q3sygz3l0d88hgfr"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };

From 732be7d5726bddb1a53306f7be7686c7e90b5985 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 11:52:45 -0700
Subject: [PATCH 1138/2266] vault: 0.9.4 -> 0.9.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault -h` got 0 exit code
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault --help` got 0 exit code
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault -v` and found version 0.9.5
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault --version` and found version 0.9.5
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault version` and found version 0.9.5
- found 0.9.5 with grep in /nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5
---
 pkgs/tools/security/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 8118e830675..02c0b27a564 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,13 +9,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1a12pfzln6qdff08j9l1807anrsgn3ggnaqda020p6y9zg1p8xzd";
+    sha256 = "1ddki3bnp6yrajc0cxxjkbdlfp0xqx407nxvvv611lsnlbr2sz5g";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];

From e3d08865e7080766eccb5ecbefbc5839b99bd228 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 12:10:28 -0700
Subject: [PATCH 1139/2266] vips: 8.6.2 -> 8.6.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vips -h` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vips --help` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vips help` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vips -v` and found version 8.6.3
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vips --version` and found version 8.6.3
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vipsedit --help` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vipsthumbnail -h` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vipsthumbnail --help` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vipsheader -h` got 0 exit code
- ran `/nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3/bin/vipsheader --help` got 0 exit code
- found 8.6.3 with grep in /nix/store/bp442wm5qgvy88dgyl1qa60jsp068yg4-vips-8.6.3
---
 pkgs/tools/graphics/vips/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index c50d7ec8fad..d1dfe7afbf8 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vips-${version}";
-  version = "8.6.2";
+  version = "8.6.3";
 
   src = fetchurl {
     url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "18hjwk000w49yjjb41qrk4s39mr1xccisrvwy2x063vyjbdbr1ll";
+    sha256 = "14h9w61gaimldmqaym0zhf9fkxjj1pkd5lhglhs6pxphynwxnnpq";
   };
 
   buildInputs =

From 2956cc87603b1961ddc0f930c07e51c82613b59a Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Thu, 15 Mar 2018 18:55:18 +0100
Subject: [PATCH 1140/2266] haskellPackages.ghcWithPackages: Wrap haddock with
 GHC lib dir

---
 .../haskell-modules/with-packages-wrapper.nix            | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index d858787f43c..03f0a1dd0a3 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -95,6 +95,15 @@ symlinkJoin {
         makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
       fi
     done
+
+    # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
+    if [[ -x "${ghc}/bin/haddock" ]]; then
+      rm -f $out/bin/haddock
+      makeWrapper ${ghc}/bin/haddock $out/bin/haddock    \
+        --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'  \
+        --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+    fi
+
   '' + (lib.optionalString targetPlatform.isDarwin ''
     # Work around a linker limit in macOS Sierra (see generic-builder.nix):
     local packageConfDir="$out/lib/${ghc.name}/package.conf.d";

From 60b5fdd67f5dcfbfbbbaf28f5cb8e4fade300bcf Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 12:26:32 -0700
Subject: [PATCH 1141/2266] vnstat: 1.17 -> 1.18

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstat --help` got 0 exit code
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstat -v` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstat --version` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstat --help` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstati --help` got 0 exit code
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstati -v` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstati --version` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstati --help` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstatd --help` got 0 exit code
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstatd -v` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstatd --version` and found version 1.18
- ran `/nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18/bin/vnstatd --help` and found version 1.18
- found 1.18 with grep in /nix/store/zaidqa5gzm2wdfg0mrybj180k73jbkpq-vnstat-1.18
---
 pkgs/applications/networking/vnstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 7c059b6f9fd..e38ba36b925 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "vnstat-${version}";
-  version = "1.17";
+  version = "1.18";
 
   src = fetchurl {
-    sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q";
+    sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp";
     url = "http://humdi.net/vnstat/${name}.tar.gz";
   };
 

From 3b51839427b5d547a35497cda076f448ef33fb8a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 13:03:37 -0700
Subject: [PATCH 1142/2266] xca: 1.4.0 -> 1.4.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.1 with grep in /nix/store/zbqzc6j7104bdpdmpxzj8i11dsxmp3h4-xca-1.4.1
---
 pkgs/applications/misc/xca/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index c783985d505..270380a8c3f 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -3,11 +3,11 @@
 
 mkDerivation rec {
   name = "xca-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/xca/${name}.tar.gz";
-    sha256 = "1gygj6kljj3r1y0pg67mks36vfcz4vizjsqnqdvrk6zlgqjbzm7z";
+    sha256 = "11niik2m4yswkp71hrdh54z5kgkvdg8y0b6wdqbrn6vy1n8gz63q";
   };
 
   enableParallelBuilding = true;

From 9c207cd922cb5be603f4793b5ad8e6d3b81c5d41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:12:13 +0100
Subject: [PATCH 1143/2266] R: fix evaluation errors

---
 pkgs/development/r-modules/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index cc0fdfc6fd9..37d6611cd9f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -366,7 +366,6 @@ let
     udunits2 = [ pkgs.udunits pkgs.expat ];
     V8 = [ pkgs.v8_3_14 ];
     VBLPCM = [ pkgs.gsl_1 ];
-    VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
     WhopGenome = [ pkgs.zlib.dev ];
     XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
     xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
@@ -404,7 +403,6 @@ let
     RGtk2 = [ pkgs.pkgconfig ];
     RProtoBuf = [ pkgs.pkgconfig ];
     Rpoppler = [ pkgs.pkgconfig ];
-    VBmix = [ pkgs.pkgconfig ];
     XML = [ pkgs.pkgconfig ];
     cairoDevice = [ pkgs.pkgconfig ];
     chebpol = [ pkgs.pkgconfig ];
@@ -493,7 +491,6 @@ let
     "EasyqpcR"
     "EcoVirtual"
     "ENiRG"
-    "EnQuireR"
     "eVenn"
     "exactLoglinTest"
     "fat2Lpoly"

From 745efc94a4ec1c5e4ce9aced5ac56726f89a8ddb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 13:19:04 -0700
Subject: [PATCH 1144/2266] xe: 0.6.1 -> 0.11

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
---
 pkgs/tools/system/xe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index e0444fcfd9f..934aa6fc279 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xe-${version}";
-  version = "0.6.1";
+  version = "0.11";
   
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "xe";
     rev = "v${version}";
-    sha256 = "1dr3xlfq3zfdba1q96iags572lbk3z6s2179rs3pvsgkxn4m0qpf";
+    sha256 = "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x";
   };
 
   makeFlags = "PREFIX=$(out)";

From ff9db1ffc478be9e9ff466ae584472903a8491f3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 16:28:09 -0400
Subject: [PATCH 1145/2266] linux-copperhead: 4.15.9.a -> 4.15.10.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 9b1552fc90f..f59106746fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.9";
+  version = "4.15.10";
   revision = "a";
-  sha256 = "0nnim0ziibrg6ihipnkgmy0ssmwgjy5lyzfj78snvw5fmp5a9k74";
+  sha256 = "02plwrj6d7wzwf6w8q2cxspy2q58i3v46clm2vf8m9x6mm88jrzx";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From da9f52a6e93e66f86802a98bd1779d3a60a3384a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 17:37:50 +0100
Subject: [PATCH 1146/2266] LTS Haskell 11.0

---
 .../configuration-hackage2nix.yaml            | 970 ++++++------------
 1 file changed, 337 insertions(+), 633 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3139a15039f..05fae616da0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 10.9
+  # LTS Haskell 11.0
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -46,7 +46,6 @@ default-package-overrides:
   - accelerate-arithmetic ==1.0
   - accelerate-bignum ==0.1.0.0
   - accelerate-blas ==0.1.0.1
-  - accelerate-examples ==1.1.0.0
   - accelerate-fft ==1.1.0.0
   - accelerate-fftw ==1.0
   - accelerate-fourier ==1.0.0.4
@@ -60,7 +59,7 @@ default-package-overrides:
   - action-permutations ==0.0.0.1
   - active ==0.2.0.13
   - ad ==4.3.5
-  - adjunctions ==4.3
+  - adjunctions ==4.4
   - adler32 ==0.1.1.0
   - aern2-mp ==0.1.2.0
   - aern2-real ==0.1.1.0
@@ -81,9 +80,9 @@ default-package-overrides:
   - Agda ==2.5.3
   - airship ==0.9.3
   - alarmclock ==0.4.0.3
-  - alerta ==0.1.0.6
   - alerts ==0.1.0.0
   - alex ==3.2.3
+  - algebra ==4.3.1
   - algebraic-graphs ==0.0.5
   - alsa-core ==0.5.0.1
   - alsa-mixer ==0.2.0.3
@@ -92,100 +91,12 @@ default-package-overrides:
   - alternative-vector ==0.0.0
   - alternators ==0.1.2.0
   - ALUT ==2.4.0.2
-  - amazonka ==1.5.0
-  - amazonka-apigateway ==1.5.0
-  - amazonka-application-autoscaling ==1.5.0
-  - amazonka-appstream ==1.5.0
-  - amazonka-autoscaling ==1.5.0
-  - amazonka-budgets ==1.5.0
-  - amazonka-certificatemanager ==1.5.0
-  - amazonka-cloudformation ==1.5.0
-  - amazonka-cloudfront ==1.5.0
-  - amazonka-cloudhsm ==1.5.0
-  - amazonka-cloudsearch ==1.5.0
-  - amazonka-cloudsearch-domains ==1.5.0
-  - amazonka-cloudtrail ==1.5.0
-  - amazonka-cloudwatch ==1.5.0
-  - amazonka-cloudwatch-events ==1.5.0
-  - amazonka-cloudwatch-logs ==1.5.0
-  - amazonka-codebuild ==1.5.0
-  - amazonka-codecommit ==1.5.0
-  - amazonka-codedeploy ==1.5.0
-  - amazonka-codepipeline ==1.5.0
-  - amazonka-cognito-identity ==1.5.0
-  - amazonka-cognito-idp ==1.5.0
-  - amazonka-cognito-sync ==1.5.0
-  - amazonka-config ==1.5.0
-  - amazonka-core ==1.5.0
-  - amazonka-datapipeline ==1.5.0
-  - amazonka-devicefarm ==1.5.0
-  - amazonka-directconnect ==1.5.0
-  - amazonka-discovery ==1.5.0
-  - amazonka-dms ==1.5.0
-  - amazonka-ds ==1.5.0
-  - amazonka-dynamodb ==1.5.0
-  - amazonka-dynamodb-streams ==1.5.0
-  - amazonka-ec2 ==1.5.0
-  - amazonka-ecr ==1.5.0
-  - amazonka-ecs ==1.5.0
-  - amazonka-efs ==1.5.0
-  - amazonka-elasticache ==1.5.0
-  - amazonka-elasticbeanstalk ==1.5.0
-  - amazonka-elasticsearch ==1.5.0
-  - amazonka-elastictranscoder ==1.5.0
-  - amazonka-elb ==1.5.0
-  - amazonka-elbv2 ==1.5.0
-  - amazonka-emr ==1.5.0
-  - amazonka-gamelift ==1.5.0
-  - amazonka-glacier ==1.5.0
-  - amazonka-health ==1.5.0
-  - amazonka-iam ==1.5.0
-  - amazonka-importexport ==1.5.0
-  - amazonka-inspector ==1.5.0
-  - amazonka-iot ==1.5.0
-  - amazonka-iot-dataplane ==1.5.0
-  - amazonka-kinesis ==1.5.0
-  - amazonka-kinesis-analytics ==1.5.0
-  - amazonka-kinesis-firehose ==1.5.0
-  - amazonka-kms ==1.5.0
-  - amazonka-lambda ==1.5.0
-  - amazonka-lightsail ==1.5.0
-  - amazonka-marketplace-analytics ==1.5.0
-  - amazonka-marketplace-metering ==1.5.0
-  - amazonka-ml ==1.5.0
-  - amazonka-opsworks ==1.5.0
-  - amazonka-opsworks-cm ==1.5.0
-  - amazonka-pinpoint ==1.5.0
-  - amazonka-polly ==1.5.0
-  - amazonka-rds ==1.5.0
-  - amazonka-redshift ==1.5.0
-  - amazonka-rekognition ==1.5.0
-  - amazonka-route53 ==1.5.0
-  - amazonka-route53-domains ==1.5.0
-  - amazonka-s3 ==1.5.0
-  - amazonka-sdb ==1.5.0
-  - amazonka-servicecatalog ==1.5.0
-  - amazonka-ses ==1.5.0
-  - amazonka-shield ==1.5.0
-  - amazonka-sms ==1.5.0
-  - amazonka-snowball ==1.5.0
-  - amazonka-sns ==1.5.0
-  - amazonka-sqs ==1.5.0
-  - amazonka-ssm ==1.5.0
-  - amazonka-stepfunctions ==1.5.0
-  - amazonka-storagegateway ==1.5.0
-  - amazonka-sts ==1.5.0
-  - amazonka-support ==1.5.0
-  - amazonka-swf ==1.5.0
-  - amazonka-test ==1.5.0
-  - amazonka-waf ==1.5.0
-  - amazonka-workspaces ==1.5.0
-  - amazonka-xray ==1.5.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.7.1.1
+  - ansi-terminal ==0.8.0.2
   - ansi-wl-pprint ==0.6.8.2
+  - ANum ==0.2.0.2
   - apecs ==0.2.4.7
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.4
@@ -197,8 +108,6 @@ default-package-overrides:
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
-  - arrowp-qq ==0.2.1.1
-  - arrows ==0.4.4.1
   - asciidiagram ==1.3.3
   - ascii-progress ==0.3.3.0
   - asn1-encoding ==0.9.5
@@ -207,7 +116,6 @@ default-package-overrides:
   - assert-failure ==0.1.2.2
   - astro ==0.4.2.0
   - async ==2.1.1.1
-  - async-dejafu ==0.1.3.0
   - async-extra ==0.2.0.0
   - async-refresh ==0.2.0.2
   - async-refresh-tokens ==0.3.0.1
@@ -222,22 +130,18 @@ default-package-overrides:
   - attoparsec-ip ==0.0.1
   - attoparsec-iso8601 ==1.0.0.0
   - attoparsec-path ==0.0.0.1
-  - attoparsec-uri ==0.0.3
+  - attoparsec-time ==1
+  - attoparsec-uri ==0.0.4
   - audacity ==0.0.1.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.3
+  - autoexporter ==1.1.4
   - auto-update ==0.1.4
-  - avers ==0.0.17.1
-  - avers-api ==0.1.0
-  - avers-server ==0.1.0
   - avwx ==0.3.0.2
-  - aws ==0.18
   - axiom ==0.4.6
   - b9 ==0.5.35
-  - backprop ==0.0.3.0
-  - bake ==0.5
+  - backprop ==0.1.3.0
   - bank-holidays-england ==0.1.0.6
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
@@ -246,8 +150,8 @@ default-package-overrides:
   - base64-bytestring ==1.0.0.1
   - base64-string ==0.2
   - base-compat ==0.9.3
-  - basement ==0.0.4
-  - base-orphans ==0.6
+  - basement ==0.0.7
+  - base-orphans ==0.7
   - base-prelude ==1.2.0.1
   - base-unicode-symbols ==0.2.2.4
   - basic-prelude ==0.7.0
@@ -264,7 +168,7 @@ default-package-overrides:
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
-  - binary-conduit ==1.2.5
+  - binary-conduit ==1.3
   - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.8.0
@@ -294,13 +198,11 @@ default-package-overrides:
   - bits ==0.5.1
   - bitset-word8 ==0.1.1.0
   - bit-stream ==0.1.0.2
-  - bitx-bitcoin ==0.11.0.1
+  - bitx-bitcoin ==0.12.0.0
   - blake2 ==0.2.0
-  - blank-canvas ==0.6.2
-  - blas-carray ==0.0
-  - blas-ffi ==0.0
+  - blas-carray ==0.0.1
+  - blas-ffi ==0.0.1
   - blas-hs ==0.1.1.0
-  - BlastHTTP ==1.2.1
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.0.2
@@ -309,7 +211,6 @@ default-package-overrides:
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - bloodhound ==0.15.0.2
-  - bloomfilter ==2.0.1.0
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
   - bno055-haskell ==0.1.0
@@ -325,17 +226,19 @@ default-package-overrides:
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
-  - boxes ==0.1.4
-  - brick ==0.29.1
-  - brittany ==0.9.0.0
+  - boxes ==0.1.5
+  - brick ==0.34.1
+  - brittany ==0.9.0.1
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
+  - buchhaltung ==0.0.7
   - buffer-builder ==0.2.4.4
   - buffer-pipe ==0.0
-  - butcher ==1.2.1.0
-  - bv ==0.4.1
+  - butcher ==1.3.0.0
+  - bv ==0.5
+  - bv-little ==0.1.0.0
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
@@ -348,7 +251,7 @@ default-package-overrides:
   - bytestring-tree-builder ==0.2.7.1
   - bytestring-trie ==0.2.4.1
   - bzlib ==0.5.0.5
-  - bzlib-conduit ==0.2.1.5
+  - bzlib-conduit ==0.3.0
   - c2hs ==0.28.3
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
@@ -359,6 +262,7 @@ default-package-overrides:
   - cairo ==0.13.4.2
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
+  - capataz ==0.1.0.1
   - carray ==0.1.6.8
   - cartel ==0.18.0.2
   - cased ==0.1.0.0
@@ -366,22 +270,21 @@ default-package-overrides:
   - cases ==0.1.3.2
   - casing ==0.1.2.1
   - cassava ==0.5.1.0
-  - cassava-conduit ==0.4.0.1
+  - cassava-conduit ==0.4.0.2
+  - cassava-records ==0.1.0.4
   - cassette ==0.1.0
   - cast ==0.1.0.2
   - cayley-client ==0.4.4
   - cereal ==0.5.5.0
-  - cereal-conduit ==0.7.3
+  - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
-  - ChannelT ==0.0.0.4
+  - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.3
   - Chart ==1.8.3
   - Chart-cairo ==1.8.3
-  - Chart-diagrams ==1.8.3
-  - chart-unit ==0.5.5.0
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
   - chatwork ==0.1.3.1
@@ -399,11 +302,11 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
-  - cisco-spark-api ==0.1.0.0
   - clang-compilation-database ==0.1.0.1
-  - classy-prelude ==1.3.1
-  - classy-prelude-conduit ==1.3.1
-  - classy-prelude-yesod ==1.3.1
+  - classyplate ==0.3.0.2
+  - classy-prelude ==1.4.0
+  - classy-prelude-conduit ==1.4.0
+  - classy-prelude-yesod ==1.4.0
   - clay ==0.12.2
   - cli ==0.1.2
   - clientsession ==0.9.1.2
@@ -411,7 +314,6 @@ default-package-overrides:
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
   - clr-host ==0.2.0.1
-  - clr-inline ==0.2.0.1
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.2
@@ -428,12 +330,10 @@ default-package-overrides:
   - colorize-haskell ==1.0.1
   - colour ==2.3.4
   - colour-accelerate ==0.2.0.0
-  - combinatorial ==0.0
+  - combinatorial ==0.1
   - comfort-graph ==0.0.3
   - commutative ==0.0.1.4
   - comonad ==5.0.3
-  - comonads-fd ==4.0
-  - comonad-transformers ==4.0
   - compact ==0.1.0.1
   - compactmap ==0.1.4.2.1
   - compensated ==0.7.2
@@ -442,20 +342,19 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
+  - compressed ==3.11
   - concise ==0.1.0.1
-  - concurrency ==1.2.3.0
+  - concurrency ==1.4.0.2
   - concurrent-extra ==0.7.0.11
   - concurrent-output ==1.10.4
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.2.13.1
-  - conduit-algorithms ==0.0.7.2
-  - conduit-combinators ==1.1.2
+  - conduit ==1.3.0
+  - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
-  - conduit-extra ==1.2.3.2
+  - conduit-extra ==1.3.0
   - conduit-iconv ==0.1.1.3
-  - conduit-parse ==0.1.2.2
   - conduit-throttle ==0.3.1.0
   - ConfigFile ==1.1.4
   - config-ini ==0.2.2.0
@@ -465,17 +364,16 @@ default-package-overrides:
   - connection ==0.2.8
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
-  - constraints ==0.9.1
+  - constraints ==0.10
   - consul-haskell ==0.4.2
   - containers-unicode-symbols ==0.3.1.1
   - contravariant ==1.4.1
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
   - control-monad-free ==0.6.1
-  - control-monad-loop ==0.1
   - control-monad-omega ==0.3.1
   - convertible ==1.1.1.0
-  - cookie ==0.4.3
+  - cookie ==0.4.4
   - countable ==1.0
   - country ==0.1.4
   - courier ==0.1.1.5
@@ -486,13 +384,15 @@ default-package-overrides:
   - cql ==3.1.1
   - cql-io ==0.16.0
   - crackNum ==1.9
-  - criterion ==1.2.6.0
+  - credential-store ==0.1.2
+  - criterion ==1.3.0.0
   - cron ==0.6.1
   - crypto-api ==0.13.3
   - crypto-api-tests ==0.3
   - cryptocipher ==0.6.2
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
+  - cryptocompare ==0.1.1
   - crypto-enigma ==0.0.2.10
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
@@ -500,11 +400,9 @@ default-package-overrides:
   - cryptohash-sha1 ==0.11.100.1
   - cryptohash-sha256 ==0.11.101.0
   - cryptohash-sha512 ==0.11.100.1
-  - cryptonite ==0.24
+  - cryptonite ==0.25
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.6
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
@@ -515,13 +413,13 @@ default-package-overrides:
   - csv ==0.1.2
   - csv-conduit ==0.6.8.1
   - ctrie ==0.2
-  - cubicbezier ==0.6.0.5
   - cubicspline ==0.1.2
   - cublas ==0.4.0.0
   - cuda ==0.9.0.2
   - cue-sheet ==1.0.1
   - cufft ==0.8.0.0
   - curl ==1.3.8
+  - curl-runnings ==0.2.0
   - currencies ==0.1.1.1
   - cusolver ==0.1.0.0
   - cusparse ==0.1.0.0
@@ -533,17 +431,16 @@ default-package-overrides:
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
-  - data-check ==0.1.1
   - data-checked ==0.3
   - data-clist ==0.1.2.0
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
-  - data-default-instances-base ==0.1.0.1
   - data-default-instances-containers ==0.0.1
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==2.0.1.0
-  - data-diverse-lens ==1.0.0.1
+  - data-diverse-lens ==2.1.0.0
+  - datadog ==0.2.0.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
   - data-fix ==0.2.0
@@ -568,40 +465,23 @@ default-package-overrides:
   - dbcleaner ==0.1.3
   - dbus ==0.10.15
   - debian-build ==0.10.1.0
-  - debug ==0.0.2
-  - Decimal ==0.4.2
-  - declarative ==0.5.1
+  - debug ==0.1
+  - Decimal ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==0.9.1.2
+  - dejafu ==1.3.1.0
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2
-  - derive ==2.6.3
-  - deriving-compat ==0.3.6
+  - deriving-compat ==0.4.1
   - descriptive ==0.9.4
-  - dhall ==1.8.2
-  - dhall-bash ==1.0.6
-  - dhall-json ==1.0.9
-  - dhall-nix ==1.0.9
-  - dhall-text ==1.0.5
-  - diagrams ==1.4
-  - diagrams-builder ==0.8.0.2
-  - diagrams-cairo ==1.4
-  - diagrams-canvas ==1.4
-  - diagrams-contrib ==1.4.1
-  - diagrams-core ==1.4.0.1
-  - diagrams-lib ==1.4.2
-  - diagrams-postscript ==1.4
-  - diagrams-solve ==0.1.1
-  - diagrams-svg ==1.4.1.1
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
   - diff3 ==0.3.0
   - digest ==0.0.1.2
   - digits ==0.3.1
-  - dimensional ==1.0.1.3
+  - dimensional ==1.1
   - directory-tree ==0.12.1
   - direct-rocksdb ==0.0.3
   - direct-sqlite ==2.3.22
@@ -610,8 +490,10 @@ default-package-overrides:
   - disk-free-space ==0.1.0.1
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
-  - distributed-closure ==0.3.5
+  - distributed-closure ==0.4.0
   - distributed-process ==0.7.3
+  - distributed-process-lifted ==0.3.0.1
+  - distributed-process-monad-control ==0.5.1.3
   - distributed-process-simplelocalnet ==0.2.4
   - distributed-process-tests ==0.4.11
   - distributed-static ==0.3.8
@@ -624,27 +506,25 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.2
-  - docker ==0.4.1.1
-  - docker-build-cacher ==1.8.2
+  - docker ==0.5.1.0
+  - docker-build-cacher ==1.9.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
-  - doctemplates ==0.2.1
+  - doctemplates ==0.2.2
   - doctest ==0.13.0
-  - doctest-discover ==0.1.0.9
-  - doctest-driver-gen ==0.1.0.1
+  - doctest-discover ==0.1.0.7
+  - doctest-driver-gen ==0.2.0.0
   - do-list ==1.0.1
   - dom-parser ==3.0.0
   - dotenv ==0.5.2.3
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
-  - dpor ==0.2.0.0
   - drawille ==0.1.2.0
   - DRBG ==0.5.5
   - drifter ==0.2.3
   - drifter-postgresql ==0.2.1
   - dsp ==0.2.4
-  - dual-tree ==0.2.1
   - dublincore-xml-conduit ==0.1.0.2
   - dvorak ==0.1.0.0
   - dynamic-state ==0.3
@@ -654,17 +534,14 @@ default-package-overrides:
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ed25519 ==0.0.5.0
-  - ede ==0.2.8.7
   - EdisonAPI ==1.3.1
-  - EdisonCore ==1.3.1.1
+  - EdisonCore ==1.3.2.1
   - edit-distance ==0.2.2.1
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
-  - effect-handlers ==0.1.0.8
-  - either ==4.5
+  - either ==5
   - either-unwrap ==1.1
   - ekg ==0.4.0.14
-  - ekg-cloudwatch ==0.0.1.6
   - ekg-core ==0.1.1.4
   - ekg-json ==0.1.0.6
   - ekg-statsd ==0.2.2.0
@@ -673,19 +550,17 @@ default-package-overrides:
   - eliminators ==0.3
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - elm-export-persistent ==0.1.2
   - emailaddress ==0.2.0.0
   - email-validate ==2.3.2.3
   - enclosed-exceptions ==1.0.2
-  - EntrezHTTP ==1.0.4
   - entropy ==0.3.8
   - enummapset ==0.5.2.1
   - enumset ==0.0.4.1
   - envelope ==0.2.2.0
   - envparse ==0.4
-  - envy ==1.3.0.2
+  - envy ==1.5.0.0
   - epub-metadata ==4.5
-  - eq ==4.0.4
+  - eq ==4.1
   - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
@@ -693,23 +568,21 @@ default-package-overrides:
   - errors-ext ==0.4.1
   - error-util ==0.0.1.2
   - ersatz ==0.4.2
-  - esqueleto ==2.5.3
-  - etcd ==1.0.5
   - ether ==0.5.1.0
+  - euler-tour-tree ==0.1.0.1
   - event ==0.1.4
   - eventful-core ==0.2.0
-  - eventful-dynamodb ==0.2.0
   - eventful-memory ==0.2.0
   - eventful-postgresql ==0.2.0
   - eventful-sql-common ==0.2.0
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventsource-api ==1.1.1
-  - eventsource-geteventstore-store ==1.0.4
-  - eventsource-store-specs ==1.0.1
-  - eventsource-stub-store ==1.0.2
-  - eventstore ==0.15.0.2
+  - eventsource-api ==1.3.0
+  - eventsource-geteventstore-store ==1.1.0
+  - eventsource-store-specs ==1.1.1
+  - eventsource-stub-store ==1.0.3
+  - eventstore ==1.1.2
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -724,7 +597,7 @@ default-package-overrides:
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.5.2
   - extensible ==0.4.8
-  - extensible-effects ==2.1.0.0
+  - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.4
   - extractable-singleton ==0.0.1
@@ -735,17 +608,15 @@ default-package-overrides:
   - fast-builder ==0.0.1.0
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.11
-  - fast-math ==1.0.2
-  - fb ==1.1.1
+  - fb ==1.2.0
   - fclabels ==2.0.3.3
-  - fdo-notify ==0.3.1
   - feature-flags ==0.1.0.1
-  - fedora-haskell-tools ==0.4
+  - fedora-haskell-tools ==0.5.1
   - feed ==1.0.0.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
-  - fgl ==5.5.4.0
-  - filecache ==0.2.9
+  - fgl ==5.6.0.0
+  - filecache ==0.3.1
   - file-embed ==0.0.10.1
   - filelock ==0.1.1.2
   - filemanip ==0.3.6.3
@@ -760,11 +631,10 @@ default-package-overrides:
   - fitspec ==0.4.4
   - fixed ==0.2.1.1
   - fixed-length ==0.2
-  - fixed-vector ==1.0.0.0
+  - fixed-vector ==1.1.0.0
   - fixed-vector-hetero ==0.4.0.0
   - flac ==0.1.2
   - flac-picture ==0.1.1
-  - flat ==0.3
   - flat-mcmc ==1.5.0
   - flexible-defaults ==0.0.1.2
   - FloatingHex ==0.4
@@ -775,7 +645,7 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==0.1.5.2
   - fold-debounce ==0.2.0.6
-  - fold-debounce-conduit ==0.1.0.5
+  - fold-debounce-conduit ==0.2.0.0
   - foldl ==1.3.7
   - folds ==0.7.4
   - follow-file ==0.0.2
@@ -785,38 +655,39 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.2.5
-  - foundation ==0.0.17
+  - formatting ==6.3.0
+  - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
-  - free ==4.12.4
+  - free ==5.0.1
   - freenect ==1.2.1
-  - freer-simple ==1.0.1.1
+  - freer-simple ==1.1.0.0
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
   - friday ==0.2.3.1
+  - friday-juicypixels ==0.1.2.3
   - friendly-time ==0.4.1
   - frisby ==0.2.2
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1.1
   - fsnotify-conduit ==0.1.0.0
-  - fswatch ==0.1.0.2
-  - funcmp ==1.8
+  - funcmp ==1.9
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
   - fuzzyset ==0.1.0.6
-  - gauge ==0.1.3
+  - gauge ==0.2.1
+  - gc ==0.0.2
   - gd ==3000.7.3
   - gdax ==0.6.0.0
   - Genbank ==1.0.3
-  - general-games ==1.0.5
+  - general-games ==1.1.1
   - generic-aeson ==0.2.0.9
   - generic-arbitrary ==0.1.0
   - generic-deriving ==1.12.1
   - generic-lens ==0.5.1.0
-  - GenericPretty ==1.2.1
-  - generic-random ==1.0.0.0
+  - GenericPretty ==1.2.2
+  - generic-random ==1.1.0.2
   - generics-eot ==0.2.1.1
   - generics-sop ==0.3.2.0
   - generics-sop-lens ==0.1.2.1
@@ -843,13 +714,12 @@ default-package-overrides:
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-events ==0.7.1
-  - ghc-exactprint ==0.5.6.0
+  - ghc-exactprint ==0.5.6.1
   - ghcid ==0.6.10
   - ghcjs-base-stub ==0.1.0.4
   - ghcjs-codemirror ==0.0.0.1
-  - ghcjs-dom ==0.9.2.0
-  - ghcjs-dom-jsaddle ==0.9.2.0
   - ghcjs-perch ==0.3.3.2
+  - ghc-parser ==0.2.0.1
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.1
   - ghc-syb-utils ==0.2.3.3
@@ -858,22 +728,19 @@ default-package-overrides:
   - ghc-typelits-knownnat ==0.4
   - ghc-typelits-natnormalise ==0.5.8
   - ghost-buster ==0.1.1.0
-  - gi-atk ==2.0.14
-  - gi-cairo ==1.0.14
-  - gi-glib ==2.0.15
-  - gi-gobject ==2.0.15
-  - gi-javascriptcore ==4.0.14
+  - gi-atk ==2.0.15
+  - gi-cairo ==1.0.15
+  - gi-glib ==2.0.16
+  - gi-gobject ==2.0.16
+  - gi-javascriptcore ==4.0.15
   - ginger ==0.7.3.0
-  - giphy-api ==0.5.2.0
   - git ==0.2.1
-  - github ==0.18
-  - github-release ==1.1.4
+  - github ==0.19
+  - github-release ==1.1.5
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
-  - gitlib ==3.1.1
-  - gitlib-libgit2 ==3.1.1
-  - gitlib-test ==3.1.0.3
+  - github-webhooks ==0.9.1
   - gitrev ==1.3.1
   - gl ==0.8.0
   - glabrous ==0.3.4
@@ -894,112 +761,13 @@ default-package-overrides:
   - GLUT ==2.7.0.12
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.5.1
-  - goggles ==0.1.0.3
-  - gogol ==0.3.0
-  - gogol-adexchange-buyer ==0.3.0
-  - gogol-adexchange-seller ==0.3.0
-  - gogol-admin-datatransfer ==0.3.0
-  - gogol-admin-directory ==0.3.0
-  - gogol-admin-emailmigration ==0.3.0
-  - gogol-admin-reports ==0.3.0
-  - gogol-adsense ==0.3.0
-  - gogol-adsense-host ==0.3.0
-  - gogol-affiliates ==0.3.0
-  - gogol-analytics ==0.3.0
-  - gogol-android-enterprise ==0.3.0
-  - gogol-android-publisher ==0.3.0
-  - gogol-appengine ==0.3.0
-  - gogol-apps-activity ==0.3.0
-  - gogol-apps-calendar ==0.3.0
-  - gogol-apps-licensing ==0.3.0
-  - gogol-apps-reseller ==0.3.0
-  - gogol-apps-tasks ==0.3.0
-  - gogol-appstate ==0.3.0
-  - gogol-autoscaler ==0.3.0
-  - gogol-bigquery ==0.3.0
-  - gogol-billing ==0.3.0
-  - gogol-blogger ==0.3.0
-  - gogol-books ==0.3.0
-  - gogol-civicinfo ==0.3.0
-  - gogol-classroom ==0.3.0
-  - gogol-cloudmonitoring ==0.3.0
-  - gogol-cloudtrace ==0.3.0
-  - gogol-compute ==0.3.0
-  - gogol-container ==0.3.0
-  - gogol-core ==0.3.0
-  - gogol-customsearch ==0.3.0
-  - gogol-dataflow ==0.3.0
-  - gogol-dataproc ==0.3.0
-  - gogol-datastore ==0.3.0
-  - gogol-debugger ==0.3.0
-  - gogol-deploymentmanager ==0.3.0
-  - gogol-dfareporting ==0.3.0
-  - gogol-discovery ==0.3.0
-  - gogol-dns ==0.3.0
-  - gogol-doubleclick-bids ==0.3.0
-  - gogol-doubleclick-search ==0.3.0
-  - gogol-drive ==0.3.0
-  - gogol-firebase-rules ==0.3.0
-  - gogol-fitness ==0.3.0
-  - gogol-fonts ==0.3.0
-  - gogol-freebasesearch ==0.3.0
-  - gogol-fusiontables ==0.3.0
-  - gogol-games ==0.3.0
-  - gogol-games-configuration ==0.3.0
-  - gogol-games-management ==0.3.0
-  - gogol-genomics ==0.3.0
-  - gogol-gmail ==0.3.0
-  - gogol-groups-migration ==0.3.0
-  - gogol-groups-settings ==0.3.0
-  - gogol-identity-toolkit ==0.3.0
-  - gogol-kgsearch ==0.3.0
-  - gogol-latencytest ==0.3.0
-  - gogol-logging ==0.3.0
-  - gogol-maps-coordinate ==0.3.0
-  - gogol-maps-engine ==0.3.0
-  - gogol-mirror ==0.3.0
-  - gogol-monitoring ==0.3.0
-  - gogol-oauth2 ==0.3.0
-  - gogol-pagespeed ==0.3.0
-  - gogol-partners ==0.3.0
-  - gogol-people ==0.3.0
-  - gogol-play-moviespartner ==0.3.0
-  - gogol-plus ==0.3.0
-  - gogol-plus-domains ==0.3.0
-  - gogol-prediction ==0.3.0
-  - gogol-proximitybeacon ==0.3.0
-  - gogol-pubsub ==0.3.0
-  - gogol-qpxexpress ==0.3.0
-  - gogol-replicapool ==0.3.0
-  - gogol-replicapool-updater ==0.3.0
-  - gogol-resourcemanager ==0.3.0
-  - gogol-resourceviews ==0.3.0
-  - gogol-script ==0.3.0
-  - gogol-sheets ==0.3.0
-  - gogol-shopping-content ==0.3.0
-  - gogol-siteverification ==0.3.0
-  - gogol-spectrum ==0.3.0
-  - gogol-sqladmin ==0.3.0
-  - gogol-storage ==0.3.0
-  - gogol-storage-transfer ==0.3.0
-  - gogol-tagmanager ==0.3.0
-  - gogol-taskqueue ==0.3.0
-  - gogol-translate ==0.3.0
-  - gogol-urlshortener ==0.3.0
-  - gogol-useraccounts ==0.3.0
-  - gogol-vision ==0.3.0
-  - gogol-webmaster-tools ==0.3.0
-  - gogol-youtube ==0.3.0
-  - gogol-youtube-analytics ==0.3.0
-  - gogol-youtube-reporting ==0.3.0
+  - goggles ==0.3.2
   - google-cloud ==0.0.4
   - google-oauth2-jwt ==0.2.2
-  - google-translate ==0.4.1
   - GPipe ==2.2.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphs ==0.7.1
-  - graphviz ==2999.19.0.0
   - graph-wrapper ==0.2.5.1
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
@@ -1012,31 +780,24 @@ default-package-overrides:
   - groundhog-th ==0.8.0.2
   - group-by-date ==0.1.0.2
   - grouped-list ==0.2.1.5
-  - groupoids ==4.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.3.1
-  - gym-http-api ==0.1.0.0
   - H ==0.9.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0
   - hackage-security ==0.5.2.2
-  - hackernews ==1.3.0.0
-  - haddock-library ==1.4.3
+  - haddock-library ==1.4.5
   - hailgun ==0.4.1.6
   - hailgun-simple ==0.1.0.0
-  - hakyll ==4.10.0.0
   - half ==0.2.2.3
   - hamilton ==0.1.0.2
-  - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
   - hapistrano ==0.3.5.3
-  - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.0.1
   - happstack-server-tls ==7.1.6.5
   - happy ==1.19.9
-  - harp ==0.4.3
   - hasbolt ==0.1.3.0
   - hashable ==1.2.7.0
   - hashable-time ==0.2.0.1
@@ -1044,45 +805,36 @@ default-package-overrides:
   - hashmap ==1.3.3
   - hashtables ==1.2.2.1
   - haskeline ==0.7.4.2
-  - haskell-gi ==0.20.3
-  - haskell-gi-base ==0.20.8
-  - haskell-gi-overloading ==1.0
-  - haskell-import-graph ==1.0.3
+  - haskell-gi ==0.21.0
+  - haskell-gi-base ==0.21.0
+  - haskell-gi-overloading ==0.0
   - haskell-lexer ==1.0.1
   - haskell-lsp ==0.2.0.1
   - haskell-lsp-client ==1.0.0.1
-  - haskell-names ==0.9.0
+  - haskell-names ==0.9.1
   - haskell-neo4j-client ==0.3.2.4
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.4.0
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.2.0
-  - haskell-src-exts ==1.19.1
-  - haskell-src-exts-simple ==1.19.0.0
+  - haskell-src-exts ==1.20.2
   - haskell-src-exts-util ==0.2.2
   - haskell-src-meta ==0.8.0.2
-  - haskell-tools-ast ==1.0.0.4
-  - haskell-tools-backend-ghc ==1.0.0.4
-  - haskell-tools-builtin-refactorings ==1.0.0.4
-  - haskell-tools-cli ==1.0.0.4
-  - haskell-tools-daemon ==1.0.0.4
-  - haskell-tools-debug ==1.0.0.4
-  - haskell-tools-demo ==1.0.0.4
-  - haskell-tools-prettyprint ==1.0.0.4
-  - haskell-tools-refactor ==1.0.0.4
-  - haskell-tools-rewrite ==1.0.0.4
+  - haskell-tools-ast ==1.0.1.1
+  - haskell-tools-backend-ghc ==1.0.1.1
+  - haskell-tools-prettyprint ==1.0.1.1
+  - haskell-tools-refactor ==1.0.1.1
+  - haskell-tools-rewrite ==1.0.1.1
   - haskintex ==0.8.0.0
   - hasmin ==1.0.1
   - hasql ==1.1.1
   - hasql-migration ==0.1.3
-  - hasql-optparse-applicative ==0.2.4
+  - hasql-optparse-applicative ==0.3
   - hasql-pool ==0.4.3
-  - hasql-transaction ==0.5.2
+  - hasql-transaction ==0.6
   - hastache ==0.6.1
-  - hasty-hamiltonian ==1.3.0
-  - HaTeX ==3.17.3.1
+  - HaTeX ==3.18.0.0
   - haxl ==0.5.1.0
-  - haxl-amazonka ==0.1.1
   - HaXml ==1.25.4
   - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
@@ -1099,9 +851,11 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.5.2
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.9.12
+  - hedis ==0.10.0
+  - heist ==1.0.1.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
+  - herms ==1.8.1.4
   - heterocephalus ==1.0.5.1
   - hex ==0.1.2
   - hexml ==0.3.3
@@ -1114,14 +868,13 @@ default-package-overrides:
   - hidapi ==0.1.4
   - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
-  - higher-leveldb ==0.4.0.1
+  - higher-leveldb ==0.5.0.1
   - highjson ==0.4.0.0
   - highjson-swagger ==0.4.0.0
   - highjson-th ==0.4.0.0
   - highlighting-kate ==0.6.4
   - hinotify ==0.3.9
   - hint ==0.7.0
-  - hip ==1.5.3.0
   - histogram-fill ==0.8.5.0
   - hit ==0.6.3
   - hjsmin ==0.2.0.2
@@ -1130,19 +883,17 @@ default-package-overrides:
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.6.1
   - hmatrix ==0.18.2.0
+  - hmatrix-backprop ==0.1.0.0
   - hmatrix-gsl ==0.18.2.0
   - hmatrix-gsl-stats ==0.4.1.7
   - hmatrix-morpheus ==0.1.1.1
   - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
+  - hmatrix-vector-sized ==0.1.1.0
   - hmpfr ==0.4.4
-  - hnix ==0.3.4
-  - hoauth2 ==1.5.1
   - hocilib ==0.2.0
-  - Hoed ==0.4.1
-  - holy-project ==0.2.0.1
-  - hOpenPGP ==2.5.5
-  - hopenpgp-tools ==0.19.5
+  - Hoed ==0.5.0
+  - hOpenPGP ==2.6
   - hopfli ==0.2.2.1
   - hosc ==0.16
   - hostname ==1.0
@@ -1150,13 +901,12 @@ default-package-overrides:
   - hourglass ==0.2.11
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.8.0.2
-  - hpack ==0.21.2
+  - hpack ==0.27.0
   - hpc-coveralls ==1.0.10
   - HPDF ==1.4.10
   - hpio ==0.9.0.5
   - hpp ==0.5.1
   - hpqtypes ==1.5.1.1
-  - hprotoc ==2.4.8
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
@@ -1164,17 +914,17 @@ default-package-overrides:
   - hsass ==0.5.0
   - hsb2hs ==0.3.1
   - hs-bibutils ==6.2.0.1
-  - hscolour ==1.24.2
+  - hscolour ==1.24.4
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
-  - hse-cpp ==0.2
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
   - hsinstall ==1.6
+  - HSlippyMap ==3.0
   - hslogger ==1.2.10
   - hslua ==0.9.5.1
   - hslua-aeson ==0.3.0.1
@@ -1184,20 +934,20 @@ default-package-overrides:
   - HsOpenSSL ==0.11.4.13
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.4.4
+  - hspec ==2.4.8
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.4.0
-  - hspec-core ==2.4.4
-  - hspec-discover ==2.4.4
+  - hspec-core ==2.4.8
+  - hspec-discover ==2.4.8
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.4
-  - hspec-golden-aeson ==0.4.0.0
+  - hspec-golden-aeson ==0.5.1.0
   - hspec-megaparsec ==1.0.0
   - hspec-meta ==2.4.6
   - hspec-pg-transact ==0.1.0.2
-  - hspec-smallcheck ==0.4.2
+  - hspec-smallcheck ==0.5.0
   - hspec-wai ==0.9.0
   - hspec-wai-json ==0.9.0
   - hspec-webdriver ==1.2.0
@@ -1206,14 +956,13 @@ default-package-overrides:
   - hstatsd ==0.1
   - HStringTemplate ==0.8.6
   - HSvm ==0.1.0.3.22
-  - hsx2hs ==0.14.1.2
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
   - hsyslog-udp ==0.2.1
   - htaglib ==1.1.1
   - HTF ==0.13.2.2
   - html ==1.0.1.2
-  - html-conduit ==1.2.1.2
+  - html-conduit ==1.3.0
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
@@ -1224,17 +973,17 @@ default-package-overrides:
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
-  - http-conduit ==2.2.4
+  - http-conduit ==2.3.0
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
-  - http-reverse-proxy ==0.4.5
+  - http-reverse-proxy ==0.5.0
   - http-streams ==0.8.5.5
-  - http-types ==0.9.1
+  - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==0.7.1.1
+  - hunit-dejafu ==1.1.0.2
   - hvect ==0.4.0.0
   - hw-balancedparens ==0.2.0.1
   - hw-bits ==0.7.0.2
@@ -1242,6 +991,8 @@ default-package-overrides:
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
+  - hw-fingertree ==0.1.0.0
+  - hw-fingertree-strict ==0.1.0.0
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.2
   - hw-int ==0.0.0.3
@@ -1268,42 +1019,40 @@ default-package-overrides:
   - hybrid-vectors ==0.2.2
   - hyperloglog ==0.4.2
   - hyphenation ==0.7.1
-  - ical ==0.0.1
   - iconv ==0.4.1.3
   - identicon ==0.2.2
-  - idris ==1.2.0
   - ieee754 ==0.8.0
   - if ==0.1.0.0
-  - IfElse ==0.85
   - iff ==0.0.6
   - ignore ==0.1.1.0
+  - ihaskell ==0.9.0.2
   - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
   - immortal ==0.2.2.1
-  - importify ==1.0.1
+  - imprint ==0.0.1.0
   - include-file ==0.1.0.3
   - incremental-parser ==0.2.5.3
   - indentation-core ==0.0.0.1
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
+  - indexed-list-literals ==0.1.0.1
   - inflections ==0.4.0.1
-  - influxdb ==1.2.2.3
+  - influxdb ==1.3.0.1
   - ini ==0.3.5
   - inline-c ==0.6.0.5
   - inline-c-cpp ==0.2.1.0
-  - inline-java ==0.7.2
+  - inline-java ==0.8.2
   - inline-r ==0.9.1
   - insert-ordered-containers ==0.2.1.0
-  - inspection-testing ==0.1.2
+  - inspection-testing ==0.2.0.1
   - instance-control ==0.1.2.0
   - integer-logarithms ==1.0.2.1
   - integration ==0.2.1
   - intern ==0.9.2
-  - interpolate ==0.1.1
+  - interpolate ==0.2.0
   - interpolatedstring-perl6 ==1.0.0
-  - Interpolation ==0.3.0
   - interpolation ==0.1.0.2
   - IntervalMap ==0.5.3.1
   - intervals ==0.8.1
@@ -1325,8 +1074,8 @@ default-package-overrides:
   - IPv6DB ==0.2.5
   - ipython-kernel ==0.9.0.1
   - irc ==0.6.1.0
-  - irc-client ==1.0.1.1
-  - irc-conduit ==0.2.2.5
+  - irc-client ==1.1.0.2
+  - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
   - islink ==0.1.0.0
@@ -1343,65 +1092,63 @@ default-package-overrides:
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
-  - jni ==0.5.1
+  - jni ==0.6.0
   - jose ==0.6.0.3
   - jose-jwt ==0.7.8
-  - jsaddle ==0.9.4.0
-  - jsaddle-dom ==0.9.2.0
   - js-flot ==0.8.3
-  - js-jquery ==3.2.1
+  - js-jquery ==3.3.1
   - json ==0.9.1
   - json-autotype ==1.0.18
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.3
   - json-schema ==0.7.4.1
-  - json-stream ==0.4.1.5
+  - json-stream ==0.4.2.0
   - JuicyPixels ==3.2.9.4
-  - JuicyPixels-extra ==0.2.2
+  - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.1.2
-  - justified-containers ==0.2.0.1
+  - justified-containers ==0.3.0.0
   - jvm ==0.4.2
+  - jvm-batching ==0.1.1
+  - jvm-streaming ==0.3.1
   - jwt ==0.7.2
-  - kan-extensions ==5.0.2
-  - kanji ==3.0.2
-  - kansas-comet ==0.4
-  - katip ==0.5.3.0
-  - katip-elasticsearch ==0.4.1.0
+  - kan-extensions ==5.1
+  - kanji ==3.1.0
   - katydid ==0.1.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
   - keycode ==0.2.2
-  - keys ==3.11
+  - keys ==3.12
   - kmeans ==0.1.3
   - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==0.4.7
+  - lackey ==1.0.1
+  - lambdabot-core ==5.1.0.1
+  - lambdabot-irc-plugins ==5.1.0.1
   - lame ==0.1.1
   - language-c ==0.7.2
   - language-c-quote ==0.12.1
-  - language-docker ==1.0.0
+  - language-docker ==2.0.1
+  - language-ecmascript ==0.17.2.0
   - language-fortran ==0.5.1
   - language-glsl ==0.2.1
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.10
-  - language-puppet ==1.3.16
-  - lapack-carray ==0.0
-  - lapack-ffi ==0.0
-  - lapack-ffi-tools ==0.0.0.1
+  - lapack-carray ==0.0.1
+  - lapack-ffi ==0.0.1
+  - lapack-ffi-tools ==0.1
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - latex ==0.1.0.3
-  - lattices ==1.7
+  - lattices ==1.7.1
   - lazyio ==0.1.0.4
-  - lazysmallcheck ==0.6
   - lca ==0.3.1
   - leancheck ==0.7.0
   - leapseconds-announced ==2017.1.0.1
-  - lens ==4.15.4
+  - lens ==4.16
   - lens-accelerate ==0.1.0.0
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1410,16 +1157,17 @@ default-package-overrides:
   - lens-family-core ==1.2.2
   - lens-family-th ==0.5.0.1
   - lens-labels ==0.1.0.2
+  - lens-properties ==4.11.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
-  - lentil ==1.0.9.1
+  - lentil ==1.0.10.0
   - leveldb-haskell ==0.6.5
   - lexer-applicative ==2.1.0.1
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
   - libinfluxdb ==0.0.4
-  - libmpd ==0.9.0.7
+  - libmpd ==0.9.0.8
   - liboath-hs ==0.0.1.0
   - libsystemd-journal ==1.4.2
   - libxml-sax ==0.7.5
@@ -1435,7 +1183,7 @@ default-package-overrides:
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.2.0
   - List ==0.6.2
-  - ListLike ==4.5.1
+  - ListLike ==4.6
   - listsafe ==0.1.0.1
   - list-t ==1.0.0.1
   - llvm-hs ==5.1.3
@@ -1458,7 +1206,7 @@ default-package-overrides:
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
   - log-postgres ==0.7.0.2
-  - log-warper ==1.8.3
+  - log-warper ==1.8.10.1
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
@@ -1471,19 +1219,19 @@ default-package-overrides:
   - machines-binary ==0.3.0.3
   - machines-directory ==0.2.1.0
   - machines-io ==0.2.0.13
-  - magic ==1.1
-  - magicbane ==0.1.4
   - mainland-pretty ==0.6.1
   - makefile ==1.1.0.0
-  - mallard ==0.6.1.1
   - managed ==1.0.6
-  - mandrill ==0.5.3.2
+  - mandrill ==0.5.3.3
+  - mapquest-api ==0.3.1
+  - map-syntax ==0.2.0.2
   - markdown ==0.1.16
-  - markdown-unlit ==0.4.1
+  - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - markup ==4.0.3
-  - marvin ==0.2.5
+  - markup ==4.0.4
   - marvin-interpolate ==1.1.2
+  - massiv ==0.1.1.0
+  - massiv-io ==0.1.1.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
   - matplotlib ==0.6.0
@@ -1497,9 +1245,8 @@ default-package-overrides:
   - mcmc-types ==1.0.3
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
-  - megaparsec ==6.3.0
-  - mega-sdist ==0.3.0.6
-  - memory ==0.14.11
+  - megaparsec ==6.4.1
+  - memory ==0.14.16
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1507,52 +1254,47 @@ default-package-overrides:
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
   - MFlow ==0.4.6.0
-  - mfsolve ==0.3.2.0
   - microformats2-parser ==1.0.1.7
   - microlens ==0.4.8.3
-  - microlens-aeson ==2.2.0.2
+  - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.8.0
   - microlens-mtl ==0.1.11.1
   - microlens-platform ==0.3.9.0
   - microlens-th ==0.4.1.3
-  - microsoft-translator ==0.1.1
   - microspec ==0.1.0.0
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
-  - midi-music-box ==0.0.0.4
   - mighty-metropolis ==1.2.0
   - milena ==0.5.2.1
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.0.0
   - mime-types ==0.1.0.7
   - minimorph ==0.1.6.1
-  - minio-hs ==0.3.2
   - miniutter ==0.4.6.0
   - mintty ==0.1.1
   - misfortune ==0.1.1.2
-  - miso ==0.10.0.0
+  - miso ==0.14.0.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mixed-types-num ==0.3.1.4
   - mltool ==0.1.0.2
   - mmap ==0.5.9
-  - mmark ==0.0.4.0
-  - mmark-ext ==0.0.1.2
+  - mmark ==0.0.5.6
+  - mmark-cli ==0.0.3.0
+  - mmark-ext ==0.2.0.0
   - mmorph ==1.1.1
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
   - model ==0.4.4
-  - modern-uri ==0.1.2.1
+  - modern-uri ==0.2.1.0
   - modify-fasta ==0.8.2.3
   - moesocks ==1.0.0.44
   - mole ==0.0.6
   - monad-control ==1.0.2.3
   - monad-control-aligned ==0.0.1
   - monad-coroutine ==0.9.0.4
-  - monadcryptorandom ==0.7.2
   - monad-extras ==0.6.0
-  - monad-http ==0.1.0.0
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monadloc ==0.7.1
@@ -1581,7 +1323,7 @@ default-package-overrides:
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
   - mongoDB ==2.3.0.4
-  - monoidal-containers ==0.3.0.2
+  - monoidal-containers ==0.3.1.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.4
   - monoid-transformer ==0.0.4
@@ -1599,10 +1341,9 @@ default-package-overrides:
   - multiset ==0.3.3
   - multistate ==0.7.1.2
   - murmur-hash ==0.1.0.9
-  - MusicBrainz ==0.3.1
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
-  - mwc-probability ==1.3.0
+  - mwc-probability ==2.0.2
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
   - mysql ==0.1.4
@@ -1611,7 +1352,6 @@ default-package-overrides:
   - mysql-haskell-openssl ==0.8.3.0
   - mysql-simple ==0.4.4
   - nagios-check ==0.3.2
-  - nakadi-client ==0.3.0.0
   - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
@@ -1621,8 +1361,8 @@ default-package-overrides:
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
   - neat-interpolation ==0.3.2.1
-  - netlib-carray ==0.0
-  - netlib-ffi ==0.0
+  - netlib-carray ==0.0.1
+  - netlib-ffi ==0.0.1
   - netpbm ==1.0.2
   - nettle ==0.2.0
   - netwire ==5.0.2
@@ -1633,11 +1373,10 @@ default-package-overrides:
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
   - network-carbon ==1.0.11
-  - network-conduit-tls ==1.2.2
+  - network-conduit-tls ==1.3.0
   - network-house ==0.1.0.2
   - network-info ==0.2.0.9
   - network-ip ==0.3.0.2
-  - network-msgpack-rpc ==0.0.4
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.2
   - network-simple ==0.4.0.5
@@ -1655,12 +1394,11 @@ default-package-overrides:
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
   - NoHoed ==0.1.1
-  - nonce ==1.0.5
+  - nonce ==1.0.7
   - nondeterminism ==1.4
   - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
-  - normaldistribution ==1.1.0.3
   - normalization-insensitive ==2.0.1
   - NoTrace ==0.3.0.2
   - nsis ==0.3.2
@@ -1672,25 +1410,24 @@ default-package-overrides:
   - numhask-range ==0.1.3.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - nvim-hs ==0.2.5
-  - nvim-hs-contrib ==0.2.0
-  - nvim-hs-ghcid ==0.2.0
   - nvvm ==0.8.0.2
+  - oauthenticated ==0.2.1.0
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
   - ochintin-daicho ==0.1.0.1
+  - o-clock ==0.1.1
   - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
   - once ==0.2
   - one-liner ==0.9.2
+  - one-liner-instances ==0.1.1.0
   - OneTuple ==0.2.1
   - online ==0.2.1.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.6.0.0
-  - opaleye-trans ==0.4.2
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.1
@@ -1706,17 +1443,18 @@ default-package-overrides:
   - optional-args ==1.0.2
   - options ==1.2.1.1
   - optparse-applicative ==0.14.2.0
-  - optparse-generic ==1.2.3
+  - optparse-generic ==1.3.0
   - optparse-simple ==0.1.0
   - optparse-text ==0.1.1.0
+  - overhang ==1.0.0
   - package-description-remote ==0.2.0.0
   - packdeps ==0.4.4
   - pager ==0.1.1.0
   - pagerduty ==0.0.8
   - pagination ==0.2.1
   - palette ==0.1.0.5
-  - pandoc ==2.0.6
-  - pandoc-citeproc ==0.12.2.5
+  - pandoc ==2.1.2
+  - pandoc-citeproc ==0.14.1.5
   - pandoc-types ==1.17.3.1
   - pango ==0.13.4.0
   - papillon ==0.1.0.5
@@ -1752,16 +1490,18 @@ default-package-overrides:
   - pdf-toolbox-document ==0.0.7.1
   - pell ==0.1.1.0
   - pem ==0.2.4
-  - perf ==0.3.0
+  - perf ==0.3.1.1
+  - perfect-hash-generator ==0.2.0.6
   - persistable-record ==0.6.0.1
   - persistable-types-HDBC-pg ==0.0.1.5
-  - persistent ==2.7.1
-  - persistent-mongoDB ==2.6.0
-  - persistent-mysql ==2.6.2.1
-  - persistent-mysql-haskell ==0.3.6
-  - persistent-postgresql ==2.6.3
+  - persistent ==2.8.1
+  - persistent-mongoDB ==2.8.0
+  - persistent-mysql ==2.8.1
+  - persistent-mysql-haskell ==0.4.0
+  - persistent-postgresql ==2.8.2.0
+  - persistent-redis ==2.5.2.2
   - persistent-refs ==0.4
-  - persistent-sqlite ==2.6.4
+  - persistent-sqlite ==2.8.1.2
   - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
@@ -1770,7 +1510,7 @@ default-package-overrides:
   - picoparsec ==0.1.2.3
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.8
+  - pinboard ==0.9.12.9
   - pinch ==0.3.2.0
   - pipes ==4.3.8
   - pipes-aeson ==0.4.1.8
@@ -1779,10 +1519,10 @@ default-package-overrides:
   - pipes-category ==0.3.0.0
   - pipes-concurrency ==2.0.9
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.12
+  - pipes-extras ==1.0.13
   - pipes-fastx ==0.3.0.0
   - pipes-fluid ==0.6.0.0
-  - pipes-group ==1.0.8
+  - pipes-group ==1.0.9
   - pipes-misc ==0.4.0.1
   - pipes-mongodb ==0.1.0.0
   - pipes-network ==0.6.4.1
@@ -1794,11 +1534,10 @@ default-package-overrides:
   - pixelated-avatar-generator ==0.1.3
   - pkcs10 ==0.2.0.0
   - placeholders ==0.1
-  - plan-b ==0.2.1
   - plot ==0.2.3.9
+  - plot-light ==0.2.9
   - pointed ==5.0.1
   - pointedlist ==0.6.1
-  - pointful ==1.0.9
   - pointless-fun ==1.1.0.6
   - poll ==0.0.0.1
   - poly-arity ==0.1.0
@@ -1809,8 +1548,7 @@ default-package-overrides:
   - PortMidi ==0.1.6.1
   - posix-paths ==0.2.1.3
   - postgresql-binary ==0.12.1
-  - postgresql-libpq ==0.9.4.0
-  - postgresql-query ==3.3.0
+  - postgresql-libpq ==0.9.4.1
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.5.3.0
   - postgresql-simple-migration ==0.1.11.0
@@ -1819,7 +1557,8 @@ default-package-overrides:
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.2
   - post-mess-age ==0.2.1.0
-  - pqueue ==1.3.2.3
+  - pptable ==0.2.0.0
+  - pqueue ==1.4.1.1
   - pred-set ==0.0.1
   - pred-trie ==0.5.1.2
   - prefix-units ==0.2.0
@@ -1831,25 +1570,23 @@ default-package-overrides:
   - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
-  - prettyprinter ==1.1.1
+  - prettyprinter ==1.2.0.1
   - prettyprinter-ansi-terminal ==1.1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - pretty-show ==1.6.16
-  - pretty-simple ==2.0.2.1
+  - pretty-simple ==2.1.0.0
   - pretty-types ==0.2.3.1
   - prim-array ==0.2.1
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
-  - printcess ==0.1.0.3
+  - prim-uniq ==0.1.0.1
   - probability ==0.2.5.1
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.1
-  - product-profunctors ==0.8.0.3
+  - product-profunctors ==0.9.0.0
   - profiterole ==0.1
-  - profiteur ==0.4.4.0
-  - profunctor-extras ==4.0
   - profunctors ==5.2.2
   - projectroot ==0.2.0.1
   - project-template ==0.2.0.1
@@ -1861,31 +1598,31 @@ default-package-overrides:
   - protobuf-simple ==0.1.0.5
   - protocol-buffers ==2.4.8
   - protocol-buffers-descriptor ==2.4.8
+  - protocol-radius ==0.0.1.0
+  - protocol-radius-test ==0.0.1.0
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
-  - proto-lens-combinators ==0.1.0.8
   - proto-lens-descriptors ==0.2.2.0
   - proto-lens-optparse ==0.1.0.4
-  - proto-lens-protobuf-types ==0.2.2.0
-  - proto-lens-protoc ==0.2.2.3
   - protolude ==0.2.1
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
   - psqueues ==0.2.5.0
   - pthread ==0.2.0
-  - publicsuffix ==0.20170802
+  - publicsuffix ==0.20171229
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
+  - pushbullet-types ==0.4.0.2
   - pusher-http-haskell ==1.5.1.2
   - pwstore-fast ==2.4.4
-  - qchas ==1.0.1.0
-  - qm-interpolated-string ==0.2.1.0
+  - qchas ==1.1.0.0
+  - qm-interpolated-string ==0.3.0.0
   - QuasiText ==0.1.2.6
   - quickbench ==1.0
   - QuickCheck ==2.10.1
-  - quickcheck-arbitrary-adt ==0.2.0.0
+  - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
   - quickcheck-classes ==0.3.3
   - quickcheck-combinators ==0.0.2
@@ -1908,27 +1645,25 @@ default-package-overrides:
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
-  - range ==0.1.2.0
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.4.0
+  - rank2classes ==1.0.1
   - rank-product ==0.2.0.1
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.3
-  - ratel ==0.3.10
-  - ratel-wai ==0.3.2
+  - ratel ==1.0.2
+  - ratel-wai ==1.0.1
   - ratio-int ==0.1.2
-  - rattletrap ==3.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
+  - rcu ==0.2.2
   - rdf ==0.1.0.2
   - rdtsc ==1.3.0.1
   - re2 ==0.2
-  - reactive-banana ==1.1.0.1
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - rebase ==1.1.1
   - recursion-schemes ==5.0.2
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
@@ -1942,9 +1677,7 @@ default-package-overrides:
   - reform-blaze ==0.2.4.3
   - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.2
-  - reform-hsp ==0.2.7.1
   - RefSerialize ==0.4.0
-  - ref-tf ==0.4.0.1
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1954,7 +1687,7 @@ default-package-overrides:
   - regex-pcre-builtin ==0.94.4.8.8.35
   - regex-pcre-text ==0.94.0.1
   - regex-posix ==0.95.2
-  - regex-tdfa ==1.2.2
+  - regex-tdfa ==1.2.3
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.11.0.0
@@ -1968,18 +1701,14 @@ default-package-overrides:
   - repa-io ==3.4.1.1
   - repline ==0.1.7.0
   - req ==1.0.0
-  - req-conduit ==1.0.0
+  - req-url-extra ==0.1.0.0
   - reroute ==0.4.1.0
   - resource-pool ==0.2.3.2
-  - resourcet ==1.1.11
-  - rest-client ==0.5.1.1
+  - resourcet ==1.2.0
   - rest-core ==0.39
-  - rest-gen ==0.20.0.1
-  - rest-happstack ==0.3.1.1
   - rest-snap ==0.3.0.0
   - rest-stringmap ==0.2.0.6
   - rest-types ==1.14.1.1
-  - rest-wai ==0.2.0.1
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.7.6.1
@@ -1987,31 +1716,31 @@ default-package-overrides:
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
   - riak-protobuf ==0.23.0.0
-  - RNAlien ==1.3.7
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
+  - rollbar-hs ==0.2.0.0
   - rose-trees ==0.0.4.4
   - rot13 ==0.2.0.1
   - RSA ==2.3.0
+  - rss-conduit ==0.4.2.1
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.15
-  - safecopy ==0.9.3.3
-  - safe-exceptions ==0.1.6.0
+  - safe ==0.3.17
+  - safecopy ==0.9.4
+  - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safeio ==0.0.5.0
   - SafeSemaphore ==0.10.1
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.2
-  - sandi ==0.4.1
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - sbp ==2.3.9
-  - sbv ==7.4
-  - SCalendar ==1.1.0
+  - sbv ==7.5
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -2019,10 +1748,10 @@ default-package-overrides:
   - scientific ==0.3.5.2
   - scotty ==0.11.0
   - scrypt ==0.5.0
-  - sdl2 ==2.3.0.1
+  - sdl2 ==2.4.0.1
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
-  - sdl2-mixer ==0.1
+  - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.0.2
   - search-algorithms ==0.3.0
   - securemem ==0.1.10
@@ -2031,7 +1760,7 @@ default-package-overrides:
   - selda-postgresql ==0.1.7.2
   - selda-sqlite ==0.1.6.0
   - semigroupoid-extras ==5
-  - semigroupoids ==5.2.1
+  - semigroupoids ==5.2.2
   - semigroups ==0.18.4
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
@@ -2039,39 +1768,38 @@ default-package-overrides:
   - sensu-run ==0.4.0.4
   - seqalign ==0.2.0.4
   - seqloc ==0.6.1.1
+  - sequence ==0.9.8
   - serf ==0.1.1.0
-  - servant ==0.11
-  - servant-auth-cookie ==0.5.0.5
-  - servant-blaze ==0.7.1
+  - servant ==0.13
+  - servant-blaze ==0.8
   - servant-cassava ==0.10
-  - servant-checked-exceptions ==0.4.1.0
-  - servant-client ==0.11
-  - servant-docs ==0.11
+  - servant-client ==0.13
+  - servant-client-core ==0.13
+  - servant-docs ==0.11.2
   - servant-elm ==0.4.0.1
   - servant-exceptions ==0.1.1
-  - servant-foreign ==0.10.1
+  - servant-foreign ==0.11
   - servant-generic ==0.1.0.1
+  - servant-github-webhook ==0.4.0.0
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
   - servant-kotlin ==0.1.1.0
-  - servant-lucid ==0.7.1
-  - servant-mock ==0.8.3
-  - servant-pandoc ==0.4.1.4
+  - servant-lucid ==0.8
+  - servant-mock ==0.8.4
+  - servant-pandoc ==0.5.0.0
   - servant-purescript ==0.9.0.2
-  - servant-rawm ==0.2.0.2
-  - servant-ruby ==0.5.1.0
-  - servant-server ==0.11.0.1
-  - servant-static-th ==0.1.0.6
+  - servant-ruby ==0.7.0.0
+  - servant-server ==0.13
+  - servant-static-th ==0.2.0.1
   - servant-subscriber ==0.6.0.1
-  - servant-swagger ==1.1.4
+  - servant-swagger ==1.1.5
   - servant-swagger-ui ==0.2.5.3.9.1
-  - servant-websockets ==1.0.0
+  - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
   - serversession-backend-persistent ==1.0.4
   - serversession-backend-redis ==1.0.3
   - serversession-frontend-wai ==1.0
-  - serversession-frontend-yesod ==1.0
   - servius ==1.2.0.3
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
@@ -2083,13 +1811,13 @@ default-package-overrides:
   - shake ==0.16.3
   - shake-language-c ==0.11.0
   - shakespeare ==2.0.15
-  - shell-conduit ==4.6.1
-  - shell-escape ==0.2.0
+  - shelltestrunner ==1.9
   - shelly ==1.7.1
   - shikensu ==0.3.8
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
-  - show-prettyprint ==0.2.0.1
+  - show-combinators ==0.1.0.0
+  - show-prettyprint ==0.2.0.2
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
@@ -2104,18 +1832,18 @@ default-package-overrides:
   - siphash ==1.0.3
   - skein ==1.0.9.4
   - skeletons ==0.4.0
-  - skylighting ==0.5.1
-  - slack-web ==0.2.0.1
+  - skylighting ==0.6
+  - slack-web ==0.2.0.3
   - slave-thread ==1.0.2
   - slug ==0.1.7
   - smallcheck ==1.1.3.1
   - smoothie ==0.4.2.8
   - smtp-mail ==0.1.4.6
+  - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.3.1
   - snap-server ==1.0.3.3
   - snowflake ==0.1.1.1
-  - snowtify ==0.1.0.3
   - soap ==0.2.3.5
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
@@ -2127,6 +1855,7 @@ default-package-overrides:
   - sourcemap ==0.1.6
   - sox ==0.2.3
   - soxlib ==0.0.3
+  - sparkle ==0.7.4
   - sparse-linear-algebra ==0.2.9.9
   - spdx ==0.2.2.0
   - special-values ==0.1.0.0
@@ -2146,22 +1875,24 @@ default-package-overrides:
   - Spock-worker ==0.3.1.0
   - spreadsheet ==0.1.3.7
   - sqlite-simple ==0.4.14.0
-  - sqlite-simple-errors ==0.6.0.0
   - sql-words ==0.1.5.1
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.1
   - stache ==1.2.1
-  - stackage-curator ==0.15.1.0
   - stack-type ==0.1.0.0
+  - starter ==0.2.1
   - state-codes ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
   - stateWriter ==0.2.10
+  - static-text ==0.2
   - statistics ==0.14.0.2
+  - stb-image-redux ==0.2.1.2
+  - stitch ==0.5.0.0
   - stm ==2.4.5.0
   - stm-chans ==3.0.0.4
-  - stm-conduit ==3.0.0
+  - stm-conduit ==4.0.0
   - stm-containers ==0.2.16
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
@@ -2177,9 +1908,8 @@ default-package-overrides:
   - storablevector ==0.2.13
   - store ==0.4.3.2
   - store-core ==0.4.1
-  - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.14.0
-  - Stream ==0.4.7.2
+  - Strafunski-StrategyLib ==5.0.1.0
+  - stratosphere ==0.19.0
   - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
@@ -2187,7 +1917,7 @@ default-package-overrides:
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
-  - strict-base-types ==0.5.0
+  - strict-base-types ==0.6.1
   - strict-concurrency ==0.2.4.2
   - strict-types ==0.1.2
   - stringable ==0.1.3
@@ -2198,23 +1928,17 @@ default-package-overrides:
   - string-conversions ==0.4.0.1
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
-  - string-transform ==0.1.1
-  - stripe-core ==2.2.3
-  - stripe-haskell ==2.2.3
-  - stripe-http-streams ==2.2.3
-  - stripe-tests ==2.2.3
-  - strive ==4.0.3
-  - structured-haskell-mode ==1.1.0
-  - stylish-haskell ==0.8.1.0
+  - string-transform ==1.0.0
+  - stripe-core ==2.3.0
+  - strive ==5.0.3
+  - structs ==0.1.1
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
   - svg-builder ==0.1.0.2
-  - SVGFonts ==1.6.0.3
   - svg-tree ==0.6.2.1
   - swagger ==0.3.0
   - swagger2 ==2.2
-  - swagger-petstore ==0.0.1.8
   - swish ==0.9.2.0
   - syb ==0.7
   - syb-with-class ==0.6.1.8
@@ -2224,39 +1948,36 @@ default-package-overrides:
   - system-argv0 ==0.1.1
   - system-fileio ==0.3.16.3
   - system-filepath ==0.4.14
-  - system-posix-redirect ==1.1.0.1
   - tabular ==0.2.2.7
   - tagchup ==0.4.1
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.1
   - tagged-identity ==0.1.2
+  - tagshare ==0.0
   - tagsoup ==0.14.6
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.1.0
-  - tar-conduit ==0.1.1
+  - tar-conduit ==0.2.3
   - tardis ==0.4.1.0
-  - tasty ==0.11.3
+  - tasty ==1.0.1.1
   - tasty-ant-xml ==1.1.3
   - tasty-auto ==0.2.0.0
-  - tasty-dejafu ==0.7.1.1
-  - tasty-discover ==4.1.5
+  - tasty-dejafu ==1.1.0.1
+  - tasty-discover ==4.2.0
   - tasty-expected-failure ==0.11.1
-  - tasty-fail-fast ==0.0.3
-  - tasty-golden ==2.3.1.2
+  - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
   - tasty-hspec ==1.1.3.3
   - tasty-html ==0.4.1.1
-  - tasty-hunit ==0.9.2
+  - tasty-hunit ==0.10.0.1
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
-  - tasty-quickcheck ==0.9.1
+  - tasty-quickcheck ==0.9.2
   - tasty-rerun ==1.1.10
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
-  - tasty-tap ==0.0.4
   - tasty-th ==0.1.7
-  - Taxonomy ==1.0.3
   - TCache ==0.12.1
   - tce-conf ==1.3
   - tcp-streams ==1.0.1.0
@@ -2268,17 +1989,17 @@ default-package-overrides:
   - temporary-rc ==1.2.0.3
   - tensorflow-test ==0.1.0.0
   - termcolor ==0.2.0.0
-  - terminal-progress-bar ==0.1.1.1
+  - terminal-progress-bar ==0.2
   - terminal-size ==0.3.2.1
   - test-fixture ==0.5.1.0
-  - test-framework ==0.8.1.1
+  - test-framework ==0.8.2.0
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
+  - testing-feat ==0.4.0.3
   - texmath ==0.10.1.1
-  - text ==1.2.2.2
-  - text-all ==0.4.1.1
+  - text ==1.2.3.0
   - text-binary ==0.2.1.1
   - text-conversions ==0.3.0
   - text-format ==0.3.1.1
@@ -2321,15 +2042,13 @@ default-package-overrides:
   - throwable-exceptions ==0.1.0.9
   - th-strict-compat ==0.1.0.1
   - th-to-exp ==0.0.1.1
-  - thumbnail-plus ==1.0.5
   - th-utilities ==0.2.0.1
-  - thyme ==0.3.5.5
   - tibetan-utils ==0.1.1.4
   - tidal ==0.9.6
   - tidal-midi ==0.9.5.2
   - tile ==0.3.0.0
   - time-compat ==0.1.0.3
-  - timeit ==1.0.0.0
+  - timeit ==2.0
   - timelens ==0.2.0.2
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.3
@@ -2343,7 +2062,7 @@ default-package-overrides:
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
   - titlecase ==1.0.1
-  - tldr ==0.2.5
+  - tldr ==0.3.0
   - tls ==1.4.1
   - tls-debug ==0.4.5
   - tls-session-manager ==0.0.0.2
@@ -2351,11 +2070,12 @@ default-package-overrides:
   - tmapmvar ==0.0.3
   - tmp-postgres ==0.1.1.1
   - token-bucket ==0.1.0.1
-  - torrent ==10000.1.1
   - tostring ==0.2.1.1
   - transformers-base ==0.4.4
   - transformers-bifunctors ==0.1
   - transformers-compat ==0.5.1.4
+  - transformers-either ==0.0.2
+  - transformers-fix ==1.0
   - transformers-lift ==0.2.0.1
   - transient ==0.5.9.2
   - transient-universe ==0.4.6.1
@@ -2371,15 +2091,11 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.4.6
+  - turtle ==1.5.5
   - turtle-options ==0.1.0.4
-  - twitter-conduit ==0.2.3
-  - twitter-types ==0.7.2.2
-  - twitter-types-lens ==0.7.2
-  - type-aligned ==0.9.6
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
-  - type-combinators-singletons ==0.1.0.0
+  - type-combinators-singletons ==0.2.1.0
   - TypeCompose ==0.9.12
   - typed-process ==0.2.1.0
   - type-fun ==0.1.1
@@ -2387,7 +2103,7 @@ default-package-overrides:
   - type-level-integers ==0.0.1
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
-  - typelits-witnesses ==0.2.3.0
+  - typelits-witnesses ==0.3.0.1
   - type-of-html ==1.3.3.0
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
@@ -2396,13 +2112,12 @@ default-package-overrides:
   - tzdata ==0.1.20180122.0
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
-  - unagi-chan ==0.4.1.0
   - unbounded-delays ==0.1.1.0
   - unbound-generics ==0.3.2
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
-  - unfoldable ==0.9.5
+  - unfoldable ==0.9.6
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0.1
   - unicode-show ==0.1.0.2
@@ -2412,8 +2127,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - unique ==0
   - Unique ==0.4.7.2
+  - unique ==0
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2422,25 +2137,23 @@ default-package-overrides:
   - universe-instances-extended ==1.0.0.1
   - universe-instances-trans ==1.0.0.1
   - universe-reverse-instances ==1.0
-  - universum ==1.0.0
+  - universum ==1.1.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
   - unliftio ==0.2.4.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
-  - unordered-containers ==0.2.8.0
+  - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
   - uri-bytestring ==0.3.1.1
   - uri-bytestring-aeson ==0.1.0.5
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
-  - url ==2.1.3
-  - urlpath ==7.0.2
+  - urlpath ==8.0.1
   - userid ==0.1.3.1
   - users ==0.5.0.0
-  - users-persistent ==0.5.0.2
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
   - utf8-light ==0.4.2
@@ -2449,8 +2162,7 @@ default-package-overrides:
   - uuid ==1.3.13
   - uuid-types ==1.0.3
   - vado ==0.0.9
-  - validate-input ==0.4.0.0
-  - validation ==0.6.3
+  - validation ==1
   - validationt ==0.2.0.0
   - validity ==0.4.0.4
   - validity-aeson ==0.1.0.0
@@ -2475,21 +2187,20 @@ default-package-overrides:
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
   - vector-sized ==0.6.1.0
-  - vector-space ==0.12
+  - vector-space ==0.13
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.2.0.6
+  - vectortiles ==1.3.0
   - verbosity ==0.2.3.0
   - versions ==3.3.1
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.14
   - vinyl ==0.7.0
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
   - vivid-supercollider ==0.3.0.0
   - void ==0.7.2
-  - vty ==5.19.2
+  - vty ==5.20
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-cli ==0.1.1
@@ -2498,8 +2209,7 @@ default-package-overrides:
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.22.0
   - wai-handler-launch ==3.0.2.3
-  - wai-logger ==2.3.1
-  - wai-middleware-auth ==0.1.2.1
+  - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
@@ -2507,7 +2217,7 @@ default-package-overrides:
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
   - wai-middleware-prometheus ==0.3.0
-  - wai-middleware-rollbar ==0.8.4
+  - wai-middleware-rollbar ==0.10.0
   - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.2.0
   - wai-predicates ==0.10.0
@@ -2518,8 +2228,8 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
-  - warp ==3.2.18
-  - warp-tls ==3.2.4
+  - warp ==3.2.18.1
+  - warp-tls ==3.2.4.2
   - wave ==0.1.5
   - wavefront ==0.7.1.1
   - webdriver ==0.8.5
@@ -2541,7 +2251,7 @@ default-package-overrides:
   - wide-word ==0.1.0.5
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.1.0
-  - wild-bind-x11 ==0.1.0.7
+  - wild-bind-x11 ==0.2.0.1
   - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
@@ -2561,9 +2271,10 @@ default-package-overrides:
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
   - Workflow ==0.8.3
+  - world-peace ==0.1.0.0
   - wrap ==0.0.0
-  - wrecker ==1.2.4.0
-  - wreq ==0.5.2.0
+  - wrecker ==1.3.1.0
+  - wreq ==0.5.2.1
   - wreq-stringless ==0.5.9.1
   - writer-cps-full ==0.1.0.0
   - writer-cps-lens ==0.1.0.1
@@ -2584,15 +2295,14 @@ default-package-overrides:
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
-  - xlsx ==0.6.0
-  - xlsx-tabular ==0.2.2
+  - xlsx ==0.7.0
+  - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3
-  - xml-conduit ==1.7.1.2
-  - xml-conduit-parse ==0.3.1.2
+  - xml-conduit ==1.8.0
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.1
-  - xml-hamlet ==0.4.1.1
+  - xml-hamlet ==0.5.0
   - xmlhtml ==0.2.5.2
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
@@ -2613,31 +2323,27 @@ default-package-overrides:
   - Yampa ==0.10.7
   - YampaSynth ==0.2
   - yeshql ==3.0.1.3
-  - yesod ==1.4.5
+  - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
-  - yesod-auth ==1.4.21
-  - yesod-auth-basic ==0.1.0.2
-  - yesod-auth-fb ==1.8.1
-  - yesod-auth-hashdb ==1.6.2
-  - yesod-bin ==1.5.3
-  - yesod-core ==1.4.37.3
+  - yesod-auth ==1.6.2
+  - yesod-auth-fb ==1.9.0
+  - yesod-auth-hashdb ==1.7
+  - yesod-bin ==1.6.0
+  - yesod-core ==1.6.2
   - yesod-csp ==0.2.4.0
-  - yesod-eventsource ==1.4.1
-  - yesod-fb ==0.4.0
-  - yesod-form ==1.4.16
+  - yesod-eventsource ==1.6.0
+  - yesod-fb ==0.5.0
+  - yesod-form ==1.6.1
   - yesod-form-bootstrap4 ==0.1.0.2
-  - yesod-form-richtext ==0.1.0.2
-  - yesod-gitrepo ==0.2.1.0
-  - yesod-gitrev ==0.1.0.0
-  - yesod-newsfeed ==1.6
-  - yesod-persistent ==1.4.3
-  - yesod-recaptcha2 ==0.2.3
-  - yesod-sitemap ==1.4.0.1
-  - yesod-static ==1.5.3.1
-  - yesod-static-angular ==0.1.8
+  - yesod-gitrepo ==0.3.0
+  - yesod-newsfeed ==1.6.1.0
+  - yesod-paginator ==0.11.0
+  - yesod-persistent ==1.6.0
+  - yesod-sitemap ==1.6.0
+  - yesod-static ==1.6.0
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.9.1
-  - yesod-websockets ==0.2.6
+  - yesod-test ==1.6.2
+  - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
   - yi-core ==0.17.1
   - yi-frontend-vty ==0.17.1
@@ -2659,16 +2365,14 @@ default-package-overrides:
   - zero ==0.1.4
   - zeromq4-haskell ==0.7.0
   - zim-parser ==0.2.1.0
-  - zip ==0.2.0
+  - zip ==1.0.0
   - zip-archive ==0.3.2.4
   - zippers ==0.2.5
-  - ziptastic-client ==0.3.0.3
-  - ziptastic-core ==0.2.0.3
   - zlib ==0.6.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
-  - zm ==0.3.2
   - zot ==0.0.3
+  - zstd ==0.1.0.0
   - ztail ==1.2
 
 extra-packages:

From e4d49bcabc8389c34d43f6d4f6bde4be3b5d6ba3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:45:56 +0100
Subject: [PATCH 1147/2266] hackage2nix: keep old package versions around so
 that we can build git-annex

---
 .../configuration-hackage2nix.yaml                | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 05fae616da0..cb673f76bf6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2379,12 +2379,15 @@ extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier
   - aeson-pretty < 0.8                  # required by elm compiler
   - apply-refact < 0.4                  # newer versions don't work with GHC 8.0.x
+  - aws ^>= 0.18                        # pre-lts-11.x versions neeed by git-annex 6.20180227
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.24.*                     # required for jailbreak-cabal etc.
   - colour < 2.3.4                      # newer versions don't support GHC 7.10.x
+  - conduit >=1.1 && <1.3               # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - conduit-extra >=1.1 && <1.3         # pre-lts-11.x versions neeed by git-annex 6.20180227
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
@@ -2401,20 +2404,32 @@ extra-packages:
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
   - hoogle == 5.0.14                    # required by hie-hoogle
+  - html-conduit ^>= 1.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - inline-c < 0.6                      # required on GHC 8.0.x
   - inline-c-cpp < 0.2                  # required on GHC 8.0.x
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
+  - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
+  - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
+  - xml-conduit ^>= 1.7                 # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod ^>= 1.4                       # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-core < 1.5                    # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-form < 1.5                    # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-persistent < 1.5              # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-static ^>= 1.5                # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-test ^>= 1.5                  # pre-lts-11.x versions neeed by git-annex 6.20180227
 
 package-maintainers:
   peti:

From b79f68ae7a83d3aea2110c5b73057602ea2cda09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 02:31:40 +0100
Subject: [PATCH 1148/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9-6-g7017487 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/97c9f84bf59e626d3a55971111659b6cd01e06d6.
---
 .../haskell-modules/hackage-packages.nix      | 8216 ++++-------------
 1 file changed, 1903 insertions(+), 6313 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8e495e3ea58..ecc14528d63 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1774,23 +1774,6 @@ self: {
      }) {};
 
   "BlastHTTP" = callPackage
-    ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring
-     , conduit, HTTP, http-conduit, hxt, mtl, network, transformers
-     }:
-     mkDerivation {
-       pname = "BlastHTTP";
-       version = "1.2.1";
-       sha256 = "1mav6nyrqyjfl0qs9r7pqdijpd8dh0ddkcq9fbssyc05p87mxs6f";
-       libraryHaskellDepends = [
-         base biocore biofasta blastxml bytestring conduit HTTP http-conduit
-         hxt mtl network transformers
-       ];
-       homepage = "https://github.com/eggzilla/BlastHTTP";
-       description = "Libary to interface with the NCBI blast REST interface";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "BlastHTTP_1_3_0" = callPackage
     ({ mkDerivation, base, BiobaseBlast, biocore, biofasta, blastxml
      , bytestring, conduit, either-unwrap, HTTP, http-conduit, hxt, mtl
      , network, transformers
@@ -1806,7 +1789,6 @@ self: {
        homepage = "https://github.com/eggzilla/BlastHTTP";
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Blobs" = callPackage
@@ -2703,18 +2685,6 @@ self: {
      }) {};
 
   "ChannelT" = callPackage
-    ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
-     mkDerivation {
-       pname = "ChannelT";
-       version = "0.0.0.4";
-       sha256 = "06yr40kpi4jr65r76vlbf68ybh17n4b2k8claj0czgs4igspyhvn";
-       libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
-       homepage = "https://github.com/pthariensflame/ChannelT";
-       description = "Generalized stream processors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ChannelT_0_0_0_7" = callPackage
     ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
      mkDerivation {
        pname = "ChannelT";
@@ -2724,7 +2694,6 @@ self: {
        homepage = "https://github.com/pthariensflame/ChannelT";
        description = "Generalized stream processors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart" = callPackage
@@ -4058,24 +4027,6 @@ self: {
      }) {};
 
   "Decimal" = callPackage
-    ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "Decimal";
-       version = "0.4.2";
-       sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base deepseq HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
-       description = "Decimal numbers with variable precision";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Decimal_0_5_1" = callPackage
     ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
@@ -4091,7 +4042,6 @@ self: {
        homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
        description = "Decimal numbers with variable precision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DecisionTree" = callPackage
@@ -4745,6 +4695,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_12_1_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.12.1.0";
+       sha256 = "07dxsl2cvb40z2z41a263xpg5mhplaqj9p2qjhaw6q5rkjz9653k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -4777,22 +4749,6 @@ self: {
      }) {};
 
   "EdisonCore" = callPackage
-    ({ mkDerivation, array, base, containers, EdisonAPI, mtl
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "EdisonCore";
-       version = "1.3.1.1";
-       sha256 = "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry";
-       libraryHaskellDepends = [
-         array base containers EdisonAPI mtl QuickCheck
-       ];
-       homepage = "http://rwd.rdockins.name/edison/home/";
-       description = "A library of efficent, purely-functional data structures (Core Implementations)";
-       license = "unknown";
-     }) {};
-
-  "EdisonCore_1_3_2_1" = callPackage
     ({ mkDerivation, array, base, containers, EdisonAPI, mtl
      , QuickCheck
      }:
@@ -4806,7 +4762,6 @@ self: {
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -6582,18 +6537,6 @@ self: {
      }) {};
 
   "GenericPretty" = callPackage
-    ({ mkDerivation, base, ghc-prim, pretty }:
-     mkDerivation {
-       pname = "GenericPretty";
-       version = "1.2.1";
-       sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
-       libraryHaskellDepends = [ base ghc-prim pretty ];
-       homepage = "https://github.com/RazvanRanca/GenericPretty";
-       description = "A generic, derivable, haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "GenericPretty_1_2_2" = callPackage
     ({ mkDerivation, base, ghc-prim, pretty }:
      mkDerivation {
        pname = "GenericPretty";
@@ -6603,7 +6546,6 @@ self: {
        homepage = "https://github.com/RazvanRanca/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenussFold" = callPackage
@@ -9060,27 +9002,6 @@ self: {
      }) {};
 
   "HaTeX" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, matrix
-     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
-     , wl-pprint-extras
-     }:
-     mkDerivation {
-       pname = "HaTeX";
-       version = "3.17.3.1";
-       sha256 = "1vq22yf90cxq6a224zw73c1iqqbcsa2swasds605y9kwp9wzf6db";
-       libraryHaskellDepends = [
-         base bytestring containers hashable matrix parsec QuickCheck text
-         transformers wl-pprint-extras
-       ];
-       testHaskellDepends = [
-         base parsec QuickCheck tasty tasty-quickcheck text
-       ];
-       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
-       description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HaTeX_3_18_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hashable, matrix
      , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
      , wl-pprint-extras
@@ -9099,7 +9020,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -9868,28 +9788,6 @@ self: {
      }) {};
 
   "Hoed" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, clock, containers
-     , deepseq, directory, libgraph, process, QuickCheck, regex-tdfa
-     , semigroups, strict, template-haskell, terminal-size, uniplate
-     , vector
-     }:
-     mkDerivation {
-       pname = "Hoed";
-       version = "0.4.1";
-       sha256 = "14d4wypx75xmhb81f4lplvw04f5hjc97ncgzv4s07vd09bal8kq7";
-       libraryHaskellDepends = [
-         array base bytestring cereal clock containers deepseq directory
-         libgraph process QuickCheck regex-tdfa semigroups strict
-         template-haskell terminal-size uniplate vector
-       ];
-       testHaskellDepends = [ base process QuickCheck ];
-       homepage = "https://github.com/MaartenFaddegon/Hoed";
-       description = "Lightweight algorithmic debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Hoed_0_5_0" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, cereal-text
      , cereal-vector, clock, containers, deepseq, directory, hashable
      , hashtables, libgraph, open-browser, primitive, process
@@ -10936,6 +10834,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_9_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.9.5";
+       sha256 = "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -10950,23 +10866,6 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "JuicyPixels-extra";
-       version = "0.2.2";
-       sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld";
-       revision = "1";
-       editedCabalFile = "1h88x4bp9jvxx8laz69izna82a9d3bapr7nfpa9gpbvqpmi7d3vd";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base JuicyPixels ];
-       testHaskellDepends = [ base hspec JuicyPixels ];
-       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
-       description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-extra_0_3_0" = callPackage
     ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
      mkDerivation {
        pname = "JuicyPixels-extra";
@@ -10981,7 +10880,6 @@ self: {
        homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -11004,8 +10902,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.1.2";
        sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs";
-       revision = "1";
-       editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24";
+       revision = "2";
+       editedCabalFile = "04g0yga3v0922aysqv2m2h7vxbaaxfdb7lafsakpzlp0w659f930";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -11830,28 +11728,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.1";
-       sha256 = "139aaraprdlana39bldxzrl1pnvymwpiwymikc1xjg2nbcrla1xp";
-       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_6" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , dlist, fmlist, HUnit, QuickCheck, random, semigroups, text
      , utf8-string, vector
@@ -11871,7 +11747,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;
      }) {};
 
   "ListT" = callPackage
@@ -13013,17 +12888,17 @@ self: {
   "MusicBrainz" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , HTTP, http-conduit, http-types, monad-control, resourcet, text
-     , time, time-locale-compat, transformers, vector, xml-conduit
-     , xml-types
+     , time, time-locale-compat, transformers, unliftio-core, vector
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "MusicBrainz";
-       version = "0.3.1";
-       sha256 = "1zgk2ms1a5zd6wndc41z3f8p2pfygiijpijxbjhr1fqwb2bzs61m";
+       version = "0.4";
+       sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
          http-types monad-control resourcet text time time-locale-compat
-         transformers vector xml-conduit xml-types
+         transformers unliftio-core vector xml-conduit xml-types
        ];
        homepage = "http://floss.scru.org/hMusicBrainz";
        description = "interface to MusicBrainz XML2 and JSON web services";
@@ -15806,6 +15681,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7.2.2";
+       sha256 = "01sr6x22j042vydfiprkszk95wf9flq2fp0552wnmzr7qvn0j8qd";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -16280,6 +16173,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SHA_1_6_4_4" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "SHA";
+       version = "1.6.4.4";
+       sha256 = "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base binary bytestring ];
+       testHaskellDepends = [
+         array base binary bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       description = "Implementations of the SHA suite of message digest functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "SHA2" = callPackage
     ({ mkDerivation, AES, base, bytestring, monads-tf, transformers }:
      mkDerivation {
@@ -16903,8 +16816,8 @@ self: {
     ({ mkDerivation, base, GLUT }:
      mkDerivation {
        pname = "Shu-thing";
-       version = "1.1.3";
-       sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv";
+       version = "1.1.4";
+       sha256 = "1j42jgv27lj723mnq3dbc94zirhbbksahzw6y43ay1iylw870yjs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT ];
@@ -17626,19 +17539,6 @@ self: {
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
-    ({ mkDerivation, base, directory, mtl, syb, transformers }:
-     mkDerivation {
-       pname = "Strafunski-StrategyLib";
-       version = "5.0.0.10";
-       sha256 = "1hhcx0arzyrw8ij5ispnqysbipxyznbs5g9pkmy63fzn3l2im2ih";
-       revision = "1";
-       editedCabalFile = "031p57vf33vdhwk1p4d1jzpk8fcl2js8kzdg7gyhz9g11vl2n4j9";
-       libraryHaskellDepends = [ base directory mtl syb transformers ];
-       description = "Library for strategic programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Strafunski-StrategyLib_5_0_1_0" = callPackage
     ({ mkDerivation, base, directory, mtl, syb, transformers }:
      mkDerivation {
        pname = "Strafunski-StrategyLib";
@@ -17647,7 +17547,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "StrappedTemplates" = callPackage
@@ -21604,8 +21503,8 @@ self: {
        pname = "ad";
        version = "4.3.5";
        sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw";
-       revision = "2";
-       editedCabalFile = "0307kxvxzfsp9jlkhj4rcc6rncndq2ih87b8vn9h55fzii868j74";
+       revision = "3";
+       editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
@@ -21736,27 +21635,6 @@ self: {
      }) {};
 
   "adjunctions" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, contravariant
-     , distributive, free, mtl, profunctors, semigroupoids, semigroups
-     , tagged, transformers, transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "adjunctions";
-       version = "4.3";
-       sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r";
-       revision = "1";
-       editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q";
-       libraryHaskellDepends = [
-         array base comonad containers contravariant distributive free mtl
-         profunctors semigroupoids semigroups tagged transformers
-         transformers-compat void
-       ];
-       homepage = "http://github.com/ekmett/adjunctions/";
-       description = "Adjunctions and representable functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "adjunctions_4_4" = callPackage
     ({ mkDerivation, array, base, comonad, containers, contravariant
      , distributive, free, generic-deriving, hspec, hspec-discover, mtl
      , profunctors, semigroupoids, semigroups, tagged, transformers
@@ -21776,7 +21654,6 @@ self: {
        homepage = "http://github.com/ekmett/adjunctions/";
        description = "Adjunctions and representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adler32" = callPackage
@@ -21795,6 +21672,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
+  "adler32_0_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, zlib }:
+     mkDerivation {
+       pname = "adler32";
+       version = "0.1.2.0";
+       sha256 = "1936b05mx842wm8swz3g3jv6m9absa04islq4rwysicz72gkrd16";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/redneb/hs-adler32";
+       description = "An implementation of Adler-32, supporting rolling checksum operation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zlib;};
+
   "adobe-swatch-exchange" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , language-css, mtl, pretty
@@ -22383,6 +22275,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-picker_0_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
+     mkDerivation {
+       pname = "aeson-picker";
+       version = "0.1.0.4";
+       sha256 = "0ln4qwx7app1sc01irmy5lx7bqsq6wsgdig6zihpnp9rbj8263mj";
+       libraryHaskellDepends = [ aeson base lens lens-aeson text ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "https://github.com/ozzzzz/aeson-picker#readme";
+       description = "Tiny library to get fields from JSON format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-prefix" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, mtl, text
      , unordered-containers, vector
@@ -26722,20 +26628,6 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.7.1.1";
-       sha256 = "1z2lllm5f2wy3a1j1198mpwq9cb6qclrxr2gpdzjyxzzvybpdj3g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_8_0_2" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
@@ -26747,7 +26639,6 @@ self: {
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -27042,6 +26933,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs_0_3_0_0" = callPackage
+    ({ mkDerivation, async, base, containers, criterion, linear, mtl
+     , QuickCheck, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "apecs";
+       version = "0.3.0.0";
+       sha256 = "0iir47vj8fgclppynav0skda7q91kw0nnw6pjr4cz6gz9ragh9wh";
+       libraryHaskellDepends = [
+         async base containers mtl template-haskell vector
+       ];
+       testHaskellDepends = [ base containers QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion linear ];
+       homepage = "https://github.com/jonascarpay/apecs#readme";
+       description = "A fast ECS for game engine programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apelsin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, filepath, glib, gtk, HTTP, mtl, network, process
@@ -27174,6 +27084,8 @@ self: {
        pname = "apiary";
        version = "2.1.2";
        sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc";
+       revision = "1";
+       editedCabalFile = "0fznli6f20wxzbg1b5ylnjiyfqrmvm0wi5jcvhg8przmqhvjmcki";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html blaze-markup bytestring
          bytestring-lexing case-insensitive data-default-class exceptions
@@ -27186,7 +27098,7 @@ self: {
          aeson base bytestring directory http-types HUnit mtl tasty
          tasty-hunit tasty-quickcheck wai wai-extra
        ];
-       homepage = "https://github.com/philopon/apiary";
+       homepage = "https://github.com/winterland1989/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28338,6 +28250,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arithmoi_0_7_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim
+     , integer-gmp, integer-logarithms, mtl, QuickCheck, random
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "arithmoi";
+       version = "0.7.0.0";
+       sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
+         array base containers exact-pi ghc-prim integer-gmp
+         integer-logarithms mtl random vector
+       ];
+       testHaskellDepends = [
+         base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge integer-logarithms random vector
+       ];
+       homepage = "https://github.com/cartazio/arithmoi";
+       description = "Efficient basic number-theoretic functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "armada" = callPackage
     ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }:
      mkDerivation {
@@ -28352,6 +28292,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "armor" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, HUnit, lens, text
+     }:
+     mkDerivation {
+       pname = "armor";
+       version = "0.1";
+       sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath HUnit lens
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory hspec HUnit lens text
+       ];
+       homepage = "https://github.com/mightybyte/armor";
+       description = "Armor data structures against serialization backwards compatibility problems";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "arpa" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -28793,6 +28752,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asciidiagram_1_3_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
+     , rasterific-svg, svg-tree, text, vector
+     }:
+     mkDerivation {
+       pname = "asciidiagram";
+       version = "1.3.3.1";
+       sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers FontyFruity JuicyPixels lens linear mtl
+         rasterific-svg svg-tree text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative rasterific-svg svg-tree text
+       ];
+       description = "Pretty rendering of Ascii diagram into svg or png";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asic" = callPackage
     ({ mkDerivation, asil, base, bytestring, utf8-string }:
      mkDerivation {
@@ -30200,22 +30183,6 @@ self: {
      }) {};
 
   "attoparsec-uri" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
-     , strict, text, vector
-     }:
-     mkDerivation {
-       pname = "attoparsec-uri";
-       version = "0.0.3";
-       sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n";
-       libraryHaskellDepends = [
-         attoparsec attoparsec-ip base bytedump ip strict text vector
-       ];
-       homepage = "https://github.com/athanclark/attoparsec-uri#readme";
-       description = "URI parser / printer using attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "attoparsec-uri_0_0_4" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
      , strict, text, vector
      }:
@@ -30229,7 +30196,6 @@ self: {
        homepage = "https://github.com/athanclark/attoparsec-uri#readme";
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attosplit" = callPackage
@@ -30514,21 +30480,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "1.1.3";
-       sha256 = "0rkgb2vfznn6a28h40c26if43mzcavwd81myi27zbg8811g9bv6m";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/autoexporter#readme";
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_1_4" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -30541,7 +30492,6 @@ self: {
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -30954,7 +30904,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {awesomium = null;};
 
-  "aws" = callPackage
+  "aws_0_18" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
      , case-insensitive, cereal, conduit, conduit-combinators
@@ -30989,9 +30939,10 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aws_0_19" = callPackage
+  "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
      , case-insensitive, cereal, conduit, conduit-combinators
@@ -31026,7 +30977,6 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -31792,30 +31742,6 @@ self: {
      }) {};
 
   "backprop" = callPackage
-    ({ mkDerivation, ad, base, bifunctors, criterion, deepseq
-     , directory, generics-sop, hmatrix, microlens, microlens-mtl
-     , microlens-th, mnist-idx, mtl, mwc-random, profunctors, reflection
-     , tagged, time, transformers, transformers-base, type-combinators
-     , vector
-     }:
-     mkDerivation {
-       pname = "backprop";
-       version = "0.0.3.0";
-       sha256 = "1rjqv29fk0yqbqygnhm14zrjigicsgbiq5gcvr8j4kqkb8s9l6df";
-       libraryHaskellDepends = [
-         ad base generics-sop microlens microlens-mtl microlens-th mtl
-         profunctors reflection tagged transformers-base type-combinators
-       ];
-       benchmarkHaskellDepends = [
-         base bifunctors criterion deepseq directory generics-sop hmatrix
-         mnist-idx mwc-random time transformers type-combinators vector
-       ];
-       homepage = "https://github.com/mstksg/backprop";
-       description = "Heterogeneous, type-safe automatic backpropagation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "backprop_0_1_3_0" = callPackage
     ({ mkDerivation, base, bifunctors, criterion, deepseq, directory
      , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive
      , reflection, time, transformers, type-combinators, vector
@@ -31835,7 +31761,6 @@ self: {
        homepage = "https://github.com/mstksg/backprop#readme";
        description = "Heterogeneous automatic differentation (backpropagation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -32352,19 +32277,6 @@ self: {
      }) {};
 
   "base-orphans" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "base-orphans";
-       version = "0.6";
-       sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/haskell-compat/base-orphans#readme";
-       description = "Backwards-compatible orphan instances for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-orphans_0_7" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
      }:
      mkDerivation {
@@ -32377,7 +32289,6 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-prelude" = callPackage
@@ -32597,18 +32508,6 @@ self: {
      }) {};
 
   "basement" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "basement";
-       version = "0.0.4";
-       sha256 = "1zdqv8dbzv8jx6z8fcghinbnxdc5fb97i7sdfswdr1fcp8jq6i38";
-       libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell-foundation/foundation";
-       description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "basement_0_0_7" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "basement";
@@ -32618,7 +32517,6 @@ self: {
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basex-client" = callPackage
@@ -33981,26 +33879,6 @@ self: {
      }) {};
 
   "binary-conduit" = callPackage
-    ({ mkDerivation, base, binary, bytestring, conduit, hspec
-     , QuickCheck, quickcheck-assertions, resourcet, vector
-     }:
-     mkDerivation {
-       pname = "binary-conduit";
-       version = "1.2.5";
-       sha256 = "06sbs5kib5jdfxn0fj2yx2wjysgr7g0alnjg1v6iwi7rw2m1gm11";
-       libraryHaskellDepends = [
-         base binary bytestring conduit resourcet vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring conduit hspec QuickCheck
-         quickcheck-assertions resourcet
-       ];
-       homepage = "http://github.com/qnikst/binary-conduit/";
-       description = "data serialization/deserialization conduit library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "binary-conduit_1_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, conduit, exceptions
      , hspec, QuickCheck, quickcheck-assertions, resourcet, vector
      }:
@@ -34020,7 +33898,6 @@ self: {
        homepage = "http://github.com/qnikst/binary-conduit/";
        description = "data serialization/deserialization conduit library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-derive" = callPackage
@@ -34384,8 +34261,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri";
-       revision = "7";
-       editedCabalFile = "04l05gfbf3hf0pnkjpclyfqb9jaa665z4f89kf43lmd19qml6h04";
+       revision = "8";
+       editedCabalFile = "0a8xcrx2lm8yzcnrf76c1wynn238i87yz3lqlgrg5n9csdc0bhj1";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -35183,17 +35060,17 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, sane-backends }:
+    ({ mkDerivation, base, bindings-DSL, saneBackends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ sane-backends ];
+       libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
-     }) {inherit (pkgs) sane-backends;};
+     }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -36029,8 +35906,8 @@ self: {
        pname = "bits";
        version = "0.5.1";
        sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
-       revision = "3";
-       editedCabalFile = "1xvrnswmny4j0p1h30hfgf5h4p128zn578bxzr83v6drmd74az9k";
+       revision = "4";
+       editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
@@ -36104,6 +35981,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bits-extra" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec
+     , hw-hedgehog, hw-hspec-hedgehog, vector
+     }:
+     mkDerivation {
+       pname = "bits-extra";
+       version = "0.0.0.1";
+       sha256 = "1yggdh8j2hqhyskyqq4gci4hg1kdglzw7sfd7gdf4fsw9l6g8rq0";
+       revision = "1";
+       editedCabalFile = "13rmw51xqbz0zjn2g0135m2f5qqsba3l5w02pb16dkfq4gbhmblx";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
+       ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
+       homepage = "https://github.com/haskell-works/bits-extra#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bits-extras" = callPackage
     ({ mkDerivation, base, gcc_s }:
      mkDerivation {
@@ -36292,8 +36188,8 @@ self: {
        pname = "bitwise";
        version = "0.1.1.1";
        sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d";
-       revision = "1";
-       editedCabalFile = "10v3wkjc3y9435kn1rywrp6z0h71pkjcs51p8wl30g9pbpscw5pq";
+       revision = "2";
+       editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -36303,30 +36199,6 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, directory
-     , doctest, exceptions, hspec, http-client, http-client-tls
-     , http-types, microlens, microlens-th, network, QuickCheck, safe
-     , scientific, split, text, time
-     }:
-     mkDerivation {
-       pname = "bitx-bitcoin";
-       version = "0.11.0.1";
-       sha256 = "1711zfb7hl31xwpcwkxjnsmn541hzzk01fwa5rf1hhmxhpxmfslj";
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq exceptions http-client
-         http-client-tls http-types microlens microlens-th network
-         QuickCheck scientific split text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory doctest hspec http-client
-         http-types microlens safe text time
-       ];
-       homepage = "https://github.com/tebello-thejane/bitx.hs";
-       description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bitx-bitcoin_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, directory
      , doctest, exceptions, hspec, http-client, http-client-tls
      , http-types, microlens, microlens-th, network, QuickCheck, safe
@@ -36348,7 +36220,6 @@ self: {
        homepage = "https://github.com/tebello-thejane/bitx.hs";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bizzlelude" = callPackage
@@ -36579,24 +36450,6 @@ self: {
      }) {};
 
   "blas-carray" = callPackage
-    ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi
-     , storable-complex, transformers
-     }:
-     mkDerivation {
-       pname = "blas-carray";
-       version = "0.0";
-       sha256 = "131kz5rdgz4l5xhwpfacix0wiwqf9a0ngdvmgp7iznf7znrf8hk6";
-       libraryHaskellDepends = [
-         base blas-ffi carray netlib-carray netlib-ffi storable-complex
-         transformers
-       ];
-       homepage = "http://hub.darcs.net/thielema/blas-carray/";
-       description = "Auto-generated interface to Fortran BLAS via CArrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "blas-carray_0_0_1" = callPackage
     ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi
      , storable-complex, transformers
      }:
@@ -36615,20 +36468,6 @@ self: {
      }) {};
 
   "blas-ffi" = callPackage
-    ({ mkDerivation, base, blas, netlib-ffi }:
-     mkDerivation {
-       pname = "blas-ffi";
-       version = "0.0";
-       sha256 = "173djbrps396c9v5fl706k70qwy5jqcxay9j67draidw5qwhqcs2";
-       libraryHaskellDepends = [ base netlib-ffi ];
-       libraryPkgconfigDepends = [ blas ];
-       homepage = "http://hub.darcs.net/thielema/blas-ffi/";
-       description = "Auto-generated interface to Fortran BLAS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) blas;};
-
-  "blas-ffi_0_0_1" = callPackage
     ({ mkDerivation, base, blas, netlib-ffi }:
      mkDerivation {
        pname = "blas-ffi";
@@ -36734,6 +36573,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-builder_0_4_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, utf8-string
+     }:
+     mkDerivation {
+       pname = "blaze-builder";
+       version = "0.4.1.0";
+       sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text utf8-string
+       ];
+       homepage = "http://github.com/lpsmith/blaze-builder";
+       description = "Efficient buffered output";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-builder-conduit" = callPackage
     ({ mkDerivation, base, conduit }:
      mkDerivation {
@@ -37983,8 +37842,8 @@ self: {
     ({ mkDerivation, base, gtk, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
-       version = "0.1.0.4";
-       sha256 = "15ii0v9qy55pzz9ykbwigazck61m7vh5k7m782nzbqyi7az7v7sg";
+       version = "0.1.0.5";
+       sha256 = "062l93lh9y9wgdf8f1xql07ci8rpcspaagpsmcyc6wnikganls9w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
@@ -38043,8 +37902,8 @@ self: {
        pname = "bound";
        version = "2.0.1";
        sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
-       revision = "3";
-       editedCabalFile = "1ivq22ks8y4c086q6w74bh8jvgvliwzdayqw0h5zycx8wg7vcgiz";
+       revision = "4";
+       editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -38143,20 +38002,6 @@ self: {
      }) {};
 
   "boxes" = callPackage
-    ({ mkDerivation, base, QuickCheck, split }:
-     mkDerivation {
-       pname = "boxes";
-       version = "0.1.4";
-       sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf";
-       revision = "1";
-       editedCabalFile = "073kkci1pm6rci7mnq9v006679jk41bfzc0jfi7my4c7idwd1ijd";
-       libraryHaskellDepends = [ base split ];
-       testHaskellDepends = [ base QuickCheck split ];
-       description = "2D text pretty-printing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "boxes_0_1_5" = callPackage
     ({ mkDerivation, base, QuickCheck, split }:
      mkDerivation {
        pname = "boxes";
@@ -38166,7 +38011,6 @@ self: {
        testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bpann" = callPackage
@@ -38344,28 +38188,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, dlist, microlens, microlens-mtl
-     , microlens-th, stm, template-haskell, text, text-zipper
-     , transformers, vector, vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.29.1";
-       sha256 = "1jslqfsqgrg379x4zi44f5xxn2jh0syqd4zbnfg07y3zgy5i399z";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq dlist
-         microlens microlens-mtl microlens-th stm template-haskell text
-         text-zipper transformers vector vty word-wrap
-       ];
-       homepage = "https://github.com/jtdaugherty/brick/";
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_34_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, stm, template-haskell, text, text-zipper
@@ -38385,7 +38207,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-skylighting" = callPackage
@@ -38553,46 +38374,6 @@ self: {
      }) {};
 
   "brittany" = callPackage
-    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
-     , containers, czipwith, data-tree-print, deepseq, directory, extra
-     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
-     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
-     , safe, semigroups, strict, syb, text, transformers, uniplate
-     , unsafe, yaml
-     }:
-     mkDerivation {
-       pname = "brittany";
-       version = "0.9.0.0";
-       sha256 = "0fi87p8ybibwhsmbh35xhipfkdg3kdwqb6n3y5ynql7603kssgc1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra ghc ghc-boot-th
-         ghc-exactprint ghc-paths monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       executableHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       testHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
-         neat-interpolation parsec pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       homepage = "https://github.com/lspitzner/brittany/";
-       description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "brittany_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
      , containers, czipwith, data-tree-print, deepseq, directory, extra
      , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
@@ -38630,7 +38411,6 @@ self: {
        homepage = "https://github.com/lspitzner/brittany/";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -38693,8 +38473,8 @@ self: {
     ({ mkDerivation, base, bytestring, bytestring-builder }:
      mkDerivation {
        pname = "bsb-http-chunked";
-       version = "0.0.0.1";
-       sha256 = "062rlcipj61cj38mysg8bmbiklbsz45lhgb0cl39j2wvxpmr6v6b";
+       version = "0.0.0.2";
+       sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
        libraryHaskellDepends = [ base bytestring bytestring-builder ];
        homepage = "http://github.com/sjakobi/bsb-http-chunked";
        description = "Chunked HTTP transfer encoding for bytestring builders";
@@ -39037,6 +38817,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bugsnag-haskell" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring
+     , case-insensitive, doctest, hspec, http-client, http-client-tls
+     , http-conduit, http-types, iproute, network, parsec
+     , template-haskell, text, th-lift-instances, time, ua-parser, wai
+     }:
+     mkDerivation {
+       pname = "bugsnag-haskell";
+       version = "0.0.1.1";
+       sha256 = "09jv8qr795ag12xf035ywpvnd61q7cgsqcx1irvyh9zlmiixb975";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive http-client http-client-tls
+         http-conduit http-types iproute network parsec template-haskell
+         text th-lift-instances time ua-parser wai
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base doctest hspec text time
+       ];
+       homepage = "https://github.com/pbrisbin/bugsnag-haskell#readme";
+       description = "Bugsnag error reporter for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bugzilla" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
      , containers, data-default, http-conduit, http-types, iso8601-time
@@ -39332,26 +39137,6 @@ self: {
      }) {system-glib = pkgs.glib;};
 
   "butcher" = callPackage
-    ({ mkDerivation, base, bifunctors, containers, deque, either, extra
-     , free, microlens, microlens-th, mtl, multistate, pretty
-     , transformers, unsafe, void
-     }:
-     mkDerivation {
-       pname = "butcher";
-       version = "1.2.1.0";
-       sha256 = "0vam5lqbp2k8r56d997bcp63lnsc4bbs7yd4lzjvibimr38g032w";
-       revision = "3";
-       editedCabalFile = "1faax0pipbywayjn961id2bc19y109bq0ny2hl1p9mh209iccnza";
-       libraryHaskellDepends = [
-         base bifunctors containers deque either extra free microlens
-         microlens-th mtl multistate pretty transformers unsafe void
-       ];
-       homepage = "https://github.com/lspitzner/butcher/";
-       description = "Chops a command or program invocation into digestable pieces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "butcher_1_3_0_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, deque, extra, free
      , microlens, microlens-th, mtl, multistate, pretty, transformers
      , unsafe, void
@@ -39367,7 +39152,6 @@ self: {
        homepage = "https://github.com/lspitzner/butcher/";
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butterflies" = callPackage
@@ -39393,20 +39177,6 @@ self: {
      }) {};
 
   "bv" = callPackage
-    ({ mkDerivation, base, ghc-prim, integer-gmp }:
-     mkDerivation {
-       pname = "bv";
-       version = "0.4.1";
-       sha256 = "1fs5rwmd9zn58wdb5s4xrq8vj9rsimwnjp9nd3hpcbkry58222fx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
-       homepage = "https://github.com/iagoabal/haskell-bv";
-       description = "Bit-vector arithmetic library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bv_0_5" = callPackage
     ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
        pname = "bv";
@@ -39418,7 +39188,6 @@ self: {
        homepage = "https://github.com/iagoabal/haskell-bv";
        description = "Bit-vector arithmetic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv-little" = callPackage
@@ -39551,8 +39320,8 @@ self: {
        pname = "bytes";
        version = "0.15.3";
        sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q";
-       revision = "3";
-       editedCabalFile = "13dwn6srx7zgiyayx5yxc14425asph9mylbi21yw30g04ahrbkxv";
+       revision = "4";
+       editedCabalFile = "1w0hmrlxbki1cd5685y40w4jhjbrk6if7jgikxxvl4dzlbl5ksaq";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytestring cereal containers hashable mtl scientific
@@ -40040,33 +39809,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
-     , conduit-extra, data-default, hspec, mtl, QuickCheck, random
-     , resourcet
-     }:
-     mkDerivation {
-       pname = "bzlib-conduit";
-       version = "0.2.1.5";
-       sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an";
-       revision = "1";
-       editedCabalFile = "1pz462dij6rizmbi7dw6qz50f9xgnzzw2z08cjlvbqzn05cpgdv6";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bindings-DSL bytestring conduit conduit-extra data-default mtl
-         resourcet
-       ];
-       librarySystemDepends = [ bzip2 ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra hspec QuickCheck random
-         resourcet
-       ];
-       benchmarkHaskellDepends = [ base conduit conduit-extra resourcet ];
-       homepage = "https://github.com/snoyberg/bzlib-conduit";
-       description = "Streaming compression/decompression via conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) bzip2;};
-
-  "bzlib-conduit_0_3_0" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
      , data-default, hspec, mtl, random, resourcet
      }:
@@ -40089,7 +39831,6 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -40293,8 +40034,8 @@ self: {
      }:
      mkDerivation {
        pname = "cab";
-       version = "0.2.17";
-       sha256 = "0lnd8m10999jxyx6x5plbrm135p7bv9q67c80h4l4gy49h07sr87";
+       version = "0.2.18";
+       sha256 = "0ic1ivxiv217ls4g38q5dwrb8sbsrzvdm6c0idv9ancpjmm8k8jl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40876,6 +40617,7 @@ self: {
          ansi-terminal base base-compat bytestring containers mtl
          optparse-applicative parsec text vector
        ];
+       doHaddock = false;
        description = "Library and utiltity for processing cabal's plan.json file";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -42486,6 +42228,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "case-insensitive_1_2_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "case-insensitive";
+       version = "1.2.0.11";
+       sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7";
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit text
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+       homepage = "https://github.com/basvandijk/case-insensitive";
+       description = "Case insensitive string comparison";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "case-insensitive-match" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl
      , QuickCheck, random-strings, tagsoup, text
@@ -42825,28 +42586,6 @@ self: {
      }) {};
 
   "cassava-conduit" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
-     , text
-     }:
-     mkDerivation {
-       pname = "cassava-conduit";
-       version = "0.4.0.1";
-       sha256 = "0y4zlr0k3hcwh8b9ly1aslpz4fbns7xw2h8jwghfl7zpi52zlj9y";
-       libraryHaskellDepends = [
-         array base bifunctors bytestring cassava conduit conduit-extra
-         containers mtl text
-       ];
-       testHaskellDepends = [
-         base bytestring cassava conduit conduit-extra QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/domdere/cassava-conduit";
-       description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cassava-conduit_0_4_0_2" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, containers, criterion, mtl, QuickCheck, text
      }:
@@ -42865,7 +42604,6 @@ self: {
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-embed" = callPackage
@@ -43531,25 +43269,6 @@ self: {
      }) {};
 
   "cereal-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl
-     , resourcet, transformers
-     }:
-     mkDerivation {
-       pname = "cereal-conduit";
-       version = "0.7.3";
-       sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit resourcet transformers
-       ];
-       testHaskellDepends = [
-         base bytestring cereal conduit HUnit mtl resourcet transformers
-       ];
-       homepage = "https://github.com/snoyberg/conduit";
-       description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cereal-conduit_0_8_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl
      , resourcet, transformers
      }:
@@ -43568,7 +43287,6 @@ self: {
        homepage = "https://github.com/snoyberg/conduit";
        description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-derive" = callPackage
@@ -44147,34 +43865,6 @@ self: {
      }) {};
 
   "chart-unit" = callPackage
-    ({ mkDerivation, base, colour, containers, data-default
-     , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear
-     , mwc-probability, mwc-random, numhask, numhask-range, palette
-     , primitive, protolude, scientific, SVGFonts, tasty, tasty-hspec
-     , tdigest, text
-     }:
-     mkDerivation {
-       pname = "chart-unit";
-       version = "0.5.5.0";
-       sha256 = "0hskfcg17h22fyprr9y264g6jz4lq1a7akqvdyji4fln61mqn07r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base colour data-default diagrams-lib diagrams-svg foldl formatting
-         lens linear numhask numhask-range palette scientific SVGFonts text
-       ];
-       executableHaskellDepends = [
-         base containers diagrams-lib diagrams-svg foldl formatting lens
-         mwc-probability mwc-random numhask primitive protolude tdigest text
-       ];
-       testHaskellDepends = [ base numhask tasty tasty-hspec text ];
-       homepage = "https://github.com/tonyday567/chart-unit#readme";
-       description = "Native haskell charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "chart-unit_0_6_1_0" = callPackage
     ({ mkDerivation, base, colour, data-default, diagrams-lib
      , diagrams-svg, doctest, foldl, formatting, generic-lens
      , generic-lens-labels, lens, linear, mwc-probability, mwc-random
@@ -45100,15 +44790,18 @@ self: {
      }) {};
 
   "cipher-aes128" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, criterion, crypto-api
-     , entropy, tagged
+    ({ mkDerivation, base, bytestring, Cabal, cereal, criterion
+     , crypto-api, entropy, process, tagged
      }:
      mkDerivation {
        pname = "cipher-aes128";
        version = "0.7.0.3";
        sha256 = "0fif8626z1p2q6734sjb69s1ascwmqiv9dkmzir7166ipjlbw9vg";
+       revision = "1";
+       editedCabalFile = "1c3lr80vcdrajlvks9ny9s8m2n2kc9jw14nh65668dfikp0pqc61";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
@@ -45305,29 +44998,28 @@ self: {
      }) {};
 
   "cisco-spark-api" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bitset-word8, bytestring
-     , conduit-combinators, data-default, hspec, http-conduit
-     , http-types, network-uri, optparse-applicative, text
-     , thread-hierarchy, utf8-string, wai, warp
+    ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
+     , bytestring, conduit, data-default, hspec, http-conduit
+     , http-types, network-uri, optparse-applicative, text, utf8-string
+     , wai, warp
      }:
      mkDerivation {
        pname = "cisco-spark-api";
-       version = "0.1.0.0";
-       sha256 = "0wiz580v04acjnc05mpx7nwgdz5gk6gsg84lv26p7qlij17038ds";
+       version = "0.1.0.2";
+       sha256 = "0cgs3d4dlc5vxz51d8c6hjvi1zxsvxzni4nqhqrc0rxnxkimc7bw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bitset-word8 bytestring conduit-combinators
-         data-default http-conduit network-uri text
+         aeson attoparsec base bitset-word8 bytestring conduit data-default
+         http-conduit network-uri text
        ];
        executableHaskellDepends = [
-         aeson base bytestring conduit-combinators data-default http-conduit
+         aeson base bytestring conduit data-default http-conduit
          optparse-applicative text utf8-string
        ];
        testHaskellDepends = [
-         aeson attoparsec base bytestring conduit-combinators data-default
-         hspec http-conduit http-types network-uri text thread-hierarchy wai
-         warp
+         aeson async attoparsec base bytestring conduit data-default hspec
+         http-conduit http-types network-uri text wai warp
        ];
        homepage = "https://github.com/nshimaza/cisco-spark-api#readme";
        description = "A Haskell bindings for Cisco Spark API";
@@ -45878,37 +45570,6 @@ self: {
      }) {};
 
   "classy-prelude" = callPackage
-    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
-     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
-     , hashable, hspec, lifted-async, lifted-base, monad-unlift
-     , mono-traversable, mono-traversable-instances, mtl
-     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
-     , semigroups, stm, stm-chans, text, time, time-locale-compat
-     , transformers, transformers-base, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "classy-prelude";
-       version = "1.3.1";
-       sha256 = "0rk1h0kipmpk94ny2i389l6kjv7j4a55vabpm938rxv5clja2wyd";
-       libraryHaskellDepends = [
-         async base basic-prelude bifunctors bytestring chunked-data
-         containers deepseq dlist exceptions ghc-prim hashable lifted-async
-         lifted-base monad-unlift mono-traversable
-         mono-traversable-instances mtl mutable-containers primitive
-         safe-exceptions say semigroups stm stm-chans text time
-         time-locale-compat transformers transformers-base
-         unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck transformers unordered-containers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "classy-prelude_1_4_0" = callPackage
     ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
      , hspec, mono-traversable, mono-traversable-instances, mtl
@@ -45933,31 +45594,9 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, conduit
-     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "classy-prelude-conduit";
-       version = "1.3.1";
-       sha256 = "0n76c6bg45zcvy1jid3lrn6cr4iz3la7dd1ym7nffvqvgrfp0r2j";
-       libraryHaskellDepends = [
-         base bytestring classy-prelude conduit conduit-combinators
-         monad-control resourcet transformers void
-       ];
-       testHaskellDepends = [
-         base bytestring conduit hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "classy-prelude-conduit_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
      , monad-control, QuickCheck, resourcet, transformers, void
      }:
@@ -45975,29 +45614,9 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "classy-prelude together with conduit functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-yesod" = callPackage
-    ({ mkDerivation, aeson, base, classy-prelude
-     , classy-prelude-conduit, data-default, http-conduit, http-types
-     , persistent, yesod, yesod-newsfeed, yesod-static
-     }:
-     mkDerivation {
-       pname = "classy-prelude-yesod";
-       version = "1.3.1";
-       sha256 = "1yzkwp4gbl1jqv8r95kvbiqgf2sr9wy5ddkqdz3413y0rvwccr9x";
-       libraryHaskellDepends = [
-         aeson base classy-prelude classy-prelude-conduit data-default
-         http-conduit http-types persistent yesod yesod-newsfeed
-         yesod-static
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "classy-prelude-yesod_1_4_0" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -46014,7 +45633,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classyplate" = callPackage
@@ -48440,25 +48058,6 @@ self: {
      }) {};
 
   "combinatorial" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, transformers
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "combinatorial";
-       version = "0.0";
-       sha256 = "0v0djq8kiiam8fd0057skny3dkqn3y138nf5cqbyqp52wzs2lvs6";
-       revision = "1";
-       editedCabalFile = "18aykjlggxkwn3cl46i2vznvag5kkw2kslf69yxvf4sg34bi7yfz";
-       libraryHaskellDepends = [
-         array base containers transformers utility-ht
-       ];
-       testHaskellDepends = [ base QuickCheck utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/combinatorial/";
-       description = "Count, enumerate, rank and unrank combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "combinatorial_0_1" = callPackage
     ({ mkDerivation, array, base, containers, QuickCheck, transformers
      , utility-ht
      }:
@@ -48477,7 +48076,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/combinatorial/";
        description = "Count, enumerate, rank and unrank combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -48714,8 +48312,8 @@ self: {
        pname = "comonad";
        version = "5.0.3";
        sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57";
-       revision = "1";
-       editedCabalFile = "1i72zgxjkbldkwz0g2awf44cm9466ahll89j5kl45vszx4iz0anl";
+       revision = "2";
+       editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
@@ -49073,8 +48671,8 @@ self: {
        pname = "complex-generic";
        version = "0.1.1.1";
        sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
-       revision = "1";
-       editedCabalFile = "0jf2mq26m0asgl5l0b1c1va30qj61ddvwxyl5xq29d3lpgnlby27";
+       revision = "2";
+       editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://code.mathr.co.uk/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
@@ -49711,23 +49309,6 @@ self: {
      }) {};
 
   "concurrency" = callPackage
-    ({ mkDerivation, array, atomic-primops, base, exceptions
-     , monad-control, mtl, stm, transformers
-     }:
-     mkDerivation {
-       pname = "concurrency";
-       version = "1.2.3.0";
-       sha256 = "1abrl3qab0gq1a2v4wjvmfzfmyainbj2qwf67h46pcrnd7va0ddq";
-       libraryHaskellDepends = [
-         array atomic-primops base exceptions monad-control mtl stm
-         transformers
-       ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "concurrency_1_4_0_2" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
@@ -49742,7 +49323,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -49821,6 +49401,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concurrent-extra_0_7_0_12" = callPackage
+    ({ mkDerivation, async, base, HUnit, random, stm, test-framework
+     , test-framework-hunit, unbounded-delays
+     }:
+     mkDerivation {
+       pname = "concurrent-extra";
+       version = "0.7.0.12";
+       sha256 = "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4";
+       libraryHaskellDepends = [ base stm unbounded-delays ];
+       testHaskellDepends = [
+         async base HUnit random stm test-framework test-framework-hunit
+         unbounded-delays
+       ];
+       homepage = "https://github.com/basvandijk/concurrent-extra";
+       description = "Extra concurrency primitives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-machines" = callPackage
     ({ mkDerivation, async, base, containers, lifted-async, machines
      , monad-control, semigroups, tasty, tasty-hunit, time, transformers
@@ -49828,8 +49427,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.3.1.2";
-       sha256 = "1qvd452najs0i3a2k2m493zs1jclsiisr1wv318kvkh0k42sb2m6";
+       version = "0.3.1.3";
+       sha256 = "1p1zlqa1mywn3mxg94gcryhpnffq8jpirgnvxhff2b1bs4llfaik";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -49858,6 +49457,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_10_5" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.10.5";
+       sha256 = "1hx51zihgr6awgx2widqv8y8hbi0baaq081m5kmr3mb4hqi9dh4q";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50059,7 +49675,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit" = callPackage
+  "conduit_1_2_13_1" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, exceptions
      , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, split
@@ -50084,9 +49700,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit_1_3_0" = callPackage
+  "conduit" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -50113,38 +49730,39 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-algorithms" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, containers, deepseq
-     , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-th, transformers, vector
+  "conduit_1_3_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hspec, kan-extensions
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , resourcet, safe, silently, split, text, transformers, unix
+     , unliftio, unliftio-core, vector
      }:
      mkDerivation {
-       pname = "conduit-algorithms";
-       version = "0.0.7.2";
-       sha256 = "19lamsddxvj8m47f97wlmk3phzf2rjdaxjbz064wc96r763mnigy";
+       pname = "conduit";
+       version = "1.3.0.1";
+       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
        libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq lzma-conduit mtl resourcet stm
-         stm-conduit streaming-commons transformers vector
+         base bytestring directory exceptions filepath mono-traversable mtl
+         primitive resourcet text transformers unix unliftio-core vector
        ];
        testHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq directory HUnit lzma-conduit mtl
-         resourcet stm stm-conduit streaming-commons test-framework
-         test-framework-hunit test-framework-th transformers vector
+         base bytestring containers directory exceptions filepath hspec
+         mono-traversable mtl QuickCheck resourcet safe silently split text
+         transformers unliftio vector
        ];
-       homepage = "https://github.com/luispedro/conduit-algorithms#readme";
-       description = "Conduit-based algorithms";
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-algorithms_0_0_8_0" = callPackage
+  "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, deepseq
      , directory, exceptions, HUnit, lzma-conduit, monad-control, mtl
@@ -50243,34 +49861,6 @@ self: {
      }) {};
 
   "conduit-combinators" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, filepath, hspec, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , text, transformers, transformers-base, unix, unix-compat, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "conduit-combinators";
-       version = "1.1.2";
-       sha256 = "0f31iphdi31m7cfd2szq06x3xdag1kkv2vbxh6bm2ax37k9sw2w4";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra filepath monad-control mono-traversable
-         mwc-random primitive resourcet text transformers transformers-base
-         unix unix-compat vector void
-       ];
-       testHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory filepath hspec mono-traversable mtl
-         mwc-random QuickCheck safe silently text transformers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "Commonly used conduit functions, for both chunked and unchunked data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-combinators_1_3_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "conduit-combinators";
@@ -50281,7 +49871,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "DEPRECATED Functionality merged into the conduit package itself";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -50305,7 +49894,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "conduit-extra" = callPackage
+  "conduit-extra_1_2_3_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, criterion, directory, exceptions
      , filepath, hspec, monad-control, network, primitive, process
@@ -50336,9 +49925,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-extra_1_3_0" = callPackage
+  "conduit-extra" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring
      , bytestring-builder, conduit, directory, exceptions, filepath
      , gauge, hspec, network, primitive, process, QuickCheck, resourcet
@@ -50365,7 +49955,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-find" = callPackage
@@ -50454,17 +50043,16 @@ self: {
      }) {};
 
   "conduit-parse" = callPackage
-    ({ mkDerivation, base, conduit, conduit-combinators, dlist, mtl
-     , parsers, resourcet, safe, safe-exceptions, tasty, tasty-hunit
-     , text, transformers
+    ({ mkDerivation, base, conduit, dlist, mtl, parsers, resourcet
+     , safe, safe-exceptions, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "conduit-parse";
-       version = "0.1.2.2";
-       sha256 = "19ywaknrdcg88ximmx6fa08bq9xvp76ybly09gyp21xjnfdznsr9";
+       version = "0.2.0.0";
+       sha256 = "03ynwkq48ni473fzbhviyff73i4v7wy8hcdlvr0i8pv8kq1zk7v5";
        libraryHaskellDepends = [
-         base conduit conduit-combinators dlist mtl parsers safe
-         safe-exceptions text transformers
+         base conduit dlist mtl parsers safe safe-exceptions text
+         transformers
        ];
        testHaskellDepends = [
          base conduit mtl parsers resourcet safe-exceptions tasty
@@ -51055,8 +50643,8 @@ self: {
      }:
      mkDerivation {
        pname = "console-program";
-       version = "0.4.2.1";
-       sha256 = "1havd30r0yni6vym7zfkryvyhqp1r0q8ijypr31jdk5dsn8zb2py";
+       version = "0.4.2.2";
+       sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory haskeline
          parsec parsec-extra split transformers unix utility-ht
@@ -51215,23 +50803,6 @@ self: {
      }) {};
 
   "constraints" = callPackage
-    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "constraints";
-       version = "0.9.1";
-       sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7";
-       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;
-     }) {};
-
-  "constraints_0_10" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
      , hspec-discover, mtl, semigroups, transformers
      , transformers-compat
@@ -51249,7 +50820,6 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructible" = callPackage
@@ -52064,28 +51634,6 @@ self: {
      }) {};
 
   "cookie" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring
-     , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck, text, time
-     }:
-     mkDerivation {
-       pname = "cookie";
-       version = "0.4.3";
-       sha256 = "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring data-default-class deepseq old-locale
-         text time
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
-         tasty-quickcheck text time
-       ];
-       homepage = "http://github.com/snoyberg/cookie";
-       description = "HTTP cookie parsing and rendering";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "cookie_0_4_4" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
      , time
@@ -52104,7 +51652,6 @@ self: {
        homepage = "http://github.com/snoyberg/cookie";
        description = "HTTP cookie parsing and rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coordinate" = callPackage
@@ -52368,6 +51915,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "corenlp-parser" = callPackage
+    ({ mkDerivation, aeson, base, directory, process, raw-strings-qq
+     , string-class, temporary, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "corenlp-parser";
+       version = "0.2.0.0";
+       sha256 = "0h001djrgjds3rnmgdxmap26rb1z2zr88q1snv6gkq28p3vknyf1";
+       libraryHaskellDepends = [
+         aeson base directory process raw-strings-qq string-class temporary
+         text unordered-containers
+       ];
+       homepage = "https://github.com/k-bx/corenlp-parser#readme";
+       description = "Launches CoreNLP and parses the JSON output";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "coroutine-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, monad-coroutine }:
      mkDerivation {
@@ -53545,10 +53109,10 @@ self: {
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.2.6.0";
-       sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc";
+       version = "1.3.0.0";
+       sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q";
        revision = "2";
-       editedCabalFile = "0i5fb4g9qpar9fkbkgrd9v7ifl4277cp88qmcwxzqak4knxifba8";
+       editedCabalFile = "1yyv34f9yk8d67x18l1al5csd383ypmdwnz73gq0agmw4k2f9c54";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -53559,10 +53123,12 @@ self: {
          parsec semigroups statistics text time transformers
          transformers-compat vector vector-algorithms
        ];
-       executableHaskellDepends = [ base optparse-applicative ];
+       executableHaskellDepends = [
+         base base-compat optparse-applicative semigroups
+       ];
        testHaskellDepends = [
-         aeson base bytestring deepseq directory HUnit QuickCheck statistics
-         tasty tasty-hunit tasty-quickcheck vector
+         aeson base base-compat bytestring deepseq directory HUnit
+         QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector
        ];
        homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
@@ -54146,8 +53712,8 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-rng";
-       version = "0.1.0.1";
-       sha256 = "1hmml06vkf769cwxjry04zcxigy8w6sgfm9rmzwwv402mqh48dzs";
+       version = "0.1.0.2";
+       sha256 = "1h7ilx91jbnlmax0z74kvk6f3yr4f14pk15bi9qvhn8kj13i7qf1";
        libraryHaskellDepends = [
          base bytestring crypto-api DRBG exceptions monad-control mtl
          transformers-base
@@ -54478,29 +54044,6 @@ self: {
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, foundation
-     , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
-     , tasty-kat, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite";
-       version = "0.24";
-       sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp";
-       libraryHaskellDepends = [
-         base bytestring deepseq foundation ghc-prim integer-gmp memory
-       ];
-       testHaskellDepends = [
-         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion memory random
-       ];
-       homepage = "https://github.com/haskell-crypto/cryptonite";
-       description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite_0_25" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, gauge
      , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
      , tasty-kat, tasty-quickcheck
@@ -54521,7 +54064,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -54725,6 +54267,21 @@ self: {
        license = "LGPL";
      }) {};
 
+  "csp_1_4_0" = callPackage
+    ({ mkDerivation, base, containers, mtl, nondeterminism, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "csp";
+       version = "1.4.0";
+       sha256 = "15ilx5ycvh12c71wza2d25cp4llvncxc9csmmisjcxwny5gpz1q8";
+       libraryHaskellDepends = [ base containers mtl nondeterminism ];
+       testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
+       description = "Discrete constraint satisfaction problem (CSP) solver";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cspmchecker" = callPackage
     ({ mkDerivation, base, directory, filepath, haskeline, libcspm, mtl
      }:
@@ -55235,6 +54792,28 @@ self: {
      }) {};
 
   "curl-runnings" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs
+     , directory, hspec, hspec-expectations, http-conduit, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "curl-runnings";
+       version = "0.2.0";
+       sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hspec
+         hspec-expectations http-conduit text unordered-containers yaml
+       ];
+       executableHaskellDepends = [ base cmdargs text ];
+       testHaskellDepends = [ base directory hspec hspec-expectations ];
+       homepage = "https://github.com/aviaviavi/curl-runnings#readme";
+       description = "A framework for declaratively writing curl based API tests";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "curl-runnings_0_3_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, cmdargs, directory, hspec, hspec-expectations
      , http-conduit, http-types, text, unordered-containers, vector
@@ -55256,6 +54835,7 @@ self: {
        homepage = "https://github.com/aviaviavi/curl-runnings#readme";
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curlhs" = callPackage
@@ -55302,12 +54882,17 @@ self: {
      }) {};
 
   "currency-codes" = callPackage
-    ({ mkDerivation, aeson, base, bson, random, safe, text }:
+    ({ mkDerivation, aeson, base, bson, deepseq, hspec, QuickCheck
+     , random, safe, text
+     }:
      mkDerivation {
        pname = "currency-codes";
-       version = "2.0.0.0";
-       sha256 = "0sdgnzww38l9vhjxs2b92c4j0db4ssbhxs4zrhvnfh66x6jjvnd5";
-       libraryHaskellDepends = [ aeson base bson random safe text ];
+       version = "3.0.0.0";
+       sha256 = "0xv5mad6d5y0slizwvh3q9m4n2nxjlav4lxy30s3fv0cfkx4hhwn";
+       libraryHaskellDepends = [
+         aeson base bson deepseq random safe text
+       ];
+       testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        homepage = "https://github.com/chordify/currency-codes";
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
@@ -56823,25 +56408,6 @@ self: {
      }) {};
 
   "data-diverse-lens" = callPackage
-    ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
-     , profunctors, tagged
-     }:
-     mkDerivation {
-       pname = "data-diverse-lens";
-       version = "1.0.0.1";
-       sha256 = "0ivrm1n2pbsj6hskgz56igna13d8zfj2n0iiqvmpba81kzwlg0x7";
-       libraryHaskellDepends = [
-         base data-diverse generic-lens lens profunctors tagged
-       ];
-       testHaskellDepends = [
-         base data-diverse generic-lens hspec lens tagged
-       ];
-       homepage = "https://github.com/louispan/data-diverse-lens#readme";
-       description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-diverse-lens_2_1_0_0" = callPackage
     ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
      , profunctors, tagged
      }:
@@ -56858,7 +56424,6 @@ self: {
        homepage = "https://github.com/louispan/data-diverse-lens#readme";
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-dword" = callPackage
@@ -57927,8 +57492,8 @@ self: {
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "data-transform";
-       version = "0.1.0.1";
-       sha256 = "1ib6znjgcjz50z4saf70z7jg9qz132627vj3kv6r3jx6i9vyv2l6";
+       version = "0.1.0.2";
+       sha256 = "0r4j295b8688x88knbw19z6f4ggnpxgs7adpl1r00njjykdhdzac";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -59091,25 +58656,6 @@ self: {
      }) {};
 
   "debug" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, directory, extra
-     , ghc-prim, js-jquery, open-browser, template-haskell, uniplate
-     }:
-     mkDerivation {
-       pname = "debug";
-       version = "0.0.2";
-       sha256 = "13dx8fqyczba1qldl0nk5i8c1hxsqi5497dylkjyzjmxphs6fi53";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base containers directory extra ghc-prim js-jquery
-         open-browser template-haskell uniplate
-       ];
-       testHaskellDepends = [ base extra ];
-       homepage = "https://github.com/ndmitchell/debug";
-       description = "Simple trace-based debugger";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "debug_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, clock, containers
      , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
      , js-jquery, libgraph, monoidal-containers, open-browser
@@ -59137,7 +58683,6 @@ self: {
        homepage = "https://github.com/ndmitchell/debug";
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug-diff" = callPackage
@@ -59286,8 +58831,8 @@ self: {
      }:
      mkDerivation {
        pname = "declarative";
-       version = "0.5.1";
-       sha256 = "0966yk9ihl2xawr8xiymz6yp0z6py7dq94ii7zd845klgq393maf";
+       version = "0.5.2";
+       sha256 = "014spawd3wgasrlfaz0zcz0qf1cnhr9nxm71lzcxjgi8n1gcza0y";
        libraryHaskellDepends = [
          base hasty-hamiltonian kan-extensions lens mcmc-types
          mighty-metropolis mwc-probability pipes primitive speedy-slice
@@ -59462,8 +59007,8 @@ self: {
        pname = "deepseq-generics";
        version = "0.2.0.0";
        sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh";
-       revision = "1";
-       editedCabalFile = "055m914q7a19jagpxh65d8m67z1nl0h7cz77y1r0zp1qmpkisg82";
+       revision = "2";
+       editedCabalFile = "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -59665,18 +59210,18 @@ self: {
 
   "dejafu" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, random, ref-fd, transformers, transformers-base
+     , leancheck, profunctors, random, ref-fd, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.9.1.2";
-       sha256 = "1cxskfl2wg3m9hja97yc0sjghskhs442l2jqwcynlhjr308g84as";
+       version = "1.3.1.0";
+       sha256 = "09c2gsgqxnr9kpkhbz4g1wrl66qy02vp3sckp8vsg194r5xx4s1b";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck random
-         ref-fd transformers transformers-base
+         base concurrency containers deepseq exceptions leancheck
+         profunctors random ref-fd transformers
        ];
        homepage = "https://github.com/barrucadu/dejafu";
-       description = "Systematic testing for Haskell concurrency";
+       description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -60248,28 +59793,6 @@ self: {
      }) {};
 
   "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged
-     , template-haskell, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.3.6";
-       sha256 = "0v9m76hjrlrcbyawdp04y1vv0p867h3jhy00xjxgmqq5cm0sn7qc";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell transformers
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
-       ];
-       homepage = "https://github.com/haskell-compat/deriving-compat";
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_4_1" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -60293,7 +59816,6 @@ self: {
        homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -60538,37 +60060,6 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring
-     , bytestring, case-insensitive, charset, containers, contravariant
-     , cryptohash, exceptions, http-client, http-client-tls, lens
-     , optparse-generic, parsers, prettyprinter, system-fileio
-     , system-filepath, tasty, tasty-hunit, text, text-format
-     , transformers, trifecta, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.8.2";
-       sha256 = "1llr12rwnd39xs51faxxvrf9n9scwsz3j2ywqdfsrr3hiasq80aj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
-         charset containers contravariant cryptohash exceptions http-client
-         http-client-tls lens parsers prettyprinter system-fileio
-         system-filepath text text-format transformers trifecta
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         base optparse-generic prettyprinter system-filepath text trifecta
-       ];
-       testHaskellDepends = [
-         base containers tasty tasty-hunit text vector
-       ];
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall_1_11_1" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , contravariant, cryptonite, deepseq, directory, exceptions
@@ -60603,32 +60094,9 @@ self: {
        ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , neat-interpolation, optparse-generic, shell-escape, text
-     , text-format, trifecta, vector
-     }:
-     mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.6";
-       sha256 = "1wjwjpprvd90dpmxij5zj1gr5x41bvzmr4qwyfhxd2am6bzg5n5d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers dhall neat-interpolation shell-escape
-         text text-format vector
-       ];
-       executableHaskellDepends = [
-         base bytestring dhall optparse-generic text trifecta
-       ];
-       description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-bash_1_0_10" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , insert-ordered-containers, neat-interpolation, optparse-generic
      , shell-escape, text, text-format, trifecta
@@ -60648,7 +60116,6 @@ self: {
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-check" = callPackage
@@ -60671,25 +60138,6 @@ self: {
      }) {};
 
   "dhall-json" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, trifecta, vector, yaml
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.0.9";
-       sha256 = "0xxgvsv8maccf81mdip1jnw4y3jlpnjhhxvyp4d3ph0xnng7z9l6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ aeson base dhall text vector ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-generic text
-         trifecta yaml
-       ];
-       description = "Compile Dhall to JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-json_1_0_12" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
      , optparse-generic, text, trifecta, yaml
      }:
@@ -60706,32 +60154,9 @@ self: {
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , neat-interpolation, optparse-generic, text, text-format, trifecta
-     , vector
-     }:
-     mkDerivation {
-       pname = "dhall-nix";
-       version = "1.0.9";
-       sha256 = "06njwk2mmn8virrzd7q1bw91rwagcczkjn21kjhbajn6gzl77dry";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-fix dhall hnix neat-interpolation text
-         text-format vector
-       ];
-       executableHaskellDepends = [
-         base dhall hnix optparse-generic text trifecta
-       ];
-       description = "Dhall to Nix compiler";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-nix_1_1_1" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
      , insert-ordered-containers, neat-interpolation, optparse-generic
      , scientific, text, text-format, trifecta
@@ -60751,23 +60176,9 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-text" = callPackage
-    ({ mkDerivation, base, dhall, optparse-generic, text }:
-     mkDerivation {
-       pname = "dhall-text";
-       version = "1.0.5";
-       sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base dhall optparse-generic text ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_7" = callPackage
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
@@ -60778,7 +60189,6 @@ self: {
        executableHaskellDepends = [ base dhall optparse-generic text ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -60879,6 +60289,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-braille" = callPackage
+    ({ mkDerivation, base, containers, diagrams-core, diagrams-lib
+     , diagrams-rasterific, filepath, hashable, JuicyPixels, lens, mtl
+     , optparse-applicative, Rasterific, time
+     }:
+     mkDerivation {
+       pname = "diagrams-braille";
+       version = "0.1.0.0";
+       sha256 = "0825zczccr878ghlw26x1skg56g8wxa9c0zq3dfaxhfyvxi9d6aq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers diagrams-core diagrams-lib diagrams-rasterific
+         filepath hashable JuicyPixels lens mtl optparse-applicative
+         Rasterific time
+       ];
+       executableHaskellDepends = [
+         base containers diagrams-core diagrams-lib diagrams-rasterific
+         filepath hashable JuicyPixels lens mtl optparse-applicative
+         Rasterific time
+       ];
+       homepage = "https://github.com/mlang/diagrams-braille#readme";
+       description = "Braille diagrams with plain text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-builder" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cmdargs
      , diagrams-cairo, diagrams-lib, diagrams-postscript
@@ -60953,35 +60389,6 @@ self: {
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, base, circle-packing, colour, containers
-     , cubicbezier, data-default, data-default-class, diagrams-core
-     , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
-     , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat
-     , parsec, QuickCheck, random, semigroups, split, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "diagrams-contrib";
-       version = "1.4.1";
-       sha256 = "1apbgicaq7qaij42hwh5aiy67si2fjd0m4lah1hw4vz0cqfxxs2v";
-       revision = "1";
-       editedCabalFile = "0143vrfnb5qp3m23nvh5h67b2wvkq8y27yn6jjq601cs95f3b41c";
-       libraryHaskellDepends = [
-         base circle-packing colour containers cubicbezier data-default
-         data-default-class diagrams-core diagrams-lib diagrams-solve
-         force-layout hashable lens linear mfsolve MonadRandom monoid-extras
-         mtl mtl-compat parsec random semigroups split text
-       ];
-       testHaskellDepends = [
-         base containers diagrams-lib HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-contrib_1_4_2_1" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , cubicbezier, data-default, data-default-class, diagrams-core
      , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
@@ -61006,7 +60413,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -61988,24 +61394,6 @@ self: {
      }) {};
 
   "dimensional" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit
-     , numtype-dk, vector
-     }:
-     mkDerivation {
-       pname = "dimensional";
-       version = "1.0.1.3";
-       sha256 = "19wkm9jm6pjrrwqvafhs8zmfa9g06l5a03pcr8jm6497jajndi9v";
-       libraryHaskellDepends = [
-         base deepseq exact-pi numtype-dk vector
-       ];
-       testHaskellDepends = [ base HUnit ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/bjornbm/dimensional/";
-       description = "Statically checked physical dimensions, using Type Families and Data Kinds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dimensional_1_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob
      , hspec, ieee754, numtype-dk, QuickCheck, semigroups
      , template-haskell, vector
@@ -62024,7 +61412,6 @@ self: {
        homepage = "https://github.com/bjornbm/dimensional/";
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dimensional-codata" = callPackage
@@ -62784,23 +62171,6 @@ self: {
      }) {};
 
   "distributed-closure" = callPackage
-    ({ mkDerivation, base, binary, bytestring, constraints, hspec
-     , QuickCheck, syb, template-haskell
-     }:
-     mkDerivation {
-       pname = "distributed-closure";
-       version = "0.3.5";
-       sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h";
-       libraryHaskellDepends = [
-         base binary bytestring constraints syb template-haskell
-       ];
-       testHaskellDepends = [ base binary hspec QuickCheck ];
-       homepage = "https://github.com/tweag/distributed-closure";
-       description = "Serializable closures for distributed programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-closure_0_4_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, hspec
      , QuickCheck, syb, template-haskell
      }:
@@ -62815,7 +62185,6 @@ self: {
        homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process" = callPackage
@@ -63419,8 +62788,8 @@ self: {
        pname = "distributive";
        version = "0.5.3";
        sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
-       revision = "4";
-       editedCabalFile = "1v6b2vnharppjn6w36lxfy0dvl93jzjq7fcyq9cp71650f1g9ai5";
+       revision = "5";
+       editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans tagged transformers transformers-compat
@@ -63858,42 +63227,6 @@ self: {
      }) {};
 
   "docker" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , conduit-combinators, conduit-extra, connection, containers
-     , data-default-class, directory, exceptions, filemanip, filepath
-     , http-client, http-client-tls, http-conduit, http-types, lens
-     , lens-aeson, monad-control, mtl, network, process, QuickCheck
-     , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, time, tls, transformers, transformers-base
-     , unordered-containers, uuid, vector, x509, x509-store, x509-system
-     , zlib
-     }:
-     mkDerivation {
-       pname = "docker";
-       version = "0.4.1.1";
-       sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka";
-       revision = "1";
-       editedCabalFile = "1zbi904jaq2mvbxhmw2l181xz0p6q8mia843g5arsz3akckq2z72";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit conduit-combinators
-         conduit-extra containers data-default-class directory exceptions
-         filemanip filepath http-client http-conduit http-types
-         monad-control mtl network resourcet scientific tar temporary text
-         time tls transformers transformers-base unordered-containers uuid
-         vector x509 x509-store x509-system zlib
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection containers http-client
-         http-client-tls http-types lens lens-aeson process QuickCheck tasty
-         tasty-hunit tasty-quickcheck text transformers unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/denibertovic/docker-hs";
-       description = "An API client for docker written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "docker_0_5_1_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , conduit-combinators, conduit-extra, connection, containers
      , data-default-class, directory, exceptions, filemanip, filepath
@@ -63925,7 +63258,6 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -63934,13 +63266,14 @@ self: {
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.8.2";
-       sha256 = "0kmr7b0i5wbcn6r2f2pi4ndnzr4kdi3yj2v1pxwqyv8v0d6h55gi";
+       version = "1.9.1";
+       sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base containers foldl language-docker system-filepath text turtle
        ];
+       homepage = "https://github.com/seatgeek/docker-build-cacher#readme";
        description = "Builds a services with docker and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64047,26 +63380,6 @@ self: {
      }) {};
 
   "doctemplates" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, hspec, parsec, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "doctemplates";
-       version = "0.2.1";
-       sha256 = "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers parsec
-         scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec text ];
-       homepage = "https://github.com/jgm/doctemplates#readme";
-       description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "doctemplates_0_2_2" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, hspec, parsec, scientific, text, unordered-containers
      , vector
@@ -64084,7 +63397,6 @@ self: {
        homepage = "https://github.com/jgm/doctemplates#readme";
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest" = callPackage
@@ -64114,7 +63426,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "doctest_0_14_1" = callPackage
+  "doctest_0_15_0" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -64122,10 +63434,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.14.1";
-       sha256 = "1phnrsh2gjls54mlpqhfjs0x003jbrsz1sijy107mbg2gnck9cfj";
-       revision = "1";
-       editedCabalFile = "12ypn6bk87kmqfsyy8950zpyl4h45rnkyxsh2i5sbyx4rjq3kwk6";
+       version = "0.15.0";
+       sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64147,14 +63457,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover_0_1_0_8" = callPackage
+  "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.8";
-       sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x";
+       version = "0.1.0.7";
+       sha256 = "0w5xgw841fxp26n4c9srp84g0m0b105sa1snwrjg5dvxa7d6asmc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64171,14 +63481,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover" = callPackage
+  "doctest-discover_0_1_0_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.9";
-       sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
+       version = "0.1.0.8";
+       sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64222,25 +63532,6 @@ self: {
      }) {};
 
   "doctest-driver-gen" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "doctest-driver-gen";
-       version = "0.1.0.1";
-       sha256 = "0drv2zp8mr4sisd27y0bcjamip8vs26a09k65x6zm5ric4psmhqs";
-       revision = "1";
-       editedCabalFile = "0005s8byp2ww8y2xnmxvdh24fw5qwly4f6sbmzwbs0yi10zsbfkg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base doctest ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/Hexirp/doctest-driver-gen#readme";
-       description = "Generate doctest-driver.hs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "doctest-driver-gen_0_2_0_0" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
@@ -65092,18 +64383,17 @@ self: {
      }) {};
 
   "drinkery" = callPackage
-    ({ mkDerivation, base, conduit, conduit-combinators, gauge, list-t
-     , ListT, machines, mtl, pipes, transformers
+    ({ mkDerivation, base, conduit, conduit-combinators, exceptions
+     , gauge, list-t, ListT, machines, mtl, pipes, transformers
      }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.1";
-       sha256 = "0cwv7z7gzbbkxrdfikkbmkhd6asbib1m0j9h98nwhm7i1c498rhi";
-       revision = "1";
-       editedCabalFile = "19zjmmfjkkx3dsy4zwz8f3iciwgvlra9rxp5y11mkb5glg5qy3f9";
-       libraryHaskellDepends = [ base mtl transformers ];
+       version = "0.2";
+       sha256 = "0bfdd916ab27fqhsly2z2dmjhfvyz9q5w78qpdryi69d0gimfb8g";
+       libraryHaskellDepends = [ base exceptions mtl transformers ];
        benchmarkHaskellDepends = [
-         base conduit conduit-combinators gauge list-t ListT machines pipes
+         base conduit conduit-combinators exceptions gauge list-t ListT
+         machines mtl pipes transformers
        ];
        homepage = "https://github.com/fumieval/drinkery#readme";
        description = "Boozy streaming library";
@@ -67003,25 +66293,6 @@ self: {
      }) {};
 
   "either" = callPackage
-    ({ mkDerivation, base, bifunctors, exceptions, free, mmorph
-     , monad-control, MonadRandom, mtl, profunctors, semigroupoids
-     , semigroups, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "either";
-       version = "4.5";
-       sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc";
-       libraryHaskellDepends = [
-         base bifunctors exceptions free mmorph monad-control MonadRandom
-         mtl profunctors semigroupoids semigroups transformers
-         transformers-base
-       ];
-       homepage = "http://github.com/ekmett/either/";
-       description = "An either monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "either_5" = callPackage
     ({ mkDerivation, base, bifunctors, hedgehog, mtl, profunctors
      , semigroupoids, semigroups
      }:
@@ -67036,7 +66307,6 @@ self: {
        homepage = "http://github.com/ekmett/either/";
        description = "Combinators for working with sums";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either-list-functions" = callPackage
@@ -67604,24 +66874,6 @@ self: {
      }) {};
 
   "elm-export-persistent" = callPackage
-    ({ mkDerivation, aeson, base, elm-export, persistent, scientific
-     , text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "elm-export-persistent";
-       version = "0.1.2";
-       sha256 = "17fyv33wv38lbfkx55wqhz1xls8as75ndfd14f10r2sknxafyidw";
-       libraryHaskellDepends = [
-         aeson base elm-export persistent scientific text
-         unordered-containers
-       ];
-       homepage = "https://github.com/jb55/elm-export-persistent";
-       description = "elm-export persistent entities";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
-     }) {};
-
-  "elm-export-persistent_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, elm-export, persistent, scientific
      , text, unordered-containers
      }:
@@ -67636,7 +66888,6 @@ self: {
        homepage = "https://github.com/jb55/elm-export-persistent";
        description = "elm-export persistent entities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
@@ -68020,6 +67271,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_2_5" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.2.5";
+       sha256 = "0k2fczw7qk442b3k0qblypaad8bva06x5sai5zgp7h6ckvlg8kvv";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       homepage = "https://github.com/Porges/email-validate-hs";
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -68744,26 +68013,6 @@ self: {
      }) {};
 
   "envy" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec, mtl
-     , QuickCheck, quickcheck-instances, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "envy";
-       version = "1.3.0.2";
-       sha256 = "16w9d0cg2niy766kmnsfgy803s802dm6mr0n3sgwz2fhwy6sz82c";
-       libraryHaskellDepends = [
-         base bytestring containers mtl text time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring hspec mtl QuickCheck quickcheck-instances text time
-         transformers
-       ];
-       description = "An environmentally friendly way to deal with environment variables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "envy_1_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, mtl
      , QuickCheck, quickcheck-instances, text, time, transformers
      }:
@@ -68937,18 +68186,6 @@ self: {
      }) {};
 
   "eq" = callPackage
-    ({ mkDerivation, base, semigroupoids }:
-     mkDerivation {
-       pname = "eq";
-       version = "4.0.4";
-       sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4";
-       libraryHaskellDepends = [ base semigroupoids ];
-       homepage = "http://github.com/ekmett/eq/";
-       description = "Leibnizian equality";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eq_4_1" = callPackage
     ({ mkDerivation, base, semigroupoids }:
      mkDerivation {
        pname = "eq";
@@ -68958,7 +68195,6 @@ self: {
        homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "equal-files" = callPackage
@@ -69590,8 +68826,8 @@ self: {
      }:
      mkDerivation {
        pname = "eternity";
-       version = "0.1.1";
-       sha256 = "0vl5vyysshbrb4vcf4r85w0n46vlfgpspj6nk7jl054099vsv58f";
+       version = "0.1.2";
+       sha256 = "0rjjdhr9cnpgm55mjvhlkgdvqvi5dmmzrr4vj0jmn9pg7zra34y6";
        libraryHaskellDepends = [
          attoparsec base cereal directory foldl potoki potoki-cereal text
        ];
@@ -69611,8 +68847,8 @@ self: {
      }:
      mkDerivation {
        pname = "eternity-timestamped";
-       version = "0.2.3";
-       sha256 = "1c7qil02diisnpv5vihh76l32l4c912s806z8p7p1jhv4wb13f8z";
+       version = "0.2.5";
+       sha256 = "1ndvb2gs8a9720k9wlbz01vm12s0pb4kmrkidc9w6m33985jckfa";
        libraryHaskellDepends = [
          attoparsec base cereal directory eternity foldl generic-random
          hashable potoki QuickCheck text time
@@ -70221,22 +69457,6 @@ self: {
      }) {};
 
   "eventsource-api" = callPackage
-    ({ mkDerivation, aeson, base, containers, mtl, protolude
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventsource-api";
-       version = "1.1.1";
-       sha256 = "0zy59m7iwxwy5c4l15kvj98fk7vrjwhxp0scc3r3v37cxkakg01h";
-       libraryHaskellDepends = [
-         aeson base containers mtl protolude unordered-containers uuid
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "Provides an eventsourcing high level API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-api_1_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , enclosed-exceptions, lifted-async, lifted-base, monad-control
      , monad-loops, mtl, stm, stm-chans, string-conversions, text
@@ -70254,32 +69474,9 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "Provides an eventsourcing high level API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-geteventstore-store" = callPackage
-    ({ mkDerivation, aeson, base, eventsource-api
-     , eventsource-store-specs, eventstore, mtl, protolude, tasty
-     , tasty-hspec
-     }:
-     mkDerivation {
-       pname = "eventsource-geteventstore-store";
-       version = "1.0.4";
-       sha256 = "0fn75hwarhjnrjalv7i16ry1wnr2z2gqvpj3ls2faappz1drhxmp";
-       libraryHaskellDepends = [
-         aeson base eventsource-api eventstore mtl protolude
-       ];
-       testHaskellDepends = [
-         base eventsource-api eventsource-store-specs eventstore protolude
-         tasty tasty-hspec
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "GetEventStore store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventsource-geteventstore-store_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, eventsource-api
      , eventsource-store-specs, eventstore, mtl, protolude
      , string-conversions, tasty, tasty-hspec, transformers-base
@@ -70303,22 +69500,6 @@ self: {
      }) {};
 
   "eventsource-store-specs" = callPackage
-    ({ mkDerivation, aeson, base, eventsource-api, mtl, protolude
-     , tasty, tasty-hspec, uuid
-     }:
-     mkDerivation {
-       pname = "eventsource-store-specs";
-       version = "1.0.1";
-       sha256 = "0fg6rma02vp3iij93xgccqivqfx3h9675203jlmk6073mhg2i5id";
-       libraryHaskellDepends = [
-         aeson base eventsource-api mtl protolude tasty tasty-hspec uuid
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "Provides common test specification for Store implementation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-store-specs_1_1_1" = callPackage
     ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty
      , tasty-hspec, text, transformers-base, uuid
      }:
@@ -70333,30 +69514,9 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "Provides common test specification for Store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-stub-store" = callPackage
-    ({ mkDerivation, aeson, base, containers, eventsource-api
-     , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
-     }:
-     mkDerivation {
-       pname = "eventsource-stub-store";
-       version = "1.0.2";
-       sha256 = "10c853i9k91gc42jbqzxx3scip2hr1ahwkhzvcryhiw3745qsidr";
-       libraryHaskellDepends = [
-         base containers eventsource-api mtl protolude stm
-       ];
-       testHaskellDepends = [
-         aeson base eventsource-api eventsource-store-specs protolude tasty
-         tasty-hspec
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "An in-memory stub store implementation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-stub-store_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, base, containers, eventsource-api
      , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
      , transformers-base
@@ -70375,7 +69535,6 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "An in-memory stub store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsourced" = callPackage
@@ -70401,42 +69560,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, text-format, time, transformers-base
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "0.15.0.2";
-       sha256 = "00mamlf121c3dsigpxvshj1mbm2b4hdbil02zyhz7jc6kccgbjwx";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text text-format time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       homepage = "https://github.com/YoEight/eventstore#readme";
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_2" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -71065,8 +70188,8 @@ self: {
        pname = "exp-extended";
        version = "0.1.1.2";
        sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r";
-       revision = "1";
-       editedCabalFile = "1bxlaagjvlhnbf9hh0n46b05gm1vmdrgzzgrc3kbz8mg87j91vyr";
+       revision = "2";
+       editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0";
        libraryHaskellDepends = [ base compensated log-domain ];
        homepage = "https://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
@@ -71483,28 +70606,6 @@ self: {
      }) {};
 
   "extensible-effects" = callPackage
-    ({ mkDerivation, base, directory, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, transformers, transformers-base, type-aligned
-     }:
-     mkDerivation {
-       pname = "extensible-effects";
-       version = "2.1.0.0";
-       sha256 = "069v7ql359msnnsbapy1dwgsw3g6f0w8rrc0ihix1jm7p2ivjyrc";
-       libraryHaskellDepends = [
-         base transformers transformers-base type-aligned
-       ];
-       testHaskellDepends = [
-         base directory HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th
-       ];
-       homepage = "https://github.com/suhailshergill/extensible-effects";
-       description = "An Alternative to Monad Transformers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "extensible-effects_2_4_0_0" = callPackage
     ({ mkDerivation, base, criterion, HUnit, mtl, QuickCheck, silently
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , test-framework-th, transformers, transformers-base
@@ -71884,6 +70985,23 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "fake" = callPackage
+    ({ mkDerivation, base, containers, generics-sop, hspec, random
+     , text, time
+     }:
+     mkDerivation {
+       pname = "fake";
+       version = "0.1";
+       sha256 = "1q6l1nz4anq3njbs772y0mdyy6qhfza7yicxa6fkjaxzgc2dnf1m";
+       libraryHaskellDepends = [
+         base containers generics-sop random text time
+       ];
+       testHaskellDepends = [ base hspec random text time ];
+       homepage = "https://github.com/mightybyte/fake";
+       description = "Randomly generated fake data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fake-type" = callPackage
     ({ mkDerivation, base, base-prelude, libXtst, split, X11 }:
      mkDerivation {
@@ -72501,37 +71619,6 @@ self: {
      }) {};
 
   "fb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, bytestring, cereal, conduit, conduit-extra
-     , containers, crypto-api, cryptohash, cryptohash-cryptoapi
-     , data-default, hspec, http-client, http-conduit, http-types, HUnit
-     , lifted-base, monad-control, monad-logger, old-locale, QuickCheck
-     , resourcet, text, time, transformers, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "fb";
-       version = "1.1.1";
-       sha256 = "0rbzcnd0cw06vfyy3k5f1n0f8hr00ygn5pjdws7ayn2f2hsk9ln8";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         bytestring cereal conduit conduit-extra crypto-api cryptohash
-         cryptohash-cryptoapi data-default http-client http-conduit
-         http-types lifted-base monad-control monad-logger old-locale
-         resourcet text time transformers transformers-base
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit containers data-default hspec
-         http-conduit HUnit lifted-base monad-control QuickCheck resourcet
-         text time transformers
-       ];
-       homepage = "https://github.com/psibi/fb";
-       description = "Bindings to Facebook's API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fb_1_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
      , containers, crypto-api, cryptohash, cryptohash-cryptoapi
@@ -72559,7 +71646,6 @@ self: {
        homepage = "https://github.com/psibi/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb-persistent" = callPackage
@@ -72820,22 +71906,6 @@ self: {
      }) {};
 
   "fedora-haskell-tools" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, time, unix }:
-     mkDerivation {
-       pname = "fedora-haskell-tools";
-       version = "0.4";
-       sha256 = "0105i1klks1f0gcq9fyv1pbfrm3mfiwp14pdac0xb8hm1fbhbs70";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory filepath process time unix
-       ];
-       homepage = "https://github.com/fedora-haskell/fedora-haskell-tools";
-       description = "Building and managing tools for Fedora Haskell";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "fedora-haskell-tools_0_5_1" = callPackage
     ({ mkDerivation, base, directory, filepath, process, time, unix }:
      mkDerivation {
        pname = "fedora-haskell-tools";
@@ -72849,7 +71919,6 @@ self: {
        homepage = "https://github.com/fedora-haskell/fedora-haskell-tools";
        description = "Building and managing tools for Fedora Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fedora-packages" = callPackage
@@ -73364,23 +72433,6 @@ self: {
      }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, hspec
-     , microbench, QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "fgl";
-       version = "5.5.4.0";
-       sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji";
-       libraryHaskellDepends = [
-         array base containers deepseq transformers
-       ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
-       benchmarkHaskellDepends = [ base deepseq microbench ];
-       description = "Martin Erwig's Functional Graph Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fgl_5_6_0_0" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
      , microbench, QuickCheck, transformers
      }:
@@ -73395,7 +72447,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq microbench ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-arbitrary" = callPackage
@@ -73677,27 +72728,6 @@ self: {
      }) {};
 
   "filecache" = callPackage
-    ({ mkDerivation, base, directory, exceptions, hashable, hinotify
-     , lens, mtl, stm, strict-base-types, temporary
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "filecache";
-       version = "0.2.9";
-       sha256 = "10fxjphldf2mi25pmx5l9j1073zb5lrhana2ysvkiazfmmjcvrh2";
-       libraryHaskellDepends = [
-         base exceptions hashable hinotify lens mtl stm strict-base-types
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory temporary unordered-containers
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "A Linux-only cache system associating values to files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "filecache_0_3_1" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
      }:
@@ -73715,7 +72745,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "A cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filediff" = callPackage
@@ -74485,20 +73514,6 @@ self: {
      }) {};
 
   "fixed-vector" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
-     mkDerivation {
-       pname = "fixed-vector";
-       version = "1.0.0.0";
-       sha256 = "1y2250frzbx750jpp9qslmhfjdx9bn8aariwng3py3kz392p7x3g";
-       revision = "1";
-       editedCabalFile = "02ig2q9jn2lnf9w2cap5fjjslix928zg5dc40pab8pjb7qzlb6wy";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [ base doctest filemanip primitive ];
-       description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector_1_1_0_0" = callPackage
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
@@ -74508,7 +73523,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-binary" = callPackage
@@ -75764,27 +74778,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fold-debounce-conduit" = callPackage
-    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
-     , stm, transformers, transformers-base
+  "fold-debounce_0_2_0_7" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
      }:
      mkDerivation {
-       pname = "fold-debounce-conduit";
-       version = "0.1.0.5";
-       sha256 = "1k441whksiwss55j7q7iwhr90hdj02dy7jg2rhd2ijz1ysy76gi5";
+       pname = "fold-debounce";
+       version = "0.2.0.7";
+       sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz";
        libraryHaskellDepends = [
-         base conduit fold-debounce resourcet stm transformers
-         transformers-base
+         base data-default-class stm stm-delay time
        ];
-       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";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fold-debounce-conduit_0_2_0_0" = callPackage
+  "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
      }:
@@ -75802,7 +74814,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
@@ -76395,21 +75406,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, base, clock, old-locale, scientific, text
-     , text-format, time
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.2.5";
-       sha256 = "0k4z8b9x91m243kplx9gap1rqyvdszf3241aq7pkqwrybbzgm8yh";
-       libraryHaskellDepends = [
-         base clock old-locale scientific text text-format time
-       ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, text, time, transformers
      }:
@@ -76424,6 +75420,23 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "formatting_6_3_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+     , integer-gmp, old-locale, scientific, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.3.1";
+       sha256 = "0yfl3xb0dyig8imzxxaq2lh6gy3rn07c6zxncvmzjzlpzy6kqc2n";
+       libraryHaskellDepends = [
+         array base bytestring clock ghc-prim integer-gmp old-locale
+         scientific text time transformers
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -76666,22 +75679,6 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, basement, gauge, ghc-prim }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.17";
-       sha256 = "00f2p47h715fjb3rpsxlf4jskgwk9sz5p692r09gspspqmrs5l84";
-       revision = "1";
-       editedCabalFile = "15y38y0mj4vc694jwh3cjgnq8xv5vv7954g633f7mw5f0hb3yxkn";
-       libraryHaskellDepends = [ base basement ghc-prim ];
-       testHaskellDepends = [ base basement ];
-       benchmarkHaskellDepends = [ base basement gauge ];
-       homepage = "https://github.com/haskell-foundation/foundation";
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foundation_0_0_20" = callPackage
     ({ mkDerivation, base, basement, gauge, ghc-prim }:
      mkDerivation {
        pname = "foundation";
@@ -76693,7 +75690,6 @@ self: {
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foundation-edge" = callPackage
@@ -76994,28 +75990,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, containers
-     , distributive, exceptions, mtl, prelude-extras, profunctors
-     , semigroupoids, semigroups, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "4.12.4";
-       sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9";
-       revision = "1";
-       editedCabalFile = "17ymahpfjf3ychrl9f6vhqy5637sc9k019v8b7wp0ydg6b61znmg";
-       libraryHaskellDepends = [
-         base bifunctors comonad containers distributive exceptions mtl
-         prelude-extras profunctors semigroupoids semigroups
-         template-haskell transformers transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/free/";
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_5_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, profunctors, semigroupoids
      , semigroups, template-haskell, transformers, transformers-base
@@ -77035,7 +76009,6 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-concurrent" = callPackage
@@ -77388,32 +76361,6 @@ self: {
      }) {};
 
   "freer-simple" = callPackage
-    ({ mkDerivation, base, criterion, extensible-effects, free, mtl
-     , natural-transformation, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, transformers-base
-     }:
-     mkDerivation {
-       pname = "freer-simple";
-       version = "1.0.1.1";
-       sha256 = "1fdxj1iyh8jl2nghrm51r7gvlk1qwzrjjhj13f0akwrm2s0la1jb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base natural-transformation transformers-base
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion extensible-effects free mtl
-       ];
-       homepage = "https://github.com/lexi-lambda/freer-simple#readme";
-       description = "Implementation of a friendly effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "freer-simple_1_1_0_0" = callPackage
     ({ mkDerivation, base, criterion, extensible-effects, free, mtl
      , natural-transformation, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, transformers-base
@@ -77437,7 +76384,6 @@ self: {
        homepage = "https://github.com/lexi-lambda/freer-simple#readme";
        description = "Implementation of a friendly effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesect" = callPackage
@@ -78244,22 +77190,6 @@ self: {
      }) {};
 
   "funcmp" = callPackage
-    ({ mkDerivation, base, filepath, process }:
-     mkDerivation {
-       pname = "funcmp";
-       version = "1.8";
-       sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
-       revision = "1";
-       editedCabalFile = "1fkjmx4mmfmf2y08w7mgw1rp6q6w9zxdj95zfydgxgkmvk9b37c4";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base filepath process ];
-       homepage = "https://github.com/peti/funcmp";
-       description = "Functional MetaPost";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "funcmp_1_9" = callPackage
     ({ mkDerivation, base, filepath, pretty, process }:
      mkDerivation {
        pname = "funcmp";
@@ -78270,7 +77200,6 @@ self: {
        homepage = "https://github.com/peti/funcmp";
        description = "Functional MetaPost is a Haskell frontend to the MetaPost language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -78977,28 +77906,6 @@ self: {
      }) {};
 
   "gauge" = callPackage
-    ({ mkDerivation, base, basement, bytestring, code-page, containers
-     , deepseq, directory, HUnit, math-functions, mwc-random, tasty
-     , tasty-hunit, vector
-     }:
-     mkDerivation {
-       pname = "gauge";
-       version = "0.1.3";
-       sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0";
-       libraryHaskellDepends = [
-         base basement code-page containers deepseq math-functions
-         mwc-random vector
-       ];
-       testHaskellDepends = [
-         base bytestring deepseq directory HUnit tasty tasty-hunit
-       ];
-       benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/vincenthz/hs-gauge";
-       description = "small framework for performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gauge_0_2_1" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, directory
      , HUnit, process, tasty, tasty-hunit, vector
      }:
@@ -79016,7 +77923,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-gauge";
        description = "small framework for performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gbu" = callPackage
@@ -79564,23 +78470,6 @@ self: {
      }) {};
 
   "general-games" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
-     , random, random-shuffle
-     }:
-     mkDerivation {
-       pname = "general-games";
-       version = "1.0.5";
-       sha256 = "0lra0dn1nnvkbbc5x3sxn10z7vziwzvlvg153l3xi6daqhch6za2";
-       libraryHaskellDepends = [
-         base monad-loops MonadRandom random random-shuffle
-       ];
-       testHaskellDepends = [ base hspec HUnit MonadRandom ];
-       homepage = "https://github.com/cgorski/general-games";
-       description = "Library supporting simulation of a number of games";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "general-games_1_1_1" = callPackage
     ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
      , random, random-shuffle
      }:
@@ -79595,7 +78484,6 @@ self: {
        homepage = "https://github.com/cgorski/general-games";
        description = "Library supporting simulation of a number of games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "general-prelude" = callPackage
@@ -79861,21 +78749,6 @@ self: {
      }) {};
 
   "generic-random" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "generic-random";
-       version = "1.0.0.0";
-       sha256 = "16wlfmfms5544aag1bkzaq9wwsd5zkq7mhwlz9fvsngmkbfa07g7";
-       revision = "3";
-       editedCabalFile = "12l53dxv400g9fvz07jv42gn7x6825kxsyvpnhd3snsklvjrhl70";
-       libraryHaskellDepends = [ base QuickCheck ];
-       testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://github.com/lysxia/generic-random";
-       description = "Generic random generators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-random_1_1_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "generic-random";
@@ -79886,7 +78759,6 @@ self: {
        homepage = "http://github.com/lysxia/generic-random";
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-records" = callPackage
@@ -80001,6 +78873,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-eot_0_2_1_2" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec
+     , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
+     , shake
+     }:
+     mkDerivation {
+       pname = "generics-eot";
+       version = "0.2.1.2";
+       sha256 = "07vaywcqrp9jcsbcgj63i5mcs3zbf69zprkkmh9in3rnkvq9cfjf";
+       libraryHaskellDepends = [ base markdown-unlit ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec interpolate markdown-unlit
+         mockery QuickCheck shake
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/soenkehahn/generics-eot#readme";
+       description = "A library for generic programming that aims to be easy to understand";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
@@ -80957,6 +79850,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gh-labeler" = callPackage
+    ({ mkDerivation, base, directory, github, memory, text, vector }:
+     mkDerivation {
+       pname = "gh-labeler";
+       version = "0.1.0";
+       sha256 = "05g3lk1ff87qmjlywi6p90mjyycx418idddavpi8i045gr51am4l";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory github memory text vector
+       ];
+       homepage = "https://github.com/vincenthz/gh-labeler#readme";
+       description = "Github Standard Labeler";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gh-pocket-knife" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
      , QuickCheck, resourcet
@@ -81027,6 +79936,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-call-stack-extras" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ghc-call-stack-extras";
+       version = "0.1.0.2";
+       sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/treeowl/ghc-call-stack-extras";
+       description = "Extra utilities for HasCallStack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-compact_0_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim }:
      mkDerivation {
@@ -81252,29 +80173,6 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, Diff, directory
-     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
-     , silently, syb
-     }:
-     mkDerivation {
-       pname = "ghc-exactprint";
-       version = "0.5.6.0";
-       sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-exactprint_0_5_6_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
@@ -81295,7 +80193,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -82403,27 +81300,6 @@ self: {
      }) {};
 
   "gi-atk" = callPackage
-    ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-atk";
-       version = "2.0.14";
-       sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) atk;};
-
-  "gi-atk_2_0_15" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
@@ -82442,35 +81318,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-cairo";
-       version = "1.0.14";
-       sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo ];
-       doHaddock = false;
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo;};
-
-  "gi-cairo_1_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -82493,7 +81343,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "gi-gdk" = callPackage
@@ -82631,27 +81480,6 @@ self: {
      }) {inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "gi-glib" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
-       version = "2.0.15";
-       sha256 = "1gfkqvw2m5i5cg9c3y33l1wqxcr8s80w0sx8kdnnfial0c4ba6cz";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-glib_2_0_16" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -82670,31 +81498,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.15";
-       sha256 = "0h98lld62dhdbw7s0c833jw15wxajy6nmvr69604px3saf4mjrrl";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gobject_2_0_16" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -82713,7 +81519,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
@@ -82940,28 +81745,6 @@ self: {
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers
-     , webkitgtk
-     }:
-     mkDerivation {
-       pname = "gi-javascriptcore";
-       version = "4.0.14";
-       sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ webkitgtk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "JavaScriptCore bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
-
-  "gi-javascriptcore_4_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
      , webkitgtk
@@ -83925,40 +82708,6 @@ self: {
      }) {};
 
   "github" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, base-compat
-     , base16-bytestring, binary, binary-orphans, byteable, bytestring
-     , containers, cryptohash, deepseq, deepseq-generics, exceptions
-     , file-embed, hashable, hspec, hspec-discover, http-client
-     , http-client-tls, http-link-header, http-types, iso8601-time, mtl
-     , network-uri, semigroups, text, time, tls, transformers
-     , transformers-compat, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "github";
-       version = "0.18";
-       sha256 = "0i4cs6d95ik5c8zs2508nmhjh2v30a0qjyxfqyxhjsz48p9h5p1i";
-       revision = "2";
-       editedCabalFile = "1rywfb78acwh81mdnxb4q35n374k1wbxg0562biis0i0jjxfp211";
-       libraryHaskellDepends = [
-         aeson aeson-compat base base-compat base16-bytestring binary
-         binary-orphans byteable bytestring containers cryptohash deepseq
-         deepseq-generics exceptions hashable http-client http-client-tls
-         http-link-header http-types iso8601-time mtl network-uri semigroups
-         text time tls transformers transformers-compat unordered-containers
-         vector vector-instances
-       ];
-       testHaskellDepends = [
-         aeson-compat base base-compat bytestring file-embed hspec
-         unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/phadej/github";
-       description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "github_0_19" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
@@ -83972,6 +82721,8 @@ self: {
        pname = "github";
        version = "0.19";
        sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph";
+       revision = "1";
+       editedCabalFile = "0f6frc80nkwxjp8p0mr6x6x0jd9vvwi0aw0a8yfsk7lxvd4lr6cs";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -83988,7 +82739,6 @@ self: {
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -84061,27 +82811,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.1.4";
-       sha256 = "0jnxlvs69jc5d60s266f5clsfx1jr517b7yzl08hnka5km8qqdkb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_1_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -84100,7 +82829,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -85777,29 +84505,6 @@ self: {
      }) {};
 
   "goggles" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , bytestring, containers, cryptonite, exceptions, filepath, hspec
-     , http-client, http-client-tls, http-types, memory, mtl, pem
-     , QuickCheck, req, scientific, stm, text, time, transformers
-     , unix-time, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "goggles";
-       version = "0.1.0.3";
-       sha256 = "0if045sxm1xss91hx2hi4hcjy2b4w7q0sas8h9ra75vmzxfn6hjz";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring binary bytestring
-         containers cryptonite exceptions filepath hspec http-client
-         http-client-tls http-types memory mtl pem QuickCheck req scientific
-         stm text time transformers unix-time x509 x509-store
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/goggles";
-       description = "Interface to Google Cloud APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "goggles_0_3_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
      , bytestring, containers, cryptonite, exceptions, filepath, hspec
      , http-client, http-client-tls, http-types, memory, mtl, pem
@@ -85820,7 +84525,6 @@ self: {
        homepage = "https://github.com/ocramz/goggles";
        description = "Extensible interface to Web APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goggles-gcs" = callPackage
@@ -85829,8 +84533,8 @@ self: {
      }:
      mkDerivation {
        pname = "goggles-gcs";
-       version = "0.1.0.0";
-       sha256 = "0g23z852g7f1h8s49q4nj0y2lnm4fa0ycs4d633937i3f18bsl74";
+       version = "0.1.2";
+       sha256 = "0p1z03y6sy8daqvyfs4mj767yh98zbl23lri72jpy0z213qsjybf";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite exceptions goggles memory mtl req
          text unix-time
@@ -90351,58 +89055,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, bifunctors, binary, binary-conduit, byteable
-     , bytestring, bzlib, conduit, conduit-extra, containers, criterion
-     , crypto-cipher-types, cryptonite, data-default-class, errors
-     , hashable, incremental-parser, ixset-typed, lens, memory
-     , monad-loops, nettle, network, network-uri, newtype
-     , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet
-     , securemem, semigroups, split, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, time-locale-compat, transformers
-     , unordered-containers, wl-pprint-extras, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.5.5";
-       sha256 = "0m5df5w261nm6v246g6r306a5higmyzpgsskf8cp4m88cnlyy08q";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         bifunctors binary binary-conduit byteable bytestring bzlib conduit
-         conduit-extra containers crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network network-uri newtype
-         openpgp-asciiarmor resourcet securemem semigroups split text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras zlib
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base16-bytestring bifunctors binary
-         binary-conduit byteable bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype QuickCheck quickcheck-instances
-         resourcet securemem semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unordered-containers wl-pprint-extras zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit byteable bytestring bzlib conduit conduit-extra
-         containers criterion crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network network-uri newtype
-         openpgp-asciiarmor resourcet securemem semigroups split text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras zlib
-       ];
-       homepage = "http://floss.scru.org/hOpenPGP/";
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hOpenPGP_2_6" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
@@ -91526,31 +90178,6 @@ self: {
      }) {};
 
   "hackernews" = callPackage
-    ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
-     , http-types, QuickCheck, quickcheck-instances, servant
-     , servant-client, string-conversions, text
-     }:
-     mkDerivation {
-       pname = "hackernews";
-       version = "1.3.0.0";
-       sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base http-client http-types QuickCheck quickcheck-instances
-         servant servant-client string-conversions text
-       ];
-       executableHaskellDepends = [ base http-client http-client-tls ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-client-tls QuickCheck
-         quickcheck-instances
-       ];
-       description = "API for Hacker News";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hackernews_1_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
      , http-types, QuickCheck, quickcheck-instances, servant
      , servant-client, string-conversions, text
@@ -91625,8 +90252,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.5.4";
-       sha256 = "1gbn6bnlhaafycyfsfh5j4rbkd56nc65qny34ii9clr34d2cwkaq";
+       version = "0.5.5";
+       sha256 = "0chvf2wvpvbnzf8980sdg9s61c4p100ps7ava85hlr281sng5d60";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91638,9 +90265,9 @@ self: {
          transformers unix xml zlib
        ];
        testHaskellDepends = [
-         base binary bytestring containers deepseq directory
-         extensible-exceptions filepath HUnit pretty process split time unix
-         xml
+         array base binary bytestring containers deepseq directory
+         extensible-exceptions filepath HUnit parsec pretty process split
+         time unix xml
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
@@ -91861,23 +90488,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haddock-library" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.4.3";
-       sha256 = "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
-       testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
-       ];
-       homepage = "http://www.haskell.org/haddock/";
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "haddock-library_1_4_4" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
      , hspec-discover, QuickCheck, transformers
@@ -91891,12 +90501,32 @@ self: {
          base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
        testToolDepends = [ hspec-discover ];
+       doHaddock = false;
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haddock-library" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
+     , hspec-discover, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.4.5";
+       sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9";
+       libraryHaskellDepends = [ base bytestring deepseq transformers ];
+       testHaskellDepends = [
+         base base-compat bytestring deepseq hspec QuickCheck transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       doHaddock = false;
+       homepage = "http://www.haskell.org/haddock/";
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haddock-library_1_5_0_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
@@ -91914,6 +90544,7 @@ self: {
          hspec optparse-applicative QuickCheck transformers tree-diff
        ];
        testToolDepends = [ hspec-discover ];
+       doHaddock = false;
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
@@ -92416,50 +91047,6 @@ self: {
      }) {};
 
   "hakyll" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
-     , network, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
-     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, utillinux, vector, wai
-     , wai-app-static, warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.10.0.0";
-       sha256 = "0zz5g8ildihng1cw12hxfv3ihd604id20llnpaasrg25b96bidw2";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
-         text time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process
-         QuickCheck random regex-base regex-tdfa resourcet scientific
-         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
-         time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       testToolDepends = [ utillinux ];
-       homepage = "http://jaspervdj.be/hakyll";
-       description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) utillinux;};
-
-  "hakyll_4_11_0_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , containers, cryptohash, data-default, deepseq, directory
      , file-embed, filepath, fsnotify, http-conduit, http-types
@@ -92472,8 +91059,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.11.0.0";
-       sha256 = "08930cs783krsjqzlswz4fplppdlmw5b29nry5i7kan7d4f4lfb8";
+       version = "4.12.0.1";
+       sha256 = "07alx008dg4q2ygwqf854r1nyizac0i3frkk23lzsfpzrbi784r0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -92501,7 +91088,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -95657,34 +94243,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
-     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
-     , text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.20.3";
-       sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring Cabal containers directory filepath
-         haskell-gi-base mtl pretty-show process regex-tdfa safe text
-         transformers xdg-basedir xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobjectIntrospection;};
-
-  "haskell-gi_0_21_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobjectIntrospection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -95709,24 +94267,10 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; 
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.20.8";
-       sha256 = "1qfkzsr5z8c71hps66zj90j70s258d85r0zpw5s87vcj1cbjza4i";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_21_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -95737,10 +94281,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-overloading_0_0" = callPackage
+  "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "haskell-gi-overloading";
@@ -95750,10 +94293,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-gi-overloading" = callPackage
+  "haskell-gi-overloading_1_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "haskell-gi-overloading";
@@ -95763,6 +94305,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-go-checkers" = callPackage
@@ -96031,30 +94574,6 @@ self: {
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
-     , pretty-show, tasty, tasty-golden, transformers
-     , traverse-with-class, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-names";
-       version = "0.9.0";
-       sha256 = "117nywdif86x11kmv5ibfqxn3bjaxb2flygvhp7d62kglqz2l85x";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-lens-light filepath
-         haskell-src-exts mtl transformers traverse-with-class uniplate
-       ];
-       testHaskellDepends = [
-         base containers filemanip filepath haskell-src-exts mtl pretty-show
-         tasty tasty-golden traverse-with-class
-       ];
-       homepage = "http://documentup.com/haskell-suite/haskell-names";
-       description = "Name resolution library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-names_0_9_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
      , pretty-show, tasty, tasty-golden, transformers
@@ -96076,7 +94595,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -96337,13 +94855,28 @@ self: {
        pname = "haskell-src";
        version = "1.0.2.0";
        sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
+       revision = "1";
+       editedCabalFile = "13lipvh20r35vcgschkvxl8csfi6bn7nqk6avzp7jwrhmpgi9wi0";
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-src-exts" = callPackage
+  "haskell-src_1_0_3_0" = callPackage
+    ({ mkDerivation, array, base, happy, pretty, syb }:
+     mkDerivation {
+       pname = "haskell-src";
+       version = "1.0.3.0";
+       sha256 = "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l";
+       libraryHaskellDepends = [ array base pretty syb ];
+       libraryToolDepends = [ happy ];
+       description = "Support for manipulating Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-src-exts_1_19_1" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
@@ -96362,9 +94895,10 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-src-exts_1_20_2" = callPackage
+  "haskell-src-exts" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
@@ -96383,7 +94917,6 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-observe" = callPackage
@@ -96448,18 +94981,6 @@ self: {
      }) {};
 
   "haskell-src-exts-simple" = callPackage
-    ({ mkDerivation, base, haskell-src-exts }:
-     mkDerivation {
-       pname = "haskell-src-exts-simple";
-       version = "1.19.0.0";
-       sha256 = "01i4kaw9sbcygsj7s17xxw7cf8p11kq2msq9af5v32yhwxk93g21";
-       libraryHaskellDepends = [ base haskell-src-exts ];
-       homepage = "https://github.com/int-e/haskell-src-exts-simple";
-       description = "A simplified view on the haskell-src-exts AST";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-src-exts-simple_1_20_0_0" = callPackage
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "haskell-src-exts-simple";
@@ -96469,7 +94990,6 @@ self: {
        homepage = "https://github.com/int-e/haskell-src-exts-simple";
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -96565,22 +95085,6 @@ self: {
      }) {};
 
   "haskell-tools-ast" = callPackage
-    ({ mkDerivation, base, ghc, mtl, references, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-ast";
-       version = "1.0.0.4";
-       sha256 = "000dazz2qmc46pyfxskimz02xllf7fs6nl18ki6pvvahp0ammgd9";
-       libraryHaskellDepends = [
-         base ghc mtl references template-haskell uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-ast_1_0_1_1" = callPackage
     ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references
      , template-haskell, uniplate
      }:
@@ -96595,7 +95099,6 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -96653,24 +95156,6 @@ self: {
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
-     , haskell-tools-ast, mtl, references, safe, split, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-backend-ghc";
-       version = "1.0.0.4";
-       sha256 = "0c909xknb4q28cqm4cckx5girygz1jjg0nwj9v31dj7yhwgm6y2g";
-       libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
-         references safe split template-haskell transformers uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-backend-ghc_1_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
@@ -96686,42 +95171,9 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, either
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-refactor, haskell-tools-rewrite, mtl, old-time
-     , polyparse, references, split, tasty, tasty-hunit
-     , template-haskell, time, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-builtin-refactorings";
-       version = "1.0.0.4";
-       sha256 = "1hxl8j8nkn3f59wxbzfyhjbshjypi4bv7v2vrqlpfygnb1n1jhci";
-       libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite mtl references split template-haskell
-         transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite mtl old-time polyparse references split tasty
-         tasty-hunit template-haskell time transformers uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-builtin-refactorings_1_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, Cabal, classyplate, containers
      , deepseq, directory, either, filepath, ghc, ghc-paths
      , haskell-tools-ast, haskell-tools-backend-ghc
@@ -96755,43 +95207,6 @@ self: {
      }) {};
 
   "haskell-tools-cli" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , directory, filepath, ghc, ghc-paths, Glob
-     , haskell-tools-builtin-refactorings, haskell-tools-daemon
-     , haskell-tools-refactor, knob, mtl, optparse-applicative, process
-     , references, split, strict, tasty, tasty-hunit, time
-     }:
-     mkDerivation {
-       pname = "haskell-tools-cli";
-       version = "1.0.0.4";
-       sha256 = "121q9ydi0jlj9bs6zyy2h6vkmaajwf1pcnnq4s21yw99ah4xhy6q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath ghc ghc-paths
-         haskell-tools-builtin-refactorings haskell-tools-daemon
-         haskell-tools-refactor mtl references split strict
-       ];
-       executableHaskellDepends = [
-         base directory filepath Glob haskell-tools-builtin-refactorings
-         haskell-tools-daemon mtl optparse-applicative process split
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath
-         haskell-tools-builtin-refactorings knob tasty tasty-hunit
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring criterion directory filepath
-         haskell-tools-builtin-refactorings haskell-tools-daemon knob split
-         time
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Command-line frontend for Haskell-tools Refact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-cli_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-daemon
@@ -96829,41 +95244,6 @@ self: {
      }) {};
 
   "haskell-tools-daemon" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
-     , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
-     , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative
-     , pretty, process, references, split, strict, tasty, tasty-hunit
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "haskell-tools-daemon";
-       version = "1.0.0.4";
-       sha256 = "1gqx9nn87mq2n722lzl0slpw54dg6asc2s77zjs0sywvcpck4b4v";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq Diff directory
-         filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings
-         haskell-tools-prettyprint haskell-tools-refactor mtl network
-         optparse-applicative pretty process references split strict
-         template-haskell
-       ];
-       executableHaskellDepends = [
-         base directory filepath haskell-tools-builtin-refactorings
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath ghc Glob
-         haskell-tools-builtin-refactorings HUnit network process tasty
-         tasty-hunit
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Background process for Haskell-tools that editors can connect to";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-daemon_1_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
@@ -96899,31 +95279,6 @@ self: {
      }) {};
 
   "haskell-tools-debug" = callPackage
-    ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
-     , haskell-tools-prettyprint, haskell-tools-refactor, references
-     , split, template-haskell
-     }:
-     mkDerivation {
-       pname = "haskell-tools-debug";
-       version = "1.0.0.4";
-       sha256 = "0lh48bfjicpjsk2vazl91n6xw0ahff89rw9iiizpla92rz1fcb20";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base filepath ghc ghc-paths haskell-tools-ast
-         haskell-tools-backend-ghc haskell-tools-builtin-refactorings
-         haskell-tools-prettyprint haskell-tools-refactor references split
-         template-haskell
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-debug_1_0_1_1" = callPackage
     ({ mkDerivation, base, classyplate, criterion, filepath, ghc
      , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
      , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
@@ -96950,38 +95305,6 @@ self: {
      }) {};
 
   "haskell-tools-demo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
-     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
-     , HUnit, mtl, network, references, tasty, tasty-hunit, transformers
-     , wai, wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "haskell-tools-demo";
-       version = "1.0.0.4";
-       sha256 = "0vqjs4wrgjacj3i6hykfvafhnyik6nn9p8miyb1plmhm9w6g0ynq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-builtin-refactorings haskell-tools-prettyprint
-         haskell-tools-refactor http-types mtl references transformers wai
-         wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit websockets
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-demo_1_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
@@ -97045,23 +95368,6 @@ self: {
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
-     , references, split, text, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-prettyprint";
-       version = "1.0.0.4";
-       sha256 = "001mk8fdxl06il8s3w1i4901s85kb99nyhp3yk7jg6ghh4iaf1c9";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast mtl references split text
-         uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-prettyprint_1_0_1_1" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
@@ -97076,25 +95382,33 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
-     , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
-     , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references
-     , split, template-haskell, transformers, uniplate
+    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-rewrite, mtl, old-time, polyparse, references
+     , split, tasty, tasty-hunit, template-haskell, time, transformers
+     , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.0.0.4";
-       sha256 = "192najfy3r05vhxl21bg6lqy8m5081sdxp5yfvw9nyjlarfcb2b9";
+       version = "1.0.1.1";
+       sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2";
        libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-paths
+         aeson base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-rewrite mtl references
          split template-haskell transformers uniplate
        ];
+       testHaskellDepends = [
+         base Cabal containers directory either filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
+         polyparse references split tasty tasty-hunit template-haskell time
+         transformers uniplate
+       ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -97132,28 +95446,6 @@ self: {
      }) {};
 
   "haskell-tools-rewrite" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-rewrite";
-       version = "1.0.0.4";
-       sha256 = "1jjg6w2ajlnjz7hl74znm2gaylmlixvp65m2ns7p4iryycsr5fjg";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
-         references
-       ];
-       testHaskellDepends = [
-         base directory filepath haskell-tools-ast haskell-tools-prettyprint
-         tasty tasty-hunit
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-rewrite_1_0_1_1" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
@@ -97173,7 +95465,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -98720,23 +97011,6 @@ self: {
      }) {};
 
   "hasql-optparse-applicative" = callPackage
-    ({ mkDerivation, base-prelude, hasql, hasql-pool
-     , optparse-applicative
-     }:
-     mkDerivation {
-       pname = "hasql-optparse-applicative";
-       version = "0.2.4";
-       sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr";
-       libraryHaskellDepends = [
-         base-prelude hasql hasql-pool optparse-applicative
-       ];
-       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
-       description = "\"optparse-applicative\" parsers for \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-optparse-applicative_0_3" = callPackage
     ({ mkDerivation, base-prelude, hasql, hasql-pool
      , optparse-applicative
      }:
@@ -98853,26 +97127,6 @@ self: {
      }) {};
 
   "hasql-transaction" = callPackage
-    ({ mkDerivation, async, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , hasql, mtl, rebase, transformers
-     }:
-     mkDerivation {
-       pname = "hasql-transaction";
-       version = "0.5.2";
-       sha256 = "0w4y65vqgc4pk66xpip9jzzbas6cpnss4gx1w91rg7j48491cmym";
-       libraryHaskellDepends = [
-         base base-prelude bytestring bytestring-tree-builder contravariant
-         contravariant-extras hasql mtl transformers
-       ];
-       testHaskellDepends = [ async hasql rebase ];
-       homepage = "https://github.com/nikita-volkov/hasql-transaction";
-       description = "A composable abstraction over the retryable transactions for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-transaction_0_6" = callPackage
     ({ mkDerivation, async, base, base-prelude, bytestring
      , bytestring-tree-builder, contravariant, contravariant-extras
      , hasql, mtl, rebase, transformers
@@ -99112,8 +97366,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasty-hamiltonian";
-       version = "1.3.0";
-       sha256 = "0cgvxr4zywnvd7q109qlcrcpcfszj4w5viyjz9g7mafdfay17xqm";
+       version = "1.3.2";
+       sha256 = "17nc33q9vkq13wp5dqrq2vq6bz408ll8h84fg7mapks5w5r9sag6";
        libraryHaskellDepends = [
          base kan-extensions lens mcmc-types mwc-probability pipes primitive
          transformers
@@ -100445,8 +98699,8 @@ self: {
        pname = "heaps";
        version = "0.3.6";
        sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q";
-       revision = "1";
-       editedCabalFile = "0k505k86zwfw1wmj5gr2qab7cq9q26f9nbf9jzfgw9qxwb17j284";
+       revision = "2";
+       editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
@@ -100725,30 +98979,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.12";
-       sha256 = "0z9d0d1f394xf1c6fsi4c0ib3pgn0w3d6iw2h34774bxrmglf5aa";
-       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
-       ];
-       benchmarkHaskellDepends = [ base mtl 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_10_0" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, slave-thread, stm, test-framework
@@ -100771,7 +99001,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
@@ -102602,8 +100831,8 @@ self: {
        pname = "hgmp";
        version = "0.1.1";
        sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "1";
-       editedCabalFile = "14hbr8r0pjgjv2pv9any7yqrvw2qyg7z1fk89d4sh0wd6isvgjqj";
+       revision = "2";
+       editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://code.mathr.co.uk/hgmp";
@@ -102986,29 +101215,6 @@ self: {
      }) {};
 
   "higher-leveldb" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
-     , hspec, leveldb-haskell, lifted-base, monad-control, mtl, process
-     , resourcet, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "higher-leveldb";
-       version = "0.4.0.1";
-       sha256 = "0ia3ssxr414jqvb4gzkaaa4a8d3rd7b395cfh0m2hz2jn6q7z651";
-       libraryHaskellDepends = [
-         base bytestring cereal data-default exceptions leveldb-haskell
-         lifted-base monad-control mtl resourcet transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring cereal hspec leveldb-haskell lifted-base
-         monad-control mtl process resourcet transformers transformers-base
-       ];
-       homepage = "https://github.com/jeremyjh/higher-leveldb";
-       description = "A rich monadic API for working with leveldb databases";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "higher-leveldb_0_5_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
      , hspec, leveldb-haskell, mtl, process, resourcet, transformers
      , transformers-base, unliftio, unliftio-core
@@ -103028,7 +101234,6 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "higherorder" = callPackage
@@ -105367,36 +103572,6 @@ self: {
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
-     , data-fix, deepseq, deriving-compat, parsers, semigroups, tasty
-     , tasty-hunit, tasty-th, text, transformers, trifecta
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "hnix";
-       version = "0.3.4";
-       sha256 = "1wnvbal093c207vr68i0zyrxvmb3yyxdr8p7lbw2yy4ari2hi2gc";
-       revision = "1";
-       editedCabalFile = "01svkjznkz51742k3hcc0ssz5m0kymk53ydrdwg4a24ygvb408iw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq deriving-compat
-         parsers semigroups text transformers trifecta unordered-containers
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq
-       ];
-       testHaskellDepends = [
-         base containers data-fix tasty tasty-hunit tasty-th text
-       ];
-       benchmarkHaskellDepends = [ base containers criterion text ];
-       homepage = "http://github.com/jwiegley/hnix";
-       description = "Haskell implementation of the Nix language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hnix_0_4_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
      , data-fix, deepseq, deriving-compat, parsers, regex-tdfa
      , regex-tdfa-text, semigroups, tasty, tasty-hunit, tasty-th, text
@@ -105423,7 +103598,6 @@ self: {
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -105537,26 +103711,6 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
-     , http-types, microlens, text, unordered-containers, uri-bytestring
-     , uri-bytestring-aeson
-     }:
-     mkDerivation {
-       pname = "hoauth2";
-       version = "1.5.1";
-       sha256 = "1lb76084ha2wkhccgcwvn5ffdsrxsqbvhmlhx9aw9dm39ganggva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-conduit http-types microlens
-         text unordered-containers uri-bytestring uri-bytestring-aeson
-       ];
-       homepage = "https://github.com/freizl/hoauth2";
-       description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hoauth2_1_7_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
      , http-types, microlens, text, unordered-containers, uri-bytestring
      , uri-bytestring-aeson
@@ -105574,7 +103728,6 @@ self: {
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -106475,6 +104628,8 @@ self: {
        pname = "hoopl";
        version = "3.10.2.2";
        sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9";
+       revision = "1";
+       editedCabalFile = "0w34az1mldbvzdywszc4japdksdbdsrb1nw44vjqv3nmz65fn14x";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers filepath mtl parsec test-framework
@@ -106551,40 +104706,6 @@ self: {
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
-    ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
-     , base, base16-bytestring, binary, binary-conduit, bytestring
-     , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
-     , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
-     , http-client-tls, http-types, ixset-typed, lens, monad-loops
-     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers
-     , wl-pprint-extras, wl-pprint-terminfo, yaml
-     }:
-     mkDerivation {
-       pname = "hopenpgp-tools";
-       version = "0.19.5";
-       sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0";
-       revision = "2";
-       editedCabalFile = "1w9ban4w6zm7cknfnlzhgx649xg2j0vsrhqdlnd5g8qzcbbhh0si";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
-         binary-conduit bytestring conduit conduit-extra containers
-         crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
-         http-client http-client-tls http-types ixset-typed lens monad-loops
-         openpgp-asciiarmor optparse-applicative resourcet text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras wl-pprint-terminfo yaml
-       ];
-       executableToolDepends = [ alex happy ];
-       homepage = "http://floss.scru.org/hopenpgp-tools";
-       description = "hOpenPGP-based command-line tools";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hopenpgp-tools_0_20_1" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
@@ -107190,39 +105311,6 @@ self: {
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , HUnit, interpolate, mockery, pretty, QuickCheck, scientific
-     , temporary, text, transformers, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.21.2";
-       sha256 = "1grsr2418z42bcvqnr788n3lpfbscqvvfcnglba9v95nl8lpfm0c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob pretty scientific text transformers
-         unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob pretty scientific text transformers
-         unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob hspec HUnit interpolate mockery
-         pretty QuickCheck scientific temporary text transformers
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/sol/hpack#readme";
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack_0_27_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, interpolate
@@ -107257,6 +105345,43 @@ self: {
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hpack_0_28_1" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
+     , http-client, http-client-tls, http-types, HUnit, interpolate
+     , mockery, pretty, QuickCheck, scientific, template-haskell
+     , temporary, text, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.28.1";
+       sha256 = "0nigj421i8yw1k1aaly9qzwkahjx92w4arpj2a5mwg89v0xfw7pr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types pretty scientific text transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types pretty scientific text transformers unordered-containers
+         vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob hspec http-client http-client-tls
+         http-types HUnit interpolate mockery pretty QuickCheck scientific
+         template-haskell temporary text transformers unordered-containers
+         vector yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -109487,22 +107612,6 @@ self: {
      }) {};
 
   "hscolour" = callPackage
-    ({ mkDerivation, base, containers }:
-     mkDerivation {
-       pname = "hscolour";
-       version = "1.24.2";
-       sha256 = "08ng635m1qylng1khm9nqvfw2wdhljy1q2wi4ly63nfaznx8dysm";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base containers ];
-       executableHaskellDepends = [ base containers ];
-       homepage = "http://code.haskell.org/~malcolm/hscolour/";
-       description = "Colourise Haskell code";
-       license = "LGPL";
-     }) {};
-
-  "hscolour_1_24_4" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
@@ -109516,7 +107625,6 @@ self: {
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscope" = callPackage
@@ -110622,8 +108730,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.4";
-       sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh";
+       version = "2.4.8";
+       sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -110638,15 +108746,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_4_8" = callPackage
+  "hspec_2_5_0" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.8";
-       sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l";
+       version = "2.5.0";
+       sha256 = "16vp3k8bdqvsdhv12srahda3anf1pia7blczh201snib52is9vdb";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -110708,36 +108816,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core" = callPackage
-    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
-     , deepseq, directory, filepath, hspec-expectations, hspec-meta
-     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
-     , silently, temporary, tf-random, time, transformers
-     }:
+  "hspec-contrib_0_5_0" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
-       pname = "hspec-core";
-       version = "2.4.4";
-       sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0";
-       revision = "1";
-       editedCabalFile = "0m4bmclgs7as957wdnq1y4zh49hrwpslgz5m9430myl4dc14r81l";
-       libraryHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv tf-random time transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently temporary tf-random time
-         transformers
-       ];
-       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       pname = "hspec-contrib";
+       version = "0.5.0";
+       sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv";
+       libraryHaskellDepends = [ base hspec-core HUnit ];
+       testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
+       description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core_2_4_8" = callPackage
+  "hspec-core" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, hspec-meta, HUnit
      , process, QuickCheck, quickcheck-io, random, setenv, silently, stm
@@ -110762,6 +108855,33 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hspec-core_2_5_0" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.5.0";
+       sha256 = "1p88sxarrpfzic4h37n9crpvmklisv514cm0v6fxmk1f2jvf3rgj";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110785,22 +108905,6 @@ self: {
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.4.4";
-       sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [ base directory filepath hspec-meta ];
-       homepage = "http://hspec.github.io/";
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_4_8" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
@@ -110817,6 +108921,25 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hspec-discover_2_5_0" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.5.0";
+       sha256 = "1r91g9hqdn815i86hsrv5bagv76rhq4n0avkmhkh670kkryc0iry";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110926,28 +109049,6 @@ self: {
      }) {};
 
   "hspec-golden-aeson" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
-     , random, silently, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-golden-aeson";
-       version = "0.4.0.0";
-       sha256 = "03gsw9jamkjwj5vhlhg9xz7214d71py94qx0daym7gjiq4zpw1gk";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath hspec
-         QuickCheck quickcheck-arbitrary-adt random transformers
-       ];
-       testHaskellDepends = [
-         aeson base directory hspec hspec-core QuickCheck
-         quickcheck-arbitrary-adt silently transformers
-       ];
-       homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
-       description = "Use tests to monitor changes in Aeson serialization";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-golden-aeson_0_5_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
      , random, silently, transformers
@@ -110967,7 +109068,6 @@ self: {
        homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
        description = "Use tests to monitor changes in Aeson serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-hashable" = callPackage
@@ -111195,23 +109295,6 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
-     mkDerivation {
-       pname = "hspec-smallcheck";
-       version = "0.4.2";
-       sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds";
-       revision = "1";
-       editedCabalFile = "19fp4xandn3jn1hzs1bkjbncyv74908wzcqkvk7xf0dfmm0wpmqw";
-       libraryHaskellDepends = [ base hspec-core smallcheck ];
-       testHaskellDepends = [
-         base hspec hspec-core QuickCheck smallcheck
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-smallcheck_0_5_0" = callPackage
     ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit
      , QuickCheck, smallcheck
      }:
@@ -111228,6 +109311,25 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hspec-smallcheck_0_5_1" = callPackage
+    ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit
+     , QuickCheck, smallcheck
+     }:
+     mkDerivation {
+       pname = "hspec-smallcheck";
+       version = "0.5.1";
+       sha256 = "11202q3ixqmmi3nx79l82jha5kdnpajvv1rd1s6rwh0560i8vj2v";
+       libraryHaskellDepends = [
+         base call-stack hspec-core HUnit smallcheck
+       ];
+       testHaskellDepends = [
+         base call-stack hspec hspec-core HUnit 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;
      }) {};
 
@@ -112403,7 +110505,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "html-conduit" = callPackage
+  "html-conduit_1_2_1_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, hspec, HUnit, resourcet, tagstream-conduit, text
      , transformers, xml-conduit, xml-types
@@ -112422,9 +110524,10 @@ self: {
        homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "html-conduit_1_3_0" = callPackage
+  "html-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, hspec
      , HUnit, resourcet, tagstream-conduit, text, transformers
      , xml-conduit, xml-types
@@ -112443,7 +110546,6 @@ self: {
        homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-email-validate" = callPackage
@@ -112837,17 +110939,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_3_8" = callPackage
+  "http-api-data_0_3_8_1" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
      , Cabal, cabal-doctest, containers, directory, doctest, filepath
      , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
-     , unordered-containers, uri-bytestring, uuid, uuid-types
+     , unordered-containers, uri-bytestring, uuid-types
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.3.8";
-       sha256 = "0m1q3zl2bjayafr8b9ihizk0mg8awga4l7gg1p1khy3yyzngl5wv";
+       version = "0.3.8.1";
+       sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base bytestring containers hashable
@@ -112856,7 +110958,7 @@ self: {
        ];
        testHaskellDepends = [
          base bytestring directory doctest filepath hspec HUnit QuickCheck
-         quickcheck-instances text time unordered-containers uuid
+         quickcheck-instances text time unordered-containers uuid-types
        ];
        testToolDepends = [ hspec-discover ];
        homepage = "http://github.com/fizruk/http-api-data";
@@ -112907,6 +111009,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client_0_5_11" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, deepseq, directory
+     , exceptions, filepath, ghc-prim, hspec, http-types, memory
+     , mime-types, monad-control, network, network-uri, random, stm
+     , streaming-commons, text, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.5.11";
+       sha256 = "0mjm2d77i82jazq0602v34m5xiyxc15680zx6ay9ncspr7rhd6wp";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring case-insensitive containers
+         cookie deepseq exceptions filepath ghc-prim http-types memory
+         mime-types network network-uri random stm streaming-commons text
+         time transformers
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring case-insensitive containers
+         deepseq directory hspec http-types monad-control network
+         network-uri streaming-commons text time transformers zlib
+       ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "An HTTP client engine";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-auth" = callPackage
     ({ mkDerivation, base, base64-string, blaze-builder, bytestring
      , case-insensitive, conduit, crypto-conduit, http-client
@@ -113100,7 +111231,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-conduit" = callPackage
+  "http-conduit_2_2_4" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, exceptions, hspec, http-client
@@ -113128,9 +111259,10 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-conduit_2_3_0" = callPackage
+  "http-conduit" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, hspec, http-client, http-client-tls
@@ -113157,7 +111289,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -113578,8 +111709,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-reverse-proxy";
-       version = "0.4.5";
-       sha256 = "0v1f1z3gmc51sbxmxhnp4sspzj6mdm0ihl5x30218p1ynz9ssxjn";
+       version = "0.5.0";
+       sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i";
        libraryHaskellDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
@@ -113730,27 +111861,6 @@ self: {
      }) {};
 
   "http-types" = callPackage
-    ({ mkDerivation, array, base, blaze-builder, bytestring
-     , case-insensitive, doctest, hspec, QuickCheck
-     , quickcheck-instances, text
-     }:
-     mkDerivation {
-       pname = "http-types";
-       version = "0.9.1";
-       sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive text
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring doctest hspec QuickCheck
-         quickcheck-instances text
-       ];
-       homepage = "https://github.com/aristidb/http-types";
-       description = "Generic HTTP types for Haskell (for both client and server code)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-types_0_12_1" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
      , hspec, QuickCheck, quickcheck-instances, text
      }:
@@ -113767,7 +111877,6 @@ self: {
        homepage = "https://github.com/aristidb/http-types";
        description = "Generic HTTP types for Haskell (for both client and server code)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-wget" = callPackage
@@ -114198,18 +112307,6 @@ self: {
      }) {};
 
   "hunit-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
-       version = "0.7.1.1";
-       sha256 = "1b9c4v82fzrl88bg13q36smicndi0l7bp73mxniavbnsmccb22yy";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hunit-dejafu_1_1_0_2" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
@@ -114219,7 +112316,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-gui" = callPackage
@@ -114855,8 +112951,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.3.3";
-       sha256 = "14g0mqwj6fr8sdq62sljzih0a9km1hxqm1zqmr9jv58znmj9f2x1";
+       version = "2.4.0";
+       sha256 = "1c7q05wrwwk2mqr09r14q2c38k5fdpn8phhdzxby0nj1q28azmmk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114879,8 +112975,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "2.1.0";
-       sha256 = "1ncxagsmil3cxmsrw2ywzcpfhhlkaz87mfhzkww7j93jcwacbph2";
+       version = "2.4.0";
+       sha256 = "0xzsdslkc069wccqihd50zxvm9jx6p5izwf4v44dizn42lfymm75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116220,8 +114316,8 @@ self: {
        pname = "hyphenation";
        version = "0.7.1";
        sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52";
-       revision = "1";
-       editedCabalFile = "04kn5pdb1f6yz959qjv3bcbqi3zs88fn6rwxv45m95lx6pzywhln";
+       revision = "2";
+       editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -118585,33 +116681,6 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , containers, foldl, http-client, http-types, HUnit, lens, mtl
-     , network, optional-args, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text, time, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
-       version = "1.2.2.3";
-       sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
-         tasty-th text vector
-       ];
-       homepage = "https://github.com/maoe/influxdb-haskell";
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_3_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -118637,6 +116706,34 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "influxdb_1_5_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, clock, containers, doctest, foldl, http-client
+     , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
+     , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     , template-haskell, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "influxdb";
+       version = "1.5.0";
+       sha256 = "008ry9znrjjn3yhc5831gc4jgnxnwr1yibzm72lmngqywhv0mi9w";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit
+         tasty-quickcheck tasty-th template-haskell text vector
+       ];
+       homepage = "https://github.com/maoe/influxdb-haskell";
+       description = "Haskell client library for InfluxDB";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -118847,25 +116944,6 @@ self: {
      }) {};
 
   "inline-java" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
-     , hspec, jni, jvm, language-java, mtl, process, template-haskell
-     , temporary, text
-     }:
-     mkDerivation {
-       pname = "inline-java";
-       version = "0.7.2";
-       sha256 = "0hfjgkv8shi3zhjx7jkcwqyglrh5hrc11zf58ykhwxjhzhj4f05b";
-       libraryHaskellDepends = [
-         base bytestring Cabal directory filepath ghc jni jvm language-java
-         mtl process template-haskell temporary text
-       ];
-       testHaskellDepends = [ base hspec jni jvm text ];
-       homepage = "http://github.com/tweag/inline-java#readme";
-       description = "Java interop via inline Java code in Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "inline-java_0_8_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
      , hspec, jni, jvm, language-java, mtl, process, template-haskell
      , temporary, text
@@ -118882,7 +116960,6 @@ self: {
        homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-r" = callPackage
@@ -119012,23 +117089,6 @@ self: {
      }) {};
 
   "inspection-testing" = callPackage
-    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "inspection-testing";
-       version = "0.1.2";
-       sha256 = "1si89b5scc7qw88shmyzi1abbvgl7fv16yw731n5niw4cqps329j";
-       libraryHaskellDepends = [
-         base containers ghc mtl template-haskell transformers
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/nomeata/inspection-testing";
-       description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inspection-testing_0_2_0_1" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, template-haskell
      , transformers
      }:
@@ -119043,7 +117103,6 @@ self: {
        homepage = "https://github.com/nomeata/inspection-testing";
        description = "GHC plugin to do inspection testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -119447,8 +117506,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.28";
-       sha256 = "0c9hlbqjisb8y96s2rhgklc93g0jmawq3v80ksdvg9asdyfsmafs";
+       version = "0.1.30";
+       sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -119493,24 +117552,6 @@ self: {
      }) {};
 
   "interpolate" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
-     , QuickCheck, quickcheck-instances, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "interpolate";
-       version = "0.1.1";
-       sha256 = "120ygxs8vfsjcc7xr9v8p8bcyqidhlg1rd568ym2bsl1nhx4h22b";
-       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
-       testHaskellDepends = [
-         base bytestring haskell-src-meta hspec QuickCheck
-         quickcheck-instances template-haskell text
-       ];
-       homepage = "https://github.com/sol/interpolate#readme";
-       description = "String interpolation done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "interpolate_0_2_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta
      , hspec, QuickCheck, quickcheck-instances, template-haskell, text
      }:
@@ -119526,7 +117567,6 @@ self: {
        homepage = "https://github.com/sol/interpolate#readme";
        description = "String interpolation done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolatedstring-perl6" = callPackage
@@ -119648,8 +117688,8 @@ self: {
        pname = "intervals";
        version = "0.8.1";
        sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
-       revision = "2";
-       editedCabalFile = "0ia6pig8g2hg1nr0p46s3npv0gvd2cn9mkgm232slwynyb63qjkn";
+       revision = "3";
+       editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [
@@ -120030,6 +118070,8 @@ self: {
        pname = "io-streams-haproxy";
        version = "1.0.0.2";
        sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
+       revision = "1";
+       editedCabalFile = "0mm20k4d6xcjjghwkgbfap9n35nixzvk3y0n52f88cq0rfrn1y0r";
        libraryHaskellDepends = [
          attoparsec base bytestring io-streams network transformers
        ];
@@ -120341,6 +118383,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_3" = callPackage
+    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+     , network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.3";
+       sha256 = "0zhfn0rxwakspx1b9pxcqb9vbi8lr786hhb5s9j15xiszkl8hf4s";
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder containers doctest hspec network QuickCheck
+         safe
+       ];
+       homepage = "http://www.mew.org/~kazu/proj/iproute/";
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -120438,27 +118501,6 @@ self: {
      }) {};
 
   "irc-client" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, containers
-     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
-     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
-     , text, time, tls, transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-client";
-       version = "1.0.1.1";
-       sha256 = "1d5xy2q5pkyn4i6d9myw27wr75xci05s446l23kdjli2ldh0g4nx";
-       libraryHaskellDepends = [
-         base bytestring conduit connection containers contravariant
-         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
-         profunctors stm stm-chans text time tls transformers x509
-         x509-store x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-client";
-       description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-client_1_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, containers
      , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
      , network-conduit-tls, old-locale, profunctors, stm, stm-chans
@@ -120477,7 +118519,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -120492,25 +118533,6 @@ self: {
      }) {};
 
   "irc-conduit" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
-     , time, tls, transformers, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-conduit";
-       version = "0.2.2.5";
-       sha256 = "1f9dvs4z15wym2a7dpm9h7m3ffpj8d089k6q28my6yx10mi93ksj";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra connection irc irc-ctcp
-         network-conduit-tls profunctors text time tls transformers
-         x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-conduit";
-       description = "Streaming IRC message library using conduits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-conduit_0_3_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
      , time, tls, transformers, x509-validation
@@ -120527,7 +118549,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-conduit";
        description = "Streaming IRC message library using conduits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-core" = callPackage
@@ -122301,25 +120322,6 @@ self: {
      }) {};
 
   "jni" = callPackage
-    ({ mkDerivation, base, bytestring, choice, constraints, containers
-     , cpphs, deepseq, inline-c, jdk, singletons
-     }:
-     mkDerivation {
-       pname = "jni";
-       version = "0.5.1";
-       sha256 = "0lrgj5dxhn7amzjw7gsqxg0gh91nxh1j4vmb4j2f5r8y3m8nwq4a";
-       libraryHaskellDepends = [
-         base bytestring choice constraints containers deepseq inline-c
-         singletons
-       ];
-       librarySystemDepends = [ jdk ];
-       libraryToolDepends = [ cpphs ];
-       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
-       description = "Complete JNI raw bindings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) jdk;};
-
-  "jni_0_6_0" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, containers
      , cpphs, deepseq, inline-c, jdk, singletons
      }:
@@ -122336,7 +120338,6 @@ self: {
        homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -122534,21 +120535,6 @@ self: {
      }) {};
 
   "js-jquery" = callPackage
-    ({ mkDerivation, base, HTTP }:
-     mkDerivation {
-       pname = "js-jquery";
-       version = "3.2.1";
-       sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base HTTP ];
-       doCheck = false;
-       homepage = "https://github.com/ndmitchell/js-jquery#readme";
-       description = "Obtain minified jQuery code";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "js-jquery_3_3_1" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -122561,7 +120547,6 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle" = callPackage
@@ -122854,8 +120839,8 @@ self: {
        pname = "json-autotype";
        version = "1.0.18";
        sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h";
-       revision = "1";
-       editedCabalFile = "0f67frvi5jsn47w02kqi834mkjy4kz451fic5m4i24lyykw19kvm";
+       revision = "2";
+       editedCabalFile = "1b7q8af32zpsrq32m34d4h4245ww19kxfqjrbq6s2mfx5qd5s5y6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123316,27 +121301,6 @@ self: {
      }) {};
 
   "json-stream" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, hspec
-     , QuickCheck, quickcheck-unicode, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "json-stream";
-       version = "0.4.1.5";
-       sha256 = "0h5g76grhi60idvmxdhydpz5f3198bydwywfyv9pghlmbrzjnkih";
-       libraryHaskellDepends = [
-         aeson base bytestring scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
-         scientific text unordered-containers vector
-       ];
-       homepage = "https://github.com/ondrap/json-stream";
-       description = "Incremental applicative JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json-stream_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, hspec
      , QuickCheck, quickcheck-unicode, scientific, text
      , unordered-containers, vector
@@ -123355,7 +121319,6 @@ self: {
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-togo" = callPackage
@@ -123716,8 +121679,8 @@ self: {
      }:
      mkDerivation {
        pname = "judge";
-       version = "0.1.2.0";
-       sha256 = "14lrqrzw70cjzz0skihh9w9kfgah6rb7023dbgmcqbx0m8xjiiaw";
+       version = "0.1.3.0";
+       sha256 = "02lyd1ql4qj5da0p3mhpkh0gq8lrc6xmz3yg5hnc8mk5d3a381hw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -123731,7 +121694,7 @@ self: {
          optparse-applicative text unordered-containers yaml
        ];
        homepage = "https://github.com/slakkenhuis/judge#readme";
-       description = "Tableau-based theorem prover";
+       description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -123851,23 +121814,6 @@ self: {
      }) {};
 
   "justified-containers" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck
-     , roles, should-not-typecheck
-     }:
-     mkDerivation {
-       pname = "justified-containers";
-       version = "0.2.0.1";
-       sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2";
-       libraryHaskellDepends = [ base containers roles ];
-       testHaskellDepends = [
-         base containers ghc-prim hspec QuickCheck should-not-typecheck
-       ];
-       homepage = "https://github.com/matt-noonan/justified-containers";
-       description = "Keyed container types with type-checked proofs of key presence";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "justified-containers_0_3_0_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck
      , roles, should-not-typecheck
      }:
@@ -123882,7 +121828,6 @@ self: {
        homepage = "https://github.com/matt-noonan/justified-containers";
        description = "Keyed container types with type-checked proofs of key presence";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm" = callPackage
@@ -124231,24 +122176,6 @@ self: {
      }) {};
 
   "kan-extensions" = callPackage
-    ({ mkDerivation, adjunctions, array, base, comonad, containers
-     , contravariant, distributive, fail, free, mtl, semigroupoids
-     , tagged, transformers
-     }:
-     mkDerivation {
-       pname = "kan-extensions";
-       version = "5.0.2";
-       sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw";
-       libraryHaskellDepends = [
-         adjunctions array base comonad containers contravariant
-         distributive fail free mtl semigroupoids tagged transformers
-       ];
-       homepage = "http://github.com/ekmett/kan-extensions/";
-       description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "kan-extensions_5_1" = callPackage
     ({ mkDerivation, adjunctions, array, base, comonad, containers
      , contravariant, distributive, fail, free, mtl, profunctors
      , semigroupoids, tagged, transformers, transformers-compat
@@ -124267,7 +122194,6 @@ self: {
        homepage = "http://github.com/ekmett/kan-extensions/";
        description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kangaroo" = callPackage
@@ -124284,20 +122210,6 @@ self: {
      }) {};
 
   "kanji" = callPackage
-    ({ mkDerivation, base, bytestring, containers, microlens, text }:
-     mkDerivation {
-       pname = "kanji";
-       version = "3.0.2";
-       sha256 = "1kgq8ns8mig93rf86wskay4kjp1lgdwp3xywld20mxdp4zwr5a6b";
-       libraryHaskellDepends = [
-         base bytestring containers microlens text
-       ];
-       homepage = "https://github.com/fosskers/nanq";
-       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "kanji_3_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
      , microlens-platform, optparse-applicative, protolude, tasty
@@ -124325,6 +122237,34 @@ self: {
        homepage = "https://github.com/fosskers/kanji";
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "kanji_3_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
+     , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
+     , microlens-platform, optparse-applicative, protolude, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "kanji";
+       version = "3.2.1";
+       sha256 = "1x9mrjsj73kwk0y7m1j9n9d4pbcrjg066njpasb1vi69w6h2flbs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers deepseq hashable text
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base containers microlens microlens-aeson
+         microlens-platform optparse-applicative protolude text
+       ];
+       testHaskellDepends = [
+         aeson base containers HUnit-approx tasty tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [ aeson base containers criterion text ];
+       homepage = "https://github.com/fosskers/kanji";
+       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -124501,8 +122441,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.3.0";
-       sha256 = "1v6gyk2x14nvzz0g560r7yh9wsp8r2imqgiq46m2nmx70ksfcx2b";
+       version = "0.5.4.0";
+       sha256 = "1144krzz4wvwhdh1b2673302xn7svz2b6kjfvq9728f1bzkkspad";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -124575,6 +122515,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "katip-scalyr-scribe" = callPackage
+    ({ mkDerivation, aeson, base, katip, scientific, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "katip-scalyr-scribe";
+       version = "0.1.0.1";
+       sha256 = "0pbq4mawa0aq2gzzhkrk9avv0pv20hjhq2qv0lvs0wyhv5jnmkqr";
+       libraryHaskellDepends = [
+         aeson base katip scientific text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base katip scientific text unordered-containers
+       ];
+       homepage = "https://github.com/reactormonk/katip-scalyr-scribe#readme";
+       description = "A katip scribe for logging to json";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "katip-syslog" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hsyslog, katip
      , string-conv, text
@@ -125309,26 +123268,6 @@ self: {
      }) {};
 
   "keys" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, free, hashable
-     , semigroupoids, semigroups, transformers, transformers-compat
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "keys";
-       version = "3.11";
-       sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc";
-       revision = "1";
-       editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i";
-       libraryHaskellDepends = [
-         array base comonad containers free hashable semigroupoids
-         semigroups transformers transformers-compat unordered-containers
-       ];
-       homepage = "http://github.com/ekmett/keys/";
-       description = "Keyed functors and containers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "keys_3_12" = callPackage
     ({ mkDerivation, array, base, comonad, containers, free, hashable
      , semigroupoids, semigroups, tagged, transformers
      , transformers-compat, unordered-containers
@@ -125347,7 +123286,6 @@ self: {
        homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keysafe" = callPackage
@@ -126150,19 +124088,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
-       version = "0.4.7";
-       sha256 = "026w7wmz71g9796mx6mdn3s1nxrds631kacn423zdvchridm0398";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_1" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
@@ -126173,7 +124098,6 @@ self: {
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -127239,29 +125163,30 @@ self: {
   "language-docker" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , split, template-haskell, text, th-lift, th-lift-instances
-     , transformers, unordered-containers, yaml
+     , semigroups, split, template-haskell, text, th-lift
+     , th-lift-instances, time, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "1.0.0";
-       sha256 = "023gahxcy27rg03fyk87h4yirba2c23qv4fww9fwzi4f4m8inf81";
+       version = "2.0.1";
+       sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath free Glob mtl parsec
-         pretty split template-haskell text th-lift th-lift-instances
-         transformers unordered-containers yaml
+         pretty semigroups split template-haskell text th-lift
+         th-lift-instances time transformers unordered-containers yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath free Glob hspec HUnit mtl
-         parsec pretty process QuickCheck split template-haskell text
-         th-lift th-lift-instances transformers unordered-containers yaml
+         parsec pretty process QuickCheck semigroups split template-haskell
+         text th-lift th-lift-instances time transformers
+         unordered-containers yaml
        ];
        homepage = "https://github.com/hadolint/language-docker#readme";
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_3_0_0" = callPackage
+  "language-docker_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
      , semigroups, split, template-haskell, text, th-lift
@@ -127269,8 +125194,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "3.0.0";
-       sha256 = "0bxj7ipv6b07yjyz4a03j3whayb6rln5ymj1n06kfnbpl0lzcmyr";
+       version = "3.0.1";
+       sha256 = "1bs9ghajxz0a1jmzarb7fzn4z2m8qmcyydsf93rqlzxc8y8fhsp2";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath free Glob mtl parsec
          pretty semigroups split template-haskell text th-lift
@@ -128123,24 +126048,6 @@ self: {
      }) {};
 
   "lapack-carray" = callPackage
-    ({ mkDerivation, base, carray, lapack-ffi, netlib-carray
-     , netlib-ffi, storable-complex, transformers
-     }:
-     mkDerivation {
-       pname = "lapack-carray";
-       version = "0.0";
-       sha256 = "1903wa7hv6mi8zrz99fjlbwk4dvn2q2sshf7nazlyg9dz9gg861l";
-       libraryHaskellDepends = [
-         base carray lapack-ffi netlib-carray netlib-ffi storable-complex
-         transformers
-       ];
-       homepage = "http://hub.darcs.net/thielema/lapack-carray/";
-       description = "Auto-generated interface to Fortran LAPACK via CArrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "lapack-carray_0_0_1" = callPackage
     ({ mkDerivation, base, carray, lapack-ffi, netlib-carray
      , netlib-ffi, storable-complex, transformers
      }:
@@ -128159,20 +126066,6 @@ self: {
      }) {};
 
   "lapack-ffi" = callPackage
-    ({ mkDerivation, base, liblapack, netlib-ffi }:
-     mkDerivation {
-       pname = "lapack-ffi";
-       version = "0.0";
-       sha256 = "1r2625li76ky8gxl07vzqh38xzrjazzf3fxzhhbl2nkjcx9bmv83";
-       libraryHaskellDepends = [ base netlib-ffi ];
-       libraryPkgconfigDepends = [ liblapack ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi/";
-       description = "Auto-generated interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) liblapack;};
-
-  "lapack-ffi_0_0_1" = callPackage
     ({ mkDerivation, base, liblapack, netlib-ffi }:
      mkDerivation {
        pname = "lapack-ffi";
@@ -128187,29 +126080,6 @@ self: {
      }) {inherit (pkgs) liblapack;};
 
   "lapack-ffi-tools" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, containers
-     , explicit-exception, filepath, non-empty, optparse-applicative
-     , parsec, pathtype, transformers, unordered-containers, utility-ht
-     , vector
-     }:
-     mkDerivation {
-       pname = "lapack-ffi-tools";
-       version = "0.0.0.1";
-       sha256 = "091799j96gc1g9dq6hr3swpq4w4s0p8i5256308lwrqls1hlggs8";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         base bytestring cassava containers explicit-exception filepath
-         non-empty optparse-applicative parsec pathtype transformers
-         unordered-containers utility-ht vector
-       ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
-       description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lapack-ffi-tools_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers
      , explicit-exception, filepath, non-empty, optparse-applicative
      , parsec, pathtype, transformers, unordered-containers, utility-ht
@@ -128230,7 +126100,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
        description = "Generator for Haskell interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "large-hashable" = callPackage
@@ -128427,33 +126296,6 @@ self: {
      }) {};
 
   "lattices" = callPackage
-    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
-     , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
-     , tasty-quickcheck, transformers, universe-base
-     , universe-instances-base, universe-reverse-instances
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "lattices";
-       version = "1.7";
-       sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc";
-       revision = "1";
-       editedCabalFile = "1nsc77nnh8cvfw8f58g0w5mjamy4iivkadyyaj3yzawfr8jbxi53";
-       libraryHaskellDepends = [
-         base base-compat containers deepseq hashable semigroupoids tagged
-         universe-base universe-reverse-instances unordered-containers
-       ];
-       testHaskellDepends = [
-         base base-compat containers QuickCheck quickcheck-instances tasty
-         tasty-quickcheck transformers universe-instances-base
-         unordered-containers
-       ];
-       homepage = "http://github.com/phadej/lattices/";
-       description = "Fine-grained library for constructing and manipulating lattices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lattices_1_7_1" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
      , tasty-quickcheck, transformers, universe-base
@@ -128478,7 +126320,6 @@ self: {
        homepage = "http://github.com/phadej/lattices/";
        description = "Fine-grained library for constructing and manipulating lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "launchpad-control" = callPackage
@@ -129254,47 +127095,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, call-stack, comonad, containers
-     , contravariant, criterion, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.15.4";
-       sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring call-stack comonad
-         containers contravariant distributive exceptions filepath free
-         ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids semigroups tagged template-haskell text
-         th-abstraction transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
-         simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_16" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -129310,8 +127110,8 @@ self: {
        pname = "lens";
        version = "4.16";
        sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z";
-       revision = "3";
-       editedCabalFile = "0zkjys731g07brc4ky29245jrdx1r8l468k5fh9hlwd0dx9d4996";
+       revision = "4";
+       editedCabalFile = "18nipajdyqz5vpqx0mrl5c1a97jb8wm2skq57jashgygq5h8y7g4";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -129335,7 +127135,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -129381,8 +127180,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.2";
        sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
-       revision = "3";
-       editedCabalFile = "160zpz85p8qfg6scqp2cbg3w9lbv89hkxcvmyk6la34v9d439lm0";
+       revision = "4";
+       editedCabalFile = "1gas30rarvr8337a06z089m3dp5kvdcvhyac2mrp5pjlfp4zz226";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
@@ -129674,8 +127473,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.9.1";
-       sha256 = "10a0y0n62n8indkhapscws3lj95riaxxdq04bcfah8ljvqy1b61r";
+       version = "1.0.10.0";
+       sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129693,7 +127492,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "lentil_1_0_10_0" = callPackage
+  "lentil_1_0_10_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
@@ -129701,8 +127500,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.10.0";
-       sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7";
+       version = "1.0.10.1";
+       sha256 = "04hr5q48da5clfvypwb9fii6si19kda12ncyx10rp2fni50sshrl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130366,28 +128165,6 @@ self: {
      }) {};
 
   "libmpd" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, filepath, hspec, mtl, network, old-locale
-     , QuickCheck, text, time, unix, utf8-string
-     }:
-     mkDerivation {
-       pname = "libmpd";
-       version = "0.9.0.7";
-       sha256 = "08i6v4i8xbv0vv4w0yqqh2pp7z0fb5dc9chgwyclkrvy480g5w0p";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default-class filepath
-         mtl network old-locale text time utf8-string
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers data-default-class filepath
-         hspec mtl network old-locale QuickCheck text time unix utf8-string
-       ];
-       homepage = "http://github.com/vimus/libmpd-haskell#readme";
-       description = "An MPD client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "libmpd_0_9_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, filepath, hspec, mtl, network, old-locale
      , QuickCheck, text, time, unix, utf8-string
@@ -130407,7 +128184,6 @@ self: {
        homepage = "http://github.com/vimus/libmpd-haskell#readme";
        description = "An MPD client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -130924,6 +128700,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-base_0_2_3_12" = callPackage
+    ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
+     , test-framework, test-framework-hunit, transformers
+     , transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-base";
+       version = "0.2.3.12";
+       sha256 = "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61";
+       libraryHaskellDepends = [ base monad-control transformers-base ];
+       testHaskellDepends = [
+         base HUnit monad-control test-framework test-framework-hunit
+         transformers transformers-base transformers-compat
+       ];
+       benchmarkHaskellDepends = [
+         base criterion monad-control monad-peel transformers
+       ];
+       homepage = "https://github.com/basvandijk/lifted-base";
+       description = "lifted IO operations from the base library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-protolude" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm
@@ -131269,8 +129068,8 @@ self: {
        pname = "linear";
        version = "1.20.7";
        sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b";
-       revision = "2";
-       editedCabalFile = "1w5194k2sqr508942xr9acfzk80avc4bwax347blw4js4vl5adwn";
+       revision = "3";
+       editedCabalFile = "0y7gjzrwhfsbr4vh10qkky563jiwr60cp0yx019adabvx6sf7yil";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -131295,8 +129094,8 @@ self: {
        pname = "linear-accelerate";
        version = "0.5.0.1";
        sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l";
-       revision = "1";
-       editedCabalFile = "1r0h6mk2ai11f9grcwfbq4a5j7s9zn32m4finrigar4q22xkxf2j";
+       revision = "2";
+       editedCabalFile = "0b7amkafmf82q6a8q49q6n3v33xs16n5h6y005jva5bhpxkmn26w";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
@@ -133440,8 +131239,8 @@ self: {
        pname = "log-domain";
        version = "0.12";
        sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
-       revision = "1";
-       editedCabalFile = "0p2cmr9lpbakh4ml4mxgh4fhqmxdk78xpcnqblag1cllx9jrmk5b";
+       revision = "2";
+       editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
@@ -133542,38 +131341,6 @@ self: {
      }) {};
 
   "log-warper" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, async, base, containers
-     , data-default, deepseq, directory, filepath, fmt, hspec, HUnit
-     , markdown-unlit, microlens-mtl, microlens-platform, mmorph
-     , monad-control, monad-loops, mtl, QuickCheck, text, time
-     , transformers, transformers-base, universum, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "log-warper";
-       version = "1.8.3";
-       sha256 = "1awblvxh6cncwlqacxb1wq4s77x79ncrz6dl81wgrbjjifwpf0xz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base containers deepseq directory filepath fmt
-         microlens-platform mmorph monad-control monad-loops mtl text time
-         transformers transformers-base universum unix unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         base markdown-unlit mtl text universum yaml
-       ];
-       testHaskellDepends = [
-         async base data-default directory filepath hspec HUnit
-         microlens-mtl QuickCheck universum unordered-containers
-       ];
-       homepage = "https://github.com/serokell/log-warper";
-       description = "Flexible, configurable, monadic and pretty logging";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "log-warper_1_8_10_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, containers
      , data-default, deepseq, directory, filepath, fmt, hspec
      , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens
@@ -133606,7 +131373,6 @@ self: {
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -134540,6 +132306,8 @@ self: {
        pname = "lrucaching";
        version = "0.3.3";
        sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
+       revision = "1";
+       editedCabalFile = "0axg26s9gssg3ig613rnqj5v4aczki4kgyqmnd208kljkawq6c7k";
        libraryHaskellDepends = [
          base base-compat deepseq hashable psqueues vector
        ];
@@ -134824,6 +132592,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid_2_9_10" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
+     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
+     , mtl, parsec, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lucid";
+       version = "2.9.10";
+       sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers hashable mmorph mtl text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text transformers
+       ];
+       homepage = "https://github.com/chrisdone/lucid";
+       description = "Clear to write, read and edit DSL for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucid-colonnade" = callPackage
     ({ mkDerivation, base, colonnade, lucid, text }:
      mkDerivation {
@@ -135233,8 +133026,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
-       revision = "1";
-       editedCabalFile = "0y89blvpswvji1ya7h67gcx322iqi93di3jmwx47l6mic3ki4r2d";
+       revision = "2";
+       editedCabalFile = "0c6jkr22w797jvmad9vki2mm7cdzxpqqxkpv836fh5m248nnc618";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -135440,8 +133233,8 @@ self: {
        pname = "machines";
        version = "0.6.3";
        sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz";
-       revision = "5";
-       editedCabalFile = "1w9z6j74vdsaiqr5jhw4zvgl2n3l6fw3x1sgvf1yysmxkx9hhhdn";
+       revision = "6";
+       editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base comonad containers distributive mtl pointed
@@ -135742,37 +133535,6 @@ self: {
      }) {};
 
   "magicbane" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude
-     , conduit, conduit-combinators, data-default, data-has, ekg-core
-     , ekg-wai, envy, errors, fast-logger, http-api-data, http-client
-     , http-client-tls, http-conduit, http-date, http-link-header
-     , http-media, http-types, lifted-async, mime-types, monad-control
-     , monad-logger, monad-metrics, mtl, network, network-uri
-     , raw-strings-qq, refined, servant, servant-server, split
-     , string-conversions, text, transformers, unordered-containers, wai
-     , wai-cli, wai-middleware-metrics
-     }:
-     mkDerivation {
-       pname = "magicbane";
-       version = "0.1.4";
-       sha256 = "1zfj188iw6g0ym88p69wrf5avbipjxvijklphki5bj3rc7h8cyx0";
-       libraryHaskellDepends = [
-         aeson aeson-qq attoparsec base classy-prelude conduit
-         conduit-combinators data-default data-has ekg-core ekg-wai envy
-         errors fast-logger http-api-data http-client http-client-tls
-         http-conduit http-date http-link-header http-media http-types
-         lifted-async mime-types monad-control monad-logger monad-metrics
-         mtl network network-uri raw-strings-qq refined servant
-         servant-server split string-conversions text transformers
-         unordered-containers wai wai-cli wai-middleware-metrics
-       ];
-       homepage = "https://github.com/myfreeweb/magicbane#readme";
-       description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "magicbane_0_2_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, async, attoparsec, base
      , bytestring, conduit, conduit-combinators, data-default, data-has
      , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data
@@ -136520,30 +134282,6 @@ self: {
      }) {};
 
   "mandrill" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
-     , bytestring, containers, email-validate, http-client
-     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
-     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "mandrill";
-       version = "0.5.3.2";
-       sha256 = "1jzlfi7b4djkwm0vx9ii55db0jf4v8av3idkgg8x3ix95pvps397";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-html bytestring containers
-         email-validate http-client http-client-tls http-types lens mtl
-         old-locale QuickCheck text time unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mandrill_0_5_3_3" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -136565,7 +134303,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -136804,6 +134541,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "markdown_0_1_17" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , call-stack, conduit, conduit-extra, containers, data-default
+     , directory, filepath, hspec, text, transformers, xml-conduit
+     , xml-types, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "markdown";
+       version = "0.1.17";
+       sha256 = "11bcbhrlfddjlifrab46qywbrabxcf8hg1zp26l17dlxs3nm681w";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup conduit conduit-extra
+         containers data-default text transformers xml-conduit xml-types
+         xss-sanitize
+       ];
+       testHaskellDepends = [
+         base blaze-html call-stack conduit conduit-extra containers
+         directory filepath hspec text transformers
+       ];
+       homepage = "https://github.com/snoyberg/markdown";
+       description = "Convert Markdown to HTML, with XSS protection";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "markdown-kate" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html
      , conduit, containers, data-default, highlighting-kate, hspec
@@ -136840,27 +134602,6 @@ self: {
      }) {};
 
   "markdown-unlit" = callPackage
-    ({ mkDerivation, base, base-compat, directory, hspec, QuickCheck
-     , silently, stringbuilder, temporary
-     }:
-     mkDerivation {
-       pname = "markdown-unlit";
-       version = "0.4.1";
-       sha256 = "00q9igbplavnrjhg0fjfdg30pnmw9gsrnsk9l3hhp5dmi1lxhf3l";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base base-compat ];
-       executableHaskellDepends = [ base base-compat ];
-       testHaskellDepends = [
-         base base-compat directory hspec QuickCheck silently stringbuilder
-         temporary
-       ];
-       homepage = "https://github.com/sol/markdown-unlit#readme";
-       description = "Literate Haskell support for Markdown";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "markdown-unlit_0_5_0" = callPackage
     ({ mkDerivation, base, base-compat, directory, hspec, QuickCheck
      , silently, stringbuilder, temporary
      }:
@@ -136879,7 +134620,6 @@ self: {
        homepage = "https://github.com/sol/markdown-unlit#readme";
        description = "Literate Haskell support for Markdown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown2svg" = callPackage
@@ -136955,24 +134695,6 @@ self: {
      }) {};
 
   "markup" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad
-     , lucid, mmorph, monad-control, monad-logger, mtl, path-extra
-     , resourcet, text, transformers-base, urlpath
-     }:
-     mkDerivation {
-       pname = "markup";
-       version = "4.0.3";
-       sha256 = "1a4n89j8z3sgyigbxkc10lb3kz6x5bf0kdcs1k0hydcj0vdvwqh3";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup clay comonad lucid mmorph
-         monad-control monad-logger mtl path-extra resourcet text
-         transformers-base urlpath
-       ];
-       description = "Abstraction for HTML-embedded content";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "markup_4_0_4" = callPackage
     ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
      , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
      , path-extra, resourcet, text, transformers-base, urlpath
@@ -136988,7 +134710,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -137200,8 +134921,8 @@ self: {
        pname = "massiv";
        version = "0.1.1.0";
        sha256 = "0xl6f3cxhfbyz15p4mayj0489mjgrvla7hz0sf0i58bfcl2b8r8q";
-       revision = "1";
-       editedCabalFile = "0qymziv7s5w70z0f32l8ns8xhzn9m4qrjhr9sfiy9wc1li0q3pch";
+       revision = "2";
+       editedCabalFile = "06d7lkd65bd5gfpgfgppcg8pagfc8k03qf7psggv2d3sixm088bn";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -137213,6 +134934,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_1_2_0" = callPackage
+    ({ mkDerivation, base, data-default, data-default-class, deepseq
+     , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.1.2.0";
+       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
+       libraryHaskellDepends = [
+         base data-default-class deepseq ghc-prim primitive vector
+       ];
+       testHaskellDepends = [
+         base data-default deepseq hspec QuickCheck safe-exceptions vector
+       ];
+       homepage = "https://github.com/lehins/massiv";
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq, directory
      , filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -138398,75 +136139,25 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude-conduit
-     , conduit-extra, directory, filepath, http-conduit, optparse-simple
-     , tar-conduit, temporary, text, typed-process, yaml
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , http-conduit, optparse-simple, rio, tar-conduit, yaml
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.0.6";
-       sha256 = "0cgak9hp1j9ybcpbqjs56pq7h9wn0my46mlx6nqv3fvidwdp5vl7";
+       version = "0.3.2";
+       sha256 = "05v061giv1q0gq4n8x1g44pyfxjy95aqxnnv5bc4cclrp233m5b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring classy-prelude-conduit conduit-extra directory
-         filepath http-conduit optparse-simple tar-conduit temporary text
-         typed-process yaml
+         base bytestring conduit conduit-extra http-conduit optparse-simple
+         rio tar-conduit yaml
        ];
        homepage = "https://github.com/snoyberg/mega-sdist#readme";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mega-sdist_0_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude-conduit
-     , conduit-extra, directory, filepath, http-conduit, optparse-simple
-     , tar-conduit, temporary, text, typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
-       version = "0.3.1";
-       sha256 = "06sgnkia5fwlsmy6m88mdklsabqv8vixgjbfzmyfln3aqhvwqk23";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring classy-prelude-conduit conduit-extra directory
-         filepath http-conduit optparse-simple tar-conduit temporary text
-         typed-process yaml
-       ];
-       homepage = "https://github.com/snoyberg/mega-sdist#readme";
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, hspec, hspec-expectations, mtl
-     , parser-combinators, QuickCheck, scientific, text, transformers
-     , weigh
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "6.3.0";
-       sha256 = "15bhghiszm18acn1igmq6vgdlcvsvsx4dlkl2vg2ghy5qgyrqxsv";
-       revision = "2";
-       editedCabalFile = "1npxvydar8l68vfp3g0ir9cvq5vglf1z2a9q1h1mj438y0084f7v";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-expectations mtl QuickCheck
-         scientific text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       homepage = "https://github.com/mrkkrp/megaparsec";
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_6_4_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -138476,8 +136167,8 @@ self: {
        pname = "megaparsec";
        version = "6.4.1";
        sha256 = "0w0kw8g7c6c3sp0fpgfqjc2w032dv9s7jnyn1dx71hk5mifh2h6y";
-       revision = "1";
-       editedCabalFile = "1r7isvrj7k34bsl7snd14wjvc64vx01dmbkm17ycik3lhllscfif";
+       revision = "2";
+       editedCabalFile = "0vh4l2kl9nfxlr8l82qicldybwiv6vbksi3jdk0xjzxmkvgm0jnf";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -138490,7 +136181,6 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -138764,13 +136454,13 @@ self: {
      }) {};
 
   "memo-sqlite" = callPackage
-    ({ mkDerivation, base, direct-sqlite }:
+    ({ mkDerivation, base, direct-sqlite, text }:
      mkDerivation {
        pname = "memo-sqlite";
-       version = "0.1";
-       sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3";
-       libraryHaskellDepends = [ base direct-sqlite ];
-       homepage = "https://gitorious.org/memo-sqlite";
+       version = "0.2";
+       sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7";
+       libraryHaskellDepends = [ base direct-sqlite text ];
+       homepage = "https://code.mathr.co.uk/memo-sqlite";
        description = "memoize functions using SQLite3 database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138836,25 +136526,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
-     , ghc-prim, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.11";
-       sha256 = "0k6x58r3if8zbsgip8nr7lb77xf468qxlwqnmah8p313rxfg0k37";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq foundation ghc-prim
-       ];
-       testHaskellDepends = [
-         base foundation tasty tasty-hunit tasty-quickcheck
-       ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_16" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, foundation
      , ghc-prim
      }:
@@ -138869,7 +136540,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -139436,28 +137106,6 @@ self: {
      }) {};
 
   "microlens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "microlens-aeson";
-       version = "2.2.0.2";
-       sha256 = "05zk6pfb9s48kgfpim1lj32vh3p54g633d5x4771inxihlskqd4d";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring microlens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring microlens tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
-       description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "microlens-aeson_2_3_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty
      , tasty-hunit, text, unordered-containers, vector
@@ -139481,7 +137129,6 @@ self: {
        homepage = "http://github.com/fosskers/microlens-aeson/";
        description = "Law-abiding lenses for Aeson, using microlens";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-contra" = callPackage
@@ -140583,26 +138230,6 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
-     , http-types, lucid, network-uri, servant, servant-lucid, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "miso";
-       version = "0.10.0.0";
-       sha256 = "0p5hnd9k14zbv2gphxwm7a84m3djzybr6awihrb22wk5jyjc9d7x";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data http-types lucid
-         network-uri servant servant-lucid text transformers vector
-       ];
-       homepage = "http://github.com/dmjio/miso";
-       description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miso_0_14_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
@@ -140620,7 +138247,6 @@ self: {
        homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -140797,37 +138423,6 @@ self: {
      }) {};
 
   "mmark" = callPackage
-    ({ mkDerivation, aeson, base, case-insensitive, containers
-     , criterion, data-default-class, deepseq, dlist, email-validate
-     , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
-     , megaparsec, microlens, microlens-th, modern-uri, mtl
-     , parser-combinators, QuickCheck, text, text-metrics
-     , unordered-containers, weigh, yaml
-     }:
-     mkDerivation {
-       pname = "mmark";
-       version = "0.0.4.0";
-       sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch";
-       revision = "2";
-       editedCabalFile = "1l2xljnasvgj3icc8dynsakyskd65c114gm4f94la3pv8ghcc3rg";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base case-insensitive containers data-default-class deepseq
-         dlist email-validate foldl hashable html-entity-map lucid
-         megaparsec microlens microlens-th modern-uri mtl parser-combinators
-         text text-metrics unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
-         QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion text weigh ];
-       homepage = "https://github.com/mrkkrp/mmark";
-       description = "Strict markdown processor for writers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmark_0_0_5_6" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, data-default-class, deepseq, dlist, email-validate
      , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
@@ -140854,7 +138449,6 @@ self: {
        homepage = "https://github.com/mmark-md/mmark";
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-cli" = callPackage
@@ -140881,26 +138475,6 @@ self: {
      }) {};
 
   "mmark-ext" = callPackage
-    ({ mkDerivation, base, data-default-class, foldl, hspec, lucid
-     , microlens, mmark, modern-uri, text
-     }:
-     mkDerivation {
-       pname = "mmark-ext";
-       version = "0.0.1.2";
-       sha256 = "0f698yvlcbvq627advl832nlzl975jx462zg7pd8h43chdbj5qar";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base data-default-class foldl lucid microlens mmark modern-uri text
-       ];
-       testHaskellDepends = [
-         base data-default-class hspec lucid mmark text
-       ];
-       homepage = "https://github.com/mrkkrp/mmark-ext";
-       description = "Commonly useful extensions for MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmark-ext_0_2_0_0" = callPackage
     ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark
      , modern-uri, skylighting, text
      }:
@@ -140918,7 +138492,6 @@ self: {
        homepage = "https://github.com/mmark-md/mmark-ext";
        description = "Commonly useful extensions for MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmorph" = callPackage
@@ -141081,33 +138654,6 @@ self: {
      }) {};
 
   "modern-uri" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , criterion, deepseq, exceptions, hspec, hspec-megaparsec
-     , megaparsec, profunctors, QuickCheck, template-haskell, text
-     , weigh
-     }:
-     mkDerivation {
-       pname = "modern-uri";
-       version = "0.1.2.1";
-       sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h";
-       revision = "1";
-       editedCabalFile = "1kgwf0y5p5imrkjga53yna4sy6jqk5x3v0zks24c4vb52mi2a19n";
-       libraryHaskellDepends = [
-         base bytestring containers contravariant deepseq exceptions
-         megaparsec profunctors QuickCheck template-haskell text
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq megaparsec text weigh
-       ];
-       homepage = "https://github.com/mrkkrp/modern-uri";
-       description = "Modern library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "modern-uri_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , criterion, deepseq, exceptions, hspec, hspec-megaparsec
      , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged
@@ -141133,7 +138679,6 @@ self: {
        homepage = "https://github.com/mrkkrp/modern-uri";
        description = "Modern library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modify-fasta" = callPackage
@@ -141847,6 +139392,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_28_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
+     , mtl, resourcet, stm, stm-chans, template-haskell, text
+     , transformers, transformers-base, transformers-compat
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.28.2";
+       sha256 = "1dqrsqpqw4qfyida4j0z6dffds4sj7j282x4ir6wrq9j7nmns4yx";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra exceptions fast-logger
+         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+         template-haskell text transformers transformers-base
+         transformers-compat unliftio-core
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -142859,6 +140427,38 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "mongoDB_2_3_0_5" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+     , binary, bson, bytestring, conduit, conduit-extra, containers
+     , criterion, cryptohash, data-default-class, hashtables, hspec
+     , lifted-base, monad-control, mtl, network, nonce, old-locale
+     , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text
+     , time, tls, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.3.0.5";
+       sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9";
+       libraryHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring conduit conduit-extra containers cryptohash
+         data-default-class hashtables lifted-base monad-control mtl network
+         nonce parsec pureMD5 random random-shuffle resourcet tagged text
+         time tls transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
+       benchmarkHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring containers criterion cryptohash data-default-class
+         hashtables lifted-base monad-control mtl network nonce parsec
+         random random-shuffle text transformers-base
+       ];
+       homepage = "https://github.com/mongodb-haskell/mongodb";
+       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mongodb-queue" = callPackage
     ({ mkDerivation, base, data-default, hspec, lifted-base
      , monad-control, mongoDB, network, text, transformers
@@ -143106,22 +140706,6 @@ self: {
      }) {};
 
   "monoidal-containers" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "monoidal-containers";
-       version = "0.3.0.2";
-       sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij";
-       libraryHaskellDepends = [
-         base containers deepseq hashable lens newtype unordered-containers
-       ];
-       homepage = "http://github.com/bgamari/monoidal-containers";
-       description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoidal-containers_0_3_1_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
      , semigroups, unordered-containers
      }:
@@ -143136,7 +140720,6 @@ self: {
        homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoidplus" = callPackage
@@ -145388,20 +142971,6 @@ self: {
      }) {};
 
   "mwc-probability" = callPackage
-    ({ mkDerivation, base, mwc-random, primitive, transformers }:
-     mkDerivation {
-       pname = "mwc-probability";
-       version = "1.3.0";
-       sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg";
-       revision = "1";
-       editedCabalFile = "1b1w504ycphpkcq279bjr2m1laxmv7xzhrbqaf6ayym265f75mnb";
-       libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       homepage = "http://github.com/jtobin/mwc-probability";
-       description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mwc-probability_2_0_2" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -145411,7 +142980,6 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random" = callPackage
@@ -145435,8 +143003,8 @@ self: {
        pname = "mwc-random-accelerate";
        version = "0.1.0.0";
        sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih";
-       revision = "1";
-       editedCabalFile = "0xgl1glq4jxs48x7wp8wh6pk3zad8483bvppwp89p3k0vlh6yqq3";
+       revision = "2";
+       editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -146020,41 +143588,6 @@ self: {
      }) {};
 
   "nakadi-client" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
-     , classy-prelude, conduit, conduit-combinators, conduit-extra
-     , containers, hashable, http-client, http-client-tls, http-conduit
-     , http-types, iso8601-time, lens, lens-aeson, monad-logger, mtl
-     , random, resourcet, retry, safe-exceptions, say, scientific, split
-     , tasty, tasty-hunit, template-haskell, text, time, transformers
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "nakadi-client";
-       version = "0.3.0.0";
-       sha256 = "14cr81b6x7cf10zja1vvpqhz9wanq50wwxhkvfx8w1s44skwvasy";
-       libraryHaskellDepends = [
-         aeson aeson-casing base bytestring conduit conduit-combinators
-         conduit-extra containers hashable http-client http-client-tls
-         http-conduit http-types iso8601-time lens monad-logger mtl
-         resourcet retry safe-exceptions scientific split tasty
-         template-haskell text time transformers unordered-containers uuid
-         vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing async base bytestring classy-prelude conduit
-         conduit-combinators conduit-extra containers hashable http-client
-         http-client-tls http-conduit http-types iso8601-time lens
-         lens-aeson monad-logger mtl random resourcet retry safe-exceptions
-         say scientific split tasty tasty-hunit template-haskell text time
-         transformers unordered-containers uuid vector
-       ];
-       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
-       description = "Client library for the Nakadi Event Broker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "nakadi-client_0_5_0_3" = callPackage
     ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
      , classy-prelude, conduit, conduit-combinators, conduit-extra
      , containers, exceptions, fast-logger, hashable, http-client
@@ -147219,20 +144752,6 @@ self: {
      }) {};
 
   "netlib-carray" = callPackage
-    ({ mkDerivation, base, carray, storable-complex, transformers }:
-     mkDerivation {
-       pname = "netlib-carray";
-       version = "0.0";
-       sha256 = "173hphdy4qv3zx6qigjf2zj38gzlmp94xjcyc8jlwln221s35l0r";
-       libraryHaskellDepends = [
-         base carray storable-complex transformers
-       ];
-       homepage = "http://hub.darcs.net/thielema/netlib-carray/";
-       description = "Helper modules for CArray wrappers to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "netlib-carray_0_0_1" = callPackage
     ({ mkDerivation, base, carray, netlib-ffi, transformers }:
      mkDerivation {
        pname = "netlib-carray";
@@ -147242,22 +144761,9 @@ self: {
        homepage = "http://hub.darcs.net/thielema/netlib-carray/";
        description = "Helper modules for CArray wrappers to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlib-ffi" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "netlib-ffi";
-       version = "0.0";
-       sha256 = "0i04gahmv9171ndw5nkcawkfn3vbfgagnxhl1xpy0a45bfs0n9xc";
-       libraryHaskellDepends = [ base transformers ];
-       homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
-       description = "Helper modules for FFI to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "netlib-ffi_0_0_1" = callPackage
     ({ mkDerivation, base, storable-complex, transformers }:
      mkDerivation {
        pname = "netlib-ffi";
@@ -147267,7 +144773,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
        description = "Helper modules for FFI to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -147849,28 +145354,6 @@ self: {
      }) {};
 
   "network-conduit-tls" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , connection, cprng-aes, data-default, HUnit, monad-control, mtl
-     , network, streaming-commons, tls, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "network-conduit-tls";
-       version = "1.2.2";
-       sha256 = "11xh5g0c7arf6d0klilacajf2mg24pb47wbzwn2hb7fimkgwv8hj";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra connection cprng-aes
-         data-default monad-control network streaming-commons tls
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra connection HUnit mtl
-       ];
-       homepage = "https://github.com/snoyberg/conduit";
-       description = "Create TLS-aware network code with conduits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "network-conduit-tls_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , connection, data-default-class, HUnit, mtl, network
      , streaming-commons, tls, transformers, unliftio-core
@@ -147889,7 +145372,6 @@ self: {
        homepage = "https://github.com/snoyberg/conduit";
        description = "Create TLS-aware network code with conduits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-connection" = callPackage
@@ -149077,8 +146559,8 @@ self: {
      }:
      mkDerivation {
        pname = "nirum";
-       version = "0.3.0";
-       sha256 = "1s9yk0gjly0camg3crk0nk2943maizgija415lrd0b8ykgm97ax6";
+       version = "0.3.3";
+       sha256 = "0ilrhkfv1q2w49wsj27dssaavw8v5w77vyf2mynb5aam1yax3d3v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149722,23 +147204,6 @@ self: {
      }) {};
 
   "nonce" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
-     , transformers, unliftio, unliftio-core
-     }:
-     mkDerivation {
-       pname = "nonce";
-       version = "1.0.5";
-       sha256 = "15gbgfmby1mlk95c1q7qd38yc5xr4z7l58b3y59aixlsp4qspind";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring entropy text transformers
-         unliftio unliftio-core
-       ];
-       homepage = "https://github.com/prowdsponsor/nonce";
-       description = "Generate cryptographic nonces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nonce_1_0_7" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
      , transformers, unliftio, unliftio-core
      }:
@@ -149753,7 +147218,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/nonce";
        description = "Generate cryptographic nonces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nondeterminism" = callPackage
@@ -150684,7 +148148,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "nvim-hs_0_2_4" = callPackage
+  "nvim-hs" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, data-default
      , deepseq, directory, dyre, exceptions, filepath, foreign-store
@@ -150721,46 +148185,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "nvim-hs" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, data-default
-     , deepseq, directory, dyre, exceptions, filepath, foreign-store
-     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
-     , messagepack, monad-control, mtl, network, optparse-applicative
-     , process, QuickCheck, resourcet, setenv, stm, streaming-commons
-     , template-haskell, text, time, time-locale-compat, transformers
-     , transformers-base, utf8-string, void
-     }:
-     mkDerivation {
-       pname = "nvim-hs";
-       version = "0.2.5";
-       sha256 = "1qiypd9cn80zjk38p572rbyfsrlff6a2qwvfj7ck3jdj5vv1dq2b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default deepseq directory dyre
-         exceptions filepath foreign-store hslogger lifted-base megaparsec
-         messagepack monad-control mtl network optparse-applicative process
-         resourcet setenv stm streaming-commons template-haskell text time
-         time-locale-compat transformers transformers-base utf8-string void
-       ];
-       executableHaskellDepends = [ base data-default ];
-       testHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger hspec hspec-discover HUnit
-         lifted-base megaparsec messagepack mtl network optparse-applicative
-         process QuickCheck resourcet setenv stm streaming-commons
-         template-haskell text time time-locale-compat transformers
-         transformers-base utf8-string
-       ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs";
-       description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -153117,22 +150541,6 @@ self: {
      }) {};
 
   "optparse-generic" = callPackage
-    ({ mkDerivation, base, bytestring, Only, optparse-applicative
-     , semigroups, system-filepath, text, time, transformers, void
-     }:
-     mkDerivation {
-       pname = "optparse-generic";
-       version = "1.2.3";
-       sha256 = "1wxzpj4xj3bafg3piarwsr69xxzp75fdglx9c3spbahl1aq9wzgk";
-       libraryHaskellDepends = [
-         base bytestring Only optparse-applicative semigroups
-         system-filepath text time transformers void
-       ];
-       description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-generic_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, Only, optparse-applicative
      , semigroups, system-filepath, text, time, transformers, void
      }:
@@ -153146,7 +150554,6 @@ self: {
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -153926,6 +151333,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packdeps_0_4_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , filepath, optparse-applicative, process, semigroups, split, tar
+     , text, time
+     }:
+     mkDerivation {
+       pname = "packdeps";
+       version = "0.4.5";
+       sha256 = "07nsnxxs5y77w0v5dxw9mqgq98s3riws5846qshlnhq4l5q73php";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath split tar text
+         time
+       ];
+       executableHaskellDepends = [
+         base Cabal containers optparse-applicative process semigroups
+       ];
+       homepage = "http://packdeps.haskellers.com/";
+       description = "Check your cabal packages for lagging dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "packed" = callPackage
     ({ mkDerivation, base, containers, gauge, ghc-prim, hedgehog
      , primitive, tasty, tasty-hedgehog, tasty-hunit
@@ -154288,55 +151719,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , binary, blaze-html, blaze-markup, bytestring, Cabal
-     , case-insensitive, cmark-gfm, containers, criterion, data-default
-     , deepseq, Diff, directory, doctemplates, executable-path, filepath
-     , Glob, haddock-library, hslua, hslua-module-text, HTTP
-     , http-client, http-client-tls, http-types, JuicyPixels, mtl
-     , network, network-uri, pandoc-types, parsec, process, QuickCheck
-     , random, safe, scientific, SHA, skylighting, split, syb, tagsoup
-     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary
-     , texmath, text, time, unix, unordered-containers, vector, xml
-     , yaml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.0.6";
-       sha256 = "1vhj6splykksb1mkxv5cs0361nj12qn23a3y1i8j5dc637lkdwpj";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring binary blaze-html
-         blaze-markup bytestring case-insensitive cmark-gfm containers
-         data-default deepseq directory doctemplates filepath Glob
-         haddock-library hslua hslua-module-text HTTP http-client
-         http-client-tls http-types JuicyPixels mtl network network-uri
-         pandoc-types parsec process random safe scientific SHA skylighting
-         split syb tagsoup temporary texmath text time unix
-         unordered-containers vector xml yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base64-bytestring bytestring containers Diff directory
-         executable-path filepath hslua pandoc-types process QuickCheck
-         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
-         zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion text time
-       ];
-       doCheck = false;
-       homepage = "http://pandoc.org";
-       description = "Conversion between markup formats";
-       license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_1_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -154384,46 +151766,10 @@ self: {
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, 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.12.2.5";
-       sha256 = "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       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 containers 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;
-     }) {};
-
-  "pandoc-citeproc_0_14_1_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
      , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -154456,7 +151802,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
@@ -154756,6 +152101,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-types_1_17_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.17.4";
+       sha256 = "0ng8nxrx85wl5fqsjfzmbhwimkqvblwplzkn8ra93pgpvqpnmrk5";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit QuickCheck string-qq syb
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -156312,6 +153682,7 @@ self: {
          async base conduit filepath QuickCheck quickcheck-unicode
          template-haskell temporary text yaml
        ];
+       doHaddock = false;
        homepage = "https://github.com/PasswordManager/passman-core#readme";
        description = "Deterministic password generator core";
        license = stdenv.lib.licenses.gpl3;
@@ -157654,30 +155025,6 @@ self: {
      }) {};
 
   "perf" = callPackage
-    ({ mkDerivation, base, containers, doctest, foldl, formatting
-     , numhask, optparse-generic, protolude, rdtsc, tdigest, text, time
-     , vector
-     }:
-     mkDerivation {
-       pname = "perf";
-       version = "0.3.0";
-       sha256 = "0l8q2jc3gfyair7x7jlx6aqs25m9f2ib9hdmzc3vfrh91ky67x1q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers foldl numhask protolude rdtsc tdigest time
-       ];
-       executableHaskellDepends = [
-         base formatting numhask optparse-generic protolude text vector
-       ];
-       testHaskellDepends = [ base doctest protolude ];
-       homepage = "https://github.com/tonyday567/perf";
-       description = "low-level performance statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "perf_0_3_1_1" = callPackage
     ({ mkDerivation, base, containers, doctest, foldl, formatting
      , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest
      , text, time, vector
@@ -157887,28 +155234,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent" = callPackage
+  "persistent_2_7_3_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
-     , exceptions, fast-logger, hspec, http-api-data, lifted-base
-     , monad-control, monad-logger, mtl, old-locale, path-pieces
-     , resource-pool, resourcet, scientific, silently, tagged
-     , template-haskell, text, time, transformers, transformers-base
-     , unordered-containers, vector
+     , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data
+     , lifted-base, monad-control, monad-logger, mtl, old-locale
+     , path-pieces, resource-pool, resourcet, scientific, silently
+     , tagged, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers, vector
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.7.1";
-       sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2";
+       version = "2.7.3.1";
+       sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p";
        revision = "1";
-       editedCabalFile = "0ag2fd1iaiwiviskr5qzhgq7a0vr5x7vjq9zi75j25lahrqxxfm1";
+       editedCabalFile = "17kdzvhakjqkif1xxrbgh1lwjd0sfd0ikl1jxrjn4il16jy7gazz";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers exceptions fast-logger http-api-data
-         lifted-base monad-control monad-logger mtl old-locale path-pieces
-         resource-pool resourcet scientific silently tagged template-haskell
-         text time transformers transformers-base unordered-containers
-         vector
+         bytestring conduit containers exceptions fast-logger
+         haskell-src-meta http-api-data lifted-base monad-control
+         monad-logger mtl old-locale path-pieces resource-pool resourcet
+         scientific silently tagged template-haskell text time transformers
+         transformers-base unordered-containers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
@@ -157920,10 +155267,11 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent_2_8_1" = callPackage
+  "persistent" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , fast-logger, haskell-src-meta, hspec, http-api-data
@@ -157953,7 +155301,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -158095,26 +155442,6 @@ self: {
      }) {};
 
   "persistent-mongoDB" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal
-     , conduit, containers, http-api-data, monad-control, mongoDB
-     , network, path-pieces, persistent, resource-pool, resourcet, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mongoDB";
-       version = "2.6.0";
-       sha256 = "1y94k4ymrwb1p881gzf6g3ppv41dsvc097cq4myfjcm22xaf4kp3";
-       libraryHaskellDepends = [
-         aeson attoparsec base bson bytestring cereal conduit containers
-         http-api-data monad-control mongoDB network path-pieces persistent
-         resource-pool resourcet text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using mongoDB";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-mongoDB_2_8_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal
      , conduit, containers, http-api-data, mongoDB, network, path-pieces
      , persistent, resource-pool, resourcet, text, time, transformers
@@ -158132,29 +155459,9 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, mysql, mysql-simple
-     , persistent, resource-pool, resourcet, text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mysql";
-       version = "2.6.2.1";
-       sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger mysql mysql-simple persistent
-         resource-pool resourcet text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-mysql_2_8_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-logger, mysql, mysql-simple, persistent
      , resource-pool, resourcet, text, transformers, unliftio-core
@@ -158171,36 +155478,9 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , io-streams, monad-control, monad-logger, mysql-haskell, network
-     , persistent, persistent-template, resource-pool, resourcet, text
-     , time, tls, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mysql-haskell";
-       version = "0.3.6";
-       sha256 = "1a829hrbsa54qikbnafv7vk7shzyg0697nvj43md19p172mkwj93";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers io-streams monad-control
-         monad-logger mysql-haskell network persistent resource-pool
-         resourcet text time tls transformers
-       ];
-       executableHaskellDepends = [
-         base monad-logger persistent persistent-template transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "A pure haskell backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "persistent-mysql-haskell_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-logger, mysql-haskell, network, persistent
      , persistent-template, resource-pool, resourcet, text, time, tls
@@ -158261,27 +155541,6 @@ self: {
      }) {};
 
   "persistent-postgresql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, persistent
-     , postgresql-libpq, postgresql-simple, resource-pool, resourcet
-     , text, time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-postgresql";
-       version = "2.6.3";
-       sha256 = "0yr384b77mp8z7k8mjmdbsqrrqplymcy9rfy6lm1v3ff81g52vli";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger persistent postgresql-libpq
-         postgresql-simple resource-pool resourcet text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using postgresql";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-postgresql_2_8_2_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-logger, persistent, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -158299,7 +155558,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -158395,7 +155653,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "persistent-sqlite" = callPackage
+  "persistent-sqlite_2_6_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-control, monad-logger, old-locale
      , persistent, persistent-template, resource-pool, resourcet
@@ -158419,10 +155677,11 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-sqlite_2_8_1_2" = callPackage
+  "persistent-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-logger, old-locale, persistent
      , persistent-template, resource-pool, resourcet, temporary, text
@@ -158446,7 +155705,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -158721,17 +155979,18 @@ self: {
 
   "pg-harness-server" = callPackage
     ({ mkDerivation, async, base, ini, postgresql-simple, random
-     , scotty, text, transformers
+     , scotty, text, transformers, warp
      }:
      mkDerivation {
        pname = "pg-harness-server";
-       version = "0.5.0";
-       sha256 = "1h14lbjygvdsq0g5yp0c3jnkayrzscw9dsllz0s4jzfg9hzskwa1";
+       version = "0.5.1";
+       sha256 = "0l7g99wh2znn3y3ma862j6yrmxdl9bjg2p4qaqf4iijxqxcrb1lq";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
+         warp
        ];
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
@@ -159456,32 +156715,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, monad-logger, mtl
-     , network, profunctors, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.12.8";
-       sha256 = "0k9lyk3h108y3zyvqz1krr08cqf4fahg4lh4f5fn1spgz46q3dwk";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-client http-client-tls
-         http-types monad-logger mtl network profunctors random
-         safe-exceptions text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck
-         safe-exceptions semigroups text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_9" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -159505,7 +156738,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -160115,22 +157347,6 @@ self: {
      }) {};
 
   "pipes-extras" = callPackage
-    ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework
-     , test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-extras";
-       version = "1.0.12";
-       sha256 = "0sr7n0p8nwsyp52dybq3lgswz353jc239hysqlxhlsa4hh1l5q61";
-       libraryHaskellDepends = [ base foldl lens pipes transformers ];
-       testHaskellDepends = [
-         base HUnit pipes test-framework test-framework-hunit transformers
-       ];
-       description = "Extra utilities for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-extras_1_0_13" = callPackage
     ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework
      , test-framework-hunit, transformers
      }:
@@ -160144,7 +157360,6 @@ self: {
        ];
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -160214,22 +157429,6 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
-     , pipes-parse, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-group";
-       version = "1.0.8";
-       sha256 = "0zcmhq46972zxjj5nmr46fdvvwb3q0i42q9m70i758a3iwkmnr3a";
-       libraryHaskellDepends = [
-         base free pipes pipes-parse transformers
-       ];
-       testHaskellDepends = [ base doctest lens-family-core ];
-       description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-group_1_0_9" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -160243,7 +157442,6 @@ self: {
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-http" = callPackage
@@ -161953,6 +159151,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "poly-cont" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "poly-cont";
+       version = "0.1.0.0";
+       sha256 = "05pkz6v2xyva73ibb5v97c7fh5zjpvkhahfgnnxycrlnsag5ckgy";
+       libraryHaskellDepends = [ base mtl transformers ];
+       description = "Poly-kinded continuations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "poly-control" = callPackage
     ({ mkDerivation, base, lens }:
      mkDerivation {
@@ -162957,22 +160166,6 @@ self: {
      }) {};
 
   "postgresql-libpq" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
-     mkDerivation {
-       pname = "postgresql-libpq";
-       version = "0.9.4.0";
-       sha256 = "15laa8m6i4girhr0i3xscgsl30iqj61mx5vbl67wasb8rwx0pi82";
-       revision = "1";
-       editedCabalFile = "0s1xyl25jn3miysc7i61wf2klm7blnczb0yhnf7hmv3ilpfsqghy";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring unix ];
-       librarySystemDepends = [ postgresql ];
-       homepage = "https://github.com/lpsmith/postgresql-libpq";
-       description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) postgresql;};
-
-  "postgresql-libpq_0_9_4_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
      mkDerivation {
        pname = "postgresql-libpq";
@@ -162984,7 +160177,6 @@ self: {
        homepage = "https://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-named" = callPackage
@@ -163515,8 +160707,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.10.3";
-       sha256 = "0q4pdmikv395gk9ahiild76g3gh9sa924w57dmlc2ly6gqk01mhh";
+       version = "0.11.1";
+       sha256 = "1xmxdlg213y1v09akc853zymbkxpg6pkfspwjb0g1kvnirjlj0rj";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors text transformers unagi-chan
@@ -163538,8 +160730,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.1.5";
-       sha256 = "1p24iv5mymyrw8q8y4k6zhzq3qd8z62ai0sfx2mh29in4s1y508y";
+       version = "0.1.6";
+       sha256 = "0mr3wv8mx88xzbkcrndq833wcq753dyp9z4610pxa34cfalnbvhf";
        libraryHaskellDepends = [
          base base-prelude bytestring cereal potoki potoki-core text
        ];
@@ -163748,18 +160940,6 @@ self: {
      }) {};
 
   "pqueue" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "pqueue";
-       version = "1.3.2.3";
-       sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pqueue_1_4_1_1" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "pqueue";
@@ -163769,7 +160949,6 @@ self: {
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -164025,8 +161204,8 @@ self: {
     ({ mkDerivation, base, hspec, regex-pcre-builtin }:
      mkDerivation {
        pname = "prefix-expression";
-       version = "1.2.4";
-       sha256 = "03gnfh84vpd66i8mnnx5y1ci20p7ykic9cnnsvz3bddfvwp4silr";
+       version = "1.2.5";
+       sha256 = "0z1s74iw87qkfaa7v8a3m91w2phmkp02yiz5xk8w2w4jz72x3x0b";
        libraryHaskellDepends = [ base regex-pcre-builtin ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/VonFry/prefix-expression";
@@ -164476,26 +161655,6 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
-       version = "2.0.2.1";
-       sha256 = "16hnx6ra46m9i0q12b1xlbizv0vm76sqmfgj7w2l4ghw8ddciy8f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl parsec text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/cdepillabout/pretty-simple";
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-simple_2_1_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , doctest, Glob, mtl, parsec, text, transformers
      }:
@@ -164513,7 +161672,6 @@ self: {
        homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -164589,31 +161747,6 @@ self: {
      }) {};
 
   "prettyprinter" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
-     , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "prettyprinter";
-       version = "1.1.1";
-       sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base bytestring doctest pgp-wordlist tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
-         random text transformers
-       ];
-       homepage = "http://github.com/quchen/prettyprinter";
-       description = "A modern, easy to use, well-documented, extensible prettyprinter";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter_1_2_0_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
      , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
@@ -164636,7 +161769,6 @@ self: {
        homepage = "http://github.com/quchen/prettyprinter";
        description = "A modern, easy to use, well-documented, extensible prettyprinter";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -165495,23 +162627,6 @@ self: {
      }) {};
 
   "product-profunctors" = callPackage
-    ({ mkDerivation, base, contravariant, profunctors, tagged
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "product-profunctors";
-       version = "0.8.0.3";
-       sha256 = "1j8cqhx2691pxnb4kwwbm3a3fzq2lyaic00yy5g3112gpb3b392g";
-       libraryHaskellDepends = [
-         base contravariant profunctors tagged template-haskell
-       ];
-       testHaskellDepends = [ base profunctors ];
-       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
-       description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "product-profunctors_0_9_0_0" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, criterion
      , deepseq, profunctors, tagged, template-haskell
      }:
@@ -165527,7 +162642,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof2dot" = callPackage
@@ -166772,6 +163886,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "psqueues_0_2_6_0" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
+     , QuickCheck, random, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, unordered-containers
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.6.0";
+       sha256 = "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree-psqueue ghc-prim
+         hashable mtl PSQueue random unordered-containers
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pstemmer" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -166843,22 +163981,6 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, criterion, filepath, hspec, random
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "publicsuffix";
-       version = "0.20170802";
-       sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20171229" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
@@ -166872,7 +163994,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -167983,19 +165104,6 @@ self: {
      }) {};
 
   "qchas" = callPackage
-    ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }:
-     mkDerivation {
-       pname = "qchas";
-       version = "1.0.1.0";
-       sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam";
-       libraryHaskellDepends = [ base hmatrix random ];
-       testHaskellDepends = [ base hmatrix tasty tasty-hunit ];
-       homepage = "https://github.com/ardeleanasm/qchas#readme";
-       description = "A library for implementing Quantum Algorithms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "qchas_1_1_0_0" = callPackage
     ({ mkDerivation, base, hmatrix, linear, random, tasty, tasty-hunit
      }:
      mkDerivation {
@@ -168010,7 +165118,6 @@ self: {
        homepage = "https://github.com/ardeleanasm/qchas#readme";
        description = "A library for implementing Quantum Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qd" = callPackage
@@ -168094,23 +165201,6 @@ self: {
      }) {};
 
   "qm-interpolated-string" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "qm-interpolated-string";
-       version = "0.2.1.0";
-       sha256 = "09qzlhrzhv0hcc7m8qwfh64nprf3wq4x9lrcdnqpqw2airh5cbn3";
-       libraryHaskellDepends = [
-         base bytestring haskell-src-meta template-haskell text
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
-       description = "Implementation of interpolated multiline strings";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "qm-interpolated-string_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
      , template-haskell, text
      }:
@@ -168125,7 +165215,6 @@ self: {
        homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
        description = "Implementation of interpolated multiline strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qq-literals" = callPackage
@@ -168707,23 +165796,6 @@ self: {
      }) {};
 
   "quickcheck-arbitrary-adt" = callPackage
-    ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "quickcheck-arbitrary-adt";
-       version = "0.2.0.0";
-       sha256 = "1ny04h3kxqdhlfxbvcdzsl6n7vgs5xdk9p0b9hb2jpvqlazqv6fr";
-       libraryHaskellDepends = [ base QuickCheck ];
-       testHaskellDepends = [
-         base hspec lens QuickCheck template-haskell transformers
-       ];
-       homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme";
-       description = "Generic typeclasses for generating arbitrary ADTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-arbitrary-adt_0_3_1_0" = callPackage
     ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell
      , transformers
      }:
@@ -168738,7 +165810,6 @@ self: {
        homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme";
        description = "Generic typeclasses for generating arbitrary ADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-arbitrary-template" = callPackage
@@ -170146,6 +167217,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "random-names" = callPackage
+    ({ mkDerivation, base, QuickCheck, random, safe, text }:
+     mkDerivation {
+       pname = "random-names";
+       version = "0.1.0.0";
+       sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy";
+       libraryHaskellDepends = [ base QuickCheck random safe text ];
+       homepage = "https://github.com/aiya000/hs-random-names";
+       description = "Expose Random and Arbitrary instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "random-shuffle" = callPackage
     ({ mkDerivation, base, MonadRandom, random }:
      mkDerivation {
@@ -170722,6 +167805,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rasterific-svg_0_3_3_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
+     , optparse-applicative, primitive, Rasterific, scientific, svg-tree
+     , text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "rasterific-svg";
+       version = "0.3.3.1";
+       sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath FontyFruity
+         JuicyPixels lens linear mtl primitive Rasterific scientific
+         svg-tree text transformers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative Rasterific svg-tree
+       ];
+       description = "SVG renderer based on Rasterific";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rate-limit" = callPackage
     ({ mkDerivation, base, stm, time, time-units }:
      mkDerivation {
@@ -170735,25 +167844,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.3.10";
-       sha256 = "10cqg2rrr8fx57r0vhw37wrv92243lzi2mp7ghsl3kkl1n73qz8n";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base filepath hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
@@ -170770,26 +167860,9 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
-       version = "0.3.2";
-       sha256 = "1f38xivw19ic002idr936859rwmz2g9nmhbwxvsf4fw3lm31qwpa";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       homepage = "https://github.com/tfausak/ratel-wai#readme";
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
      }:
@@ -170803,7 +167876,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel-wai#readme";
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rating-systems" = callPackage
@@ -170831,38 +167903,6 @@ self: {
      }) {};
 
   "rattletrap" = callPackage
-    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
-     , bytestring, containers, data-binary-ieee754, filepath, hspec
-     , http-client, http-client-tls, template-haskell, temporary, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "rattletrap";
-       version = "3.1.2";
-       sha256 = "0b0f5lkh8m96qg3m8wgnhpamqjndspa6ysf0lq013qbk9nvlvla8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 http-client http-client-tls template-haskell
-         text vector
-       ];
-       executableHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 http-client http-client-tls template-haskell
-         text vector
-       ];
-       testHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 filepath hspec http-client http-client-tls
-         template-haskell temporary text vector
-       ];
-       homepage = "https://github.com/tfausak/rattletrap#readme";
-       description = "Parse and generate Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rattletrap_4_0_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
      , bytestring, containers, filepath, http-client, http-client-tls
      , HUnit, template-haskell, temporary, text, transformers
@@ -170891,7 +167931,6 @@ self: {
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -171139,8 +168178,8 @@ self: {
        pname = "rcu";
        version = "0.2.2";
        sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk";
-       revision = "1";
-       editedCabalFile = "0kq7g4wplri8xnp6b1xvxd74vl60dhdkz0p3994swy7dbk8b7vic";
+       revision = "2";
+       editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -171901,28 +168940,6 @@ self: {
      }) {};
 
   "rebase" = callPackage
-    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
-     , containers, contravariant, contravariant-extras, deepseq, dlist
-     , either, fail, hashable, mtl, profunctors, scientific
-     , semigroupoids, semigroups, stm, text, time, transformers
-     , unordered-containers, uuid, vector, void
-     }:
-     mkDerivation {
-       pname = "rebase";
-       version = "1.1.1";
-       sha256 = "0rhfpdh8hmna02pbiljkiy623sdy1nqk60azr43cdx5q9aw1b3jy";
-       libraryHaskellDepends = [
-         base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist either fail hashable mtl
-         profunctors scientific semigroupoids semigroups stm text time
-         transformers unordered-containers uuid vector void
-       ];
-       homepage = "https://github.com/nikita-volkov/rebase";
-       description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rebase_1_2_3" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
      , either, fail, hashable, mtl, profunctors, scientific
@@ -171942,7 +168959,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -173380,24 +170396,6 @@ self: {
      }) {};
 
   "regex-tdfa" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
-     , parsec, regex-base
-     }:
-     mkDerivation {
-       pname = "regex-tdfa";
-       version = "1.2.2";
-       sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb";
-       revision = "1";
-       editedCabalFile = "0m2i94gm6a1m6sn3mj47jbnmjp5ksiqmdn6v4pdr7xsv5a15gfwn";
-       libraryHaskellDepends = [
-         array base bytestring containers ghc-prim mtl parsec regex-base
-       ];
-       homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-tdfa_1_2_3" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
      , parsec, regex-base
      }:
@@ -173411,7 +170409,6 @@ self: {
        homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -174419,6 +171416,8 @@ self: {
        pname = "repa";
        version = "3.4.1.3";
        sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
+       revision = "1";
+       editedCabalFile = "08n1c94kds39p5gaz46cij4swycr49jz7jhpr669jf68limhrqk6";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -174433,6 +171432,8 @@ self: {
        pname = "repa-algorithms";
        version = "3.4.1.2";
        sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87";
+       revision = "1";
+       editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k";
        libraryHaskellDepends = [ base repa vector ];
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
@@ -174524,8 +171525,8 @@ self: {
        pname = "repa-examples";
        version = "3.4.1.1";
        sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
-       revision = "1";
-       editedCabalFile = "0acl57w635zi1il4r4jxzp3r1kd0zdqdiihinpbla5vnp3a5zg13";
+       revision = "2";
+       editedCabalFile = "1ljqrqlk5h34q4mg6qipx5qsgz8fhp51p5mfkzv822d7v5qdsnv7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174585,8 +171586,8 @@ self: {
        pname = "repa-io";
        version = "3.4.1.1";
        sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
-       revision = "1";
-       editedCabalFile = "0z0wbaz7svqdzjpmx7d9wwfjl31w0i29pcc1v11r26f9avw3g9qi";
+       revision = "2";
+       editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm";
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
@@ -175283,7 +172284,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet" = callPackage
+  "resourcet_1_1_11" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat, unliftio-core
@@ -175300,9 +172301,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet_1_2_0" = callPackage
+  "resourcet" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, mtl
      , primitive, transformers, unliftio-core
      }:
@@ -175317,7 +172319,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "respond" = callPackage
@@ -175351,29 +172352,6 @@ self: {
      }) {};
 
   "rest-client" = callPackage
-    ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
-     , data-default, exceptions, http-client, http-conduit, http-types
-     , hxt, hxt-pickle-utils, monad-control, mtl, resourcet, rest-types
-     , tostring, transformers, transformers-base, transformers-compat
-     , uri-encode, utf8-string
-     }:
-     mkDerivation {
-       pname = "rest-client";
-       version = "0.5.1.1";
-       sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x";
-       revision = "2";
-       editedCabalFile = "0issr73rbnyaqfgx4c0wsy9sq948sqrkima2cr2sb1lkf8n4ihr8";
-       libraryHaskellDepends = [
-         aeson-utils base bytestring case-insensitive data-default
-         exceptions http-client http-conduit http-types hxt hxt-pickle-utils
-         monad-control mtl resourcet rest-types tostring transformers
-         transformers-base transformers-compat uri-encode utf8-string
-       ];
-       description = "Utility library for use in generated API client libraries";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-client_0_5_2_1" = callPackage
     ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
      , data-default, exceptions, http-client, http-conduit, http-types
      , hxt, hxt-pickle-utils, monad-control, mtl, resourcet, rest-types
@@ -175392,7 +172370,6 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-core" = callPackage
@@ -178094,19 +175071,6 @@ self: {
      }) {};
 
   "safe" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.15";
-       sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "safe_0_3_17" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
@@ -178117,7 +175081,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
@@ -178133,21 +175096,6 @@ self: {
      }) {};
 
   "safe-exceptions" = callPackage
-    ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
-     , void
-     }:
-     mkDerivation {
-       pname = "safe-exceptions";
-       version = "0.1.6.0";
-       sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i";
-       libraryHaskellDepends = [ base deepseq exceptions transformers ];
-       testHaskellDepends = [ base hspec void ];
-       homepage = "https://github.com/fpco/safe-exceptions#readme";
-       description = "Safe, consistent, and easy exception handling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "safe-exceptions_0_1_7_0" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
      , void
      }:
@@ -178155,14 +175103,13 @@ self: {
        pname = "safe-exceptions";
        version = "0.1.7.0";
        sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
-       revision = "2";
-       editedCabalFile = "01n9yyhqa1xzsi2mk4if7p0zqdxcwr8f44vbbj01hx9152xs7j4k";
+       revision = "3";
+       editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        homepage = "https://github.com/fpco/safe-exceptions#readme";
        description = "Safe, consistent, and easy exception handling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-exceptions-checked" = callPackage
@@ -178328,29 +175275,6 @@ self: {
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.3.3";
-       sha256 = "17msazxg0iqvmsn4cwlnr1hwcw5bfp276zsg7x5r47ifi9j748nb";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       homepage = "https://github.com/acid-state/safecopy";
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_9_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -178371,7 +175295,6 @@ self: {
        homepage = "https://github.com/acid-state/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -179195,34 +176118,6 @@ self: {
      }) {};
 
   "sbv" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , crackNum, data-binary-ieee754, deepseq, directory, doctest
-     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
-     , process, QuickCheck, random, syb, tasty, tasty-golden
-     , tasty-hunit, template-haskell, time, z3
-     }:
-     mkDerivation {
-       pname = "sbv";
-       version = "7.4";
-       sha256 = "0yylg2zdrcqzckhmlz9d5chac1jawbnrdp7fn49ia1nsl0i3jggc";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base containers crackNum data-binary-ieee754 deepseq
-         directory filepath generic-deriving ghc mtl pretty process
-         QuickCheck random syb template-haskell time
-       ];
-       testHaskellDepends = [
-         base bytestring data-binary-ieee754 directory doctest filepath Glob
-         hlint mtl random syb tasty tasty-golden tasty-hunit
-         template-haskell
-       ];
-       testSystemDepends = [ z3 ];
-       homepage = "http://leventerkok.github.com/sbv/";
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) z3;};
-
-  "sbv_7_5" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -179248,7 +176143,6 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -179854,6 +176748,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_5_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.5.3";
+       sha256 = "0j67qa7iqlkx0l9xlgxsyzv53bnrs7fdhv2xj1zlnkn22wsd39hj";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq hashable integer-gmp
+         integer-logarithms primitive text
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -180482,26 +177401,6 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
-     , StateVar, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "sdl2";
-       version = "2.3.0.1";
-       sha256 = "1cyp3afs89xsqn3hxzk1223vpbifr1w2faczqfkii3irdgpqjl6k";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring exceptions linear StateVar text transformers vector
-       ];
-       librarySystemDepends = [ SDL2 ];
-       libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) SDL2;};
-
-  "sdl2_2_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
      , StateVar, text, transformers, vector
      }:
@@ -180519,7 +177418,6 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -180613,29 +177511,6 @@ self: {
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-mixer" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, lifted-base
-     , monad-control, sdl2, SDL2_mixer, template-haskell, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "sdl2-mixer";
-       version = "0.1";
-       sha256 = "1h1b5q5jrns4ia5ih9qrhqvld96vfc1f4z1m5pcyx1qwkqfz696r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring data-default-class lifted-base monad-control sdl2
-         template-haskell text transformers vector
-       ];
-       librarySystemDepends = [ SDL2_mixer ];
-       libraryPkgconfigDepends = [ SDL2_mixer ];
-       executableHaskellDepends = [ base data-default-class sdl2 vector ];
-       description = "Bindings to SDL2_mixer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) SDL2_mixer;};
-
-  "sdl2-mixer_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, lifted-base
      , monad-control, sdl2, SDL2_mixer, template-haskell, vector
      }:
@@ -181282,30 +178157,6 @@ self: {
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
-     , cabal-doctest, comonad, containers, contravariant, distributive
-     , doctest, hashable, semigroups, tagged, transformers
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "semigroupoids";
-       version = "5.2.1";
-       sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
-       revision = "4";
-       editedCabalFile = "0izc33v2n2321hc4ssr1b8fj85i91ca6c99w1qhdqnnp1sank7sk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad containers contravariant
-         distributive hashable semigroups tagged transformers
-         transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/semigroupoids";
-       description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroupoids_5_2_2" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, Cabal
      , cabal-doctest, comonad, containers, contravariant, distributive
      , doctest, hashable, semigroups, tagged, template-haskell
@@ -181315,8 +178166,8 @@ self: {
        pname = "semigroupoids";
        version = "5.2.2";
        sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
-       revision = "2";
-       editedCabalFile = "1ps5v8c9w39jbcakg4vignza5mr4cjanxwh9y0hslwpm5mhh7326";
+       revision = "3";
+       editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -181327,7 +178178,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -181594,6 +178444,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sentiwordnet-parser" = callPackage
+    ({ mkDerivation, base, Decimal, hashable, parsers, safe
+     , string-class, text, trifecta, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "sentiwordnet-parser";
+       version = "0.1.1.0";
+       sha256 = "0mb5c0n2i0gyyk94j4lnfpxzh8v2vxlq7dbp1v5gmz5ws7s9pfll";
+       libraryHaskellDepends = [
+         base Decimal hashable parsers safe string-class text trifecta
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/k-bx/sentiwordnet-parser#readme";
+       description = "Parser for the SentiWordNet tab-separated file";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sentry" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal, cmdargs
      , directory, filepath, old-locale, old-time, process, safecopy
@@ -182066,37 +178933,6 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
-     , bytestring, Cabal, cabal-doctest, case-insensitive, directory
-     , doctest, filemanip, filepath, hspec, http-api-data, http-media
-     , http-types, mmorph, mtl, natural-transformation, network-uri
-     , QuickCheck, quickcheck-instances, string-conversions, tagged
-     , text, url, vault
-     }:
-     mkDerivation {
-       pname = "servant";
-       version = "0.11";
-       sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5";
-       revision = "2";
-       editedCabalFile = "1b5zxz1cqf0n2y1jfvb1rsza95hdyhn9fc6fl73bxr5m9apv511z";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring case-insensitive
-         http-api-data http-media http-types mmorph mtl
-         natural-transformation network-uri string-conversions tagged text
-         vault
-       ];
-       testHaskellDepends = [
-         aeson aeson-compat attoparsec base base-compat bytestring directory
-         doctest filemanip filepath hspec QuickCheck quickcheck-instances
-         string-conversions text url
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant_0_13" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , bytestring, Cabal, cabal-doctest, case-insensitive, doctest
      , hspec, hspec-discover, http-api-data, http-media, http-types
@@ -182123,7 +178959,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -182214,35 +179049,6 @@ self: {
      }) {};
 
   "servant-auth-cookie" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , cereal, cookie, criterion, cryptonite, data-default, deepseq
-     , exceptions, hspec, http-api-data, http-types, memory, mtl
-     , QuickCheck, servant, servant-server, tagged, time, transformers
-     , wai
-     }:
-     mkDerivation {
-       pname = "servant-auth-cookie";
-       version = "0.5.0.5";
-       sha256 = "1ml7f452ikfwzymvajrs0fmlww7pbq5prphsv65r12n4pzx9ynva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring cereal cookie
-         cryptonite data-default exceptions http-api-data http-types memory
-         mtl servant servant-server tagged time transformers wai
-       ];
-       testHaskellDepends = [
-         base bytestring cereal cryptonite data-default deepseq hspec
-         QuickCheck servant-server time transformers
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion cryptonite servant-server
-       ];
-       description = "Authentication via encrypted cookies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-cookie_0_6_0_3" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , cereal, cereal-time, cookie, criterion, cryptonite, data-default
      , deepseq, exceptions, hspec, http-api-data, http-types, memory
@@ -182270,7 +179076,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -182518,20 +179323,6 @@ self: {
      }) {};
 
   "servant-blaze" = callPackage
-    ({ mkDerivation, base, blaze-html, http-media, servant }:
-     mkDerivation {
-       pname = "servant-blaze";
-       version = "0.7.1";
-       sha256 = "0ii60xn5khsj8w3glvwqpwrpd6v9yc1n52gk9qsfwfxq49x1rvch";
-       revision = "6";
-       editedCabalFile = "051m44rqmxkl30n96qcbz1xwwsw2n7l7laflnc0xydc40ws0bj96";
-       libraryHaskellDepends = [ base blaze-html http-media servant ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Blaze-html support for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-blaze_0_8" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant
      , servant-server, wai, warp
      }:
@@ -182544,7 +179335,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-cassava" = callPackage
@@ -182570,33 +179360,6 @@ self: {
      }) {};
 
   "servant-checked-exceptions" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
-     , hspec-wai, http-media, profunctors, servant, servant-client
-     , servant-docs, servant-server, tagged, tasty, tasty-hspec
-     , tasty-hunit, text, wai
-     }:
-     mkDerivation {
-       pname = "servant-checked-exceptions";
-       version = "0.4.1.0";
-       sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g";
-       revision = "1";
-       editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq http-media profunctors servant
-         servant-client servant-docs servant-server tagged text
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hspec-wai servant servant-server tasty
-         tasty-hspec tasty-hunit wai
-       ];
-       homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
-       description = "Checked exceptions for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-checked-exceptions_1_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
      , hspec-wai, http-media, http-types, profunctors, servant
      , servant-client, servant-client-core, servant-docs, servant-server
@@ -182620,43 +179383,9 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, deepseq, exceptions, generics-sop
-     , hspec, http-api-data, http-client, http-client-tls, http-media
-     , http-types, HUnit, monad-control, mtl, network, network-uri
-     , QuickCheck, safe, semigroupoids, servant, servant-server
-     , string-conversions, text, transformers, transformers-base
-     , transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.11";
-       sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga";
-       revision = "2";
-       editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         exceptions generics-sop http-api-data http-client http-client-tls
-         http-media http-types monad-control mtl network-uri safe
-         semigroupoids servant string-conversions text transformers
-         transformers-base transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring deepseq generics-sop hspec
-         http-api-data http-client http-media http-types HUnit mtl network
-         QuickCheck servant servant-server text transformers
-         transformers-compat wai warp
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "automatical derivation of querying functions for servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client_0_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
      , hspec-discover, http-api-data, http-client, http-client-tls
@@ -182685,7 +179414,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client-core" = callPackage
@@ -182772,34 +179500,6 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , case-insensitive, control-monad-omega, hashable, hspec
-     , http-media, http-types, lens, servant, string-conversions, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
-       version = "0.11";
-       sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         control-monad-omega hashable http-media http-types lens servant
-         string-conversions text unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base hspec lens servant string-conversions
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-docs_0_11_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , hspec-discover, http-media, http-types, lens, servant
@@ -182826,7 +179526,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -182946,18 +179645,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.10.1";
-       sha256 = "1j69mv1i6q5z790asbj0n24h62biz3dlnm2zrxnmwn4k4aygbwl8";
-       libraryHaskellDepends = [ base http-types lens servant text ];
-       testHaskellDepends = [ base hspec servant ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_11" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -182972,7 +179659,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generic" = callPackage
@@ -183155,20 +179841,6 @@ self: {
      }) {};
 
   "servant-lucid" = callPackage
-    ({ mkDerivation, base, http-media, lucid, servant }:
-     mkDerivation {
-       pname = "servant-lucid";
-       version = "0.7.1";
-       sha256 = "0h7yw140ymigrzrzp2vkkhg13gg1d8pj9xmcpq8bw2cv2myvl9pc";
-       revision = "6";
-       editedCabalFile = "0bz3j6xjig6qj7qwkvzv9kqvivd6qvz0kn42lpwg1kcf1j6w31mc";
-       libraryHaskellDepends = [ base http-media lucid servant ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Servant support for lucid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-lucid_0_8" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant, servant-server
      , wai, warp
      }:
@@ -183181,7 +179853,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-match" = callPackage
@@ -183224,36 +179895,6 @@ self: {
      }) {};
 
   "servant-mock" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
-     , hspec, hspec-discover, hspec-wai, http-types, QuickCheck, servant
-     , servant-server, transformers, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-mock";
-       version = "0.8.3";
-       sha256 = "0fwkygv4rx98qys8apj7aby4xhssgzqdgsxmb6vh4ky71vjq0q5m";
-       revision = "2";
-       editedCabalFile = "00dq310ik9nm20mxxr9d46jilp9h6k54f5mdl1ii2ggwy2mck1dm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring http-types QuickCheck servant servant-server
-         transformers wai
-       ];
-       executableHaskellDepends = [
-         aeson base QuickCheck servant-server warp
-       ];
-       testHaskellDepends = [
-         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
-         servant-server wai
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-mock_0_8_4" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , bytestring-conversion, hspec, hspec-discover, hspec-wai
      , http-types, QuickCheck, servant, servant-server, transformers
@@ -183280,7 +179921,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-multipart" = callPackage
@@ -183359,23 +179999,6 @@ self: {
      }) {};
 
   "servant-pandoc" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, http-media
-     , lens, pandoc-types, servant-docs, string-conversions, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-pandoc";
-       version = "0.4.1.4";
-       sha256 = "0hsmbrn7i6zbwfw5j2l8qppnjx1cl2g0iksim514ajga6zfjm96j";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive http-media lens pandoc-types
-         servant-docs string-conversions text unordered-containers
-       ];
-       description = "Use Pandoc to render servant API documentation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-pandoc_0_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, http-media
      , lens, pandoc-types, servant-docs, string-conversions, text
      , unordered-containers
@@ -183390,7 +180013,6 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -183609,21 +180231,6 @@ self: {
      }) {};
 
   "servant-ruby" = callPackage
-    ({ mkDerivation, base, casing, doctest, lens, QuickCheck
-     , servant-foreign, text
-     }:
-     mkDerivation {
-       pname = "servant-ruby";
-       version = "0.5.1.0";
-       sha256 = "0j1q8yl1cz8lwij17zl13rk35r0qnk8ibh963qlcd35w83wms56j";
-       libraryHaskellDepends = [ base casing lens servant-foreign text ];
-       testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/joneshf/servant-ruby#readme";
-       description = "Generate a Ruby client from a Servant API with Net::HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-ruby_0_7_0_0" = callPackage
     ({ mkDerivation, base, casing, doctest, lens, QuickCheck
      , servant-foreign, text
      }:
@@ -183636,7 +180243,6 @@ self: {
        homepage = "https://github.com/joneshf/servant-ruby#readme";
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-scotty" = callPackage
@@ -183660,45 +180266,6 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
-     , directory, doctest, exceptions, filemanip, filepath, hspec
-     , hspec-discover, hspec-wai, http-api-data, http-types
-     , monad-control, mtl, network, network-uri, parsec, QuickCheck
-     , resourcet, safe, servant, should-not-typecheck, split
-     , string-conversions, system-filepath, tagged, temporary, text
-     , transformers, transformers-base, transformers-compat, wai
-     , wai-app-static, wai-extra, warp, word8
-     }:
-     mkDerivation {
-       pname = "servant-server";
-       version = "0.11.0.1";
-       sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         containers exceptions filepath http-api-data http-types
-         monad-control mtl network network-uri resourcet safe servant split
-         string-conversions system-filepath tagged text transformers
-         transformers-base transformers-compat wai wai-app-static warp word8
-       ];
-       executableHaskellDepends = [ aeson base servant text wai warp ];
-       testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring directory
-         doctest exceptions filemanip filepath hspec hspec-wai http-types
-         mtl network parsec QuickCheck resourcet safe servant
-         should-not-typecheck string-conversions temporary text transformers
-         transformers-compat wai wai-extra warp
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-server_0_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
      , directory, doctest, exceptions, filepath, hspec, hspec-discover
@@ -183735,7 +180302,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -183802,33 +180368,6 @@ self: {
      }) {};
 
   "servant-static-th" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , directory, doctest, filepath, Glob, hspec-wai, http-media
-     , semigroups, servant, servant-blaze, servant-server, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, text, wai
-     }:
-     mkDerivation {
-       pname = "servant-static-th";
-       version = "0.1.0.6";
-       sha256 = "19rb7xmfnls8wkgyq6gf5b6rri6b6z4qfj1m2pxa9rwx5hfajiax";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-html bytestring containers directory filepath http-media
-         semigroups servant servant-blaze servant-server template-haskell
-         text
-       ];
-       testHaskellDepends = [
-         base blaze-html bytestring directory doctest filepath Glob
-         hspec-wai servant servant-blaze servant-server tasty tasty-hspec
-         tasty-hunit wai
-       ];
-       homepage = "https://github.com/cdepillabout/servant-static-th";
-       description = "Embed a directory of static files in your Servant server";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-static-th_0_2_0_1" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, doctest, filepath, Glob, hspec-wai, http-media
      , semigroups, servant, servant-blaze, servant-server, tasty
@@ -183853,7 +180392,6 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-static-th";
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -183884,30 +180422,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
-     , cabal-doctest, directory, doctest, filepath, hspec, http-media
-     , insert-ordered-containers, lens, QuickCheck, servant, swagger2
-     , text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.1.4";
-       sha256 = "0xcs019v0kmaa265a15zbqj591d3nrrj19r5176816pldq8q213i";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base bytestring hspec http-media insert-ordered-containers
-         lens QuickCheck servant swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base directory doctest filepath hspec lens
-         QuickCheck servant swagger2 text time
-       ];
-       homepage = "https://github.com/haskell-servant/servant-swagger";
-       description = "Generate Swagger specification for your servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_1_5" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
      , cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -183932,7 +180446,6 @@ self: {
        homepage = "https://github.com/haskell-servant/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -183962,29 +180475,6 @@ self: {
      }) {};
 
   "servant-websockets" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, conduit
-     , exceptions, resourcet, servant-server, text, wai, wai-websockets
-     , warp, websockets
-     }:
-     mkDerivation {
-       pname = "servant-websockets";
-       version = "1.0.0";
-       sha256 = "05y9yyrg5c99xdlyfzwddylrklpspabijdd08f5c75bhdi2i4cb2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring conduit exceptions resourcet
-         servant-server text wai wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [
-         aeson base conduit servant-server text wai warp websockets
-       ];
-       homepage = "https://github.com/moesenle/servant-websockets#readme";
-       description = "Small library providing WebSocket endpoints for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-websockets_1_1_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, resourcet, servant-server, text, wai, wai-websockets
      , warp, websockets
@@ -184005,7 +180495,6 @@ self: {
        homepage = "https://github.com/moesenle/servant-websockets#readme";
        description = "Small library providing WebSocket endpoints for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-xml" = callPackage
@@ -184014,8 +180503,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-xml";
-       version = "1.0.1";
-       sha256 = "09rxvrxxmj62rscvddza8rygx4zv06k975j99yz7ymggmimhwaig";
+       version = "1.0.1.1";
+       sha256 = "1j1gbwywbb8n6zplvf1drrlpp2ghh7n2jrzl9x7pjplplr6mfpbh";
        libraryHaskellDepends = [
          base bytestring http-media servant xmlbf xmlbf-xeno
        ];
@@ -185144,6 +181633,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "shake-language-c_0_12_0" = callPackage
+    ({ mkDerivation, base, data-default-class, directory, doctest
+     , fclabels, hspec, process, shake, split, unordered-containers
+     }:
+     mkDerivation {
+       pname = "shake-language-c";
+       version = "0.12.0";
+       sha256 = "1c0smbshksjw114m09n5i1ynkhibvd9kix9n7h696p75g40ka7k6";
+       libraryHaskellDepends = [
+         base data-default-class fclabels process shake split
+         unordered-containers
+       ];
+       testHaskellDepends = [ base directory doctest hspec shake ];
+       doCheck = false;
+       homepage = "https://github.com/samplecount/shake-language-c";
+       description = "Utilities for cross-compiling with Shake";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-minify" = callPackage
     ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }:
      mkDerivation {
@@ -186006,23 +182515,6 @@ self: {
      }) {};
 
   "show-prettyprint" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
-     , trifecta
-     }:
-     mkDerivation {
-       pname = "show-prettyprint";
-       version = "0.2.0.1";
-       sha256 = "0nkp1qjm017j3pmih9qnymi361wq1f45vr2pqi6y3wbspi0gq029";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base prettyprinter trifecta
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/quchen/show-prettyprint#readme";
-       description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "show-prettyprint_0_2_0_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
      , trifecta
      }:
@@ -186037,7 +182529,6 @@ self: {
        homepage = "https://github.com/quchen/show-prettyprint#readme";
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "show-type" = callPackage
@@ -186930,6 +183421,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-reflect_0_3_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "simple-reflect";
+       version = "0.3.3";
+       sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
+       description = "Simple reflection of expressions containing variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-rope" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck }:
      mkDerivation {
@@ -187931,22 +184435,23 @@ self: {
      }) {};
 
   "skylighting" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , blaze-html, bytestring, case-insensitive, containers, criterion
-     , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show
-     , QuickCheck, random, regex-pcre-builtin, safe, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, text, utf8-string
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.5.1";
-       sha256 = "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg";
+       version = "0.6";
+       sha256 = "1027rcj6zqmnwm6is5k5v28r8af8bsf6i36dwi128h5g92pg206f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring binary blaze-html
-         bytestring case-insensitive containers directory filepath hxt mtl
-         regex-pcre-builtin safe text utf8-string
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-pcre-builtin safe text utf8-string
        ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
@@ -188121,30 +184626,6 @@ self: {
      }) {};
 
   "slack-web" = callPackage
-    ({ mkDerivation, aeson, base, containers, errors, hspec
-     , http-api-data, http-client, http-client-tls, megaparsec, mtl
-     , servant, servant-client, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "slack-web";
-       version = "0.2.0.1";
-       sha256 = "1v1w6szcjy4qgdx66754vkp7w4fnkyg0pngijy2v422pqmc4jpr9";
-       libraryHaskellDepends = [
-         aeson base containers errors http-api-data http-client
-         http-client-tls megaparsec mtl servant servant-client text time
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base containers errors hspec http-api-data megaparsec text
-         time
-       ];
-       homepage = "https://github.com/jpvillaisaza/slack-web";
-       description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "slack-web_0_2_0_3" = callPackage
     ({ mkDerivation, aeson, base, containers, errors, hspec
      , http-api-data, http-client, http-client-tls, megaparsec, mtl
      , servant, servant-client, servant-client-core, text, time
@@ -189252,8 +185733,8 @@ self: {
        pname = "snap-server";
        version = "1.0.3.3";
        sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl";
-       revision = "2";
-       editedCabalFile = "1nb3jxr7sgw2r305k6bbbyyx8myxm3r01a8zhvxdkz4xvv9907d0";
+       revision = "3";
+       editedCabalFile = "0y0rd2skx59knkxm53zg6m4mi0p4rj9jw32vsj9mbl8sy2vw9hlj";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -190512,8 +186993,8 @@ self: {
        pname = "soap";
        version = "0.2.3.5";
        sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs";
-       revision = "2";
-       editedCabalFile = "07283pa4n5mf908zl3az9gy95y49zk65kiwyymsmcz5nvhqvp840";
+       revision = "3";
+       editedCabalFile = "0kdxd31csfmixq3jps9kqhcbqirrvrlxh4lv07gyb761dpfpc039";
        libraryHaskellDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
@@ -191364,30 +187845,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sparse-linear-algebra_0_2_9_7" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec
-     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
-     , scientific, transformers, vector, vector-algorithms, vector-space
-     }:
-     mkDerivation {
-       pname = "sparse-linear-algebra";
-       version = "0.2.9.7";
-       sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers exceptions mtl transformers vector
-         vector-algorithms vector-space
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec matrix-market-attoparsec mtl
-         mwc-random primitive QuickCheck scientific vector-space
-       ];
-       homepage = "https://github.com/ocramz/sparse-linear-algebra";
-       description = "Numerical computation in native Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "sparse-linear-algebra" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec
      , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
@@ -191411,6 +187868,30 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "sparse-linear-algebra_0_3" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
+     , scientific, transformers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "sparse-linear-algebra";
+       version = "0.3";
+       sha256 = "10s3z0mva8hf9f2ckbpfkzdkhnixp73xli5yigh4d44662rzwqn1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers exceptions hspec mtl primitive QuickCheck
+         transformers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec matrix-market-attoparsec mtl
+         mwc-random primitive QuickCheck scientific
+       ];
+       homepage = "https://github.com/ocramz/sparse-linear-algebra";
+       description = "Numerical computing in native Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparsebit" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -192007,6 +188488,8 @@ self: {
        pname = "splitmix";
        version = "0";
        sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi";
+       revision = "1";
+       editedCabalFile = "0dh4p3rzvx3zwj0bh5flf4qsiw831rb4vxmbh5jq45qkvry8z8hy";
        libraryHaskellDepends = [ base random time ];
        testHaskellDepends = [
          base base-compat bytestring random tf-random
@@ -193388,51 +189871,6 @@ self: {
      }) {};
 
   "stackage-curator" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
-     , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
-     , conduit, conduit-extra, containers, cryptonite
-     , cryptonite-conduit, data-default-class, directory, exceptions
-     , filepath, hashable, hspec, html-conduit, http-client
-     , http-client-tls, http-conduit, lucid, memory, mime-types
-     , monad-unlift, monad-unlift-ref, mono-traversable, mtl, old-locale
-     , optparse-applicative, optparse-simple, process, QuickCheck
-     , resourcet, safe, semigroups, stm, store, streaming-commons, syb
-     , system-fileio, system-filepath, tar, temporary, text, time
-     , transformers, unix-compat, unordered-containers, utf8-string
-     , vector, xml-conduit, xml-types, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "stackage-curator";
-       version = "0.15.1.0";
-       sha256 = "158bxk5g1bc139nmdqvr4fid5igmsgqa1d4nxy0dpl8xb68l69jp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 async base blaze-html
-         bytestring Cabal classy-prelude-conduit conduit conduit-extra
-         containers cryptonite cryptonite-conduit data-default-class
-         directory exceptions filepath hashable html-conduit http-client
-         http-client-tls http-conduit lucid memory mime-types monad-unlift
-         monad-unlift-ref mono-traversable mtl old-locale process resourcet
-         safe semigroups stm store streaming-commons syb system-fileio
-         system-filepath tar temporary text time transformers unix-compat
-         unordered-containers utf8-string vector xml-conduit xml-types yaml
-         zlib
-       ];
-       executableHaskellDepends = [
-         aeson base http-client http-client-tls optparse-applicative
-         optparse-simple system-filepath text
-       ];
-       testHaskellDepends = [
-         base Cabal classy-prelude-conduit containers directory hspec
-         http-client http-client-tls QuickCheck text yaml
-       ];
-       homepage = "https://github.com/fpco/stackage-curator";
-       description = "Tools for curating Stackage bundles";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stackage-curator_0_16_0_0" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
      , conduit, conduit-extra, containers, cryptonite
@@ -193475,7 +189913,6 @@ self: {
        homepage = "https://github.com/fpco/stackage-curator";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-install" = callPackage
@@ -193510,6 +189947,8 @@ self: {
        pname = "stackage-metadata";
        version = "0.3.0.0";
        sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx";
+       revision = "1";
+       editedCabalFile = "1kfdzvvfxlc0y23mdwklm3szb91zjwpzibb68jgjf1hkmv5kfzk3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193522,7 +189961,7 @@ self: {
          stackage-install stackage-update tar text transformers yaml
        ];
        homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool";
-       description = "Grab current metadata for all packages";
+       description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194129,6 +190568,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "static-text_0_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty
+     , tasty-hunit, template-haskell, text, vector
+     }:
+     mkDerivation {
+       pname = "static-text";
+       version = "0.2.0.1";
+       sha256 = "0acj953bclr2b9qd1i5b1grxrz07pr38f9q720j92v4xpk8i4pgd";
+       libraryHaskellDepends = [
+         base bytestring template-haskell text vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest doctest-discover tasty tasty-hunit
+         template-haskell
+       ];
+       homepage = "https://github.com/dzhus/static-text#readme";
+       description = "Lists, Texts, ByteStrings and Vectors of statically known length";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "staticanalysis" = callPackage
     ({ mkDerivation, base, MissingH }:
      mkDerivation {
@@ -194632,35 +191092,6 @@ self: {
      }) {};
 
   "stm-conduit" = callPackage
-    ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
-     , conduit-combinators, conduit-extra, directory, doctest, ghc-prim
-     , HUnit, lifted-async, lifted-base, monad-control, monad-loops
-     , QuickCheck, resourcet, stm, stm-chans, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, transformers
-     , void
-     }:
-     mkDerivation {
-       pname = "stm-conduit";
-       version = "3.0.0";
-       sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg";
-       revision = "1";
-       editedCabalFile = "0wmjqypqjw9irmpsmra6zbj1sa4l14xnx5xpaz2zvfsk4x90qyyg";
-       libraryHaskellDepends = [
-         async base cereal cereal-conduit conduit conduit-combinators
-         conduit-extra directory ghc-prim lifted-async lifted-base
-         monad-control monad-loops resourcet stm stm-chans transformers void
-       ];
-       testHaskellDepends = [
-         base conduit conduit-combinators directory doctest HUnit QuickCheck
-         resourcet stm stm-chans test-framework test-framework-hunit
-         test-framework-quickcheck2 transformers
-       ];
-       homepage = "https://github.com/cgaebel/stm-conduit";
-       description = "Introduces conduits to channels, and promotes using conduits concurrently";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stm-conduit_4_0_0" = callPackage
     ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
      , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
      , QuickCheck, resourcet, stm, stm-chans, test-framework
@@ -194684,7 +191115,6 @@ self: {
        homepage = "https://github.com/cgaebel/stm-conduit";
        description = "Introduces conduits to channels, and promotes using conduits concurrently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-containers" = callPackage
@@ -195006,6 +191436,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stopwatch_0_1_0_5" = callPackage
+    ({ mkDerivation, base, clock, hspec, transformers }:
+     mkDerivation {
+       pname = "stopwatch";
+       version = "0.1.0.5";
+       sha256 = "0q9l27cpfz5hs3ggxij0lk8p3vrgkjg1binhv2nwss4dvygdc7j6";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "storable" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -195225,30 +191669,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
-     , hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.14.0";
-       sha256 = "11y97l0qsyab8hk126qi4lj8a8d13wp8zhk2qsqwy31rcmjipr0s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable lens template-haskell
-         text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable hspec hspec-discover
-         lens template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_19_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -195270,7 +191690,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -195578,14 +191997,14 @@ self: {
      }) {};
 
   "streaming-concurrency" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, lifted-async
+    ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async
      , monad-control, QuickCheck, quickcheck-instances, stm, streaming
-     , streaming-with, transformers-base
+     , streaming-with, testbench, transformers-base
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.3.0.1";
-       sha256 = "040x4g1q520s6a1kxi4j730r6vr7n539wg92mdcvg9bswa620yqj";
+       version = "0.3.1.0";
+       sha256 = "151nyi75qrlvp5q3xi678rkg2vk0mrvpyr8c4yagh1df90amhvsm";
        libraryHaskellDepends = [
          base exceptions lifted-async monad-control stm streaming
          streaming-with transformers-base
@@ -195593,6 +192012,10 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances streaming
        ];
+       benchmarkHaskellDepends = [
+         base exceptions HUnit lifted-async monad-control streaming
+         testbench
+       ];
        description = "Concurrency support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195857,8 +192280,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka";
-       version = "2.0.2";
-       sha256 = "1lrp6llvl0g469gjgl7rl67qj8zn1ssbg61n6qwkb8lqqqpq03mq";
+       version = "2.0.2.1";
+       sha256 = "0wh702y5m7045jlr3qf2k852x68d7ylr16hanb6jjw2f476fnc7i";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base base-prelude base64-bytestring
          bifunctors bytestring bytestring-tree-builder hashable http-media
@@ -195895,8 +192318,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka-wai";
-       version = "1.0.1";
-       sha256 = "0zbz8aa5gvh4y5brypzkp8bn1gkkz4pcdmd3ga62xpym8hhf83cc";
+       version = "1.0.1.1";
+       sha256 = "05l26v777fifb5rpvmkyvaqr12f7q8i9780savx6wfabi6wvqh5i";
        libraryHaskellDepends = [
          base base-prelude bytestring case-insensitive http-types
          strelka-core text unordered-containers wai warp
@@ -195933,23 +192356,6 @@ self: {
      }) {};
 
   "strict-base-types" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
-     , hashable, lens, QuickCheck, strict
-     }:
-     mkDerivation {
-       pname = "strict-base-types";
-       version = "0.5.0";
-       sha256 = "1jx10iqkdmrhakk1aq2g9vf8lfm8gd9y560s2s69qzzrszrsvg7y";
-       libraryHaskellDepends = [
-         aeson base bifunctors binary deepseq ghc-prim hashable lens
-         QuickCheck strict
-       ];
-       homepage = "https://github.com/meiersi/strict-base-types";
-       description = "Strict variants of the types provided in base";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "strict-base-types_0_6_1" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
      , hashable, lens, QuickCheck, strict
      }:
@@ -195964,7 +192370,6 @@ self: {
        homepage = "https://github.com/meiersi/strict-base-types";
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-concurrency" = callPackage
@@ -196262,23 +192667,6 @@ self: {
      }) {};
 
   "string-transform" = callPackage
-    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
-     , tasty-smallcheck, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "string-transform";
-       version = "0.1.1";
-       sha256 = "0qg9db46hbpgwndg1n7h6dfz5kx8372fqbs02nw8p9l6fsigiks8";
-       libraryHaskellDepends = [ base bytestring text utf8-string ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
-       ];
-       homepage = "https://github.com/ncaq/string-transform#readme";
-       description = "simple and easy haskell string transform wrapper";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "string-transform_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, tasty, tasty-hunit
      , tasty-smallcheck, text, utf8-string
      }:
@@ -196293,7 +192681,6 @@ self: {
        homepage = "https://github.com/ncaq/string-transform#readme";
        description = "simple and easy haskell string transform wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-typelits" = callPackage
@@ -196443,23 +192830,6 @@ self: {
      }) {};
 
   "stripe-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, mtl, text, time
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "stripe-core";
-       version = "2.2.3";
-       sha256 = "0vyqmz0q2davlqj2673pzj5qxawvrxypm2jd839igb5y0wnj9idv";
-       libraryHaskellDepends = [
-         aeson base bytestring mtl text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
-       description = "Stripe API for Haskell - Pure Core";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-core_2_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, mtl, text, time
      , transformers, unordered-containers
      }:
@@ -196474,22 +192844,9 @@ self: {
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-haskell" = callPackage
-    ({ mkDerivation, base, stripe-core, stripe-http-streams }:
-     mkDerivation {
-       pname = "stripe-haskell";
-       version = "2.2.3";
-       sha256 = "086baq9f9pzacf5vqvi2ikx47sijyb8r6ndnqph9r8qvjgc2xy2x";
-       libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
-       homepage = "https://github.com/dmjio/stripe";
-       description = "Stripe API for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-haskell_2_3_0" = callPackage
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
@@ -196499,30 +192856,9 @@ self: {
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-http-streams" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec
-     , http-streams, io-streams, stripe-core, stripe-tests, text
-     }:
-     mkDerivation {
-       pname = "stripe-http-streams";
-       version = "2.2.3";
-       sha256 = "0bdl85xwm7ym1kf2d0vjn4652z3bgvzj2l7z5lgsxzr5acn6q02p";
-       libraryHaskellDepends = [
-         aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
-         text
-       ];
-       testHaskellDepends = [
-         base free HsOpenSSL hspec http-streams stripe-core stripe-tests
-       ];
-       doCheck = false;
-       description = "Stripe API for Haskell - http-streams backend";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-http-streams_2_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec
      , http-streams, io-streams, stripe-core, stripe-tests, text
      }:
@@ -196540,28 +192876,9 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-tests" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
-     , mtl, random, stripe-core, text, time, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stripe-tests";
-       version = "2.2.3";
-       sha256 = "1yks2wabqirq4hi1a52k9302pyp1w4q7b6chg6a7r28wsjlv27hs";
-       libraryHaskellDepends = [
-         aeson base bytestring free hspec hspec-core mtl random stripe-core
-         text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
-       description = "Tests for Stripe API bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-tests_2_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
      , mtl, random, stripe-core, text, time, transformers
      , unordered-containers
@@ -196577,7 +192894,6 @@ self: {
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strips" = callPackage
@@ -196596,25 +192912,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "4.0.3";
-       sha256 = "1b1shq0jznyx9cbir33diflw1602py651rqj2hfjrgdywjrac8fq";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [ base bytestring markdown-unlit time ];
-       homepage = "https://github.com/tfausak/strive#readme";
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_5_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -196631,7 +192928,6 @@ self: {
        homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -196905,41 +193201,12 @@ self: {
          base base-compat bytestring optparse-applicative
        ];
        testHaskellDepends = [ base base-compat bytestring hspec ];
+       doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
-     , strict, syb, test-framework, test-framework-hunit, yaml
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.8.1.0";
-       sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl syb yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl optparse-applicative strict syb yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
-         yaml
-       ];
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_9_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , file-embed, filepath, haskell-src-exts, HUnit, mtl
      , optparse-applicative, strict, syb, test-framework
@@ -196967,7 +193234,6 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -197718,6 +193984,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sv-cassava" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv
+     , text, utf8-string, validation, vector
+     }:
+     mkDerivation {
+       pname = "sv-cassava";
+       version = "0.1";
+       sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15";
+       libraryHaskellDepends = [
+         attoparsec base bytestring cassava sv utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring cassava HUnit sv text validation vector
+       ];
+       homepage = "https://github.com/qfpl/sv";
+       description = "Integration to use sv with cassava's parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
      , unordered-containers
@@ -197769,6 +194054,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "svg-tree_0_6_2_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
+     , vector, xml
+     }:
+     mkDerivation {
+       pname = "svg-tree";
+       version = "0.6.2.2";
+       sha256 = "1iva5vb76z2laygvlh31zbhhcfzympk9s765499j7p356ycl0s1s";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "svg2q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -200326,18 +196629,6 @@ self: {
      }) {};
 
   "tar-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit-combinators }:
-     mkDerivation {
-       pname = "tar-conduit";
-       version = "0.1.1";
-       sha256 = "189dy1j32c44mjr3waljcvch1hqlijnax7myp4jih7y12hji6i9r";
-       libraryHaskellDepends = [ base bytestring conduit-combinators ];
-       homepage = "https://github.com/snoyberg/tar-conduit#readme";
-       description = "Parse tar files using conduit for streaming";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tar-conduit_0_2_3" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, criterion, deepseq, directory, filepath, hspec
      , QuickCheck, safe-exceptions, text, unix, weigh
@@ -200361,7 +196652,6 @@ self: {
        homepage = "https://github.com/snoyberg/tar-conduit#readme";
        description = "Extract and create tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -200518,24 +196808,6 @@ self: {
      }) {};
 
   "tasty" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers
-     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
-     , unbounded-delays, unix
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "0.11.3";
-       sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative regex-tdfa stm tagged unbounded-delays unix
-       ];
-       homepage = "https://github.com/feuerbach/tasty";
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_1_0_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      }:
@@ -200550,7 +196822,6 @@ self: {
        homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -200594,18 +196865,6 @@ self: {
      }) {};
 
   "tasty-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "0.7.1.1";
-       sha256 = "04qmgvm6z2bfbb8dsbj71famyiacswp7nbjwsa043w4i0hnsgpsl";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_1_0_1" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
@@ -200615,37 +196874,9 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, Glob
-     , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-discover";
-       version = "4.1.5";
-       sha256 = "1v2g0jyfrcv04klxicp1z6p478ppq5l3szkx4f4hjqnim6kg8pgh";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath Glob
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath Glob
-       ];
-       testHaskellDepends = [
-         base containers directory filepath Glob hedgehog tasty
-         tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       homepage = "https://github.com/lwm/tasty-discover#readme";
-       description = "Test discovery for the tasty framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-discover_4_2_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck
@@ -200670,7 +196901,6 @@ self: {
        homepage = "https://github.com/lwm/tasty-discover#readme";
        description = "Test discovery for the tasty framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-expected-failure" = callPackage
@@ -200716,27 +196946,6 @@ self: {
      }) {};
 
   "tasty-golden" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, mtl, optparse-applicative, process, tagged
-     , tasty, tasty-hunit, temporary, temporary-rc
-     }:
-     mkDerivation {
-       pname = "tasty-golden";
-       version = "2.3.1.2";
-       sha256 = "088rvrvmi8wjci3zlyn3mph1yjl77j0wabdwzp4x2wxpygviy7k9";
-       libraryHaskellDepends = [
-         async base bytestring containers deepseq directory filepath mtl
-         optparse-applicative process tagged tasty temporary
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary-rc
-       ];
-       homepage = "https://github.com/feuerbach/tasty-golden";
-       description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-golden_2_3_1_3" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, mtl, optparse-applicative, process, tagged
      , tasty, tasty-hunit, temporary, temporary-rc
@@ -200755,7 +196964,6 @@ self: {
        homepage = "https://github.com/feuerbach/tasty-golden";
        description = "Golden tests support for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-groundhog-converters" = callPackage
@@ -200785,11 +196993,13 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.1.0.2";
        sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x";
+       revision = "1";
+       editedCabalFile = "1kmmry6zawyhxgi20v3j62m58lqjcjzvap0qp6b35yj31vbzl727";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       homepage = "https://github.com/qfpl/tasty-hedghog";
+       homepage = "https://github.com/qfpl/tasty-hedgehog";
        description = "Integrates the hedgehog testing library with the tasty testing framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200802,11 +197012,13 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
+       revision = "2";
+       editedCabalFile = "1if3pmvnnfs8zrqbg5awdc9qafqhwrgq4f75bqcqlapljlhp4xx0";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       homepage = "https://github.com/qfpl/tasty-hedghog";
+       homepage = "https://github.com/qfpl/tasty-hedgehog";
        description = "Integration for tasty and hedgehog";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200848,18 +197060,6 @@ self: {
      }) {};
 
   "tasty-hunit" = callPackage
-    ({ mkDerivation, base, tasty }:
-     mkDerivation {
-       pname = "tasty-hunit";
-       version = "0.9.2";
-       sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
-       libraryHaskellDepends = [ base tasty ];
-       homepage = "http://documentup.com/feuerbach/tasty";
-       description = "HUnit support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-hunit_0_10_0_1" = callPackage
     ({ mkDerivation, base, call-stack, tasty }:
      mkDerivation {
        pname = "tasty-hunit";
@@ -200869,7 +197069,6 @@ self: {
        homepage = "https://github.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-hunit-adapter" = callPackage
@@ -201011,11 +197210,11 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-quickcheck";
-       version = "0.9.1";
-       sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa";
+       version = "0.9.2";
+       sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5";
        libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-       homepage = "http://documentup.com/feuerbach/tasty";
+       homepage = "https://github.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -202280,25 +198479,6 @@ self: {
      }) {};
 
   "terminal-progress-bar" = callPackage
-    ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "terminal-progress-bar";
-       version = "0.1.1.1";
-       sha256 = "1y9mpmnbc12bbybaqq7cqwhvbbdbx31zxkb63mymiaz1bnhi58fp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base stm stm-chans ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/roelvandijk/terminal-progress-bar";
-       description = "A simple progress bar in the terminal";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "terminal-progress-bar_0_2" = callPackage
     ({ mkDerivation, async, base, HUnit, stm, stm-chans, terminal-size
      , test-framework, test-framework-hunit
      }:
@@ -202315,7 +198495,6 @@ self: {
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
        description = "A simple progress bar in the terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-size" = callPackage
@@ -202464,27 +198643,6 @@ self: {
      }) {};
 
   "test-framework" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
-     , hostname, old-locale, random, regex-posix, time, xml
-     }:
-     mkDerivation {
-       pname = "test-framework";
-       version = "0.8.1.1";
-       sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
-       revision = "3";
-       editedCabalFile = "1b6pi4j1dpcbiyx1bpfks29x293j02z7ashs2sdc8fhzbwsr9lxj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal ansi-wl-pprint base containers hostname old-locale
-         random regex-posix time xml
-       ];
-       homepage = "https://batterseapower.github.io/test-framework/";
-       description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "test-framework_0_8_2_0" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, bytestring
      , containers, hostname, HUnit, libxml, old-locale, QuickCheck
      , random, regex-posix, semigroups, time, xml
@@ -202505,7 +198663,6 @@ self: {
        homepage = "http://haskell.github.io/test-framework/";
        description = "Framework for running and organising tests, with HUnit and QuickCheck support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-doctest" = callPackage
@@ -203099,30 +199256,6 @@ self: {
      }) {};
 
   "text" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
-     , quickcheck-unicode, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "text";
-       version = "1.2.2.2";
-       sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii";
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq ghc-prim integer-gmp
-       ];
-       testHaskellDepends = [
-         array base binary bytestring deepseq directory ghc-prim HUnit
-         integer-gmp QuickCheck quickcheck-unicode random test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       doCheck = false;
-       homepage = "https://github.com/bos/text";
-       description = "An efficient packed Unicode text type";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "text_1_2_3_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
      , quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -203144,25 +199277,9 @@ self: {
        homepage = "https://github.com/haskell/text";
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-all" = callPackage
-    ({ mkDerivation, base, bytestring, text, text-format, utf8-string
-     }:
-     mkDerivation {
-       pname = "text-all";
-       version = "0.4.1.1";
-       sha256 = "195f1l4s6vfg4dhpmkfsd178rldknw0gdkl1qpbn3kzhba044y7w";
-       libraryHaskellDepends = [
-         base bytestring text text-format utf8-string
-       ];
-       homepage = "http://github.com/aelve/text-all";
-       description = "Everything Data.Text related in one package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-all_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, text, text-format, utf8-string
      }:
      mkDerivation {
@@ -203175,7 +199292,6 @@ self: {
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-and-plots" = callPackage
@@ -203772,6 +199888,8 @@ self: {
        pname = "text-show";
        version = "3.7.2";
        sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s";
+       revision = "1";
+       editedCabalFile = "1iaa9scqwys9da98ya62jz2lyqia79ys8zq4hhcgb3l45x0ngc27";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -203810,8 +199928,8 @@ self: {
        pname = "text-show-instances";
        version = "3.6.2";
        sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5";
-       revision = "1";
-       editedCabalFile = "04rkwk7c6zzl2ql22x66gn3amgq7cfqdndxyhh6ywlbksa9ljjsw";
+       revision = "3";
+       editedCabalFile = "1nzl40bcg17i98xnlcm5djhriaz6pcmhyzmmd0pavkgyra57arz0";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -203832,6 +199950,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show-instances_3_6_3" = callPackage
+    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+     , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale
+     , old-time, pretty, process, QuickCheck, quickcheck-instances
+     , random, semigroups, tagged, template-haskell, terminfo, text
+     , text-show, th-orphans, time, transformers, transformers-compat
+     , unix, unordered-containers, vector, xhtml
+     }:
+     mkDerivation {
+       pname = "text-show-instances";
+       version = "3.6.3";
+       sha256 = "14b5bz0xxihi44nd80c8ma81khn7yjcpl8xvavsdfqy4jz9sb9fr";
+       libraryHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
+         random semigroups tagged template-haskell terminfo text text-show
+         time transformers transformers-compat unix unordered-containers
+         vector xhtml
+       ];
+       testHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
+         old-locale old-time pretty process QuickCheck quickcheck-instances
+         random semigroups tagged template-haskell terminfo text text-show
+         th-orphans time transformers transformers-compat unix
+         unordered-containers vector xhtml
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/RyanGlScott/text-show-instances";
+       description = "Additional instances for text-show";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
      }:
@@ -204257,6 +200410,8 @@ self: {
        pname = "th-desugar";
        version = "1.7";
        sha256 = "1iqlqadax1ahgv9h1vdyddf55v2h4ghqrxfyqirrvk97iyk1rcsj";
+       revision = "1";
+       editedCabalFile = "06cxv8yx2dwppzzb9vjqiic2hiaiiqakg0kv0byp9k00sidabbm3";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-expand-syns th-lift
          th-orphans
@@ -204278,6 +200433,8 @@ self: {
        pname = "th-desugar";
        version = "1.8";
        sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv";
+       revision = "1";
+       editedCabalFile = "13jvl6ijxjwbd7df0cq5pnijs3wrs8x5r9ykyyj180dak66909wd";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-expand-syns th-lift
          th-orphans
@@ -204466,13 +200623,13 @@ self: {
      }) {};
 
   "th-nowq" = callPackage
-    ({ mkDerivation, base, template-haskell, time }:
+    ({ mkDerivation, base, markdown-unlit, template-haskell, time }:
      mkDerivation {
        pname = "th-nowq";
-       version = "0.1.0.0";
-       sha256 = "06ajyk1a1kdxa0cva4lym2jf52bkkz8dxgk8753k2m035czm2w26";
+       version = "0.1.0.2";
+       sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1";
        libraryHaskellDepends = [ base template-haskell time ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base markdown-unlit ];
        homepage = "https://github.com/dzhus/th-nowq#readme";
        description = "Template Haskell splice that expands to current time";
        license = stdenv.lib.licenses.bsd3;
@@ -204978,6 +201135,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threads_0_5_1_6" = callPackage
+    ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "threads";
+       version = "0.5.1.6";
+       sha256 = "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base concurrent-extra HUnit stm test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/basvandijk/threads";
+       description = "Fork threads and wait for their result";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threads-extras" = callPackage
     ({ mkDerivation, base, stm, threads }:
      mkDerivation {
@@ -205846,8 +202022,8 @@ self: {
        pname = "time-parsers";
        version = "0.1.2.0";
        sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f";
-       revision = "1";
-       editedCabalFile = "1fvk31ab241v4ib7lg718q6qwrc3w7axq9kinccbdnn7b7d259gj";
+       revision = "2";
+       editedCabalFile = "1qvhmwkdb4a0msxpfssyqdz0fmi45iv7iwmw7b1mf4flqz6jvaql";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -206033,17 +202209,6 @@ self: {
      }) {};
 
   "timeit" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "timeit";
-       version = "1.0.0.0";
-       sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x";
-       libraryHaskellDepends = [ base ];
-       description = "Time a computation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timeit_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "timeit";
@@ -206053,7 +202218,6 @@ self: {
        homepage = "https://github.com/merijn/timeit";
        description = "Time monadic computations with an IO base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timelens" = callPackage
@@ -206290,6 +202454,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timers-tick" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "timers-tick";
+       version = "0.4.0.0";
+       sha256 = "02da32j9jz21awmsf38rrj3l3ks7s9a6vvqadr98c35shx3sxzcq";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://ariis.it/static/articles/timers-tick/page.html";
+       description = "tick based timers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timers-updatable" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -206383,6 +202560,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-olson_0_1_9" = callPackage
+    ({ mkDerivation, base, binary, bytestring, extensible-exceptions
+     , time, timezone-series
+     }:
+     mkDerivation {
+       pname = "timezone-olson";
+       version = "0.1.9";
+       sha256 = "05abywx1nrcaz0nqzfy4zw62bc5qd7pdfnjvv4drxkwv084ha8rj";
+       libraryHaskellDepends = [
+         base binary bytestring extensible-exceptions time timezone-series
+       ];
+       homepage = "http://projects.haskell.org/time-ng/";
+       description = "A pure Haskell parser and renderer for binary Olson timezone files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timezone-olson-th" = callPackage
     ({ mkDerivation, base, template-haskell, time, timezone-olson
      , timezone-series
@@ -206411,6 +202605,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-series_0_1_9" = callPackage
+    ({ mkDerivation, base, deepseq, time }:
+     mkDerivation {
+       pname = "timezone-series";
+       version = "0.1.9";
+       sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5";
+       libraryHaskellDepends = [ base deepseq time ];
+       homepage = "http://projects.haskell.org/time-ng/";
+       description = "Enhanced timezone handling for Data.Time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timezone-unix" = callPackage
     ({ mkDerivation, base, directory, filepath, leapseconds, tasty
      , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series
@@ -206701,29 +202908,6 @@ self: {
      }) {};
 
   "tldr" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
-     , filepath, optparse-applicative, semigroups, shell-conduit, text
-     }:
-     mkDerivation {
-       pname = "tldr";
-       version = "0.2.5";
-       sha256 = "0b87zkwj27z7h5rxf25qh4sq20smwbd3fg6j30hgmn0p9rsg4gzw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring cmark text
-       ];
-       executableHaskellDepends = [
-         base directory filepath optparse-applicative semigroups
-         shell-conduit
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/psibi/tldr-hs#readme";
-       description = "Haskell tldr client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tldr_0_3_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
      , filepath, optparse-applicative, semigroups, text, typed-process
      }:
@@ -206744,7 +202928,6 @@ self: {
        homepage = "https://github.com/psibi/tldr-hs#readme";
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls" = callPackage
@@ -207828,8 +204011,8 @@ self: {
      }:
      mkDerivation {
        pname = "transfer-db";
-       version = "0.3.1.0";
-       sha256 = "0gmgn78p0gfpm8iqkziz50yrx59lkj6m11lnawyfi55dxjjcwqgf";
+       version = "0.3.1.1";
+       sha256 = "1wgxg576dqivwxfks75nc0yaxxiaf8zyxz0fpay0qgdfwd218f2n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208686,8 +204869,8 @@ self: {
        pname = "trifecta";
        version = "1.7.1.1";
        sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
-       revision = "3";
-       editedCabalFile = "18n50vn8znpwci2f333wsqzr8zkj35ki5z8bs9a2717yhzyha4k8";
+       revision = "4";
+       editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -209433,29 +205616,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, foldl, hostname
-     , managed, optional-args, optparse-applicative, process, semigroups
-     , stm, system-fileio, system-filepath, temporary, text, time
-     , transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.4.6";
-       sha256 = "02qayazjr2b2g6ksmpwn9v5z3kibrf5kf9f1whfw83sq6vqa7ixx";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         foldl hostname managed optional-args optparse-applicative process
-         semigroups stm system-fileio system-filepath temporary text time
-         transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_5" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -209476,6 +205636,29 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "turtle_1_5_6" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , semigroups, stm, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.6";
+       sha256 = "1cx25845i4n00xjb5dg9jg1p229nra0j5r2jwpwarra5c092df2p";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm system-fileio
+         system-filepath temporary text time transformers unix unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -210286,18 +206469,6 @@ self: {
      }) {};
 
   "type-combinators-singletons" = callPackage
-    ({ mkDerivation, base, singletons, type-combinators }:
-     mkDerivation {
-       pname = "type-combinators-singletons";
-       version = "0.1.0.0";
-       sha256 = "11sc0fjlppp35fy35bk4vxzx8c4ws7j3zww59cg1abrpfk7i82mh";
-       libraryHaskellDepends = [ base singletons type-combinators ];
-       homepage = "https://github.com/mstksg/type-combinators-singletons";
-       description = "Interop between /type-combinators/ and /singletons/";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-combinators-singletons_0_2_1_0" = callPackage
     ({ mkDerivation, base, singletons, type-combinators }:
      mkDerivation {
        pname = "type-combinators-singletons";
@@ -210307,7 +206478,6 @@ self: {
        homepage = "https://github.com/mstksg/type-combinators-singletons";
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-digits" = callPackage
@@ -211034,22 +207204,6 @@ self: {
      }) {};
 
   "typelits-witnesses" = callPackage
-    ({ mkDerivation, base, base-compat, constraints, reflection
-     , transformers
-     }:
-     mkDerivation {
-       pname = "typelits-witnesses";
-       version = "0.2.3.0";
-       sha256 = "0311zz3anvngjgrgry2zij5jkb8mjxfcb8rvmrik06myq7wr4vm5";
-       libraryHaskellDepends = [
-         base base-compat constraints reflection transformers
-       ];
-       homepage = "https://github.com/mstksg/typelits-witnesses";
-       description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typelits-witnesses_0_3_0_1" = callPackage
     ({ mkDerivation, base, base-compat, constraints, reflection
      , transformers
      }:
@@ -211063,7 +207217,6 @@ self: {
        homepage = "https://github.com/mstksg/typelits-witnesses";
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typeof" = callPackage
@@ -211875,22 +208028,6 @@ self: {
      }) {};
 
   "unfoldable" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
-     , random, transformers
-     }:
-     mkDerivation {
-       pname = "unfoldable";
-       version = "0.9.5";
-       sha256 = "0ll29dvizh8hqhqncrmzwzgbb1q9br2f7326r38dr7xmdpmpjsbn";
-       libraryHaskellDepends = [
-         base containers ghc-prim one-liner QuickCheck random transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
-       description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unfoldable_0_9_6" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
      }:
@@ -211904,7 +208041,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -212698,30 +208834,6 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , ghc-prim, hashable, microlens, microlens-mtl, mtl
-     , safe-exceptions, semigroups, stm, text, text-format, transformers
-     , type-operators, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.0.0";
-       sha256 = "1wsglfacd2aqfxxri3hzs5zwxvfkn3kqb09icax1fncjmb0yc35w";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text text-format transformers
-         type-operators unordered-containers utf8-string vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq hashable mtl semigroups text
-         unordered-containers
-       ];
-       homepage = "https://github.com/serokell/universum";
-       description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "universum_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , doctest, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty
@@ -212748,7 +208860,6 @@ self: {
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -212906,6 +209017,8 @@ self: {
        pname = "unjson";
        version = "0.15.1.0";
        sha256 = "1k61lak22snr7fimpr7pjri33rg0gm1hhfn253bwlz3pvpn85vmp";
+       revision = "1";
+       editedCabalFile = "1icfcg8dbqw48a96w6j9jwa6xf08nms55pfixjwf4332qk7q7hkc";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific text time unordered-containers vector
@@ -212955,6 +209068,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_5_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.5.0";
+       sha256 = "0c08i5vnhjw28i321dpjap1a9jz3g85gq2zm39v8pl6w89ilcq81";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm transformers unix
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm
+         transformers unix unliftio-core
+       ];
+       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -213012,32 +209147,6 @@ self: {
      }) {};
 
   "unordered-containers" = callPackage
-    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
-     , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
-     , mtl, QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "unordered-containers";
-       version = "0.2.8.0";
-       sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4";
-       revision = "1";
-       editedCabalFile = "0bllj6rg1ab468ilxzhnafjx2qzqx1bshlf207rk9yhszw801awj";
-       libraryHaskellDepends = [ base deepseq hashable ];
-       testHaskellDepends = [
-         base ChasingBottoms containers hashable HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion deepseq deepseq-generics
-         hashable hashmap mtl random
-       ];
-       homepage = "https://github.com/tibbe/unordered-containers";
-       description = "Efficient hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unordered-containers_0_2_9_0" = callPackage
     ({ mkDerivation, base, bytestring, ChasingBottoms, containers
      , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
      , mtl, QuickCheck, random, test-framework, test-framework-hunit
@@ -213059,7 +209168,6 @@ self: {
        homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -213749,25 +209857,6 @@ self: {
      }) {};
 
   "urlpath" = callPackage
-    ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
-     , monad-control, monad-control-aligned, monad-logger, mtl
-     , path-extra, resourcet, split, strict, text, transformers
-     , transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "urlpath";
-       version = "7.0.2";
-       sha256 = "0q8kxgvlm6wf5xwq8a61c7vwbv3ghbbhid516ril677r5y6l7vv3";
-       libraryHaskellDepends = [
-         attoparsec-uri base exceptions mmorph monad-control
-         monad-control-aligned monad-logger mtl path-extra resourcet split
-         strict text transformers transformers-base vector
-       ];
-       description = "Painfully simple URL deployment";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "urlpath_8_0_1" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl
      , path-extra, resourcet, split, strict, text, transformers
@@ -213784,7 +209873,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -214736,23 +210824,6 @@ self: {
      }) {};
 
   "validation" = callPackage
-    ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
-     , semigroupoids, semigroups
-     }:
-     mkDerivation {
-       pname = "validation";
-       version = "0.6.3";
-       sha256 = "07j4nxah790vbzn0jfkp9lgb4afr8zwi06a0xp5dw0xjdl0qja66";
-       libraryHaskellDepends = [
-         base bifunctors deepseq lens semigroupoids semigroups
-       ];
-       testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
-       homepage = "https://github.com/qfpl/validation";
-       description = "A data-type like Either but with an accumulating Applicative";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "validation_1" = callPackage
     ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
      , semigroupoids, semigroups
      }:
@@ -214767,7 +210838,6 @@ self: {
        homepage = "https://github.com/qfpl/validation";
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validations" = callPackage
@@ -215738,17 +211808,6 @@ self: {
      }) {};
 
   "vector-space" = callPackage
-    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
-     mkDerivation {
-       pname = "vector-space";
-       version = "0.12";
-       sha256 = "16nzp2m6pcbqp27dm54v9a009j7jdjkrhw2hm1rgvh5jh4alyzi3";
-       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
-       description = "Vector & affine spaces, linear maps, and derivatives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-space_0_13" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
@@ -215757,7 +211816,6 @@ self: {
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space-map" = callPackage
@@ -215859,32 +211917,6 @@ self: {
      }) {};
 
   "vectortiles" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, criterion
-     , deepseq, hex, microlens, microlens-platform, protobuf, tasty
-     , tasty-hunit, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "vectortiles";
-       version = "1.2.0.6";
-       sha256 = "1l3sdd1cpcx9lxqcfzy9nndflzf8x2z7xayrj6k18zdf862dbxn7";
-       libraryHaskellDepends = [
-         base bytestring cereal containers deepseq protobuf text
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers hex protobuf tasty tasty-hunit
-         text vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring cereal containers criterion microlens
-         microlens-platform protobuf text vector
-       ];
-       homepage = "https://github.com/fosskers/vectortiles";
-       description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "vectortiles_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , hashable, hex, microlens, microlens-platform, protocol-buffers
      , protocol-buffers-descriptor, tasty, tasty-hunit, text
@@ -215914,7 +211946,6 @@ self: {
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -216289,6 +212320,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vinyl_0_8_1" = callPackage
+    ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
+     , lens, linear, microlens, mwc-random, primitive
+     , should-not-typecheck, singletons, tagged, vector
+     }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.8.1";
+       sha256 = "02ccxz95r99nzzlgr50kdha2vv8znlyrzza3k150xmh7m63dzgnr";
+       libraryHaskellDepends = [ array base ghc-prim ];
+       testHaskellDepends = [
+         base doctest hspec lens microlens should-not-typecheck singletons
+       ];
+       benchmarkHaskellDepends = [
+         base criterion linear microlens mwc-random primitive tagged vector
+       ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vinyl-gl" = callPackage
     ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL
      , tagged, test-framework, test-framework-hunit, transformers
@@ -216725,43 +212777,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.19.2";
-       sha256 = "158afcgzcwq7ybjw7jk28q799xzpns47m1l4sivc3wrrfklqh7xz";
-       revision = "1";
-       editedCabalFile = "16xg3m7rfg9rf2z9q0ns7f3gyi1acyw21d3bvr6fy4b9v1ngxsdq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/jtdaugherty/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_20" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -216796,7 +212811,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -217480,24 +213494,6 @@ self: {
      }) {};
 
   "wai-logger" = callPackage
-    ({ mkDerivation, base, blaze-builder, byteorder, bytestring
-     , case-insensitive, doctest, fast-logger, http-types, network, unix
-     , unix-time, wai
-     }:
-     mkDerivation {
-       pname = "wai-logger";
-       version = "2.3.1";
-       sha256 = "0ldx9jiq70ga2clsrg1sw5jsy76n4s6kzs3785qs87gbj5dqfdip";
-       libraryHaskellDepends = [
-         base blaze-builder byteorder bytestring case-insensitive
-         fast-logger http-types network unix unix-time wai
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-logger_2_3_2" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, case-insensitive
      , doctest, fast-logger, http-types, network, unix, unix-time, wai
      }:
@@ -217512,7 +213508,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger-buffered" = callPackage
@@ -218015,30 +214010,6 @@ self: {
      }) {};
 
   "wai-middleware-rollbar" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, hostname, hspec, hspec-golden-aeson, http-client
-     , http-conduit, http-types, lens, lens-aeson, network, QuickCheck
-     , text, time, unordered-containers, uuid, wai
-     }:
-     mkDerivation {
-       pname = "wai-middleware-rollbar";
-       version = "0.8.4";
-       sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive hostname http-client
-         http-conduit http-types network text time unordered-containers uuid
-         wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive containers hspec
-         hspec-golden-aeson lens lens-aeson QuickCheck text
-       ];
-       homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
-       description = "Middleware that communicates to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-rollbar_0_10_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hostname, http-client
      , http-conduit, http-types, rollbar-hs, text, time, uuid, wai
      }:
@@ -218053,7 +214024,6 @@ self: {
        homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -218739,41 +214709,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, 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.18";
-       sha256 = "0xlwbch06q9mjv36ki79z06n49na48326bawgw1vsz5afcyrlj34";
-       libraryHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         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
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client 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
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_18_1" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -218806,7 +214741,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
@@ -218850,23 +214784,6 @@ self: {
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, tls-session-manager, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.4";
-       sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager 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_4_2" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -218881,7 +214798,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
@@ -219932,6 +215848,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets_0_12_4_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.12.4.0";
+       sha256 = "1sq488nm8bjrg1q9vypag9pd8vljfibx3kacgkcfi1zqmr14x8x3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy network
+         random SHA streaming-commons text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy HUnit
+         network QuickCheck random SHA streaming-commons test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers criterion entropy
+         network random SHA text
+       ];
+       doCheck = false;
+       homepage = "http://jaspervdj.be/websockets";
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , exceptions, hashable, monad-control, mtl, QuickCheck
@@ -220053,17 +216005,17 @@ self: {
      }) {};
 
   "wedged" = callPackage
-    ({ mkDerivation, array, base, colour, containers, diagrams-cairo
-     , diagrams-lib, MonadRandom, strict
+    ({ mkDerivation, array, base, colour, containers, diagrams-lib
+     , diagrams-rasterific, MonadRandom, strict
      }:
      mkDerivation {
        pname = "wedged";
-       version = "1";
-       sha256 = "1phq3zrx5adclzxri61hr7977jxpq8ycbaan00qxvr3bbk4247g4";
+       version = "2";
+       sha256 = "1aw29dk0h25zw60m288423bakz36k0jpmzdhy7kq2wns3l5k6jqs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base colour containers diagrams-cairo diagrams-lib
+         array base colour containers diagrams-lib diagrams-rasterific
          MonadRandom strict
        ];
        description = "Wedged postcard generator";
@@ -220383,6 +216335,22 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "wide-word_0_1_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "wide-word";
+       version = "0.1.0.6";
+       sha256 = "0y3wdd5kslz71nlk32nvmi3yqd331jjl49njm58bixqanyc0k30x";
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
+       homepage = "https://github.com/erikd/wide-word";
+       description = "Data types for large but fixed width signed and unsigned integers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wigner-symbols" = callPackage
     ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
      , random, vector
@@ -220471,6 +216439,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_1_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+     , stm, text, transformers
+     }:
+     mkDerivation {
+       pname = "wild-bind";
+       version = "0.1.1.1";
+       sha256 = "00xs9m87skqnwv6cysy84bfbpnhb4jp46x08gn9f07n5jz113asi";
+       libraryHaskellDepends = [ base containers text transformers ];
+       testHaskellDepends = [
+         base hspec microlens QuickCheck stm transformers
+       ];
+       homepage = "https://github.com/debug-ito/wild-bind";
+       description = "Dynamic key binding framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wild-bind-indicator" = callPackage
     ({ mkDerivation, base, containers, gtk, text, transformers
      , wild-bind
@@ -220507,23 +216493,6 @@ self: {
      }) {};
 
   "wild-bind-x11" = callPackage
-    ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck
-     , stm, text, time, transformers, wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
-       version = "0.1.0.7";
-       sha256 = "0vdhmjkpy09w21xqhrqaxc645ghyb0ify1yq37wrlabqdqqms08d";
-       libraryHaskellDepends = [
-         base containers fold-debounce stm text transformers wild-bind X11
-       ];
-       testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ];
-       homepage = "https://github.com/debug-ito/wild-bind";
-       description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_2_0_1" = callPackage
     ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
      , semigroups, stm, text, time, transformers, wild-bind, X11
      }:
@@ -220541,7 +216510,6 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "win-hp-path" = callPackage
@@ -221477,45 +217445,6 @@ self: {
      }) {};
 
   "wrecker" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, ansigraph, array
-     , authenticate-oauth, base, base64-bytestring, blaze-builder
-     , bytestring, case-insensitive, clock, clock-extras, connection
-     , containers, cookie, cryptonite, data-default, data-default-class
-     , deepseq, exceptions, filepath, http-client, http-client-tls
-     , http-types, immortal, lens, markdown-unlit, memory, mime-types
-     , network, network-uri, next-ref, optparse-applicative, random
-     , statistics, stm, stm-chans, streaming-commons, tabular, tdigest
-     , text, threads, threads-extras, time, tls, transformers
-     , unagi-chan, unix, unordered-containers, vector, vty, wreq
-     }:
-     mkDerivation {
-       pname = "wrecker";
-       version = "1.2.4.0";
-       sha256 = "1yrjr1mhywxwdcnakyfgga7jlwpxzb4clldp21igw35y3n53i6y8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal ansigraph array authenticate-oauth base
-         base64-bytestring blaze-builder bytestring case-insensitive clock
-         clock-extras connection containers cookie cryptonite data-default
-         data-default-class deepseq exceptions filepath http-client
-         http-client-tls http-types immortal memory mime-types network
-         network-uri next-ref optparse-applicative random statistics stm
-         stm-chans streaming-commons tabular tdigest text threads
-         threads-extras time tls transformers unagi-chan unix
-         unordered-containers vector vty wreq
-       ];
-       executableHaskellDepends = [
-         base http-client http-client-tls lens markdown-unlit
-         optparse-applicative transformers wreq
-       ];
-       homepage = "https://github.com/lorenzo/wrecker#readme";
-       description = "An HTTP Performance Benchmarker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wrecker_1_3_1_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansigraph, array
      , authenticate-oauth, base, base64-bytestring, blaze-builder
      , bytestring, case-insensitive, clock, clock-extras, connection
@@ -221590,47 +217519,6 @@ self: {
      }) {};
 
   "wreq" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec
-     , authenticate-oauth, base, base16-bytestring, base64-bytestring
-     , byteable, bytestring, Cabal, cabal-doctest, case-insensitive
-     , containers, cryptohash, directory, doctest, exceptions, filepath
-     , ghc-prim, hashable, http-client, http-client-tls, http-types
-     , HUnit, lens, lens-aeson, mime-types, network-info, psqueues
-     , QuickCheck, snap-core, snap-server, template-haskell, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat, transformers, unix-compat
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "wreq";
-       version = "0.5.2.0";
-       sha256 = "06v70dpnh7lp1sr0i0fvl2b2cx0z57dfwi8i2fxva0gcdwan0fki";
-       revision = "1";
-       editedCabalFile = "01x430yrqiv02pq7h55h3y70hvz7n62882vnw1m53qqxp667i580";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec authenticate-oauth base base16-bytestring byteable
-         bytestring case-insensitive containers cryptohash exceptions
-         ghc-prim hashable http-client http-client-tls http-types lens
-         lens-aeson mime-types psqueues template-haskell text time
-         time-locale-compat unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bytestring
-         case-insensitive containers directory doctest filepath hashable
-         http-client http-types HUnit lens lens-aeson network-info
-         QuickCheck snap-core snap-server temporary test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         transformers unix-compat unordered-containers uuid vector
-       ];
-       homepage = "http://www.serpentine.com/wreq";
-       description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wreq_0_5_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
      , bytestring, Cabal, cabal-doctest, case-insensitive, containers
@@ -221667,7 +217555,6 @@ self: {
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq-sb" = callPackage
@@ -222673,6 +218560,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xeno_0_3_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, criterion, deepseq
+     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
+     , weigh, xml
+     }:
+     mkDerivation {
+       pname = "xeno";
+       version = "0.3.3";
+       sha256 = "034d38kcgpil1xf32cl131jh7b0x8awhxwv1nnc790x5wn876c0x";
+       libraryHaskellDepends = [
+         array base bytestring deepseq mtl mutable-containers vector
+       ];
+       testHaskellDepends = [ base bytestring hexml hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
+       ];
+       homepage = "https://github.com/ocramz/xeno";
+       description = "A fast event-based XML parser in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -223014,34 +218923,6 @@ self: {
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
-     , conduit, containers, data-default, Diff, errors, extra, filepath
-     , groom, lens, mtl, mtl-compat, network-uri, old-locale
-     , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xml-conduit
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.6.0";
-       sha256 = "1a6xvk8b0lsqr3m712879vr3z84snkzcfb9ykikf2azz69kn7y4k";
-       libraryHaskellDepends = [
-         base base64-bytestring binary-search bytestring conduit containers
-         data-default errors extra filepath lens mtl mtl-compat network-uri
-         old-locale safe text time transformers vector xml-conduit
-         zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
-         xml-conduit
-       ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xlsx_0_7_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
      , bytestring, conduit, containers, criterion, data-default, deepseq
      , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
@@ -223068,27 +218949,9 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , lens, text, xlsx
-     }:
-     mkDerivation {
-       pname = "xlsx-tabular";
-       version = "0.2.2";
-       sha256 = "0mjmyx7bnbzbwvfiwgsmchl9gyzhn0dbvmr2bwcg4fmddqzmrnfl";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default lens text xlsx
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/kkazuo/xlsx-tabular";
-       description = "Xlsx table cell value extraction utility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xlsx-tabular_0_2_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
@@ -223103,7 +218966,6 @@ self: {
        homepage = "https://github.com/kkazuo/xlsx-tabular";
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -223172,7 +219034,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit" = callPackage
+  "xml-conduit_1_7_1_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default-class, deepseq, hspec, HUnit, monad-control
@@ -223194,9 +219056,10 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit_1_8_0" = callPackage
+  "xml-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers
      , data-default-class, deepseq, hspec, HUnit, monad-control
@@ -223218,7 +219081,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -223337,27 +219199,6 @@ self: {
      }) {};
 
   "xml-hamlet" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, parsec
-     , shakespeare, template-haskell, text, xml-conduit
-     }:
-     mkDerivation {
-       pname = "xml-hamlet";
-       version = "0.4.1.1";
-       sha256 = "0bfhk3hdg70j91g5i9ygz0nmbpffnxa4kh5h828fdgml54i5sv2d";
-       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_5_0" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, parsec
      , shakespeare, template-haskell, text, xml-conduit
      }:
@@ -223376,7 +219217,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
@@ -225382,7 +221222,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod" = callPackage
+  "yesod_1_4_5" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit, conduit-extra, data-default-class, directory
      , fast-logger, monad-control, monad-logger, resourcet, semigroups
@@ -225404,9 +221244,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod_1_6_0" = callPackage
+  "yesod" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit, data-default-class, directory, fast-logger, monad-logger
      , resourcet, semigroups, shakespeare, streaming-commons
@@ -225428,7 +221269,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-alerts" = callPackage
@@ -225509,35 +221349,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unordered-containers, wai, yesod-core
-     , yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.4.21";
-       sha256 = "1qqwg9l65m9q3l8z0r1bnihqb5rbbp2c2w6gbk49kx9127rf4488";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base memory
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_2" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -225565,7 +221376,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -225694,25 +221504,6 @@ self: {
      }) {};
 
   "yesod-auth-fb" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
-     , lifted-base, shakespeare, text, time, transformers, wai
-     , yesod-auth, yesod-core, yesod-fb
-     }:
-     mkDerivation {
-       pname = "yesod-auth-fb";
-       version = "1.8.1";
-       sha256 = "0y7vl91ih3w2wdv62hpa180l2536778s64w9vqygh7cd9rmikdzg";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit fb http-conduit lifted-base
-         shakespeare text time transformers wai yesod-auth yesod-core
-         yesod-fb
-       ];
-       homepage = "https://github.com/psibi/yesod-auth-fb";
-       description = "Authentication backend for Yesod using Facebook";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-auth-fb_1_9_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
      , resourcet, shakespeare, text, time, transformers, unliftio, wai
      , yesod-auth, yesod-core, yesod-fb
@@ -225728,36 +221519,9 @@ self: {
        homepage = "https://github.com/psibi/yesod-auth-fb";
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.6.2";
-       sha256 = "1cydpwy8i5z1ya5k3kn3qx0np3lhv9cka5c6gajwvla8kpgy11df";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent text yesod-auth yesod-core
-         yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth-hashdb_1_7" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, resourcet, text
@@ -225781,7 +221545,6 @@ self: {
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -225987,40 +221750,6 @@ self: {
      }) {};
 
   "yesod-bin" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
-     , containers, data-default-class, deepseq, directory, file-embed
-     , filepath, fsnotify, http-client, http-client-tls
-     , http-reverse-proxy, http-types, lifted-base, network
-     , optparse-applicative, parsec, process, project-template
-     , resourcet, safe-exceptions, say, shakespeare, split, stm
-     , streaming-commons, tar, template-haskell, text, time
-     , transformers, transformers-compat, unix-compat
-     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.5.3";
-       sha256 = "06q1lnr3q8hplm2fd6blkp2z9awnslyaabjj2pg1cxq2ki9ndvmq";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder bytestring
-         Cabal conduit conduit-extra containers data-default-class deepseq
-         directory file-embed filepath fsnotify http-client http-client-tls
-         http-reverse-proxy http-types lifted-base network
-         optparse-applicative parsec process project-template resourcet
-         safe-exceptions say shakespeare split stm streaming-commons tar
-         template-haskell text time transformers transformers-compat
-         unix-compat unordered-containers wai wai-extra warp warp-tls yaml
-         zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-bin_1_6_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, Cabal, conduit, conduit-extra, containers
      , data-default-class, directory, file-embed, filepath, fsnotify
@@ -226050,7 +221779,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -226149,7 +221877,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core" = callPackage
+  "yesod-core_1_4_37_3" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -226190,9 +221918,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core_1_6_2" = callPackage
+  "yesod-core" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -226230,7 +221959,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -226372,23 +222100,6 @@ self: {
      }) {};
 
   "yesod-eventsource" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
-     , wai-eventsource, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-eventsource";
-       version = "1.4.1";
-       sha256 = "04ry7mzrwxjvgx5y2mcjsjghv6b39dh6zsg834vw5maf0wnph6a0";
-       libraryHaskellDepends = [
-         base blaze-builder conduit transformers wai wai-eventsource
-         wai-extra yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Server-sent events support for Yesod apps";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-eventsource_1_6_0" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
      , wai-eventsource, wai-extra, yesod-core
      }:
@@ -226403,7 +222114,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Server-sent events support for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-examples" = callPackage
@@ -226473,23 +222183,6 @@ self: {
      }) {};
 
   "yesod-fb" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb
-     , http-conduit, text, wai, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-fb";
-       version = "0.4.0";
-       sha256 = "043k4rzvzyjibyq94vjsk2mvs4l2bwfn41h1jrhfsppw42zh3pcm";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit crypto-api fb http-conduit text wai
-         yesod-core
-       ];
-       homepage = "https://github.com/psibi/yesod-fb";
-       description = "Useful glue functions between the fb library and Yesod";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-fb_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb
      , http-client-tls, http-conduit, text, wai, yesod-core
      }:
@@ -226504,10 +222197,9 @@ self: {
        homepage = "https://github.com/psibi/yesod-fb";
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form" = callPackage
+  "yesod-form_1_4_16" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -226529,9 +222221,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form_1_6_1" = callPackage
+  "yesod-form" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -226553,7 +222246,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -226602,23 +222294,6 @@ self: {
      }) {};
 
   "yesod-gitrepo" = callPackage
-    ({ mkDerivation, base, directory, enclosed-exceptions, http-types
-     , lifted-base, process, temporary, text, wai, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-gitrepo";
-       version = "0.2.1.0";
-       sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf";
-       libraryHaskellDepends = [
-         base directory enclosed-exceptions http-types lifted-base process
-         temporary text wai yesod-core
-       ];
-       homepage = "https://github.com/snoyberg/yesod-gitrepo";
-       description = "Host content provided by a Git repo";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-gitrepo_0_3_0" = callPackage
     ({ mkDerivation, base, directory, http-types, process, temporary
      , text, unliftio, wai, yesod-core
      }:
@@ -226633,7 +222308,6 @@ self: {
        homepage = "https://github.com/snoyberg/yesod-gitrepo#readme";
        description = "Host content provided by a Git repo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-gitrev" = callPackage
@@ -226806,23 +222480,6 @@ self: {
      }) {};
 
   "yesod-newsfeed" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , containers, shakespeare, text, time, xml-conduit, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-newsfeed";
-       version = "1.6";
-       sha256 = "05kmnv0by94la3np715j6my41y8wqlvc0h8rf09zvrrg003bqvaf";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup bytestring containers shakespeare text
-         time xml-conduit yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Helper functions and data types for producing News feeds";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-newsfeed_1_6_1_0" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
      }:
@@ -226837,7 +222494,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paginate" = callPackage
@@ -226907,7 +222563,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-persistent" = callPackage
+  "yesod-persistent_1_4_3" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -226927,9 +222583,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-persistent_1_6_0" = callPackage
+  "yesod-persistent" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -226949,7 +222606,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -227191,8 +222847,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-recaptcha2";
-       version = "0.2.3";
-       sha256 = "1q7anpls9nczvx65ba64nd1gmqgkznfd1ghv6c7z7pndq5cy91in";
+       version = "0.2.4";
+       sha256 = "1aw104i2v9m6dc5z5iqzihjfybfxg90l0rj0pazb672qzp9yqj18";
        libraryHaskellDepends = [
          base classy-prelude-yesod http-conduit yesod-auth
        ];
@@ -227332,23 +222988,6 @@ self: {
      }) {};
 
   "yesod-sitemap" = callPackage
-    ({ mkDerivation, base, conduit, containers, data-default, text
-     , time, xml-conduit, xml-types, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-sitemap";
-       version = "1.4.0.1";
-       sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100";
-       libraryHaskellDepends = [
-         base conduit containers data-default text time xml-conduit
-         xml-types yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Generate XML sitemaps";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-sitemap_1_6_0" = callPackage
     ({ mkDerivation, base, conduit, containers, data-default, text
      , time, xml-conduit, xml-types, yesod-core
      }:
@@ -227363,10 +223002,9 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Generate XML sitemaps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-static" = callPackage
+  "yesod-static_1_5_3_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, conduit-extra
      , containers, cryptonite, cryptonite-conduit, css-text
@@ -227399,9 +223037,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-static_1_6_0" = callPackage
+  "yesod-static" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, containers
      , cryptonite, cryptonite-conduit, css-text, data-default, directory
@@ -227434,7 +223073,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -227490,7 +223128,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yesod-test" = callPackage
+  "yesod-test_1_5_9_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -227515,9 +223153,10 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-test_1_6_2" = callPackage
+  "yesod-test" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, conduit, containers
      , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
@@ -227542,7 +223181,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -227646,24 +223284,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.6";
-       sha256 = "0agfpvm3xig9rwq2rm658ahzv8r0pw6k284s8m1lqgzkl00ij4cq";
-       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_3_0" = callPackage
     ({ mkDerivation, base, conduit, mtl, transformers, unliftio, wai
      , wai-websockets, websockets, yesod-core
      }:
@@ -227678,7 +223298,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
@@ -229078,34 +224697,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, exceptions
-     , filepath, hspec, monad-control, mtl, path, path-io, plan-b
-     , QuickCheck, resourcet, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "0.2.0";
-       sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr";
-       revision = "2";
-       editedCabalFile = "0vwbgpk6arp1hfndsm9n0f91yhagyqa0byiwvpl77gbiirbzrlwj";
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest exceptions filepath monad-control
-         mtl path path-io plan-b resourcet text time transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers exceptions filepath hspec path
-         path-io QuickCheck text time transformers
-       ];
-       homepage = "https://github.com/mrkkrp/zip";
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zip_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, directory
      , dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -229131,7 +224722,6 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage
@@ -229265,8 +224855,8 @@ self: {
        pname = "zippers";
        version = "0.2.5";
        sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id";
-       revision = "1";
-       editedCabalFile = "0nndhvgkv1v8zg906cblnxb5xiz0ghmvwdwnsn85pyp0rjplcv1k";
+       revision = "2";
+       editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens profunctors semigroupoids semigroups

From 90696dcb6c05d1691664a1acffd86133fc25f7e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 22:16:11 +0100
Subject: [PATCH 1149/2266] cabal2nix: update hpack override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 524e73077ad..a9a480668f3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -607,8 +607,8 @@ self: super: {
     haskell-src-exts = self.haskell-src-exts_1_20_2;
   };
 
-  # Need newer versions of their dependencies than the ones we have in LTS-10.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_27_0; hackage-db = self.hackage-db_2_0_1; });
+  # Need newer versions of their dependencies than the ones we have in LTS-11.x.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; });
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; });
 
   # https://github.com/bos/configurator/issues/22

From a13ff71b2148e39811003e34fe30e3338503c9ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 22:16:32 +0100
Subject: [PATCH 1150/2266] haskell-configuration-common: update a couple of
 comments

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9a480668f3..602d01d8258 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -845,7 +845,7 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
-  # Hoogle needs newer versions than lts-10 provides. lambdabot-haskell-plugins
+  # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins
   # depends on Hoogle and therefore needs to use the same version.
   hoogle = super.hoogle.override {
     haskell-src-exts = self.haskell-src-exts_1_20_2;
@@ -1004,7 +1004,7 @@ self: super: {
   # Needs older hlint
   hpio = dontCheck super.hpio;
 
-  # Needs turtle >=1.5.0, which we don't have by default in lts-10.x.
+  # Needs turtle >=1.5.0, which we don't have by default in lts-11.x.
   changelogged = super.changelogged.override { turtle = self.turtle_1_5_5; };
 
   # https://github.com/fpco/inline-c/issues/72

From 80b209cf20719afebaaeddbae013dd71cb872014 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:49:00 -0400
Subject: [PATCH 1151/2266] http-conduit: remove unnecessary override

The 2.3.0 version is now the default.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 602d01d8258..43e2b23841c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -849,7 +849,6 @@ self: super: {
   # depends on Hoogle and therefore needs to use the same version.
   hoogle = super.hoogle.override {
     haskell-src-exts = self.haskell-src-exts_1_20_2;
-    http-conduit = self.http-conduit_2_3_0;
   };
   lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
     haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;

From 41409f634801083d0d2609894ee9d11f95b8248c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:49:44 -0400
Subject: [PATCH 1152/2266] haskell-src-exts: remove unnecessary overrides

The 1.20.2 release is now the default.
---
 .../haskell-modules/configuration-common.nix          | 11 +----------
 .../haskell-modules/configuration-ghc-8.4.x.nix       |  6 ------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 43e2b23841c..6bf66cd659c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -603,13 +603,10 @@ self: super: {
       ln -s $lispdir $data/share/emacs/site-lisp
     '';
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
-  })).override {
-    haskell-src-exts = self.haskell-src-exts_1_20_2;
-  };
+  }));
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; });
-  hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
@@ -847,15 +844,9 @@ self: super: {
 
   # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins
   # depends on Hoogle and therefore needs to use the same version.
-  hoogle = super.hoogle.override {
-    haskell-src-exts = self.haskell-src-exts_1_20_2;
-  };
   lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
     haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;
   };
-  haskell-src-exts-simple_1_20_0_0 = super.haskell-src-exts-simple_1_20_0_0.override {
-    haskell-src-exts = self.haskell-src-exts_1_20_2;
-  };
 
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d216e8a41a0..196888c2883 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -117,12 +117,6 @@ self: super: {
     doHaddock       = false;
   });
 
-  ## Needs bump to a versioned attribute
-  ##     • Could not deduce (Semigroup (ParseResult m))
-  ##         arising from the superclasses of an instance declaration
-  ##       from the context: Monoid m
-  haskell-src-exts = super.haskell-src-exts_1_20_2;
-
   ## Needs bump to a versioned attribute
   hspec = overrideCabal super.hspec_2_4_8 (drv: {
     ## Setup: Encountered missing dependencies:

From 2d3138fc9ab94a5875537dff2bb50ae4d94050d7 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:50:20 -0400
Subject: [PATCH 1153/2266] tldr: remove unnecessary override

`shell-conduit` is no longer necessary for the expression.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6bf66cd659c..f66cff3bb11 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -352,12 +352,6 @@ self: super: {
   th-printf = dontCheck super.th-printf;
   thumbnail-plus = dontCheck super.thumbnail-plus;
   tickle = dontCheck super.tickle;
-  tldr = super.tldr.override {
-    # shell-conduit determines what commands are available at compile-time, so
-    # that tldr will not compile unless the shell-conduit it uses is compiled
-    # with git in its environment.
-    shell-conduit = addBuildTool self.shell-conduit pkgs.git;
-  };
   tpdb = dontCheck super.tpdb;
   translatable-intset = dontCheck super.translatable-intset;
   ua-parser = dontCheck super.ua-parser;

From 559832d6633510ad60b0fb473e1a5066d0610446 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:51:09 -0400
Subject: [PATCH 1154/2266] isDarwin: make usage consistent

This one was the only one of the form pkgs.stdenv._hostPlatform_.isDarwin.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f66cff3bb11..ee8c65b3d3c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -94,7 +94,7 @@ self: super: {
 
     # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
     # see: https://github.com/psibi/shell-conduit/issues/12
-    doCheck = !pkgs.stdenv.hostPlatform.isDarwin;
+    doCheck = !pkgs.stdenv.isDarwin;
   }));
 
   # https://github.com/froozen/kademlia/issues/2

From 8fdba8ca99b5c6453521b739afe01fd00a99677d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:06:01 +0100
Subject: [PATCH 1155/2266] haskell-test-framework: disable test suite build

This avoids a dependency on an old version of QuickCheck.
---
 .../haskell-modules/configuration-common.nix         |  3 +++
 .../haskell-modules/configuration-ghc-8.4.x.nix      | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ee8c65b3d3c..b40bd1fbef6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -418,6 +418,9 @@ self: super: {
   HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
   test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
 
+  # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
+  test-framework = dontCheck super.test-framework;
+
   # Depends on broken test-framework-quickcheck.
   apiary = dontCheck super.apiary;
   apiary-authenticate = dontCheck super.apiary-authenticate;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 196888c2883..9a987424e58 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -169,18 +169,6 @@ self: super: {
   ## doctest >=0.11.1 && <0.14
   semigroupoids = super.semigroupoids_5_2_2;
 
-  ## Needs bump to a versioned attribute
-  ## Issue: https://github.com/haskell/test-framework/issues/35
-  test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: {
-    ##     • No instance for (Semigroup (TestOptions' Maybe))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (TestOptions' Maybe)’
-    ##
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.3 && <2.10
-    doCheck         = false;
-  });
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.7 && <0.14

From 3cf9c63c646ef5cad1544e402647c54e37d07b4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:09:46 +0100
Subject: [PATCH 1156/2266] Drop obsolete Haskell overrides.

The overrides for the following packages no longer help:

 - HaVSA
 - test-framework-quickcheck
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b40bd1fbef6..9cf1cf6f954 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -414,10 +414,6 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # Depends on QuickCheck 1.x.
-  HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
-  test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
-
   # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
   test-framework = dontCheck super.test-framework;
 

From 77c16dd7db7c4a267eb12326d8ee482ebfa48719 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:14:11 +0100
Subject: [PATCH 1157/2266] haskell-hspec: update overrides for ghc-8.4.1 build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9a987424e58..e3169474c03 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -118,7 +118,7 @@ self: super: {
   });
 
   ## Needs bump to a versioned attribute
-  hspec = overrideCabal super.hspec_2_4_8 (drv: {
+  hspec = overrideCabal super.hspec_2_5_0 (drv: {
     ## Setup: Encountered missing dependencies:
     ## hspec-core ==2.4.4, hspec-discover ==2.4.4
     ##
@@ -130,7 +130,7 @@ self: super: {
   });
 
   ## Needs bump to a versioned attribute
-  hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: {
+  hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: {
     ##     • No instance for (Semigroup Summary)
     ##         arising from the superclasses of an instance declaration
     ##     • In the instance declaration for ‘Monoid Summary’
@@ -147,7 +147,7 @@ self: super: {
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## hspec-discover ==2.4.8
-  hspec-discover = super.hspec-discover_2_4_8;
+  hspec-discover = super.hspec-discover_2_5_0;
 
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:

From 6e507784d7f9e60841dc749724e054a493e20b3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:16:50 +0100
Subject: [PATCH 1158/2266] lambdabot-haskell-plugins: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9cf1cf6f954..ebe681e6f88 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -835,12 +835,6 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
-  # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins
-  # depends on Hoogle and therefore needs to use the same version.
-  lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
-    haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;
-  };
-
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
   SCalendar = markBroken (super.SCalendar.override { scalendar = null; });

From f0730a1bf57090d06323cf67c1c23046ee4a9e1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:17:59 +0100
Subject: [PATCH 1159/2266] haskell-funcmp: drop obsolete override for
 ghc-8.4.x

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e3169474c03..9d355c74988 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -90,12 +90,6 @@ self: super: {
   ##       from the context: (Monad m, Monoid a)
   free = super.free_5_0_1;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## base >=3 && <4.11
-  ## Needed for (<>) in prelude
-  funcmp = super.funcmp_1_9;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## Cabal <2.2

From 45caa0cf64a8c8b22680635e08ba503cec1ef5c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 16:25:54 +0100
Subject: [PATCH 1160/2266] haskell-unordered-containers: drop obsolete
 override for GHC 8.4.x

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9d355c74988..20473f4c5c4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -168,12 +168,6 @@ self: super: {
   ## doctest >=0.7 && <0.14
   turtle = super.turtle_1_5_4;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## base >=4 && <4.11
-  unordered-containers = super.unordered-containers_0_2_9_0;
-
-
   ## On Hackage:
 
   ## On Hackage, awaiting for import

From 326e1157a39469913edbcb00c8d8870727a3cdc4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 16:26:35 +0100
Subject: [PATCH 1161/2266] cabal2nix: update hpack override to use the latest
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ebe681e6f88..042d76cb0c7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -599,7 +599,7 @@ self: super: {
   }));
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; });
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_1; hackage-db = self.hackage-db_2_0_1; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;

From 2932385b3c5e9bae5c5995344418960704d4d5ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 16:28:53 +0100
Subject: [PATCH 1162/2266] haskell-pandoc-types: update to latest version to
 fix the build with GHC 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 20473f4c5c4..4073e4798b1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -768,4 +768,7 @@ self: super: {
   # Old versions don't compile.
   vty = self.vty_5_20;
 
+  # https://github.com/jgm/pandoc-types/issues/37
+  pandoc-types = self.pandoc-types_1_17_4;
+
 }

From 79c2be32adb1d9fe45142f55611c9878bcb54c23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 17:49:53 +0100
Subject: [PATCH 1163/2266] haskell-doctest: update overrides for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 4073e4798b1..737ed7facbd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -70,7 +70,7 @@ self: super: {
 
   ## Needs bump to a versioned attribute
   ## Issue: https://github.com/sol/doctest/issues/189
-  doctest = overrideCabal super.doctest_0_14_1 (drv: {
+  doctest = overrideCabal super.doctest_0_15_0 (drv: {
     ## Setup: Encountered missing dependencies:
     ## ghc >=7.0 && <8.4
     ##

From 8d0df69f4f1d9c9c5aa83a576d1ee6480bb3d4cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 17:50:59 +0100
Subject: [PATCH 1164/2266] haskell-vty: drop obsolete override for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 737ed7facbd..3879e9f471c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -765,9 +765,6 @@ self: super: {
       stripLen = 1;
     });
 
-  # Old versions don't compile.
-  vty = self.vty_5_20;
-
   # https://github.com/jgm/pandoc-types/issues/37
   pandoc-types = self.pandoc-types_1_17_4;
 

From 080c54cd1c3f090597dea59f49ad21c17d635955 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 18:17:57 +0100
Subject: [PATCH 1165/2266] haskell-turtle: drop obsolete override for
 ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 3879e9f471c..7a96de305fb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -163,11 +163,6 @@ self: super: {
   ## doctest >=0.11.1 && <0.14
   semigroupoids = super.semigroupoids_5_2_2;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## doctest >=0.7 && <0.14
-  turtle = super.turtle_1_5_4;
-
   ## On Hackage:
 
   ## On Hackage, awaiting for import

From e14fa3f2281913f3c24e68c59038191d2c88dacb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:58:19 +0100
Subject: [PATCH 1166/2266] hackage: update db snapshot

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 2f095e49828..c20e56a1711 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c1b1aa583dc3e3cd2c97c17d865be34ff3e019ab.tar.gz";
-  sha256 = "03q732jxymdxmm9gqfyghjcsscc5qwg7aicx5kk8fkrfz17xd44k";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b09de4efc2a385cf3407072c24c21ec8ec774a03.tar.gz";
+  sha256 = "0yy3k5wgi9zgwz51gxakhlalwac59fkh0flydf334msrxlc3xf9z";
 }

From de7847e683db12611bff58cd6813cef07768ae2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:45:12 +0100
Subject: [PATCH 1167/2266] git-annex: add overrides to fix the build in an
 lts-11.x environment

---
 .../haskell-modules/configuration-common.nix  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 042d76cb0c7..e2886d24597 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -75,13 +75,30 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = (overrideCabal super.git-annex (drv: {
+  git-annex = ((overrideCabal super.git-annex (drv: {
     src = pkgs.fetchgit {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
       sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w";
     };
+  })).overrideScope (self: super: {
+    aws = dontCheck (self.aws_0_18);
+    conduit = self.conduit_1_2_13_1;
+    conduit-extra = self.conduit-extra_1_2_3_2;
+    cryptonite-conduit = dontCheck super.cryptonite-conduit;  # test suite does not compile with old versions used here
+    html-conduit = self.html-conduit_1_2_1_2;
+    http-conduit = self.http-conduit_2_2_4;
+    persistent = self.persistent_2_7_3_1;
+    persistent-sqlite = self.persistent-sqlite_2_6_4;
+    resourcet = self.resourcet_1_1_11;
+    xml-conduit = self.xml-conduit_1_7_1_2;
+    yesod = self.yesod_1_4_5;
+    yesod-core = self.yesod-core_1_4_37_3;
+    yesod-form = self.yesod-form_1_4_16;
+    yesod-persistent = self.yesod-persistent_1_4_3;
+    yesod-static = self.yesod-static_1_5_3_1;
+    yesod-test = self.yesod-test_1_5_9_1;
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;

From 1e8e3d6291c6517cce4cd1111362683f8a3916f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:01:46 +0100
Subject: [PATCH 1168/2266] haskell-changelogged: drop obsolete override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e2886d24597..0496383da2f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -998,9 +998,6 @@ self: super: {
   # Needs older hlint
   hpio = dontCheck super.hpio;
 
-  # Needs turtle >=1.5.0, which we don't have by default in lts-11.x.
-  changelogged = super.changelogged.override { turtle = self.turtle_1_5_5; };
-
   # https://github.com/fpco/inline-c/issues/72
   inline-c = dontCheck super.inline-c;
 

From a11eaf1f04dc4cf75cee430e18a934296b6da35c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:03:46 +0100
Subject: [PATCH 1169/2266] haskell-regex-tdfa: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 7a96de305fb..e5c26439347 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -148,16 +148,6 @@ self: super: {
   ## free ==4.*, template-haskell >=2.4 && <2.13
   lens = super.lens_4_16;
 
-  ## Needs bump to a versioned attribute
-  regex-tdfa = overrideCabal super.regex-tdfa_1_2_3 (drv: {
-    ##     • No instance for (Semigroup (CharMap a))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (CharMap a)’
-    ##
-    ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:188:16:
-    editedCabalFile = null;
-  });
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.11.1 && <0.14

From 43d9df52c3cd527a4730daa5c44f6df6941449c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:04:59 +0100
Subject: [PATCH 1170/2266] haskell-lens: drop obsolete override for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e5c26439347..6fefab4ad31 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -143,11 +143,6 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_5_0;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## free ==4.*, template-haskell >=2.4 && <2.13
-  lens = super.lens_4_16;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.11.1 && <0.14

From 5c9b3a6b187c1072b38722fc1320acce1d2244af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:44:42 +0100
Subject: [PATCH 1171/2266] haskell-free: drop obsolete override for ghc-8.4.x

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 6fefab4ad31..15c37ffbdee 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -84,12 +84,6 @@ self: super: {
   ## free >=4.9 && <5
   either = super.either_5;
 
-  ## Needs bump to a versioned attribute
-  ##     • Could not deduce (Semigroup (IterT m a))
-  ##         arising from the superclasses of an instance declaration
-  ##       from the context: (Monad m, Monoid a)
-  free = super.free_5_0_1;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## Cabal <2.2

From 9254b06b22f6e95aaff755278df8ae1753c80258 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:53:03 +0100
Subject: [PATCH 1172/2266] haskell-src: update override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 15c37ffbdee..a087b66f069 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -45,8 +45,9 @@ self: super: {
   # https://github.com/bitemyapp/esqueleto/issues/77
   esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
 
-  # https://github.com/haskell-pkg-janitors/haskell-src/issues/5
-  haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src;
+  # Need newer version.
+  haskell-src = super.haskell-src_1_0_3_0;
+
   ## Shadowed:
 
   ## Needs bump to a versioned attribute

From 5a1a30becc091c3d01d22e7712d26278470df3b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 21:12:58 +0100
Subject: [PATCH 1173/2266] structured-haskell-mode: update overrides for
 lts-11.x

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0496383da2f..cff41f865a7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -601,7 +601,9 @@ self: super: {
       mkdir -p $data/share/emacs
       ln -s $lispdir $data/share/emacs/site-lisp
     '';
-  }));
+  })).override {
+    haskell-src-exts = self.haskell-src-exts_1_19_1;
+  };
 
   # Make elisp files available at a location where people expect it.
   hindent = (overrideCabal super.hindent (drv: {

From 81316008f715af84ff3f3d941cfe6d0ba590d834 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 21:16:22 +0100
Subject: [PATCH 1174/2266] haskell-semigroupoids: drop obsolete override for
 ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index a087b66f069..8dad142ca83 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -138,11 +138,6 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_5_0;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## doctest >=0.11.1 && <0.14
-  semigroupoids = super.semigroupoids_5_2_2;
-
   ## On Hackage:
 
   ## On Hackage, awaiting for import

From dc7557a2f07d93e583af7f2d25ccf9e102e2b238 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 21:18:05 +0100
Subject: [PATCH 1175/2266] haskell-constraints: drop obsolete override for
 ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8dad142ca83..6df7c90536e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -61,9 +61,6 @@ self: super: {
   ##     • In the instance declaration for ‘Monoid BV’
   bv = super.bv_0_5;
 
-  ## Needs bump to a versioned attribute
-  constraints = super.constraints_0_10;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## template-haskell >=2.5 && <2.13

From 04436f2c6617210d3bcf952c42773a9e064b23c1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 13:35:05 -0700
Subject: [PATCH 1176/2266] xfontsel: 1.0.5 -> 1.0.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.6 with grep in /nix/store/adg669da0gmhxmlgh7y2w5c7nw3w10gi-xfontsel-1.0.6
---
 pkgs/applications/misc/xfontsel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index b152badcda4..5d2b70a80ee 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -4,11 +4,11 @@
 
 {stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}:
 stdenv.mkDerivation rec {
-  name = "xfontsel-1.0.5";
+  name = "xfontsel-1.0.6";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/${name}.tar.bz2";
-    sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p";
+    sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 520642b6e6056802302f01a35eeb6c75a9413e1b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 18:34:24 -0400
Subject: [PATCH 1177/2266] atom: 1.24.1 -> 1.25.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index aa3c92da1f7..8c7ff7b5eae 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.24.1";
+  version = "1.25.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0llg2q1hn2wmhi80ddwwb2lir2xwwmrw19i2c1y3qmfb0apynhw3";
+    sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh";
     name = "${name}.deb";
   };
 

From f93d4b6181f5c28b20d63a4d76e182511369c1bf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 18:40:40 -0400
Subject: [PATCH 1178/2266] vscode: 1.21.0 -> 1.21.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 612932e20c6..a8b38012a13 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.21.0";
+  version = "1.21.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0gib1ljf1zm432cgv9i59dq7n9fblcgy6diy2qy4g1ichi92s2i3";
-    "x86_64-linux" = "08md8q325z8q3afzxbpzvjfwdjw7phqd7cpq2vadwnd2ixvga2nk";
-    "x86_64-darwin" = "0jmlhza48k5amb4phwy8k6xyznvivzd7gjsmsn4lmnasrxj5lask";
+    "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj";
+    "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l";
+    "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 9c7901691589b09070100f1af5727c34aa43965f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 8 Mar 2018 00:05:52 +0100
Subject: [PATCH 1179/2266] givaro: 4.0.2 -> 4.0.4

---
 pkgs/development/libraries/givaro/default.nix | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 335afa566db..3556acb0590 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -1,16 +1,34 @@
-{stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx
+, optimize ? false # impure
+}:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "givaro";
-  version = "4.0.2";
+  version = "4.0.4";
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7";
+    sha256 = "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy";
   };
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [autoconf automake libtool gmpxx];
+  configureFlags = [
+    "--disable-optimization"
+  ] ++ stdenv.lib.optionals (!optimize) [
+    # disable SIMD instructions (which are enabled *when available* by default)
+    "--disable-sse"
+    "--disable-sse2"
+    "--disable-sse3"
+    "--disable-ssse3"
+    "--disable-sse41"
+    "--disable-sse42"
+    "--disable-avx"
+    "--disable-avx2"
+    "--disable-fma"
+    "--disable-fma4"
+  ];
+  doCheck = true;
   meta = {
     inherit version;
     description = ''A C++ library for arithmetic and algebraic computations'';

From a4a04528e4f5252c0d94dd1ed72405a2b2fca11b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 16 Mar 2018 02:08:24 +0300
Subject: [PATCH 1180/2266] libva1: init at 1.7.3

---
 pkgs/development/libraries/libva/1.0.0.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/libva/1.0.0.nix

diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
new file mode 100644
index 00000000000..031ac781651
--- /dev/null
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
+, mesa_noglu
+, minimal ? true, libva
+}:
+
+stdenv.mkDerivation rec {
+  name = "libva-${version}";
+  version = "1.7.3";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+    sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
+  };
+
+  outputs = [ "bin" "dev" "out" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libdrm ]
+    ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
+  # TODO: share libs between minimal and !minimal - perhaps just symlink them
+
+  configureFlags =
+    [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
+    lib.optionals (!minimal) [ "--enable-glx" ];
+
+  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.freedesktop.org/wiki/Software/vaapi;
+    license = licenses.mit;
+    description = "VAAPI library: Video Acceleration API";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56b608779e0..816f0a2b597 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10280,6 +10280,9 @@ with pkgs;
   libva-full = libva.override { minimal = false; };
   libva-utils = callPackage ../development/libraries/libva-utils { };
 
+  libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
+  libva1-full = libva1.override { minimal = false; };
+
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
   libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl {

From 9c8137ca81fec5db81e0b9dc28055fa02548eeae Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 16 Mar 2018 02:37:42 +0300
Subject: [PATCH 1181/2266] steam: improvements for native runtime

* Update dependencies using steam-native-runtime from Arch Linux as a
  reference.
* Remove native-only Steam Runtime, just use installed libraries
  instead.
* Mark native-only Steam as broken (due to segfault inside D-Bus). Seems it was
  already broken for a long time. Doesn't apply to steam-run.
* Some cleanups for chrootenv.
---
 pkgs/games/steam/chrootenv.nix       | 112 +++++++++++++++++++++++----
 pkgs/games/steam/default.nix         |   1 +
 pkgs/games/steam/runtime-wrapped.nix |  93 ++--------------------
 3 files changed, 106 insertions(+), 100 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 88cde733176..ce6e86c50b8 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeScript, buildFHSUserEnv, steam
+{ stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686
 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
 , withJava ? false
 , withPrimus ? false
@@ -58,9 +58,6 @@ in buildFHSUserEnv rec {
     xorg.libX11
     xorg.libXfixes
 
-    # Needed to properly check for libGL.so.1 in steam-wrapper.sh
-    pkgsi686Linux.glxinfo
-
     # Not formally in runtime but needed by some games
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-ugly
@@ -68,19 +65,104 @@ in buildFHSUserEnv rec {
     mono
     xorg.xkeyboardconfig
     xorg.libpciaccess
-
+  ] ++ (if (!nativeOnly) then [
     (steamPackages.steam-runtime-wrapped.override {
-      inherit nativeOnly runtimeOnly;
+      inherit runtimeOnly;
     })
-  ];
+  ] else [
+    # Required
+    glib
+    gtk2
+    bzip2
+    zlib
+    gdk_pixbuf
 
-  extraBuildCommands = ''
+    # Without these it silently fails
+    xorg.libXinerama
+    xorg.libXdamage
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXxf86vm
+    xorg.libXi
+    xorg.libSM
+    xorg.libICE
+    gnome2.GConf
+    freetype
+    (curl.override { gnutlsSupport = true; sslSupport = false; })
+    nspr
+    nss
+    fontconfig
+    cairo
+    pango
+    expat
+    dbus
+    cups
+    libcap
+    SDL2
+    libusb1
+    dbus-glib
+    libav
+    atk
+    # Only libraries are needed from those two
+    libudev0-shim
+    networkmanager098
+
+    # Verified games requirements
+    xorg.libXmu
+    xorg.libxcb
+    libGLU
+    libuuid
+    libogg
+    libvorbis
+    SDL
+    SDL2_image
+    glew110
+    openssl
+    libidn
+    tbb
+
+    # Other things from runtime
+    flac
+    freeglut
+    libjpeg
+    libpng12
+    libsamplerate
+    libmikmod
+    libtheora
+    libtiff
+    pixman
+    speex
+    SDL_image
+    SDL_ttf
+    SDL_mixer
+    SDL2_ttf
+    SDL2_mixer
+    gstreamer
+    gst-plugins-base
+    libGLU
+    libappindicator-gtk2
+    libcaca
+    libcanberra
+    libgcrypt
+    libvpx
+    librsvg
+    xorg.libXft
+    libvdpau
+  ] ++ steamPackages.steam-runtime-wrapped.overridePkgs);
+
+  extraBuildCommands = if (!nativeOnly) then ''
     mkdir -p steamrt
     ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch}
     ${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
       ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch}
     ''}
     ln -s ${runSh} steamrt/run.sh
+  '' else ''
+    ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0
+    ${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
+      ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
+    ''}
   '';
 
   extraInstallCommands = ''
@@ -91,13 +173,13 @@ in buildFHSUserEnv rec {
   '';
 
   profile = ''
-    export STEAM_RUNTIME=/steamrt
+    export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"}
   '';
 
   runScript = writeScript "steam-wrapper.sh" ''
     #!${stdenv.shell}
     if [ -f /host/etc/NIXOS ]; then   # Check only useful on NixOS
-      glxinfo >/dev/null 2>&1
+      ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1
       # If there was an error running glxinfo, we know something is wrong with the configuration
       if [ $? -ne 0 ]; then
         cat <<EOF > /dev/stderr
@@ -112,9 +194,13 @@ in buildFHSUserEnv rec {
     EOF
       fi
     fi
-    steam
+    exec steam "$@"
   '';
 
+  meta = steam.meta // {
+    broken = nativeOnly;
+  };
+
   passthru.run = buildFHSUserEnv {
     name = "steam-run";
 
@@ -129,8 +215,8 @@ in buildFHSUserEnv rec {
         exit 1
       fi
       shift
-      export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
-      exec "$run" "$@"
+      ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"}
+      exec -- "$run" "$@"
     '';
   };
 }
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 6a6485d4331..b7dbba55269 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -13,6 +13,7 @@ let
     steam = callPackage ./steam.nix { };
     steam-fonts = callPackage ./fonts.nix { };
     steam-chrootenv = callPackage ./chrootenv.nix {
+      glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo;
       steam-runtime-wrapped-i686 =
         if steamArch == "amd64"
         then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 5412a1be518..b3746a50c77 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -1,103 +1,22 @@
 { stdenv, steamArch, lib, perl, pkgs, steam-runtime
-, nativeOnly ? false
 , runtimeOnly ? false
 }:
 
-assert !(nativeOnly && runtimeOnly);
-
 let
-  runtimePkgs = with pkgs; [
-    # Required
-    glib
-    gtk2
-    bzip2
-    zlib
-    gdk_pixbuf
-
-    # Without these it silently fails
-    xorg.libXinerama
-    xorg.libXdamage
-    xorg.libXcursor
-    xorg.libXrender
-    xorg.libXScrnSaver
-    xorg.libXxf86vm
-    xorg.libXi
-    xorg.libSM
-    xorg.libICE
-    gnome2.GConf
-    freetype
-    (curl.override { gnutlsSupport = true; sslSupport = false; })
-    nspr
-    nss
-    fontconfig
-    cairo
-    pango
-    expat
-    dbus
-    cups
-    libcap
-    SDL2
-    libusb1
-    dbus-glib
-    libav
-    atk
-    # Only libraries are needed from those two
-    libudev0-shim
-    networkmanager098
-
-    # Verified games requirements
-    xorg.libXmu
-    xorg.libxcb
-    libGLU
-    libuuid
-    libogg
-    libvorbis
-    SDL
-    SDL2_image
-    glew110
-    openssl
-    libidn
-    tbb
-
-    # Other things from runtime
-    xorg.libXinerama
-    flac
-    freeglut
-    libjpeg
-    libpng12
-    libsamplerate
-    libmikmod
-    libtheora
-    pixman
-    speex
-    SDL_image
-    SDL_ttf
-    SDL_mixer
-    SDL2_net
-    SDL2_ttf
-    SDL2_mixer
-    gstreamer
-    gst-plugins-base
-  ];
-
-  overridePkgs = with pkgs; [
+  overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [
     libgpgerror
     libpulseaudio
     alsaLib
     openalSoft
-    libva
+    libva1-full
+    libvdpau
     vulkan-loader
     gcc.cc
     nss
     nspr
-  ];
+  ]);
 
-  ourRuntime = if runtimeOnly then []
-               else if nativeOnly then runtimePkgs ++ overridePkgs
-               else overridePkgs;
-  steamRuntime = lib.optional (!nativeOnly) steam-runtime;
-
-  allPkgs = ourRuntime ++ steamRuntime;
+  allPkgs = overridePkgs ++ [ steam-runtime ];
 
   gnuArch = if steamArch == "amd64" then "x86_64-linux-gnu"
             else if steamArch == "i386" then "i386-linux-gnu"
@@ -114,7 +33,7 @@ in stdenv.mkDerivation rec {
   builder = ./build-wrapped.sh;
 
   passthru = {
-    inherit gnuArch libs bins;
+    inherit gnuArch libs bins overridePkgs;
     arch = steamArch;
   };
 

From 18bf53a74d7abc194775c925000bc0adc68a33d5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 15 Mar 2018 22:00:02 -0400
Subject: [PATCH 1182/2266] haskel packages: drop override on ltk to fix
 evaluation

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cff41f865a7..2204f8703cc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -827,10 +827,7 @@ self: super: {
   fluid-idl-http-client = markBroken super.fluid-idl-http-client;
   fluid-idl-scotty = markBroken super.fluid-idl-scotty;
 
-  # Build with gi overloading feature disabled.
-  ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; });
-
-  # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
+   # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
   stack2nix = doJailbreak super.stack2nix;
 
   # Hacks to work around https://github.com/haskell/c2hs/issues/192.

From 86be186fee37a0ee516383dea0078419887dc773 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 16 Mar 2018 03:09:02 +0100
Subject: [PATCH 1183/2266] =?UTF-8?q?Revert=20"networkmanager-fortisslvpn:?=
 =?UTF-8?q?=201.2.4=20=E2=86=92=201.2.8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3ebc49c5c02b13636c7eff235cbcbe14632b816b.
---
 pkgs/tools/networking/network-manager/fortisslvpn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index 73aaea06c91..b924a02438f 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -3,13 +3,13 @@ networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
 
 let
   pname   = "NetworkManager-fortisslvpn";
-  version = "1.2.8";
+  version = "1.2.4";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
+    sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
   };
 
   buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]

From 4695569260849d708d2e6bbea2de9064d0fbf83f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 16 Mar 2018 03:09:06 +0100
Subject: [PATCH 1184/2266] =?UTF-8?q?Revert=20"networkmanager:=201.10.2=20?=
 =?UTF-8?q?=E2=86=92=201.10.4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d5d7fa4c03b4064ef15c73a0706bc7b29cce278a.
---
 pkgs/tools/networking/network-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index dc7a29f5267..fc7d352757d 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname   = "NetworkManager";
-  version = "1.10.4";
+  version = "1.10.2";
 in stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1zimmpmpd84dscdky7zad5zr1gk1bnsk0insjm0s9415gjvsgq3x";
+    sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
   };
 
   outputs = [ "out" "dev" ];

From a7afedd2e782b2d2fa093d6b00fc146b4caaf475 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 15 Mar 2018 21:49:26 -0500
Subject: [PATCH 1185/2266] elpa-packages 2018-03-15

---
 .../editors/emacs-modes/elpa-generated.nix    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index ac50e829100..49783650393 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -54,10 +54,10 @@
       }) {};
     adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "adaptive-wrap";
-        version = "0.5.1";
+        version = "0.5.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el";
-          sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll";
+          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el";
+          sha256 = "1qcf1cabn4wb34cdmlyk3rv5dl1dcrxrbaw38kly1prs6y4l22aw";
         };
         packageRequires = [];
         meta = {
@@ -1438,10 +1438,10 @@
       }) {};
     muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "muse";
-        version = "3.20";
+        version = "3.20.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/muse-3.20.tar";
-          sha256 = "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9";
+          url = "https://elpa.gnu.org/packages/muse-3.20.1.tar";
+          sha256 = "0h8lxm08r519psz93m1i43prkcpsm2dgkcvdlpvg7sm0ky7i5cay";
         };
         packageRequires = [];
         meta = {
@@ -1688,6 +1688,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "posframe";
+        version = "0.3.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/posframe-0.3.0.el";
+          sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/posframe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "psgml";
         version = "1.3.4";
@@ -2400,10 +2413,10 @@
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "xelb";
-        version = "0.13";
+        version = "0.14";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.13.tar";
-          sha256 = "0sfygy6ihjwszhn6a81fz2yn70rr7vpygl7z49vz4rsd8s0fdgjc";
+          url = "https://elpa.gnu.org/packages/xelb-0.14.tar";
+          sha256 = "09flnbjy9ck784kprz036rwg9qk45hpv0w5hz3pz3zhwyk57fv74";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {

From 8cf0f49ed2bcd88cbe55ae6dd041ca0ef4166ca3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 19:51:20 -0700
Subject: [PATCH 1186/2266] archivemount: 0.8.7 -> 0.8.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/sn92kb7bgpg6arj6jfgg7yv78ap2fkll-archivemount-0.8.9/bin/archivemount -V` and found version 0.8.9
- ran `/nix/store/sn92kb7bgpg6arj6jfgg7yv78ap2fkll-archivemount-0.8.9/bin/archivemount --version` and found version 0.8.9
- found 0.8.9 with grep in /nix/store/sn92kb7bgpg6arj6jfgg7yv78ap2fkll-archivemount-0.8.9
---
 pkgs/tools/filesystems/archivemount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
index 72403bd3dc0..b7ade4c5abc 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, fuse, libarchive }:
 
 let
-  name = "archivemount-0.8.7";
+  name = "archivemount-0.8.9";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz";
-    sha256 = "1diiw6pnlnrnikn6l5ld92dx59lhrxjlqms8885vwbynsjl5q127";
+    sha256 = "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Mar 2018 23:21:52 +0900
Subject: [PATCH 1187/2266] nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104
 -> 20170717

---
 pkgs/data/misc/cacert/default.nix                     | 4 ++--
 pkgs/development/libraries/nss/85_security_load.patch | 8 ++++----
 pkgs/development/libraries/nss/default.nix            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 91af84c4224..d6f5507bf69 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -9,8 +9,8 @@ let
 
   certdata2pem = fetchurl {
     name = "certdata2pem.py";
-    url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20160104";
-    sha256 = "0bw11mgfrf19qziyvdnq22kirp0nn54lfsanrg5h6djs6ig1c2im";
+    url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20170717";
+    sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
   };
 
 in
diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch
index 7687ea9bedb..132d5a96b29 100644
--- a/pkgs/development/libraries/nss/85_security_load.patch
+++ b/pkgs/development/libraries/nss/85_security_load.patch
@@ -13,10 +13,10 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/sh
 diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
 --- nss/coreconf/config.mk	2017-01-04 15:24:24.000000000 +0100
 +++ nss/coreconf/config.mk	2017-01-24 14:43:47.989432372 +0100
-@@ -208,3 +208,6 @@
- # exported symbols, which causes problem when NSS is built as part of Mozilla.
- # So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off.
- NSS_SSL_ENABLE_ZLIB = 1
+@@ -202,3 +202,6 @@
+ 
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
 +
 +# Nix specific stuff.
 +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index a8f36af5df5..5c23f3dfde9 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.34.1";
+  version = "3.35";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz";
-    sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz";
+    sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl";
   };
 
   buildInputs = [ perl zlib sqlite ]

From fe5a406067d7503c9f11dcc49f18f45b1f5acbe5 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Thu, 15 Mar 2018 00:00:00 +0000
Subject: [PATCH 1188/2266] firefoxPackages.tor-browser: 52.6.2esr-7.5-2 ->
 52.7.0esr-7.5-1

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 865bf4379d7..c1ba615ea4a 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -149,9 +149,9 @@ in rec {
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-52.6.2esr-7.5-2-slnos";
-      rev   = "cf1a504aaa26af962ae909a3811c0038db2d2eec";
-      sha256 = "0llbk7skh1n7yj137gv7rnxfasxsnvfjp4ss7h1fbdnw19yba115";
+      # branch "tor-browser-52.7.0esr-7.5-1-slnos";
+      rev   = "211b2be3fea45a450915b0addcd7783aa939e24a";
+      sha256 = "18gv4r8cjf89mamjh93a856a5yfp7dm3jrk8g05w89vxb3lrl74v";
     };
 
     patches = nixpkgsPatches;

From 60932704518ff77330cf3e459edfa6f4bb9f4c19 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Thu, 15 Mar 2018 00:00:00 +0000
Subject: [PATCH 1189/2266] firefoxPackages.tor-browser: add 52.7.0esr-8.0-1
 (alpha)

---
 .../networking/browsers/firefox/packages.nix    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index c1ba615ea4a..6b4ef3854b0 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -157,6 +157,23 @@ in rec {
     patches = nixpkgsPatches;
   } // commonAttrs) {};
 
+  tor-browser-8-0 = common (rec {
+    pname = "tor-browser";
+    version = "8.0.1";
+    isTorBrowserLike = true;
+
+    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+    src = fetchFromGitHub {
+      owner = "SLNOS";
+      repo  = "tor-browser";
+      # branch "tor-browser-52.7.0esr-8.0-1-slnos";
+      rev   = "58314ccb043882e830ee9a21c37a92d6e0d34e94";
+      sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb";
+    };
+
+    patches = nixpkgsPatches;
+  } // commonAttrs) {};
+
   tor-browser = tor-browser-7-5;
 
 })

From cef5ed1bc271aaae850f762aa09fb8d08a1a5167 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 15 Mar 2018 20:47:48 -0700
Subject: [PATCH 1190/2266] matrix-synapse: 0.26.0 -> 0.26.1

Security hotfix
---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index d8352df3623..4c7d1649832 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1ggdnb4c8y835j9lxsglxry6fqy7d190s70rccjrc3rj0p5vwlyj";
+    sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0";
   };
 
   patches = [

From 97ab4c1072db2291d6c119362c4fab538d7db9be Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 16 Mar 2018 08:07:52 +0100
Subject: [PATCH 1191/2266] dino: unstable-2018-02-11 -> unstable-2018-03-10

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

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 810422dcd3f..fd253c389a2 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-02-11";
+  name = "dino-unstable-2018-03-10";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "5436d716c0f508eb8ab70f322da862f996ce421e";
-    sha256 = "0yxkhl9xm5f0j2i9vxgyabpa5fwja0329fmg0878mqsm89nzz3am";
+    rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe";
+    sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq";
     fetchSubmodules = true;
   };
 

From 0cadbb84167043e6001497eaa6a86593a5be808f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 15:42:39 +0800
Subject: [PATCH 1192/2266] nodejs-6_x: 6.13.0 -> 6.13.1

---
 pkgs/development/web/nodejs/v6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 491c0674a70..d3e43371c6d 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "6.13.0";
-    sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp";
+    version = "6.13.1";
+    sha256 = "0ikasm20wq56gvn3j28hxjwbvqqzqj5w0p2sc3ss00v58w5kady4";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
   }

From a36ae7a6852684233e1c4c2971d5aeea99b20bd7 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 15:43:09 +0800
Subject: [PATCH 1193/2266] nodejs-8_x: 8.9.4 -> 8.10.0

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 662999225bf..939322a1bc9 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "8.9.4";
-    sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c";
+    version = "8.10.0";
+    sha256 = "06lhnasmbpwvyv5dfc9kmjj32djllwgvb1xl778cnswdc5qlwbdp";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }

From 03efbb01c622a4a17f0faba357a74b07ead537c3 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 15:43:30 +0800
Subject: [PATCH 1194/2266] nodejs-9_x: 9.7.1 -> 9.8.0

---
 pkgs/development/web/nodejs/v9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix
index f17c5f6d26c..71d0f6e21f9 100644
--- a/pkgs/development/web/nodejs/v9.nix
+++ b/pkgs/development/web/nodejs/v9.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "9.7.1";
-    sha256 = "0hlhj817s5bji2qdghxkwxjj40kwkyzgax4zyv32r5pbl6af3yh6";
+    version = "9.8.0";
+    sha256 = "1b0ynhvnq25w29rmshim0dn4m1dknkn1p52idi6acpzswi4vn1h7";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
   }

From 4c28d80be2232304cf185e21f80777bb501600e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 01:31:41 -0700
Subject: [PATCH 1195/2266] atlas: 3.10.2 -> 3.10.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.10.3 with grep in /nix/store/79z1zd6ydm6b7x6xbf8b908iirah8hqn-atlas-3.10.3
---
 pkgs/development/libraries/science/math/atlas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 7fad5c312a0..d971f1a2e0b 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -45,7 +45,7 @@
 
 let
   inherit (stdenv.lib) optional optionalString;
-  version = "3.10.2";
+  version = "3.10.3";
 in
 
 stdenv.mkDerivation {
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
-    sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars";
+    sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216";
   };
 
   buildInputs = [ gfortran ];

From 01014713bfab184ab031b735dc636172db0142ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Mar 2018 09:58:03 +0000
Subject: [PATCH 1196/2266] sshuttle: upstream fixed tests

---
 pkgs/tools/security/sshuttle/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index d2c194308e1..d344f95573d 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -16,6 +16,11 @@ python3Packages.buildPythonApplication rec {
       url = "https://github.com/sshuttle/sshuttle/commit/91aa6ff625f7c89a19e6f8702425cfead44a146f.patch";
       sha256 = "0sqcc6kj53wlas2d3klbyilhns6vakzwbbp8y7j9wlmbnc530pks";
     })
+    # fix macos patch
+    (fetchpatch {
+      url = "https://github.com/sshuttle/sshuttle/commit/884bd6deb0b699a5648bb1c7bdfbc7be8ea0e7df.patch";
+      sha256 = "1nn0wx0rckxl9yzw9dxjji44zw4xqz7ws4qwjdvfn48w1f786lmz";
+    })
   ];
 
   nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
@@ -25,14 +30,6 @@ python3Packages.buildPythonApplication rec {
 
   checkInputs = with python3Packages; [ mock pytest pytestrunner ];
 
-  # Tests only run with Python 3. Server-side Python 2 still works if client
-  # uses Python 3, so it should be fine.
-  doCheck = true;
-
-  checkPhase = ''
-    py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}"
-  '';
-
   postInstall = let
     mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
   in ''

From e47175638b99d576de67e8c82fb4a3fcb6fadec8 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 16 Mar 2018 10:08:46 +0000
Subject: [PATCH 1197/2266] rpm: 4.14.0 -> 4.14.1

---
 pkgs/tools/package-management/rpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 3a56db1e0d3..a46550d59cd 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "rpm-${version}";
-  version = "4.14.0";
+  version = "4.14.1";
 
   src = fetchurl {
     url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2";
-    sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806";
+    sha256 = "0fvrjq6jsvbllb5q6blchzh7p5flk61rz34g4g9mp9iwrhn0xx23";
   };
 
   outputs = [ "out" "dev" "man" ];

From 29be8dd70c25316395cf97a65936eb3e13d079c7 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 16 Mar 2018 11:14:39 +0100
Subject: [PATCH 1198/2266] kubernetes: use go 1.9 instead of 1.10

Build using go 1.10 fails due to an error in a vendored dependency
[Upstream Issue](https://github.com/kubernetes/kubernetes/pull/60373)
---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 090fc98566d..b9cb5ca91e7 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
 , iptables, coreutils
 , components ? [
     "cmd/kubeadm"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
   };
 
-  buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
+  buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
+    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
   '';
 
   meta = {

From 3f2f5e5c4bd6d2b3cbce462ae871d4e77df0dbd7 Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <danielehlers@mindeye.net>
Date: Fri, 16 Mar 2018 11:16:55 +0100
Subject: [PATCH 1199/2266] trayer: 1.1.7 -> 1.1.8

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

diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 020a7bbb357..5aec0973a7c 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "trayer-1.1.7";
+  name = "trayer-1.1.8";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gdk_pixbuf gtk2 ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "sargon";
     repo = "trayer-srg";
     rev = name;
-    sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
+    sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg";
   };
 
   preConfigure = ''

From 03cf538ef2258dd4174c1f7df0109ab7571ddcf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 16 Mar 2018 12:23:56 +0100
Subject: [PATCH 1200/2266] 18.09: Jackrabbit -> Jellyfish

See eb0fa09232 and github discussion on that.
My misgiving about the t-shirts was refuted.
I don't think this flip may negatively affect anyone.
---
 nixos/doc/manual/release-notes/rl-1809.xml | 2 +-
 nixos/modules/misc/version.nix             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 55f294e3957..959bd86759b 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -4,7 +4,7 @@
          version="5.0"
          xml:id="sec-release-18.09">
 
-<title>Release 18.09 (“Jackrabbit”, 2018/09/??)</title>
+<title>Release 18.09 (“Jellyfish”, 2018/09/??)</title>
 
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 957eeb90850..b8f0a223c91 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -85,8 +85,8 @@ in
       revision      = mkIf (pathIsDirectory gitRepo) (mkDefault            gitCommitId);
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
-      # Note: code names must only increase in alphabetical order.
-      codeName = "Jackrabbit";
+      # Note: the first letter is bumped on every release.  It's an animal.
+      codeName = "Jellyfish";
     };
 
     # Generate /etc/os-release.  See

From cf65d477fd9e92823c64a44521835c82e122c2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Fri, 16 Mar 2018 12:34:36 +0100
Subject: [PATCH 1201/2266] maintainers: add brainrape

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index abc47e6beb6..a8276b580ba 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -617,6 +617,11 @@
     github = "bradediger";
     name = "Brad Ediger";
   };
+  brainrape = {
+    email = "martonboros@gmail.com";
+    github = "brainrape";
+    name = "Marton Boros";
+  };
   bramd = {
     email = "bram@bramd.nl";
     github = "bramd";

From 5057c24a1fcdf772694d5689658b8a585a57761f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 04:48:50 -0700
Subject: [PATCH 1202/2266] aws-sdk-cpp: 1.3.22 -> 1.4.10

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.10 with grep in /nix/store/qb91mvvbzd45xcnd640m0wq8z915d257-aws-sdk-cpp-1.4.10
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index cd42652e091..8d13a55887d 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.3.22";
+  version = "1.4.10";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0sdgy8kqhxnw7n0sw4m3p3ay7yic3rhad5ab8m5lbx61ad9bq3c2";
+    sha256 = "0gw0ph6v2w4zqmixqfw5ab08c0r3d7iy2z1hll5pydlp5vwfmn7g";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 850492a0db7492d09fa882f03cff0aeea055d112 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 05:51:00 -0700
Subject: [PATCH 1203/2266] cgal: 4.11 -> 4.11.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/prp059sdh2cfi1n6m1y43w7hf33ixs7x-cgal-4.11.1/bin/cgal_create_CMakeLists -h` got 0 exit code
- ran `/nix/store/prp059sdh2cfi1n6m1y43w7hf33ixs7x-cgal-4.11.1/bin/cgal_create_CMakeLists help` got 0 exit code
- ran `/nix/store/prp059sdh2cfi1n6m1y43w7hf33ixs7x-cgal-4.11.1/bin/cgal_create_cmake_script -h` got 0 exit code
- ran `/nix/store/prp059sdh2cfi1n6m1y43w7hf33ixs7x-cgal-4.11.1/bin/cgal_create_cmake_script --help` got 0 exit code
- found 4.11.1 with grep in /nix/store/prp059sdh2cfi1n6m1y43w7hf33ixs7x-cgal-4.11.1
---
 pkgs/development/libraries/CGAL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 46cdf3a47c6..cdb37a84c80 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.11";
+  version = "4.11.1";
   name = "cgal-" + version;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "126r06aba5h8l73xmm5mwmxkir7sy122jn2j18cd4gz3z9p23npr";
+    sha256 = "04nn1lzsjdglzjygc72cq09xrvpqwwnbf6l0xz8bfwfp4x9g10jf";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;

From 234f70b59ea8b7186f6c65731b659af08d79368d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Mar 2018 12:52:00 +0000
Subject: [PATCH 1204/2266] kubernetes: add go 1.10 support info

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index b9cb5ca91e7..e892dbaddf5 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
   };
 
+  # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373
   buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];

From 041b27bfb390da037c5312c2bddb4d4721668aa2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 13:59:45 +0100
Subject: [PATCH 1205/2266] fsatrace: initial version

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

diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix
new file mode 100644
index 00000000000..e84aa0ef555
--- /dev/null
+++ b/pkgs/development/tools/misc/fsatrace/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "fsatrace-${version}";
+  version = "0.0.1-160";
+
+  src = fetchFromGitHub {
+    owner = "jacereda";
+    repo = "fsatrace";
+    rev = "2bf89d836e0156e68f121b0ffeedade7c9381f77";
+    sha256 = "0bndfmm0y738azwzf6m6xg6gjnrwcqlfjsampk67vga40yylwkbw";
+  };
+
+  preConfigure = ''
+    mkdir -p $out/libexec/${name}
+    export makeFlags=INSTALLDIR=$out/libexec/${name}
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -s $out/libexec/${name}/fsatrace $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/jacereda/fsatrace;
+    description = "filesystem access tracer";
+    license = licenses.isc;
+    maintainers = [ maintainers.peti ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 816f0a2b597..e8e6b900829 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7722,6 +7722,8 @@ with pkgs;
 
   frame = callPackage ../development/libraries/frame { };
 
+  fsatrace = callPackage ../development/tools/misc/fsatrace { };
+
   fswatch = callPackage ../development/tools/misc/fswatch { };
 
   funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };

From 5c0645fe94e23a8370db27fdc8055b7bcf302b25 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 06:10:55 -0700
Subject: [PATCH 1206/2266] cups-filters: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/233chsllrfymrvizn74nf8sav0r0llrb-cups-filters-1.20.1
---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index f80f2ddf03e..72e265360bf 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0g6npicm1cwmxqi6ymfvf9wkplp4z2rzvjjl9v4yfvqdjq85gxnp";
+    sha256 = "0qix1whz5n4ijnl6d44f1v8nzkpv99wqjyrby8vx6xnpskw5hsxk";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From e7acf719b135f131163778ddb2f7584e3df3241d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 06:58:26 -0700
Subject: [PATCH 1207/2266] dnscrypt-wrapper: 0.4.0 -> 0.4.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/a48lz2a4vrs617kqdhwdiyjwjanfg0pq-dnscrypt-wrapper-0.4.1/bin/dnscrypt-wrapper -h` got 0 exit code
- ran `/nix/store/a48lz2a4vrs617kqdhwdiyjwjanfg0pq-dnscrypt-wrapper-0.4.1/bin/dnscrypt-wrapper --help` got 0 exit code
- ran `/nix/store/a48lz2a4vrs617kqdhwdiyjwjanfg0pq-dnscrypt-wrapper-0.4.1/bin/dnscrypt-wrapper -v` and found version 0.4.1
- ran `/nix/store/a48lz2a4vrs617kqdhwdiyjwjanfg0pq-dnscrypt-wrapper-0.4.1/bin/dnscrypt-wrapper --version` and found version 0.4.1
- found 0.4.1 with grep in /nix/store/a48lz2a4vrs617kqdhwdiyjwjanfg0pq-dnscrypt-wrapper-0.4.1
---
 pkgs/tools/networking/dnscrypt-wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index cb12300d51e..4351fd84dcd 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-wrapper-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "Cofyc";
     repo = "dnscrypt-wrapper";
     rev = "v${version}";
-    sha256 = "121y93sb06qc50fj7vv47r6dpzv77hh7ywl7sgrfp8i4jf4kaspa";
+    sha256 = "187sq99zxdfv3xhq939rybb0pps3l6wgyyvbj3zns5jr6mms64vd";
   };
 
   enableParallelBuilding = true;

From 13df7202d7d430b0f2e658b692074a61e8d9c004 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Mar 2018 21:01:25 +0900
Subject: [PATCH 1208/2266] firefox: Fix update.nix

---
 pkgs/applications/networking/browsers/firefox/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 0f465122806..6c264a94673 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -22,7 +22,7 @@ writeScript "update-${attrPath}" ''
   #  - removes trailing slash
   #  - sorts everything with semver in mind
   #  - picks up latest release
-  version=`xidel -q $url --extract "//a" | \
+  version=`xidel -s $url --extract "//a" | \
            grep "^[0-9.]*${versionSuffix}/$" | \
            sed s/[/]$// | \
            sort --version-sort | \

From 97ab43d5808a643b6b8752a5b34bd6d449eef2bd Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Mar 2018 21:01:44 +0900
Subject: [PATCH 1209/2266] firefox-bin: 58.0.2 -> 59.0

---
 .../browsers/firefox-bin/release_sources.nix  | 780 +++++++++---------
 1 file changed, 395 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 0fbe6d749c2..b28d4645c38 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,975 @@
 {
-  version = "58.0.2";
+  version = "59.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ach/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ach/firefox-59.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "4f974e90d5db09a02c61a634f7309ba479f8699d1d61f4c21a7bb6ae5f520332292031ce0988605f8e727da5161de1b3a055da59d5f8bf220c1b369f9c453f17";
+      sha512 = "12e4398b10c4e2c6364307098307895afd2a5054f729be61230a402b7fc7e55371b1ae04693f3aa87ec1d8a537d92174be1b61bef601d41ba821c8f4a4c4353b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/af/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/af/firefox-59.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "d821bf5c1fa1bc38f64195d1bfbc7ce5205b50139710fde6e1db37c4a429a0df16ede8411a618d8e339f369dac699a38651c3aec9952d7c20fb84e1eaf1f59de";
+      sha512 = "5e5f7febbe069692edcf4e1e91cb1f2cf5b54b66e3f8e77c4920f5f64011f426fcd69f04ed8f84cee569f7cb7d11445dd59c6e308a58927e37955f8bbf75f166";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/an/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/an/firefox-59.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7238e49735bab7983a478c217b128d7cc8b07e90fc5e2739eaf07e35be054a354c5c0006bae6fdb29ef71855c33ea531e84c1617832412315eb2e07ad7310d14";
+      sha512 = "50f0e7b76401de5c5f30fb58920263b2f4221a02ca0e9f987e19d0150eab3b81da0f9c28f0c6b711a7666abc3a34f22e820c4a3496fb73bd2d736f8cbf2691f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ar/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ar/firefox-59.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "f505930eed9262e595a8969dc86ed43c04f32ba62301b2fa8d1246ef956f3075d5633112e6129707ddb02d3047b93a5c9f5ce16f958a06ad928c59d64c8a1e75";
+      sha512 = "d0d77e62ef730af02ef24794099e022296563906019f955861886aee3306aa8326ee5c89e0cd3734640b2253065ddeb1f6941a689593b616fb741e5d52c3a157";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/as/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/as/firefox-59.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "e1b876dee0ac09a391c53f066f5bf56fa6b0b4bcb389beb0844670a7f14ff422a230f58389f3c3d2a1f8b7486fe528a7abbe3b6abfb86c330ea13cab0cc67a7f";
+      sha512 = "2b6333d2e36d44d45d64c53481e82b110a03a18b6156b7d2b0666645a193b116112e3c061c3a07d96b1001b4e8842821f52f3ee1dc6676c44d2b1ae89087d5f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ast/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ast/firefox-59.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "1c47fae696cfcbdd4f7fbbc8ddeacbfa1ae1b9a624bec9f512527b99c7ddd63c99fd55b60ae9a3ea1104fb5b943c8c029b19b93e6426de793788c2a5354a0d57";
+      sha512 = "c21a0e8b1b4c4a6e7eaf9558d2ec72fcbddac12e5b75c066596c57687f02559ed15dedcd5e1a5b6d719664b086ea2b9c17a6dae51ac85a6a0019a8a44f50bf4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/az/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/az/firefox-59.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "5c3bab4ba81967b957c14152f6461ccb129396562ece07a34644f88b67185f9d6639ce3bd709a463816efe531c6e8bf3aa6414828feb37ae54564d1c9ae237fc";
+      sha512 = "c057c7c73a9946aa8bafc535e3da57c59037c7150d9b3152ed993587999068712d05dc6625c1a36c38665f5495b4d147f48d962479ea849073f76e7f218e5330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/be/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/be/firefox-59.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "8c719a8fcaef9f2f3ae50d0ecd999972649b5814c1bab45a418c474b6090bbcb47d58a32012f3ccb6c785ca9a1c76cb2f69e370714e1533349806c3db0364dd5";
+      sha512 = "51403b2a65b4c4f3839b53793cb88d941e50c5b14d63f2690b3490b63d9bdef7c12c82d2ccedd633d9811b01dcadae9b94d5c6a5c6bfd59f7a1710c2cb1d8ae0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bg/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bg/firefox-59.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "b871aa3dc5e4721174e73081e4c551f802a16cb54690ea1850e549c37c1160000b9eb0e312fe03e43d8e254cfc063d971625624a6d0d7a8de14f731d1e139135";
+      sha512 = "5251dcbd0c87bc2d41f7ea1487e9ca4aff80bfaa8ed2be8a76ec96388587b41cf9a4a80f8936c9b770fbfc9f3d1b1716f6f8d591b6bd523e3bdf0baf35e8b5b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-BD/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-BD/firefox-59.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "53cfa7aa2bcdebb6770d1d993d71a0fd039eb540884d0dbe3d0fc953260a850bcdf72b20eb67d11630aafa9f282cab279776fa9d5cb45aeb7280dfd064b0199b";
+      sha512 = "3010153a9285c5f85eaf5910d93ccf64fc903db34ad8183ca7841040cae522b004d257bd17325d5fe333714baba4f300ab9b1ccde920568f849105acc4f5fbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-IN/firefox-59.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "a47f5c6bb46f6f4a2af27a8dd1556339ba5efd1b2c23494b0913033580dc735097eeefd58a6c0253d74c8fab30fa628d106a0f4111b0b5af5f98b1dd2d9d111d";
+      sha512 = "12f013cad7391649482bae272899a74d0981df94693105fce9e22fd7ca9c28bd992c2f80cc68ec5e70713d82e21cb015af5a3469b7868b89ea182d2b8b41a52e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/br/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/br/firefox-59.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b4dade4de1e40f8ef6c1af9fa260f7e06bbae6790a87813032c35317fa462f15905fa8b66c8b08bae640186f1fe6d10c15c87d64085d6fd23e5dd7a33cb9326d";
+      sha512 = "f00b92c8328e7e97abc5b1f4233a49f9af396cf147e4ca0682b54c541fd40d3c03252464d6ad888cad06f8e79b6d02432e86f944d297457a4cca2fa668f3722e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bs/firefox-59.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "d32cd117524343cf451b30526466b84f84a7ab99f6e716ccff5c1c7e768003409723df93ee8839ca00d3e0a52cd9cba270f78033124809e4d18942bae9c736e0";
+      sha512 = "70af2412a775157473b3018c630d6786c650cdbd5691ef893e91807020d360c37a3031771442f3e16d678658ac045bd4fe8393a35951ef9edfa77242785c6b41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ca/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ca/firefox-59.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c4063632526c6936e71e50a898077568cf678a8f9275258311bda91ca0a150b7c30b19b86cb12bbf786624675ed3f383ba21b52545b36f8ef7032ef9001136e1";
+      sha512 = "6cf8206a6b92878fe6cc789619eb92f231d758faad1cec562329399529dfa7671dd2245301be7d75e98afe5714185826f4ce13748a01c768bf186805be579488";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cak/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cak/firefox-59.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "cb1f2142d698226ff881e9b3a1037ddbea1bc3ffca8ae98a7526bc3a6b728a3e30957196d809d523a638d7482db3e60b774de8f7f274c76982962026cebc0b9c";
+      sha512 = "01891976a3053fae3d8ad723456e2003afe75aa7904549f2d9e5cd3becbc3e33c3ae73755ebe6b92d9bbe05a2f3efb52e0794cc6a3f1c00cd9b376cac6f85818";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cs/firefox-59.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8b17ed6a66081f445319a6e329710350f79751388e1cc6eb6f5945e0c0e6145053904ee2a1c1a562407299518eb8d97a52d86a0d4807f8711ee3ba6521f23820";
+      sha512 = "d307d2a2be21ca964e2bb48ef062ca4a84229108d8047e601cd9f650fb0c0445f477d08e48cc6fa3a6fd0f3877a2c65527ce98c6e42a85aa8b1734ac0467b9de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cy/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cy/firefox-59.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a679e779b6afda954fde1bfdf079eca62e4541bb5c0398e8fe797e3ab8341922c279d1eb5d4f237995d01d39261f9b6f814540532c646558b10cef178870d5bb";
+      sha512 = "0d5eb86ca615908701972a03e12ab2485ecaa22ba6a5263ab4bd748fa91d5ce1aebea2cf86249e25fae46a3e50404d2f91d10937da6e85d9695ec70f04b92857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/da/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/da/firefox-59.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "81771c6a78ff9349ac8086dce32900544d0a8b79eca55a61bc1efde34788a77fd41607c43403bf1df18f2f6aee8b61460e113ee301c2888494a970600fb4a371";
+      sha512 = "f304162d5da09f87b318dd0c9f769d8a0dc37d205b1a1cee316b807c6b9ce80d5252af1e5fdef8da9d2575d5722d37cd15ea1cea587670695e1c3b577006050a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/de/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/de/firefox-59.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "cef7eebf9dd55af3d7245161c6f41153b99cefdb73e71c5cfaab1d8f1037c8da7ee2f36836e51416c36f7a7472b113bab23fa6a35ce30269733889ecd4aa1d5d";
+      sha512 = "699ecbc68675286294d2917e5d024ba4705d8644a5c43aca5ccd5cce43f06717d853c109290806990909e55f0fa47ef308d9c1a9818502b1f9ea527c5d38dd60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/dsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/dsb/firefox-59.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "986c25e9f994ab766f4017f664304c03cc0a26c8ea50f892d48ff571322aeaa6b76eb1f4c7f1133a68783a9f55ce0e56a6cc599fb6eae0431e5bccec639504d9";
+      sha512 = "050e15e9e82638bd70a8a3ae845da65bf7021bab70411ed33b686b14aa8ac96a694f85a4ddc36b074ccffd63704c88e77010d24943bae6ba76c506cd2c2fcd92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/el/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/el/firefox-59.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8d352b56ef049e2bb94952ebaca276dbfa4d7ea34ad368907406b67391d618e8aa2f908c19f3c7210220237d3721021686bc8fa0702c748680035a48b9ff2c4e";
+      sha512 = "5655883ffd4d55900b50fec19436c475c78a6d9616c277b1b547b9054674343a187f3cb0d637e08c45695994ab9173d4cd0fc24a0dff9770aea9f7defa9e53af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-GB/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-GB/firefox-59.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "318a67d7d875a350e561a2a4e0f2d6278ce3a9f7e2db9ce307c58b5a2ffd40753edbfce01438c7b02421efa84129f95caf3887ca2929271ce5fe95f9321db11a";
+      sha512 = "059034d9f6be9153111e173b4c55a8670a94675aa574bd0f0859c93c0f32ae949b849bf77816f68f4e6b726bb0cc5ee2ba1b68c7c76beb72b2fe99a91183e296";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-US/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-US/firefox-59.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "71f5d1d3779eab4025ab57aef1795f9d6c509a50c5397df6a8ec741584d441acb9f7cbf8c8c002cb367c9c42b72dd6d29710fcf0cfead3a4525f2ccf39f3b930";
+      sha512 = "0443db32335191e1cc2f65512c692663aaa1ffcf05875b9d955a9afc7a651999e0e1c81e515ba887cefd115a4db541999acca6014b7a3fbe89784d3077185905";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-ZA/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-ZA/firefox-59.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "07604a360c8a932fdc161b4c2762e953812eef7cca765db29bcf0514027a8db3c22bbd879de6a1222eadbfb817540ef55e136df0df858a21c55ab4150cb3d5a4";
+      sha512 = "78d2e567a791ce410442ab0b8c12e5e4f5fc671f1f74870aa02ff3b08d69f51f7e06027d81f917ce79f8422548731bf78c6bdc208472e3a3d97e0b0c47139e57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eo/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eo/firefox-59.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "cdcb32f4b5e14a11033f62ec7e4ba00fab689dde93978cec405d55a497fb6a59a9c06839e04b8cd550557d37f1801bc6f9a9440e4a59f3d4b32cd2a27ddbac9c";
+      sha512 = "2e6a42a96dc3d29b229de4a214fd2106424cc702d6fd2a985f0de6854663c3cf3b5c1025e2f2032bc4c271efa02df450e8677cec516cde1114fcccf5b506c7ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-AR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-AR/firefox-59.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "aaf28d1b93d1eba50eafdc112f51fe261a0a38bb9e28ba4d86c12cb1f509d5fb375986e7a7e7a81483aa64bcf16f09620ff325674c29738ff62335d8ad1d1c7b";
+      sha512 = "48d2835f64b8e010288daaa5f9023b0f008479fceb3f08a19dcf7044283ec922632e2cb08725676ffc3b3406a379df790fdcb3c928a2a02ccb66269c91109c63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-CL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-CL/firefox-59.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f30c318fa51c551fc03bf9f962cad8fce4795094d1389c1a35096e8e229fd1d78dae43cfb6c01f2600e7f5fd8efd02345f2c18578e3bc0378fedb947abf5904a";
+      sha512 = "e35f259268f34fb0df14b85d5d50ba9ec55cb3a905df88b488a5c552f2820f426a86d7d820c8ea92055ba51cb48c2cf2c41cac2fb0d863f4e341d316960322e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-ES/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-ES/firefox-59.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "08fc4a475fdf2e91550de0b5127df679f4011cc79af6125fb117aec44f97936f794fc0135fd381abaae4370b7343c200308e0cc659828fa8f8e665f39c4109cd";
+      sha512 = "2b09055ff9a4a803003d98c4223c328502f863419a70c0a4f56d92df04f2b484ece4a86caa0cc670538ce91c7add1d31885493d5e49a3fa33d8c983d67443600";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-MX/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-MX/firefox-59.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "baf9277fe32334b88be4bb6aa5b714e86d6d316866088173d0bfb221ab989708e3b67dfdd934c0df80ddbbcef8b2d78c35b33b1420332b094442b31aa62b6ca7";
+      sha512 = "1520332a48ca76d9101805943b7a40a6c55ac1959650361f87725fac542d8f6dd5f0ca4564ef28ad2375aa2ea9ea49b31c14e34687b566105b7098cbe8a4d4c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/et/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/et/firefox-59.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "eed1be0068e6efba0130658c7fe5104ca0fd9c7485da0715113ac82665a153836e6d0eed083c91a89b4f8c11eec0fe2c0f8ef161f2bf7f565b6689f5978a454a";
+      sha512 = "330f653d29f02c7db61e1009af54a2f2d95e8d2a46283681475f988781dcc62650886fbdf4729448997d8eec8fe6aa401e095d7b0284a67682c3ba4ee24e0d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eu/firefox-59.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d0bd609308813d99a79b393dc4fe0960da01ab032ada1d4c2933c89acdc7a1016ac25ca67205aa29106ca12b34fe7dee42316ed457a4e0cee9fc43e3acc2011e";
+      sha512 = "4a37bd50167f6bf57f7f89f12314bbe3bd198003f8bbe9c45c7f38b06f51956a5dfcc2cb65af536044b64b22ff778b274d5f87867a7f1d0d6a74aa07cfb2ed59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fa/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fa/firefox-59.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "cde046bc147e860c40f979f8fe1bb39cc3391939f2b04f572d6db5a61be8be9574c1ddde1a400d16c06c2c6dd87a9b19830f2591809439820a27349d10860801";
+      sha512 = "481a1a26bbfad9376f7da898d4aed4b5637fa3a8f72d5f2dd4240d310ca95349f31690df7ad4dc1316360d2c4837a8c40bb4b7261ef6459ed05bcc870fdda987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ff/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ff/firefox-59.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "047d9b2af90da36699cec77ba419db42cf6ac63fd3d9185150973fa6aaa20cb4bf23538e50154f03bb3edee4f16985baa4332e247ccf7d756f358f81afb2c329";
+      sha512 = "be22da0887c10742db25bdecc28170652fac7e3aa819e757b900e321cbb86e3570dd0cc1dc45ef6ae56bad7fb407f5081d656be44dd5c161294e6087ff563ee1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fi/firefox-59.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5c2955e5c1e54bc0b2bfa08051ec61745765b7d9c970c7ea905e41d4ccb22b32caa3011a64a152d997db1f0b6451b10116060914c601aaa7a240f23cecff166c";
+      sha512 = "f9cc91a350c243fdbc80e4d4d85024ea805face7406098c2c016c154d7e705d15e6445478f63e9ef62838fb3ea74efa186336d14a57ac715df025f526010bd05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fr/firefox-59.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "e32448bc068d0c816c16ec1b4c53d462da430ca7ebca484dd363253e9d47277a0eb40ef0291b58e7dadd3457f49fd69d452c2e7728e45a1473472a2523c24028";
+      sha512 = "774a038f6b3b27e7aad40935d33c770cef2b0553b78ccdaeeecb23d1c153898beeedf14c59762581bd5ecf4489e739641d4ac04c44fcb64e40da419c232c79e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fy-NL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fy-NL/firefox-59.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "9501fc459c883b3d7c3299243288aa5210755d78238af2f6d79e15104ba575b4a7cffebc9c067dc23bbc0941bc5f4a786909a194bac9f1f59244715f8b3cea2c";
+      sha512 = "3d6149960c5bc044db065b7972e6c55ee74bc650ddff5ea127224d081de2122427fc6166d89448402bf8d07147d847e1be86c28fd4b949a3b2a90337979eefea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ga-IE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ga-IE/firefox-59.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d7696ae4b38bfdcd93ffc6796bb2fdd6b952a5892a4a753b0a0717c0448ff59263516896dac2830aabc7b2df5719856f077450d29a48e25fec77bde00cb25d4a";
+      sha512 = "6d6ff8e7425ce6a5ab1a30936ba52e9f9f819b31b3b4cfa2028829a7260ab489b785e1f56d2095f3cc669e5b7647b5c5622cb751bfe90408b0c4c7edc09dadb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gd/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gd/firefox-59.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ebe7526f32d43572538bde521b4df30aff91eb1a30148e20a164cfa044d7391bd7259486c72e68f9c110745e9013f36fa8c1f5be7519551c303cfdb06d4b6008";
+      sha512 = "84c99ebe9add8acffe3fe82b7d0f233dab91d251c1211b4b0c79cdac99f272a12a551a91c6568ec0298160467cb17e9b2c9206ce1b8f78e2bd8e1f6b53bada94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gl/firefox-59.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "a071ecc811b90c102dd5c7b4174d6cd65e7e07bed16566e71740cc3d29446757f220330910aa3a321809de3417a64641ee74b788bd27975c7ad75cc4e777116a";
+      sha512 = "8f5ac4fa1549e89946378dea8af31133e4918f4fa09f6392aa048aed8161e939f65bc5a86f44a416c55cf5f770eba27fe862d9c189f448f93bda44c50f01142c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gn/firefox-59.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "1bc8f57884cd4af64e1a99defaca501561d84a70aaa3f4ee71c3c1497a4829248e2f5fea5b09c89eaf8d3701fd4f9753bdb50f6133850d2baa1708e942d8281a";
+      sha512 = "55a4ecfec8f853f9f97e3f810c377a0921f1553fde6fe60fc7e996c0f20b2576997ee4999e392687606ab89c20e44507db1668a8f5ef2491838da9951d9e8bad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gu-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gu-IN/firefox-59.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "230b2c609b5ff96385b93ece8ac197910fe332ca76300dada12a0687b025ee7781ded47bb1a13816bb2fbd6c7e250bd0af8f4b40dd78c1d75a77a66391d7bccf";
+      sha512 = "487a830757aecef4a8158f52231ba7128c4d0ccb1831fe986f78cf627997927b43ddaef073882b5d3f445c27a4a80c5960204c5ae666ed8d889531f06b433807";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/he/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/he/firefox-59.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f52add938bcf862c8d417709298eae9e502aa5845d01a349b9a8d29ab790ed342b7bbbe615fee6db7e939150a15a2e46895d162544ce4028806bd68c0c832186";
+      sha512 = "c6b0cadd23930933b80dffda825ab9bbf5a498f7d8f92c0a2e74e7f82b5bd9c19bd4f73f492ca9c7350015b0818d702519c97a3369ea3e7129caec7684737688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hi-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hi-IN/firefox-59.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "10406b782c3343fcb63420cf98690ac6eb1eaf9024eff226066587c356edf32006e288e8ce6373f6fc1475dd08c30da2b38cd284ccfd610c33c3726c91dc7691";
+      sha512 = "2cbfa8f66aa329ad2311cc73b545f09236dc6f014f009cb77bf8ba1886b665002849f2f1a85d8827baae706557436203ba9f5ac85eb7a11766c388a7bec3087b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hr/firefox-59.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "8fdfd613b9ee56a9da8f8c1ed1e9c9a6ece04bbffb1dc197120c9d3aeef2c36d9d660a44539f4c1820273be91dcc30d89652a9d9ecabe9bfa88b146fdaef18a0";
+      sha512 = "c7ef4d6c42685ce58402a3a7d42b556280e4bce0633d0d0125aaef391e7a0ebee17347c848928f134af3b2327ea547121c7834b33b98732fd32e29cc2bd739eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hsb/firefox-59.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "4e1cce7f55a3b66b21c0f8f16661855b2946a403d6f29e3725aa300fce49bc065dd7719b9203e79b3ead73dc92220a40d2f99d9079eecc8ae44a38b87086394d";
+      sha512 = "ea42844766e41d634b4b50fba65cbbd4e8f4813bb56abee12fe8c559c031ba54e73aa8725074391b879f9ff88cb9ec285306bc816039037c7306ebbc8cfe7a82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hu/firefox-59.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b636ff6691834dbab712be03bd3dfa92f8a0bcf5e4807ef77e81d0a602acfd1f5df37e0c5a2237518305e4a9150fa592204f84e93ef83273f84a4ec34f65d3f2";
+      sha512 = "8e84cff8c9a20949d7ba08f57a671ae06ec4b3181cee67894d752289193d6652744611a82c666275e9ca6d03b9aa4b1e73637a9435fdc25e3dbb2100d53ed021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hy-AM/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hy-AM/firefox-59.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "909f565a687d6676175105584b2042af8cea66a2da1a2d529954c1a3f5f98807f655a20b1b16d1d80a9af05c02997d543055bd2edcffaec4fb0df0da6e610ab7";
+      sha512 = "33771438db83a53231502eea1921948c53095db70bb09e7ae354615af294b0b85c7318944b8cc524f6a6e8386b351153993b9368ce38ceb8f57f7486d2626a58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/id/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ia/firefox-59.0.tar.bz2";
+      locale = "ia";
+      arch = "linux-x86_64";
+      sha512 = "1f529c3d83d419a8890f947b4999e9b27c6963987879d25c72e7f4217c1ed7a6c471822d59697c252f18bc5d0a10f869e63ddd76c2b2a762dd150e92a6c63af7";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/id/firefox-59.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "1338acae5fb5d477f51d09c8e49bf29ea4a7ac1a86d2b8bbfd431af2faa7a2db19fe5ae61650127c0f10a40b37a464bf7c67e4a4d2930bdb0dd04160013f5ead";
+      sha512 = "c18fa29c6dfd11fe311440fb4eaeda46077b9270945d02d6e88546fee0682bc7cae8ed41a2cf50b42d851bd7b61f689bd3f6b92970b1ce7e314a7822a54526aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/is/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/is/firefox-59.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "6bf296d0e64ded43518b30f2b064cc99ddad031e8ff6129a6a9bda4736e93cfee1d2a9c0df96e86754762cc0ef38fa9cf7d79caf154c1db8c5ba57d88abfce0c";
+      sha512 = "2057a0ac563b16d61ded5ad9f5ec45baf9e1789303d7fc0707a94caf2eb193aeee11610bac46146489993118a3a2b1aa0e1b8f2a4bb5aa0be95d55d48bc52092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/it/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/it/firefox-59.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c46ab44a51aa21b23b50763a6f35c5418a03a847584a1aad3560f62a828d2f859c912ead26d1a1206cfde73d411bad31bc87f19c5203850712bae911dc86fa44";
+      sha512 = "175ec65442e20b0b05b6ec5ed104117163e25d96e801bf268b5a58ffc94d8ae91f237d0d88157fa70792e1b9ac9b3fa6e8dba8000e4f0d7f344a1598a56657b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ja/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ja/firefox-59.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "4765ad23e91c8599b6d1144533b7b24cac68b77a91c197e6e505a3be0bdb74f60bec2c49b7e7338ba994619d3969c00e5b9c7ba872da4958be37ab69b772d786";
+      sha512 = "ef2aa0a3409fdf9553bcf11a6b87a86165f976a9c84587c369d32d9c25a0387b991d71e9c3333e603bf73e37db2c79b3fb47a8391ca75a84634b937ab9a7cf39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ka/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ka/firefox-59.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "2a8aee12fead92872c5c94a319926aec87a95e891fa280588737b66814aa7378c5d7240a3c5f50145ff23c7673767037160d043b655b2a96ccdded6015254f4f";
+      sha512 = "31e09c540764e993246f929c6a8f1b8a0bb5b35856981e5edf7f55b4226caf5dd1bad2d4d1eb63f915b663c46a4800d11b1835c3234a21f5bccbea6c263631ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kab/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kab/firefox-59.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6518ac1276db195c2435160e619dbc1ec7494e51b06971fe409f46ead4af6367567a99356f6b5e353c024a8b9e51d2c2f99983d50709fba2e12342b0084c39f8";
+      sha512 = "95105aeb8cff505ce4b6ad401bf1d823818a3ce9f64a02154c628a7bffac0a8cabfebd9cfe623f8bf945128f44d673220abf770c30c15b942e59ecbb36310e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kk/firefox-59.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2d515605c00f1cf2e76b26dfba3d4fbca00da18bddc5ed39f66d15568b15a2bbee0f1676d2b1b5058e11399ecb3e7cc593ff040757fce76d82ca859ca7b9ce81";
+      sha512 = "ce8f9488fba0789ed8d39ca3e2055a8b088761e0516c4b214421443a5d5c88ab9f732b600e937fabfd8b9f8cbfe35471bf8c8754c5e20ed103c986d945b2ac71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/km/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/km/firefox-59.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "6bcba0015fd5753f7ab6725197fc164723d64de0790927115a0c06d0d1d92fd39bd41d83ffe59a5e9eaec48224c24e39f26cab3ac1bef6265eff8ad9a70c46c5";
+      sha512 = "a31bf297f9f9eed047cff8b3ec7f5638caf3538b5662f8d2ecb8f37e54e22ddb1fc37c6c8c854d3d95b8e49cc2ca82e9aeca6894808b3b77fd8642c04f7caad3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kn/firefox-59.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5fbbffed20a48328d2b199626a9810dfa6bf9cc84f358d429e7986d813c1ffa37fc95eb20a37b10bbf728e4bddd3ce8635c096b7fc4a4dabe462a32606a6dd96";
+      sha512 = "941d71e3763c16d6387f397e7d6c7771c2b9ff99e1eb8a32ce188d704f3f89aef2a6c66e5397fe056725c25628960a8c58d5b2611c8728128ada60e92e6dc95f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ko/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ko/firefox-59.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "2e7f5b385fb65b167ef1784288a68fdde29a3345ade9eb873a6e07a340c5bf76df5769c7771fbf9049eb31bfc5978e20c143a2e753614237b25a065e0735313d";
+      sha512 = "5c013f5a5b9033fb71896611570d3a465b7e264eda5f51f480e557ef6fb7eada5f291b714282c7c50bbd7b75a7d1664879e8575419e71e40a45043c031309e07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lij/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lij/firefox-59.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "fe436e3ab07f3b139460ff385e73147572a1becbda1ccacc0da6a6cf1c49ab3e1424e9b9d8e26a14a2748e5ac9b0c67fc8970f14f5d64975ace3c6e9949f702a";
+      sha512 = "f94d01a0c63bae58027d973d67fbacc76b982abefe561ef086b4b897ea686d9c8521a81cbb8a2f1ee25f1402935107f42821e7c41f593b042891d6e8285000f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lt/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lt/firefox-59.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "b6e3d248f7a76c4a202c767710151067031e34a08ebcc460f4d6bd95fb395533414d6267daa1d9d8172097aa4ae0155ae693e027757c93b1cba50ad9a94f3cc4";
+      sha512 = "84a60ed8e168c63528c8b93e9e77eba73f27b6dad13e6042568272f992350086e72735cd184da71075d8111d1fb298a79ed4fc03b4734f83d13842a6a9715ca2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lv/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lv/firefox-59.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "7bd3844aedf8112d396f07e1d57ec915e48bec1c375c8489057d7a3f2aa5f93c738d2d361848b977243b95b79a821848c2b27b3117a26fce9054d26e4621522e";
+      sha512 = "6faa48a449627279bb291328428e4031e2e3f55d1ff6e0805e720a89c20aa50dec119fccfb552fe9dbfa302a7da560d63f1e0f4f053dc14cbb4df3a79e21b609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mai/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mai/firefox-59.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "d5e6a53c7744ab267404d9107665e6f55acf584c11123d0e9b4a82f6572ef815fb87f52ce9e0be9352ed7c4af901819fa186ed57e4a313349ddee680727b0343";
+      sha512 = "00dfd076186f53915d26016107934705c4585edaa17a5a3a6887ff646d2c4583620b052f8fcdd66bb5841b5b63252e64460806c92ac895879035e91c2a957724";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mk/firefox-59.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7c49cc95a233c4662265e3fe57e87f4320ed120309599f0f78655a9e70b87ae36dad915afad2445cbf55c84e906c3fd2df4b7f84db59323f4629f662f6f2af31";
+      sha512 = "a0905eafcbc262c367cdd8ed94161a71bf0916727fb728033dd4f43462693550e90da9479cd72d8f9d644bbaff95cd2a04a17ca5fd4e90c151b3dcc6e8179c27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ml/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ml/firefox-59.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "d1aed7e78433d3b427c215ed0b2c8455a8a0374bd4e2d88d7dca59c2a3d0402ce1670f1dc1c8675cf7953416fd4be584df59ab646783240f3aef14cb9474c91c";
+      sha512 = "53bcb3c892761447c0c0f62794d1765536d5ab3bb99e9d076ca75280b93b86d64694355569fbbdeefdf5b588bfaf90b0e0d0ef10f30b1efbb9a37073ad5cece1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mr/firefox-59.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3244354a154372149da8b0564645ac5b827176c6eb79a88a2a182d2ae7a5e320fc1f843c1576eee86dec62d2866f6648403bc9c687322eade1f943717b655771";
+      sha512 = "3da0e724bd03a088d6e5f14bba294290800a46b245867381333d4f32e7c53ed2fa2e2ec0c7aa5d57b3a5af6e71310416b83f3511af26bb0431254bec387f1af4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ms/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ms/firefox-59.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "3f753476dcd5f128d7a660dfb9e1003f706ba2b2a135df629bdd68c8580e9bd47f23b5fe3ef77136c8e6611f434bc502f96eef4b7f7d6185ce7630bfd1f32e24";
+      sha512 = "6b2e6861cb3feb8987fec2e72e3bb958bc6d2884e4c71f5a762b57f17981130439e85a85acdf7285b4cced9b5088e34b7736a2dc57d35eaeb14185d88a7b7415";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/my/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/my/firefox-59.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "b83f6807c08c08e7245bc1c5309e2bb2d3d434a577f672a9ea9e95017b61993acbd0df9c339a4fff4c5e65c589d939c57477ba206194e7d09ff140a8882d2e52";
+      sha512 = "18201ec177a93ea77f8fbbd201754e05dc6126954771764778e48833f858c3c46bece73ac4698050f4f6126ef9f136365f7387d363dd274063d6bb46d23d527d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nb-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nb-NO/firefox-59.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e59931df86dff00b3ee55f93b01e4828a60de0f693de412c4825dfe7957c0bda8b9644040657036d5228fd7b6f4e3a93273d561f14fc5e9d3d81cc5c708f0f84";
+      sha512 = "b18a913ef9aa15d43ff201f61d7350e41e0f8819a835bd777ebb29607f82f3b4d4e223c5c035b2ea49bc4306c489190f55e545f79989440824742b7ec22b3e6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ne-NP/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ne-NP/firefox-59.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4dc88c6895264f50639e17eddd5df76de7689208d6094b0d4a51586fa45b359a0ebddc2d58cffbb952cda0a3c199ca287dac278f2a9cd517b923c60398fea449";
+      sha512 = "6f4fe4817d6204d2b1a93fda7e070ab17aab04148ab33508b4f2e4aefe4e23ace3cc1e3a0cf11df35582ee8f39e841e14e151d668f411529b99b0add1ebb34fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nl/firefox-59.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "30f623d07fba2688b8f4c4958817ca208bb8981d1c5a64a232568c301aa8b95dec9406bc064b5c629c357381b5c41bcaed9d652d7e25b3a4f537717d79302361";
+      sha512 = "8a74b28ea9b288c8b35136274839d77c8bbbe0a11a2f3ab6b9577c000a8c3fbba3d1a053dde2ac336e91ab5cce4d5809ee0c08e91fb452251f2c33714c7089eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nn-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nn-NO/firefox-59.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ddb85b71a86ad20a363edbdc9e0e79f6c485b4da02cb803142a717d297e58c10a4ada476a57dee01d5834246a53051b9e65b95eafae081b5b43648b2ac914acd";
+      sha512 = "1e06c148bda453f841f837aface7dfc228b20c8e10d84afd90a0cff2e12a457c5f176461d79543e775c45bf4dd62d7cf1048bec5d3574c5dfcf62c8e6609b487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/or/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/or/firefox-59.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "8161a5ccf70f5b370d1bdfb9b849a2761eb4c25f6d821d39e63f45cd29d9be82be81f523bdb9b1f1b2ea134a8672b9153ff14ece3af6ed7e5a2339c9a43d71a7";
+      sha512 = "bc8575ff5aefdc8df53bf121733189775b1c145c189ed4b0ae8a99fd1f8f578b8380836331f77b03f766bbf9a4f1e6e7c9bbe6087686a14f0617569863c76d86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pa-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pa-IN/firefox-59.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "fc0424027788746b0c8b68c553b7d989e60af2a29e4fa733bea440f31d277c1e64fba06a74c915986dfb3c8da13405689121a8771fb0a47f091e27185cfd7a28";
+      sha512 = "0d32075943cfad32e01df6a2efdfd20a4cab604227b44ba45d8389de18de020dc137096d9de602dda5cc9fabd80ab07017fde6f8ba6e9c46132fcb98908eaac8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pl/firefox-59.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f39a26cbc41739b250bb92bf2daf6ba835639e5751e1dd0893013e1541ec43de7e747b3ec754894a56362263b3ace8d5f105ace5654c30657ad9e44195cd42ee";
+      sha512 = "c114fee704632eaa7fad91d82836329bc873984ab836edfb2d4b880be07e308bf50f4eb0989995a127bdc649501e9a4c76e91b73d5bba9b9ac67fde22b0a02ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-BR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-BR/firefox-59.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "2d3fb878c286a750fa10413545f0d2ce5efeebea5f8c4192dd5b53131edcaa6a54940f242ea002d9a79f41a14e70095cc79526773dc95d3550bc0e0291185a5f";
+      sha512 = "831f0f1e1442520b96706b672c2c34f46a1335808d552473a5eaec898fe7b085485b3c66535356731507937dc2d11f2082db1a182404d672c479f916868283a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-PT/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-PT/firefox-59.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a2eb5b43c3d87ea8193fdb1f0ecb0e1a317a71f10af4f3184484536dfc1f7f09fdfb498bbf073f68847f7c2cbf9383adf9ad9e92371c8a835e4e3651a0546ce7";
+      sha512 = "9a6d7559d79808d47dd0dec15afbc477d599be476761d48426ecda6ac96cd9ce560bac9eee05a5020b8f6cb764d07546ef2fe59f79c39f20190739f1a3236967";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/rm/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/rm/firefox-59.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8dd38ae11781013a03fae2b3cd5fc1b033c45050ed4245fca2302e1818135f1e754cb6c8ecbc535d253104ebafc0792dbabe78f7f336f12297b7b4b8c4a9f2a3";
+      sha512 = "03925bf66c04031813b05008879bbac83ec81684a5419d6d0ec87ba35e15f3f8eb3fdcff191b4ced92f1ac50136f13544c03d58bb0f241ae50e953940a7be8cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ro/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ro/firefox-59.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e9958818254c1b5577a83960e1136541c8ebf2cd4f43ba06d73c2e40990fb6da958aeb423c640ae988057d3782db145ba8e8cd7816b8aac8dfb7f58c2eb0060a";
+      sha512 = "5f7dfa6494e8c1687d8bc3ee473d8bf1a5721f2766c883f4072a55c0507eba1cf422769a099b2485762b996c8f7dd251577d94c785c186a73fd0db7d548e8a9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ru/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ru/firefox-59.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "abcd9a548335648d84ed3856a89275c62ef7d883e18d52dca053b4d8f80deff8fdab7336a2aa9382e55e110ded2d4bd9cf147b3f482f3b0ebb972ac696562645";
+      sha512 = "9104b67151238cc6b531a1d874d2474ded47ba1f5ba5bd65f66ac60ed0876d4170f19b2c5152f5d07e9965fe74de0df2504ae40f49d883546d21586d4d832a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/si/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/si/firefox-59.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "53a7b139ba28103b88359eb450c033fbc8bd3a0c95048aadbd058e505ec85b652054968304d113826a5fcdb6abcb47e8498d9750023a899fd83d5c0dc8b3ed63";
+      sha512 = "79a88f42f81caa578afb3d7b1efd85a74c76c1b9ac7876e63d19a15bd3a7ebe5602cda5ba3b67c7e2a4f24d22d3a83bfb35ecd034ceb95fbd40652a88bdb89c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sk/firefox-59.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "05d4f52e87bf24884caa888c14dbb6e46bce2de967fa4524090df63b2d9f2f4f82b926842544d2ce7ee46f0196a62e8dbe26e7b07176f5c13886ab2a1b2cd184";
+      sha512 = "9ce10a004fa3f3f4a02bfea3abccec28785a0db9c1e5a0e797f6eb83731c6e7f4902906863cd681f5351c7bb84dbeec59b840c4612b1b6ddbe244a4142f6bc0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sl/firefox-59.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "655b4fae25e42cd1678e49b555508ddba2da83a24f04d7d66f5d25a124fa2818368adc851258dd78915a2998272cf8e7bb7a5e918e01228e735d3ad0caa8edc8";
+      sha512 = "898915cab6633ae442b7328ffc3e6ec60649b5d7bcebd795c05a2e552d40a6431ba02274079f2b3069ddf284be986b427509077526a03a550d635f518c8b1620";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/son/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/son/firefox-59.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "cb555d1465c5ce0a7db10e5117081e682425aaf00221b93a66d23ca9217cb2cd2b3835007961f572a39d93a02d12f9a62acc75f1ce3d8c3bd6cd057afd750f79";
+      sha512 = "fce8ede20a5f9510546736b37d6f80fe65470582ebf9608ab4d4984e8b46225f3f68c4d82569bf20db204094932703a74b1333884791db1bcce154fa17f45d09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sq/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sq/firefox-59.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "5afe4996a2c66d220d038cc041fba4a3bb5e411c0d1c4962b2a3f28ee16c5f23d1d8609a7d492a10b16d508c2781b7bdfb884d810ae5d8c5fdadee8120a34659";
+      sha512 = "4a92efdc1363069dd871aca5024334866443fd9228e317d2ead30a4546102e71c7678df46726774e989e4e0ed7d3f205c229dd9fbd3a18cb234d099f3ed7a90b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sr/firefox-59.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "641e3173693e73018154f5f3fdeefc0b0fdc0b1939ccac19b73769476a8827b7244a4088cc83fc651694e9c82fa5231b114fc05c80371469e63926494906aa83";
+      sha512 = "6966a84f7846f20951f25e4e6c56a65d896e8e51f6d1cf8ff9ced8814fffbe3d6db301668cfea28bf34c338900410b8e633f8a7d241aaaf46fadbaa04ad3eabe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sv-SE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sv-SE/firefox-59.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "873f11216e002fc9eb4bd6389774c21d1f3aa17baf0f38770c18db541b30334a84cf2c33b478d009227b1ef48a7c45183d7df9991878daee78c139f6964c8b3a";
+      sha512 = "c4802d33c9574f6b676360ae402d27d755325f208547e7d6b137bce69b0e4170b3d7139d9fc97a6ea21d60ee083c90dbd9d09af4dce8dff78f502bf6669c608e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ta/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ta/firefox-59.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "1d91749d41fdd5d5f3988803563e083f3d65ed6c70fed197f38fffa7847c10d2b0f355fd46a1fb7f84d8c94dce096d2b84ff692fc6f5f33be4ee1dc63a4efcd0";
+      sha512 = "d3782b30491e9044e16d672e697b51449f66b750b466c830acf2b53a13d5448848fe2fb035338d32b43951f2d10b88a12c2dae3cc07050925e127e2c7da6bb1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/te/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/te/firefox-59.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "2b779beaee906278903dc12bf679f0d8ed51d622a1f790a956d039faa71c11abf1b4d462527e330dfb92dabd87aaaa70b3d84a295f21e1a701b4a308c85dc821";
+      sha512 = "37bad7c63601005ab4d93903a8e00c81449acd78a694a855edc9a5aeec404f49433467a9ed6b431886ab9dd754a5f51c29502ff350936f84df69676a6999c0a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/th/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/th/firefox-59.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "82bf20ace51794807f6460ae4142869fc2efb1b4bcef66cc5d68fe8812d4cb89578a45cfe0cb7927c45ab0d1e057f30d4388093678213187bbbb6f209babad2c";
+      sha512 = "a0a6e1803c54f06ed49c1c339da0baf2058fd3a8e612df0c2bdc088d7bec8d8785a688b230e9df6c96aba4923253186f118d0c660bee60bde1054dde246082eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/tr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/tr/firefox-59.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "65766e0207ea300dae4d95023ddc732cf5f59662a894689e87620e6e08a3f658234293b666467eb1f76afffda29716b128d72286b1c9cd68cf574f7121b71792";
+      sha512 = "06c61402c4732041e2140dbb6e56d969edbd64a0e25a31ad521c2b692df2193369fbb6af2848c68da0c5b620af4c171f2d748a10f0e402ac56b72c2f5fea3277";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uk/firefox-59.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "01aab08b333c16ac7156ca35580fc6502aaccdc269c6be29e20ea3ecf97104a3d0214d16bb65f1e3e7aab5b17ef3c637d948a2767594c36ab920c7086e11607d";
+      sha512 = "7a7a76241dbe77680229df13b1a724d71a2139c5fc38bbc573592fcb9f07e5ab2122700854e18af339805073fef0081ec3f1b0f47d19fd1edd225b4556137d8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ur/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ur/firefox-59.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b282916667060259bb90452d08a2bb65cb1225cc45494c2c18c4982e710abbd345744b08bb9c2bd200073c2b470c3b3bddf7f9b6d652563e3c4a8cf6a6248391";
+      sha512 = "33af5113a20708300d8d9de5584e22212a3561cda55a666e153af7e4dda67a114d1b7d3c9a3606f47ce0885613dcffea8c78981a24973d996533020ec3906161";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uz/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uz/firefox-59.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "9339ec640a3d4920fba39e69520477d9c00cdda5f1617067f19fb13b1c17cabd1cf1917001a49604686cd835839adcf3f206dcde14e7c4a98d579c7d8a19386d";
+      sha512 = "8cbe6151d20b18741af0ec6c2c70da8f23753562a4f8619f1d1a9fccc890bd13590dfd22c6bda0db4b113651d3e89c147733ebe5cc761a24eac656f6f3ad2bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/vi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/vi/firefox-59.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c318398809637623e4ecb187f4b531bfc1b9abe093cfecfefe2faa75990dad09b505d8f88e2556476c92cdfda491161af8e7fc27c68c8bbedf5d4abee8eda941";
+      sha512 = "22a8c52c09f6c8fce4cb9eecf6378d9b5fed6a60f0ae73c44a91156fca23d85db837e670f9afeff57290f42c00b10aad5a0ff5b279e7f7d91e9d139928244932";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/xh/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/xh/firefox-59.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "08caf6844c3900624093ada61c92f7c74dc5533818745b8e85b15a093b640eda9686bb0d5d86cfec0c90df49e782c942693d4e0a169b7cdfecfd13827ae27ea8";
+      sha512 = "874e3dd3bd4e5ccf058d026e61314e48c9f06f549912066058d3c936ec606264754c4ac76035ee09b4112faa2b96e146f5250caf1ee7421325f6beaae259f2db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-CN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-CN/firefox-59.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3046e58285f220ef7ecaea81c44063b8573f59ffc64dc12f698a184ad2f11bed3a4cb5d03a2bc105083b0fd84335d7477f81d3eac4bb28b961d38d9c886a9376";
+      sha512 = "658b94cdb5f6dde841c95a48bf1f3e401d02891d5385d0608951630b38aa74dd92894d67d672818cbeb63a3cecdcf101c9ac381b21f208fdb27061681911abd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-TW/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-TW/firefox-59.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "cc453128e4720181d147552fe2452b5142b959e3e0cfd3e340159def69be169d272980066f9a34206da5f815ea54b8e4a062bf95ec4b1cd7ec7b3b83e2ae13b8";
+      sha512 = "de8e1bb93294891439c9925a76b380aa40c29ccf6ce01db23c16469e60d8e9f7f49d0e8e5875cdf0f9afafa9df7968293ae6218039c9a3a0f38db15b39e89a41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ach/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ach/firefox-59.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "c26386414dd416bee1e4fe505da524a4c1de34ba8c25b2978a20c66a09f8e3c7339dfc4b5fa00f0d2c052fea1574e5ef1a5d74e67d39c7e717b54439d7dbb852";
+      sha512 = "a8f58cadcefed9ffaacc55c9e14a8a7c96f854ad624280eec4c978c3a2b8a8b503fbb6173e4c34168ea0563e5937a65736cd170413671670c04ab9155f279851";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/af/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/af/firefox-59.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a8c4485e579f127882c0f00a4a90bff5d02bee5f28642257bfe0d6638fe9156ab10a00dfd48052aa4995dcecbe10b7247f1d4e6d9b424bf06e431a782b46b95c";
+      sha512 = "b69726e9aaed92712f332a8c8a46310881f043d51f5c19ded3cc39feefccad26c41c94ac247cff870289217b36f3c035d60ed32844105b3b6decd87017f8a100";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/an/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/an/firefox-59.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "29e91d4e5ff020241ac81b810b893bdea9fc194090c78fc857d507d7bec8651f15a3c70f3fc245f0d5faa21a3cc44b6327c1a32444eeff3ae4d93a723e230e16";
+      sha512 = "c68b504e7ca5553e14562d347b8bfd69dad41d5f2961e6102db344ca42c1e05ae88c73537fbdf08c4d21cc907c4baa64f8d2592ab8ba284673b15162cdbb06d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ar/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ar/firefox-59.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d1d936284a12f1718b69b279334aecd49a68e5dbabc65a5ade2af277ac7b8ea342ba4b580df95040ae057525d28a7c1852222ab2bd273c2aae74409a5533f74b";
+      sha512 = "6dcde34f30e4f945b36d1d019190ae6aa83b70af4fc2ae4e2c6d02ca013dfb2955639cb0e02014cb65f21b969fd3d8589e0efdfdb13b6cdcde956751329e5c87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/as/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/as/firefox-59.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "49f8e1e8cbe6910a9fc8a812b3dcb7e694c2785fca1c65639d70a5d0fc82dcda9630a1e311df9bdf148d684c2173c761b6aa3926a425730dc35fe99b14124992";
+      sha512 = "be78bef5378fee1a9c38df3364f294f56e5c1a64df2613504fc1d5e0728ad3e41bc8314c9489ff300dfc522d301c66045bb6ed567aac80528add08d8fd40490a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ast/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ast/firefox-59.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a01eb17a9952055aedc3eb29126a826ef812c75f5f5b5a22af3125ab37b63e3e0ad6de0a5f68d0a5bf0b3d1c8fb1f721d4331f1afd30b6a3ee94a502d5931ff1";
+      sha512 = "4fb28c925add1b528406b7f951e06818c6e6f641a998c286bf68422faa037a890f9a556bc61a54a48607776bba33b1dc97f00244122310611d32a7d731d583fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/az/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/az/firefox-59.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "7117993a67c2d0f3c0438afcbd87f22ce141063dbc66a1fea997f5145603f8e9d28b62473add81475bdfbad350d6e683d0c483ec2287f0a47f4e9b3bfbe92ec7";
+      sha512 = "8708a6ed5266c4bb70c747bfe7e5225edce564d5ee5009f016c0a4ed87c6676c04dbcfe573ac31f7d8ad8db23d45c5218dba7ac1b8f16f546fb2484457bdea81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/be/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/be/firefox-59.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "9b3486fdb08f0aae375a74701e7904dc13b1e4db7a1489c4538d523bd4af91b882b9785fc4fbc3da2f6ac67745216ffaf7c48c173f840288c6e39b2fb8e78b62";
+      sha512 = "a469f44da99b430acc985d077ae47d61d518ad9f172ddac88e65114ed144b69f0ede2aa7388b6dba3f9c35944489024a5a419f0433054983d328ff0d09c83736";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bg/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bg/firefox-59.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a917bd437926c8854786b4169ddb2a132bf4ca0e51c17a99a3cb814a1c1fa7fbc7c2ca46a0c7c91ada117ce4b2e89c955e1d60502c6eaefc9c57e0011459609e";
+      sha512 = "dc4c39517e124d241e9a779db619f3dcf1c11b9a2a5afd15d2ba4d4894978d1383c30beead473b9ebf5343d1f7ac1c6d6aea17f0865fa7abd06301f8c3648921";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-BD/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-BD/firefox-59.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "51032301e619fdf9e9ac99c52f771e39425e9e8f063f71c491f0802f02993bda668e0e18196f4d10125ffc66fec760df0f98c19713f8b54b5b05c502067fa4ff";
+      sha512 = "82d1a8615e9d7f97d23ef9265674511a8c5ea15fcde020a6405e5e1b05eeebdd93d1f7c2f9cff96f88b36f1493b721566395834479253476c0e76d807faf4094";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-IN/firefox-59.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b76ea76976ade5df4866c2c54bef553924ec9d3bc229cc7513530ca81c4c4e118bbbbadbea8a64f27a061d0ccb061d7ec0e1a398a428892a2c59761b0a7392e6";
+      sha512 = "a0032964905e4b0df68d8db313759c510d236feef049149140d8eb8c9fea2a8a372ebf1c73f222b959d90c04ae84dae429113d97292f1b0395cb00147ca1e66c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/br/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/br/firefox-59.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "7ba73fb0068862700bf64248987796837c44bb59ffec052638956fe205bb52780bf2ce9bc6b1a5347b173255e893de8b9380dbbb245d8a3552dfd1a6fb73f7cf";
+      sha512 = "cce14e58021b86447b6d7b58d082abc42451aa5af30bb5a81a42ee70c9b17cb653ca3f9a97180d2ebdc2ca943a96b1d85f0beccefebab926ee0872ed03579fc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bs/firefox-59.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "5f2aa4be25f279212541716777012f87f5e65a57deb3b4dd84d4187d84db80ef3f8dede2adf971dae1fd9f4e6398db81f956f59df2f51f35f1893f581266fe0f";
+      sha512 = "c91fc6c8d17aeb65bc95ea3e8f9c6e90cfd46a5b89ea8623dfa61e068e1b129a1c228649a73d70d1bfdaf9aca5a3ca90d2722b16593f3d5b55b5d1d5a7b3f305";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ca/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ca/firefox-59.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2995ed991ab118d5e318f085a340113a0e71801cb2b781890dec674bf3a8142b9bd8b0bc23ee23bed72b1b7bdc7f0181abd4f4d23fc88b7930f710934d2943c0";
+      sha512 = "274f6cbc0488d1417ac34841f3b7574dab1663cd583e481c8c928445b1197c4a716810cbe3413e2857a43ff83b27cc02cd7735b1758d8c67f424fe797b633ea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cak/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cak/firefox-59.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "dce6a70f1c59b01a2d3ac65c6f44adb9baa8e483dba84989e40d7388f9ffaea894e3107cc4a82ba6aa730770c681bd73b50d0ae2f248477f0b63192c45f142d6";
+      sha512 = "25c65e084a21bd1da1732e007020c57f22bc49c7be0c99e1932d733433f57d88d73fc0187ebc55db251876da2d2353f2bab205775bb4e8f66d8871a25b01b857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cs/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cs/firefox-59.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "3c84b185de63520d430ef541cc95290868fb8ccb09829ef8887ee0559fc5da8182e890155e3d1bf4e82966c82837d05253fdf2d2115f376c4bb0d09c21cef339";
+      sha512 = "8595e022a47f60bb9df6a54ada7d788b85e9caff164c4763e31544c099dcb161beb4cf7122b4eedcaaf0f330b47ea60f7f8f69bc442623c1d4fee00b6842717c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cy/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cy/firefox-59.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "1561488521608643f3ce97da23052b8e968c1b8ad7ca38b966fd088368932976be0f503942ef65617248d3ae572afa4ecda3499c427845de32572d163d577c9e";
+      sha512 = "9e7d939963bc28bbe9d1c4c610d0c7820907a94add5d9afdb41b69e050378b1376bff82d429c6a340701063d9516891380f7b7630a2c8557ba36ca8a75a29069";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/da/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/da/firefox-59.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "fda58e6fbf5243d5fed1b386ac8014efefa856ea3f8cdfca4e723f646dda2a8825356818bc8f06183a57337a5449ae3907bb3ac4c81bd7f9590d94bbc32749a2";
+      sha512 = "e28aa52cf42472eba10ff29419910d391e70f62492f4d4ac7e38619c48d4dad760123e1b26455c2fff05794c8f945982d4f4798894acc55f262185ff89829d63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/de/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/de/firefox-59.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d56395a97002f31ead2523179eec912dea7035a86c80a8788b21f272c6e6ac4095caff5520feed261f5ab5a2a2366cd12e223b23d276e01d1ef318b8c15db860";
+      sha512 = "24ef96a42c0d6a580d382e1c793ac0e8a70e1a2a6a66ef2a295e026ad52b706cd73ff0cf858ef927e2e031261e5e8b0bd3fa38d1afcc7659149494c1f0900cbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/dsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/dsb/firefox-59.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "97538fdf8a2a1cc3c485210583d9c80db10b2d599d2b34bfffd5e3b29c092a8573f100cee5c69dbbc69fe67ba6e2c648715fbb9271704dc26e6b2fa98a8512c3";
+      sha512 = "b60cd13f290def58ef219757004eb2ad4ed92f1497b091162b61fcf7f185fd2f7708a1f6ba2218b4cf28084ed270031900cc6ace00edf56dc94a97ff22214a4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/el/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/el/firefox-59.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "4a12302d67b830098e74ecc5a2e785829c1602dfc3cdc20c1e4be5a2e58854128a68ef9fe459dc4baf7f1f87e8ac2a065061a259c9625f09098b364c6d12a393";
+      sha512 = "fecbd2d681c81dc4a8459bde6fb55d595fef390cc54ab1f3e5ca0230ada9b0fa3d69d280aaf1ff6218b5a348b7fb7f06800bbd710f3b20db98056c5a7a75ec84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-GB/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-GB/firefox-59.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0ef9e96b43154f3b6d8e620183c092d38b8a5dfd7b762416b090e2754baee4564f6876bba9765cbf7499f5c658f2d352bb45769d852a683fd528573b53eff2d8";
+      sha512 = "be9bcda727b18bf8dd822fbaa62f7da17ce24f728b1c48fefdd6163934fcf9591f999f45bf5a2dbe092f37f37a7fa3b7d90afb2f2a915a11f17530ff17593a87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-US/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-US/firefox-59.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "05046233531db36a9c9c16cf6247401ec662254e8e1b896abf557bb2f4043ee2ec1f83a04c9b1199877d66b50b41d47bef1ebe6236e21998406616b8251001ca";
+      sha512 = "6b42ca4bacb37012d99508048d01686b881217e80bd2f57bb9b3a22207888dc9db19151adabb64c074421460e0309d298edd7078a13c44c815ff99a24a97b2ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-ZA/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-ZA/firefox-59.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "7ff1777a3aab71e9bdac1d41f777837cf91ca5f9ae353e6289812899fd10a4f58c13938cef0f33cb3d3a0e80b42c70034f7af22783e0b22495fe279cc497fa5a";
+      sha512 = "ef85c017d1df9eed592b1816692d2e57f6555575ab9eea630817ade5c156e944a4196637fd640ff22922da12710f000fb559b5e5f16d0ce5d07feb5bc59ec2ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eo/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eo/firefox-59.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3b4a8b0fb29abbebb224cbdc4dd9ca62457d88394f653388915898fba9eed6d1cbed43f6b8fb7bebbf18963d368fbea6aeef5bf681c14d2d5e09747fbd42fbe1";
+      sha512 = "9deb3e19177e35dffa51913decdf5579fb925158843c762bf44355e5a0173e2b7604c1d7c26a1cfcfb7420695b18a9002a4ec1a4b683911d09366569b7b0fbfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-AR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-AR/firefox-59.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "9409072b8aaffe4ed914832d0b545fefd20b9930e0529c38255f19a0ad524b66127d9704eae2b8623696560fb78169aa66d1b5bde358885dad4d00e010189841";
+      sha512 = "bab8d2eaf02961c665ddbfe4d380c72dc0363feb356854a9dd7d28526b7c01dc8b2dad13c087d91ad7056ce50d0cf37123ce54afa45c1279ff827e3ce808fbb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-CL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-CL/firefox-59.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0bcdfe996b3a8f4810d464bbca0690d12f6262032a21e0716f86f793faa4e707d3c308e79aac5657d619ebca204d5f67667c6d3d09e405e887c338a859ea1faf";
+      sha512 = "981df51596a9e3fab9281c3319960f766b02941d3d89371f15c3ef6ddb853cc3dc3b2de3f196eb83d20a503eec6cc7926ce66a41f67ad4690fb601b9731e8522";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-ES/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-ES/firefox-59.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "1f2aa1ec1c97cfdaff07b7aabf75b5e1bfc628fd8ee71c988af5471e570574453889a7bf40f9d3a4ec06889a4672518c986c3bc6fd35d7436d45c5c74507d801";
+      sha512 = "017875c18052a84bc262812332d854d6f1402b9b81d8e0399d319e5c2b9d41a6a199e5286cbb2973ed8eeec0d9753f66a4911deda4a31049033c1ce47c992c98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-MX/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-MX/firefox-59.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "366dc93d1e6508b00987163e44ac2d6fd318bc9c80487a13d581926be7d3a88a6fbc6438effcefcfbe6a1a9794f2a692c385fec7503ea96feeabc5fe10cc7a4b";
+      sha512 = "9a4c52058d5db0b342b68b6c389932106ad1f4a041e152acac7bf86c7bfad84aa8228299bd0dc60817bc51ad3c42ca07ced58eb9b0d60cdfd58775eabdd06fb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/et/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/et/firefox-59.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "82b25a2e1ab4d61d89f5944495f69fcc7db33b3a7bb7822758b588ea7c3fe9ce3d728ba838760b93975cc52b105de77cd980d20997f642839680a20ccd5e1d4f";
+      sha512 = "24c85711693582ee0eaf7985af0bfecc5e905d9687dace724a57c66ace2ed72318c48ee7c1d0ccd0de125929c829afb2b08a13cb4072ddb73d12e8143f95a267";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eu/firefox-59.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "6eacc4b6069f6bda6b08fca871c7cf08bd666f974bedff6c511652801e3718ef60ab97425c8ce6d1cf5aaac1b5b9a62990ab086ebfd9e76f646d491a19325b34";
+      sha512 = "916164528c57173f70adbe3f92a9f80aeb5cdd46540b3dfb4261afec0649ba976375dfa54e11ece249fa2cd6b8a905dc0f1fef3104e83ed3e7dc4e622a82f8f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fa/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fa/firefox-59.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "e3f4c57555c415a4d3830a6751c5444e07987fdf85ed0e122312bc4bfd0fbaf841cda7aeeb6aa161d48070844aaab316ffc163755481479f5d421ab8967aac15";
+      sha512 = "d3ec04850664f1480be7f722bd694a74091197e1fca9a780808884cd72864ce6502ec02ac6aab2498a5adc87b34770022edce940d7e5af6d1856641282547880";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ff/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ff/firefox-59.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "695b44de161563727097da1d969c0a98fdbda51613ae8631a757410a502ab25038a9c356338b1178f7d35e0110e9772b3e2fb705e20d81787317b528ffd709c0";
+      sha512 = "b0af3deba5f7c823eab1053b21e0efe00492ac8dcc55ba7d223c4531ae16ccd7f81ea4acc4b6d3996efd25b2c3401449870d0818ab1c180b1b3aae86c2640af5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fi/firefox-59.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1227a6e57a68c0ffc60f6d9eda20a41fe70e7da130bc705fa15e428539e0380e1f65739e791ec699f216588ba54e558ddb6242862396837229c3ef3b028a6346";
+      sha512 = "d88a2b576f56f49953f0e9129fcf78ff62791a905afe41e1e7b7c73402f054d762983bc354acfc177a58a4e72e4786c82fd8776f07dc413d4b73851da26e2c3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fr/firefox-59.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "c15980e0a1b4b9709416d362e36a3dab26502af4788b7c74d68e0ebd2f3ada6039d10af1e1d49885604c4c3b41356519e53c278f04b14729502d8044bc106384";
+      sha512 = "8087e313549c8a4e8fb534c72b6de0be694305c4786a685f8899aa483c80e4ddb0a5d134cbaac56f4eeef31fb8802353d1a531dbf33f639c79e668bdbfb711a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fy-NL/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fy-NL/firefox-59.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "dd38e22a986b558aea005900c2da53cbf28ea68a77bff428aea6ebaa09318439232cc2d5c8d0599fd8512ee4ca2488080297ffa61f2cac9547fd5257a01abd3f";
+      sha512 = "3fd21e1c39c32c11650cbbb095b64bd1ce720ef2614d98cf7af2fc3bf7979c19566b4c0abe0a24e2f80bce7f05a49740cfe8d9dca6edfbbc4a5ab32f808c5629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ga-IE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ga-IE/firefox-59.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "97ff02536814db1310bcf53adac31fd9e84a5e39d58f9d81dc2f70d40e6b608c450dbdb38edc83abbaeb0535f1a1c0b1511c77a161e6d0ec22b8cde71501be08";
+      sha512 = "946fc4e3b831f91f5e505c7fe4aac8100d3b3edead97655a47ea5b2138595fd821d96dca3df88bb3e3cd6522753f2262bb61f5b9a563e073f27f128f390bd0ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gd/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gd/firefox-59.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "7e8d8dc8c341ab3990b550392f92029b70f6d947119de13843e11a8067c2edcd10a02dc088396beb52b1d069e8f42732db8c514f822706de3f309061e649caa8";
+      sha512 = "ee014509e87ebd64096c8d87170ebefddfd600843e410fdbe74a65e5d4fdcd40de59881396d39db9e68a09ee7f10b03a5e3459b07ea442c4d1e5e44bb6b14a78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gl/firefox-59.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "31b57462e13e43e31e0e9073b353e1f5a3c32ffcf5c5fded188a1a61a973510479d5e04dc26437eba5445baca51f82311ee9470e3bed9a6309d40cd456da4763";
+      sha512 = "c90904cae401464bed29e5c2b33940f9b996ac46e071be89a5ca51dc6db492f6914d234b518706278b0d2d676bb1ab017b5055c3297d269017bcd6c04b766dce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gn/firefox-59.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "d54e50b52870747013ba457d205fd9d2632302309b9850171b968d66dc537357bf747e322420e70e5c029532b053e557da86076a25fe8c5f1a3491acc9906b37";
+      sha512 = "dd401ed91652cd458152372deab8c3067fc7f000abdda3b9d1f3e9e5b1cc253c9ee081fba3bdc9b5c5398d64d43a42a80c20d6caadc761bfe4469bd4ac7a4b9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gu-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gu-IN/firefox-59.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d18427e64b54eb6aa1a1ee7ebfe4bdc3b219af28e7cedde55ae384d475ba88b83b9c6fe701ff849aeec32f8e6b184f2e3f910b407a9d200fd45ceaa18fc7d61f";
+      sha512 = "889d81035e9a618539eb9aeb85567406a589e6691c162481bd5622ea3be06e46910314b83c3008f3bf9f6c35b6330acce459b84136e111f45b247ce9771a99fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/he/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/he/firefox-59.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a7ac2db737ddeb870bbd136f8dea08306e8bc7158d7e880655cf15541ed26382086d270a6ff2bbfb332fcc3e53c7348a403bb889aa8ae5dd1cc6fd1b7844e768";
+      sha512 = "e8057f72bc093ccf150d9a014eb2ea2ecb86d7b383603542bb90944dfbba3bd391fe36645c6f0124d6e9fc50cc7cb3e70c1339d4eb9e4c928c2621aa38cefa3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hi-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hi-IN/firefox-59.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "18263b33d5fff4154db809fed79fc2ae20590cc2ad609e2abe90b036420bcd38fda629c613750432ca4c06684c772cf567368ba2bf098719b501e329e55caf51";
+      sha512 = "d651eddbb9f3b419c86ff9535519dfde886172b0f81972880e10c7c0234f01f5fa4050218d1c8cad302a401fbf9dc369dbe9749822f2f9efe2426cba31dc9d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hr/firefox-59.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f75aa782b03335b0197cbea1446cca56cedeb4be0282dff8bc0f1d6f6c8bf596113edcab650b6c8b7bf5a9ffe6bd14e0e29f2e82002a5c720cbf82f9dfca1b08";
+      sha512 = "e1de943f777afe8564d5da316cc13c7232f431e023eba55cccbf9443451089d84f0c66b6818d88b2dceb47299693e0c06e0058f41a0929cabc486fc7b78218da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hsb/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hsb/firefox-59.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c0b987b299ba764ff5418be38e68c52b7caaf61480edc34d575ef58807b5289fabc25cb22d7d87dc8ba708d6fa4157d46237e0a31dafcbbe5f463fc945a620e5";
+      sha512 = "20bdc20beb7853264a98201e4a3c39c2ff9058ad9a5cf23e0cf57879ed6d11f4c59589078410411276c2e4cef01869a7c418265f2755b1324c10757dd41accf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hu/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hu/firefox-59.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "58c7c346d0fdb16efee21d8802d3bc668ff4fd9497ceef1b7a96cb8bff01df647c32819a5606891e2b7a9283677bfa9624e33423f7ed1a9c6acd1c19414276fb";
+      sha512 = "37d6b03aec34c3a958cd58e489dd1da715c676532b70a90ed87fd9e05ac30deb60e2e5c35ca6c4e2b21eda1066ee5c84780149298aed4149ad937fa99a71ab79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hy-AM/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hy-AM/firefox-59.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "79e733f8be50ce4cab74d80dd8e4ea667ac9b2973bce27fc1f70a37b879e19b52ee423c2b360433d1e5e15a4143050e7943a3bdcbf709bc34e89302bb0ad7f35";
+      sha512 = "b3f4b807a1a5c3c6a2e79570567a89d3fdf7ebfa565d57723f161a81ab05a23dadcd1d47b3a220553e14604ac54b0bd0dabce47d54383594978723fb67b37248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/id/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ia/firefox-59.0.tar.bz2";
+      locale = "ia";
+      arch = "linux-i686";
+      sha512 = "48cc98802d7f5efe1b9ad21c5f223099b99f7cbb5f659577646fb56f412551d234f9c2709a6b26c790f91ad6e1167160e995e040c334836ae4abc7f20e07fabb";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/id/firefox-59.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "5f49f449fd68cd4513ccbb541d3884e190b2a9897ba6267f348f4e7df9415a63e58a254d18f116cecd33f0e34a9022f4e34472bf2486e29b0ff17702f4790e0b";
+      sha512 = "f47d27aa649d702b372e7571fa2dc08179ecb1e8db3600eef7c2a26cb68ce74e747af5a7fe2e2cde68546a9a04cb895973a3cebb4cf93e54cf9f6cdf089bdd3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/is/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/is/firefox-59.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6c5028ec47a18d9de6bfb4d99d54815b174ed51ccb74f84e0e1d69ad10940847d4655eb76b13281296575fdbb972d32df34e8e9849c8db4fd46a6dac4b4f0d62";
+      sha512 = "c92a6940f537f13608a322de49027cefcf52f5f740c450c37083acafc805cfcdaa01ae8bcde46799a252e5149256c8a4c464411d14d02c969f1a158931b352cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/it/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/it/firefox-59.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "dd4e79563c63cfcd76906dad9b28162bc9df443964a10fb0be7c2a201621d394d45ace33dbdf85d7acd040175528d58da243333d06ced80bfa96f8c6226aa3de";
+      sha512 = "c5db9df2e668d91884d1c81f325a6cd5649fc8f9c1cd67e3107f54a2028db866c3d9e9f504ea84fb997403aba04e773225fb5509b60e194929756610e4f20813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ja/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ja/firefox-59.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "472f544038dce535691db40eae8cb06dcd77a468059a261cfe04186bedb4403ca209efd51a5b5efdedca323f70f4a69140614d13380fae0e01b49c85e5fffb8c";
+      sha512 = "c56d79fcf04458d0d4b11c3ca675493a5c9ce8013eccace4d9182aaac361b5524cbeffee2c206d5d0c4c3b641f0a7db6acc05745bd1cf54a795b833a0585c7cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ka/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ka/firefox-59.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "8337bbc594e6d7c0f862a99b8ad67fa7b86e55d372c5db850657eb7952f9abe2640c7bccf69568790099c8f9e7dcda65ecb28bbf2c18eeeb6760f3274f343513";
+      sha512 = "9596b0982e29f7302963e96c6db071d668cf7bfc8c31f634d2cbe687582906806c832c9d06cef22f44cec5418aeeaf42afbed6fd00e32f845e5f57eb08482a11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kab/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kab/firefox-59.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "8d46fdff00c65f503f87b1d478b71621a2051c7ea7c24747f0793f6f6b7ebccaa39e8a61b35299078e2b49f07a17f7c4f744c97ee3767f598503faf7bae4a17d";
+      sha512 = "6988478ec06e738e333508c5cd64688429f9445391899e57931dd7672c88767b7c84ac2bd7aaf952343c4c671a205864dbe7736401625decc2b72c48db749dc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kk/firefox-59.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "617ce9bd37cd1ef36251cae9a0738ab93bfc4eeac2f54912011343905047ea5d181c25fc891b8abe178f3632189fe62c38ea00910a1c4bea3d47907c0a2caa07";
+      sha512 = "05ad5aef14e19bbf2b6665f96877d7484280484ea274a4bc1c5ed77911575ce9e6d9ff87dbde790c04691bb4dce02b03ba0286a48c159b9f48d5133581ccf040";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/km/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/km/firefox-59.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "38ee6522276cd186ae63053fb15978f6eb5bfa8b2e78b3f2e4233d58ef53ac32307c936c454eb76e86e9f5d4845632a7b58e6209851a775c93629d0bad1473d5";
+      sha512 = "5298858458e6a7fdb1c506b54ff3e0ea8d28b85120cda27994838ab614fcc5cb95699acd607970dc2fd8961d66f2640b9f135995e1407f7c511631c43586fca0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kn/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kn/firefox-59.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "462349b1bf91686f8212deb580166a3e0ca5dafb947c74b9786809626af68e43c4ac6e51c8351d028acb3c86d1f687ea9f94cf34c9b5085801c242d136a19383";
+      sha512 = "6a32c5e98920a90af971a12dfa15f434a968e2fd0faac302c8b79881e42917eb8e2fe028873f23159870c08e90d3410308ca3c7233c49d72cb4940ba076038de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ko/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ko/firefox-59.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "78e8eb72d89173676a0b65d7295f37b656791595c4def454604a83ad76e2fdf8ce40976bc91ee17219a320242e9a41568157f3754719ab9f9e0a7ce6cb4f66ff";
+      sha512 = "e05c536e4c901323d1e744bb1e85ae85df1454ffaff9234db6fd8fbc79807198c775cf1e0179ab670903bf12ca34c9356b30afe25d8dbc27c9ef4549a5148023";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lij/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lij/firefox-59.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "f51136d2e8e29af14aee4cc20e3fba6546effa40c681d3831a9ced7008a845e27e9bb80ada996d0d77c2c9ecc0825f6c7bbf1063797f71a153fe298be06e7da4";
+      sha512 = "2f47338944f8b34eaa7bb28a2804c637b392a2af4630d758b1c378b9b1d020aa6e611f8e8504adeff75e9eec5eb70c3b39f20b779003d22b87c79ebe0973ae6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lt/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lt/firefox-59.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e1ba1b26612c2622853987fb802c4fd5e7433481b6721950813f76b6463b1320484383b25574733d75c5c4e547b52b3ad9d8687c1a28b511b07bacb9186f22f0";
+      sha512 = "d593966d81f8a0652368f819f8e3f0624fc6d28ebc7387bd5a6a2b3a10d3e87f657076fdeb6eab7a93b7c22e87fea1b84a776ac3d667ea90b302fe1b20638af3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lv/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lv/firefox-59.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "894b82ffe22425e1c95c4e148c7dd58f5b14e2ec11a5a27594e0a00b8d5d57364080caf4da38f73c0af3962600d0051f6d6d436687f485cc178e6eab1d5733d7";
+      sha512 = "3e0a350f87e487c0496f04b419f7eb2313341798f042344b5e2406f7b59d154bbe7830683797021a412c1e2a18f30324260a6988e8d2de5fe6e2a02b28a18493";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mai/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mai/firefox-59.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7240f90b5a4b6cd68135b3436fa796de0e799316b8abc06c1c62bbe22ef9b6ae38bdcf1c60a5df97354ec5b0b69f64635ad6a88321a34a6b15e035bbee19fd53";
+      sha512 = "6bdb0c149489e2acf9fa9ffeb9f519f0ce2d167fa4a7c36cde81675cc9876d202d116b97ccb853ee869e6ab7afc570a023b2a1be847a6ab976bb3c0186aa51b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mk/firefox-59.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "30769e066f1c0cc71f0e5139c893b3e887f4618640b762b666f85c208fc8bdddc53afd7f0beb0421e9c84f82a6b332321840c93ecc9635dff784185f2122527c";
+      sha512 = "233551a16630146475f0bb479f9c2152e546b9e56d3137dc391dba586a1988246c86862c317c5ad13b3a96c8e4f80ef4e108047e9fd917b97165ef3d8dee6f6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ml/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ml/firefox-59.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "6c3f77d4fd7fbc05b7812eff2e8c5ebb75d4fd97a1cb8797260da5d2e53e10def88cfe107131097e6b72968b4c827b998abc42df0443c24330be3a0b0622b715";
+      sha512 = "59711210565b4fb45b7cb001e7315116a666819abe81ead43d8cb70604e33c2cccf5a1469ca8ae72ba2bf73a2d74e4ce024b75fcf7c2ca722ac390ce4371f2b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mr/firefox-59.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "60d8c8824ee7b414ada656310218cc87ad347b36e7192196b2d5c6a5e0958f9786589a3c3f896f1a99b19aa2419431e6aaafaf69b877240872f9ea89178ea699";
+      sha512 = "4dddc2a3f9f646062d0c047f66b86ed8270457d7184eb8147330576eb6c9afc025e025c99bca2cba1854248777eccdf4793be94df0100a035914f8dfd1918a7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ms/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ms/firefox-59.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "114c337fdceec43c1482ee60467526d7fc422f720400e2cd66259cb11c1aed46fc800b1b3fc32ca5e08ad85667bdff31cb31ecd19f66e63d29bdf8696f8e4477";
+      sha512 = "635ebb9f601898097ec59368df8050df894d086e173371479ba4a922beb829adf3ed2af05bf03dd91526ac13cf4b7092f37c6253913806708326b7ed8901b203";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/my/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/my/firefox-59.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "430ed92df431653d7c2f3750c6a7e3987424d9bc49359dcbe6f9c2b66c601e263cdb26f2428c9a1948de78ea51a78e0f1e6fc1538c4cdbc39a126c76050ea51d";
+      sha512 = "7d58e3be5f83d1a42445debbe02a2b4d3305c61523bf3cf8550a7d1dff5f44a8be453f2d4a487b290c61258c4d9ea1c74579d207ce1ad270f3c0dfd2f16e3b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nb-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nb-NO/firefox-59.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c0b00789726e8020a5d8f853b73280720ba650f81cb4559e17578c862ab3d45aadd6a1948ff26e502bacd34d8c0cffa8d46ad6fd35d968ddcb4f8300dfcf44b8";
+      sha512 = "61b25e6697de41ea41daa549fb087b1ea35ac756eee3a783a29d3282ddbde1b63c46848a6ce9fd9f5455806c440ed7c9e4690f2176e3214979bd8c17c83b5e9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ne-NP/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ne-NP/firefox-59.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "b90dc1fd628689c45f06800b3cadee034d6da54a3695959a927ac0466ba70378f4197bc5b17b39d9572a8369897aebb589d1ce7d2dcc0972a371100938704f9c";
+      sha512 = "9b10111c6ed5acd8e0e43bb91837f27e70149685ed40f274e63faa88dd6b2a984cd654e708a72c56f57f1e69fca8518be0e355113456d087256cd0cbe08bce2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nl/firefox-59.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "ab802fa78343b4a2074d2a09187cc96b66c03a26d26f21eb158e90b30bbbafe6dd40d563c9a65c3b6c99f79edcca3615e1322dd9a4fe3ddf1ea527ae41b4b25d";
+      sha512 = "f35f5b21ed6d88686c3411581d3fa3545e8498b04b970e2d18794b56c2b155a2006b90f71fc2e66948f3476116933f1809db403672a66c698f949b4852dff56c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nn-NO/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nn-NO/firefox-59.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4ca2889f2e0a7f19ff1e1f7fa95ef692188f78289e1830df5c72e27db761f599dc1022ce1f9b8c8f30eab92aa70381a1e721deff07fe130b1685e968cd3aaa68";
+      sha512 = "39c0202f69f5d210da4996abe072a60354b2df73266dae36d636c48df576aa7cce1a85214a0c25ff41b3ea7128cb01c2302451d16d637c4b3d8b9595aae5914c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/or/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/or/firefox-59.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "f2da13fc423beccb7044af1b8ad8ae5b8728aeff5ad0bccf52625936b59040aa6db6fd8fec112be8cfa0baf5448ff4b9d0e179b35302c235e6b4dae01500660d";
+      sha512 = "684c2c0d6886152632f530e0f6d290f5ceef9d427cb33d5214cde5e34131092ad682f010db8b6d12470d332b4cf9c7deb0905427a363c776959a64f8958a0c24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pa-IN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pa-IN/firefox-59.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ab193a72db52ab2208f7c6b5b5eca4756231cc31a7fc9f6adf434169ece5df5cca8800c952bca285f989dd2b5c8d7f825b0a0e99d2fa6a698a70a11fc63b1602";
+      sha512 = "0098f298243cdd4bd114a796cd1e6325e73802d8b9d8fcdcad954c8d648de00d08efe51082bf24f66d23dce696764b745002d56ce049c68a71093ecedd4b661a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pl/firefox-59.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "31954e6be8bc114fab04c45f5ffa1f38c74ca147d790bf63130dac4fbc6f8213cf485216d5f50ceb87e60d587fbdb82fe7034c04182017b8120ec6995a9278a1";
+      sha512 = "f759cb045f817264f63f7b222c93da2dece9b8c14d9621d23798c5e924982e64da2a15af888d1ef0a6b1b2de34695f1c3e70527dcd9b9ddc069c281eb43ffc43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-BR/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-BR/firefox-59.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5cfe1e7d703cfa42a1033df3509db3e91788160079c9396d55356b3c7f0b848b59e6a8f704866dd14f2f0714e89830ad541da615c7d4209249ccc46b01eb11ee";
+      sha512 = "367d1ba059d2c4c9b4dbd3422e7a7d964bcaed6d066e022fbbf5c603c80e36acf81aed8c8b9cc4c076f4293a5ec5da81c3c4f9e2cfe6fddcbe0c3db6db3a67b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-PT/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-PT/firefox-59.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "124ce2632b461e53b2cd3474e4fbcb92554006bee72498356886a451800a15d91ffe32ac87451b61d32e6f9d60b04dd14f4ba081a535124c7e2816edc11ac287";
+      sha512 = "a7fba52997e5925bc462fe6cbfb89b642d5759f4bb0c71e07ac2b88e1d726f664a829c433be14088f32eba59474bd3da152da10602fd57a3a8a8f433e738633a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/rm/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/rm/firefox-59.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "847f41ff0293f82425bfba1af30deb4858c066f738f0f9d3db5303092406358e9b11f6207ed732903b860f60c1c1b1f622c5c1d2113eed073d70d039dac4a6bd";
+      sha512 = "a009a30f8b1040e66bb6b49cbad0830e052e95c29a6b294d13f3475e0c2389d8123c20121580f503a1cb5427715d6e8eac501eb3919c894799e2eeb976d4b808";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ro/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ro/firefox-59.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ccd5ac724cd810dec2e1ddb3e48139d9f5768d56ded09c0e6576c0dae898df310a4c5815635f646c0aa91caaad696c0ec6338bf21dacde33b4675f320fb4bca8";
+      sha512 = "5856f65cdbc8ed9161b7a9be8d2f060ed029443bc45cf65b50ae97bd7786a069454a269ab98caff1449a6d6ce804438f08b0a39deaf047ebf024f8da79510ae8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ru/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ru/firefox-59.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d003f707e4a481ddaeab11dffccbc46d0d7173afb081a5007b3efbb6e1ce8d081a4eb23017b87d7e22fc3741e117bdcddbd2393b578bae2d07a2c2c2bbe2d0a9";
+      sha512 = "52a7634f62b97cf2af945d9c69599f2e6e65ae56d52c1e562a28f13f8631e9a75975e37d4bf97ad2b3e50d4e4c58f0b67b6514fc34bc2034989b0ae055187cab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/si/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/si/firefox-59.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "80e0e8c1ee6483a5b70140e4a6c0eb694f24dbce0a638700866ea8759063bba3f42c33ffaf465c7e8266fc764fe2983a2d6b098356dc6f4420eff9089c22331a";
+      sha512 = "e87128bc44713f3d26bf97f2d5a607e63845bcf84e9016886c06ae5ca9153a42cc042e5754e4c97462bcf1079ba699e653f99761f991a0cd0d270eb28561cc54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sk/firefox-59.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9aec4b3085ac757137a8ead6829bee1ae26cc02a494f60a3aa44daa56f5cbe1201c7588a60682b3bdccccad75782bade43d092352c015213e5f16212f9fb2800";
+      sha512 = "3507a790a43da30d9ab82f5a54682d7907982a599ac88ce38f0db5940d49a45ec05093a577c4d549070bfd17f9e1fa3110e2e4fe07c8aeca338bb4486f0c7cfa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sl/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sl/firefox-59.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2dc5d855eaedd125f8a3d828d85bc12ae47123f2f4be2bbf1e262c678cbd2607ee48c61e6fa70402da5e7ad549e2580e7d9a0a696e89ac5fee1da2154443f289";
+      sha512 = "ccc7ec548f3639f4c44b42c2c787944c243c7824210cbb52dd8662f4035e12eb1026c6ee8bfc33452f8861fef16be2684e9fc10b7b6cedd94fc1559f98278d0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/son/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/son/firefox-59.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7a1c4f86a4e459e80725b250b3a54be7c78397bd909c7a2081723571378578b7e672af380305ff9dae714e911fb209833833fd7cb3fb8a850f9d6a3b14f41cba";
+      sha512 = "079a31ab92406db87653e5046b4abec632775404fd4850605fd57695d19fbd034b2b5e6de2bcb6340401bb16f0150a20ee437b881fbf23fcab235bb2cee86012";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sq/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sq/firefox-59.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "45d20dcd82c6648c0429dfa0009aaf2d807efb7e9468ded4491a04dced5957d3bc9c1491c09c7f85ea63991283e2c38b2c906ebb338dffba1d0db4748e56246a";
+      sha512 = "c51c0631f9caf84e079bf38f842aa3f85ec8c7289483f7174109f957ee43bd998937f6bd0dc2f4db63bed3e5ee7f113af2def5ac957b854ec044f280feeabde7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sr/firefox-59.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "799f0548e18cbf77a6daf6ec0f9c12e904fde3235e9d8a5564e06df45bc037f4a04de0f5bfb9e74f9fa7053e8fc7b39b5c55b03dba5e78cf4e1400c033077f5f";
+      sha512 = "100b80f6644759840f41d926a5d18b39adf84d626b4dc60fb7b379b0b12d4925f0ba6d223ab36081948f47b527cea3b87600688b99b280bbfb7192dd68606dda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sv-SE/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sv-SE/firefox-59.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c2c693ab974b4c26a0c786955cff61f3b0689bd272b00fe4cbdbd7701a57481724f0ebf8aeb8427c7b50f4419875e9ca10d79c534c0e3ca8db132bcf6436e013";
+      sha512 = "3d3a400efa6288b69a42ff9a3dc61b0905250f677f4fcddbe084a562f15d8904a9233bd79c67dcdf1b7d04f7465f2f8cd5f93dfdb5e2e253697875bdda65ac55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ta/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ta/firefox-59.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "0771a9cbb44102291142fab34dbfd704461da5c6c013b48c1ee22cd7cc92ebfaad7ccac5b87bf764489d66e8cec2e4056e9fcd62c3ddb734753a48022f7f8914";
+      sha512 = "de47657375144e368e8a8801b9a486ff11628d86dcc43609ce285710b0bd529df418d8644c8b97e4f1562057d1d5cf7e2bda346cb01f1d9ddb800dbf517a9d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/te/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/te/firefox-59.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "699d8d52cc8e1bac02fbca3caa6504a028100d76fc9fe2492dfe214c5a96f0d3425bf541d2873133dd00e501dcc9d27894e613c44fc3cf9adedc0e08104524f6";
+      sha512 = "0a8a9e5fbacec8ac7473507e6304c52535f81a5b358651b87cb3412e193dfcbf30085b1b725113eceb1818e3c564de05a6a3fa5dc27cbe72b26ba9d58f2be76e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/th/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/th/firefox-59.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "13cf7e1740ab2f508983617ce27f991db8049070061cb4d31299b372a801abf7292edd185fafc73dd58c46d009c32a6b5103a77834b2ddb0cc420cd98f747e9b";
+      sha512 = "312ac50828b9a0fd63be8ef9341b98a3efa6fa8e358730b09e51a4553008a8a38b43306ceb65e9a6dde594c9615c0540584d0b67ece408bf4bd2f6ba19daf80a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/tr/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/tr/firefox-59.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a3439d157762eddcc1c09c4b687028b97004ac49144a3f26ea2a05a8eccc0a8b04659147ae7e8972ac16299d262586cc1d0c1bc69e5a309a0c82086cf61202ac";
+      sha512 = "f07f4ec0ed1aad0de8196b7f74316156d677184c102e31e24d9b0384f8cbf4782fcd9ca847974a417d4ac596d6c9b90edc8be6b3a6440c65a39e2b760da12342";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uk/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uk/firefox-59.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7767a4549265131e29a142c6f2a914b8699f2042a9da5831192668300acc564fbfe94009b3ea33a7bedc469a7585029685fa91dc752b46d7d7be5425776bc7c4";
+      sha512 = "6cdf07d539646c83059452750f6b70fdff5f9172fc68ac00a82a731c18cbdcb518fed4e1777d44a0ede00af0bfc8c2ccbe5c745140b6bbbeaa8916ed2f4417da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ur/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ur/firefox-59.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "b85f5c3067cf897079ff1de7c0de84756fb2224f703ec6825108efff52bed3a6e780b8410a58ed756e926a6033cd10c888743642f997b9c9d7390096c3b5e7c9";
+      sha512 = "a3111464bdad72fe3af763003941bb1d36de607b1df222a00fb65ed79c7b2c364657493408a634fc55bf3525d584231915970bcf31e94dbf331b65bae47fbcb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uz/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uz/firefox-59.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3febb16ceabdcf7395196f1aef6c5ecc6a09f45e63485207816e95dd5ec0ac9729c3644b8afa75d68241ad203459239bd7f5693c6d8aa7e59afb1a1f661015ff";
+      sha512 = "852f44d66be42fb6973529143f99d358ce3b5839154b70ab57d9547dcbe1d3c408df396901b57a7c05c66cbc8e9cc6f7acc4d1bc638a19ab19279a053342cefd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/vi/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/vi/firefox-59.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d117eca28279af133e2dde8dc25d3f7c4dcdc97f683f4570aa9cb8965200dfd8799271958ed6113b9bee488fc3e17d772b1aa4a4d657a49f72914890752af13c";
+      sha512 = "b4a8662cb51660051ea0ce52156f8e767b0a465a3cf954f08b3e7eb6f55d2f48da16ac47ec8e6c431836956058df388c35437f29f3e993d2e918de328edb6ffa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/xh/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/xh/firefox-59.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "4ce7c4627a7db67ebe85ddb134cadca8cc4ecd3a01d8895dcb8b691f85e01911818404cc7243b4f5e1df0133a204a1ce5289168cae0b7e1b0b2674a659fc6684";
+      sha512 = "a3bb908c5785995cbae70ed6bd8f819f1d7bd39073b210489d48db17132be0a28485969ce5619752724ea28eff33f7c20e532edfc260b4fcb80187755f9b3b76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-CN/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-CN/firefox-59.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d0a73f00af50d70b055a1b2e89dc942b56d8d6e3a297407060a88a994dfcbd52fd60ec221e3afd9b6036500d27d861415ab0b25ceb443210321823e4e3b189e2";
+      sha512 = "7c9a083e669a8412915f3423b639605fe5377945d81f21c5acc4efa19d8204b53093bfe99f3a664e7190a91b2a5eb957f561667644569cbd272ab13dcf53568e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-TW/firefox-58.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-TW/firefox-59.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a855e8de90b5b26e8d4fed05b48c5efd6626c9d793f30c1f0b71d9b062a4e253b8c417a44e581ea8edd7babf5bd536b4384dd494dbb2fa36d7f585e555cdd655";
+      sha512 = "9cfcf4928557a4158c802a20b7c63d8097fa629cb755399d16cfbd7e61c7dfc4058b3879f4840743ed25925a4a9d6ef200c7f6a40bed428915f3d3c0392deb23";
     }
     ];
 }

From cb51341d122d4c22ae180844025e071ab0b8fed5 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Mar 2018 21:02:46 +0900
Subject: [PATCH 1210/2266] firefox-esr: 52.6.0esr -> 52.7.0esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 6b4ef3854b0..465b4d1b85e 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -54,10 +54,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.6.0esr";
+    version = "52.7.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "cf583df34272b7ff8841c3b093ca0819118f9c36d23c6f9b3135db298e84ca022934bcd189add6473922b199b47330c0ecf14c303ab4177c03dbf26e64476fa4";
+      sha512 = "69ab3f03c3e690b3794714b0e8cafac90130ae32ebef37c8bc3d36e973153e531cbf20e650e216b76fcc09130800c9040ccbbd7468e7c1efd73be225dd17fc0b";
     };
 
     patches = nixpkgsPatches;

From 186de9ca9ef5650180f2f0cf0a9efdc7dfb16e2e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Mar 2018 23:24:34 +0900
Subject: [PATCH 1211/2266] common-updater: support updating source URL

---
 .../networking/browsers/firefox/update.nix    |  4 +++-
 .../scripts/update-source-version             | 21 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 6c264a94673..997bccbe9a9 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -28,7 +28,9 @@ writeScript "update-${attrPath}" ''
            sort --version-sort | \
            tail -n 1`
 
+  source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'`
+
   shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
 
-  update-source-version ${attrPath} "$version" "$shasum"
+  update-source-version ${attrPath} "$version" "$shasum" "$source_url"
 ''
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 4c32ae046f3..3e507660a65 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -6,10 +6,11 @@ die() {
     exit 1
 }
 
-# Usage: update-source-hash <attr> <version> [<new-source-hash>]
+# Usage: update-source-hash <attr> <version> [<new-source-hash>] [<new-source-url>]
 attr=$1
 newVersion=$2
 newHash=$3
+newUrl=$4
 
 nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
 if [ ! -f "$nixFile" ]; then
@@ -27,6 +28,12 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then
     die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
 fi
 
+oldUrl=$(nix-instantiate --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"')
+
+if [ -z "$oldUrl" ]; then
+    die "Couldn't evaluate source url from '$attr.name'!"
+fi
+
 drvName=$(nix-instantiate --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
 oldVersion=$(nix-instantiate --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')
 
@@ -41,6 +48,7 @@ fi
 
 # Escape regex metacharacter that are allowed in store path names
 oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
+oldUrl=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
 
 if [ $(grep -c -E "^\s*(let\b)?\s*version\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
@@ -56,6 +64,15 @@ if cmp -s "$nixFile" "$nixFile.bak"; then
     die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!"
 fi
 
+# Replace new URL
+if [ -n "$newUrl" ]; then
+    sed -i "$nixFile" -re "s|\"$oldUrl\"|\"$newUrl\"|"
+
+    if cmp -s "$nixFile" "$nixFile.bak"; then
+        die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!"
+    fi
+fi
+
 case "$oldHashAlgo" in
     sha256) hashLength=64 ;;
     sha512) hashLength=128 ;;
@@ -74,7 +91,7 @@ fi
 if [ -z "$newHash" ]; then
     nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
     # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
-    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash \(.*\) when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1)
+    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1)
 fi
 
 if [ -z "$newHash" ]; then

From 8170c05afc580db5fbdf7907e4e9666b611b1767 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Mar 2018 21:02:24 +0900
Subject: [PATCH 1212/2266] firefox: 58.0.2 -> 59.0

---
 .../networking/browsers/firefox/common.nix    |  6 +++---
 .../networking/browsers/firefox/packages.nix  | 21 ++++---------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index a70b554c850..e8e1862d7f8 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -221,7 +221,7 @@ stdenv.mkDerivation (rec {
 
   postInstall = ''
     # For grsecurity kernels
-    paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container}
+    paxmark m $out/lib/firefox*/{firefox,firefox-bin,plugin-container}
 
     # Remove SDK cruft. FIXME: move to a separate output?
     rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
@@ -233,8 +233,8 @@ stdenv.mkDerivation (rec {
   postFixup = ''
     # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
     patchelf --set-rpath "${lib.getLib libnotify
-      }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \
-        "$out"/lib/firefox-*/libxul.so
+      }/lib:$(patchelf --print-rpath "$out"/lib/firefox*/libxul.so)" \
+        "$out"/lib/firefox*/libxul.so
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 465b4d1b85e..8b41bf1c95a 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -18,28 +18,15 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "58.0.2";
+    version = "59.0";
     src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f";
+      url = "https://hg.mozilla.org/releases/mozilla-release/archive/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2";
+      sha512 = "03yybi1yp9g29jzdfgrq32r7a0gl2jz64w6ai8219cvhx8y95ahxfznj3vm29frrp6c18dk2nlpv2s89iczwm00lnn42r7dn6s6ppl9";
     };
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
-
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1430274
-      # Scheduled for firefox 59
-      (fetchpatch {
-        url = "https://bug1430274.bmoattachments.org/attachment.cgi?id=8943426";
-        sha256 = "12yfss3k61yilrb337dh2rffy5hh83d2f16gqrf5i56r9c33f7hf";
-      })
-
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1388981
-      # Should have been fixed in firefox 57
-    ] ++ lib.optional stdenv.isi686 (fetchpatch {
-      url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
-      sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
-    });
+    ];
 
     meta = {
       description = "A web browser built from Firefox source tree";

From 6778f7a7862a068e4679d60d42a3484123262661 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 15 Mar 2018 08:10:39 +0900
Subject: [PATCH 1213/2266] firefox-esr: 52.7.0esr -> 52.7.1esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 8b41bf1c95a..7a04c0d2d42 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -41,10 +41,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.7.0esr";
+    version = "52.7.1esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "69ab3f03c3e690b3794714b0e8cafac90130ae32ebef37c8bc3d36e973153e531cbf20e650e216b76fcc09130800c9040ccbbd7468e7c1efd73be225dd17fc0b";
+      sha512 = "0275ca9c093fd0dcf09cfd31a4bca8c6ddb87aa74ace6b273a62f61079eeed11c2c0330c52c5f76aa73ed97e9cd18aa63cee69387e1fe346a30e4f9affc91ba7";
     };
 
     patches = nixpkgsPatches;

From c565492cf815fe0d6481e75bf486db0ed628a0a5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 07:24:39 -0700
Subject: [PATCH 1214/2266] drumkv1: 0.8.6 -> 0.9.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.0 with grep in /nix/store/an15ybvqbh12vslgbsv3422mjkvcvsws-drumkv1-0.9.0
- found 0.9.0 in filename of file in /nix/store/an15ybvqbh12vslgbsv3422mjkvcvsws-drumkv1-0.9.0
---
 pkgs/applications/audio/drumkv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 4ceafa1e52e..3594fd881b2 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0fwxrfyp15a4m77mzz4mwj36mhdrj646whlrkvcys33p2w75f8cq";
+    sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

From 8016b1503834bf6be0ee8f0012aed08a0cd7c524 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 07:42:52 -0700
Subject: [PATCH 1215/2266] eccodes: 2.6.0 -> 2.7.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/codes_info -v` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_histogram -h` got 0 exit code
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_histogram --help` got 0 exit code
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_filter -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_ls -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_dump -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_merge -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib2ppm -h` got 0 exit code
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib2ppm --help` got 0 exit code
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_set -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_get -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_get_data -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_copy -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_compare -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_index_build help` got 0 exit code
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_index_build -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_ls -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_dump -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_set -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_get -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_copy -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_compare -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_index_build help` got 0 exit code
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_index_build -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/gts_get -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/gts_compare -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/gts_copy -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/gts_dump -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/gts_filter -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/gts_ls -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/metar_dump -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/metar_ls -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/metar_compare -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/metar_get -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/metar_filter -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/metar_copy -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/grib_to_netcdf -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/codes_bufr_filter -V` and found version 2.7.0
- ran `/nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0/bin/bufr_filter -V` and found version 2.7.0
- found 2.7.0 with grep in /nix/store/bfvhxcjlapkmg74v72z65csmqbpdy3fx-eccodes-2.7.0
---
 pkgs/development/libraries/eccodes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index eb197d11720..49dcb31c047 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib; 
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "0pzibd3vdqmqsqsnfir6q66p6f3cmr9hrrixzpfhf7k62vv9y1ha";
+    sha256 = "0slfim64wdyd97nwv7ry0xwhiarphl93ij2v19c8a1c0dz7ld3qi";
   };
 
   nativeBuildInputs = [ cmake ];

From 1c0126a26d4fa0dcfc8cc142f74da0c097e43fc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 17:29:53 +0100
Subject: [PATCH 1216/2266] multi-ghc-travis: update to latest version

And jailbreak to support building in an lts-11.x package set.
---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 2bcf13f1337..7efe556ebde 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,9 +8,10 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "a4962f1478089654d138da7a3807dfcf2cef4284";
-    sha256 = "1qwknajabxcfz5w5g0yn30r8p0180wxp7pncr6nwfhszlhay0vb7";
+    rev = "7ca5d751c35c6dc43392397b4641c4611ed55121";
+    sha256 = "04f9jcxqv1mn0rw31x23ns6xdhgqjv55blsksadwr25qn2521zxb";
   };
+  jailbreak = true;
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [

From 50020a296a95806049d1ad1f36133695ca8bf3b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 17:33:31 +0100
Subject: [PATCH 1217/2266] darcs: jailbreak fgl dependency constraints to fix
 the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2204f8703cc..12356ae2096 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -925,7 +925,7 @@ self: super: {
   haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
 
   # Jailbreak "unix-compat >=0.1.2 && <0.5".
-  darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; });
+  darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' darcs.cabal"; });
 
   # https://github.com/Twinside/Juicy.Pixels/issues/149
   JuicyPixels = dontHaddock super.JuicyPixels;

From 9ee5a5591da78609ec89d1d5343bed5641954ca3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 10:55:04 -0700
Subject: [PATCH 1218/2266] feh: 2.25 -> 2.25.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/feh -h` got 0 exit code
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/feh --help` got 0 exit code
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/feh -v` and found version 2.25.1
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/feh --version` and found version 2.25.1
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/.feh-wrapped -h` got 0 exit code
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/.feh-wrapped --help` got 0 exit code
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/.feh-wrapped -v` and found version 2.25.1
- ran `/nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1/bin/.feh-wrapped --version` and found version 2.25.1
- found 2.25.1 with grep in /nix/store/cyjk3r8pig6cypvfv4fwx888ml4zd4vs-feh-2.25.1
- directory tree listing: https://gist.github.com/6fb1817519334ef951e6661a3c41dda6
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 61e177be609..d7f25fdd426 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.25";
+  version = "2.25.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "102rwi30n09l8rih6kv6bb7lhv3djklgzill4p2zag0h700yqfq6";
+    sha256 = "197sm78bm33dvahr5nxqkbmpmdn4b13ahc9mrgn1l7n104bg4phc";
   };
 
   outputs = [ "out" "man" "doc" ];

From 1317428ca026ec1d438e68cb0308b38028777492 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 13:02:29 -0700
Subject: [PATCH 1219/2266] inkscape: 0.92.2 -> 0.92.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape -h` got 0 exit code
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape --help` got 0 exit code
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape -V` and found version 0.92.3
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape --version` and found version 0.92.3
- found 0.92.3 with grep in /nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3
---
 pkgs/applications/graphics/inkscape/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 889d710f043..47452eb43e8 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -10,11 +10,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.92.2";
+  name = "inkscape-0.92.3";
 
   src = fetchurl {
     url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
-    sha256 = "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56";
+    sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
   };
 
   unpackPhase = ''

From 63ca77bca5bad9adc99f327dc545ae40c2014eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 16 Mar 2018 14:28:32 +0100
Subject: [PATCH 1220/2266] xvfb_run: fix /bin/sh impurity

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

diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 8bcbf4951d1..80135f4ab44 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
     cp ${xvfb_run} $out/bin/xvfb-run
 
     chmod a+x $out/bin/xvfb-run
+    patchShebangs $out/bin/xvfb-run
     wrapProgram $out/bin/xvfb-run \
       --set FONTCONFIG_FILE "${fontsConf}" \
       --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}

From ef7a25fcc0063390a108049e69148fdb36430668 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 14 Feb 2018 17:42:48 +0000
Subject: [PATCH 1221/2266] godot: 2.1.4 -> 3.0

---
 pkgs/development/tools/godot/default.nix      | 30 ++++++++++++-------
 .../tools/godot/pkg_config_additions.patch    |  7 +++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 1ea4d160b4c..067ac4aa694 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
-, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
-, libpulseaudio, libGLU, zlib }:
+{ stdenv, lib, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
+, libXinerama, libXrandr, libXrender, libpulseaudio ? null
+, libXi ? null, libXext, libXfixes, freetype, openssl
+, alsaLib, libGLU, zlib, yasm ? null }:
 
-stdenv.mkDerivation rec {
+let
+  options = {
+    touch = libXi != null;
+    pulseaudio = false;
+  };
+in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "2.1.4";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48";
+    sha256 = "1pgs2hghjhs3vkgxsi50i5myr7yac3jhpk4vi4bcra1cvdmkgr39";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
-    freetype openssl alsaLib libpulseaudio libGLU zlib
+    libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
+    libGLU zlib
   ];
 
   patches = [ ./pkg_config_additions.patch ];
@@ -24,12 +31,14 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildPhase = ''
-    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES
+    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \
+      ${lib.concatStringsSep " "
+          (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}
   '';
 
   installPhase = ''
-    mkdir $out/bin -p
-    cp bin/godot.* $out/bin/
+    mkdir $out
+    cp -r bin $out
   '';
 
   meta = {
@@ -37,5 +46,6 @@ stdenv.mkDerivation rec {
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index 2302710ac7e..4870ec3cd70 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,9 +1,12 @@
 +++ build/platform/x11/detect.py
-@@ -139,6 +139,10 @@
-     env.ParseConfig('pkg-config xinerama --cflags --libs')
+@@ -142,3 +142,10 @@
      env.ParseConfig('pkg-config xcursor --cflags --libs')
+     env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
 +    env.ParseConfig('pkg-config xrender --cflags --libs')
++    env.ParseConfig('pkg-config xi --cflags --libs')
++    env.ParseConfig('pkg-config xext --cflags --libs')
++    env.ParseConfig('pkg-config xfixes --cflags --libs')
 +    env.ParseConfig('pkg-config oslibGLU_combined --cflags')
 +    env.ParseConfig('pkg-config glu --cflags --libs')
 +    env.ParseConfig('pkg-config zlib --cflags --libs')

From 494a4ef3ce33d7edc1661273e18cee2a2f10b9d2 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 14 Feb 2018 17:43:33 +0000
Subject: [PATCH 1222/2266] godot_headers: init at
 51bca3bf5d917341f3e15076c5a9191f8a5118ae

---
 .../libraries/godot_headers/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/godot_headers/default.nix

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
new file mode 100644
index 00000000000..07f901bf9ac
--- /dev/null
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "godot_headers";
+  version = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
+  src = fetchFromGitHub {
+    owner = "GodotNativeTools";
+    repo = "godot_headers";
+    rev = version;
+    sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
+  };
+  buildPhase = "true";
+  installPhase = "cp -r . $out";
+  meta = {
+    homepage = "https://github.com/GodotNativeTools/godot_headers/";
+    description = "Headers for the Godot API supplied by the GDNative module";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.twey ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..e7119965b02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2560,6 +2560,7 @@ with pkgs;
   gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
 
   godot = callPackage ../development/tools/godot {};
+  godot_headers = callPackage ../development/libraries/godot_headers {};
 
   goklp = callPackage ../tools/networking/goklp {};
 

From 62ab6170523962c2a2b0bb743b5f02715fdeb680 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Feb 2018 11:41:13 +0000
Subject: [PATCH 1223/2266] godot_headers: clean up output path

---
 pkgs/development/libraries/godot_headers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
index 07f901bf9ac..aa29d2788fe 100644
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
   };
   buildPhase = "true";
-  installPhase = "cp -r . $out";
+  installPhase = ''
+    mkdir $out
+    cp -r . $out/include
+  '';
   meta = {
     homepage = "https://github.com/GodotNativeTools/godot_headers/";
     description = "Headers for the Godot API supplied by the GDNative module";

From ef5fd1cf27e0b2cd62c7bcb78defd83dd355ff86 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Feb 2018 11:41:26 +0000
Subject: [PATCH 1224/2266] godot: clean up output path

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 067ac4aa694..395080c3da5 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -37,8 +37,8 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
-    cp -r bin $out
+    mkdir -p $out/bin
+    cp -r bin/godot.x11.tools.64 $out/bin/godot
   '';
 
   meta = {

From 2b96b03333e8d1c78c9ecd96df3182bd9c0b991d Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Tue, 20 Feb 2018 11:58:59 +0000
Subject: [PATCH 1225/2266] godot_headers: provide a better version string

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

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
index aa29d2788fe..c60fbdd3acc 100644
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "godot_headers";
-  version = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
+  version = "2018-02-09";
   src = fetchFromGitHub {
     owner = "GodotNativeTools";
     repo = "godot_headers";
-    rev = version;
+    rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
     sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
   };
   buildPhase = "true";

From 7ba969f87e68cad7c813210e758cff0b2cdd4047 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 21 Feb 2018 12:23:11 +0000
Subject: [PATCH 1226/2266] godot: stop build process from looking in global
 directories

---
 pkgs/development/tools/godot/default.nix         |  7 +++++--
 .../tools/godot/dont_clobber_environment.patch   | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/godot/dont_clobber_environment.patch

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 395080c3da5..9b515511953 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -23,10 +23,13 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
     libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
-    libGLU zlib
+    libGLU zlib yasm
   ];
 
-  patches = [ ./pkg_config_additions.patch ];
+  patches = [
+    ./pkg_config_additions.patch
+    ./dont_clobber_environment.patch
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch
new file mode 100644
index 00000000000..c57c85588a0
--- /dev/null
+++ b/pkgs/development/tools/godot/dont_clobber_environment.patch
@@ -0,0 +1,16 @@
++++ build/SConstruct
+@@ -69,10 +69,10 @@
+         custom_tools = ['mingw']
+ 
+ env_base = Environment(tools=custom_tools)
+-if 'TERM' in os.environ:
+-    env_base['ENV']['TERM'] = os.environ['TERM']
+-env_base.AppendENVPath('PATH', os.getenv('PATH'))
+-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
++for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
++    if (k in os.environ):
++        env_base["ENV"][k] = os.environ[k]
++
+ env_base.global_defaults = global_defaults
+ env_base.android_maven_repos = []
+ env_base.android_flat_dirs = []

From 998f42aa4898f05bc7b25d3180f5402d20b7064b Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Mar 2018 17:44:44 +0000
Subject: [PATCH 1227/2266] godot: restrict build platforms to [ "i686-linux"
 "x86_64-linux" ]

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 9b515511953..375638a8220 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
     homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = [ "i646-linux" "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }

From 3e2f544c393e8c920f4ba12928fca4c121f267e0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 12:51:03 -0700
Subject: [PATCH 1228/2266] gp2c: 0.0.10 -> 0.0.10pl1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c -h` got 0 exit code
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c -v` and found version 0.0.10pl1
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c -h` and found version 0.0.10pl1
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c-run -h` got 0 exit code
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c-run --help` got 0 exit code
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c-run -h` and found version 0.0.10pl1
- ran `/nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1/bin/gp2c-run --help` and found version 0.0.10pl1
- found 0.0.10pl1 with grep in /nix/store/phmgqwmf0fa3q2d62zq220zpgi64hssj-gp2c-0.0.10pl1
- directory tree listing: https://gist.github.com/27f1364bf90110b801070fcb28c64e0e
---
 pkgs/applications/science/math/pari/gp2c.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 007514e6552..b3e36b6bf20 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
 
   name = "gp2c-${version}";
-  version = "0.0.10";
+  version = "0.0.10pl1";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
-    sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70";
+    sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
   };
 
   buildInputs = [ pari perl ];

From 5fbbd5e02bf73e3edb589e99b4f95658cf7109cd Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Mar 2018 19:54:32 +0000
Subject: [PATCH 1229/2266] godot: 3.0 -> 3.0.2

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 375638a8220..b2a4684ffeb 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "3.0";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "1pgs2hghjhs3vkgxsi50i5myr7yac3jhpk4vi4bcra1cvdmkgr39";
+    sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 298f61691348475ecbc591444626d1ef2595edaa Mon Sep 17 00:00:00 2001
From: Felipe Espinoza <fdns02@gmail.com>
Date: Fri, 16 Mar 2018 15:47:05 -0300
Subject: [PATCH 1230/2266] libtins: init at 3.5

---
 maintainers/maintainer-list.nix               |  5 +++
 .../development/libraries/libtins/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/libtins/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index abc47e6beb6..445fd712298 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1256,6 +1256,11 @@
     github = "fare";
     name = "Francois-Rene Rideau";
   };
+  fdns = {
+    email = "fdns02@gmail.com";
+    github = "fdns";
+    name = "Felipe Espinoza";
+  };
   fgaz = {
     email = "francygazz@gmail.com";
     github = "fgaz";
diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
new file mode 100644
index 00000000000..efd63148fb1
--- /dev/null
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -0,0 +1,43 @@
+{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "libtins-${version}";
+  version = "3.5";
+  
+  src = fetchFromGitHub {
+    owner = "mfontanini";
+    repo = "libtins";
+    rev = "v${version}";
+    sha256 = "00d1fxyg8q6djljm79ms69gcrsqxxksny3b16v99bzf3aivfss5x";
+  };
+
+  postPatch = ''
+    rm -rf googletest
+    cp -r ${gtest.src}/googletest googletest
+    chmod -R a+w googletest
+  '';
+
+  nativeBuildInputs = [ cmake gtest ];
+  buildInputs = [
+    openssl
+    libpcap
+    boost
+  ];
+
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+    "--with-boost=${boost.dev}"
+  ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+  checkPhase = "make tests && LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib make test";
+
+  meta = with stdenv.lib; {
+    description = "High-level, multiplatform C++ network packet sniffing and crafting library";
+    homepage = https://libtins.github.io/;
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with maintainers; [ fdns ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..2257b847c8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3392,6 +3392,8 @@ with pkgs;
 
   libtirpc = callPackage ../development/libraries/ti-rpc { };
 
+  libtins = callPackage ../development/libraries/libtins { };
+
   libshout = callPackage ../development/libraries/libshout { };
 
   libqb = callPackage ../development/libraries/libqb { };

From b9639d7e1f2fac0b21d47db2d16683ae9f58b70c Mon Sep 17 00:00:00 2001
From: giraffito <37449399+giraffito@users.noreply.github.com>
Date: Fri, 16 Mar 2018 21:50:46 +0000
Subject: [PATCH 1231/2266] nixos/security: fix description of
 sudo.wheelNeedsPassword

the previous description mistakenly described the opposite semantics
---
 nixos/modules/security/sudo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index e0ec77a2959..24283e1d616 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -47,8 +47,8 @@ in
       default = true;
       description =
         ''
-          Whether users of the <code>wheel</code> group can execute
-          commands as super user without entering a password.
+          Whether users of the <code>wheel</code> group must
+          provide a password to run commands as super user via <command>sudo</command>.
         '';
       };
 

From cb88f21b16f8ecc690e1d2539fc6f55bf9987c6c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2018 17:53:45 -0400
Subject: [PATCH 1232/2266] perlPackages.JSON: Fix typo.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b3729fa1ce4..5f3e725c0ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7654,7 +7654,7 @@ let self = _self // overrides; _self = with self; {
       echo "1;" > lib/JSON/backportPP.pm
     '';
     postConfigure = ''
-      cp lib/JSON/backportPP.pm{,orig}
+      cp lib/JSON/backportPP.pm{orig,}
     '';
     buildInputs = [ TestPod ];
     meta = {

From aa02248781700e8a4030f1e1c7ee5aa1bd835226 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 15:06:01 -0700
Subject: [PATCH 1233/2266] mattermost: 4.7.2 -> 4.8.0

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

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index f0c1a0fcec5..936e457eb33 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage }:
 
 let
-  version = "4.7.2";
+  version = "4.8.0";
   goPackagePath = "github.com/mattermost/mattermost-server";
   buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\"";
 in
@@ -13,12 +13,12 @@ buildGoPackage rec {
     owner = "mattermost";
     repo = "mattermost-server";
     rev = "v${version}";
-    sha256 = "129rvmwf9c19jbdpiclysb870svs2fbhdybcal0jbmzgx2zr8qma";
+    sha256 = "16yf4p0n3klgh0zw2ikbahj9cy1wcxbwg86pld0yz63cfvfz5ns4";
   };
 
   webApp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "14gr7zzx77q862qccjcdwrzd6n8g2z8yngw8aa4g3q6hypsqi4v3";
+    sha256 = "0ykp9apsv2514bircgay0xi0jigiai65cnb8q77v1qxjzdyx8s75";
   };
 
   inherit goPackagePath;

From 4dd5948134022b3353442b8f47be4028f25cc237 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 16 Mar 2018 22:48:38 +0100
Subject: [PATCH 1234/2266] eclipse-plugin-jsonedit: 1.0.2 -> 1.1.0

Also add `antlr-runtime-4.7.1`.
---
 pkgs/applications/editors/eclipse/plugins.nix | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 5d850614e95..1710c0e3553 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -160,6 +160,29 @@ rec {
     };
   };
 
+  antlr-runtime_4_7 = buildEclipsePluginBase rec {
+    name = "antlr-runtime-4.7.1";
+
+    src = fetchurl {
+      url = "http://www.antlr.org/download/${name}.jar";
+      sha256 = "07f91mjclacrvkl8a307w2abq5wcqp0gcsnh0jg90ddfpqcnsla3";
+    };
+
+    buildCommand = ''
+      dropinDir="$out/eclipse/dropins/"
+      mkdir -p $dropinDir
+      cp -v $src $dropinDir/${name}.jar
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A powerful parser generator for processing structured text or binary files";
+      homepage = http://www.antlr.org/;
+      license = licenses.bsd3;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
     version = "2.7.1.201709201439";
@@ -409,11 +432,11 @@ rec {
 
   jsonedit = buildEclipsePlugin rec {
     name = "jsonedit-${version}";
-    version = "1.0.2";
+    version = "1.1.0";
 
     srcFeature = fetchurl {
       url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
-      sha256 = "0zh9ihvaji2v4d4980va8p1c38x5dn2mcw74qmqkwxlz4nglpsr0";
+      sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5";
     };
 
     srcPlugins =
@@ -425,16 +448,16 @@ rec {
           };
       in
         map fetch [
-          { n = "core"; h = "0zc1jpda6sviazsgvvig8zk2zmz0ac1mch5qs8lbcbdmrpq732ni"; }
-          { n = "editor"; h = "06k2mx7ka0bn0i8dfbv89jna9kmy8wnlwkg9yp1n1pgqmr01944s"; }
-          { n = "folding"; h = "1525blyhrl495vz5r98dyfws6kcgnhmyf9qgm5vkplhb27474yca"; }
-          { n = "model"; h = "0rnnkdl3hrp0sxchfzfad97ya5swsw56wfb5zvjwffbby4vln8fd"; }
-          { n = "outline"; h = "06bday90a7sdpv4idp69m2831z3r99q248n2avw2npc3gzkfy3kl"; }
-          { n = "preferences"; h = "1d9pcnq6j5p2smkfldb9dw8gdw5nqlmpcy9kh5n34jcyzf37cdac"; }
-          { n = "text"; h = "0r3g2qhnhl6misi0rrmw152gw0nb7zlcjy7019qvprn9mhwn1n84"; }
+          { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; }
+          { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; }
+          { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; }
+          { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; }
+          { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; }
+          { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; }
+          { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; }
         ];
 
-    propagatedBuildInputs = [ antlr-runtime_4_5 ];
+    propagatedBuildInputs = [ antlr-runtime_4_7 ];
 
     meta = with stdenv.lib; {
       description = "Adds support for JSON files to Eclipse";

From bc0d05870cb396fcf999366b359085270d74e3e5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 17:50:02 -0700
Subject: [PATCH 1235/2266] imapfilter: 2.6.10 -> 2.6.11

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11/bin/imapfilter -h` got 0 exit code
- ran `/nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11/bin/imapfilter --help` got 0 exit code
- ran `/nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11/bin/imapfilter -V` and found version 2.6.11
- ran `/nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11/bin/imapfilter --version` and found version 2.6.11
- ran `/nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11/bin/imapfilter -h` and found version 2.6.11
- ran `/nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11/bin/imapfilter --help` and found version 2.6.11
- found 2.6.11 with grep in /nix/store/vfixsp2napk2fv4dkhzdfv0nx473vz1j-imapfilter-2.6.11
- directory tree listing: https://gist.github.com/3899407e9730a32a5b25ade7c1238086
---
 pkgs/applications/networking/mailreaders/imapfilter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 0aa95ee9532..4d0c09c2dcc 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "imapfilter-${version}";
-  version = "2.6.10";
+  version = "2.6.11";
 
   src = fetchFromGitHub {
     owner = "lefcha";
     repo = "imapfilter";
     rev = "v${version}";
-    sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc";
+    sha256 = "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps";
   };
 
   makeFlagsArray = "PREFIX=$(out)";

From 372e704f98beb74c3fe7389b242e5b6764595eca Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Fri, 16 Mar 2018 21:15:07 -0400
Subject: [PATCH 1236/2266] elixir: 1.6.2 -> 1.6.4

---
 pkgs/development/interpreters/elixir/1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix
index 32e5bb6b323..816bd92d5ee 100644
--- a/pkgs/development/interpreters/elixir/1.6.nix
+++ b/pkgs/development/interpreters/elixir/1.6.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.6.2";
-  sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7";
+  version = "1.6.4";
+  sha256 = "0li2zb5ha7fdkjnzjbj3dxb9xls8xn6xr23fqwl7gp2697vcw3ws";
   minimumOTPVersion = "18";
 }

From e8cbd446415d960fbae2debf403625c4bfda2dec Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 10 Mar 2018 10:34:40 +0100
Subject: [PATCH 1237/2266] nixos/kubernetes: Patch kube-proxy for iptables
 1.6.2 compatibility

Closes #36739
---
 .../applications/networking/cluster/kubernetes/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index e892dbaddf5..7f03831ff1d 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch";
       sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w";
     })
+    (fetchpatch {
+      # https://github.com/kubernetes/kubernetes/pull/60978
+      # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and
+      # non-critical failures on prior versions.
+      url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch";
+      sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p";
+    })
   ];
 
   postPatch = ''

From 3d28c329214abf581bf38fbeca71b7f7743d5a67 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 17 Mar 2018 10:56:22 +0900
Subject: [PATCH 1238/2266] firefox-bin: 59.0 -> 59.0.1

---
 .../browsers/firefox-bin/release_sources.nix  | 778 +++++++++---------
 1 file changed, 389 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index b28d4645c38..851c95fb1a2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "59.0";
+  version = "59.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ach/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ach/firefox-59.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "12e4398b10c4e2c6364307098307895afd2a5054f729be61230a402b7fc7e55371b1ae04693f3aa87ec1d8a537d92174be1b61bef601d41ba821c8f4a4c4353b";
+      sha512 = "b982f2bd54312d66b7a1d6d6e775bad21eb1bce3bbe161cf980d03e55d4bfb5eaa217b05c16c72cd55165cdf7ee409c2e0a56143a82374f66c67609fed1464ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/af/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/af/firefox-59.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "5e5f7febbe069692edcf4e1e91cb1f2cf5b54b66e3f8e77c4920f5f64011f426fcd69f04ed8f84cee569f7cb7d11445dd59c6e308a58927e37955f8bbf75f166";
+      sha512 = "fbafd3dcfc473b7ebc0d6230cff487819c37b6f41135060cceca72e8704afa147edf71405c1367137bab6c8013fdd98ad487bd7039a291f64b0b37eb468d5b18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/an/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/an/firefox-59.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "50f0e7b76401de5c5f30fb58920263b2f4221a02ca0e9f987e19d0150eab3b81da0f9c28f0c6b711a7666abc3a34f22e820c4a3496fb73bd2d736f8cbf2691f9";
+      sha512 = "b7cf1261c2e776874ecb7c709d82f288e74d16770acd3215fbdcf44f6167544e626c1f809e4d68dac7a040e0dacba0095d24c1994fe329e5613c7a561ad652f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ar/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ar/firefox-59.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "d0d77e62ef730af02ef24794099e022296563906019f955861886aee3306aa8326ee5c89e0cd3734640b2253065ddeb1f6941a689593b616fb741e5d52c3a157";
+      sha512 = "16e308336b1ea37bc7aa18184e30eee4f1a073bc1dfe009c515a338f6412de6ad19ce96653cd58aa99d4ca34476e16693c03b01b7d5b1df3154ecab58fca157b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/as/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/as/firefox-59.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "2b6333d2e36d44d45d64c53481e82b110a03a18b6156b7d2b0666645a193b116112e3c061c3a07d96b1001b4e8842821f52f3ee1dc6676c44d2b1ae89087d5f9";
+      sha512 = "a6de3e421126adf95a02911db3140791c5a5dc9030e63327fbafd5fa3f5d6d81f4d62fa705c84a573788840e921ea1ab71e52d08df443405a6c8b2e69773e76b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ast/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ast/firefox-59.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c21a0e8b1b4c4a6e7eaf9558d2ec72fcbddac12e5b75c066596c57687f02559ed15dedcd5e1a5b6d719664b086ea2b9c17a6dae51ac85a6a0019a8a44f50bf4a";
+      sha512 = "2bd15deae2a01d09a622df87ce5329adb5d5da2e76dce678aaee202eec2a7ddd0ae79de205d3dabbcd189fbd3aa5293ee551c31bb3850b3cd7e5c02d73862548";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/az/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/az/firefox-59.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c057c7c73a9946aa8bafc535e3da57c59037c7150d9b3152ed993587999068712d05dc6625c1a36c38665f5495b4d147f48d962479ea849073f76e7f218e5330";
+      sha512 = "ba021c1531fbcc1c7f4b44f798d0046c39b2578fb4fa8f81927f7a4bb3a3e8b3d7de545bb2d818cfe1c095cb4387477d05541b5e5021c56086a700e8cf928b64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/be/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/be/firefox-59.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "51403b2a65b4c4f3839b53793cb88d941e50c5b14d63f2690b3490b63d9bdef7c12c82d2ccedd633d9811b01dcadae9b94d5c6a5c6bfd59f7a1710c2cb1d8ae0";
+      sha512 = "ba5ac2b182f9534825468829b62359f5c24a2cfcfc0e27ff47469b814f746240155ceb228bb7fdf1855e378048806b70106bc0a3999b0cc2d4f69b28f7565784";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bg/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bg/firefox-59.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5251dcbd0c87bc2d41f7ea1487e9ca4aff80bfaa8ed2be8a76ec96388587b41cf9a4a80f8936c9b770fbfc9f3d1b1716f6f8d591b6bd523e3bdf0baf35e8b5b3";
+      sha512 = "a1aff58b327ffa5dc62975e31e59306350bc8b4a2b38e5993aea4ca70fd4c0e295b7e25a8deafc9d354fc674d8c55ae917a110bfa832f54fd0067f4e2f35dd71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-BD/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-BD/firefox-59.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "3010153a9285c5f85eaf5910d93ccf64fc903db34ad8183ca7841040cae522b004d257bd17325d5fe333714baba4f300ab9b1ccde920568f849105acc4f5fbc0";
+      sha512 = "fe96f073482488f66f0b7a46852d763212e444c80cba0f495e275b4c73711374949d742bd8ca0c69cb9e662e71b13b28084c004b3530f702445796d7c1716f0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-IN/firefox-59.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "12f013cad7391649482bae272899a74d0981df94693105fce9e22fd7ca9c28bd992c2f80cc68ec5e70713d82e21cb015af5a3469b7868b89ea182d2b8b41a52e";
+      sha512 = "31d8f589ec72a8ff3315fec3bcf9894ff6590768f2c380313c38efa2106bbc71bd11d54b553eca568cee0a7768f0e57b3ef8038d14ae2615fa1160145b123cb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/br/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/br/firefox-59.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "f00b92c8328e7e97abc5b1f4233a49f9af396cf147e4ca0682b54c541fd40d3c03252464d6ad888cad06f8e79b6d02432e86f944d297457a4cca2fa668f3722e";
+      sha512 = "7ed8310521f981a4ff75037198a9bcde4fa07077c298c43f5baf532e84be017d604d27d59ae38c10d0c422a1cc793652c148e7c3944171044f4e9f267b64993b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bs/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bs/firefox-59.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "70af2412a775157473b3018c630d6786c650cdbd5691ef893e91807020d360c37a3031771442f3e16d678658ac045bd4fe8393a35951ef9edfa77242785c6b41";
+      sha512 = "7ce16040b19d61d39936fd220351d6dce0210aa0edc0494d1956d1f19d7e027cb2d8d100940bbc34a77f05d305a5af3708d16bc78bd9b2364407bdb71ff05052";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ca/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ca/firefox-59.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "6cf8206a6b92878fe6cc789619eb92f231d758faad1cec562329399529dfa7671dd2245301be7d75e98afe5714185826f4ce13748a01c768bf186805be579488";
+      sha512 = "8f8ec749c55c4dd930d3e359b9a3003edddfb6ca36f6f65f0119d0049b09a4c3cbaf558178a327583769fafa2d64272099882833e2ef7d6956b606c05f8a6b76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cak/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cak/firefox-59.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "01891976a3053fae3d8ad723456e2003afe75aa7904549f2d9e5cd3becbc3e33c3ae73755ebe6b92d9bbe05a2f3efb52e0794cc6a3f1c00cd9b376cac6f85818";
+      sha512 = "41f6ae5d0aa44b90724e578d51ad7a3d6903dd74d30957a8786cddbd3ae427da0a453c1504a11ff13ab9dbb350829c1928d27ca0ec67e94995346e1414109e26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cs/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cs/firefox-59.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "d307d2a2be21ca964e2bb48ef062ca4a84229108d8047e601cd9f650fb0c0445f477d08e48cc6fa3a6fd0f3877a2c65527ce98c6e42a85aa8b1734ac0467b9de";
+      sha512 = "e219ec91c7346a72b64503f89088554f8d322968fbed0ff764d90df53fac06d4febf407773192530ad98d6c51dea23fb7c5f07e2b9099c736759a3b60b8b0a48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cy/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cy/firefox-59.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "0d5eb86ca615908701972a03e12ab2485ecaa22ba6a5263ab4bd748fa91d5ce1aebea2cf86249e25fae46a3e50404d2f91d10937da6e85d9695ec70f04b92857";
+      sha512 = "c6650b47193449b28e1d9f6420b59c1235986ececcf724234e26fd8168f52120274d3d8acd8aba036c494393eb635c0ccd68833a1961a36a10b04b1a1050bd7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/da/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/da/firefox-59.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f304162d5da09f87b318dd0c9f769d8a0dc37d205b1a1cee316b807c6b9ce80d5252af1e5fdef8da9d2575d5722d37cd15ea1cea587670695e1c3b577006050a";
+      sha512 = "b66299d7f65fdde01b644a21524635806c703df27cb4eff928189d65285f12140926e8d20d1f83b54263b8b17b7621034ac1da5867fd28d36b2733212c9b65ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/de/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/de/firefox-59.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "699ecbc68675286294d2917e5d024ba4705d8644a5c43aca5ccd5cce43f06717d853c109290806990909e55f0fa47ef308d9c1a9818502b1f9ea527c5d38dd60";
+      sha512 = "463ebdafacbe1eb4d0df9d4843ceb41849fc2680404e1e5f4af563bcd4fc4410f8cb212a396ccfca874c37a4cb245bfef8de4aa9620d3e30908f1c94d262cf71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/dsb/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/dsb/firefox-59.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "050e15e9e82638bd70a8a3ae845da65bf7021bab70411ed33b686b14aa8ac96a694f85a4ddc36b074ccffd63704c88e77010d24943bae6ba76c506cd2c2fcd92";
+      sha512 = "947dbe47ad286c57a62557532232a5e833cc6f7b6295699415c727bc30cd1cd67074a568c1f842e3e7b95460595b16b0a9c87e94f38a37f22b5e8db82a3a4932";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/el/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/el/firefox-59.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5655883ffd4d55900b50fec19436c475c78a6d9616c277b1b547b9054674343a187f3cb0d637e08c45695994ab9173d4cd0fc24a0dff9770aea9f7defa9e53af";
+      sha512 = "b0d5015676280816cde17b217e078c8b912aaa87167317393c0c20b8ebb27460ead4a4656587bda19b93fcf4362e07ce11a0f5410cee733ab44bc2b1f0a1f093";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-GB/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-GB/firefox-59.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "059034d9f6be9153111e173b4c55a8670a94675aa574bd0f0859c93c0f32ae949b849bf77816f68f4e6b726bb0cc5ee2ba1b68c7c76beb72b2fe99a91183e296";
+      sha512 = "94864d56052d619d495c527af0941979470a3c7410e51c01e5a04be565a62a29a6055eaaa9f5b4bd6b443fb87702f52c935b3071b4ddccaf97a494fc2256728f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-US/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-US/firefox-59.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "0443db32335191e1cc2f65512c692663aaa1ffcf05875b9d955a9afc7a651999e0e1c81e515ba887cefd115a4db541999acca6014b7a3fbe89784d3077185905";
+      sha512 = "ef8c7518bc9abd2f730efa428ccc418410c7c571b32c06633ecf82c949aeb3e4006d888362ab511d55db98ee2d6e152f9ed7cecdd976272c89f8cc5957c9132e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-ZA/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-ZA/firefox-59.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "78d2e567a791ce410442ab0b8c12e5e4f5fc671f1f74870aa02ff3b08d69f51f7e06027d81f917ce79f8422548731bf78c6bdc208472e3a3d97e0b0c47139e57";
+      sha512 = "7e172fd957b000d77e4ff832ebbbf6b46a192668289394370ec95f12e5f319cee59da140bb3a809bcb7e161349c32f682083e7639bfb3f6fa5cab53ac4f33716";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eo/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eo/firefox-59.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "2e6a42a96dc3d29b229de4a214fd2106424cc702d6fd2a985f0de6854663c3cf3b5c1025e2f2032bc4c271efa02df450e8677cec516cde1114fcccf5b506c7ac";
+      sha512 = "369e76a861625bc9e757980c896fbd1563e5127ce770557aa7e81cd80040146af62c526ab148168b2a078a9c16432e97e96ca4fffa5db5945c3475353cfc894f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-AR/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-AR/firefox-59.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "48d2835f64b8e010288daaa5f9023b0f008479fceb3f08a19dcf7044283ec922632e2cb08725676ffc3b3406a379df790fdcb3c928a2a02ccb66269c91109c63";
+      sha512 = "a053bba1fb77617ccd9b2bb1595ebaf040760307dedc9984d3ccf5212f572835f9463611f38bce684e71728b04c4d3e484cbe6c20875b0703d39c3fdcddc6cec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-CL/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-CL/firefox-59.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e35f259268f34fb0df14b85d5d50ba9ec55cb3a905df88b488a5c552f2820f426a86d7d820c8ea92055ba51cb48c2cf2c41cac2fb0d863f4e341d316960322e8";
+      sha512 = "618eb3fef5f3669bc104ba60b76cf280503bbb4f2700341e95a6024fb3113c56388fcfeca294e3fffa3af5db15d639c0e7613397505c63509d7f248e7a1825e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-ES/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-ES/firefox-59.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "2b09055ff9a4a803003d98c4223c328502f863419a70c0a4f56d92df04f2b484ece4a86caa0cc670538ce91c7add1d31885493d5e49a3fa33d8c983d67443600";
+      sha512 = "f8fa78438bf7561d422d9187b16c1284df2a79c6f8cfdbdcd838501b5f2fca1d2e05bfad6d59b9484f46e4dabd2630706a8c47f3323534e24ef4c8fbc4937a56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-MX/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-MX/firefox-59.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "1520332a48ca76d9101805943b7a40a6c55ac1959650361f87725fac542d8f6dd5f0ca4564ef28ad2375aa2ea9ea49b31c14e34687b566105b7098cbe8a4d4c9";
+      sha512 = "4dfc8c70cfd5eca191ed4feaaf8c4dcf2dadfd7226f1ebd939997e8bdcd7d867afe0c27a51cf5d578c380665023770b2e54110dc2af78ca63a2a38165d879665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/et/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/et/firefox-59.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "330f653d29f02c7db61e1009af54a2f2d95e8d2a46283681475f988781dcc62650886fbdf4729448997d8eec8fe6aa401e095d7b0284a67682c3ba4ee24e0d4e";
+      sha512 = "9710192f0c87ebbbd68bf336f1560007a86f9c9d55ee3df7311725f7c81e1415f5d5346378fc86424cf1d94e51efcaf791318f040c3652132dacce59a8c2668b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eu/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eu/firefox-59.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4a37bd50167f6bf57f7f89f12314bbe3bd198003f8bbe9c45c7f38b06f51956a5dfcc2cb65af536044b64b22ff778b274d5f87867a7f1d0d6a74aa07cfb2ed59";
+      sha512 = "47a76627b97b2190f532ac82a6684787a6cd45f4f831b2af6315e6242367af68f84be7965cb6d91df89d8e43d04655c0e41231eff0b86cf329ffff5b26a56dc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fa/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fa/firefox-59.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "481a1a26bbfad9376f7da898d4aed4b5637fa3a8f72d5f2dd4240d310ca95349f31690df7ad4dc1316360d2c4837a8c40bb4b7261ef6459ed05bcc870fdda987";
+      sha512 = "3a888e43b737998938a624003c6eca6362aad95d0e13203d655d67c4b76c69484240da43d00e24a809e1fa40b18249c9549d52794f9cd92469a028ddb4b585ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ff/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ff/firefox-59.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "be22da0887c10742db25bdecc28170652fac7e3aa819e757b900e321cbb86e3570dd0cc1dc45ef6ae56bad7fb407f5081d656be44dd5c161294e6087ff563ee1";
+      sha512 = "365b907bb5d720874d206cc2fd3e6f21095ea1681a0bff5ffe51b49135bb3b3984e5cbb0a50951afc5bab3ef2bd2ea55af29912d25dba8f4680bf6bc25f24b05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fi/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fi/firefox-59.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f9cc91a350c243fdbc80e4d4d85024ea805face7406098c2c016c154d7e705d15e6445478f63e9ef62838fb3ea74efa186336d14a57ac715df025f526010bd05";
+      sha512 = "9361b0554f221e13c4146f9eb0df4af64625062a368ff828d80350e932ef0bf6f9cd87e3399bdb42ca5e7ca0dfaec9357d57a345a978ff936958ddd074ac6c67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fr/firefox-59.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "774a038f6b3b27e7aad40935d33c770cef2b0553b78ccdaeeecb23d1c153898beeedf14c59762581bd5ecf4489e739641d4ac04c44fcb64e40da419c232c79e7";
+      sha512 = "61123f188e491c32e9b912026554afee17d83ed8bb3480bc6ed8f10f46049e81f2444f6850c5a9f7841f9e897311ac0955105401fd2661ee703243c6e204fd60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fy-NL/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fy-NL/firefox-59.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "3d6149960c5bc044db065b7972e6c55ee74bc650ddff5ea127224d081de2122427fc6166d89448402bf8d07147d847e1be86c28fd4b949a3b2a90337979eefea";
+      sha512 = "4575949552f1e0951d75b2f3eae5a6ea5fbbc6b69f0ba5d82b69922209a46b8f9701112cd1dd61b6c892eb1f4e6463e28874f3f84891e3eca3de0b52036ad429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ga-IE/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ga-IE/firefox-59.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "6d6ff8e7425ce6a5ab1a30936ba52e9f9f819b31b3b4cfa2028829a7260ab489b785e1f56d2095f3cc669e5b7647b5c5622cb751bfe90408b0c4c7edc09dadb7";
+      sha512 = "4a05d48803502ee435ea3b50f38ed262aa57048b0f013c7165af37ad44494a1aae7f643e14d5aaaf7a2d5a1085a67a078e70ade9e614bfe33295351686661ccd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gd/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gd/firefox-59.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "84c99ebe9add8acffe3fe82b7d0f233dab91d251c1211b4b0c79cdac99f272a12a551a91c6568ec0298160467cb17e9b2c9206ce1b8f78e2bd8e1f6b53bada94";
+      sha512 = "df9dcc72aacd44ecf73f0ddc34a6d97dafc9deddb35075273c2b958b2c23ce3a346433b050766f8b83040c495c2a84b454cd7742cdf6b59b69894a94553c21c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gl/firefox-59.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "8f5ac4fa1549e89946378dea8af31133e4918f4fa09f6392aa048aed8161e939f65bc5a86f44a416c55cf5f770eba27fe862d9c189f448f93bda44c50f01142c";
+      sha512 = "3f55336a02249aa06674adbe8f378ad2b1a7b99164608f04cefe8c642ecffd336f9f370fcc190debeb89f97f630032d41aacb46e03cfd09a9a20bdf5f207312d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gn/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gn/firefox-59.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "55a4ecfec8f853f9f97e3f810c377a0921f1553fde6fe60fc7e996c0f20b2576997ee4999e392687606ab89c20e44507db1668a8f5ef2491838da9951d9e8bad";
+      sha512 = "9bdb650bb25ad573a5722595d7b062b370d79ef6a9079354ee467ae8fdb8e319d3b666bef0569286a868e7d64453b2c69098945539a259184334910f70914211";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gu-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gu-IN/firefox-59.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "487a830757aecef4a8158f52231ba7128c4d0ccb1831fe986f78cf627997927b43ddaef073882b5d3f445c27a4a80c5960204c5ae666ed8d889531f06b433807";
+      sha512 = "5f2621253981d58aa643da76dadae44da76bad3f50d08c35c43d52da5b0a8521ee4c5df5262558edb4b2bd817985aa02d6ff908f326d99ea58dd4d96b9f04819";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/he/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/he/firefox-59.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c6b0cadd23930933b80dffda825ab9bbf5a498f7d8f92c0a2e74e7f82b5bd9c19bd4f73f492ca9c7350015b0818d702519c97a3369ea3e7129caec7684737688";
+      sha512 = "ba7b0bedc2f8146dddb7f0a8a2c357dea4d23481e85f23e5d1f820da6b9c6ea84298ef609967e62741a2f9b57a6c4e94b0a90896daccb80b888313c75359879a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hi-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hi-IN/firefox-59.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "2cbfa8f66aa329ad2311cc73b545f09236dc6f014f009cb77bf8ba1886b665002849f2f1a85d8827baae706557436203ba9f5ac85eb7a11766c388a7bec3087b";
+      sha512 = "7804c9b6bab169fda70db8ff3f638add9fc22a6b8f9adde30482558e97d32946085258bfdf93b0e67a35709c474fb3aa028816e7f501dd554ef05a282f656815";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hr/firefox-59.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c7ef4d6c42685ce58402a3a7d42b556280e4bce0633d0d0125aaef391e7a0ebee17347c848928f134af3b2327ea547121c7834b33b98732fd32e29cc2bd739eb";
+      sha512 = "e97cd1b68d5a1d471edfddedbc05321444880dc9ad2910010c447515ace632c25b0516ca1dbd529d44777c8f9046b5a660a768bdb35ac5e199d1685724c6a7ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hsb/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hsb/firefox-59.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "ea42844766e41d634b4b50fba65cbbd4e8f4813bb56abee12fe8c559c031ba54e73aa8725074391b879f9ff88cb9ec285306bc816039037c7306ebbc8cfe7a82";
+      sha512 = "098842a0e8226eee716859b7e1bd1919a2bd251bc368ff6df58c95b556dc503f15186bb483503087a7e02d785453edc77d081e267b08487c0ff874361a82ee1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hu/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hu/firefox-59.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "8e84cff8c9a20949d7ba08f57a671ae06ec4b3181cee67894d752289193d6652744611a82c666275e9ca6d03b9aa4b1e73637a9435fdc25e3dbb2100d53ed021";
+      sha512 = "cd6846f6268d96f84d405aac06c11322e188da3124ad848faaaaac7cd562c004655a8f7732294b0ce2ca42597c82d82fe8b1eb65dc5b0b659f7be342aec648ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hy-AM/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hy-AM/firefox-59.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "33771438db83a53231502eea1921948c53095db70bb09e7ae354615af294b0b85c7318944b8cc524f6a6e8386b351153993b9368ce38ceb8f57f7486d2626a58";
+      sha512 = "3e4f4f536c4dbd4337e301272fd433e4e0ea26976f2a5add8a0d90f310e2c3fb14a4b558c556214409788bc2be09d36bdbf95bc5385260b70408f00ec71c30da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ia/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ia/firefox-59.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "1f529c3d83d419a8890f947b4999e9b27c6963987879d25c72e7f4217c1ed7a6c471822d59697c252f18bc5d0a10f869e63ddd76c2b2a762dd150e92a6c63af7";
+      sha512 = "35adfd5eaaeb3d40e32d501ff49979e4db878b6fab5598d64c3943cf57f846e439ef88693b39a03df65367436ce3efada9c367ee5de20a1d769620b00299bbaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/id/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/id/firefox-59.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "c18fa29c6dfd11fe311440fb4eaeda46077b9270945d02d6e88546fee0682bc7cae8ed41a2cf50b42d851bd7b61f689bd3f6b92970b1ce7e314a7822a54526aa";
+      sha512 = "3203f599f6ed436280143aaa563780c64864488f125462a56241785f9e7d6d48b2d3fadd0366fee131d575d8dadc8ca4820716a03de4c3b23eb0f0b033cc73f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/is/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/is/firefox-59.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2057a0ac563b16d61ded5ad9f5ec45baf9e1789303d7fc0707a94caf2eb193aeee11610bac46146489993118a3a2b1aa0e1b8f2a4bb5aa0be95d55d48bc52092";
+      sha512 = "2100f728268efc1d2c0f96e745e2574847aa844ef4366dab44f9f0d89e79372a2180d530c7fdfe627e17644871b3a71387037057058a0ebd117e187343b5d1fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/it/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/it/firefox-59.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "175ec65442e20b0b05b6ec5ed104117163e25d96e801bf268b5a58ffc94d8ae91f237d0d88157fa70792e1b9ac9b3fa6e8dba8000e4f0d7f344a1598a56657b7";
+      sha512 = "abef6687c0e0b90f9857e29d5b82ded6dbc0b304dcabf2586e1328bbfb9948b37f582a5ac1c58cb46026ed674863c437a15872c46741fc4e8d0a4a4be80cc05e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ja/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ja/firefox-59.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ef2aa0a3409fdf9553bcf11a6b87a86165f976a9c84587c369d32d9c25a0387b991d71e9c3333e603bf73e37db2c79b3fb47a8391ca75a84634b937ab9a7cf39";
+      sha512 = "d953aabe2368ebe9f944d91769b6e0fe18b1b5ad819040705283af6739b03fdf6fe9f3cfdbadf5231c9789ce62dbbe831035f8776f570e0be1e483b6eea578a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ka/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ka/firefox-59.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "31e09c540764e993246f929c6a8f1b8a0bb5b35856981e5edf7f55b4226caf5dd1bad2d4d1eb63f915b663c46a4800d11b1835c3234a21f5bccbea6c263631ec";
+      sha512 = "52c4b6338dbc79a670b33e97d7996daf1ef72c22982f16840ea0cde0e6ec16eda6eee1688e6eafa2ce6eaa9cacb33ceb7196f2923c81d4e1fdb3af9c200b9c7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kab/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kab/firefox-59.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "95105aeb8cff505ce4b6ad401bf1d823818a3ce9f64a02154c628a7bffac0a8cabfebd9cfe623f8bf945128f44d673220abf770c30c15b942e59ecbb36310e5b";
+      sha512 = "4832c730d37b5890a85091109ca150b882202be9028b448aa57fa8e74a2f91673d2c6be4e963235c0453cbf070a996423e64f7cd93caed973d5c5018d26d7a4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kk/firefox-59.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ce8f9488fba0789ed8d39ca3e2055a8b088761e0516c4b214421443a5d5c88ab9f732b600e937fabfd8b9f8cbfe35471bf8c8754c5e20ed103c986d945b2ac71";
+      sha512 = "efb2fac05f337f22c326822efa17f7063dc71180d54621b95c000d6c86bf5180d5ecb012ab72cef23177cf07d7f46f507bda862f87dea507a4c1be026829ca1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/km/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/km/firefox-59.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "a31bf297f9f9eed047cff8b3ec7f5638caf3538b5662f8d2ecb8f37e54e22ddb1fc37c6c8c854d3d95b8e49cc2ca82e9aeca6894808b3b77fd8642c04f7caad3";
+      sha512 = "c7817dc8cd3e78b15708a863727627ebcdc6ad054da252f273a6e68cc914f5999fd6d7495d64586e1d218c068c9f38250db0ae54944a67f1116e5a12132c9dcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kn/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kn/firefox-59.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "941d71e3763c16d6387f397e7d6c7771c2b9ff99e1eb8a32ce188d704f3f89aef2a6c66e5397fe056725c25628960a8c58d5b2611c8728128ada60e92e6dc95f";
+      sha512 = "9ed4c6d0a6a5579d1cb32e35a97df2b05d836e5eab5df59406da4d86ebae6374c38649232c2dff849865f538ce4264d8f08c7fa6c778f9ac65362cd47297ce51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ko/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ko/firefox-59.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "5c013f5a5b9033fb71896611570d3a465b7e264eda5f51f480e557ef6fb7eada5f291b714282c7c50bbd7b75a7d1664879e8575419e71e40a45043c031309e07";
+      sha512 = "f133fda3bfbc59f895ead4257a097102af10954f0fb7ddd6bc9337a520641d8f1a26bd86011c0922c2770e8191e68d96e46d56a76d498c7a44c713207a9f8585";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lij/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lij/firefox-59.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "f94d01a0c63bae58027d973d67fbacc76b982abefe561ef086b4b897ea686d9c8521a81cbb8a2f1ee25f1402935107f42821e7c41f593b042891d6e8285000f5";
+      sha512 = "e4d55a021271186cf3553781aab1953c9bc53b86c5d8550c6d45bfcf2363dcf32def20d411c4df10aca3e7c2a79ee527b23e248910ec1bbef8d1e15793e1b831";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lt/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lt/firefox-59.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "84a60ed8e168c63528c8b93e9e77eba73f27b6dad13e6042568272f992350086e72735cd184da71075d8111d1fb298a79ed4fc03b4734f83d13842a6a9715ca2";
+      sha512 = "a08315a4134181e2f8c559e0c70ff05b1455f85a85d5b5b06c5b8cc70bb17f3761468af42c27be476ea3e342365262f18b98c523e35576425ee8e5ef8df9c362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lv/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lv/firefox-59.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "6faa48a449627279bb291328428e4031e2e3f55d1ff6e0805e720a89c20aa50dec119fccfb552fe9dbfa302a7da560d63f1e0f4f053dc14cbb4df3a79e21b609";
+      sha512 = "e6e62886b8bf972668e3da6452bbaa970cd16aa5593c8a3d765e0d784ba755e17641a1d7e5410ea6474484eb14b3b6b18b69e3be38f2e2ff30890afa18c9a405";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mai/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mai/firefox-59.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "00dfd076186f53915d26016107934705c4585edaa17a5a3a6887ff646d2c4583620b052f8fcdd66bb5841b5b63252e64460806c92ac895879035e91c2a957724";
+      sha512 = "a28537a457989974e11161ae84dee2de28d783447c0a0a6b5b03a36fcd1650d609ddbb40ed063f0c68149d314b1eb17dfe92d5396c855794d45a0bf8e3491c7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mk/firefox-59.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "a0905eafcbc262c367cdd8ed94161a71bf0916727fb728033dd4f43462693550e90da9479cd72d8f9d644bbaff95cd2a04a17ca5fd4e90c151b3dcc6e8179c27";
+      sha512 = "da601ab25113316cb9ad44d2a8bd0eba23800fc97ab18ade8324048b1d7c757c51db9fe039992d18fa7b78846b5be496d9f3439500448f21d66a9d3a335479ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ml/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ml/firefox-59.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "53bcb3c892761447c0c0f62794d1765536d5ab3bb99e9d076ca75280b93b86d64694355569fbbdeefdf5b588bfaf90b0e0d0ef10f30b1efbb9a37073ad5cece1";
+      sha512 = "eacba5bf549f1398f561ad574775af8c749251f9d4a57a2c91400236cb2b72b00e429d4dcd4597b6dc6fe95a629d4b56c2c1776e03cf5d158cbc85743bbdd443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mr/firefox-59.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3da0e724bd03a088d6e5f14bba294290800a46b245867381333d4f32e7c53ed2fa2e2ec0c7aa5d57b3a5af6e71310416b83f3511af26bb0431254bec387f1af4";
+      sha512 = "e9e9b13cc3c4f48871d5b73ea88aba384d0ae792f7c2bb49f41d5b7da36243c108dd96925c122abb0b202ba8ee7591d8edd783546402c2066f5459883a255897";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ms/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ms/firefox-59.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "6b2e6861cb3feb8987fec2e72e3bb958bc6d2884e4c71f5a762b57f17981130439e85a85acdf7285b4cced9b5088e34b7736a2dc57d35eaeb14185d88a7b7415";
+      sha512 = "edf6153c9e18e620558e283086a96d49e484a74983b7d5823b1c17f9276f3c41d4282a46dc120a181a7e53595e1434f56658d34b2cad4c97e30753c07c899fbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/my/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/my/firefox-59.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "18201ec177a93ea77f8fbbd201754e05dc6126954771764778e48833f858c3c46bece73ac4698050f4f6126ef9f136365f7387d363dd274063d6bb46d23d527d";
+      sha512 = "c153e6cc2bb3ea49de8dea3661b4c5ec23193cd40e68da8160108b40fcda6717e35e7ef3bd2708ac2e47014b224e53f74b9183cb2c50f36d517f1a5ade425d40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nb-NO/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nb-NO/firefox-59.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "b18a913ef9aa15d43ff201f61d7350e41e0f8819a835bd777ebb29607f82f3b4d4e223c5c035b2ea49bc4306c489190f55e545f79989440824742b7ec22b3e6b";
+      sha512 = "1b94a618ec8f132bbf5b246354da4b424a682fcca74259b94f1ff5cb12cb0602d327dc7b9af2814fde45e5da829159df316442db6388fc45bee8c8255418a1ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ne-NP/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ne-NP/firefox-59.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "6f4fe4817d6204d2b1a93fda7e070ab17aab04148ab33508b4f2e4aefe4e23ace3cc1e3a0cf11df35582ee8f39e841e14e151d668f411529b99b0add1ebb34fb";
+      sha512 = "552aa2504e1d5c15a413a0e7e47b509d37a8b424be9ec4371f0920a9ac8b6ada2cafb9adf054b695499d41fc9b606f6f0c95d99104318cee1d69998ed7bd1812";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nl/firefox-59.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "8a74b28ea9b288c8b35136274839d77c8bbbe0a11a2f3ab6b9577c000a8c3fbba3d1a053dde2ac336e91ab5cce4d5809ee0c08e91fb452251f2c33714c7089eb";
+      sha512 = "2449c6f7cb6106e7f49b5160ecf973a73882d653c68a8e5648a31595367ba41dd93e334f3a67e69958f4bf429a17069bdf5d66163f2be14e86068a30acc29045";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nn-NO/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nn-NO/firefox-59.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "1e06c148bda453f841f837aface7dfc228b20c8e10d84afd90a0cff2e12a457c5f176461d79543e775c45bf4dd62d7cf1048bec5d3574c5dfcf62c8e6609b487";
+      sha512 = "c80169f8f2cab78efa8ad06a6e3dcea41359bfa2b4af7baa034b88c934d27243eb5b20b4ca4f956707472daaf1e315ee4d34e5abdc25edbdd0b8aa3915c14d5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/or/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/or/firefox-59.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "bc8575ff5aefdc8df53bf121733189775b1c145c189ed4b0ae8a99fd1f8f578b8380836331f77b03f766bbf9a4f1e6e7c9bbe6087686a14f0617569863c76d86";
+      sha512 = "48ebeb9e4233b303bf5300c9d7413c82f9340a7f1fdb4ce23cd9868ae6c8c7b61532535dde653fec0f9a56a3b8d4595d451c3abddee75f6aeaa5b2450f26b0d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pa-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pa-IN/firefox-59.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0d32075943cfad32e01df6a2efdfd20a4cab604227b44ba45d8389de18de020dc137096d9de602dda5cc9fabd80ab07017fde6f8ba6e9c46132fcb98908eaac8";
+      sha512 = "4d2caea086ddd56544b59793d3e2422940d64b16a623e9b9717329a639ce8a89f9e69d7c8ed9121bd08d692462c99316e1364d89eb8d1cbe978c67f99bff2469";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pl/firefox-59.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "c114fee704632eaa7fad91d82836329bc873984ab836edfb2d4b880be07e308bf50f4eb0989995a127bdc649501e9a4c76e91b73d5bba9b9ac67fde22b0a02ba";
+      sha512 = "6d10818fe57a2b10bd5cccf068f42ef8e2d949a79c4ce6e4b2ae088944f17dee8ce14396b2e3f86d492e3ce31780bbd96ecd4bfe39cb8e15dbc70cbdad6a3927";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-BR/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-BR/firefox-59.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "831f0f1e1442520b96706b672c2c34f46a1335808d552473a5eaec898fe7b085485b3c66535356731507937dc2d11f2082db1a182404d672c479f916868283a9";
+      sha512 = "b2a8732a03983b00e7e606099a215a8b6545e093e243662988400e059757f6699571a29e6c24433b345de5e47484d19c08685fe1b5410d71bfafe023d3bbc669";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-PT/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-PT/firefox-59.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "9a6d7559d79808d47dd0dec15afbc477d599be476761d48426ecda6ac96cd9ce560bac9eee05a5020b8f6cb764d07546ef2fe59f79c39f20190739f1a3236967";
+      sha512 = "ffc7c4a8cb7a092ffb86ff32ff8d6e54b4c49600ea9c8ac77e337f4c71b283adced784d23cfe8e69d034b9cc22f118756af44fc5a22003c77c33135a24197b2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/rm/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/rm/firefox-59.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "03925bf66c04031813b05008879bbac83ec81684a5419d6d0ec87ba35e15f3f8eb3fdcff191b4ced92f1ac50136f13544c03d58bb0f241ae50e953940a7be8cd";
+      sha512 = "ca174bb51554e73d647207c62f4f17de52b47ca6960dc13f45becf0a0e43b73edcc7925a913fd42e3b151acaeded5bb68d6cdc6ac17f3add2bcdecb8a4b20c3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ro/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ro/firefox-59.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "5f7dfa6494e8c1687d8bc3ee473d8bf1a5721f2766c883f4072a55c0507eba1cf422769a099b2485762b996c8f7dd251577d94c785c186a73fd0db7d548e8a9e";
+      sha512 = "4046be435da5d23a46ea007ed04c35cc9431d22858211fb2647df1ad4e00e84476544448ca86ce353b889a8db92fa1723c0598e7d560fc9980b1c7b82fae1552";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ru/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ru/firefox-59.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9104b67151238cc6b531a1d874d2474ded47ba1f5ba5bd65f66ac60ed0876d4170f19b2c5152f5d07e9965fe74de0df2504ae40f49d883546d21586d4d832a14";
+      sha512 = "a7b4becbe30e27c8bec3c71af691a03b916774a77e4626a89743a7a7deeb07e9489ba6e276e80b53becb78e5c2575465b6f141f694b71bf9cd68dd761c0442bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/si/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/si/firefox-59.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "79a88f42f81caa578afb3d7b1efd85a74c76c1b9ac7876e63d19a15bd3a7ebe5602cda5ba3b67c7e2a4f24d22d3a83bfb35ecd034ceb95fbd40652a88bdb89c4";
+      sha512 = "a9d8162bd8784be11924e9cc0567ea720b87232d175dee18212dbecd8280fecc610a964df77a3499c5f25cbbd466344221f5b071c8d83c3268d936e108adae48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sk/firefox-59.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "9ce10a004fa3f3f4a02bfea3abccec28785a0db9c1e5a0e797f6eb83731c6e7f4902906863cd681f5351c7bb84dbeec59b840c4612b1b6ddbe244a4142f6bc0f";
+      sha512 = "999229f133193f19b49b9e4107515963fa28b524323cbf88a2d13542568997a91af911c42a3b353ab3d9dc4d05e45b8e2c9e08b4e6436da6292073365cb5db0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sl/firefox-59.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "898915cab6633ae442b7328ffc3e6ec60649b5d7bcebd795c05a2e552d40a6431ba02274079f2b3069ddf284be986b427509077526a03a550d635f518c8b1620";
+      sha512 = "10ecfc7d338462aa350aa957b3ca6c0de5eba93fdd680aa2dc406bbc0cbad821854c9a45dd12c72403393d7f9447d5dcc86981921f0eab4ce3c06549c642e08f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/son/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/son/firefox-59.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "fce8ede20a5f9510546736b37d6f80fe65470582ebf9608ab4d4984e8b46225f3f68c4d82569bf20db204094932703a74b1333884791db1bcce154fa17f45d09";
+      sha512 = "c0cea7d6ca475896c0b2b281a4a0df33311eda128d573b38b89b8f1653596d8d16bba713b8cc8bba267afc2a5cf734aa578532afaa3197cc92c5cd03db030dd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sq/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sq/firefox-59.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4a92efdc1363069dd871aca5024334866443fd9228e317d2ead30a4546102e71c7678df46726774e989e4e0ed7d3f205c229dd9fbd3a18cb234d099f3ed7a90b";
+      sha512 = "45191b5974de941748d38ae74e87b135ffc813d5f207219b21469ca7804cb4b6ce9e7fdc1892bc6a6f4fc15d0935a7e770e82baf94f1c31dc77d1108d5f25cba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sr/firefox-59.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6966a84f7846f20951f25e4e6c56a65d896e8e51f6d1cf8ff9ced8814fffbe3d6db301668cfea28bf34c338900410b8e633f8a7d241aaaf46fadbaa04ad3eabe";
+      sha512 = "e931f1d47644d6a770f193cea61148445d8f43eaf5670d7cc76b3b115db15ccd4fc0938a59e7bce237d2d05a924660a791f4b19d44ccf06572d814a692cb9173";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sv-SE/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sv-SE/firefox-59.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c4802d33c9574f6b676360ae402d27d755325f208547e7d6b137bce69b0e4170b3d7139d9fc97a6ea21d60ee083c90dbd9d09af4dce8dff78f502bf6669c608e";
+      sha512 = "95a8391082341543c2044a72d7f52de39767079957c99ec75c6daf95607877fce0ff1d3c42175964516cf93ff632789647f420687d51e717d3d51a280f5c9272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ta/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ta/firefox-59.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "d3782b30491e9044e16d672e697b51449f66b750b466c830acf2b53a13d5448848fe2fb035338d32b43951f2d10b88a12c2dae3cc07050925e127e2c7da6bb1c";
+      sha512 = "428e2269126ce169f0e83ba1274d4a11cbad2964dd6bb31e8f3c3afdfd3968fc9a06d0f92a77a0bd745f36810a526a75f8c670489cb8a28bfe086cd04819fb0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/te/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/te/firefox-59.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "37bad7c63601005ab4d93903a8e00c81449acd78a694a855edc9a5aeec404f49433467a9ed6b431886ab9dd754a5f51c29502ff350936f84df69676a6999c0a6";
+      sha512 = "34c0b91b14d70670ed0d1624a5d6b93ead775151b432add41bc13544ac2fc5acdf3ad9f8f26059655effc8f5507081461f737289011b41bb3972edf7dcf933ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/th/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/th/firefox-59.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "a0a6e1803c54f06ed49c1c339da0baf2058fd3a8e612df0c2bdc088d7bec8d8785a688b230e9df6c96aba4923253186f118d0c660bee60bde1054dde246082eb";
+      sha512 = "bd7bce3cf04674cd6423fcf7276bbcd3585c061b77c692cf33680f122b09d2c5c29ba0a2d8ec857425d9741ffce1ee23383d35c9b7a620aef5579d59dcbe0049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/tr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/tr/firefox-59.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "06c61402c4732041e2140dbb6e56d969edbd64a0e25a31ad521c2b692df2193369fbb6af2848c68da0c5b620af4c171f2d748a10f0e402ac56b72c2f5fea3277";
+      sha512 = "580604b9e4336aa6eac536d4514a41603890ceb6e9630609b4a36cfb0b34952f3d273ba1d100ea1b5509a6dc8dce9f10a335bf5aee7a0c6b133abaae3c4c7352";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uk/firefox-59.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7a7a76241dbe77680229df13b1a724d71a2139c5fc38bbc573592fcb9f07e5ab2122700854e18af339805073fef0081ec3f1b0f47d19fd1edd225b4556137d8a";
+      sha512 = "f6c7a9fe068ce1f760a7ca45a82dc5dd28c7e054823e3b9dacb6d00d628ba56c8b2d831a36237290d8803b3284b90cbd29c3ef685cd0d4973ee338b91ab541d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ur/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ur/firefox-59.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "33af5113a20708300d8d9de5584e22212a3561cda55a666e153af7e4dda67a114d1b7d3c9a3606f47ce0885613dcffea8c78981a24973d996533020ec3906161";
+      sha512 = "41c6ae7d2f80704754865982d4b64252a9a04a222c5cde279708960c8a2c167f68805ca2302a86f03ab55ba93afd069d4c289434dff8ec61b245123347e53e78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uz/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uz/firefox-59.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "8cbe6151d20b18741af0ec6c2c70da8f23753562a4f8619f1d1a9fccc890bd13590dfd22c6bda0db4b113651d3e89c147733ebe5cc761a24eac656f6f3ad2bde";
+      sha512 = "5974e06472aa75eb2b9cdf1494d8bdf0f394d5a7493e9f77d631f47dbf0a0047dffda5fdbe23f32dbe65612b9b77caeb7c3f15887cc51fa7c2609d3960b9d32a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/vi/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/vi/firefox-59.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "22a8c52c09f6c8fce4cb9eecf6378d9b5fed6a60f0ae73c44a91156fca23d85db837e670f9afeff57290f42c00b10aad5a0ff5b279e7f7d91e9d139928244932";
+      sha512 = "5b35c3ab9593074c8f88f2ad34db0e161c075d8b04785ea658a8ba49172707e9776a5882b291645d0aea5e333870723b5fbbe6c7957f7ee02c9674eb237a63ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/xh/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/xh/firefox-59.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "874e3dd3bd4e5ccf058d026e61314e48c9f06f549912066058d3c936ec606264754c4ac76035ee09b4112faa2b96e146f5250caf1ee7421325f6beaae259f2db";
+      sha512 = "8ae8b2f36cac9e1aac1f44a786d6992ea6b31dd83cfc22d1cfd75d057ae429a35e1d61272aac7ecd24d4dbfd8448f54682388e4e708222d1c2f6c6e54c0b0da8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-CN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-CN/firefox-59.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "658b94cdb5f6dde841c95a48bf1f3e401d02891d5385d0608951630b38aa74dd92894d67d672818cbeb63a3cecdcf101c9ac381b21f208fdb27061681911abd5";
+      sha512 = "76e09c7f0835270ed7788330486e1d00d10e8237e5e6b5af9bc2de227fdabb958c697c11f74d7df5b6876339adac09b6bd5e87c9d31b3c7945ffd00ef0d7527b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-TW/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-TW/firefox-59.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "de8e1bb93294891439c9925a76b380aa40c29ccf6ce01db23c16469e60d8e9f7f49d0e8e5875cdf0f9afafa9df7968293ae6218039c9a3a0f38db15b39e89a41";
+      sha512 = "87f298e06f0b58500231367da1e9fcf19f39c25cbf2b4d20980f45947539398f6f394833a6baa676c6ea27f87da26e5f211333c76ce91b40e7a3e2a6c6a33fea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ach/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ach/firefox-59.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "a8f58cadcefed9ffaacc55c9e14a8a7c96f854ad624280eec4c978c3a2b8a8b503fbb6173e4c34168ea0563e5937a65736cd170413671670c04ab9155f279851";
+      sha512 = "3d922035f62c78c21e997f0b9e1265c8f9f8bbcd53d67d7042d8d30d418d54b3bc4f5b8fa056149d8c8dcd54afcae1ba3e418fc0b89ec19b7c3af27239a0d4d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/af/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/af/firefox-59.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "b69726e9aaed92712f332a8c8a46310881f043d51f5c19ded3cc39feefccad26c41c94ac247cff870289217b36f3c035d60ed32844105b3b6decd87017f8a100";
+      sha512 = "d85f3a911741b6dceb35ea6f2daab06a6258e66b07b79fa7fba4b1c277ae8debe5fb1c45c3d9eb07b910a172ff94baf6e4520a6fe755cdeaf19204b4dadb1f42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/an/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/an/firefox-59.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "c68b504e7ca5553e14562d347b8bfd69dad41d5f2961e6102db344ca42c1e05ae88c73537fbdf08c4d21cc907c4baa64f8d2592ab8ba284673b15162cdbb06d5";
+      sha512 = "f1be5c00436a1b613fe46f5adfc19eafbb0639687346a3939437e10e64a7ba0c94b9656bff988a07210be68c7e57e982e9280aa03a0e69c2cce9f3501846ff20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ar/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ar/firefox-59.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "6dcde34f30e4f945b36d1d019190ae6aa83b70af4fc2ae4e2c6d02ca013dfb2955639cb0e02014cb65f21b969fd3d8589e0efdfdb13b6cdcde956751329e5c87";
+      sha512 = "aa2ce3ec19633a86d998132fe54eba30e52fc29d5b1dcde1c3197aab0bcf0a9f73caac3662d58e5465923edabcfb0559e8f23bff7f13b5cf89a11bde7d4b2eb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/as/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/as/firefox-59.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "be78bef5378fee1a9c38df3364f294f56e5c1a64df2613504fc1d5e0728ad3e41bc8314c9489ff300dfc522d301c66045bb6ed567aac80528add08d8fd40490a";
+      sha512 = "993be32e81700a094358999edc280a0e0999efd1478eb03f0924c0fa6b8c6347e69e0408725b916a80f350d3fe93484bfe83137fc0ba007e7f7a0f41d1c12e60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ast/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ast/firefox-59.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4fb28c925add1b528406b7f951e06818c6e6f641a998c286bf68422faa037a890f9a556bc61a54a48607776bba33b1dc97f00244122310611d32a7d731d583fd";
+      sha512 = "ed49c1ea33b0057a8b6cd406820c788248016bede3983121503a8c5332fb305837add00f7a5c75ea0aeacbda16873cb519980f440d9c11b0b54b01c674832132";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/az/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/az/firefox-59.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "8708a6ed5266c4bb70c747bfe7e5225edce564d5ee5009f016c0a4ed87c6676c04dbcfe573ac31f7d8ad8db23d45c5218dba7ac1b8f16f546fb2484457bdea81";
+      sha512 = "f02af6b9865d4f6469f62c1168bc33ac1f2abbd0a238d38524643dc5fd84de4a48b146928ca7c6d82f9db3e55ebbe861c29850a0a3aca3b3c1cea632a6938f0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/be/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/be/firefox-59.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a469f44da99b430acc985d077ae47d61d518ad9f172ddac88e65114ed144b69f0ede2aa7388b6dba3f9c35944489024a5a419f0433054983d328ff0d09c83736";
+      sha512 = "5b82b010b2ad960b8281e0cc016f7125bdae1b1f3b93a581998c4ef891ecf49b6b075949420d595ad644aa5c75ac6c552e7d26086b5ee6e807df5179ee6ad36d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bg/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bg/firefox-59.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "dc4c39517e124d241e9a779db619f3dcf1c11b9a2a5afd15d2ba4d4894978d1383c30beead473b9ebf5343d1f7ac1c6d6aea17f0865fa7abd06301f8c3648921";
+      sha512 = "b404b3f97a9dc8675e701ea2ef8bc0a57b40a2390d98573434fdc82097b12abf28e9179de3cdecd0e3c03f0cf78f47cade1e41795eaafc113ea2c954a197a1e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-BD/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-BD/firefox-59.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "82d1a8615e9d7f97d23ef9265674511a8c5ea15fcde020a6405e5e1b05eeebdd93d1f7c2f9cff96f88b36f1493b721566395834479253476c0e76d807faf4094";
+      sha512 = "a992b1cd5ae8c2237acc97bd1f7e61dfe2abb3b93c270e64d2ca190d8ebb84c84f8a45de5cfe7eb853f4e3e99d79eb19838c4d0a02c73f13795fbc42e79ec04a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-IN/firefox-59.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "a0032964905e4b0df68d8db313759c510d236feef049149140d8eb8c9fea2a8a372ebf1c73f222b959d90c04ae84dae429113d97292f1b0395cb00147ca1e66c";
+      sha512 = "4188f40867dc0f23b2c52d59e569b7f030d4392bf7715d35678c69a29b85b0573bc3de6701bc550735881b1055bc66258f4c7090e5f4277ea494a60549ad98d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/br/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/br/firefox-59.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "cce14e58021b86447b6d7b58d082abc42451aa5af30bb5a81a42ee70c9b17cb653ca3f9a97180d2ebdc2ca943a96b1d85f0beccefebab926ee0872ed03579fc6";
+      sha512 = "c69b56c43aea2821d9b085c7be10d3cd8c7f609b8c053d8fe8bbce5f719001e620bc56d1e70fd85c77e01501a0df466cbca62e2e6ecff78196ad91b6c30cd8cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bs/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bs/firefox-59.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "c91fc6c8d17aeb65bc95ea3e8f9c6e90cfd46a5b89ea8623dfa61e068e1b129a1c228649a73d70d1bfdaf9aca5a3ca90d2722b16593f3d5b55b5d1d5a7b3f305";
+      sha512 = "77dab75b3c10d6ec24ddfa436dc9a6e037da3d692912d0417a6781890eef992cef250e8a38d5c1d03045dec7a073d2658a3d17a1f3e9c6d85a58c93ee7b4e19b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ca/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ca/firefox-59.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "274f6cbc0488d1417ac34841f3b7574dab1663cd583e481c8c928445b1197c4a716810cbe3413e2857a43ff83b27cc02cd7735b1758d8c67f424fe797b633ea5";
+      sha512 = "7fdf1fa6eb06cc338d06d30e8f1ca432cf1d7930a534c6c613e0f1278ccc70f1e81f74e43cce1e1b865bdcf2b9bf10607d73fb18d51e796c731a735f1e729dcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cak/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cak/firefox-59.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "25c65e084a21bd1da1732e007020c57f22bc49c7be0c99e1932d733433f57d88d73fc0187ebc55db251876da2d2353f2bab205775bb4e8f66d8871a25b01b857";
+      sha512 = "e4e35ea7e81190343337439a3fc95786f318c1f0dc338f2d816a9845b596473067095d0f3b446087ca8dea98dd2aff4db1c8e9a8c1f8fc5d304644b06e0042ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cs/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cs/firefox-59.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "8595e022a47f60bb9df6a54ada7d788b85e9caff164c4763e31544c099dcb161beb4cf7122b4eedcaaf0f330b47ea60f7f8f69bc442623c1d4fee00b6842717c";
+      sha512 = "48288a7ceb3fbd579511950b9c6d5fc133c1fcea8435994e804ea423e0cbfaf4780fdd6317bfea37a958f800a79b62792e01c7aa25a908fe62b21684d6fda060";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cy/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cy/firefox-59.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9e7d939963bc28bbe9d1c4c610d0c7820907a94add5d9afdb41b69e050378b1376bff82d429c6a340701063d9516891380f7b7630a2c8557ba36ca8a75a29069";
+      sha512 = "ae9fc1b0c8d9b46b86b6ec9bcfd97798fbab2410c6ddfab531e364871be70a3a74c48936bfec085220bc5f37397cd83fd31da4a709f337c57a8bd944e635e7c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/da/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/da/firefox-59.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e28aa52cf42472eba10ff29419910d391e70f62492f4d4ac7e38619c48d4dad760123e1b26455c2fff05794c8f945982d4f4798894acc55f262185ff89829d63";
+      sha512 = "9ea4433a5c295abba639faed9681d68fb8976b1935a131ab763f6ac12f32afab2c1ead3709ad741e04c005b19fe230e13a93334434c76a033df69d6891f960a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/de/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/de/firefox-59.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "24ef96a42c0d6a580d382e1c793ac0e8a70e1a2a6a66ef2a295e026ad52b706cd73ff0cf858ef927e2e031261e5e8b0bd3fa38d1afcc7659149494c1f0900cbb";
+      sha512 = "6d864350a270efabd5258157c78ac6b70bb81677939bfd381b6996fb672da240b5c7ef5780819729d3ade763b9eb5a4222c361394e48d9c1c9eafc54795be93f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/dsb/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/dsb/firefox-59.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "b60cd13f290def58ef219757004eb2ad4ed92f1497b091162b61fcf7f185fd2f7708a1f6ba2218b4cf28084ed270031900cc6ace00edf56dc94a97ff22214a4a";
+      sha512 = "71e5608acee3d2cac48160e71739540c6d94fe5523415d9b639a3b493910347d38f6230afc0febb444e35838e3d402fb5b3018cf437eb48632ca1d8b873ce0e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/el/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/el/firefox-59.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "fecbd2d681c81dc4a8459bde6fb55d595fef390cc54ab1f3e5ca0230ada9b0fa3d69d280aaf1ff6218b5a348b7fb7f06800bbd710f3b20db98056c5a7a75ec84";
+      sha512 = "37ec4073075a29403e4637b48a74bed5c470ad9722c28cfc3e1d7aa5bb63034a0660fcdd2f78d8681ad21b569bc9060be05f4e1cd3eaa3d347ba0d2304075eba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-GB/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-GB/firefox-59.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "be9bcda727b18bf8dd822fbaa62f7da17ce24f728b1c48fefdd6163934fcf9591f999f45bf5a2dbe092f37f37a7fa3b7d90afb2f2a915a11f17530ff17593a87";
+      sha512 = "d2731ba3dad5298e07edb49b608f04784312e6d7e0d1219eb45dfd38a65ef62c1f9b94eff5f97bf35d75ba36cce8a831db6964251873572edc60656a87ea5ff8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-US/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-US/firefox-59.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6b42ca4bacb37012d99508048d01686b881217e80bd2f57bb9b3a22207888dc9db19151adabb64c074421460e0309d298edd7078a13c44c815ff99a24a97b2ad";
+      sha512 = "d56c62b111bb629a30e9de4098a9bfb11b9b437bab572f3e588f4d565d86979c64ec0bd4be4a54b6c1d2718e5cd91094ea046424c9e85952a4ddac2c5de8fc24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-ZA/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-ZA/firefox-59.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "ef85c017d1df9eed592b1816692d2e57f6555575ab9eea630817ade5c156e944a4196637fd640ff22922da12710f000fb559b5e5f16d0ce5d07feb5bc59ec2ae";
+      sha512 = "5fd28d0239dd61c54a062a0f6efd5d0f406bcb483cbcc111a631199d430839129dcdba84b4da66d35f1c5052d530da07e3bc8fdd7f177a366974bfa54cb3303b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eo/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eo/firefox-59.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "9deb3e19177e35dffa51913decdf5579fb925158843c762bf44355e5a0173e2b7604c1d7c26a1cfcfb7420695b18a9002a4ec1a4b683911d09366569b7b0fbfd";
+      sha512 = "327b89fbc100d238f2c1211752ea1a95d2a5c33cdbf8fba35b44ff52f2b63f2d05d84c4c714090693df28c0057e29d047278fef6d4f7e5989ec207495bac3134";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-AR/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-AR/firefox-59.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "bab8d2eaf02961c665ddbfe4d380c72dc0363feb356854a9dd7d28526b7c01dc8b2dad13c087d91ad7056ce50d0cf37123ce54afa45c1279ff827e3ce808fbb2";
+      sha512 = "676b58cde2394983a7be06039fcd1150f6e73c95518f5889702cf71ce780c4994629c5452924354ce9826aa5e0726a5de75321295f55004afd10f727d456659d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-CL/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-CL/firefox-59.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "981df51596a9e3fab9281c3319960f766b02941d3d89371f15c3ef6ddb853cc3dc3b2de3f196eb83d20a503eec6cc7926ce66a41f67ad4690fb601b9731e8522";
+      sha512 = "274acb52107294b4a65f22114da6e79d4bcb6b06a126002a371c983a926a2ab9882896439f94ee2d2ded5e5955d42cc4a87fc0f16c8960e42d406b773e2a5fd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-ES/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-ES/firefox-59.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "017875c18052a84bc262812332d854d6f1402b9b81d8e0399d319e5c2b9d41a6a199e5286cbb2973ed8eeec0d9753f66a4911deda4a31049033c1ce47c992c98";
+      sha512 = "d23192f6cbbad388d8f3183876a176197bd82ea0bd596ef03935eb020d5d6dbb94692335dbfc1b98e63097b7c66521154b0b3d013cc769c83bd48883646e44d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-MX/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-MX/firefox-59.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "9a4c52058d5db0b342b68b6c389932106ad1f4a041e152acac7bf86c7bfad84aa8228299bd0dc60817bc51ad3c42ca07ced58eb9b0d60cdfd58775eabdd06fb9";
+      sha512 = "48da06b532fa91a6b482b57a8cbbdfe3ee938b353433d22af479786129bed784380134ddebbfdc58bf06f5fb81629ec982ec5e1d9b51e92d75bde44014770fa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/et/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/et/firefox-59.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "24c85711693582ee0eaf7985af0bfecc5e905d9687dace724a57c66ace2ed72318c48ee7c1d0ccd0de125929c829afb2b08a13cb4072ddb73d12e8143f95a267";
+      sha512 = "71ec513f6b3dba3145c7b424c8f331c2108d0420a75a91045b4dfa4529448923e3ccc8fcb6b90cc01d8acd18e2164755ace78aae2d8da5eec056222b4dcb1b00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eu/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eu/firefox-59.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "916164528c57173f70adbe3f92a9f80aeb5cdd46540b3dfb4261afec0649ba976375dfa54e11ece249fa2cd6b8a905dc0f1fef3104e83ed3e7dc4e622a82f8f4";
+      sha512 = "b978c35a4ccf0efb9023f22cb05ae9696c94c8a642e3deded9c44900c84d3c0a58cfbce95aaafe7e99ee108db07a6b07a76813f7c2c3d971757eca817dc10ba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fa/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fa/firefox-59.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "d3ec04850664f1480be7f722bd694a74091197e1fca9a780808884cd72864ce6502ec02ac6aab2498a5adc87b34770022edce940d7e5af6d1856641282547880";
+      sha512 = "a67f89767cbeb3b37012c4a1ee64c53e74b30de6c5a14bce2fca15a16ce11a048ccba4e55f88ce7f2a888b7248df51fcfd03e0b0715e826f6b936db953313994";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ff/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ff/firefox-59.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b0af3deba5f7c823eab1053b21e0efe00492ac8dcc55ba7d223c4531ae16ccd7f81ea4acc4b6d3996efd25b2c3401449870d0818ab1c180b1b3aae86c2640af5";
+      sha512 = "d7b7d9b86b90d5ca609870313b2533b6feb048060902727ccf34dbbb4f180f7fdd69683e34a7483804a1ba2dae8b264ed3fbff81b065083631b234a2893d4716";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fi/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fi/firefox-59.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d88a2b576f56f49953f0e9129fcf78ff62791a905afe41e1e7b7c73402f054d762983bc354acfc177a58a4e72e4786c82fd8776f07dc413d4b73851da26e2c3f";
+      sha512 = "7c555f5ebe3fd74eb782cf9f3508c9714844cbaaa3520bc1c3b60bc8d2840874850e5f92bbd1db4f2dcc4cfba211f4aba485307f898f0b47d4b9ec93b4346ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fr/firefox-59.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "8087e313549c8a4e8fb534c72b6de0be694305c4786a685f8899aa483c80e4ddb0a5d134cbaac56f4eeef31fb8802353d1a531dbf33f639c79e668bdbfb711a9";
+      sha512 = "edf4f0669c732312c27aa40f4aca66aa2a676f9b019cf1d35d0deef2ab4d27f5441ca9aafb3ed896e20538f765de4715b67a546e4364f384e05748cd495b3f0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fy-NL/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fy-NL/firefox-59.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "3fd21e1c39c32c11650cbbb095b64bd1ce720ef2614d98cf7af2fc3bf7979c19566b4c0abe0a24e2f80bce7f05a49740cfe8d9dca6edfbbc4a5ab32f808c5629";
+      sha512 = "58238d57335a18e63230fcbc67f83059e2439528f3d0ac508750dcfad4a2c48296e43c53ecc203258f917f87be78fe50dcafaabf88b6183d5d790761bd21a7ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ga-IE/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ga-IE/firefox-59.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "946fc4e3b831f91f5e505c7fe4aac8100d3b3edead97655a47ea5b2138595fd821d96dca3df88bb3e3cd6522753f2262bb61f5b9a563e073f27f128f390bd0ac";
+      sha512 = "fe4865df72926342c139309d34c8d42187b39e098848ff32b7a0bfa21798f2d1e6dc0879dcb17ae150d977942f355c532de7d402fca3226010de8812da0ffbe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gd/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gd/firefox-59.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "ee014509e87ebd64096c8d87170ebefddfd600843e410fdbe74a65e5d4fdcd40de59881396d39db9e68a09ee7f10b03a5e3459b07ea442c4d1e5e44bb6b14a78";
+      sha512 = "68f94b2511f72a2049c07a20d120fe282a6b85a3f4284e9695ab5cbd6eadd4ee1926bcb133fc7f7394d90d2e3b47e2ee75b9860a49229012c208a144fde5e85a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gl/firefox-59.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c90904cae401464bed29e5c2b33940f9b996ac46e071be89a5ca51dc6db492f6914d234b518706278b0d2d676bb1ab017b5055c3297d269017bcd6c04b766dce";
+      sha512 = "24bb4da7b5bd5a8bbb3d5bc8ccdc96ed29d9435ef00c35c70b67e0aec5baacbb910d77daec54fddaae7d68541bf1e9d051f3b1bc80e8467cc78f3c503acc0682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gn/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gn/firefox-59.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "dd401ed91652cd458152372deab8c3067fc7f000abdda3b9d1f3e9e5b1cc253c9ee081fba3bdc9b5c5398d64d43a42a80c20d6caadc761bfe4469bd4ac7a4b9e";
+      sha512 = "24a6a40ecf5f8ca418c83c828cdc6905ed43afe137a0d59b036e68c093df3d8be679c64d06a71973a891d5765f9c366252959d6c95cfc8a5e9b5b145999526df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gu-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gu-IN/firefox-59.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "889d81035e9a618539eb9aeb85567406a589e6691c162481bd5622ea3be06e46910314b83c3008f3bf9f6c35b6330acce459b84136e111f45b247ce9771a99fe";
+      sha512 = "b36047e9e9957002d33be2c540104dc530d010a646ab8d8516ecffde0b89b9a6f82bf8b94bb3f55fafb002b5c39437b7941d5fb2a0cfdccc5159c2013db1b058";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/he/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/he/firefox-59.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "e8057f72bc093ccf150d9a014eb2ea2ecb86d7b383603542bb90944dfbba3bd391fe36645c6f0124d6e9fc50cc7cb3e70c1339d4eb9e4c928c2621aa38cefa3c";
+      sha512 = "c4d0195f72ee0afd3aa746d0a1ae5f0f7ef58646f6b4e7bffff8b1c4ac863275881c29fb7cca09ff12765e9902a6bf9404f11b45399919c9873758bbae8d017f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hi-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hi-IN/firefox-59.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "d651eddbb9f3b419c86ff9535519dfde886172b0f81972880e10c7c0234f01f5fa4050218d1c8cad302a401fbf9dc369dbe9749822f2f9efe2426cba31dc9d7d";
+      sha512 = "7bab64a89c03e37add1c6d45756acc3ba19751313f212f3069b9c1938f7533ad1d0cb99b7bca392bb5598e2c10b461f79a47b45dbb77285f7afe12f5de781e94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hr/firefox-59.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e1de943f777afe8564d5da316cc13c7232f431e023eba55cccbf9443451089d84f0c66b6818d88b2dceb47299693e0c06e0058f41a0929cabc486fc7b78218da";
+      sha512 = "aa68496e4e82fa5f491b0df056460ab3169be81869248fff0d3ce2a180c9b9963edfbfbe5b051846302ab713f436836dc63d40f65ac10ab185bc12e5942fc71b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hsb/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hsb/firefox-59.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "20bdc20beb7853264a98201e4a3c39c2ff9058ad9a5cf23e0cf57879ed6d11f4c59589078410411276c2e4cef01869a7c418265f2755b1324c10757dd41accf0";
+      sha512 = "89640b9df29c1fa946351fb74ca61e6f318ac190976f75b73aa56c66f2a67ef88b64c663cbdeea86c30c6644cf7870b59c2f9fa479ac6557e368dd486fbc4a34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hu/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hu/firefox-59.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "37d6b03aec34c3a958cd58e489dd1da715c676532b70a90ed87fd9e05ac30deb60e2e5c35ca6c4e2b21eda1066ee5c84780149298aed4149ad937fa99a71ab79";
+      sha512 = "46a6cdddc77b1d29bf85b40e6e33ab0d6b11a72d425ff59e9156cae7548288f02e3e1a54d296e4e1df1efc1e8e3c252a955c2a5be8bcb9e22d9d0e6e6b12d08e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hy-AM/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hy-AM/firefox-59.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b3f4b807a1a5c3c6a2e79570567a89d3fdf7ebfa565d57723f161a81ab05a23dadcd1d47b3a220553e14604ac54b0bd0dabce47d54383594978723fb67b37248";
+      sha512 = "0697f146aa1e7d0d4aa8be28b72a642c66a15d7e6a2208a4d704ee8559f4f814a8a6cf601c58a7516816c86a374bca5f755d30e11ca668d9f77c8ea4e388f204";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ia/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ia/firefox-59.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "48cc98802d7f5efe1b9ad21c5f223099b99f7cbb5f659577646fb56f412551d234f9c2709a6b26c790f91ad6e1167160e995e040c334836ae4abc7f20e07fabb";
+      sha512 = "107bdfde5633415250fa0cd34ecf29dc39bceb8a5762445b9b5429f4c83690193fe433128799446029f458492d4bb2fea27d7654dcba5a7ce3007bcf40052ff2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/id/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/id/firefox-59.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "f47d27aa649d702b372e7571fa2dc08179ecb1e8db3600eef7c2a26cb68ce74e747af5a7fe2e2cde68546a9a04cb895973a3cebb4cf93e54cf9f6cdf089bdd3a";
+      sha512 = "6935a4805b0498d5246f73720e02a022665fa40750937d31ba35d887ab289bcfc65fd122e6c18297443a6488a92a983e00844d384611e04e2e947d20a1aa82a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/is/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/is/firefox-59.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "c92a6940f537f13608a322de49027cefcf52f5f740c450c37083acafc805cfcdaa01ae8bcde46799a252e5149256c8a4c464411d14d02c969f1a158931b352cf";
+      sha512 = "f04f5a86e348802e38593a0c6868a1f0c534113d4511a35ad4e831a2b3d00d8d9f7522e9813230e2abe710708d61c502337de031f934813275e0d81eea8b0379";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/it/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/it/firefox-59.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c5db9df2e668d91884d1c81f325a6cd5649fc8f9c1cd67e3107f54a2028db866c3d9e9f504ea84fb997403aba04e773225fb5509b60e194929756610e4f20813";
+      sha512 = "c0db0620e0df091f31ff576d5c87004f4c283a7455afb0098a5de50cfc8bb7879ece4d8525ec1c7f4d0af9d7934d254f114cbded07c8a93126cc6b35d6058f61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ja/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ja/firefox-59.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "c56d79fcf04458d0d4b11c3ca675493a5c9ce8013eccace4d9182aaac361b5524cbeffee2c206d5d0c4c3b641f0a7db6acc05745bd1cf54a795b833a0585c7cb";
+      sha512 = "8a705718db55246b74ec0d1baa30e82c18b5898151d4b0ffa7f888cd53cf704444627c47a00af70eb381f9d5e4d163119ac57b23eb316524a4f949a722809d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ka/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ka/firefox-59.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9596b0982e29f7302963e96c6db071d668cf7bfc8c31f634d2cbe687582906806c832c9d06cef22f44cec5418aeeaf42afbed6fd00e32f845e5f57eb08482a11";
+      sha512 = "6c0c0f2b67f327e03d874ea02fd084caac2756c21838c9787a03213961bc585db5bb0f2eb068a714dcc028a7d503836f1e7f652f60e08c0e9ab45f496e53b780";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kab/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kab/firefox-59.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6988478ec06e738e333508c5cd64688429f9445391899e57931dd7672c88767b7c84ac2bd7aaf952343c4c671a205864dbe7736401625decc2b72c48db749dc0";
+      sha512 = "381d4835f2dfc3a3a553d228e821daaa6966efcb47ca5d7a625813d59db8081a81a46dfd2f246842c937f75121585124c0e7607a9bd0cafb59ab42d88a2c908c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kk/firefox-59.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "05ad5aef14e19bbf2b6665f96877d7484280484ea274a4bc1c5ed77911575ce9e6d9ff87dbde790c04691bb4dce02b03ba0286a48c159b9f48d5133581ccf040";
+      sha512 = "82f0e6cbbc9a686be9bf76a0c582800f75edd3f608671faceb813addc0e2fb66a631082e083016118dd3aff8775432ef566319cf9834a8aaa09ed6f774ddc34d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/km/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/km/firefox-59.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "5298858458e6a7fdb1c506b54ff3e0ea8d28b85120cda27994838ab614fcc5cb95699acd607970dc2fd8961d66f2640b9f135995e1407f7c511631c43586fca0";
+      sha512 = "7b1e81cf13051609897ad632afa18709dc6d9bbc66a6b7289188abe2f04a9bd1be159aa08342ce746930fc0cb50b19f0ff8abbea695787433acd25ad1cb48c58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kn/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kn/firefox-59.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "6a32c5e98920a90af971a12dfa15f434a968e2fd0faac302c8b79881e42917eb8e2fe028873f23159870c08e90d3410308ca3c7233c49d72cb4940ba076038de";
+      sha512 = "c17d8eba5bd0c1923f958dbde4a2fca62c423213b249fa1e2829361ade947aad32cdbe257cccf5d5160dd36033e827a78c6934db6bf96f166152b967a2c5d07d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ko/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ko/firefox-59.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e05c536e4c901323d1e744bb1e85ae85df1454ffaff9234db6fd8fbc79807198c775cf1e0179ab670903bf12ca34c9356b30afe25d8dbc27c9ef4549a5148023";
+      sha512 = "c34c899ed8628829dcfb48b80a8b4022db9fadafc4edac4e227849ee58e06b0a9cd4fe089e080ff65e70177f7068686dab678f2e7b04dafbf1338caaea779b62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lij/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lij/firefox-59.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2f47338944f8b34eaa7bb28a2804c637b392a2af4630d758b1c378b9b1d020aa6e611f8e8504adeff75e9eec5eb70c3b39f20b779003d22b87c79ebe0973ae6b";
+      sha512 = "be96ae1d90a0e5f2308af47cae8bef7e028f01ef156bbd0497e578a0440a7362b18c63b36806ab4f1f2f1c4f8d6c9e5d9d03593ce38d1271809745cd2b266584";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lt/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lt/firefox-59.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d593966d81f8a0652368f819f8e3f0624fc6d28ebc7387bd5a6a2b3a10d3e87f657076fdeb6eab7a93b7c22e87fea1b84a776ac3d667ea90b302fe1b20638af3";
+      sha512 = "b141b12385d040596085c328ce95b4ac741ccaebe1e950f00ebe09e96a2ea5b5ade4c5438f9b622423ef658f84659bab414eb467227cd9a664542fe76471d1f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lv/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lv/firefox-59.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "3e0a350f87e487c0496f04b419f7eb2313341798f042344b5e2406f7b59d154bbe7830683797021a412c1e2a18f30324260a6988e8d2de5fe6e2a02b28a18493";
+      sha512 = "ca296c7d74bfb0b4aa59da3f82dfe32b7c6564953c9850513bcb429ad68b6c867112eef7b7a2f9e1eb0bb8b7baa5f0f4caf4c9da311729e21976d70f8847bf44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mai/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mai/firefox-59.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "6bdb0c149489e2acf9fa9ffeb9f519f0ce2d167fa4a7c36cde81675cc9876d202d116b97ccb853ee869e6ab7afc570a023b2a1be847a6ab976bb3c0186aa51b2";
+      sha512 = "378b32c8ca6cf0319c54dc239bfcd9edc8b834a5ecbe8c990ff8d7f7f28a89a30c53384c413352219309bf537dc4b0961ec0ea7eb2c1a4977b062c280ec130df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mk/firefox-59.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "233551a16630146475f0bb479f9c2152e546b9e56d3137dc391dba586a1988246c86862c317c5ad13b3a96c8e4f80ef4e108047e9fd917b97165ef3d8dee6f6b";
+      sha512 = "7925c3a6beca9e35cf301dc7b4ebb059fc87cd710e0243c71b65c55918d10ada853b4a4b8a1c7aa0e0c89bd8e9cd4414d5a162a430cf2222e3d5c0e824b96c73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ml/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ml/firefox-59.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "59711210565b4fb45b7cb001e7315116a666819abe81ead43d8cb70604e33c2cccf5a1469ca8ae72ba2bf73a2d74e4ce024b75fcf7c2ca722ac390ce4371f2b6";
+      sha512 = "aa291245bcd21bd1e1a08f1b84346ec61311df8a9fa6f9b4af5b9cc6fcac6f332472cfe009f02faa9d842383c5e0588dd7705eaffb37c030f5e20951a4c0b2f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mr/firefox-59.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "4dddc2a3f9f646062d0c047f66b86ed8270457d7184eb8147330576eb6c9afc025e025c99bca2cba1854248777eccdf4793be94df0100a035914f8dfd1918a7d";
+      sha512 = "3bf781cc015ff35393f2d30244bc7a8c32a0ac789b0eb9da9616b1d58bb211982db2b03873a91d500f3972d0ddc32383a8e77af4b2f453d2fb8dccb71c7532c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ms/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ms/firefox-59.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "635ebb9f601898097ec59368df8050df894d086e173371479ba4a922beb829adf3ed2af05bf03dd91526ac13cf4b7092f37c6253913806708326b7ed8901b203";
+      sha512 = "705665d30a04883d1fe5791348edc2fe0aa1554cbf2932901b99ef1f4334a1ea9658574fc02c05ee64f6b2e3e8d487b8520b1f1963f285f6475af1334160e5b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/my/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/my/firefox-59.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "7d58e3be5f83d1a42445debbe02a2b4d3305c61523bf3cf8550a7d1dff5f44a8be453f2d4a487b290c61258c4d9ea1c74579d207ce1ad270f3c0dfd2f16e3b7f";
+      sha512 = "b1272fc81d358c3386cbdebad0595c7595b1d16dcee3fdef5f49776d6607f8737bdd4807140989e16873455df4a8746e00b8d3548f60cc9b22c282a5cea5a136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nb-NO/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nb-NO/firefox-59.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "61b25e6697de41ea41daa549fb087b1ea35ac756eee3a783a29d3282ddbde1b63c46848a6ce9fd9f5455806c440ed7c9e4690f2176e3214979bd8c17c83b5e9f";
+      sha512 = "b44fc5f73c1dc3625ce50c9f6058f56f874a91e04178bb179667c6fde462a2436c6b35d58155ccabf340742f03d0ac1470b56fba405a13caaec4075567b3b8c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ne-NP/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ne-NP/firefox-59.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9b10111c6ed5acd8e0e43bb91837f27e70149685ed40f274e63faa88dd6b2a984cd654e708a72c56f57f1e69fca8518be0e355113456d087256cd0cbe08bce2d";
+      sha512 = "bb063e310856adfbf3fe433d60d4fa19e8d5ace617064d334faa595cffc77d39d4e4e303b82858af8a956d43956928c7fcf70f319ce4059dae9b750d46ee3cf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nl/firefox-59.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f35f5b21ed6d88686c3411581d3fa3545e8498b04b970e2d18794b56c2b155a2006b90f71fc2e66948f3476116933f1809db403672a66c698f949b4852dff56c";
+      sha512 = "64f3cfc10133c3fb0e566422282764679f9d1587b1aa742f24e9ba77f1f45e2c1dde4cb9b97d0eb3895b745cf2037a6dda9bcec469fce3b1ee125967f2869380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nn-NO/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nn-NO/firefox-59.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "39c0202f69f5d210da4996abe072a60354b2df73266dae36d636c48df576aa7cce1a85214a0c25ff41b3ea7128cb01c2302451d16d637c4b3d8b9595aae5914c";
+      sha512 = "621c8767c5874fe530a0b4775df12be89c778915ba1f0d46271390c2208672d4211a9de501449458e88429483bf1ce453db652256c59308b3d42aa294d36649b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/or/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/or/firefox-59.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "684c2c0d6886152632f530e0f6d290f5ceef9d427cb33d5214cde5e34131092ad682f010db8b6d12470d332b4cf9c7deb0905427a363c776959a64f8958a0c24";
+      sha512 = "3c271c3e01611d8e046d44fc90ea3a13cc974ad3fe08aeb1c3fa5f18f104dd1481a5a5c9273bf21a29b7aa15f49791584b32bacd26063ffde1ea4846166d4225";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pa-IN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pa-IN/firefox-59.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "0098f298243cdd4bd114a796cd1e6325e73802d8b9d8fcdcad954c8d648de00d08efe51082bf24f66d23dce696764b745002d56ce049c68a71093ecedd4b661a";
+      sha512 = "b0f6248a44d247c7affc35c2c4e664620e6ad5b83c4135d66f803245180052e77fa84db9d05b96475a221d5c2c288b73ad23cd7c717cabf2557282d72731cf4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pl/firefox-59.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "f759cb045f817264f63f7b222c93da2dece9b8c14d9621d23798c5e924982e64da2a15af888d1ef0a6b1b2de34695f1c3e70527dcd9b9ddc069c281eb43ffc43";
+      sha512 = "75726fff593b0143a192cf3947f6c83a30c77552b227ccf2e5d0869b7a48dde22b1d555fee3baae8398b5cab58e1523ba7e15db6e237ece085b920f5fbbf4094";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-BR/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-BR/firefox-59.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "367d1ba059d2c4c9b4dbd3422e7a7d964bcaed6d066e022fbbf5c603c80e36acf81aed8c8b9cc4c076f4293a5ec5da81c3c4f9e2cfe6fddcbe0c3db6db3a67b0";
+      sha512 = "701ffb3a4dd31cb6cf50a5523a384f222b6578c2d2a2870dc1e1cd985137dc9b78e81de092b1ebaee0108164bebc94aa1a8ea12981c02d49f885d8d6c9c8281c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-PT/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-PT/firefox-59.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a7fba52997e5925bc462fe6cbfb89b642d5759f4bb0c71e07ac2b88e1d726f664a829c433be14088f32eba59474bd3da152da10602fd57a3a8a8f433e738633a";
+      sha512 = "a978e219a044b3e507ff5d907626939f8f9d0c3c988662ccdf394e613ca1127b2714c9973d90bd7d835e2af574d115b495c277f2d668142155b54e9098a285ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/rm/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/rm/firefox-59.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a009a30f8b1040e66bb6b49cbad0830e052e95c29a6b294d13f3475e0c2389d8123c20121580f503a1cb5427715d6e8eac501eb3919c894799e2eeb976d4b808";
+      sha512 = "f0f3d5e022793bc92cc84fa5f8b413fc1ae1ec9da126386283297b41e47d722b4399722f69a05aac216d46d1a1ee90a1b6fb57194284c157e68c84121d4d989c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ro/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ro/firefox-59.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "5856f65cdbc8ed9161b7a9be8d2f060ed029443bc45cf65b50ae97bd7786a069454a269ab98caff1449a6d6ce804438f08b0a39deaf047ebf024f8da79510ae8";
+      sha512 = "4995938aeb22e69a6cd8a6b37b479e9d23a140b73ce2e5c4e29e6ff4f34d702db426346a596e207c2dd2e4d1bc6f1dfea00bc7ab7a2eae763ffe9fcfbf3e00b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ru/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ru/firefox-59.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "52a7634f62b97cf2af945d9c69599f2e6e65ae56d52c1e562a28f13f8631e9a75975e37d4bf97ad2b3e50d4e4c58f0b67b6514fc34bc2034989b0ae055187cab";
+      sha512 = "32ab4f1bca6a51d204c54f4485d9642e8ccbebc008cd56e0cba55ea3a5ae5aebca050fe1e8e2b2a7fdf04480ecbab04515c0944c0d5aae0b81e350370cc2cabd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/si/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/si/firefox-59.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e87128bc44713f3d26bf97f2d5a607e63845bcf84e9016886c06ae5ca9153a42cc042e5754e4c97462bcf1079ba699e653f99761f991a0cd0d270eb28561cc54";
+      sha512 = "c2407c652b1907b3508f655c1bc831ecda75b8135dbfcaa1aed1a509a65fe2f21f22720bc80fdceede1e77c86fe39d0badf8d23f37ae48310df132c115bca448";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sk/firefox-59.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "3507a790a43da30d9ab82f5a54682d7907982a599ac88ce38f0db5940d49a45ec05093a577c4d549070bfd17f9e1fa3110e2e4fe07c8aeca338bb4486f0c7cfa";
+      sha512 = "f2a99e4f688a3384d23d36a87017ba0b5f28bfef2152867f8e8c8ca134a26e26052339c6edca1c24dfe5db5ce09d194675cac364a4918e46ae765d30ae3ab8d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sl/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sl/firefox-59.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ccc7ec548f3639f4c44b42c2c787944c243c7824210cbb52dd8662f4035e12eb1026c6ee8bfc33452f8861fef16be2684e9fc10b7b6cedd94fc1559f98278d0a";
+      sha512 = "f454a9cf5a2e1528a546a82d6c2a1f4f2a668bd2b56633216d3955ec5c1c89d8734d8cdb0ee9306698aaa5060bc5f4797a9e0fa1c8967a00fd204eb035a8ba29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/son/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/son/firefox-59.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "079a31ab92406db87653e5046b4abec632775404fd4850605fd57695d19fbd034b2b5e6de2bcb6340401bb16f0150a20ee437b881fbf23fcab235bb2cee86012";
+      sha512 = "4b020b9c0f6e9bd594afc47900025dbd2223e50668f9f43f139b00f5534487806810bc933ab0258f5fcc8c277f7c5d2411d8605dd0fbae893f5809f9cc400c22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sq/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sq/firefox-59.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c51c0631f9caf84e079bf38f842aa3f85ec8c7289483f7174109f957ee43bd998937f6bd0dc2f4db63bed3e5ee7f113af2def5ac957b854ec044f280feeabde7";
+      sha512 = "959f10db2a46cd8616686618d55119b01f0ac8e00e79093a949788ac903b6d3845a919a420d7517813e28b1227bd6f70fe8be9df39de8406743ddd7c65865e28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sr/firefox-59.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "100b80f6644759840f41d926a5d18b39adf84d626b4dc60fb7b379b0b12d4925f0ba6d223ab36081948f47b527cea3b87600688b99b280bbfb7192dd68606dda";
+      sha512 = "407e9337429d644ed75d3b2ae4953c5da3c6994e2f2ef2320becbde68662f16c711c987d4dfe2f0a784833b3c721c62cdd0080cdc1ed45a099b0c7b256411b85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sv-SE/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sv-SE/firefox-59.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3d3a400efa6288b69a42ff9a3dc61b0905250f677f4fcddbe084a562f15d8904a9233bd79c67dcdf1b7d04f7465f2f8cd5f93dfdb5e2e253697875bdda65ac55";
+      sha512 = "f59c60fbeb82cb56ddd447d4c3d4125ea3a98e95a74e7802d73eac25489f2acd4566e01397b9ee6c70260779bb895fb104ace61f2ce9268b4f3f3758d686de1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ta/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ta/firefox-59.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "de47657375144e368e8a8801b9a486ff11628d86dcc43609ce285710b0bd529df418d8644c8b97e4f1562057d1d5cf7e2bda346cb01f1d9ddb800dbf517a9d6a";
+      sha512 = "3ddc5a37d37a7db421f46d1d66d52197473f0e73c5c633ae52f12caa473ad5a4e73612a57bfc8d5d212c2b573b8308fb1b7697f78e153094230f8da64f074b64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/te/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/te/firefox-59.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "0a8a9e5fbacec8ac7473507e6304c52535f81a5b358651b87cb3412e193dfcbf30085b1b725113eceb1818e3c564de05a6a3fa5dc27cbe72b26ba9d58f2be76e";
+      sha512 = "c60cd73ec1eb27f9ab5e4ea63d3b4dc691c5c85d57a486ea408cda99f0c44c6c17e7d8e2a1de585dab1d4717bcdd7417b38b785c6f37722a3056a701163917b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/th/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/th/firefox-59.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "312ac50828b9a0fd63be8ef9341b98a3efa6fa8e358730b09e51a4553008a8a38b43306ceb65e9a6dde594c9615c0540584d0b67ece408bf4bd2f6ba19daf80a";
+      sha512 = "0ec9c7b5143268d1266e939e5ed2617edf41c99e5bddf2d4240f49b1ee2822c4c6b269a24aa607623bc82a54b501cebc1f924a9c87fac21f95108089495414f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/tr/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/tr/firefox-59.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "f07f4ec0ed1aad0de8196b7f74316156d677184c102e31e24d9b0384f8cbf4782fcd9ca847974a417d4ac596d6c9b90edc8be6b3a6440c65a39e2b760da12342";
+      sha512 = "ecf26013bc9cc189c89780c4b8b01c4f25dbc8f3f6c7bf924f528fe06ebf8c4952133e8446b3e0c8a09e3fa9d84b09883b3d4665d27ca7c028d90d3fe3d7fc1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uk/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uk/firefox-59.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6cdf07d539646c83059452750f6b70fdff5f9172fc68ac00a82a731c18cbdcb518fed4e1777d44a0ede00af0bfc8c2ccbe5c745140b6bbbeaa8916ed2f4417da";
+      sha512 = "c8595f21e86c4d1124b882ae4f1be026756b7cecb3ed5a02b4c723c37a999e2829881fab5d6349485078965881a91cfaf28bc926b5e96245e1771a9160adec76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ur/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ur/firefox-59.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a3111464bdad72fe3af763003941bb1d36de607b1df222a00fb65ed79c7b2c364657493408a634fc55bf3525d584231915970bcf31e94dbf331b65bae47fbcb5";
+      sha512 = "8d7be769c17135ad58a120cba472565597ddf05893f061e1efe2d2cf57c79bd8ec6f6a55e3271773fbc6a452e1794979cc619cc1a41d1bb13670b4f1badf4bb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uz/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uz/firefox-59.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "852f44d66be42fb6973529143f99d358ce3b5839154b70ab57d9547dcbe1d3c408df396901b57a7c05c66cbc8e9cc6f7acc4d1bc638a19ab19279a053342cefd";
+      sha512 = "cd75b674a8ff62be2abc78cfa25873950914a7ef0fb6b652c483486c8dec888bed9276c2c7b323e5787ce802583e1d140d9414e7af9ce3ffc736e38fb1521177";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/vi/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/vi/firefox-59.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b4a8662cb51660051ea0ce52156f8e767b0a465a3cf954f08b3e7eb6f55d2f48da16ac47ec8e6c431836956058df388c35437f29f3e993d2e918de328edb6ffa";
+      sha512 = "c5f9cb57563ff819236358c0ad18992f2c3f8b80decf690ec3945b029e2dbd6bc6f564af2a5bb6394eddb8a52ed0a0cab446cbd9c49284de821a814b766b60b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/xh/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/xh/firefox-59.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "a3bb908c5785995cbae70ed6bd8f819f1d7bd39073b210489d48db17132be0a28485969ce5619752724ea28eff33f7c20e532edfc260b4fcb80187755f9b3b76";
+      sha512 = "9f96977530f745eeb1cdb14b40bf657e9a3d9e322b250fab799b37d801665fa47a47aa88c1f28998a29ed69523e42f300b69e008f5d2ff7f166e12b3c1fb4497";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-CN/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-CN/firefox-59.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7c9a083e669a8412915f3423b639605fe5377945d81f21c5acc4efa19d8204b53093bfe99f3a664e7190a91b2a5eb957f561667644569cbd272ab13dcf53568e";
+      sha512 = "5f3cbcfad55017b30e72ec4fb266d5b9f822804cee329c67c5998ad44a9fb6852b32764179586862cff1dc311c9a9a84259894282d57b5d2146c1d4de86442e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-TW/firefox-59.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-TW/firefox-59.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9cfcf4928557a4158c802a20b7c63d8097fa629cb755399d16cfbd7e61c7dfc4058b3879f4840743ed25925a4a9d6ef200c7f6a40bed428915f3d3c0392deb23";
+      sha512 = "3f48bc028239f8cc8bf2f818129b1509f0e8d895087e8e7b16375df447e0d0ba7b543679a808aa579fc92bf2fc4af6c3797eacf03c905ce3714eed897a8b8f86";
     }
     ];
 }

From 9aae5d7c80514c2548c3cbeaeee232e561886cce Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 17 Mar 2018 11:00:48 +0900
Subject: [PATCH 1239/2266] firefox: 59.0 -> 59.0.1

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 7a04c0d2d42..a9a596b1a44 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -18,10 +18,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "59.0";
+    version = "59.0.1";
     src = fetchurl {
-      url = "https://hg.mozilla.org/releases/mozilla-release/archive/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2";
-      sha512 = "03yybi1yp9g29jzdfgrq32r7a0gl2jz64w6ai8219cvhx8y95ahxfznj3vm29frrp6c18dk2nlpv2s89iczwm00lnn42r7dn6s6ppl9";
+      url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2";
+      sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw";
     };
 
     patches = nixpkgsPatches ++ [

From d947db7e3cad7f4423c1679890f3d5f314bfaf9b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 17 Mar 2018 11:00:50 +0900
Subject: [PATCH 1240/2266] firefox-esr: 52.7.1esr -> 52.7.2esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index a9a596b1a44..19a16dfe3a2 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -41,10 +41,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.7.1esr";
+    version = "52.7.2esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "0275ca9c093fd0dcf09cfd31a4bca8c6ddb87aa74ace6b273a62f61079eeed11c2c0330c52c5f76aa73ed97e9cd18aa63cee69387e1fe346a30e4f9affc91ba7";
+      sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395";
     };
 
     patches = nixpkgsPatches;

From 250c19c7467d616abf5d645832f75b04c31fc6e8 Mon Sep 17 00:00:00 2001
From: Echo Nolan <echo@echonolan.net>
Date: Fri, 16 Mar 2018 19:56:51 -0700
Subject: [PATCH 1241/2266] workrave: 1.10.7 -> 1.10.20

Also: switch to GTK-3, fix GSettings by using wrapGAppsHook.
---
 pkgs/applications/misc/workrave/default.nix | 28 +++++++--------------
 pkgs/top-level/all-packages.nix             |  1 -
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 0394fa83d4a..7378a8cb476 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,39 +1,29 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, autoconf, automake, gettext, intltool, libtool, pkgconfig
+{ stdenv, fetchFromGitHub, wrapGAppsHook
+, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
 , libICE, libSM, libXScrnSaver, libXtst, cheetah
-, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm
-, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
+, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
+, cairomm , dbus, dbus-glib, gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
   name = "workrave-${version}";
-  version = "1.10.7";
+  version = "1.10.20";
 
   src = let
   in fetchFromGitHub {
-    sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
+    sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941";
     rev = with stdenv.lib;
       "v" + concatStringsSep "_" (splitString "." version);
     repo = "workrave";
     owner = "rcaelers";
   };
 
-  patches = [
-    # Building with gtk{,mm}3 works just fine, but let's be conservative for once:
-    (fetchpatch {
-      name = "workrave-fix-compilation-with-gtk2.patch";
-      url = "https://github.com/rcaelers/workrave/commit/"
-        + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch";
-      sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoconf automake gettext intltool libtool pkgconfig
+    autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook
   ];
   buildInputs = [
     libICE libSM libXScrnSaver libXtst cheetah
-    glib glibmm gtkmm2 atk pango pangomm cairo cairomm
-    dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx
+    gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
+    dbus dbus-glib gdome2 gstreamer libsigcxx
   ];
 
   preConfigure = "./autogen.sh";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..18c3625d38d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18189,7 +18189,6 @@ with pkgs;
   worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {
-    inherit (gnome2) GConf gconfmm;
     inherit (python27Packages) cheetah;
   };
 

From b17351ba2c71919811c1ab3510d11a29b53be7fc Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 22:45:36 -0700
Subject: [PATCH 1242/2266] memcached: 1.5.5 -> 1.5.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6/bin/memcached -h` got 0 exit code
- ran `/nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6/bin/memcached --help` got 0 exit code
- ran `/nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6/bin/memcached -V` and found version 1.5.6
- ran `/nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6/bin/memcached --version` and found version 1.5.6
- ran `/nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6/bin/memcached -h` and found version 1.5.6
- ran `/nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6/bin/memcached --help` and found version 1.5.6
- found 1.5.6 with grep in /nix/store/d6hf5flqvv4cw0pfbbnx8m99gs1apsk0-memcached-1.5.6
- directory tree listing: https://gist.github.com/4f05e6b4a66fc90f9ebcb02b05aead27
---
 pkgs/servers/memcached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 66e586a69d9..4668702fcee 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.5";
+  version = "1.5.6";
   name = "memcached-${version}";
 
   src = fetchurl {
     url = "http://memcached.org/files/${name}.tar.gz";
-    sha256 = "1v87gvhxih5jav20cp9zdddna31s968xdm2iskc9mqzb5li6di72";
+    sha256 = "00szy9d4szaixi260dcd4846zci04y0sd47ia2lzg0bxkn2ywxcn";
   };
 
   buildInputs = [cyrus_sasl libevent];

From 508c9b831c816929f0e8da459bf829220d2cd357 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 01:25:24 -0500
Subject: [PATCH 1243/2266] melpa-packages 2018-03-17

---
 .../editors/emacs-modes/melpa-generated.nix   | 2664 +++++++++++------
 1 file changed, 1703 insertions(+), 961 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a24cb9e4910..c91812fc30a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -740,8 +740,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "56a18467de4bc1cf408a1910458e1819102312dd";
-          sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg";
+          rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+          sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -757,12 +757,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20180222.2209";
+        version = "20180314.2055";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "56a18467de4bc1cf408a1910458e1819102312dd";
-          sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg";
+          rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+          sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -803,8 +803,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
-          sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+          rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+          sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1009,12 +1009,12 @@
     ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-link";
-        version = "20180224.2244";
+        version = "20180308.100";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "177e0f9a60ddca62cc44c2395b075cb230b26f4d";
-          sha256 = "1rjxpjanyxfrx4dfsag6g647flxvw75vf0jh6y6y0w2jdiih919i";
+          rev = "fae5d508ff519ba1fab21c51f46c0906fd82229f";
+          sha256 = "118dp8w0z475j67gvl1dj137glbli2ykbm934vdvlz6q0k94vds7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1489,12 +1489,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "alchemist";
-        version = "20171029.2307";
+        version = "20180312.604";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "38ec1faf4a9cbeb2944b517ec30d999022082bc1";
-          sha256 = "1hqr1phkm4mxzfszzraqljb32mpin1h1r26al9bazrsq2azmd5a7";
+          rev = "6f99367511ae209f8fe2c990779764bbb4ccb6ed";
+          sha256 = "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1514,8 +1514,8 @@
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "ea0d3a25ca2b45d08c510ad55b3d8a5374b2ec43";
-          sha256 = "18rfn6608sxwv8r0kdrzhag58kf1822xmy7h9gw1ci7mfpq2i1ns";
+          rev = "2582122c41cd34d034b6bbe71469f5ceb1de40c7";
+          sha256 = "11miyk48p09327ivmsk1hiw0brnx1pgjvdrfsdfhcwhbv2cafnf9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1531,12 +1531,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20180113.1316";
+        version = "20180312.1338";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "b30158d5d9e43318fa0e4a211d81fe4b2495c027";
-          sha256 = "0hylvk7ivibm8l6y21v88j1gfv8mwggdcbgw6gb4rz5ws6n0jdxd";
+          rev = "69045201a8597181509c71c770d0fbce398f0af5";
+          sha256 = "0qmrd9csa3w8a0nkrc8f4a3f67inj7hpbdwsk0883dnc7lq4lkjn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1792,12 +1792,12 @@
     amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "amx";
-        version = "20180203.1043";
+        version = "20180313.857";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "amx";
-          rev = "356393033980746eccff950c84c6e3c2984cbae4";
-          sha256 = "12ady1k621difw8b00x8ynhynkra02nkcm22s2cyzh9vv4m505zg";
+          rev = "f2b030121e59b9b3c8f05218e6c673bc6d69125e";
+          sha256 = "10369f68wzpxb01bmk35yhm1z99wj0vm5d6ivdq5n6lard5afgvy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -1817,8 +1817,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "b3f742620c17f9866f3a85ec771f4d0b239f2970";
-          sha256 = "1ycfq11x1nshv69d891am50j5zclk62krwyfgia8wk3rxmgnaj53";
+          rev = "384f1c5995a96c2687cea7cf18ff5710d00a39c2";
+          sha256 = "0qk1cd39pqjfm9hpgwm6xb205rgcka9jxfdkw3fcay3rmj3qyzws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2379,12 +2379,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20171224.601";
+        version = "20180311.2344";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "7364472a8e9ddaafdff7ad004c7a2bad42da9d92";
-          sha256 = "0sfbx63mq8pmwwb2y7w6l9hy1qr4f7d9wij6r5n7y75r19l1j9ph";
+          rev = "9b88be0c58843569dcb016550e6fad4f75847fc5";
+          sha256 = "18016zgdqa7i0vaqj9j3zkdw2i3iw8i2axyrm0579hq4hksx69w0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2610,11 +2610,11 @@
     apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apt-sources-list";
-        version = "20171004.1143";
+        version = "20180311.437";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/apt-sources-list.git";
-          rev = "842c3896f660295e4c16938aa1fd195e5d377460";
-          sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12";
+          rev = "fd12fbacf245714be5ca20563572cb49e2f1eb45";
+          sha256 = "0kfz9gj66a9wqcdrvxg4hzndmh1j01wqfqkdrblplgni4h7907a4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list";
@@ -2690,22 +2690,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    arduino-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "arduino-mode";
-        version = "20151017.2335";
+        version = "20180305.1916";
         src = fetchFromGitHub {
-          owner = "bookest";
+          owner = "stardiviner";
           repo = "arduino-mode";
-          rev = "3e2bad4569ad26e929e6db2cbcff0d6d36812698";
-          sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
+          rev = "40bc53149b517ebfa448b07f0b766f24d612f716";
+          sha256 = "0rh8rmi7y1a4myf6pa51qhr9sa1arjfbrr6rzbsdlwcbzinfj83f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e21ef938877444097d6d9cb7769819e2acb77cff/recipes/arduino-mode";
-          sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2db785f52c2facc55459e945ccb4d4b088506747/recipes/arduino-mode";
+          sha256 = "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v";
           name = "arduino-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/arduino-mode";
           license = lib.licenses.free;
@@ -2781,8 +2781,8 @@
         src = fetchFromGitHub {
           owner = "sachac";
           repo = "artbollocks-mode";
-          rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee";
-          sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w";
+          rev = "33a41ca4f8206f57e5498a526d3b0ea18d08bb93";
+          sha256 = "06a2dp6nwy8xjr01k6d2c611qr2n9m7hdkrz9fci9r4rv1ikx5xv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
@@ -2966,12 +2966,12 @@
     atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "atom-one-dark-theme";
-        version = "20180215.828";
+        version = "20180305.1454";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "atom-one-dark-theme";
-          rev = "f67722244554025db1d1ccd2a30e9fa22f8985cd";
-          sha256 = "1slk5zbwjr7jv21hxsn61ppijj6p98sqh0k0flnd4512gywdrz2r";
+          rev = "7b73ab795286fe121d23026dcc94d6a0a211e4c4";
+          sha256 = "1w5j773zg6lz8vq9yqfx2w5076h53k0narcnknni8hd8z4qg6b6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -3131,22 +3131,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
+    auth-password-store = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auth-password-store";
-        version = "20180214.558";
+        version = "20180222.916";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "6af0458a6b586cc5004fa652f23615433304924d";
-          sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa";
+          rev = "0a83b8fa074571023a10aed263d2ee7d865a49f7";
+          sha256 = "0z4pk614ndjg68z70lbc20ns9kv8r3vdayv4yy6n0jj9fvnd2pn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
-        packageRequires = [ cl-lib emacs password-store seq ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/auth-password-store";
           license = lib.licenses.free;
@@ -3894,8 +3894,8 @@
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "c1b59448e103e32202423a56c873967033778a92";
-          sha256 = "1v3swwmkmfgpylypmg6qv9bykcxqcg9d1awk8zxbwh83ys0q70sf";
+          rev = "ee8a9c3052446876057ff853369d136aea7831f5";
+          sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest";
@@ -4250,6 +4250,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    backup-each-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "backup-each-save";
+        version = "20180226.2157";
+        src = fetchFromGitHub {
+          owner = "conornash";
+          repo = "backup-each-save";
+          rev = "3c414b9d6b278911c95c5b8b71819e6af6f8a02a";
+          sha256 = "13pliz2ra020hhxcidkyhfa0767n188l1w5r0vpvv6zqyc2p414i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caa478356d20b5b0e9a450f7b4a8b25937e583a4/recipes/backup-each-save";
+          sha256 = "1l7lx3vd27qypkxa0cdm8zbd9fv08xn1bf6xj6g9c49ql95xbyiv";
+          name = "backup-each-save";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/backup-each-save";
+          license = lib.licenses.free;
+        };
+      }) {};
     backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "backup-walker";
@@ -4337,12 +4358,12 @@
     bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bar-cursor";
-        version = "20160923.920";
+        version = "20180226.1645";
         src = fetchFromGitHub {
           owner = "ajsquared";
           repo = "bar-cursor";
-          rev = "afa1d4bc1937610cc30575d71aab85ea20ebf2ea";
-          sha256 = "1cj28v48xajy1nsqk92vinaz2rh1crm5g58ma5gnibkdnkpq828s";
+          rev = "20cb59bedc3532a712fe7feeff3660ebd72a8107";
+          sha256 = "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor";
@@ -4379,12 +4400,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20180211.1545";
+        version = "20180308.1227";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "2c3f8dc0f00446376ed1d1e7776d118337e42a41";
-          sha256 = "03z477y26gwnrd1hy9ysmdqxih54adlkbvgd57m4s6zfcd6f9cyx";
+          rev = "f84ffb4d4065068f89a416f84002de92a39da1f1";
+          sha256 = "06hkpf6azjii9iiqvv3sh0vn7qczsjim9y1mk4vq3hp799ca67wh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4400,12 +4421,12 @@
     bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bash-completion";
-        version = "20170924.1021";
+        version = "20180303.1144";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "2c0b8d6a6e5cec52740b8f773297459b98f3e064";
-          sha256 = "0psp1rli7h477js25kzm00s4j5x3604ly1m3xh2w29lz8jpc0nvk";
+          rev = "6aedd690006e07199b2fcd319b9b840a527650e5";
+          sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4526,16 +4547,16 @@
     bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbcode-mode";
-        version = "20141103.1341";
+        version = "20180316.519";
         src = fetchFromGitHub {
-          owner = "ejmr";
+          owner = "lassik";
           repo = "bbcode-mode";
-          rev = "b6ff1bfb8041b1435ebfc0a7d8e5e34eeb1b6aae";
-          sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
+          rev = "653cf811460f60cb8c9489cfb3155c6493828d9f";
+          sha256 = "120g480vys6wrxhcch87jsxxvqwi31wi3dv1dckcqbxd1w1jfkzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/bbcode-mode";
-          sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode";
+          sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb";
           name = "bbcode-mode";
         };
         packageRequires = [];
@@ -4969,8 +4990,8 @@
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616";
-          sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf";
+          rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+          sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek";
@@ -5095,8 +5116,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
-          sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+          rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+          sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord";
@@ -5116,8 +5137,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
-          sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+          rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+          sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5529,6 +5550,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bolt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bolt-mode";
+        version = "20180310.10";
+        src = fetchFromGitHub {
+          owner = "mpontus";
+          repo = "bolt-mode";
+          rev = "85a5a752bfbebb4aed884326c25db64c000e9934";
+          sha256 = "03nxcmpm5n8jcca39ivrl7cjqz3gzsl3w6qc30hcp278qf2jq6va";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9e35f0e37db90d906fccd08fb25b673c88d3b8/recipes/bolt-mode";
+          sha256 = "03x89k8v0m9kv1fhyys2gwympb70qlmg7gdib8wsmdxs34ys5igz";
+          name = "bolt-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bolt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bongo";
@@ -5637,12 +5679,12 @@
     borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "borg";
-        version = "20180220.505";
+        version = "20180307.717";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "borg";
-          rev = "28abb4b602d060bba38e6f38623b2d3f309e1ede";
-          sha256 = "15iim40gzirw75h6b3alhb95x7pmzmanx6pbdrfmyw7yv4bjsdbx";
+          rev = "6b49136f37a04c5f0c328a83bb512b86f6159d6f";
+          sha256 = "1nlxdapxqdikqicyp0mq394xs7cbdkyzfw2yx1h5qww33mjl4jja";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
@@ -5826,12 +5868,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20171115.210";
+        version = "20180227.52";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "31dcf77d7c89a12f230e2b2332585db2c44530ef";
-          sha256 = "017cb8lf7zbg0jmr7zxzd7d5kz2jy35cvw5vcpdmq1fdr3wqwkgj";
+          rev = "47bab994640f086939c30cc6416e770ad067e950";
+          sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -6036,12 +6078,12 @@
     buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-flip";
-        version = "20180223.2341";
+        version = "20180307.1451";
         src = fetchFromGitHub {
           owner = "killdash9";
           repo = "buffer-flip.el";
-          rev = "443f74c1186ee91dab42812e864e7ad095f45b9a";
-          sha256 = "18ii9gd7hbfcibj7fpx9b9bz3cbpdhvy4z143hmlh3ywj2mjdfii";
+          rev = "e093360e05164c78255866c1ac8f966aa38ba514";
+          sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip";
@@ -6809,22 +6851,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    call-graph = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
+    call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
     melpaBuild {
         pname = "call-graph";
-        version = "20180226.156";
+        version = "20180309.220";
         src = fetchFromGitHub {
           owner = "beacoder";
           repo = "call-graph";
-          rev = "bdbd5130476b8ad5606e694f4310678a90bab9c2";
-          sha256 = "1a7fcpdnmjmc151d4vma9wng1m9mw102sw8qx02h61gqsg6ia8bc";
+          rev = "1c23b22b9e1a5e6484e5dfc2f4724e964ba64dc4";
+          sha256 = "1mwxxn3m5jrpa9kwm4sg0famzgxqhqgzwd93nlidkbv1vjhj2gdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph";
           sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc";
           name = "call-graph";
         };
-        packageRequires = [ emacs hierarchy ivy tree-mode ];
+        packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ];
         meta = {
           homepage = "https://melpa.org/#/call-graph";
           license = lib.licenses.free;
@@ -6879,8 +6921,8 @@
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "ocaml";
-          rev = "70eb179b20d401b2fad43d3ddfd2752fc7925ab1";
-          sha256 = "1l0qfkm9jz4yx5rpwr8bxcjpn1z1mm4zi0na6b21zbsspbmpv912";
+          rev = "02326ad0f4d0d964be89434b9b43c4f19237ea35";
+          sha256 = "09v1lasgnlv01cl1ayah183da90pcwn08fhwq0b36wk54ksymhyx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -7298,8 +7340,8 @@
         src = fetchFromGitHub {
           owner = "anler";
           repo = "centered-window-mode";
-          rev = "1234a364c9fa3a54087884ced2a7357b93fbb5d7";
-          sha256 = "1z3zi6zy1z68g4sfiv21l998n04hbbqp660khind6ap8yjjn8ik8";
+          rev = "56cb4a9ebc9a3bac7e00b4d5662dca4c39fdbb50";
+          sha256 = "067pdyzdl193pjyia8lc69s5p069kpwsrar2y221lmcvs4s164wv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window";
@@ -7382,8 +7424,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "8a24c2cb8a59bc4eba0a9271e86d078c80a3864c";
-          sha256 = "17my98032fx95kbi0hklwnk52c5n8w9npynd24255637fan46x30";
+          rev = "03ccbd8a38eef55f0801c249fc278700c52d31ed";
+          sha256 = "0ly4igpqdafmnijdlqzcrs4g4snmrp854j8vykvx7sn2wil5l9f0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7963,15 +8005,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    chyla-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chyla-theme";
+        version = "20180302.858";
+        src = fetchFromGitHub {
+          owner = "chyla";
+          repo = "ChylaThemeForEmacs";
+          rev = "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a";
+          sha256 = "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c55eebf8df165360ce1e5d18e484c90f296fe52/recipes/chyla-theme";
+          sha256 = "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5";
+          name = "chyla-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/chyla-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20180219.1846";
+        version = "20180315.950";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "88f4fcf1d39a13ff336657b2cc4161ebb9d955d6";
-          sha256 = "13yl09chl8j5n3mlwb25ipxgi4a3cfs8822lahkisjv42n62f234";
+          rev = "0ca04ebceeabda645dd9bc584b4683fe3b2ea317";
+          sha256 = "0fxd77cls2g5iq1r09zgf7iqznldbyi3y989wh27sjzqnjdw8k7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8134,12 +8197,12 @@
     circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circadian";
-        version = "20171215.1403";
+        version = "20180307.954";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
           repo = "circadian.el";
-          rev = "bb49da54b2fb57524066e54ffee27cb9549ec925";
-          sha256 = "0ra9cs407mz5243ymf4qsr92sly0k5gfl24xgdmxczg35w8hn31l";
+          rev = "26ffd83a5931bb3fb04f01cb780715a05c8dd33e";
+          sha256 = "0z8jkbycvia8ha1yv9v8zrcpqn0jqlb5myqx3qcvykn9yysmv2lq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@@ -8449,12 +8512,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20171117.317";
+        version = "20180316.1000";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "408ab1f13b8d956dd8d2c839bea5197175ef5a93";
-          sha256 = "0iqq74w65dp88y1iqc5rx7i4489ksr8lfmnjqrmwmzqzmax53nld";
+          rev = "2648558b4c27fccbd71ca679ff4bf9b9150c6c60";
+          sha256 = "1kfs1y3cwazz118ll18hyvw4wdms4byzj3z9i7kriys46lsgd05y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8629,12 +8692,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20180202.922";
+        version = "20180313.620";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "5cf0fd9360dc5a9a95464601319062673d213807";
-          sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw";
+          rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23";
+          sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8654,8 +8717,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "5cf0fd9360dc5a9a95464601319062673d213807";
-          sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw";
+          rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23";
+          sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8692,12 +8755,12 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20170713.2310";
+        version = "20180314.608";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68";
-          sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5";
+          rev = "6068dca90467a0f4ebc2cd39338a173d6f5ddc04";
+          sha256 = "0vvadcydpsz4b17dlm1jd4fbddzfqibh3mlzv3k4gvp67vv10cqy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8860,12 +8923,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20180212.258";
+        version = "20180314.1546";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "91dd693dca350d0744fcbaa2b5a36029fb17adcb";
-          sha256 = "1gy32n8xslgdsrw9riiy1rf5pxsqiwp7is71qc6z2qp2fn2dr83j";
+          rev = "4fe0a65235c3202ab6a5a6c72c91e20b43f9dd65";
+          sha256 = "0c8xcrjgyk86zk18sqbknlihwblj53h4xjjdhrf26gp28j6hrbf4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8885,8 +8948,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "25613b9fa46e6433f987e9e9f47533db3a0939f3";
-          sha256 = "1pnyx2niscm7bs2n48xxlxdfavxvb40vl0sm0j5m8vp9ybl11g4m";
+          rev = "c824b6c667cdcb978d6ed52ca5d19fd0b6bfde27";
+          sha256 = "0p2y9y2f238pns1az6ig204lj5cqq4ala0am6dc8sdidlf8m1x1z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8986,12 +9049,12 @@
     cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cobalt";
-        version = "20180222.1938";
+        version = "20180304.355";
         src = fetchFromGitHub {
           owner = "cobalt-org";
           repo = "cobalt.el";
-          rev = "b542c4172ef41bb1d50e1b1dc712acf50c2392d5";
-          sha256 = "1614m2m19wa6awvaz8akakbm2kbvj55s2lh7k3lgysaw007wbi1d";
+          rev = "634ace275697e188746ca22a30ff94380ec756be";
+          sha256 = "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt";
@@ -9217,12 +9280,12 @@
     color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-identifiers-mode";
-        version = "20170814.1121";
+        version = "20180308.1739";
         src = fetchFromGitHub {
           owner = "ankurdave";
           repo = "color-identifiers-mode";
-          rev = "5750ee9e1ab8a6890381bb461982113b1eb98879";
-          sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql";
+          rev = "e9705815cc547293fbb1c5cdac5ba90391a82878";
+          sha256 = "10cqkn4y40qwzkv9vsa5zlsqh851xacjvccw4l34piasbvm7q0hy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9364,12 +9427,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20180210.2104";
+        version = "20180302.1412";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "17bfc80dec721914299b50ef48ce47a5c18bb6b0";
-          sha256 = "1jlkpp027xfsgyw5kw9wigwxrlgihj01x76rpp2mly9pghggx6mb";
+          rev = "1d67e4a4da74323f42c1f70c8bb7dbb9feaaf4e6";
+          sha256 = "0pywpvp1ak4qp98z81qwxdd67yz8sbk8n41hv454y7jnrwxjm0w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9406,12 +9469,12 @@
     color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-x";
-        version = "20160924.854";
+        version = "20180226.1646";
         src = fetchFromGitHub {
           owner = "ajsquared";
           repo = "color-theme-x";
-          rev = "7cba227f8bd4c82269405848550a4f4475057c65";
-          sha256 = "053dq567iy9hkidsx76wjzgnq91z4gncx4870cj5lyp6j4g4mc8h";
+          rev = "6c2264aa6c5d9a72caeae67ebaa4472090e70350";
+          sha256 = "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x";
@@ -9637,12 +9700,12 @@
     common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "common-lisp-snippets";
-        version = "20170918.356";
+        version = "20180226.723";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "common-lisp-snippets";
-          rev = "cd46223fbc6ee99372a25ba455ffec4354895e45";
-          sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is";
+          rev = "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6";
+          sha256 = "0zalsvs47hv33dmbs94srpb8q354sr52sxbad182p69dn1khlwyp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9658,12 +9721,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20180225.1741";
+        version = "20180315.439";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "a64d52ca033208cda34f2fb7d0a2f951cce8bd29";
-          sha256 = "1n44f9kbmp95nbsyp4g60d6pi044vxy2ccai9lgkjm3wlg7xdzrd";
+          rev = "67650dee565c57568d22065041326a58eb0f891d";
+          sha256 = "1307v1b1dk0m95ds69b66jrpapz06mwq15awmyk6vf54h9hpbm6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9750,12 +9813,12 @@
     company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-auctex";
-        version = "20161025.24";
+        version = "20180226.2248";
         src = fetchFromGitHub {
           owner = "alexeyr";
           repo = "company-auctex";
-          rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3";
-          sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw";
+          rev = "d98ac778658ce242e70bc30f1350a93582473bd6";
+          sha256 = "0jfy96xyhsvpvwn467aq9fchz1wnyqrmr35mz4i76lykirsb93aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex";
@@ -9875,12 +9938,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20180219.751";
+        version = "20180307.510";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "e2bbd06af9661628198d12e7b4725a17ef260dd9";
-          sha256 = "01qyy4037isa5ghy7gwl77byydn3s5mc6pvd7w79910cg5h60dkg";
+          rev = "c2bd34f79472c27ee6f819820558c8b26f774748";
+          sha256 = "1dvd7w93gly70x7j7dsn2n90w7n76k2bp96p4zlzxad94kvdj2a8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10411,8 +10474,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "56a18467de4bc1cf408a1910458e1819102312dd";
-          sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg";
+          rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+          sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10564,8 +10627,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
-          sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+          rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+          sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10956,6 +11019,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }:
+    melpaBuild {
+        pname = "conllu-mode";
+        version = "20180304.637";
+        src = fetchFromGitHub {
+          owner = "odanoburu";
+          repo = "conllu-mode";
+          rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c";
+          sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
+          sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v";
+          name = "conllu-mode";
+        };
+        packageRequires = [ cl-lib emacs parsec ];
+        meta = {
+          homepage = "https://melpa.org/#/conllu-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "connection";
@@ -11211,12 +11295,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20180225.744";
+        version = "20180308.1121";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
-          sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+          rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+          sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11250,6 +11334,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    counsel-css = callPackage ({ cl-lib ? null, counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "counsel-css";
+        version = "20180302.236";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-counsel-css";
+          rev = "0536af00236cdce1ed08b40dd46c917e8b4b8869";
+          sha256 = "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/519a05a9f0e43f3e1dfac75759346476bfc40772/recipes/counsel-css";
+          sha256 = "1sckfq8kv68q1anqmslrvhcf83m7b5r0clny6q33b9x0qypkv9xp";
+          name = "counsel-css";
+        };
+        packageRequires = [ cl-lib counsel emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/counsel-css";
+          license = lib.licenses.free;
+        };
+      }) {};
     counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-dash";
@@ -11274,12 +11379,12 @@
     counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-etags";
-        version = "20180222.2023";
+        version = "20180304.58";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "9d70490b551503aac22241c8089a46e55dd3deba";
-          sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff";
+          rev = "e97902f9947c663372698affd1577a8d23876561";
+          sha256 = "1i0gb11x70nj4zp6mdqc91nd9812wsbfkpg94fssgwyqa0dqkb29";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -11358,12 +11463,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20180217.2349";
+        version = "20180316.1608";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "bf98fbd1988885e82129823bf189b777dd52a084";
-          sha256 = "0z940554lqsyrj1wljmgl4najrxpv4d6kqf5n60a6sj630ak0blc";
+          rev = "d428d08015f83fe91c058abf7f1fa95657e90483";
+          sha256 = "177w7v9hxx7p5l25hap4n4x8axzvp019a4xhkla8r1i821bxbqjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11421,12 +11526,12 @@
     counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-tramp";
-        version = "20171224.321";
+        version = "20180311.2327";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-counsel-tramp";
-          rev = "6efa0e6e204d08d5b8b8b66f7e3ae7f07d5a3665";
-          sha256 = "1byskmvhs0vdj08xjnds8zczw19d2kmnsym514c56k3a0v7g1ldz";
+          rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa";
+          sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
@@ -11484,12 +11589,12 @@
     coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
     melpaBuild {
         pname = "coverage";
-        version = "20160222.114";
+        version = "20180226.2057";
         src = fetchFromGitHub {
           owner = "trezona-lecomte";
           repo = "coverage";
-          rev = "d68e5d20108e280b11a802a671bd009c7dcfff89";
-          sha256 = "0glnvr10lwi17g44653qqswn9vnyh5r2nmpaa0y6lvfb952zn0k0";
+          rev = "c73d984168955ca0f47f44b0464aa45282df42b6";
+          sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage";
@@ -11610,12 +11715,12 @@
     cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "cquery";
-        version = "20180226.428";
+        version = "20180314.2158";
         src = fetchFromGitHub {
           owner = "cquery-project";
           repo = "emacs-cquery";
-          rev = "0b70a10869581a682ade3730442881250304a331";
-          sha256 = "01jf77m3d8ydrnjms62c6zn2xwfcs3wadk7wcc73qrsqz99i81ba";
+          rev = "f38c4b996877b5a0f5f7619bf46b268b64ef4e3c";
+          sha256 = "06s4qjwj9ikbxip84kjvs7yzdax19bp56hikzlmayzg6idbn9ld2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery";
@@ -11841,12 +11946,12 @@
     crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crystal-mode";
-        version = "20180104.1920";
+        version = "20180306.1821";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
-          sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+          rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
+          sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
@@ -11925,12 +12030,12 @@
     css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "css-autoprefixer";
-        version = "20180118.1411";
+        version = "20180311.900";
         src = fetchFromGitHub {
           owner = "kkweon";
           repo = "emacs-css-autoprefixer";
-          rev = "a694e7e725074da99d90b18dd166707f1649bfae";
-          sha256 = "0cd4i9xbc7rqsmaa73gj4p9za3g6x6xv54ngnkf6vprpg3g7lb6n";
+          rev = "386a5defc8543a3b87820f1761c075c7d1d93b38";
+          sha256 = "0ymba9bhzfi7kkrha4d4sn0hrc3sid4b5k8lhakwwdwafhym0jjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer";
@@ -12370,8 +12475,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "cf70c10744aec43df0708f5ee3d692d378fc31f1";
-          sha256 = "03ka1lnw4qdg5lzlimdg8w1gynmbf66wvr7iplgszf752cg1q01i";
+          rev = "93843b9469d164a7e98962f8f0645b93b2f7442f";
+          sha256 = "1n9g9h3pn09mfbwlq2grqjxmwhrm34wkchshhpbswngbpc0m10gk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12412,8 +12517,8 @@
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
           repo = "Emacs-D-Mode";
-          rev = "398f1854d53863185e60873b494eec0263bdd0dd";
-          sha256 = "0xka4k0j0rl4kjjyzryx7a7ngf9qzry148nhpzc66yirlrp5hjn8";
+          rev = "8d0ed0460189d0e91fa454866c1ed7b9b36f99e2";
+          sha256 = "0pdg6s10vcr95r2azin1svkdgn8grlgwi4di30d0f3vcq8jmmfhi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -12468,6 +12573,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "daemons";
+        version = "20180310.1147";
+        src = fetchFromGitHub {
+          owner = "cbowdon";
+          repo = "daemons.el";
+          rev = "75b54be70a909282b20c872b5f01d30e18e19f84";
+          sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons";
+          sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr";
+          name = "daemons";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/daemons";
+          license = lib.licenses.free;
+        };
+      }) {};
     dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-light-theme";
@@ -12765,12 +12891,12 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20180206.2124";
+        version = "20180310.1317";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01";
-          sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy";
+          rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08";
+          sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12811,8 +12937,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01";
-          sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy";
+          rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08";
+          sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -13080,12 +13206,12 @@
     decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decide";
-        version = "20170702.1617";
+        version = "20180316.1101";
         src = fetchFromGitHub {
           owner = "lifelike";
           repo = "decide-mode";
-          rev = "90133687118c236142b8110571c463304b3192f9";
-          sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s";
+          rev = "257f0e39ac60ca375942950b44eeaee04cb9d961";
+          sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
@@ -13650,8 +13776,8 @@
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "dim.el";
-          rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445";
-          sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4";
+          rev = "79b81724b951fedffdd3113f473c18990af837a9";
+          sha256 = "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim";
@@ -13772,12 +13898,12 @@
     dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-atool";
-        version = "20160208.433";
+        version = "20180302.2340";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "dired-atool";
-          rev = "f188ccf6092330dbbefc0e75aa4fad3e7258749d";
-          sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf";
+          rev = "b92e0106827d34fa686e189c7e9a537a3a947a8b";
+          sha256 = "1i40zd7y1jf9skr3wi2zqv4awrgff244p1h89r707aq67v1j19yk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
@@ -14192,12 +14318,12 @@
     dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-sidebar";
-        version = "20180218.1717";
+        version = "20180312.1715";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "dired-sidebar";
-          rev = "e43864a70ee240bf8dcaddd7bb88b77c6e1e9fe6";
-          sha256 = "1s70qlm1jxq7larwq5gr2zc58q4qxch5f2qk6fzqwkpcvsvlv304";
+          rev = "df9d46615930ad3709303babd45bc12b96d0945c";
+          sha256 = "0yj0jlm695v1kzdlvi0lqa0phafvgn1y9bwbin5cikygvn2wjjxw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
@@ -14339,12 +14465,12 @@
     direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "direnv";
-        version = "20180213.1238";
+        version = "20180307.748";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "5b55dac12467689083ff995777f54a304ff47be1";
-          sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn";
+          rev = "78bb6894348b1d958aa8947837db4b3bceaa55bb";
+          sha256 = "1i37pylq6gh9144vhf0lxqnkzcwqhaq7vm18f64qajvcv3rj5s84";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -15081,12 +15207,12 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "20170916.1438";
+        version = "20180311.611";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105";
-          sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h";
+          rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265";
+          sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -15207,16 +15333,16 @@
     doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom";
-        version = "20160121.722";
+        version = "20180301.1508";
         src = fetchFromGitHub {
-          owner = "emacsorphanage";
+          owner = "kensanata";
           repo = "doom";
-          rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
-          sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+          rev = "e59040aefc92dd9b3134eb623624307fb9e4327b";
+          sha256 = "14lwq30m0s7pkwkbn6vm5gdlkww7sszc6pdhxyinkhj67b0bxpin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e41ed64142be89a62fddeceee5e39603a18525c/recipes/doom";
-          sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom";
+          sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5";
           name = "doom";
         };
         packageRequires = [ cl-lib ];
@@ -15228,12 +15354,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20180219.1227";
+        version = "20180312.1228";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "aa57d222b65a4dc9dddd76f66adbe6ac003f57a6";
-          sha256 = "05chhg1mpnp3jqjgwwsnzkh19ci4429sgq9xpx4jxfbbalhd4z11";
+          rev = "933bf2a006c5de611e03d377b967f213e285c296";
+          sha256 = "0lcxglnq5zic2hbjwc67x60dqk3j65rsschhwvxcmcmcyfg0whfi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15249,12 +15375,12 @@
     dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dot-mode";
-        version = "20161025.1037";
+        version = "20180312.1600";
         src = fetchFromGitHub {
           owner = "wyrickre";
           repo = "dot-mode";
-          rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc";
-          sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9";
+          rev = "6ca22b73bcdae2363ee9641b822a60685df16a3e";
+          sha256 = "10lmwra48ihxqxyl54m3yn1zy0q5w6cxqd2n5pbs4lva1yck0z4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode";
@@ -15652,8 +15778,8 @@
         src = fetchFromGitHub {
           owner = "jscheid";
           repo = "dtrt-indent";
-          rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27";
-          sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg";
+          rev = "7019ecd7f20428cd33d96a25934416adc28e4159";
+          sha256 = "0vb3fhi361v4kjyhvmax60550f3xkkkm2fyhi3ssjq21cq0k923g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -15732,12 +15858,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20180225.1541";
+        version = "20180228.2206";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "65b9a3aea2bb212cc83d2f9414d0897331278000";
-          sha256 = "14g99l038f29wh66ybfi99nvk1niqkk613j0rz7hkw9l0y912m2k";
+          rev = "260054500d4731c36574b6cbc519de29fdd22f43";
+          sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -16109,12 +16235,12 @@
     eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "eacl";
-        version = "20180204.1911";
+        version = "20180308.1656";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "eacl";
-          rev = "0e4d4e016caedbfed8dea0e700a33a043e798029";
-          sha256 = "06dcv3ws91ldld3qjpbpp5j7jnjp0s8ng6g7w8wj0rspjbcb2dg5";
+          rev = "80113a9f6cc246cef67e3e20ec052788c38ab116";
+          sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
@@ -16169,22 +16295,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20180225.2153";
+        version = "20180312.352";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "336fb8ec510c10596d65bfd50f65b59e2f7711e9";
-          sha256 = "1bkd3q8lr9admpipad1vi42gvs1sv7l7rzgi6dhl799zq1691kd3";
+          rev = "b14dc7f9d0da804daf8219fea48604b192a4389d";
+          sha256 = "0y1d1vpqbdm86y52fd97l64zfnl4g428h30152mamhmbjzjsi0v5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
           sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
           name = "easy-hugo";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs popup ];
         meta = {
           homepage = "https://melpa.org/#/easy-hugo";
           license = lib.licenses.free;
@@ -16197,8 +16323,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "b3176d34f1e2850ab96795e264da6e05e23e280b";
-          sha256 = "175by3aswpd00lhin69f2jkb1aqi487vzk3qa6wqp41hjpga6fag";
+          rev = "e7016084c6212e393496cf19fb5e519c380227ba";
+          sha256 = "0jpg31z7f2him4lcnazknx9lpipf1nbqvhaqr5razkckq71llq18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@@ -16982,8 +17108,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "a41addef812318bb6bc0a693ce3a22606f27a3cf";
-          sha256 = "1303m6d53qdkv3j7bx708ipvrjb4mjdj1b58600x8471bddamgh3";
+          rev = "9948d6a1933af7af45621c9521d7a124c715191b";
+          sha256 = "0j2026bnz5wjcw9g1kbgjddapv0hnfmfiv1aab24ffh5s1mr8gnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16999,12 +17125,12 @@
     ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "ego";
-        version = "20180123.2256";
+        version = "20180228.1704";
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "ec91e8234e2b8fbfd37b6135dfda352a923c556e";
-          sha256 = "1m98zkmyy1bbcz7jpa15in9kdgskl3l498q7a9vxpr8w2scq3cls";
+          rev = "719809679c1a60887735db41abae53b61f08ef59";
+          sha256 = "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego";
@@ -17060,12 +17186,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20180226.416";
+        version = "20180311.1029";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "7a52ebca3527d891ecb7e8a3e46785b271717acc";
-          sha256 = "01ifzww8gs4qy9yrhhf5dm0s3ifrlppknvllkajfp6lh9hc7q4cx";
+          rev = "115c16eb9f38447790a75c71e67036c5f4be15e0";
+          sha256 = "112wnfhn468gfgac1vhclm6lycsp904wmf60akcng71fqgvyzcda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -17133,12 +17259,12 @@
     ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20180215.627";
+        version = "20180305.1047";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "ef19d5e33b632d776e9e369281c522e26e632384";
-          sha256 = "1q8gh79rfcn4v8ps4z3a0s60qr5nf9j93p0mkq0fdll57h2y6cbz";
+          rev = "dad0777b7dbcdee8d16134b565924a9081806ae8";
+          sha256 = "0cmkcnz2mqi3qdcl6srrdzp1yxk6qvm0dk413wkx1grx5gqs1vpr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -17179,8 +17305,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "129789cef476279a7840647a5bf39aa5cd2bc2f6";
-          sha256 = "0b20s3bc92jwi4xl2fralj0ffdj1zvagbmnsp2dw5cj94dhm33p1";
+          rev = "93fb44441b18b67d61400ca5f63e3194c34181b6";
+          sha256 = "0w9iiwnbrk18si064q433f89f8xf5b2lk5zxx1b3nrawbbk76k1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -17427,12 +17553,12 @@
     el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el2org";
-        version = "20180216.2005";
+        version = "20180311.855";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "el2org";
-          rev = "742b2e4de42026edbff20dfcc6f63200c1d0ad40";
-          sha256 = "0ji8ngf6zzhhq2vhn9i04dpgg1sgqcs0vzq7wdyfl9cfa0cpwlps";
+          rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f";
+          sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -17448,12 +17574,12 @@
     elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "elbank";
-        version = "20180215.556";
+        version = "20180316.627";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Elbank";
-          rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5";
-          sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb";
+          rev = "28143b3076f2ac64a9db84a53e9af0ad43fe4322";
+          sha256 = "0gdhdq3g34m1jqpq4m12pbf70sl5jrmj8wbakj36vh540p12f0ph";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
@@ -17490,12 +17616,12 @@
     elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elcord";
-        version = "20180203.1417";
+        version = "20180306.1515";
         src = fetchFromGitHub {
           owner = "Mstrodl";
           repo = "elcord";
-          rev = "a97824ead7c63fb114a9f34ed46a8401407fb4ea";
-          sha256 = "12mjmdr5kwmgpihnc943widbbw5pcp0gw1mcjf06v4lh0fpihk7h";
+          rev = "3071250488613d8dbd79daf81ddbe3bad4b87001";
+          sha256 = "0lcs0713r4vcln2im53mkfwcibr3j7ygs467rfgf163kd979gp5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord";
@@ -17767,6 +17893,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elgrep = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elgrep";
+        version = "20180302.527";
+        src = fetchFromGitHub {
+          owner = "TobiasZawada";
+          repo = "elgrep";
+          rev = "5e982024250e75fe02aee358a542ae3ed2a472d5";
+          sha256 = "0bkiay3mmk00lay2cv91qmas346ffhb2nlrg6xw083s5vk45fbbv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
+          sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j";
+          name = "elgrep";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elgrep";
+          license = lib.licenses.free;
+        };
+      }) {};
     elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }:
     melpaBuild {
         pname = "elhome";
@@ -17788,6 +17935,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elisp-def";
+        version = "20180309.1434";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "elisp-def";
+          rev = "4c300ea67594892171076f49df7c56f25e35d0ff";
+          sha256 = "15kqlf87nxy5vnny5l6jrfj28mxz97w07h6bmj1n1x9lwxbd830n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def";
+          sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz";
+          name = "elisp-def";
+        };
+        packageRequires = [ dash emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/elisp-def";
+          license = lib.licenses.free;
+        };
+      }) {};
     elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elisp-depend";
@@ -18190,12 +18358,12 @@
     elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-mirror";
-        version = "20180113.2321";
+        version = "20180228.1636";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "elpa-mirror";
-          rev = "3fedb1ca6f84cdbfc27723d6906b67a0e2ca2972";
-          sha256 = "087sa553aqyphrdrn8clb8pjl609aw3qkmim47hvnq8npzvhhr0l";
+          rev = "6ca78e3fb69ef582da1a01f1d193e07ae8223142";
+          sha256 = "0s0c5qqg1cl63kig7kc4fx9rz4kgchxc3w3ywgh5csmgwlkpg0id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -18211,12 +18379,12 @@
     elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20180223.1119";
+        version = "20180314.1340";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "0c51b0d3aede3e3e3d2107ea86d133c669220948";
-          sha256 = "1404r7al2rndy2nqfgdm2iw37mn2dr9hb51fr5f0l0w34mhfhyji";
+          rev = "2f4388f949482a4dd83b2dfc408dd94f72edd3d4";
+          sha256 = "1mbv1xr015pimfqx108gcnpq9ah974h8lbhc9rkb866rbwsfrnss";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -19477,12 +19645,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20180221.1318";
+        version = "20180222.1622";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "5d0bf705ccb617fafe28f2748d566d2a990aba06";
-          sha256 = "1igiwnvl3w907hz83x8hwf298wdv86s5c54zs4naw1pbi875j7zw";
+          rev = "bc78f600b2c451bc8df1cf73bbb14476c11ece1d";
+          sha256 = "0w4c3j5pnzn6yisfb02s2aw8pzhqlkmidzk0yxfalgn8gmqbz57r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19582,12 +19750,12 @@
     eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "eproject";
-        version = "20151205.2130";
+        version = "20180312.942";
         src = fetchFromGitHub {
           owner = "jrockway";
           repo = "eproject";
-          rev = "fdff000d601eb8bdb165db3dc4925c6797308b78";
-          sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
+          rev = "068218d2cf2138cb2e8fc29b57e773a0097a7e8b";
+          sha256 = "110b8gn47m5kafmvxr8q9zzrj0pdn6ikw9xsx4z1rc58i02jy307";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7e82668617a9b599f8994c720f3f123ba1e008a/recipes/eproject";
@@ -20043,12 +20211,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20171219.305";
+        version = "20180302.427";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "1c7938bc9539f1c06b5493ced9f265e05a4824af";
-          sha256 = "0vrrxh4ngbmsr2iaw5hqr0xf43vnbqghql2sm9ffm0zh6snd4kag";
+          rev = "bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee";
+          sha256 = "0f93f2w0c8gclvizh4vlkfii7y07ca7fqr40wqgs1bqjdqw9b9cv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20130,8 +20298,8 @@
         version = "20180208.935";
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
-          rev = "b335d7fb84d6af381a5dbc40c324078faf397b66";
-          sha256 = "0nbpqhpff3my4ndsf148iqgnl84ilsbq6na5jnn3nddyhbmidcxb";
+          rev = "e0cd3c21292e4a80fa8a9648981b61e62a996e80";
+          sha256 = "0i6962j2k6qmdlrw2m5jv2pyxvciyawd954q462nv64cddaa5581";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -20672,12 +20840,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20180216.1616";
+        version = "20180314.612";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "f10792493602cb5c77a7010b1b4c7063c7c41add";
-          sha256 = "03spbyi24gpmw7wlf0aifg0aa793sm0s1lxk9xw2lm974rj0g6w7";
+          rev = "87034e808c5279d73d666797971fac505215fd7f";
+          sha256 = "0ycgid2b74f07wc97ywwr5rkk4hxxwhc4zly9xfqa75ngrj993z4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20840,12 +21008,12 @@
     eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
     melpaBuild {
         pname = "eterm-256color";
-        version = "20180202.1722";
+        version = "20180308.1615";
         src = fetchFromGitHub {
           owner = "dieggsy";
           repo = "eterm-256color";
-          rev = "72b2d650a173c39648f1cb0f2b68fab5a6886d79";
-          sha256 = "15vj55l71v9yzl7cw4yw7lc71045xa3y6q0hn8a5pmakmb6fiwdf";
+          rev = "dab96af559deb443c4c9c00e23389926e1607192";
+          sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
@@ -21029,12 +21197,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20180222.1032";
+        version = "20180307.109";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "3bf198796b2d135776143eac854e8d855cd94475";
-          sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4";
+          rev = "90b41a21a31e99d4153c536f1a04a69b73d96360";
+          sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -21176,16 +21344,16 @@
     evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-collection";
-        version = "20180226.21";
+        version = "20180313.1759";
         src = fetchFromGitHub {
-          owner = "jojojames";
+          owner = "emacs-evil";
           repo = "evil-collection";
-          rev = "7adf05cf25b022197c0542920ddc65acdae1703e";
-          sha256 = "1cxsi0aqm2fd344q6nlahhg0q2bf4k6gagi6sxsvjlhwvb80skxq";
+          rev = "4d3f755884a93132659976c510fdc90b2b98622c";
+          sha256 = "05lwd9c2hdd8pdd5vy2f8h3q2djj4zpp4dfwbqqrgqkhw0wavg7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection";
-          sha256 = "0wxx6x9lxlnxaa3i36gj4nad3q8c25mbw17bp4aa0agh43yk4bgn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection";
+          sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy";
           name = "evil-collection";
         };
         packageRequires = [ emacs evil ];
@@ -21344,12 +21512,12 @@
     evil-expat = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-expat";
-        version = "20171125.752";
+        version = "20180302.657";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-expat";
-          rev = "ff443637fc514813ed3139d99950391189a9360a";
-          sha256 = "1w1yj0avg54gl7a143ib3rszi0a6arrvcb3s8j5pjr4hs7sy9jbd";
+          rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d";
+          sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat";
@@ -21617,12 +21785,12 @@
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20171213.1019";
+        version = "20180313.931";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-magit";
-          rev = "4cdfbcd13075869c238b2253a64668736a16880e";
-          sha256 = "148k9ssq8arlvkvacjxwpyg3g8i961ab6wcgg92jmxwl7ir853yf";
+          rev = "69dfa5a06e8a4024803223b9873ea5d591a97294";
+          sha256 = "1kd09z4qxcanvxnawhczwp3y61kn4gnaaji9chqrny633r8j64jk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21743,12 +21911,12 @@
     evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-multiedit";
-        version = "20171217.2317";
+        version = "20180209.1819";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "adcadd09c9f628a65d73a140c37b649c3415a3cd";
-          sha256 = "1iz0hd0h4y9crqwbq7ysnkgvwqhd9vcjcca8hk2506cks8sab73q";
+          rev = "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d";
+          sha256 = "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -21827,12 +21995,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-org";
-        version = "20180116.1347";
+        version = "20180309.252";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "491b0b302b95d44ceb73d291dedbb9d5517ccee2";
-          sha256 = "04lyp4z0vr8imjwrqc88d1pdpl86wgwn19vzl6256yl63xaipvf2";
+          rev = "79c8e067bbc31ead51894a28492f28cf3a103808";
+          sha256 = "02qdsc6fzcxmblvlg0zpznzfi8xkmc4rr44zdxgw462xyfk2fwrq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -22016,12 +22184,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170903.603";
+        version = "20180228.2218";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "69adb46546a871beb54a445cb22652ac276555c1";
-          sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc";
+          rev = "5de756fc02108cb2360908f6ec5e9630492ef422";
+          sha256 = "10ch2xkw3ca3g190344jw9wsq297sip9nh12wmd8wxgsnqjlfzfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -22058,12 +22226,12 @@
     evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
     melpaBuild {
         pname = "evil-string-inflection";
-        version = "20171225.1815";
+        version = "20180313.1055";
         src = fetchFromGitHub {
           owner = "ninrod";
           repo = "evil-string-inflection";
-          rev = "f13a4aab75e5d50c0c63c126c4cbc0067d452d85";
-          sha256 = "1i4vc8iqyhswa77awczgqi1vqaxx8png5is1hwisxf0j9ydsgw4c";
+          rev = "00b62fb82de36e9c7b44bd644c7e11ae88f35f62";
+          sha256 = "0f24722vl3sqri389hi6qj7hhfalqpjvyq4ain5hhr0gsx2dznw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
@@ -22167,8 +22335,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "3bf198796b2d135776143eac854e8d855cd94475";
-          sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4";
+          rev = "90b41a21a31e99d4153c536f1a04a69b73d96360";
+          sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -22433,22 +22601,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    exato = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+    exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exato";
-        version = "20171127.1736";
+        version = "20180305.242";
         src = fetchFromGitHub {
           owner = "ninrod";
           repo = "exato";
-          rev = "5b709c128680d4dc5ac4c11253eab94a1e38bcbc";
-          sha256 = "0ins7z1a3np7h7l2n7syhj10hm01v0gxn0m8kzjim59x57l0l3wb";
+          rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6";
+          sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
           sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
           name = "exato";
         };
-        packageRequires = [ evil thingatpt-plus ];
+        packageRequires = [ emacs evil ];
         meta = {
           homepage = "https://melpa.org/#/exato";
           license = lib.licenses.free;
@@ -22687,12 +22855,12 @@
     exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20180225.1531";
+        version = "20180227.257";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "d26d719d95b3b3296e113d89ef36972312610f4e";
-          sha256 = "0n0b7gxamizmkm2gz1ghyg36i7wvy5ims63nzjgwhbrc3ifig6cn";
+          rev = "4f7946db67d6599baba6b3961e8f543a68707742";
+          sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22926,12 +23094,12 @@
     faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "faff-theme";
-        version = "20170522.1219";
+        version = "20180315.1304";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "e79dc142d99bc5a455a46345d3aba6f95f3f3f42";
-          sha256 = "0j5vdbwwpav09v3kkx7cn5qd41inam0jd7smx8133hqpnirsh8mv";
+          rev = "abbfde9311a2b0562541d2bf455182d6197f8c48";
+          sha256 = "15x2lb41df0kvlvncqp7m4a97yb7m4jhpgb8hp35if5cgp99xmbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -23679,12 +23847,12 @@
     fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fish-mode";
-        version = "20180117.1847";
+        version = "20180306.818";
         src = fetchFromGitHub {
           owner = "wwwjfy";
           repo = "emacs-fish";
-          rev = "276db7de3c86411fbe3117f30272c5882b24a69e";
-          sha256 = "04srqfndhm6f190l7jfcswhd84xkw6vi09s6kv8bjwrk8iiy3qm9";
+          rev = "bac709ac1235751952d6022dddc6307d9135d096";
+          sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -23788,6 +23956,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flame";
+        version = "20180303.1216";
+        src = fetchFromGitHub {
+          owner = "mschuldt";
+          repo = "flame";
+          rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0";
+          sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame";
+          sha256 = "1br9c48anscq9vbssr0gq8f5kbq755hjaglbljwwh9nd5riycv5v";
+          name = "flame";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flame";
+          license = lib.licenses.free;
+        };
+      }) {};
     flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flappymacs";
@@ -24063,12 +24252,12 @@
     flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flow-minor-mode";
-        version = "20180204.141";
+        version = "20180315.1124";
         src = fetchFromGitHub {
           owner = "an-sh";
           repo = "flow-minor-mode";
-          rev = "9a90436f9208a8f4796ce0d5b08f9d1ba5dbbacf";
-          sha256 = "012q3rdzg5zrqwx5ywq07h8bzpvv0lnldkv4p1wxlr9yzxxhrv4a";
+          rev = "6c782a3fe3f810484009d87813b88804beafafac";
+          sha256 = "1awf44fyjwzlxjavk31lha8iknm8nxr2r6z07sxhzyy23ff127mh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -24084,12 +24273,12 @@
     flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flower";
-        version = "20180222.1112";
+        version = "20180316.1052";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
           repo = "flower";
-          rev = "6a9ba9f25daecfb994b8d71afbf9ab0cc9de5349";
-          sha256 = "1i95nqbcqm0gld74g5r42wwpsgdlv8fjalr8kgcn09wzg4glpvrk";
+          rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6";
+          sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
@@ -24130,8 +24319,8 @@
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "flx";
-          rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835";
-          sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad";
+          rev = "46040d0b096a0340d91235561f27a959a61d0fef";
+          sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx";
@@ -24151,8 +24340,8 @@
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "flx";
-          rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835";
-          sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad";
+          rev = "46040d0b096a0340d91235561f27a959a61d0fef";
+          sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido";
@@ -24189,12 +24378,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20180224.1046";
+        version = "20180315.25";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "b0edfef87457a13118450969696a68505cce936d";
-          sha256 = "146v50nl2a4ryd7p9lpavah01idlsjg3ff1pb0bnblprrs9sg0fw";
+          rev = "3cdef22f638a3d66b6d98ef5c51f28dcd1651e3a";
+          sha256 = "128bmgbjskgamwi6w25vjay19kd8bfq4k1rkac62jl0xa5c3kvs8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24483,12 +24672,12 @@
     flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-crystal";
-        version = "20171124.740";
+        version = "20180306.1821";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
-          sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+          rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
+          sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
@@ -24672,12 +24861,12 @@
     flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20180220.15";
+        version = "20180316.746";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "3d378a59492c810842b7c72506d2037bf70b8545";
-          sha256 = "0y8iqyml27sx2d765w2hhbyrdx0alaqvj5ls8x1zf53xfwv88x3z";
+          rev = "7e975ec648b048d6dc11ff3e41ec5b2cc201a958";
+          sha256 = "0k2pzfx6iia74cfjgf59dv5d0dsqi5424v41lmdigb7daqw0rbw7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -24711,6 +24900,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-dtrace = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dtrace";
+        version = "20180126.1135";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "flycheck-dtrace";
+          rev = "0b03e2e50c5d706a4fd4bcdc0ac643425d64d51b";
+          sha256 = "00ld1aih6axdh7zz5bhlgxqzbh80vla08hklmf5lz7mq3v7aizz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace";
+          sha256 = "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8";
+          name = "flycheck-dtrace";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-dtrace";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-elixir";
@@ -24840,12 +25050,12 @@
     flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-gradle";
-        version = "20180121.2251";
+        version = "20180306.1809";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "flycheck-gradle";
-          rev = "f8c7ec0abdd77f35c5a9a653f8a80acea717b014";
-          sha256 = "11lsk5mw2fkx81vd9r2xychh4nwadi516mpg8hr0ibh154p4ql6z";
+          rev = "3710464576f423ae4825fa18826c007adcc6aa5b";
+          sha256 = "0dislqlr4h5p85kkfhi8fnq86176xkgxdsvypr8l027svbb9aabi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle";
@@ -24942,6 +25152,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-jest";
+        version = "20180307.1";
+        src = fetchFromGitHub {
+          owner = "jojojames";
+          repo = "flycheck-jest";
+          rev = "2f524e275338e46edb9c1c9ab543020f9031b030";
+          sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest";
+          sha256 = "19dg8v0xzni7x6zn472n4ach1c1jv4syzarfi8ba8r6n26vz9ss4";
+          name = "flycheck-jest";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-jest";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-joker";
@@ -25383,6 +25614,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }:
+    melpaBuild {
+        pname = "flycheck-posframe";
+        version = "20180313.450";
+        src = fetchFromGitHub {
+          owner = "alexmurray";
+          repo = "flycheck-posframe";
+          rev = "93a8c590ac2275d754b4ca57f64e8335620ae789";
+          sha256 = "1n3nhv13wwkqw2wmajgkvmykj1s4g5jx9gjyv5k8qxc5pmf2b3f8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe";
+          sha256 = "02ym2isn761w2nsfxiqjh0jk4md9wy3hk9na2aw7pyycm5cgmfwp";
+          name = "flycheck-posframe";
+        };
+        packageRequires = [ emacs flycheck posframe ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-posframe";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-purescript";
@@ -25407,12 +25659,12 @@
     flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-pycheckers";
-        version = "20171207.1754";
+        version = "20180316.1028";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "41e676931f37ba32652edde727e443e304e7e6ee";
-          sha256 = "118y7r06cmvas5g2nypabslfch3g5wlzl3p69ynmpfsmbrlclsz1";
+          rev = "88fcbed2ab07dc14724d728dfe5ac899ced67e04";
+          sha256 = "1nz0pbafrr41sz2c7f07p1kagqqwkk6p7vkgxjw9vp5ik85a1hhf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -25474,8 +25726,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
-          sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+          rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+          sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -25596,12 +25848,12 @@
     flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swiftlint";
-        version = "20180121.2251";
+        version = "20180312.1656";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "flycheck-swiftlint";
-          rev = "fef7fd20cc167790cb29f16de16a8045717e0a18";
-          sha256 = "06m352s5ixxm5wdrkljfk0b2chlqhm8f7bp8c2f2fkcf1l2gvs5q";
+          rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3";
+          sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint";
@@ -25659,12 +25911,12 @@
     flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-vale";
-        version = "20170619.2322";
+        version = "20180308.2243";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "flycheck-vale";
-          rev = "97df981468120aaedeaa4cf8ecfd68b07046d998";
-          sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c";
+          rev = "7777e0d4cf961b6ee6ae4ef917636121d18b3ee8";
+          sha256 = "1k0bhyy2r9c79lld7mbhw8n4c1hlzwr5qp5wmcxzya0fnp3s6g9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale";
@@ -25722,12 +25974,12 @@
     flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }:
     melpaBuild {
         pname = "flycheck-yang";
-        version = "20170915.1308";
+        version = "20180312.1131";
         src = fetchFromGitHub {
           owner = "andaru";
           repo = "flycheck-yang";
-          rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf";
-          sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7";
+          rev = "47881fc42ef0163c47064b72b5d6dbef4f83d778";
+          sha256 = "0bkbl1pas44bl6s3xjdb5zjbd6bmfjk39md5ds1ix4wchnkjm3iy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang";
@@ -26839,8 +27091,8 @@
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616";
-          sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf";
+          rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+          sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
@@ -27024,12 +27276,12 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "20180215.2005";
+        version = "20180316.914";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "f131de1052d724f14c6c4a19d72978be7c70e5ad";
-          sha256 = "04dqdzyiy6iqi9p8dy8k2zml5nmlrin0p60b9p5hhxabmkwawmbx";
+          rev = "8269066a9035fcf50eb835de3745a62c1cb96660";
+          sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -27126,6 +27378,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "frameshot";
+        version = "20180228.408";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "frameshot";
+          rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
+          sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
+          sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70";
+          name = "frameshot";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/frameshot";
+          license = lib.licenses.free;
+        };
+      }) {};
     framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
     melpaBuild {
         pname = "framesize";
@@ -27284,12 +27557,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20171105.1108";
+        version = "20180315.1927";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "742e427068b5a8568f257585db3fc89c2c6c620e";
-          sha256 = "1id41sw15cvazrh7rfb3b840n2ff42qspfr7pm1sfb3v0g7cq6i6";
+          rev = "57d00abf5f4087fbb52f4072513672d6258f4656";
+          sha256 = "107pv959hqpd05w70i5klabkcy52kcfz2y6c9xb98m75c9i5bzbb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -27317,8 +27590,8 @@
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "f1030159af4a5998a8ea751a20fc8bd6598952da";
-          sha256 = "18zy8nmbi6a79rs6n3d8qrm52640fxmg6s9xfflhkr5pprbwi8fn";
+          rev = "e50be2a1ca65e9d3b3c8116fd71f743ab59fcf65";
+          sha256 = "19g188kniikjw2pjszj4shsad9iwr0z00fq1ias1yiq529z2pmri";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -27415,6 +27688,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fuo";
+        version = "20180314.948";
+        src = fetchFromGitHub {
+          owner = "cosven";
+          repo = "emacs-fuo";
+          rev = "5318bef9d935b53031e6312652554920def69af2";
+          sha256 = "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25fb625becf7f582d2a8d53726d6f01d9ea89ecc/recipes/fuo";
+          sha256 = "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf";
+          name = "fuo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fuo";
+          license = lib.licenses.free;
+        };
+      }) {};
     furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "furl";
@@ -27443,8 +27737,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "bb36b2c074449955649907449fa84bd3336528ce";
-          sha256 = "1ji4bnwqpbhldjpnkdfvd05y8bv0nc0g52iza1q4azcw4qqdkwql";
+          rev = "1c8650d39a16ead77df9f5f741d21d148818ed82";
+          sha256 = "0wifcbs5m4q9vvb0ch7x4ki05mc1babi35vqpc4pp24axm5b3c3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27752,12 +28046,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20180202.1825";
+        version = "20180313.1902";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "e1603edd6f64094495af34432f0d9be621173403";
-          sha256 = "0qab1c3d9glp15sh1b1i40zlg50phhix5c2k0vr2i9j6wl8vc80b";
+          rev = "e357eae8fa8c7d6a59f22a1c97cb90a386762089";
+          sha256 = "1ayy3pg0af5bhskkr03dmv0vad6zmlk89sn8304s0mq5barmmfi6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27896,22 +28190,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }:
+    gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache }:
     melpaBuild {
         pname = "gh";
-        version = "20180112.1110";
+        version = "20180308.1338";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "gh.el";
-          rev = "519e8397fb223bb1071b726ed65c59a9ebd9fa48";
-          sha256 = "0fz6f9g1r6lzwvnqmlnn4lr91nn2s59wrv9ajm9baxvivgr4x8w1";
+          rev = "92418cd1b67ff6e8fb0a64478444975a4b8581a3";
+          sha256 = "1vl6wy904jw1mqdic54ssvvbs4xqxhmgacldnfkdkx586vwf0hqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
-        packageRequires = [ dash emacs logito marshal pcache s ];
+        packageRequires = [ emacs logito marshal pcache ];
         meta = {
           homepage = "https://melpa.org/#/gh";
           license = lib.licenses.free;
@@ -28067,12 +28361,12 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20180221.1319";
+        version = "20180316.1351";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "bd16d17006488bcbcea32b258752ddf625954c78";
-          sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6";
+          rev = "18bab447b69507802f0261dc284376276ae8a5c8";
+          sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
@@ -28109,12 +28403,12 @@
     gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gif-screencast";
-        version = "20180226.212";
+        version = "20180309.242";
         src = fetchFromGitHub {
           owner = "Ambrevar";
           repo = "emacs-gif-screencast";
-          rev = "08eebb7e9dc583b02b86d2b62f25b7b8ff8bbd9e";
-          sha256 = "1j3bp4ahwk6jdanqspqxhf6jvk78mad6zhn7ym88561hv4gq3ngk";
+          rev = "825e606950ec842304bf75cf85baef707b853b03";
+          sha256 = "0xdzfw19zll8v9kpvay2rm8piq92ksz574m2gb6b63nm3z7sia1j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast";
@@ -28323,8 +28617,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81";
-          sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl";
+          rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a";
+          sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28463,6 +28757,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-io";
+        version = "20180223.112";
+        src = fetchFromGitHub {
+          owner = "tejasbubane";
+          repo = "emacs-git-io";
+          rev = "e141629f3133c38fdb0dcee58b205f9457d0f802";
+          sha256 = "0vvnifx9cprdr4dbi2jm6j18h2wj7d1dysbaz5lc62c3kwxz3dfp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io";
+          sha256 = "1acwc9iqchvlvx98fxh4xf3xphv0xzrnxpv8kkl8qaly41izfj0v";
+          name = "git-io";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/git-io";
+          license = lib.licenses.free;
+        };
+      }) {};
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
@@ -28571,12 +28886,12 @@
     git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20180208.1342";
+        version = "20180307.414";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "8e85fff38a7aec727d29d93b79f57c2a9f95c488";
-          sha256 = "0ds5pbg87r7ydip2dwdc3dagjby5j5q7rnrl14wpkzm3xq1zpjl3";
+          rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043";
+          sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -28886,12 +29201,12 @@
     gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "gitlab";
-        version = "20170710.724";
+        version = "20180312.947";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "67567a354a1888419331b79862f151817d9747c5";
-          sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+          rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+          sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -28904,6 +29219,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }:
+    melpaBuild {
+        pname = "gitlab-ci-mode";
+        version = "20180314.1704";
+        src = fetchFromGitLab {
+          owner = "joewreschnig";
+          repo = "gitlab-ci-mode";
+          rev = "cbad305987ff26fd604a8632fc7ee2f1a733417c";
+          sha256 = "0kcffrmww03lbarw2q4fw0sghncfiqw067wv7j1k00fyy7fwlrad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
+          sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f";
+          name = "gitlab-ci-mode";
+        };
+        packageRequires = [ emacs yaml-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/gitlab-ci-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitlab-ci-mode-flycheck";
+        version = "20180313.1157";
+        src = fetchFromGitLab {
+          owner = "joewreschnig";
+          repo = "gitlab-ci-mode-flycheck";
+          rev = "11293547385b8252ce1776bfc6455630fbc669d4";
+          sha256 = "1xfhdnny7gyxqpccss0qsmialrjw3dm8x80s7a7ahfyrx5f77yxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck";
+          sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh";
+          name = "gitlab-ci-mode-flycheck";
+        };
+        packageRequires = [ emacs flycheck gitlab-ci-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/gitlab-ci-mode-flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
     gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "gitolite-clone";
@@ -28995,8 +29352,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "bd16d17006488bcbcea32b258752ddf625954c78";
-          sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6";
+          rev = "18bab447b69507802f0261dc284376276ae8a5c8";
+          sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
@@ -29789,12 +30146,12 @@
     go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-tag";
-        version = "20180116.2332";
+        version = "20180226.2011";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "emacs-go-tag";
-          rev = "3e334d9ef3c85fd09b05973734584f401ea18c21";
-          sha256 = "1nr6ijbc4g7mwrhsbl2pacagcrhkyb32vmbp2wdc3c5j9831h7j1";
+          rev = "59b243f2fa079d9de9d56f6e2d94397e9560310a";
+          sha256 = "0r72qk79q8yyidpxgq4r0295fm73id946p1r4s65bwyzii76rjyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
@@ -29961,8 +30318,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "3ea3fa98a8104b2c8f8a7bffaebc7e54dddf99e1";
-          sha256 = "0d2xxvk44i3m4zirl9rzp6dfkf85kssw2kk8wv7h2rqgc3cxi38z";
+          rev = "46530068cce6db92aaafde350b5059841861d5be";
+          sha256 = "17wwvcmyrmi654jkbg6787kc3k0i5w99byk3g69a1rw90gx87gbr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -30024,8 +30381,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "209d38166b1a56b177de486d894d39ae6822eee6";
-          sha256 = "1qssg9sz6b5mx1x6x9ygi5kjmazi1787h8pph990fblh8gvp41wx";
+          rev = "89be4df26da2a8c50853d2e82ed4b3cc29abc8e2";
+          sha256 = "0ih82n619x7k39y0mv6mcaniv3s418b4nq5ql04rv3r4xk5z71gl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -30297,8 +30654,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "0f82f03a2bbf14037d2331cf02f1d4157bbef6cc";
-          sha256 = "19bbx8jmigflyarmydf03ms8lsjwlpn6hl97s63dcw3l4gz4jab2";
+          rev = "af9d8fad593242a5ff7e6de55f5d3dd677fcf227";
+          sha256 = "129rzpffxsnnnsmb268j028vwd9m5pb042skp829883mxk8gx231";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -30423,8 +30780,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "771a9f448593216b8d93deb8cb18465f3551406d";
-          sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s";
+          rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273";
+          sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -30533,22 +30890,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "graphql-mode";
-        version = "20171102.1606";
+        version = "20180303.1558";
         src = fetchFromGitHub {
           owner = "davazp";
           repo = "graphql-mode";
-          rev = "1f3bd34b18a41dbda75a0baee38aa0f0f1fffb7a";
-          sha256 = "16cqncjyai3kak9p108c85d8jp0n83jpfijkwjv8nx2s5wyw57dx";
+          rev = "36b1a4ed9fe78ccd1f386111644e69a5424a1a7b";
+          sha256 = "1azq0igx07aff9r7fbl0l4vbr44c4ylfq41g5rahbc70spd85bk6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
           sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
           name = "graphql-mode";
         };
-        packageRequires = [ emacs request ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/graphql-mode";
           license = lib.licenses.free;
@@ -30640,12 +30997,12 @@
     green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "green-is-the-new-black-theme";
-        version = "20180220.1332";
+        version = "20180228.206";
         src = fetchFromGitHub {
           owner = "fredcamps";
           repo = "green-is-the-new-black-emacs";
-          rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98";
-          sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0";
+          rev = "8eb51dff843f39552f009e34efbf831052557188";
+          sha256 = "1jrlbp93qjdb7mfsq1x0n45j7n3zq5q3dzyifp7767bd7ng3srlg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
@@ -30742,6 +31099,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grep-context";
+        version = "20180311.807";
+        src = fetchFromGitHub {
+          owner = "mkcms";
+          repo = "grep-context";
+          rev = "9602b7b9582d5a5cc036edf0877533b23570ad2d";
+          sha256 = "1ybw0mvif1cfkw7vr9kvb9naz06rjmcnyh6l8lk20wfpmcc1rz2r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context";
+          sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g";
+          name = "grep-context";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/grep-context";
+          license = lib.licenses.free;
+        };
+      }) {};
     greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "greymatters-theme";
@@ -30827,12 +31205,12 @@
     groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20180214.810";
+        version = "20180305.352";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "771a9f448593216b8d93deb8cb18465f3551406d";
-          sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s";
+          rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273";
+          sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -30890,12 +31268,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20180210.756";
+        version = "20180313.1451";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "156848895d16057c1dda2fdde5a7dde3053c9948";
-          sha256 = "04szg56wxf0x7w8nvf98fmnry2s77kx7jg7j6gjkp16nr0asiqp8";
+          rev = "dd5e5ad109cf0b5db6c5d9ba279337a799e12b89";
+          sha256 = "17ga9qrjmvyjj7i77k6k0riy1jc3lvjvc3v631yvza4qi28492fv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -31624,12 +32002,12 @@
     hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "hasky-stack";
-        version = "20171231.942";
+        version = "20180311.24";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-stack";
-          rev = "b981467f557498de46101ddfcbdfd025e7ec1f8c";
-          sha256 = "17vvz8gawih8rksbcn3ndyjqhxaczmjzqm42b1y51j9lky5hmsw0";
+          rev = "d162ec82f4da80f72de0d28c84a4e7ef93197a8b";
+          sha256 = "1b87i8c4i5801vsx0wwii0mk4l7z9cp5a58bj2pa3d8yy8qnwriy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -31812,12 +32190,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20180226.417";
+        version = "20180315.2354";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35";
-          sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84";
+          rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be";
+          sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -32022,12 +32400,12 @@
     helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-bbdb";
-        version = "20170505.2338";
+        version = "20180314.1527";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-bbdb";
-          rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d";
-          sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21";
+          rev = "f4a0e9bb882febf126ec95af65913c6c23f8e826";
+          sha256 = "06a2930mhnwzgl97salqccnfr4p6nx5rj94xf4dc844kriqhzy1w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
@@ -32043,12 +32421,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20180222.630";
+        version = "20180316.447";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "9002522af7ea199a1453326746ffccbd934d290f";
-          sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7";
+          rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3";
+          sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -32274,12 +32652,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20180202.1818";
+        version = "20180306.2058";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "f498727b2a742560256942ea184dcb28c455fee2";
-          sha256 = "1g7hy6fjym11yznzb8m5cn9bq5ys5iszf81hhwyia5n8qdvnlmm5";
+          rev = "9363cc537f06233345aa3af5cd46aa5681ad607b";
+          sha256 = "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
@@ -32442,12 +32820,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20180226.417";
+        version = "20180314.947";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35";
-          sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84";
+          rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be";
+          sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32799,12 +33177,12 @@
     helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-exwm";
-        version = "20180115.311";
+        version = "20180301.958";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-exwm";
-          rev = "0b557cbf0f1c84b80a83ffafb17c5aadf753859b";
-          sha256 = "0i2sbdxjv3nbnv2250gwghqk202s3z43s6dn1pa5sdsp7gkvwxjz";
+          rev = "9eec927d7fa092762b467d400d996b66c1f6d9c2";
+          sha256 = "131xb40y8n3laivzbx4pjynbv0c5v09ihvq4r9c3m1d7qmq6x3kh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm";
@@ -33177,12 +33555,12 @@
     helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-gitlab";
-        version = "20160519.303";
+        version = "20180312.947";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "67567a354a1888419331b79862f151817d9747c5";
-          sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+          rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+          sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -33636,6 +34014,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-lib-babel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-lib-babel";
+        version = "20180225.1322";
+        src = fetchFromGitHub {
+          owner = "dfeich";
+          repo = "helm-lib-babel";
+          rev = "69bce58c1ef109dd33cc7f7696ad02a536f1b215";
+          sha256 = "0x39ds3hziabizaa3hrqfbz2a9by4s25dndp8ymxbl8jjvqgdi3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d6718da5d8849a8c3ec17188b89a1273cf963047/recipes/helm-lib-babel";
+          sha256 = "0ddj6xrhz4n0npplkjmblqb43jnd6fmr4i4vv1cigrgb7zj6bjx4";
+          name = "helm-lib-babel";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-lib-babel";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-lobsters";
@@ -33975,12 +34374,12 @@
     helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "helm-pass";
-        version = "20180208.1313";
+        version = "20180311.959";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "helm-pass";
-          rev = "231c496eb2da4ecf26fcf8545de9a9819683a17f";
-          sha256 = "1lv47cwb3j7lvx8qd4p5ripmvh3ixyd0x5bql143hja396wx12rr";
+          rev = "3171a90c33ea7baaf01da37ca048a538dcb58381";
+          sha256 = "01wcc5lxnym66qgnviwsdbnzdmp4c1hyw524ii2jphhm8vyvd1k1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
@@ -34101,12 +34500,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20170926.1123";
+        version = "20180228.1125";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "4466adbcada8be19ec97b9dba52e12b8da3da849";
-          sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b";
+          rev = "20eb422df057533c6b2728f2a0871eec4f837d53";
+          sha256 = "0iba3w6kir9ymisbv7bjsb0vmmai4m24kh34693lsh4x7m8mjyz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -34206,12 +34605,12 @@
     helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-qiita";
-        version = "20170821.609";
+        version = "20180301.635";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-qiita";
-          rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895";
-          sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j";
+          rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc";
+          sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -34336,8 +34735,8 @@
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "helm-rg";
-          rev = "775ee76d8b6f45eab1330c714ddac1da20c87fe3";
-          sha256 = "11f7m143qnmh2x4987a56ir3acxbp0n54msak3mp5nc1i1h8hq31";
+          rev = "cbce7b4f1afefa1e9a505b45c1b58c688a42f3b9";
+          sha256 = "1z8ijiqih902mzfc7kbnfbdhjwfqh5yzg4w3v4mxac0ys5j4z6sg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
@@ -34420,8 +34819,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
-          sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+          rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+          sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34689,12 +35088,12 @@
     helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "helm-system-packages";
-        version = "20180210.1307";
+        version = "20180309.833";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-system-packages";
-          rev = "715a8ee0257d7d7138d4cd0cfdd61ee0ebb8ee08";
-          sha256 = "0hc51ndn3jaxykflr5mkhwc7lajp5fsnzxpqwr17hqq4aa6g1sci";
+          rev = "497d53a81fe989c341a24c3e4a288f8777b0c6e0";
+          sha256 = "1gil4y4n0glj5kksyh7r81ih9hlywx9rwp91a74g93zml0yf7rrp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
@@ -34752,12 +35151,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20171224.702";
+        version = "20180311.2157";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "94e05b0bf6f2604a2786ef6ff358363b9d4790ec";
-          sha256 = "0b0d1ka9jx68dfkdw2l7sbawa85yzkzxigjwlwki1i5l7m3cr5pd";
+          rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64";
+          sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -34962,12 +35361,12 @@
     helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "helpful";
-        version = "20180220.1512";
+        version = "20180316.1421";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "4abe04870467beb8a5a798773e1f145f65298e59";
-          sha256 = "1la6im11wmid8k2smsaks1vgw42b4plpy65mr4z22c2bx4q1a24w";
+          rev = "b42bd5adcbf910bffec44022d1c99df7322d98f7";
+          sha256 = "1bmf2cw3jj5yq2ggzmh8dmsv2wq0arikn0hyfdbsxh8qzpkxc502";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -35190,6 +35589,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hide-mode-line";
+        version = "20180302.1110";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-hide-mode-line";
+          rev = "86b9057391edad75467261c2e579603567e608f9";
+          sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line";
+          sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl";
+          name = "hide-mode-line";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hide-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
     hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hideshow-org";
@@ -36513,12 +36933,12 @@
     hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "hy-mode";
-        version = "20180115.1230";
+        version = "20180308.2201";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "5c1167c17372c7448fedbbabbca6abc0e7e50050";
-          sha256 = "09pvgrbbq1z9s4bbr40iabcxpw1z08hqbr8i997hmfy7whmv8mwp";
+          rev = "ca874a29eace152027f982b9720e3962c57a06b1";
+          sha256 = "0s1z53v95dnygjp48gmny6a9wq4740rmsaa7p99hlvgqnksx0mzq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -36597,12 +37017,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20180201.846";
+        version = "20180226.1116";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "cf961400796aea8b385b64ac0ad31c1e2500cf6a";
-          sha256 = "03ffjrq4hidvxb6m4kk0xp8rmi53al16nab6lbid5brky67hvpmq";
+          rev = "62e0f374623df15c1eabebe78f4100850d708227";
+          sha256 = "1ydipk4fkc7dlfjr7isadgap9mfnmi1lj6n7ckrnzia22vyi9i7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -36658,12 +37078,12 @@
     ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ialign";
-        version = "20180202.1447";
+        version = "20180303.1356";
         src = fetchFromGitHub {
           owner = "mkcms";
           repo = "interactive-align";
-          rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6";
-          sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h";
+          rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1";
+          sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
@@ -36998,8 +37418,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4";
-          sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649";
+          rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
+          sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -37313,8 +37733,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4";
-          sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649";
+          rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
+          sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@@ -37957,12 +38377,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20180221.1434";
+        version = "20180307.1359";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "001ef02a2a3ac0803f0f89fb90ea92d7a6e23db2";
-          sha256 = "08plikqy6k1drc1m08c9jsln8laq3mzh6056ib64pxip64fwpl62";
+          rev = "e9db390fa273b02d4e637ab94244358792caead9";
+          sha256 = "1cddcnmgdjdm9aqn5nr6g2p93rd4rb0xllyf7rimgf64xnqa96hm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37999,12 +38419,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20180223.1717";
+        version = "20180316.1140";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "f420c8a4d27c7c2dfea2ebee230d4d1b632a4e3f";
-          sha256 = "06l1mqawpaypxmb8mx7l65nzms7amr2wjz2xyhhx2czg7wdhg7sk";
+          rev = "1295e58e9f7fb575149a7b9b2604547c7331b4d5";
+          sha256 = "1c0rjnhlrbl396a5gjm7pnpqmxrbymr63l2ff0v5l2wjwfjrjiny";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -38062,12 +38482,12 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20180121.2300";
+        version = "20180309.433";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "d39ea0bd59e5f62eb92a051c1ab3d7a0f896ae0c";
-          sha256 = "0jfcdmyvxk8vj097qiq2zsr2h6v7wmsxlm8yldpsan8wa0s4rkzx";
+          rev = "57710da5c8c146fef805deb7dc6a2cd8ccbc11d4";
+          sha256 = "0kwxa8mpn3drvn1rnfh4g1hvin8l2sa1gns01dshf1qqaa829jkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -38502,12 +38922,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20180221.149";
+        version = "20180313.605";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "752e5ab174bdde87dcadccf478ca43fe328d8aeb";
-          sha256 = "0darhg4iwzgfpi62f2l9p83fvl877dw1fml8y4sfn9vrwqnvy93f";
+          rev = "ebcf8a0935b57eb54351b78ed8c358cbef96f4bd";
+          sha256 = "11ycc0ig2asndma38jhrqsy0s22m8ws6s1mjxk7p7armxca0g0pi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -38817,12 +39237,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20180104.1109";
+        version = "20180308.1256";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "82ba45ec15c9011bbdf1d69cf25c8193d33c0028";
-          sha256 = "0iby446mpgjrs4kg0ji8435h3aamdvcxbmv1j3qg0i9p6abmi7f8";
+          rev = "847cf4e84f554fdcce49587747f0c18dae12b3ba";
+          sha256 = "004b9av02q9165rfr6b3c7qfbry72s9bdkfs3n40f4fp25dcwq0q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -38943,12 +39363,12 @@
     isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "isortify";
-        version = "20180206.450";
+        version = "20180312.2132";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "isortify";
-          rev = "18c273ff401643fb903e90dff73c47a4b52268ef";
-          sha256 = "18ziajgjij66g01fyrr1z95z4x2ynfvcyas92b2rvdc1dnsdhs10";
+          rev = "2e53c9ce3fa1ef80b08a8568cdae19a3669f3056";
+          sha256 = "1l2py65xr0m3w9lc6qp2jcc9477kjhkfnjdnkgfimz6aqlg1p9xg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
@@ -39111,12 +39531,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20180225.744";
+        version = "20180315.1446";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
-          sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+          rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+          sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -39132,12 +39552,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20180222.630";
+        version = "20180316.447";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "9002522af7ea199a1453326746ffccbd934d290f";
-          sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7";
+          rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3";
+          sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -39174,12 +39594,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20180201.427";
+        version = "20180311.558";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "9783970f7dc39aaa8263d420d9d1ed6912c8e19d";
-          sha256 = "1fanxpynp3cigll0x3vknxr8r6plvsbyn34qs28zjfi0l062a8jv";
+          rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6";
+          sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -39216,12 +39636,12 @@
     ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ivy-gitlab";
-        version = "20160519.312";
+        version = "20180312.947";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "67567a354a1888419331b79862f151817d9747c5";
-          sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+          rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+          sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -39262,8 +39682,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
-          sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+          rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+          sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -39297,6 +39717,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }:
+    melpaBuild {
+        pname = "ivy-mpdel";
+        version = "20180304.50";
+        src = fetchFromGitHub {
+          owner = "mpdel";
+          repo = "ivy-mpdel";
+          rev = "d63c7ae492a3ce3288dc9f04cbc203d6a6f7c502";
+          sha256 = "04bryyq67qi7zhkvvfymcjbz1w93xwmy8svp02293an9n67dirm2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
+          sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r";
+          name = "ivy-mpdel";
+        };
+        packageRequires = [ emacs ivy libmpdel mpdel ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-mpdel";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-pages";
@@ -39339,15 +39780,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-phpunit = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, phpunit }:
+    melpaBuild {
+        pname = "ivy-phpunit";
+        version = "20180219.115";
+        src = fetchFromGitHub {
+          owner = "12pt";
+          repo = "ivy-phpunit";
+          rev = "ffedb0138d36564e8e36a28fd9bc71ea8944681f";
+          sha256 = "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/93822c5588f81683e3d43f690785b80c207d331d/recipes/ivy-phpunit";
+          sha256 = "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs";
+          name = "ivy-phpunit";
+        };
+        packageRequires = [ emacs ivy phpunit ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-phpunit";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }:
     melpaBuild {
         pname = "ivy-posframe";
-        version = "20180222.343";
+        version = "20180309.132";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ivy-posframe";
-          rev = "ddaf875d5f5a8629ba49731c199e0ca57effd3d8";
-          sha256 = "0k7mc268lrkkv7ril7z4vnm5z1ha7hl4274av8m2vfsd1szryip2";
+          rev = "b9b9a45455692d06b89d4fbf40bba6852b9a109a";
+          sha256 = "1sc8mwk5ans3l0p465wl3blvchfmkhyg06x95b0dnkjldzkk2v6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe";
@@ -39384,12 +39846,12 @@
     ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-rich";
-        version = "20180225.1752";
+        version = "20180314.1909";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "7fc9859802e264afeadb464aa8945f508727e8fa";
-          sha256 = "0lw2ywk47cbgdc37m41hm1rin3r79j5w1qrb45mixdw3l5b1vsv2";
+          rev = "69314197b6563b87d145eb13ea16efd5b20513a6";
+          sha256 = "1a09mf51nbjvz8i91vx09rricvnlpmnh1znwhrxi5iiwa1pd0dlh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -39409,8 +39871,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
-          sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+          rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+          sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39928,12 +40390,12 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20171212.1053";
+        version = "20180309.825";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "08dbcc9d8d33ed17cfe2de279f6979692c6fcaab";
-          sha256 = "09w9rkp6vh3v632kbd38aizbl3njpwxpx3n1819sz452iqsx81c7";
+          rev = "3caa95998d8492a2ca6c17971de499ca15609871";
+          sha256 = "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -39974,8 +40436,8 @@
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "6244d4608fe1ec1a1cac7b4b45cf6d1edb06cb91";
-          sha256 = "00bscgxv2gmxbmb88p8yhb5ckz73srm251h1vsdfz84cn7vsk1wz";
+          rev = "07afc434bb502d85fc8b882f62fc4d237d23f34e";
+          sha256 = "0pnf80l5v0sn24p64pb36lrajs9b7p4y9m984hm52k2ah8kjg2n5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -40138,12 +40600,12 @@
     jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jetbrains";
-        version = "20171107.847";
+        version = "20180228.2102";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "jetbrains.el";
-          rev = "8d0851793d0658cc39bca455dc14c89f78ab8335";
-          sha256 = "1k3zb3c5h8bqa7yxl3by4vxlzabh3wl5sz6ynpi01pmqf75qxa4s";
+          rev = "56f71a17d455581c10d48f6dbb31d9e2126227bf";
+          sha256 = "0v948k7xjm66px20ad331pskc7svpcrcffh3hbkjsksd4k0pggds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
@@ -40537,12 +40999,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20171224.1833";
+        version = "20180305.1647";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "40885b6b50e497d2af53161785b3c9cc3133e42d";
-          sha256 = "1yr96bm3vd6na967nn13p462ggh16k0lczgjmwg2qafmpyypn1di";
+          rev = "4125b49a6982a3eb36674962160118250daf665e";
+          sha256 = "0783l752jxca5mb7y44fbx366zkrnninzy06yahidsmhzxpw5bhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -40558,12 +41020,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20180118.251";
+        version = "20180316.552";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "c005a0df51fd671213a45d8693a1d9cf5b21a06f";
-          sha256 = "1jyrirfnrb38jcl24ad2v427arzw3ynxwsw29b58zm9c6rxr7k6h";
+          rev = "4bc2ff3b89c734ba7dfd9824d4ef5271ed09fb96";
+          sha256 = "103kvzkvwc6g3jdwz1hin61b070zhd8q32h7v1qzgbnn1zczlplf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -40747,12 +41209,12 @@
     jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jsonnet-mode";
-        version = "20171005.24";
+        version = "20180310.2256";
         src = fetchFromGitHub {
           owner = "mgyucht";
           repo = "jsonnet-mode";
-          rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
-          sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+          rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e";
+          sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
@@ -41226,12 +41688,12 @@
     kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-themes";
-        version = "20180223.1702";
+        version = "20180314.1046";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "bf301134df90159a8657fe772365fd9c82de977b";
-          sha256 = "0gm96xxa2zvmn442cjzqsqhjw6r8fsrxqacphwa19lvmm9csv3wj";
+          rev = "1576b4daca7c7504f7c91e63670d8026e9a3c927";
+          sha256 = "1ycwpj3ciwahjinwq7mnb8fhph954bv11yfxjdhhfv3yhbyd2rng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -41433,6 +41895,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keycast";
+        version = "20180226.542";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "keycast";
+          rev = "c64742ee21cdfb816d33ad0574249982e5fb10e2";
+          sha256 = "0pa87l92y2yvyghjvindvdaqy4dgzwxdg87ywzv043fl1s610c2z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast";
+          sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id";
+          name = "keycast";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/keycast";
+          license = lib.licenses.free;
+        };
+      }) {};
     keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keychain-environment";
@@ -41734,8 +42217,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "9f64f5e24240cbf7e2cd34315d08131fd31ec822";
-          sha256 = "0liyqkwv94wz623ihz5kyzfagdi08qp3q0q2hcvavjyk3j8ih6ll";
+          rev = "002e46f7db78c02cd1c12114bd9c15815cd97d83";
+          sha256 = "0h6vs7nbdi7pnh1399r2brizcnyyp7r5wlwsqss5wvm6vscyyqdm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -42066,12 +42549,12 @@
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
-        version = "20170808.602";
+        version = "20180313.1719";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "kurecolor";
-          rev = "3e8b63e89e294179e42a14a4a357c29a72669a22";
-          sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k";
+          rev = "28521a8738943d7e3ceafbf4a54ac676b3ba5f3c";
+          sha256 = "0nwflkrys84ik7abnr9pswk9qks4gyjd8ashbisqd82r2iljcqni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -42881,6 +43364,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "libmpdel";
+        version = "20180316.122";
+        src = fetchFromGitHub {
+          owner = "mpdel";
+          repo = "libmpdel";
+          rev = "60239978403a802c09d52f4638d9533dac275f25";
+          sha256 = "07y2mqz443n6wim1dq6wv22axkq4vv7y58ncm6cahl7jivkvkk4c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
+          sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1";
+          name = "libmpdel";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/libmpdel";
+          license = lib.licenses.free;
+        };
+      }) {};
     lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lice";
@@ -42930,8 +43434,8 @@
         src = fetchFromGitHub {
           owner = "janestreet";
           repo = "line-up-words";
-          rev = "b2cedc45295fd27f534f3b025d2ce72041850c2d";
-          sha256 = "0f3601k1clflan8h7a2g4l8ag2f5i5f1gh37mg5hrny8b98n009z";
+          rev = "91f5f7e38fa87bda437091f6480acfb420be808c";
+          sha256 = "07vmv8m7aip8xfjcv9plcxz9q9q4wdqx6smmc57z77zlnf27k9x8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
@@ -43165,12 +43669,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20180215.1527";
+        version = "20180315.1216";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "ae975815db5da512ea86c8547e5907cf04af54bc";
-          sha256 = "02s5242yc0c93g9wdry75pg3wrf53da9a3hdvm57zg7b1sjw6p4s";
+          rev = "0fdc50b703bb4ee41ba76df169382d1bec93668c";
+          sha256 = "127frm285hblpcp1cbjfvfzbszf9b0ik72hhlvnzw7arqns611r4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -43207,12 +43711,12 @@
     lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
     melpaBuild {
         pname = "lispyville";
-        version = "20180218.1555";
+        version = "20180228.1154";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "lispyville";
-          rev = "d99f08d5971613bcecdd2768241b9c6d617a24c7";
-          sha256 = "12kjh2b9jdwrf6naq6qvskbhlv8xkjsqr1igbldg9mi8qmas60b9";
+          rev = "b4291857ed6a49a67c4ea77522889ce51fb171ab";
+          sha256 = "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -43480,12 +43984,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20180129.2352";
+        version = "20180311.2027";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "22406984b66201441c7ad5689ab010bdfadd768b";
-          sha256 = "0ni1cvrabxiprb4gl5rd5hgwl5csy9q6b0yjd40ffvl1x5lmb0qw";
+          rev = "0c9f7a09a5c58d82bad706afd2e6e236e0cf42b8";
+          sha256 = "0ii724lvcfs9jnlpd6kgrxjwlfmg41chywcp8j85m49al8b6pipa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -44048,8 +44552,8 @@
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-haskell";
-          rev = "cf3739e96b623fe8b95617561bb29476d7553462";
-          sha256 = "0739kclc6g80r38yjwwsyx7arc0z4jlmp4x7gmf30ijdpn32qb4b";
+          rev = "aa421f9702056a89cd4e63c0dcf5543acb62840f";
+          sha256 = "1m0diap909jn9w54j9462zg972xhwxivcda59jmb6isgjpyi1yyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -44125,22 +44629,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20180224.246";
+        version = "20180314.634";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "14d5626f905d2929e4358cbea3e0106b9f3c0454";
-          sha256 = "00py4qp1rivr54h033cjnipx7011cqac49v9x86zn2g2hfclhy7n";
+          rev = "6383fb9e414dc92eca41aed6e1b643accd4271d8";
+          sha256 = "0xfg3dwi06z45y1hiff42lgyv5diz69hrrlsssar47vlprscmdxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
           sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
           name = "lsp-mode";
         };
-        packageRequires = [ emacs flycheck ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/lsp-mode";
           license = lib.licenses.free;
@@ -44212,12 +44716,12 @@
     lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "lsp-rust";
-        version = "20180213.2304";
+        version = "20180305.508";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-rust";
-          rev = "b4053425d57101f0c16ee3d4f7e3a3c483205f90";
-          sha256 = "037y7ns1p6riyycf65gq6myn921zjc2ga3h804yjx1n11wvrw9al";
+          rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3";
+          sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
@@ -44230,22 +44734,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
+    lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-ui";
-        version = "20180224.2300";
+        version = "20180314.556";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-ui";
-          rev = "7d73049dc2cf703550decdea42e35920efe7339f";
-          sha256 = "0cah4azsgks5qq8iv3g8dv0l18wkc4lca9xr7g79p2vl4z34sgps";
+          rev = "6ba9d3fe2d9c0f239ebd8a124e10bc038c76fdb3";
+          sha256 = "071bdnn1hs31bd479xs6dpyb98gf20q4z2k9sv0wfxmbjzm241s3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui";
           sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j";
           name = "lsp-ui";
         };
-        packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ];
+        packageRequires = [
+          dash
+          dash-functional
+          emacs
+          flycheck
+          lsp-mode
+          markdown-mode
+        ];
         meta = {
           homepage = "https://melpa.org/#/lsp-ui";
           license = lib.licenses.free;
@@ -44590,12 +45101,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20180224.1651";
+        version = "20180315.1731";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81";
-          sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl";
+          rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a";
+          sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
@@ -44827,27 +45338,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
-        pname = "magit-rockstar";
-        version = "20171215.1135";
-        src = fetchFromGitHub {
-          owner = "tarsius";
-          repo = "magit-rockstar";
-          rev = "c8320472e8a50c8299140ba0943bb1fe485d294a";
-          sha256 = "1xjym51z0v7ibxw059f6k3zljli6z390rmxvrywbfzkb8hqms0l1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
-          sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
-          name = "magit-rockstar";
-        };
-        packageRequires = [ dash magit ];
-        meta = {
-          homepage = "https://melpa.org/#/magit-rockstar";
-          license = lib.licenses.free;
-        };
-      }) {};
     magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-stgit";
@@ -44935,12 +45425,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20180225.529";
+        version = "20180307.446";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "8d8d136ae4c380f004354675519f4016c735d78c";
-          sha256 = "1dnz8rz78wfvpjz652hs4jh90pkkgiak4vp9fzf2kx1j4c9skp97";
+          rev = "d3fc59ddf4f3a6179386e967ad9dfcd1facb6759";
+          sha256 = "1x7ql95qf8ldzf4p9zd79qmvqh1zin96xair9rhlab0zmvk3vzca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -45082,12 +45572,12 @@
     makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "makefile-executor";
-        version = "20171017.438";
+        version = "20180315.632";
         src = fetchFromGitHub {
           owner = "thiderman";
           repo = "makefile-executor.el";
-          rev = "a950438c93dc2fdcb867ac25174c773deda95aff";
-          sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9";
+          rev = "06b2efa4539c319ab36806b0bd8ea87e214aaa74";
+          sha256 = "08rjj3bdnvmaxiwnys4cjd19wkkk06wv0l58hpn3c7vi077ps3cc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
@@ -45275,8 +45765,8 @@
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "a07d1cd310f59b28125717620dff5cd3ff674ab1";
-          sha256 = "1rpn1c66yi6rdn7f2dgdspbwgdyidvpdwshh52dydgwy4z08lpfs";
+          rev = "90b828f94872f6bdb9eb3c06bbc2a9c20e017f22";
+          sha256 = "0n5kd7fngxs3zc7scv34mfr7ppl5nkg8mnvgxwsnkghlv5a76wwp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -45664,12 +46154,12 @@
     mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mastodon";
-        version = "20170619.1050";
+        version = "20180305.1909";
         src = fetchFromGitHub {
           owner = "jdenen";
           repo = "mastodon.el";
-          rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318";
-          sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp";
+          rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
+          sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -46332,15 +46822,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mgmtconfig-mode";
+        version = "20180222.1257";
+        src = fetchFromGitHub {
+          owner = "purpleidea";
+          repo = "mgmt";
+          rev = "ddefb4e98778d4568a96754df52e3a6a494f2ad3";
+          sha256 = "17kzi4jyjbmqkkadaz0h46cjw3dxv5qcy27rpfrajhbny72x9j1h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode";
+          sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil";
+          name = "mgmtconfig-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mgmtconfig-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mhc";
-        version = "20180127.621";
+        version = "20180314.3";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "5c5265be1a0099d48ada502aaa28c7f3f08f9078";
-          sha256 = "0xaqbkdmn3hlalnzz69812a2cigpgh1199fl6hp20d4dq4hj4m6c";
+          rev = "f7bce7f5504093737071e2fc79ae6bc95dd37af5";
+          sha256 = "0sash77j2k1gpi35miyaf96g0zfx3d5hjqag8vcwc692lx1sf06c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -46646,6 +47157,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minions";
+        version = "20180306.5";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "minions";
+          rev = "360e433fb8a0c62a3661434241ba29d2ba7bf95c";
+          sha256 = "1az01ragbqwqipp1mah963l8vvyhcm003fa6rw24mfg6wv9pq58c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions";
+          sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940";
+          name = "minions";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/minions";
+          license = lib.licenses.free;
+        };
+      }) {};
     minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "minitest";
@@ -46754,12 +47286,12 @@
     mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mixed-pitch";
-        version = "20180121.1039";
+        version = "20180314.1441";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "mixed-pitch";
-          rev = "5915172c86a1d249854fed32c0e472501d1df1e6";
-          sha256 = "1mm5nkc167bli01lbng1iiswh5mgz0a48k11aipki213inhm29jc";
+          rev = "b76567bd0c55f72942e686b7de97a222d333b333";
+          sha256 = "186s9ligb1b3hh54pdhfkvpzva5dkj87ydslyi3jjf7yrhvxgw9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
@@ -46834,22 +47366,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    mmm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mmm-mode";
-        version = "20171212.1428";
+        version = "20180314.729";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "mmm-mode";
-          rev = "3fb2964c1923fa4ae71741afbd87c76dc16af93a";
-          sha256 = "1al8n18h3pnjsaffwbfbxv68zwh7svnkrjjrvzdav1ja5qs39wa4";
+          rev = "cb905bdc728fb3b5f9fdff8836d71b62bd717eab";
+          sha256 = "1vyvp20g2dppnywa2clpvsvn5yac4pczj4f316dx63xp4zh7193l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/mmm-mode";
           license = lib.licenses.free;
@@ -47131,12 +47663,12 @@
     moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moe-theme";
-        version = "20170914.2111";
+        version = "20180314.2108";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e";
-          sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2";
+          rev = "c3ec67b02d55b5072ef4d32ff412019e5940d988";
+          sha256 = "1kjyv8mypcpqhhrmbnzjfrf4i40zws9sysaar8f7i08cr79idjj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -47298,12 +47830,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20180201.553";
+        version = "20180314.501";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "031849ab863a29e7576535af92b11d535e762440";
-          sha256 = "1xl6b71r0j90n9r96f6hfvd9fzwzwy7rmn44c1p2r76inyxvlyil";
+          rev = "da23ef64d4848636e47a026259526575381bd164";
+          sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -47344,8 +47876,8 @@
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "666431c047479e414b47ca1f83fe0a2ecc02144a";
-          sha256 = "0k7d2k3m9rf77a1812clqvmsva27c7wpvkgdhkgvi7kpglj1dz2n";
+          rev = "609dfd82897c14324a99206ebf450377e5c6257e";
+          sha256 = "07qyxc7mjly0j2x7aqbpnn7nd5fp2pck02ks25m62gn4a1sq4v3z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -47358,6 +47890,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "moody";
+        version = "20180316.340";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "moody";
+          rev = "890218c6c175f6f3efbf584dd27b8702a16b8272";
+          sha256 = "05q8l32mwz6sb40lflh6vwhnqj41sfmw7dp7lw3qlhg2skwjvc29";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody";
+          sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy";
+          name = "moody";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/moody";
+          license = lib.licenses.free;
+        };
+      }) {};
     moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moonscript";
@@ -47617,8 +48170,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "mozc";
-          rev = "6b878e31fb6ac4347dc9dfd8ccc1080fe718479f";
-          sha256 = "03gcda62xl6hfibw3y15lf6b04998kj1v95gyzs3q0bqxav74ahw";
+          rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
+          sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -47715,6 +48268,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }:
+    melpaBuild {
+        pname = "mpdel";
+        version = "20180316.115";
+        src = fetchFromGitHub {
+          owner = "mpdel";
+          repo = "mpdel";
+          rev = "78bcaadd5471740a6c61a7e338086bf7a6ebfe54";
+          sha256 = "1zgv6z3mp6bjw8akqhx6add00w9qclqf94mmqmfhbg3mqaky6zgh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
+          sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8";
+          name = "mpdel";
+        };
+        packageRequires = [ emacs libmpdel ];
+        meta = {
+          homepage = "https://melpa.org/#/mpdel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
+    melpaBuild {
+        pname = "mpmc-queue";
+        version = "20180303.1229";
+        src = fetchFromGitHub {
+          owner = "smizoe";
+          repo = "mpmc-queue";
+          rev = "df07d6bef7468edb1d73ef73b8331b94d0e5d0ca";
+          sha256 = "17817l3afghg9z8jxkj61yg85plmr74ki3wf4hz685llx8fr69w0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue";
+          sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354";
+          name = "mpmc-queue";
+        };
+        packageRequires = [ emacs queue ];
+        meta = {
+          homepage = "https://melpa.org/#/mpmc-queue";
+          license = lib.licenses.free;
+        };
+      }) {};
     mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
     melpaBuild {
         pname = "mpv";
@@ -47802,12 +48397,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20180211.2319";
+        version = "20180304.2246";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "997ef1bfc7dc09d87f50ece80f0345782065eb92";
-          sha256 = "0pc95w6idvrmdpiq6gmcmi31rmh0d94rfhwjafsxqqimmsm9fk0z";
+          rev = "96a293b28646f4620e257f24748becc4a06843cd";
+          sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -48242,12 +48837,12 @@
     mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mwim";
-        version = "20180214.837";
+        version = "20180227.852";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "mwim.el";
-          rev = "508efa3a616d4b371039053b1fa80b057422196c";
-          sha256 = "067m1r19fc4zhgwc7gwb6khbh3sz74li2fcxfj42d9sx1dqhy218";
+          rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf";
+          sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
@@ -48834,7 +49429,7 @@
           owner = "yyr";
           repo = "ncl-mode";
           rev = "602292712a9e6b7e7c25155978999e77d06b7338";
-          sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n";
+          sha256 = "0a1pwhnllyb1q45gjfhply0q2p4bk208a19z9gaf635d7ck9qhny";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
@@ -48897,7 +49492,7 @@
           owner = "rsdn";
           repo = "nemerle";
           rev = "59b28607968a9bee060b42eac55c69c37d1c0e69";
-          sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g";
+          sha256 = "1qba0zg37irnk35pgiasyslp9l0lfiysms1bw3znscay5s20lm8m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -49206,12 +49801,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20180220.440";
+        version = "20180309.430";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "451a570d656e18e66d58182577685da0e43c87a3";
-          sha256 = "02bvvrvbfg7cgbd83y7544ra5a0hfrk8kh938hwygq991krc2zhp";
+          rev = "0527060cc8b27dc26496a3a9b20ee6a8526e9efe";
+          sha256 = "0iyj61870g84m6pr0vib3dj5dcrhrnwdiad6xzp8j2anf0gc23ii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -49602,6 +50197,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nofrils-acme-theme";
+        version = "20180227.1353";
+        src = fetchFromGitLab {
+          owner = "esessoms";
+          repo = "nofrils-theme";
+          rev = "0bb6f199ace1488613884075fe588f02000bb0ab";
+          sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme";
+          sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a";
+          name = "nofrils-acme-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nofrils-acme-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
@@ -51139,12 +51755,12 @@
     olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "20180205.2323";
+        version = "20180308.638";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "6893bef23e576fd776ca69517dbf0981a8dc4b2a";
-          sha256 = "0jxqnc7cwrrl9kw0fng515kl9hblkqkd5yf2gqq7di09q3rccq65";
+          rev = "b1759abbb2be27107c0c09beae10ca5e4c556b56";
+          sha256 = "0zdxvd3xh5p9j8si2kfmavzdjwpz9352nr6i0c550m10lrnixnv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -51290,8 +51906,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197";
-          sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg";
+          rev = "c00a3a9157432c578fffb79169232e4a81d4ad31";
+          sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -51778,12 +52394,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170507.858";
+        version = "20180226.1136";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "2978aee8981a2ff5c09104b2d8b055957b277078";
-          sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9";
+          rev = "eef4cd47ea221dcdc352b5af578007bcde5f3e6a";
+          sha256 = "1sj5n2gynwc14kl6cjmdg8mvs0nc187nfj4czd3rbz4yqq818l3b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -51922,6 +52538,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-chef";
+        version = "20180304.1104";
+        src = fetchFromGitHub {
+          owner = "Chobbes";
+          repo = "org-chef";
+          rev = "94427d5e48cadce45a906de16fff42676903fd9f";
+          sha256 = "10hwbfhjz2bwiralgsqwzhjgjzfil51gs8qhig8vkbxq9brhcgd4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef";
+          sha256 = "1xzbdrv5z31lxnzzgbp50l10lzlvx6j7kc7ssg76fma49wfpnra5";
+          name = "org-chef";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-chef";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-cliplink";
@@ -51967,12 +52604,12 @@
     org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-clock-csv";
-        version = "20180128.2130";
+        version = "20180313.1957";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "org-clock-csv";
-          rev = "e3b1c4236f6b74105b291ec68c0909226621b4ac";
-          sha256 = "1ykam54wz53n0gx0raywhd92diggyxw8669w988sw6jghhg65ivs";
+          rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f";
+          sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -52135,12 +52772,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20171116.1045";
+        version = "20180315.1220";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "d0e6793497d57a90543d711310ad26fae7c9bcba";
-          sha256 = "0b9a09gx9idsaw2jx5z6zd8k8la0ly3132gkz7krzkvf3nc4yfz9";
+          rev = "3f568b163a8a26f22a9b2d9a90b85fcea89c67f2";
+          sha256 = "1whp3cpdyxrip5id9ddajy0k04b81hrq12j9w5ir8244m1k5kkf4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -52321,6 +52958,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-fancy-priorities";
+        version = "20180221.1545";
+        src = fetchFromGitHub {
+          owner = "harrybournis";
+          repo = "org-fancy-priorities";
+          rev = "0998b27c02e81bc554e76fde3b7cac4aced2210e";
+          sha256 = "0nlazpgfrv67vbb5w2pcwhsxf296f62xgw1zajrkp16gvj63hry6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities";
+          sha256 = "13rljgi5fbzlc16cxqj49yg47a5qpyxzj0lswhdyhgzncp1fyq7p";
+          name = "org-fancy-priorities";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-fancy-priorities";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-fstree";
@@ -52488,6 +53146,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-kanban";
+        version = "20180313.1339";
+        src = fetchFromGitHub {
+          owner = "gizmomogwai";
+          repo = "org-kanban";
+          rev = "c240a1894b7ae4ed292657b4d3cf03db8274f451";
+          sha256 = "12l9yb5dzhv9fgcl8nba5dh403bafx1klq2sw0n1v7zv82dic57i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
+          sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41";
+          name = "org-kanban";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-kanban";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-link-minor-mode";
@@ -52554,12 +53233,12 @@
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20180220.1906";
+        version = "20180309.2241";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "0752659f7a19cead182584fabc9544464f69b83e";
-          sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz";
+          rev = "e35c367e7dc1449e63916e424d4e7349c91f8c1d";
+          sha256 = "0yyxji50cvpbrmwwqmsv48556yzd7537zzlbpng6fgsq93iq62v5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -52621,8 +53300,8 @@
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "0894a5dad148524f6e31cd089eda2879fc85fbe4";
-          sha256 = "0ya3f86kryaminjja1868wh6db5hsnczhqldq3hgh7bvlnnsvp6s";
+          rev = "18301b6ffe1149e373dc07d5047b67b9e1faec64";
+          sha256 = "13x25fk2wnddzgx11rmkrhpvaava0knaqhlhk36c6pyldbhbhbxy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -52680,12 +53359,12 @@
     org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-noter";
-        version = "20180225.1352";
+        version = "20180307.1029";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "6ef0f4d1ee13a91da837a940f7c6633e4f5d8d65";
-          sha256 = "06c35lmy2852n1ss7ry2x1m05s7indb3x5zy6lii64bmqcqr1w7v";
+          rev = "abeb48573a62b62c57f63fc89fff31c4d47141e9";
+          sha256 = "17pdx7kc3zk5yx4i10lv421zqv6a9xn37gzyd1h4vljjgs81j4yz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
@@ -52814,11 +53493,11 @@
     org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-password-manager";
-        version = "20170701.919";
+        version = "20180227.1010";
         src = fetchgit {
           url = "https://git.leafac.com/org-password-manager";
-          rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20";
-          sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2";
+          rev = "4b30a36e71182553a02e4dd415369290d98ec03a";
+          sha256 = "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -52876,12 +53555,12 @@
     org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-present";
-        version = "20141109.1756";
+        version = "20180303.1530";
         src = fetchFromGitHub {
           owner = "rlister";
           repo = "org-present";
-          rev = "1b519cfd5abf44bed307cac576dc9fd61eb2c35f";
-          sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
+          rev = "d13acd70eff6a1608bc991920232146a0de76b21";
+          sha256 = "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aba18f15fbaab115456e6afc9433074558a379f5/recipes/org-present";
@@ -52981,12 +53660,12 @@
     org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-random-todo";
-        version = "20171219.58";
+        version = "20180312.104";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-random-todo";
-          rev = "24500edf303a854f09a88b07e1a16a21e164eb87";
-          sha256 = "0c2d5dbr10p1hz51ybygmwv25si6sfwy21kc9xmbjyrrlw5l5sqv";
+          rev = "8357350a66bbc4e0e5cb590acc104d39870cf736";
+          sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -53092,12 +53771,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20180224.1445";
+        version = "20180310.1908";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "8e469035a73e3658d818d1665bcfdfb108d7ae41";
-          sha256 = "1ff901w7qrlgqzxn0cfnw3a6nqs3nip6vja11ikj9lykrh1pkf44";
+          rev = "b4bbc9774c741c299a3a232036342f89905910c8";
+          sha256 = "1ddksbznxq7cpksiqm4cx2k2c442vrm8dsb1ii6xqvnm32wsx4bf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -53166,12 +53845,12 @@
     org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-rich-yank";
-        version = "20180218.156";
+        version = "20180301.401";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-rich-yank";
-          rev = "ffa90b29604e27a60ad341c06d0e43769af19715";
-          sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6";
+          rev = "5d9bc7f474187013a8e1cdc5fc3dc86c41385873";
+          sha256 = "144cyi5k0fjnzdrp9hvhnlxshxhf6jhagiinzaw5aklswz0qs1w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
@@ -53229,12 +53908,12 @@
     org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "org-send-ebook";
-        version = "20180117.1824";
+        version = "20180314.14";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "org-send-ebook";
-          rev = "3e8030a16e420fe4a6fc73b6f166af73880c4843";
-          sha256 = "19v9vjbpvib9jcv4z0jflqym2z101a2xaf2mcjcf692nlrz8y2wk";
+          rev = "c41b6a69a16e73dd64ff1c7353d402e03a2003e2";
+          sha256 = "0j962vyvgavs9h6grayy4c6frba3ksv5n8rklgicwj4zx53b0blf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook";
@@ -53544,12 +54223,12 @@
     org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "20170225.1247";
+        version = "20180310.2352";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "d7885038d7e160a64f561f8abc942206d582faa6";
-          sha256 = "091hznr9pznm26p5vm0kav69qkji6hihf6bil0a314d8k0kaj5bc";
+          rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c";
+          sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
@@ -54390,6 +55069,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "overcast-theme";
+        version = "20180315.1243";
+        src = fetchFromGitHub {
+          owner = "myTerminal";
+          repo = "overcast-theme";
+          rev = "009257956522dedf07d9e136ee41ac0b1b0b3518";
+          sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme";
+          sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r";
+          name = "overcast-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/overcast-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "overseer";
@@ -54477,12 +55177,12 @@
     ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-clip";
-        version = "20170805.505";
+        version = "20180305.1940";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "ox-clip";
-          rev = "b596760aec2ab4e10b18807c01839047aa209d6e";
-          sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy";
+          rev = "594c90953a91948505bb394350adf110e041f19a";
+          sha256 = "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
@@ -54561,12 +55261,12 @@
     ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-hugo";
-        version = "20180222.1537";
+        version = "20180314.2012";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "d53acbb3f8557583a1a03e92ec7626ccc63f5264";
-          sha256 = "0p0a0qfsfg548bymvy57frj9yg5bzbp9r70l31p86q2x3dyjgiyi";
+          rev = "8c792bd2c4899fae6753689198599c8c730fc116";
+          sha256 = "1d6ni4i36srnh4b8f2v1279z67k1rd877ha8rw6a44vjyanzxcvd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -54792,12 +55492,12 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20180222.533";
+        version = "20180314.1713";
         src = fetchFromGitHub {
           owner = "msnoigrs";
           repo = "ox-rst";
-          rev = "313640ac945ec63b7de37fe58d4e71098c2fa4d8";
-          sha256 = "0frxwb5mi4gzv2qfqjvw10xl2vnxkra8p73hp6hx7dawbgxb56j4";
+          rev = "a74b60883b0d844c80efb364dac1560b85f2548f";
+          sha256 = "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
@@ -55384,8 +56084,8 @@
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616";
-          sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf";
+          rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+          sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
@@ -55409,8 +56109,8 @@
           sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless";
-          sha256 = "02jbqdhbq4b3yb9lrqkwaxmyymvcqrjswhzp4sbccw6arla4q7wg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/500be17952ffb6b8d1e524b5b3d316878202fabc/recipes/paperless";
+          sha256 = "182arnx2fz0dww6bvg6m70a1picqd3czmzwv92x0rb4ghwrnq2dq";
           name = "paperless";
         };
         packageRequires = [ cl-lib emacs f s ];
@@ -55567,12 +56267,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20180214.1040";
+        version = "20180226.2134";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "05f554bb5633d48e1ffb053aa3cca462c52600cf";
-          sha256 = "1dxvwc48z4z23pl317pkcrnlpwpyw1qyggzn89xcv7p3abyqqhpz";
+          rev = "5bfc915c4a91da740f3216798327b5676d227569";
+          sha256 = "0zz4l7k2blbxcg1ni3amfys58szw51fvrjk7dbjxp7vsgpp7x3ji";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -55648,6 +56348,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    parseclj = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parseclj";
+        version = "20180225.2233";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "parseclj";
+          rev = "af6102c4a80693cc3b40c4eb5c340358ab4b9696";
+          sha256 = "1m1yvskgvm4np6r36c5gjg5whi1dyg6c1xd0nfqgc0cw9awwxp6b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj";
+          sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172";
+          name = "parseclj";
+        };
+        packageRequires = [ a emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/parseclj";
+          license = lib.licenses.free;
+        };
+      }) {};
     pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pasp-mode";
@@ -57056,12 +57777,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20180219.1806";
+        version = "20180309.822";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "e9e1b5806c169a8c7a7881530dcd2e9a52ab5fe8";
-          sha256 = "1d2isgf17sg7n7vg6dif88yn31yxxgargvllys8azl48x0y40hh9";
+          rev = "b67b34c43c6e937b70fcf87cc324936ef117093b";
+          sha256 = "0z3byyy5wd2h9ab8wnhyfj3xymwz3dxq37caxjfyspzsgaviwq4c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -57074,27 +57795,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "php-plus--mode";
-        version = "20171027.921";
-        src = fetchFromGitHub {
-          owner = "echosa";
-          repo = "phpplus-mode";
-          rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de";
-          sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
-          sha256 = "1wl15l4m68xng1b87a19fm21qwr230ckjz1iwi3y1xl184zliv8p";
-          name = "php-plus--mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/php+-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-refactor-mode";
@@ -57434,12 +58134,12 @@
     pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pip-requirements";
-        version = "20171109.1439";
+        version = "20180306.1522";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pip-requirements.el";
-          rev = "d6d0437794e5de205a5fb03e0ff0a4a1b9e04eea";
-          sha256 = "01j33xlrh8zflzib7gngjhkgg8fvyx2yz57clxzbjkd4377f22c2";
+          rev = "88c764ad5d988a3ed0d2b6f0b7dd22308b03a058";
+          sha256 = "01gl4nzqpmczprsdg13yvcj8d1p49wdwskmkm8nzssrshir6xdxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements";
@@ -57770,12 +58470,12 @@
     playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "playerctl";
-        version = "20170414.156";
+        version = "20180301.554";
         src = fetchFromGitHub {
           owner = "thomasluquet";
           repo = "playerctl.el";
-          rev = "8354352813cd206efb60002f2af4427957bf8894";
-          sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq";
+          rev = "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1";
+          sha256 = "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
@@ -57791,12 +58491,12 @@
     playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "playground";
-        version = "20180224.2325";
+        version = "20180309.1614";
         src = fetchFromGitHub {
           owner = "akirak";
           repo = "emacs-playground";
-          rev = "5b8d9eb5ea48313e2b33ed3a390d7a2e04d9dda8";
-          sha256 = "1v83mkg4573iy6rjnvi5hshbgp98jhyj2c2swz7p4vfcdcak8j2n";
+          rev = "0781674b0d65b287d253f143c2bc51ee65ec5959";
+          sha256 = "0jb8qkj2hbnz4j5xzky1n9kq035xzqadssa3s9zwm43cyn6nn6f7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground";
@@ -57938,8 +58638,8 @@
         version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "7b967191976bf013cca0a5b21b1e3dbe34e86889";
-          sha256 = "18ar8m5sj3drflcpl7z528x28nskhahjl5bwa8624csdzn0fhngy";
+          rev = "007245c860654e88d5228b341c9066e84f035903";
+          sha256 = "091p7m0vs96wywysqbagirpkyn1iw1g4b5afnpv9ng0x4fvilq62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -58196,12 +58896,12 @@
     pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pomidor";
-        version = "20180224.946";
+        version = "20180312.828";
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "458ff63f640ba741959670fca0e439374d2d840a";
-          sha256 = "0vg38cccjfkn2w7a7fxks26x4v27bhxkpz7nfnq1scw88z9hl1sh";
+          rev = "b15219a7a31adeebc80a060c42aed36d4b48d149";
+          sha256 = "0xfl08cfgnms404vmc64mdihp49z00cyqyihk7i4fp1ag8cbja1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -58532,12 +59232,12 @@
     posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "posframe";
-        version = "20180225.2325";
+        version = "20180308.1627";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "posframe";
-          rev = "489620f6bd1ca5a6363d4ab9176b6eeb753e7f3b";
-          sha256 = "1p1khm0mcjq6acjh08z5gaw24hns6sg7p1iy8x6zf63c8kyfq2ls";
+          rev = "c29228eb2100503a0fda39252d4f11c1eb5acc56";
+          sha256 = "1k92gzzy6ys2f86jzggqlz3x6v665hwkafj3frj4mgmxp7yxsiw0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
@@ -58973,12 +59673,12 @@
     prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "prodigy";
-        version = "20180214.1249";
+        version = "20180312.325";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "prodigy.el";
-          rev = "a90f917390cac8ae7e95b57e88a1527b7f3242b3";
-          sha256 = "0b53xgja04vsw22yqxj5vnn4w2x23zcm3fsjwzfxlcgy4h50y3ay";
+          rev = "67b74d1354616f4761acd947fb4f89c6c8bd758e";
+          sha256 = "0pnkw65kr046368xd29rpfbf4x7qd9h430knpy8rgf4czqqvl3hw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
@@ -59182,12 +59882,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20180128.655";
+        version = "20180316.2010";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "c3562c3a182d3c9948db9c8f364e84da2e90c218";
-          sha256 = "044fdvcjqkp25kn20lr77jirgdnzjrxp8i024zp3lz7wa4gywyhy";
+          rev = "981ef7de7cd4d2465e95ae649993561783d85bc8";
+          sha256 = "0za8a1p05xqss2n4y1pvmr686xzaqwqsnp8myc8d3xqpl5412ha3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -59308,12 +60008,12 @@
     projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
     melpaBuild {
         pname = "projectile-ripgrep";
-        version = "20170211.857";
+        version = "20180301.651";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
-          sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
+          rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+          sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -59627,8 +60327,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "a6037c5230c0ccb6531f80cef909dbfe37257884";
-          sha256 = "1847pbxsh2xwfj7vm1hvf88prwni5k2jbswilply034f1648r9ar";
+          rev = "ab95b1bc1eb964ee5f1fb48297344c5d37d35191";
+          sha256 = "0abx3gs9x081wn2p3pc7v2s9rfyv0a1fmrzfwlrv2i4cx1axafig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -59717,12 +60417,12 @@
     psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "psession";
-        version = "20180202.44";
+        version = "20180314.205";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "psession";
-          rev = "0d5091ae1090bad41d8e10a2f3f94a9e87711610";
-          sha256 = "1h60j33nygivwa9hgn98ibyvxmxr02p338iq80z0nhqqkhzg24rp";
+          rev = "6f7c8d6807c76fd351380b2f6f273d800736c5ec";
+          sha256 = "1wc4fx5wqcqj2xzcch0wg5xr5vjdlqm04ljwz3cqv5ipdvqjz80z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -60241,12 +60941,12 @@
     pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pydoc";
-        version = "20170429.1158";
+        version = "20180302.2041";
         src = fetchFromGitHub {
           owner = "statmobile";
           repo = "pydoc";
-          rev = "916153516382e5546b59b46342c58ed76cf27faf";
-          sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c";
+          rev = "146a006493f5284fdf23b42ef90454f1be25d0c1";
+          sha256 = "1wk9zkwqi7vf0jpsf5y7hz0z198x4k9xp2fpqggkqfbv007ks1qq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
@@ -60307,8 +61007,8 @@
         src = fetchFromGitHub {
           owner = "ssbb";
           repo = "pyenv-mode-auto";
-          rev = "51248f13e98240ab146ff45a8247e0f5286277b2";
-          sha256 = "1y5fmc6jrw9xrafq1j2j0k1p5hydvbw1m3zy47b5c55ll97dsflj";
+          rev = "08f319efbc31571f391e032379169ab90fa71418";
+          sha256 = "089n0s0vhwysgrkpjidy7gsl6skmzz2lg011mgiskfvqwijj2vyx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto";
@@ -60450,12 +61150,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "pyimport";
-        version = "20170808.346";
+        version = "20180308.952";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76";
-          sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s";
+          rev = "a6f63cf7ed93f0c0f7c207e6595813966f8852b9";
+          sha256 = "1q5gqhvh4zq5dy8vns694warcz48j1hdnxg16sjck4gsi9xivbvs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -60496,8 +61196,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "04481735e10c8d4584447a6dba97df8653fc7ec5";
-          sha256 = "1v100ccggdhprj7zgs8cs7qi86a6xs2pkzx0whi2hvb8nyyp9gx9";
+          rev = "03aa4ca2d6a78a4d9dc69438cbc76b982aca1569";
+          sha256 = "0a8jdksaabm8ybpk0fzp58v9zy4vld1h857nwxf0crk68r50dv6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -60681,12 +61381,12 @@
     python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "python-pytest";
-        version = "20180226.305";
+        version = "20180307.844";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-python-pytest";
-          rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe";
-          sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm";
+          rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70";
+          sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
@@ -60793,12 +61493,12 @@
     pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyvenv";
-        version = "20180223.22";
+        version = "20180304.712";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "71eec02c25006737444dec7dfd004285f6cff6a8";
-          sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m";
+          rev = "f83c31a825138645dc55db49c5389cd8c7bf7b42";
+          sha256 = "0xq71zbwfl0ijmljcsq74nxmm2pj8m3rbdpwpcdk2j2i6zx2wgr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -60898,12 +61598,12 @@
     quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quasi-monochrome-theme";
-        version = "20171126.203";
+        version = "20180307.458";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-quasi-monochrome";
-          rev = "aa6a3649ad518b9eebd7bc5c84f184469ea735a9";
-          sha256 = "04ihrwnnfhwzg2l3sjsdk84rv36672hapq4016c10z0f106dcyrz";
+          rev = "7c1217521616f568a1c9aba76cc87a7381b833a4";
+          sha256 = "1yg3dg6ldlpxgsxxd15qgpda0jivj4g4cyy631hakdrp5skvpmk6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme";
@@ -61171,12 +61871,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20171116.1435";
+        version = "20180313.719";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "240a52f5e944ca6aa1799cb32160301b1d128917";
-          sha256 = "1r14q751g87846ilvqkifaq0nqyl02dgkfdfdpmsw9k006ml8rfa";
+          rev = "62c40b5a166f3d15d4ab82f5ccc0bbbd0fe90334";
+          sha256 = "0v3myl2sfpk8b4n9xsnpwn37f7bzxyh99lm3ya1qj8p3qvmqszgv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -61801,12 +62501,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20180207.1330";
+        version = "20180312.1514";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "251eb8c971b2a706767326f4f8c6fc5221dd6bd8";
-          sha256 = "0w00j3m73lwkwr2jv1bw8glbx50xk1h5vqnpb26zqk54nz310lw1";
+          rev = "6706358aa7adbfc6b551d8a2fd394287b01070e5";
+          sha256 = "1m9j3gfz9nhlvdfxrn1qf6fysj6zjjzyvr4vs8wnd7zdv2s4cvrw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -61828,12 +62528,12 @@
     realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
     melpaBuild {
         pname = "realgud-byebug";
-        version = "20160805.732";
+        version = "20180308.1923";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-byebug";
-          rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3";
-          sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr";
+          rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a";
+          sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug";
@@ -62164,12 +62864,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20180216.646";
+        version = "20180227.723";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "fcc5b73e2139529e4c0c8b8639cab6bb51dd2b74";
-          sha256 = "0kvh84k9k11xpnvs0kpk4q9nhfjrilwnhlzqmimd51pp7jqz5gff";
+          rev = "8482615ea753ff78aad2f16565ff3a918e7f6435";
+          sha256 = "1h6y2b0073xm996w4858w2xfhj97viq1fn674sfz21g93w4gjw51";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -62227,12 +62927,12 @@
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
-        version = "20180205.956";
+        version = "20180315.1528";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refine";
-          rev = "6b432bef019e7af38ee7145956fa28d512256420";
-          sha256 = "0sf70cb3ahz42pb7lyp380w4k3698z6in9ng10pm47dv7j660llq";
+          rev = "0a99439a0b4ed6f79b9a240ea1270140a9e328bc";
+          sha256 = "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -62315,8 +63015,8 @@
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "right-click-context";
-          rev = "a50d473c3bfb33537d12025115a14c821fa5325a";
-          sha256 = "0n3jdclyxgi579mab8ayynrrcbwpk4rhq3l5dzfpsy1lk690g7hn";
+          rev = "2f8195fb81b8d27aeb42bdc4055ebce37c09717b";
+          sha256 = "05fr1gg5xfwp4rmyyn181vxn2mhmb3aca1g1rp2nk36v7lfzgpxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
@@ -62772,12 +63472,12 @@
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20171203.1248";
+        version = "20180316.851";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b";
-          sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c";
+          rev = "859d944796ce298b5779d9d256bd8d271d57e221";
+          sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -62797,8 +63497,8 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b";
-          sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c";
+          rev = "859d944796ce298b5779d9d256bd8d271d57e221";
+          sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -62898,12 +63598,12 @@
     review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "review-mode";
-        version = "20171029.650";
+        version = "20180312.535";
         src = fetchFromGitHub {
           owner = "kmuto";
           repo = "review-el";
-          rev = "115cd06558c01889f89feaa659e0d7513a2ad21e";
-          sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv";
+          rev = "bf38b0ce8be2eef1cf810ac6f3664d2190bb9ef7";
+          sha256 = "0vmv19qvpba715xqx18dmlxq9kgkzvkf6jfd03bdcj2lh804y3pb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -62940,12 +63640,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rg";
-        version = "20180218.1129";
+        version = "20180312.2254";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "26413536ee71ac6ee07f193b94e60e544d800655";
-          sha256 = "1ic4ym575qj38xd3565nvwyrhzw7lx2mflbirb5aycnz7dis9xsq";
+          rev = "a3516855e12e58cef5894ddf1ca7f7b524c804d7";
+          sha256 = "1hc85c0ffkiawy3ifln8i6rak3samdzlsyl5kz7rqgg8x9pzvaf4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -63108,12 +63808,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "20170810.1118";
+        version = "20180301.650";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
-          sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
+          rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+          sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -63150,12 +63850,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "20171029.1156";
+        version = "20180314.845";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "ed8ff80f7fb7a9d46715577e4937de756b001ff7";
-          sha256 = "14a6qhh4rvsn1z8jhj4wjlljmxmmq2hrmsqpfmvx7yn1r3x51liq";
+          rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0";
+          sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -63381,12 +64081,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20180224.1134";
+        version = "20180224.1658";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
-          sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+          rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+          sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -63822,12 +64522,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20180221.1130";
+        version = "20180303.854";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "cc2435b9e5899c0787929a62dc6e6dcdb982febc";
-          sha256 = "0aq665cd28k4szc07m6cfl50dvr87i4pkbggfj8qim0gwzsgc4bi";
+          rev = "42c98bbf3550aff91fd2a3f24637508b408d4cdb";
+          sha256 = "0l0dk7w1jklg8sh5i8sxh6ggcyb9gna0n72b0icvyfihqn25qk30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -63906,12 +64606,12 @@
     s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "s";
-        version = "20171102.227";
+        version = "20180227.51";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "s.el";
-          rev = "5e9a6857d42015c67681616aa3519f599f97b8d8";
-          sha256 = "00g7nvcbf1291npid30pih72209l5hv2fpv6s6m5i1vg94z081fg";
+          rev = "5968b951bd646c003f2825f31cdf9da94d6f1cae";
+          sha256 = "1ai8r6dmlvaa702yr74dbph97kp5xar3h147ahpk3vj1gh5irvnr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -64263,12 +64963,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20171111.1558";
+        version = "20180314.1511";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "84c3d178a1f2c580f620fd8f03a05ac6413086a3";
-          sha256 = "1ndxylb2jbnfrrsbbs5vcxygrqd3ssf3az01nh694hv6lkcidw5k";
+          rev = "aebea880b3d3de606d8d8c8d65bc6a5040f52d1f";
+          sha256 = "1iqbigqdv1g12q2bg0f6j7xl0z1ra7vy4k8h1wfqxvlb9fqfqr1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -64288,8 +64988,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "21f67de6389234d00a2dde437616063a6479402b";
-          sha256 = "1vn3i5gvyn8nn5sfd8lm9csgl1v4m6n59mkif6c6h37h04232dqn";
+          rev = "3e7fbfff14baf75c5f0c23496ac3fb5c5e6f8a96";
+          sha256 = "12vs4k6ci02jw9l2z0iknm1mhs0w8kis2b9r5r1ip61nb9d43qx1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -65899,12 +66599,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20171230.1219";
+        version = "20180310.1748";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8";
-          sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf";
+          rev = "b33b23097ad34177e4179e9d3731ec5db30c6391";
+          sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -66025,12 +66725,12 @@
     silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "silkworm-theme";
-        version = "20160217.509";
+        version = "20180301.637";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "silkworm-theme";
-          rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b";
-          sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91";
+          rev = "4a297f952401cfe894dcb24174f6eda05e00fada";
+          sha256 = "00kjibpn3ry7j1s6kqmakybialpcx4919344lxks7wij5l6qqxx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
@@ -66113,8 +66813,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-web-server";
-          rev = "c252765de191441cc25068b35bdff6a912745268";
-          sha256 = "08n41cshzxjjd06n8q94yivc72kmwwnmbg469w61v8sanzv0j04q";
+          rev = "868ec06abdc23c69597bc3a12da7aa2e5c0ad9c5";
+          sha256 = "1grq5a74arng2nn5q1xjm7gl5gk55a1js2r22wsahm8gd0fn0jdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
@@ -66424,12 +67124,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20180209.1923";
+        version = "20180315.253";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "61dfcaeb4f560406c188390797448747eef1e90d";
-          sha256 = "0pmkjdq1dlbsjpfcgnmxrkj7iggwzw1b0qpyvldwp6h8xlnkca54";
+          rev = "b7e8aaee092a45ad96ea680a812cdb615463ad6e";
+          sha256 = "1hlynbydgi194j9x2na66zdnf7i2r7iklyxly4jbq7jqqh1zybgr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -66487,12 +67187,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20180218.1356";
+        version = "20180308.733";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "bb663e97339d1ff217c674d649088493b82d08a9";
-          sha256 = "0sc7k7b5fixwpmjx15vpbh3fmaxqz6m21z1ajd4c25jfnxvvhyck";
+          rev = "85ffc5ff9cd1d88e0b2fa10bbcd03d0c84768896";
+          sha256 = "0wvfw7hk95zn78j6ry82gixz3q0z3wdiy7s3gwi8v9a8lizwq83i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -66844,12 +67544,12 @@
     smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smart-compile";
-        version = "20171104.2333";
+        version = "20180315.2030";
         src = fetchFromGitHub {
           owner = "zenitani";
           repo = "elisp";
-          rev = "2a0c9b33bd97461d100e24df0103d4e5526a30d6";
-          sha256 = "1h0d1rbaprxrwgwi8pq2q93xf9j8q8qy7p42iyywav9ilc6sak6p";
+          rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a";
+          sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
@@ -67011,12 +67711,12 @@
     smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
     melpaBuild {
         pname = "smart-mode-line";
-        version = "20180129.130";
+        version = "20180313.1752";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "5aca51956fae55d7310c1f96b5d128201087864a";
-          sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
+          rev = "08993097c991070a3f804e797862a92a8bb4d59c";
+          sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -67036,8 +67736,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "5aca51956fae55d7310c1f96b5d128201087864a";
-          sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
+          rev = "08993097c991070a3f804e797862a92a8bb4d59c";
+          sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -67200,12 +67900,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20180219.758";
+        version = "20180308.1042";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "3452c21f34751bf04f2ede175b3f8eb3fe6ae282";
-          sha256 = "0df4q6467a2rkpsml7bg7s9y336cw6zlgrp1s9h04f92fhv8z9c2";
+          rev = "3181747d9b84ed44b95fa95855609b624ce83d9b";
+          sha256 = "0gv1k922w2sz1lgmivd1d5hh2gvv2w5zpvr51y94ddzpfmph4bwy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -67767,12 +68467,12 @@
     solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
-        version = "20180101.42";
+        version = "20180316.859";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "2dd2699b2f315374333292b132dc0dc03719aba2";
-          sha256 = "04365kpw8a3f3963v6c3q8zka5xivx9jikvcar7fx59l4l7k5i2p";
+          rev = "1a46af3ff988e656a12b93c503fff87324b7420b";
+          sha256 = "1w8rw2fqrf5xmy2i5pr7bxlr6n21vzfhcgd65jknbp2229nggkrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -68152,12 +68852,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20180214.758";
+        version = "20180309.1335";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "0cd15af82bb3adb5fa18bef795a2ea7f021b7e20";
-          sha256 = "19mifs075kkn45dxkgcqixvmf9d72rp79g12vpxi0rp5aw90ddfx";
+          rev = "122b5b7edb0202610be7fcfd96b7a5e03b418de3";
+          sha256 = "1pv0pv1bkp5syvkg2rss82m3f4cfx8s4726hxglm7ar72i6qy21s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -68362,12 +69062,12 @@
     sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sphinx-mode";
-        version = "20170607.1436";
+        version = "20180316.856";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "sphinx-mode";
-          rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f";
-          sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr";
+          rev = "95a14a288b50db70ee10598f83e5b087ba693bfb";
+          sha256 = "0c8p65jwrbn9pmk6j87g99p6fqcahfrc6wngmx94zw5m2wvxca2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
@@ -68632,6 +69332,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sql-clickhouse = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sql-clickhouse";
+        version = "20180302.755";
+        src = fetchFromGitHub {
+          owner = "leethargo";
+          repo = "sql-clickhouse";
+          rev = "35308c9292622547a79c0cc2659db2fc9de42e93";
+          sha256 = "12j9facwvwnwc8ga3nj9yddx3xp3kp28mih6lg4s1b67zj28pccg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse";
+          sha256 = "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j";
+          name = "sql-clickhouse";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/sql-clickhouse";
+          license = lib.licenses.free;
+        };
+      }) {};
     sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sql-impala";
@@ -68845,12 +69566,12 @@
     ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20180222.2157";
+        version = "20180301.2215";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930";
-          sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4";
+          rev = "a3f9ec5dc8ecf7caa7551be31e62a6edfdc542c3";
+          sha256 = "130jrdj9y6cv78a71xsl6j9l79vnzf4081w6v1llxpyy1mn81a33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -69122,8 +69843,8 @@
         src = fetchFromGitHub {
           owner = "ctmarinas";
           repo = "stgit";
-          rev = "416a4569ccd644718b694d4c587b313f357c6f4d";
-          sha256 = "19d8r0l0bqzwkbzd90symq65w2ay30k5bc2xrgdqpawiqz2sx7qf";
+          rev = "ffd7fb7a67b4c90b38f6caa7ce14448e11cbc86e";
+          sha256 = "01rxlg2qqqw1bvzdqdmhikag02sp9f6fira0zhwzxmrp5gsvbh3a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
@@ -69269,8 +69990,8 @@
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "d3bbc560bad160ba183778ca4628a2cce34fdd65";
-          sha256 = "1yjy11s027r7v8bzwsqfpfzh2r2ywnywx7ngajw9gy9yfchw1xxs";
+          rev = "d506eeeac59ea71601a901c311a874949a25372f";
+          sha256 = "0mp9h42qrgdlk34m9ffdqmhyy65slna5vw71bpw1883aic4agq70";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -69935,12 +70656,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20180225.744";
+        version = "20180316.924";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
-          sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+          rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+          sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -70082,12 +70803,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20180218.729";
+        version = "20180306.648";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "1d610fa5023e210e59f823e1bbe819f0fb8727ef";
-          sha256 = "14v5rw2yby2n3dhzc7y1jwnmz53apljb34a9g64h08wdpg2ff0wq";
+          rev = "bb02b971b06fb8e612c62bd2517b49884bc603a0";
+          sha256 = "18ib707rky1k5qw5m4zfd88y1lvgqfilc336ha3v88i7fz8bbzh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -70312,12 +71033,12 @@
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
-        version = "20180131.1624";
+        version = "20180316.811";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "ba902ce6602649aefda675e3c3cfcf20ac7995f2";
-          sha256 = "017gif03773wlb0jfy45lsmq5vxqhghslxck9g6rgap22xn3xbcs";
+          rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d";
+          sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -70672,8 +71393,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "f10b81de14a71c6cb682a46d1a5012daba321e9b";
-          sha256 = "0iwhxikv81i45q6q31yhbij2fli1g7vsbnv5bsaf1rshbwjla3k6";
+          rev = "3d353a435c7fcb0d9edae3094a9ece81914ba34e";
+          sha256 = "14kb6pzj23zrxwfkcxnra1j4fxzm94a3fym0nx1gf7bx362yqn5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -71596,8 +72317,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "d907cc92db5b93e699a4282e979d097ea863215a";
-          sha256 = "1zswprjkjyav2502dfsyyvh9w0hs43qpfwq9q4617p909d0sj1nb";
+          rev = "a9efd1abd4fd4862d8e967ec207015af79494b6c";
+          sha256 = "104viwwc6z9qk7p77wlmb088278f9awwx1v5cycnn6qv8wglhxfj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -71676,12 +72397,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20180212.2229";
+        version = "20180301.121";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "d80f62c07ab880fa486853846dbcda15351b61b5";
-          sha256 = "00bky1vxw08s0z1s9jm813acrnawj0s6mkg71d82lc4ig5x4lbvi";
+          rev = "bd6948be51c61845238fd323a6c08b929534cac1";
+          sha256 = "1ppzr2nhwarzmc3gpf0qcfphq2nz7jjvml1dkskpbm1j322z0mqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -72063,12 +72784,12 @@
     toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toggle";
-        version = "20160331.100";
+        version = "20180315.1703";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "c1b59448e103e32202423a56c873967033778a92";
-          sha256 = "1v3swwmkmfgpylypmg6qv9bykcxqcg9d1awk8zxbwh83ys0q70sf";
+          rev = "ee8a9c3052446876057ff853369d136aea7831f5";
+          sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd02426ce7ab46361363c7a6c56b1575642003e0/recipes/toggle";
@@ -72594,16 +73315,16 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20180221.1229";
+        version = "20180314.435";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
-          sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+          rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+          sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
-          sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
+          sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv";
           name = "treemacs";
         };
         packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
@@ -72619,12 +73340,12 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
-          sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+          rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+          sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
-          sha256 = "1b02dybvp2fs9n1f80gpnqaxic45wwykny7vdyfay11ds5xzfpsg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
+          sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg";
           name = "treemacs-evil";
         };
         packageRequires = [ evil treemacs ];
@@ -72640,12 +73361,12 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
-          sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+          rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+          sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
-          sha256 = "0q3rj0g03423ql0d1ssp928x5f4540kxqlg51584aw57dlyy2z3n";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile";
+          sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc";
           name = "treemacs-projectile";
         };
         packageRequires = [ projectile treemacs ];
@@ -72844,12 +73565,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20180218.130";
+        version = "20180312.410";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "b9941efaba0dbf40ee96c9f1829b562052b3f2d3";
-          sha256 = "1nlb46mkyzdfb0k98wsqqk7mwyh6dfw4i83wxmdpixskww4iywfj";
+          rev = "a3ad3a9220363f2fd0898369866f5879489d51ec";
+          sha256 = "1l7nbg273d1ffnac8crhvmiq8mz2xdyd52aflp0s3am9iw7319kn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -73117,12 +73838,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20180222.534";
+        version = "20180315.1309";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "2815dd1b4bbf902fb61e0a8f1aca6319c7b0c940";
-          sha256 = "0d97frhcf6g4ijr1vphfnvrchj2p1rfpj7zrvj8i3jzb6dakyw4c";
+          rev = "526f307ca8ca50b8f98975f2812198212f6acf2f";
+          sha256 = "1hj4jy91qfpfmnajb4wc9vavx0zlmawi0r1nvkh87ngm3q09mnbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -73670,22 +74391,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    unidecode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    unidecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "unidecode";
-        version = "20140317.2118";
+        version = "20180312.1226";
         src = fetchFromGitHub {
           owner = "sindikat";
           repo = "unidecode";
-          rev = "9e279e88a689584027d5a1b088fe5def25d0f75c";
-          sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
+          rev = "5502ada9287b4012eabb879f12f5b0a9df52c5b7";
+          sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2a5265b00464bcd2bb397229e87385d172856474/recipes/unidecode";
-          sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0af5c20984ebe5458c6e97b24ef97e8b2fbc4045/recipes/unidecode";
+          sha256 = "1xizid7hg98lx2i544w253h6c51ykimim1j58jkn1r5fzqg3r4xd";
           name = "unidecode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/unidecode";
           license = lib.licenses.free;
@@ -73925,12 +74646,12 @@
     use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20180206.1414";
+        version = "20180314.1143";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
-          sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+          rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+          sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
@@ -73950,8 +74671,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
-          sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+          rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+          sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords";
@@ -73988,12 +74709,12 @@
     use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }:
     melpaBuild {
         pname = "use-package-ensure-system-package";
-        version = "20180127.46";
+        version = "20180316.1307";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
-          sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+          rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+          sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package";
@@ -74009,12 +74730,12 @@
     usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "usql";
-        version = "20180204.1407";
+        version = "20180305.1523";
         src = fetchFromGitHub {
           owner = "nickbarnwell";
           repo = "usql.el";
-          rev = "b6bd210ba3feec946576ab1f130d9f91ad2e2c44";
-          sha256 = "1y1da6ipig7r5wcnb1v4pj0j56dsykvgy2pw0h4jxxibcr50pa42";
+          rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d";
+          sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
@@ -74030,12 +74751,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "20170508.2343";
+        version = "20180228.305";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "262539ae26f5e0729d6ef59009e6339a1ec21e94";
-          sha256 = "0f6m9nfvy7vgpnzra8xrb0bpgnhgi93iif4d1mswylwvj3805s6s";
+          rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07";
+          sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -75101,12 +75822,12 @@
     wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wacspace";
-        version = "20140826.2232";
+        version = "20180311.1650";
         src = fetchFromGitHub {
           owner = "shosti";
           repo = "wacspace.el";
-          rev = "4a11168d58c9c129cfcd04a1c9581962565eca4a";
-          sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
+          rev = "54d19aab6fd2bc5945b7ffc58104e695064927e2";
+          sha256 = "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace";
@@ -75226,12 +75947,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20180210.2213";
+        version = "20180316.1534";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "7c70e6308242a8e9f175fca02da9b55a1805508c";
-          sha256 = "0ipwchasw6ijykyl6ikxkghzigbxg8g10rdxqcy0250ra57afc2p";
+          rev = "f0c8c4e55be6569c4c56a1d041f5c53769e4d5ac";
+          sha256 = "11p5kqp16bvas26i0zgdazqhgz6jb6j612q032g6d4476yb8df26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -75457,12 +76178,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20180224.733";
+        version = "20180313.1458";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "c6d5cab4fc30ff9ca8b55a2a37d3ae3f7f540859";
-          sha256 = "03vb5aqyvqzxxw5zafp0hgc5vs7c74917p4r4ki9dp2qwvh82ziq";
+          rev = "49a7a72adf77c8d3ee457ef38dce415cddd09aae";
+          sha256 = "0m0dg0w6pimvq0bp5xm7jca6619n38zsw40mddpb9xw01gxmaagb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -75835,12 +76556,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20180225.1951";
+        version = "20180301.1018";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "0f80d0f95cbf133f52f64578d6a152e7e48ceb0e";
-          sha256 = "0bljzvggx1dzjl904bryny9pdg7xcncnqqzmvymgc3i6j70c0v2f";
+          rev = "d19fe4e037baf8a5cd6e8c0609d3999528bb5ac9";
+          sha256 = "1ylfy31a63g3306v0392a8nx2jdjms10f0r91i7am57pkygrx664";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -76028,8 +76749,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "5922cf54533e1f8a3b1db5f57f07ececf9a20e1e";
-          sha256 = "1qjs9xkqv3084hj67vk9cz4pnkw7hzl48fzps5kng8ip94yiazh3";
+          rev = "900cf8213df6e58bdd3244b446ea02c67b7555d8";
+          sha256 = "1yn2hadcpcsgnf0wy7x8zcfw97c90dpp2ipdml176191vz41n7nb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -76545,6 +77266,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wolfram-mode";
+        version = "20180306.1613";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "wolfram-mode";
+          rev = "be680190cac6ccf579dbce107deaae495928d1b3";
+          sha256 = "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/40ded2302e413e233d867caa4776c54a778b8b99/recipes/wolfram-mode";
+          sha256 = "0rc39vvpyhpn0m52i4hs23j6avqfddmrkhjqg339apfq7z35fpli";
+          name = "wolfram-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/wolfram-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
     melpaBuild {
         pname = "wonderland";
@@ -76590,12 +77332,12 @@
     wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wordnut";
-        version = "20151002.1457";
+        version = "20180312.2143";
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "wordnut";
-          rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb";
-          sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16";
+          rev = "feac531404041855312c1a046bde7ea18c674915";
+          sha256 = "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
@@ -76632,12 +77374,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20171002.1118";
+        version = "20180316.926";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5";
-          sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5";
+          rev = "543bfe21727c0ea96ee0c1022ed334103c0acdf0";
+          sha256 = "0ia74ijp6cdhxjfygvjb5kx36iyakbdws9lsz20761xlp8vw0dfq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -76804,8 +77546,8 @@
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "80dabd5d158929e8433e46207bb521282b21e4f3";
-          sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4";
+          rev = "52321b99be69aa1b661da7743c4421a30d8b6bcb";
+          sha256 = "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
@@ -76947,12 +77689,12 @@
     x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "x509-mode";
-        version = "20180225.2330";
+        version = "20180313.153";
         src = fetchFromGitHub {
           owner = "jobbflykt";
           repo = "x509-mode";
-          rev = "33cddc0fe18652ba707308e907b255ead60e2850";
-          sha256 = "05b7ifmjiy5rw0ywyjknf46garsyfaxrrdzn4rjwrw1crf8f804r";
+          rev = "d59058608bea1840fdba44810d7184b47bc88410";
+          sha256 = "1srqlzgrp75spygw360d1h2jfhlhmgszfsz9kyn8h564mlc3m35k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
@@ -77010,12 +77752,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20180225.1515";
+        version = "20180228.2206";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "cf1cce0ddc3cba18ccd506b04d8278189fbd92c2";
-          sha256 = "0wdfdjcq0yrj2g995879y5ymjb5z1pv38vxvniclifg478qym5yy";
+          rev = "3a617b446fda59294b5ff67c0b86a0a6e9f15feb";
+          sha256 = "1bj2w1r98db1jwirvbvxnbc8p7l9pz3n4l0w2rl9g6kqavdx8pnh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
@@ -77031,12 +77773,12 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170821.358";
+        version = "20180310.450";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887";
-          sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6";
+          rev = "0cd985675c286bfa5f07ab9d00231f8a23505537";
+          sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
@@ -77052,12 +77794,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20180221.1809";
+        version = "20180313.1143";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "c01ddd038e03051bcc8010629b7548838db2531b";
-          sha256 = "132afibrgz6381nanjhalkgqmxwia6ykyprrasa19m9kbm96xwdl";
+          rev = "cef43c378743bd0073e9044b5cd4df212a022bd8";
+          sha256 = "1qa4payi7r6ncg2dgp9frs6g8gmsc5mfaxssf84lgm3p3468y0fw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -77115,12 +77857,12 @@
     xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20180216.1040";
+        version = "20180308.349";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "16a441944da3fb3f844b93d0add1e042e1b5377a";
-          sha256 = "1vr7dkibw5ibd1c3snxy2pw055yl620pi2vynxszsk82shz2xvbz";
+          rev = "2904922958f746cbb77692564e4c4487ff31c9ab";
+          sha256 = "1zk02fbkd9y6hy226lnqf31c3l5sync2m6gqj1m4pj4qqla98m1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
@@ -77829,12 +78571,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "20170323.1104";
+        version = "20180306.407";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
-          sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
+          rev = "340aec635e359609b22f7e94df15af1af2b070f6";
+          sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -77997,12 +78739,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20180218.459";
+        version = "20180310.1614";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "3d7cafccf8d7ea9d62e0ccd63c30769de5b8cf01";
-          sha256 = "0m5z46vdv5npwpkqc87jsf488k31mpqphsg1yayy4pjqz2bn68vb";
+          rev = "5170f051ad39353ed46ae7ff7b67e50e0e27324c";
+          sha256 = "1ssb1ljbm8i78qii15yhd488y3q1w2082lb2pcwly2axwa5a02kv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -78018,12 +78760,12 @@
     yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yasnippet-snippets";
-        version = "20180222.440";
+        version = "20180307.518";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "2373036c13d71c5fab2616d97498213f54688bd6";
-          sha256 = "18sdc92qaacxp757yqdv71hx2pjhcy33vshkwjdi6mmmqa1d2zq8";
+          rev = "2b4c4d7ef7e85a3b9306ce7da82a65cf243edc22";
+          sha256 = "0v0q8ym8jp6pps6g9g0qnz9x39i4n4w937s8s6arf1f31fc73r52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -78424,12 +79166,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20180201.246";
+        version = "20180308.957";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "553ba2ba9907e56bda1d2ebf142ba7cbf9bd16f1";
-          sha256 = "1d9fclil0nf06gc9734y3p6clkxpwxa8nqh9mk9kpj8k9b36lxcn";
+          rev = "2a240de8cd89c741612d807a521d6b3e51088324";
+          sha256 = "10r806hzmgwnysjgg5lx252ychnhyma1bpwm980pf46vlywws5a0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
@@ -78445,16 +79187,16 @@
     zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zig-mode";
-        version = "20170920.802";
+        version = "20180309.1458";
         src = fetchFromGitHub {
-          owner = "AndreaOrru";
+          owner = "zig-lang";
           repo = "zig-mode";
-          rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd";
-          sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx";
+          rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8";
+          sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode";
-          sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode";
+          sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly";
           name = "zig-mode";
         };
         packageRequires = [ emacs ];
@@ -78634,12 +79376,12 @@
     zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom";
-        version = "20171110.715";
+        version = "20180310.421";
         src = fetchFromGitHub {
           owner = "cyrus-and";
           repo = "zoom";
-          rev = "d4f417b24fe022b6512a1a0ffebf898044393250";
-          sha256 = "0qksgg0c4z5c293avc87q2hgwnvr550rycwgnvrp574n3qmvqjmd";
+          rev = "a72714bb14eb32c1c5e7ad1cb4bdeb208450e507";
+          sha256 = "176fbhsh2rk6rn8fisfq4ja71lqvf1zbb393wzfsgg68df39mqyh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
@@ -78760,12 +79502,12 @@
     zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoutline";
-        version = "20170722.651";
+        version = "20180314.1059";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "zoutline";
-          rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507";
-          sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91";
+          rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699";
+          sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";

From 27faba541fffec6b08e5382c0081e7598a807b39 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 23:48:23 -0700
Subject: [PATCH 1244/2266] mkdocs: 0.17.2 -> 0.17.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/.mkdocs-wrapped -h` got 0 exit code
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/.mkdocs-wrapped --help` got 0 exit code
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/.mkdocs-wrapped -V` and found version 0.17.3
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/.mkdocs-wrapped --version` and found version 0.17.3
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/mkdocs -h` got 0 exit code
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/mkdocs --help` got 0 exit code
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/mkdocs -V` and found version 0.17.3
- ran `/nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3/bin/mkdocs --version` and found version 0.17.3
- found 0.17.3 with grep in /nix/store/wy5434b824p55fr8x67vz8q8ph9g65kn-mkdocs-0.17.3
- directory tree listing: https://gist.github.com/b9a97908c199575f84016b19365ae126
---
 pkgs/development/tools/documentation/mkdocs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index b6daade32e7..95c2a6a28a7 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -4,14 +4,14 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "mkdocs";
-  version = "0.17.2";
+  version = "0.17.3";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = "mkdocs";
     rev = version;
-    sha256 = "0hpjs9qj0nr57a249yv8xvl61d3d2rrdfqxp1fm28z77l2xjj772";
+    sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw";
   };
 
   checkInputs = [

From e2d12274c27205e7847ea1e02664119371aa3e22 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 02:02:11 -0500
Subject: [PATCH 1245/2266] jags: 4.1.0 -> 4.3.0 Semi-automatic update
 generated by https://github.com/ryantm/nix-update tools. These checks were
 done: - built on NixOS - Warning: no binary found that responded to help or
 version flags. (This warning appears even if the package isn't expected to
 have binaries.) - found 4.3.0 with grep in
 /nix/store/aw897502z5bcn6dw6rp7jca90flfrjab-JAGS-4.3.0

---
 pkgs/applications/science/math/jags/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index a30343dd0b9..2925e601e32 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gfortran, openblas}:
 
 stdenv.mkDerivation rec {
-  name = "JAGS-4.1.0";
+  name = "JAGS-4.3.0";
   src = fetchurl {
     url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
-    sha256 = "08pmrnbwibc0brgn5cx860jcl0s2xaw4amw7g45649r1bcdz7v25";
+    sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica";
   };
   buildInputs = [gfortran openblas];
   configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];

From b6ca84c94e94da8cc8395d78277ccf0f401e1b1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 20:50:45 +0100
Subject: [PATCH 1246/2266] hackage2nix: extend the set of packages I maintain

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cb673f76bf6..a769c9e1f1a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2433,9 +2433,10 @@ extra-packages:
 
 package-maintainers:
   peti:
-    - cabal-install
     - cabal2nix
     - cabal2spec
+    - cabal-install
+    - distribution-nixpkgs
     - funcmp
     - git-annex
     - hackage-db
@@ -2448,11 +2449,14 @@ package-maintainers:
     - hsemail
     - hsyslog
     - jailbreak-cabal
+    - json-autotype
     - lambdabot-core
     - lambdabot-irc-plugins
     - language-nix
     - logging-facade-syslog
+    - nix-paths
     - pandoc
+    - postmaster
     - stack
     - streamproc
     - structured-haskell-mode

From c81d3e72e8dfc0c01957efabc5101d71710ec18b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 20:51:25 +0100
Subject: [PATCH 1247/2266] hackage2nix: disable failing Hydra builds

---
 .../configuration-hackage2nix.yaml            | 595 ++++++++++++++++++
 1 file changed, 595 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a769c9e1f1a..24a96299635 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2677,7 +2677,9 @@ dont-distribute-packages:
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ADPfusionForest:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ADPfusionSet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2714,12 +2716,15 @@ dont-distribute-packages:
   aip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  airship:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   airtable-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aivika-experiment-diagrams:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alerta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-prelude:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2744,12 +2749,123 @@ dont-distribute-packages:
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-apigateway:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-application-autoscaling:             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-appstream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-athena:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-autoscaling:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-batch:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-budgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-certificatemanager:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-clouddirectory:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudformation:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudfront:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudhsm:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudhsmv2:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudsearch-domains:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudsearch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudtrail:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudwatch-events:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudwatch-logs:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cloudwatch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-codebuild:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-codecommit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-codedeploy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-codepipeline:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-codestar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cognito-identity:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cognito-idp:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cognito-sync:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-config:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-cur:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-datapipeline:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-devicefarm:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-directconnect:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-discovery:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-dms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ds:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-dynamodb-dax:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-dynamodb-streams:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-dynamodb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ec2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ecr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ecs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-efs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elasticache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elasticbeanstalk:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elasticsearch:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elastictranscoder:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-elbv2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-emr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-gamelift:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-glacier:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-glue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-greengrass:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-health:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-iam:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-importexport:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-inspector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-iot-dataplane:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-iot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-kinesis-analytics:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-kinesis-firehose:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-kinesis:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-kms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-lambda:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-lex-models:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-lex-runtime:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-lightsail:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-marketplace-analytics:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-marketplace-entitlement:             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-marketplace-metering:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-mechanicalturk:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-migrationhub:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-mobile:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-opsworks-cm:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-opsworks:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-organizations:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-pinpoint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-polly:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-pricing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-rds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-redshift:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-rekognition:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-resourcegroupstagging:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-route53-domains:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-route53:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-s3-streaming:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-s3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-sdb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-servicecatalog:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-shield:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-sms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-snowball:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-sns:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ssm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-stepfunctions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-storagegateway:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-sts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-support:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-swf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-waf-regional:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-waf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-workdocs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-workspaces:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-xray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   amqp-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amqp-worker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   analyze-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  analyze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anansi-pandoc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   anatomy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   android-activity:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2759,20 +2875,24 @@ dont-distribute-packages:
   angel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   angle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  animascii:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate-example:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   annah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ansi-terminal-game:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   antagonist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   antisplice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-authenticate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-clientsession:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2790,6 +2910,7 @@ dont-distribute-packages:
   apiary-websockets:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   apis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apns-http2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2800,8 +2921,10 @@ dont-distribute-packages:
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2822,6 +2945,7 @@ dont-distribute-packages:
   ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrowp-qq:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2838,6 +2962,7 @@ dont-distribute-packages:
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-combinators:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-dejafu:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2875,6 +3000,8 @@ dont-distribute-packages:
   authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AutoForms:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   autom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  autonix-deps-kf5:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  autonix-deps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   avahi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   avatar-generator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api-docs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2907,7 +3034,9 @@ dont-distribute-packages:
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2918,6 +3047,7 @@ dont-distribute-packages:
   backward-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Baggins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ballast:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-launcher:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-plugin-highlight:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2936,6 +3066,7 @@ dont-distribute-packages:
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-bytestring-type:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2950,6 +3081,9 @@ dont-distribute-packages:
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bdcs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-migrate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2989,6 +3123,7 @@ dont-distribute-packages:
   binary-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-serialise-cbor:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-typed:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3035,7 +3170,10 @@ dont-distribute-packages:
   BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseTypes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseXNA:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BioHMM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biophd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3050,6 +3188,7 @@ dont-distribute-packages:
   Bitly:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitmaps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bits-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3066,6 +3205,7 @@ dont-distribute-packages:
   blas-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BlastHTTP:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   blatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-builder-enumerator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3081,8 +3221,10 @@ dont-distribute-packages:
   blockhash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloodhound-amazonka-auth:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blosum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3101,8 +3243,10 @@ dont-distribute-packages:
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bowntz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brain-bleep:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3116,6 +3260,7 @@ dont-distribute-packages:
   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 ]
+  browscap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-generic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3137,6 +3282,8 @@ dont-distribute-packages:
   Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bv-sized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  byline:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3169,10 +3316,12 @@ dont-distribute-packages:
   cabal-lenses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-plan:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-src:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3190,6 +3339,7 @@ dont-distribute-packages:
   cacophony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   caffegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3267,12 +3417,14 @@ dont-distribute-packages:
   cef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  celtchar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cerberus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-io-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cereal-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3287,6 +3439,7 @@ dont-distribute-packages:
   chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Chart-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-unit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3324,6 +3477,7 @@ dont-distribute-packages:
   citation-resolve:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cj-token:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3409,6 +3563,7 @@ dont-distribute-packages:
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   collapse-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collection-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3420,6 +3575,7 @@ dont-distribute-packages:
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3478,11 +3634,16 @@ dont-distribute-packages:
   conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-find:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-merge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-network-stream:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-resumablesink:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-throttle:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-tokenize-attoparsec:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-zstd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   confide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3497,6 +3658,7 @@ dont-distribute-packages:
   consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   console-program:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constrained-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3506,6 +3668,7 @@ dont-distribute-packages:
   consumers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   container:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   containers-benchmark:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  containers-verified:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   content-store:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3542,6 +3705,7 @@ dont-distribute-packages:
   CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coroutine-object:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coroutine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3579,6 +3743,7 @@ dont-distribute-packages:
   creatur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   credential-store:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   credentials-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  credentials:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1-constrained:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3618,6 +3783,7 @@ dont-distribute-packages:
   ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cube:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  currency-codes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3732,6 +3898,7 @@ dont-distribute-packages:
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  debug:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3769,6 +3936,7 @@ dont-distribute-packages:
   derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   deterministic-game-engine:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   deunicode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3778,18 +3946,32 @@ dont-distribute-packages:
   dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-braille:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-cairo:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-contrib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-graphviz:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-gtk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-html5:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-lib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pandoc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-postscript:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-qrcode:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-rasterific:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-rubiks-cube:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice2tex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3848,6 +4030,7 @@ dont-distribute-packages:
   distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diversity:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dixi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   djembe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   djinn-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3892,6 +4075,7 @@ dont-distribute-packages:
   dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DPutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dresdner-verkehrsbetriebe:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3954,6 +4138,7 @@ dont-distribute-packages:
   ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eddie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ede:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   edenmodules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   edenskel:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3963,6 +4148,7 @@ dont-distribute-packages:
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effect-handlers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3971,6 +4157,7 @@ dont-distribute-packages:
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eight-Ball-Pool-Hack-Cheats:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ekg-cloudwatch:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-elastic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-influxdb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3998,7 +4185,9 @@ dont-distribute-packages:
   encoding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-growler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-snap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  engine-io-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4031,12 +4220,15 @@ dont-distribute-packages:
   escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ess:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   estreps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EtaMOO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   etc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  etcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity-timestamped:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4077,7 +4269,9 @@ dont-distribute-packages:
   exinst-bytes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-deepseq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-hashable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exinst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exitcode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4113,6 +4307,7 @@ dont-distribute-packages:
   fast-arithmetic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-combinatorics:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-nats:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fasta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastcgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4121,13 +4316,17 @@ dont-distribute-packages:
   FastxPipe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fathead-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-dom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-geoposition:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-jquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-ref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-uri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4148,6 +4347,7 @@ dont-distribute-packages:
   feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fenfire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   FermatsLastMargin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fernet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4155,6 +4355,7 @@ dont-distribute-packages:
   Feval:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fficxx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ffmpeg-light:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fgl-extras-decompositions:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4178,6 +4379,7 @@ dont-distribute-packages:
   fillit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   filtrable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   final-pretty-printer:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4196,6 +4398,7 @@ dont-distribute-packages:
   fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-precision:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-vector-cborg:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4223,12 +4426,17 @@ dont-distribute-packages:
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fluent-logger-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fluent-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-transduce-attoparsec:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4267,10 +4475,12 @@ dont-distribute-packages:
   Fractaler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fractals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Frames:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   franchise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frank:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fraxl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-concurrent:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4279,6 +4489,7 @@ dont-distribute-packages:
   free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer-converse:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer-effects:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4286,6 +4497,7 @@ dont-distribute-packages:
   freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fresco-binding:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4348,6 +4560,12 @@ dont-distribute-packages:
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gegl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gelatin-freetype2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gelatin-fruity:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gelatin-gl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gelatin-sdl2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gelatin-shaders:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gen-imports:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gen-passwd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4399,6 +4617,7 @@ dont-distribute-packages:
   geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geodetics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4406,12 +4625,15 @@ dont-distribute-packages:
   geom2d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeomPredicates-SSE:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   geos:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Get:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   getemx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-dump-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-tree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-dump-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4425,13 +4647,17 @@ dont-distribute-packages:
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-time-alloc-prof:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-history-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-jsaddle:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom-jsffi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-fetch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4466,6 +4692,7 @@ dont-distribute-packages:
   Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ginsu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  giphy-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4482,14 +4709,22 @@ dont-distribute-packages:
   git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-data:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-cmdline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-libgit2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-sample:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-test:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  givegif:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   glapp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4534,12 +4769,124 @@ dont-distribute-packages:
   gochan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   goggles-gcs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-adexchange-buyer:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-adexchange-seller:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-admin-datatransfer:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-admin-directory:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-admin-emailmigration:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-admin-reports:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-adsense-host:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-adsense:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-affiliates:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-analytics:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-android-enterprise:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-android-publisher:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-appengine:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-apps-activity:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-apps-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-apps-licensing:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-apps-reseller:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-apps-tasks:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-appstate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-autoscaler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-bigquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-billing:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-blogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-books:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-civicinfo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-classroom:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-cloudmonitoring:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-cloudtrace:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-compute:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-container:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-containerbuilder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-customsearch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-dataflow:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-dataproc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-datastore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-debugger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-deploymentmanager:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-dfareporting:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-discovery:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-dns:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-doubleclick-bids:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-doubleclick-search:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-drive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-firebase-dynamiclinks:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-firebase-rules:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-fitness:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-fonts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-freebasesearch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-fusiontables:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-games-configuration:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-games-management:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-genomics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-gmail:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-groups-migration:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-groups-settings:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-iam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-identity-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-kgsearch:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-latencytest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-logging:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-manufacturers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-maps-coordinate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-maps-engine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-mirror:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-ml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-monitoring:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-oauth2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-pagespeed:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-partners:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-people:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-play-moviespartner:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-plus-domains:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-prediction:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-proximitybeacon:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-pubsub:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-qpxexpress:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-replicapool-updater:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-replicapool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-resourcemanager:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-resourceviews:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-runtimeconfig:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-safebrowsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-script:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-sheets:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-shopping-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-siteverification:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-slides:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-spectrum:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-sqladmin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-storage-transfer:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-storage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-tagmanager:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-taskqueue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-translate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-urlshortener:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-useraccounts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-vision:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-webmaster-tools:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-youtube-analytics:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-youtube-reporting:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-youtube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-mail-filters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-maps-geocoding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-server-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-static-maps:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleCodeJam:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4568,9 +4915,11 @@ dont-distribute-packages:
   GPX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   graceful:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grafos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grakn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-matchings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-lambdascope:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4599,11 +4948,13 @@ dont-distribute-packages:
   graylog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greenclip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grenade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   greplicate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4648,6 +4999,7 @@ dont-distribute-packages:
   GuiHaskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GuiTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gyah-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gym-http-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4734,6 +5086,7 @@ dont-distribute-packages:
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hamtsolo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   handa-gdata:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4840,6 +5193,7 @@ dont-distribute-packages:
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-packages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4863,6 +5217,8 @@ dont-distribute-packages:
   haskell-tools-daemon:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-debug:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-demo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-experimental-refactorings:      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-refactor:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-typescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4898,6 +5254,8 @@ dont-distribute-packages:
   haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskey-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskey:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskgame:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskheap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskhol-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4920,6 +5278,7 @@ dont-distribute-packages:
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-system-build:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskus-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasmin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4954,6 +5313,7 @@ dont-distribute-packages:
   hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hawk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hax:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haxl-amazonka:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-facebook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxr-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5008,8 +5368,11 @@ dont-distribute-packages:
   HDRUtils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   headergen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   heap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heavy-logger-amazon:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hecc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heckle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hedgehog-checkers-lens:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hedgehog-checkers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-gen-json:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-config:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5109,6 +5472,7 @@ dont-distribute-packages:
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5136,6 +5500,7 @@ dont-distribute-packages:
   hinterface:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipchat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5154,6 +5519,8 @@ dont-distribute-packages:
   hjcase:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJScript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hjsonpointer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hjsonschema:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlbfgsb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5204,28 +5571,34 @@ dont-distribute-packages:
   hmt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmumps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnetcdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hnix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnormalise:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hobbits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hocilib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hocker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hodatime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hofix-mtl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoggl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoist-error:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hold-em:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-MapReduce:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Searchengine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  holy-project:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   homoiconic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5237,6 +5610,7 @@ dont-distribute-packages:
   hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-publish:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-render:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5248,6 +5622,7 @@ dont-distribute-packages:
   hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   horname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5321,6 +5696,7 @@ dont-distribute-packages:
   hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-rs-notify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-snowtify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5375,8 +5751,10 @@ dont-distribute-packages:
   hsgsom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHaruPDF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsHTSLib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hskeleton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5431,6 +5809,8 @@ dont-distribute-packages:
   hsreadability:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hssqlppp-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hssqlppp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5465,8 +5845,10 @@ dont-distribute-packages:
   http-client-auth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-lens:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-request-modifiers:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-client-session:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-conduit-browser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-conduit-downloader:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-dispatch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5474,6 +5856,7 @@ dont-distribute-packages:
   http-pony-serve-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-response-decoder:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-reverse-proxy:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-wget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5542,6 +5925,7 @@ dont-distribute-packages:
   hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyper-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperfunctions:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5553,6 +5937,7 @@ dont-distribute-packages:
   iap-verifier:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ib-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iban:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ical:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   icon-fonts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5576,11 +5961,13 @@ dont-distribute-packages:
   igrf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-basic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-display:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-rlangqq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imagemagick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagepaste:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   imap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5602,6 +5989,7 @@ dont-distribute-packages:
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indents:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexed-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5628,11 +6016,13 @@ dont-distribute-packages:
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interlude-l:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5699,6 +6089,7 @@ dont-distribute-packages:
   jail:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalla:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jammittools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jason:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5714,6 +6105,7 @@ dont-distribute-packages:
   Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jenga:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jenkinsPlugins2nix:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5721,9 +6113,12 @@ dont-distribute-packages:
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle-clib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle-dom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-warp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-wkwebview:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5815,6 +6210,7 @@ dont-distribute-packages:
   keyring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keysafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keystore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keyvaluehash:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   keyword-args:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   khph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5844,6 +6240,7 @@ dont-distribute-packages:
   L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   labeled-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   laborantin-hs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  labsat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   labyrinth-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5874,6 +6271,7 @@ dont-distribute-packages:
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdatex:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdaya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5902,6 +6300,7 @@ dont-distribute-packages:
   language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-puppet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-python-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-python:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5913,6 +6312,7 @@ dont-distribute-packages:
   language-webidl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lapack-carray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lapack-ffi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lapack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LargeCardinalHierarchy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5974,6 +6374,7 @@ dont-distribute-packages:
   libexpect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   libGenI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libhbb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libjenkins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblastfm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblawless:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblinear-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5984,6 +6385,8 @@ dont-distribute-packages:
   libpafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   librandomorg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  librato:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libstackexchange:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6008,6 +6411,7 @@ dont-distribute-packages:
   linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-socket:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6028,6 +6432,7 @@ dont-distribute-packages:
   liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  list-fusion-probe:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-prompt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-remote-forwards:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6039,6 +6444,7 @@ dont-distribute-packages:
   list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   listenbrainz-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ListT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6071,6 +6477,7 @@ dont-distribute-packages:
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-warper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6098,12 +6505,14 @@ dont-distribute-packages:
   lookup-tables:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-effin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-while:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loops:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   loopy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lord:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lorem:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   loshadka:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6137,6 +6546,7 @@ dont-distribute-packages:
   lzma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-amazonka:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-process:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6192,6 +6602,7 @@ dont-distribute-packages:
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marvin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MASMGen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   master-plan:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6238,6 +6649,8 @@ dont-distribute-packages:
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mellon-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcache-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcache-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6271,9 +6684,11 @@ dont-distribute-packages:
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microsoft-translator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   MicrosoftTranslator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6305,7 +6720,9 @@ dont-distribute-packages:
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mobile-Legends-Hack-Cheats:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  model:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modify-fasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-prelude-classy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6323,6 +6740,7 @@ dont-distribute-packages:
   monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-http:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-levels:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lgbt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6330,6 +6748,8 @@ dont-distribute-packages:
   monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-open:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-parallel-progressbar:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-persist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ste:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6362,6 +6782,7 @@ dont-distribute-packages:
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6416,6 +6837,7 @@ dont-distribute-packages:
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multi-ghc-travis:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6529,6 +6951,7 @@ dont-distribute-packages:
   netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-api-support:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bitcoin:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6537,6 +6960,7 @@ dont-distribute-packages:
   network-hans:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-interfacerequest:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-msgpack-rpc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-netpacket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-rpca:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6570,6 +6994,9 @@ dont-distribute-packages:
   Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nirum:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nix-delegate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nix-deploy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nix-diff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nix-eval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6601,6 +7028,7 @@ dont-distribute-packages:
   notzero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nqe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ntrip-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NTRU:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6619,6 +7047,9 @@ dont-distribute-packages:
   numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nutri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs-ghcid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nylas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6651,6 +7082,7 @@ dont-distribute-packages:
   olwrapper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   om-elm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ombra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6664,8 +7096,10 @@ dont-distribute-packages:
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opaleye-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-signals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6690,6 +7124,7 @@ dont-distribute-packages:
   opentype:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openweathermap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6738,10 +7173,12 @@ dont-distribute-packages:
   PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paillier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-crossref:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-csv2table:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include-code:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6764,6 +7201,7 @@ dont-distribute-packages:
   Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Parallel-Arrows-Eden:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  paramtree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   paranoia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6772,6 +7210,7 @@ dont-distribute-packages:
   pareto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parsec-free:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   parseerror-eq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsely:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6788,6 +7227,7 @@ dont-distribute-packages:
   pasta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pastis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pasty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  patat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   patches-vector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pathfinder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pathfindingcore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6797,6 +7237,7 @@ dont-distribute-packages:
   paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-rest-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pb-next:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pbc4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PBKDF2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6836,7 +7277,9 @@ dont-distribute-packages:
   persistent-hssqlppp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-mysql-haskell:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-odbc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-ratelimit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-test:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6851,6 +7294,7 @@ dont-distribute-packages:
   pg-recorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-transact:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pgdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6872,10 +7316,15 @@ dont-distribute-packages:
   pictikz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinchot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pinpon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-bgzf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-break:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-bytestring:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-bzip:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cacophony:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6884,10 +7333,13 @@ dont-distribute-packages:
   pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-fastx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-group:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-illumina:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-lines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-lzma:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6897,6 +7349,7 @@ dont-distribute-packages:
   pipes-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-shell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-sqlite-simple:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-zeromq4:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6920,6 +7373,7 @@ dont-distribute-packages:
   plot-gtk-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Plot-ho-matic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plots:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6930,6 +7384,7 @@ dont-distribute-packages:
   pocket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointfree-fancy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pointful:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6939,6 +7394,7 @@ dont-distribute-packages:
   polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polimorf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  poly-cont:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   poly-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polydata-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   polydata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6978,6 +7434,7 @@ dont-distribute-packages:
   postgresql-simple-queue:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-simple-url:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-syntax:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6985,11 +7442,15 @@ dont-distribute-packages:
   postgrest-ws:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-cereal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  potrace-diagrams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  powerqueue-levelmem:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  powerqueue-sqs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PPrinter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7000,6 +7461,7 @@ dont-distribute-packages:
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  preliminaries:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-generalize:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   preprocess-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7009,6 +7471,8 @@ dont-distribute-packages:
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pringletons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7019,6 +7483,7 @@ dont-distribute-packages:
   PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  process-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-iterio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-listlike:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7032,6 +7497,8 @@ dont-distribute-packages:
   producer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  profiteur:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progress-meter:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7044,6 +7511,7 @@ dont-distribute-packages:
   prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prologue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prometheus-effect:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prometheus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   promise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   propane:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Proper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7053,6 +7521,7 @@ dont-distribute-packages:
   prosper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-protoc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7063,6 +7532,7 @@ dont-distribute-packages:
   proxy-mapping:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   psc-ide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ptr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   publicsuffixlistcreate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubnub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubsub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7081,11 +7551,14 @@ dont-distribute-packages:
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript-tsd-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-apn:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pusher-ws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7178,11 +7651,14 @@ dont-distribute-packages:
   random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-string:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  range-set-list:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rank2classes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rapid-term:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-cmd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7210,13 +7686,18 @@ dont-distribute-packages:
   react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-bunch:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-gi-gtk:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl2:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-wx:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-midyim:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7235,8 +7716,10 @@ dont-distribute-packages:
   records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   redland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reenact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7331,13 +7814,19 @@ dont-distribute-packages:
   reserve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resolv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   resolve-trivial-conflicts:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resolve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-embed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-pool-catchio:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   respond:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-gen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-happstack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   restful-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   RESTng:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7382,13 +7871,16 @@ dont-distribute-packages:
   RNAdraw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAFold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAFoldProgs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RNAlien:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAwolf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rncryptor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  robin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   robot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   robots-txt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   roc-cluster-demo:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roc-cluster:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rocksdb-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7437,6 +7929,7 @@ dont-distribute-packages:
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-length:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safecopy-migrate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7469,6 +7962,7 @@ dont-distribute-packages:
   satchmo-funsat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-minisat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-toysat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  savage:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sc3-rdu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalable-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7478,7 +7972,9 @@ dont-distribute-packages:
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  schedule-planner:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedyield:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  schematic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-texmath:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7496,6 +7992,8 @@ dont-distribute-packages:
   scotty-fay:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-format:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-hastache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-resource:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-rest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-view:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7535,16 +8033,19 @@ dont-distribute-packages:
   semiring-num:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sendgrid-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sendgrid-v3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentence-jp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  separated:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqid-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqloc-datafiles:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serialise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   serialize-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   serokell-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   serpentine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7552,24 +8053,34 @@ dont-distribute-packages:
   serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-aeson-specs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-cookie:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-server:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-acid:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-token-leveldb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-token-persistent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-rocksdb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-client-core:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-ede:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-ekg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-elm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-iCalendar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-match:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-proto-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-pushbullet-client:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-py:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-rawm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-router:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7582,16 +8093,20 @@ dont-distribute-packages:
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   serverless-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-frontend-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serversession-frontend-yesod:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   services:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sessiontypes-distributed:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sessiontypes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sets:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   setters:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sext:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7621,6 +8136,7 @@ dont-distribute-packages:
   shared-fields:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shell-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7645,6 +8161,7 @@ dont-distribute-packages:
   simple-atom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-download:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7680,11 +8197,13 @@ dont-distribute-packages:
   singnal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  siren-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sitepipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-types:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sjsp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7694,6 +8213,7 @@ dont-distribute-packages:
   skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack-web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slave-thread:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7744,6 +8264,7 @@ dont-distribute-packages:
   snaplet-auth-acid:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-coffee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-css-min:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-customauth:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-environments:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-fay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-ghcjs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7790,11 +8311,14 @@ dont-distribute-packages:
   snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snowtify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-unix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7825,6 +8349,7 @@ dont-distribute-packages:
   sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spatial-math:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spdx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   spelling-suggest:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7859,6 +8384,7 @@ dont-distribute-packages:
   sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlcipher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqlite-simple-errors:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7881,9 +8407,11 @@ dont-distribute-packages:
   stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack2nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-metadata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-query:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-sandbox:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7903,6 +8431,7 @@ dont-distribute-packages:
   state-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stateWriter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-tensor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7925,10 +8454,12 @@ dont-distribute-packages:
   stitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   STL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-containers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-promise:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stochastic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StockholmAlignment:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7949,6 +8480,8 @@ dont-distribute-packages:
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-pcap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-png:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-postgresql-simple:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   strelka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7956,6 +8489,7 @@ dont-distribute-packages:
   string-isos:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stripe-tests:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-induction:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-traversal:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7989,8 +8523,10 @@ dont-distribute-packages:
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supplemented:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SVD2HS:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SVGFonts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7999,6 +8535,7 @@ dont-distribute-packages:
   swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   swift-lda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SWMMoutGetMB:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-with-class-instances-text:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SybWidget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8076,16 +8613,19 @@ dont-distribute-packages:
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-fail-fast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-jenkins-xml:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-laws:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-travis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TaxonomyTools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcache-AWS:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcod-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8138,6 +8678,7 @@ dont-distribute-packages:
   test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8146,9 +8687,11 @@ dont-distribute-packages:
   testrunner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeX-my-math:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  texbuilder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-containers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8179,6 +8722,7 @@ dont-distribute-packages:
   th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   thank-you-stars:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  theatre:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   themoviedb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thentos-cookie-session:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8192,6 +8736,8 @@ dont-distribute-packages:
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  throwable-exceptions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thumbnail-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tibetan-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8216,10 +8762,12 @@ dont-distribute-packages:
   time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timemap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timers-tick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8256,6 +8804,8 @@ dont-distribute-packages:
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toxiproxy-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-call:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8284,6 +8834,7 @@ dont-distribute-packages:
   trasa-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  travis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8311,6 +8862,7 @@ dont-distribute-packages:
   tsparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsuntsun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ttask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tup-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8328,6 +8880,7 @@ dont-distribute-packages:
   twentefp-trees:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-websockets:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentyseven:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twfy-api-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twidge:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twilight-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8336,8 +8889,11 @@ dont-distribute-packages:
   twiml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-feed:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8355,6 +8911,7 @@ dont-distribute-packages:
   type-level-natural-number-induction:          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-list:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-natural:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8411,6 +8968,7 @@ dont-distribute-packages:
   uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unitym-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-fcntl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-handle:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8433,6 +8991,7 @@ dont-distribute-packages:
   uri-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator-file:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri-parse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-template:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   url-decoders:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8467,6 +9026,7 @@ dont-distribute-packages:
   vacuum-ubigraph:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   valid-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validate-input:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   validated-literals:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   validations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8502,8 +9062,10 @@ dont-distribute-packages:
   verbalexpressions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  verify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vicinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ViennaRNA-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Villefort:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8549,11 +9111,13 @@ dont-distribute-packages:
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-auth:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-consul:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-content-type:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-crowd:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-etag:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-headers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8562,6 +9126,8 @@ dont-distribute-packages:
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-secure-cookies:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-postgresql:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8570,6 +9136,7 @@ dont-distribute-packages:
   wai-throttler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   waitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   waldo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  warc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-dynamic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-tls-uid:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8642,8 +9209,10 @@ dont-distribute-packages:
   WMSigner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   word2vec-model:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordchoice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8706,7 +9275,9 @@ dont-distribute-packages:
   xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xlsx-tabular:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xlsx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-conduit-decode:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8719,6 +9290,7 @@ dont-distribute-packages:
   xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-query:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-tydom-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8758,6 +9330,11 @@ dont-distribute-packages:
   yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-app:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-job:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-servant:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-transaction-odbc:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-transaction-postgresql:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8783,15 +9360,22 @@ dont-distribute-packages:
   yesod-auth-account:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-basic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-bcrypt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-bcryptdb:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-deskcom:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hmac-keccak:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-nopassword:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-oauth2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-zendesk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-bootstrap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8799,12 +9383,16 @@ dont-distribute-packages:
   yesod-crud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-dsl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-elements:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-fay:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-form-richtext:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-gitrev:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-ip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-job-queue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-lucid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-media-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8815,19 +9403,24 @@ dont-distribute-packages:
   yesod-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-purescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-raml-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-raml:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-recaptcha:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-routes-flow:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-rst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-sass:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-session-redis:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-static-angular:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-test-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-text-markdown:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yet-another-logger:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8870,9 +9463,11 @@ dont-distribute-packages:
   zifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zim-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zip-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ziptastic-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZMachine:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]

From 9df1d15a28d20abb01dd49ef647cf2851550cb39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 02:31:01 +0100
Subject: [PATCH 1248/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9-10-gc1333d1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bad3dc0ed6e6061d2fc418c279dc7b55de683b7f.
---
 .../haskell-modules/hackage-packages.nix      | 1435 +++++++++++++++--
 1 file changed, 1343 insertions(+), 92 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ecc14528d63..9598298063d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -269,6 +269,7 @@ self: {
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusionForest" = callPackage
@@ -322,6 +323,7 @@ self: {
        homepage = "https://github.com/choener/ADPfusionSet";
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -1416,6 +1418,7 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Biobase" = callPackage
@@ -1662,6 +1665,7 @@ self: {
        homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1710,6 +1714,7 @@ self: {
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BirdPP" = callPackage
@@ -1789,6 +1794,7 @@ self: {
        homepage = "https://github.com/eggzilla/BlastHTTP";
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Blobs" = callPackage
@@ -1857,6 +1863,7 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Blogdown" = callPackage
@@ -2750,6 +2757,7 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -3742,6 +3750,7 @@ self: {
        homepage = "https://github.com/choener/DPutils";
        description = "utilities for DP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DRBG" = callPackage
@@ -5040,6 +5049,7 @@ self: {
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5954,6 +5964,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frank" = callPackage
@@ -6232,8 +6243,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUtil";
-       version = "0.9.3";
-       sha256 = "045wdcxm8ink7q86f6c4p47i1vmjyndk8xahabb0zic4yf3mdr76";
+       version = "0.10.0";
+       sha256 = "0n1yfcjl2akg53zjxlqm37k1ypbfd4p60kbc0wv1v4mq1yasf5m0";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath hpp JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
@@ -6649,6 +6660,7 @@ self: {
        homepage = "https://github.com/MarisaKirisame/Get#readme";
        description = "get stuff out of stuff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GiST" = callPackage
@@ -6664,14 +6676,15 @@ self: {
      }) {};
 
   "Gifcurry" = callPackage
-    ({ mkDerivation, base, cmdargs, directory, filepath, gi-gdk
-     , gi-glib, gi-gobject, gi-gtk, haskell-gi-base, process, temporary
-     , text
+    ({ mkDerivation, base, bytestring, cairo, cmdargs, directory
+     , filepath, gi-cairo, gi-gdk, gi-glib, gi-gobject, gi-gst
+     , gi-gstvideo, gi-gtk, haskell-gi, haskell-gi-base, process
+     , temporary, text, transformers
      }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "2.3.0.0";
-       sha256 = "1xwmkr68x7mmmimx8kp2fjrfkg02fmsm0wzy93fqsdbs5vi1jqch";
+       version = "3.0.0.0";
+       sha256 = "1x7hbfjcly41sk3bins3z522651v1fqybb64dj1a6f6lvglx6ms8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -6679,8 +6692,9 @@ self: {
          base directory filepath process temporary text
        ];
        executableHaskellDepends = [
-         base cmdargs directory filepath gi-gdk gi-glib gi-gobject gi-gtk
-         haskell-gi-base process temporary text
+         base bytestring cairo cmdargs directory filepath gi-cairo gi-gdk
+         gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk haskell-gi
+         haskell-gi-base process temporary text transformers
        ];
        homepage = "https://github.com/lettier/gifcurry";
        description = "GIF creation utility";
@@ -8764,6 +8778,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HTTP_4000_3_11" = 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.11";
+       sha256 = "0idnclf1gnvqsygppanr0gj6dfvxj1rsz8q7hhahfw82v0wjplps";
+       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 {
@@ -10015,19 +10053,20 @@ self: {
      }) {};
 
   "HsHTSLib" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-lexing
-     , conduit-combinators, containers, inline-c, mtl, template-haskell
+    ({ mkDerivation, base, bytestring, bytestring-lexing, conduit
+     , containers, inline-c, mtl, template-haskell
      }:
      mkDerivation {
        pname = "HsHTSLib";
-       version = "1.3.2.2";
-       sha256 = "0i4lflc8s8byvsc4idh4fm6yzdspx0v4mahwrqrk7i2dbs84fpkw";
+       version = "1.3.2.3";
+       sha256 = "1j80lwall9ji5fb2iw1fni2jxplyiss5rx0zfkbx9g5ns1cd98r3";
        libraryHaskellDepends = [
-         base bytestring bytestring-lexing conduit-combinators containers
-         inline-c mtl template-haskell
+         base bytestring bytestring-lexing conduit containers inline-c mtl
+         template-haskell
        ];
        description = "High level bindings to htslib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsHaruPDF" = callPackage
@@ -10558,6 +10597,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IntervalMap_0_6_0_0" = callPackage
+    ({ mkDerivation, base, Cabal, containers, criterion, deepseq
+     , fingertree, QuickCheck, random, SegmentTree, weigh
+     }:
+     mkDerivation {
+       pname = "IntervalMap";
+       version = "0.6.0.0";
+       sha256 = "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg";
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree random SegmentTree
+         weigh
+       ];
+       homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
+       description = "Containers for intervals, with efficient search";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Irc" = callPackage
     ({ mkDerivation, base, data-default, doctest, mtl, network
      , transformers
@@ -10852,6 +10911,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "JuicyPixels-blp" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, directory
+     , filepath, hashable, JuicyPixels, optparse-simple, text-show
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "JuicyPixels-blp";
+       version = "0.1.0.0";
+       sha256 = "02hw885a47smwbnyk5fxvb44bdpaspsair9fmsj23sbp6f2wi0hk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring hashable JuicyPixels text-show
+         vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath JuicyPixels optparse-simple
+         text-show unordered-containers
+       ];
+       homepage = "http://github.com/NCrashed/JuicyPixels-blp#readme";
+       description = "BLP format decoder/encoder over JuicyPixels library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -11763,6 +11846,7 @@ self: {
        ];
        description = "List transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListTree" = callPackage
@@ -14808,6 +14892,7 @@ self: {
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
@@ -14831,6 +14916,7 @@ self: {
        homepage = "https://github.com/choener/PrimitiveArray-Pretty";
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Printf-TH" = callPackage
@@ -15489,6 +15575,7 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAwolf" = callPackage
@@ -15681,15 +15768,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Rasterific_0_7_2_2" = callPackage
+  "Rasterific_0_7_2_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
      }:
      mkDerivation {
        pname = "Rasterific";
-       version = "0.7.2.2";
-       sha256 = "01sr6x22j042vydfiprkszk95wf9flq2fp0552wnmzr7qvn0j8qd";
+       version = "0.7.2.3";
+       sha256 = "1imsk1dv5dksicnhmnzz5ldq84plbcg4qlwccsqvb6jg9j5vf6v6";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive transformers vector vector-algorithms
@@ -15737,6 +15824,7 @@ self: {
        homepage = "https://github.com/lookunder/RedmineHs";
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ref" = callPackage
@@ -16355,6 +16443,7 @@ self: {
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVG2Q" = callPackage
@@ -16394,6 +16483,7 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGPath" = callPackage
@@ -17487,6 +17577,7 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stomp" = callPackage
@@ -18823,6 +18914,7 @@ self: {
        homepage = "https://github.com/choener/ViennaRNA-extras";
        description = "ViennaRNA v2 extensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -22552,6 +22644,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-typescript_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml
+     , tasty-hspec, template-haskell, temporary, text, th-abstraction
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-typescript";
+       version = "0.1.0.5";
+       sha256 = "08mq1cvhgmys2jnf7jjh450ql6x800fc1a1xkczqrzw0dkbaab20";
+       libraryHaskellDepends = [
+         aeson base containers interpolate mtl template-haskell text
+         th-abstraction unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath hspec
+         interpolate mtl process tasty tasty-ant-xml tasty-hspec
+         template-haskell temporary text th-abstraction unordered-containers
+       ];
+       homepage = "https://github.com/codedownio/aeson-typescript#readme";
+       description = "Generate TypeScript definition files from your ADTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific
      , text
@@ -22955,6 +23072,7 @@ self: {
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "airtable-api" = callPackage
@@ -23093,6 +23211,7 @@ self: {
        homepage = "http://www.aivikasoft.com";
        description = "Diagrams-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-gpss" = callPackage
@@ -23347,6 +23466,7 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alg" = callPackage
@@ -24041,6 +24161,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-apigateway" = callPackage
@@ -24059,6 +24180,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon API Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -24077,6 +24199,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -24095,6 +24218,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon AppStream SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-athena" = callPackage
@@ -24113,6 +24237,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Athena SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -24131,6 +24256,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-batch" = callPackage
@@ -24149,6 +24275,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Batch SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -24167,6 +24294,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Budgets SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -24185,6 +24313,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Certificate Manager SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-clouddirectory" = callPackage
@@ -24203,6 +24332,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudDirectory SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudformation" = callPackage
@@ -24221,6 +24351,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudfront" = callPackage
@@ -24239,6 +24370,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
@@ -24257,6 +24389,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudhsmv2" = callPackage
@@ -24275,6 +24408,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM V2 SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
@@ -24293,6 +24427,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
@@ -24311,6 +24446,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
@@ -24329,6 +24465,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
@@ -24347,6 +24484,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
@@ -24365,6 +24503,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Events SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
@@ -24383,6 +24522,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -24401,6 +24541,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeBuild SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -24419,6 +24560,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeCommit SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codedeploy" = callPackage
@@ -24437,6 +24579,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codepipeline" = callPackage
@@ -24455,6 +24598,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodePipeline SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codestar" = callPackage
@@ -24473,6 +24617,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeStar SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
@@ -24491,6 +24636,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -24509,6 +24655,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity Provider SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
@@ -24527,6 +24674,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-config" = callPackage
@@ -24545,6 +24693,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-core" = callPackage
@@ -24577,6 +24726,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Core data types and functionality for Amazonka libraries";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cur" = callPackage
@@ -24595,6 +24745,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cost and Usage Report Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-datapipeline" = callPackage
@@ -24613,6 +24764,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-devicefarm" = callPackage
@@ -24631,6 +24783,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Device Farm SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-directconnect" = callPackage
@@ -24649,6 +24802,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-discovery" = callPackage
@@ -24667,6 +24821,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Discovery Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dms" = callPackage
@@ -24685,6 +24840,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Database Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ds" = callPackage
@@ -24703,6 +24859,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Directory Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb" = callPackage
@@ -24721,6 +24878,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb-dax" = callPackage
@@ -24739,6 +24897,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
@@ -24757,6 +24916,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Streams SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ec2" = callPackage
@@ -24775,6 +24935,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -24793,6 +24954,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Registry SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -24811,6 +24973,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -24829,6 +24992,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic File System SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticache" = callPackage
@@ -24847,6 +25011,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
@@ -24865,6 +25030,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
@@ -24883,6 +25049,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elasticsearch Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
@@ -24901,6 +25068,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elb" = callPackage
@@ -24919,6 +25087,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -24937,6 +25106,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -24955,6 +25125,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-gamelift" = callPackage
@@ -24973,6 +25144,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon GameLift SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-glacier" = callPackage
@@ -24991,6 +25163,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-glue" = callPackage
@@ -25009,6 +25182,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glue SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-greengrass" = callPackage
@@ -25027,6 +25201,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Greengrass SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-health" = callPackage
@@ -25045,6 +25220,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Health APIs and Notifications SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -25063,6 +25239,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iam-policy" = callPackage
@@ -25102,6 +25279,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-inspector" = callPackage
@@ -25120,6 +25298,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Inspector SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot" = callPackage
@@ -25138,6 +25317,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
@@ -25156,6 +25336,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis" = callPackage
@@ -25174,6 +25355,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -25192,6 +25374,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -25210,6 +25393,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Firehose SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kms" = callPackage
@@ -25228,6 +25412,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lambda" = callPackage
@@ -25246,6 +25431,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lex-models" = callPackage
@@ -25264,6 +25450,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lex Model Building Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lex-runtime" = callPackage
@@ -25282,6 +25469,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lex Runtime Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -25300,6 +25488,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lightsail SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -25318,6 +25507,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-entitlement" = callPackage
@@ -25336,6 +25526,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Entitlement Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
@@ -25354,6 +25545,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Metering SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-mechanicalturk" = callPackage
@@ -25372,6 +25564,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Mechanical Turk SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-migrationhub" = callPackage
@@ -25390,6 +25583,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Migration Hub SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ml" = callPackage
@@ -25408,6 +25602,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-mobile" = callPackage
@@ -25426,6 +25621,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Mobile SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks" = callPackage
@@ -25444,6 +25640,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -25462,6 +25659,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks for Chef Automate SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-organizations" = callPackage
@@ -25480,6 +25678,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Organizations SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -25498,6 +25697,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Pinpoint SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -25516,6 +25716,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Polly SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-pricing" = callPackage
@@ -25534,6 +25735,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Price List Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -25552,6 +25754,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -25570,6 +25773,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -25588,6 +25792,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Rekognition SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-resourcegroupstagging" = callPackage
@@ -25606,6 +25811,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Resource Groups Tagging API SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -25624,6 +25830,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53-domains" = callPackage
@@ -25642,6 +25849,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3" = callPackage
@@ -25660,6 +25868,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -25681,6 +25890,7 @@ self: {
        homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -25699,6 +25909,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -25717,6 +25928,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Service Catalog SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -25735,6 +25947,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -25753,6 +25966,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Shield SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -25771,6 +25985,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Server Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -25789,6 +26004,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export Snowball SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -25807,6 +26023,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sqs" = callPackage
@@ -25825,6 +26042,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -25843,6 +26061,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -25861,6 +26080,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Step Functions SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -25879,6 +26099,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sts" = callPackage
@@ -25897,6 +26118,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-support" = callPackage
@@ -25915,6 +26137,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-swf" = callPackage
@@ -25933,6 +26156,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-test" = callPackage
@@ -25955,6 +26179,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Common functionality for Amazonka library test-suites";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-waf" = callPackage
@@ -25973,6 +26198,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-waf-regional" = callPackage
@@ -25991,6 +26217,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF Regional SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-workdocs" = callPackage
@@ -26009,6 +26236,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkDocs SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-workspaces" = callPackage
@@ -26027,6 +26255,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -26045,6 +26274,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon X-Ray SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amby" = callPackage
@@ -26232,6 +26462,7 @@ self: {
        homepage = "https://github.com/ejconlon/analyze#readme";
        description = "making data science easy and safe with data frames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "analyze-client" = callPackage
@@ -26460,6 +26691,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "animascii" = callPackage
+    ({ mkDerivation, ansi-terminal-game, base, Cabal, config-ini
+     , directory, filepath, fsnotify, hspec, parsec, process, temporary
+     , text
+     }:
+     mkDerivation {
+       pname = "animascii";
+       version = "0.1.1.0";
+       sha256 = "1f474jp121s1w947d6yn6363730hgki2m7mfqyin25ngl4q0isqd";
+       isLibrary = false;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [
+         ansi-terminal-game base config-ini directory filepath fsnotify
+         parsec process temporary text
+       ];
+       testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
+       homepage = "http://www.ariis.it/static/articles/animascii/page.html";
+       description = "text-file based ASCII animator";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "animate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec, text
      , vector
@@ -26641,6 +26895,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal-game" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
+     , clock, hspec, linebreak, split, terminal-size, timers-tick
+     }:
+     mkDerivation {
+       pname = "ansi-terminal-game";
+       version = "0.2.0.0";
+       sha256 = "0lh3yhx5ylfi7m35p5kbnfh0vrcp2p7yrr6lxpfab6y0gs683snk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal array base bytestring cereal clock linebreak split
+         terminal-size timers-tick
+       ];
+       testHaskellDepends = [ array base hspec linebreak ];
+       homepage = "none-yet";
+       description = "sdl-like functions for terminal applications, based on ansi-terminal";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-wl-pprint" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -26757,6 +27032,7 @@ self: {
        homepage = "https://github.com/exbb2/antigate";
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antimirov" = callPackage
@@ -26995,6 +27271,7 @@ self: {
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -27412,6 +27689,7 @@ self: {
        homepage = "https://github.com/ConferHealth/apns-http2#readme";
        description = "Apple Push Notification service HTTP/2 integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apotiki" = callPackage
@@ -27737,6 +28015,7 @@ self: {
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate-equality" = callPackage
@@ -27836,6 +28115,7 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arcgrid" = callPackage
@@ -28516,6 +28796,7 @@ self: {
        homepage = "https://github.com/pepeiborra/arrowp";
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrows" = callPackage
@@ -29201,6 +29482,7 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-extra" = callPackage
@@ -30567,6 +30849,7 @@ self: {
        ];
        description = "Library for Nix expression dependency generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autonix-deps-kf5" = callPackage
@@ -30590,6 +30873,7 @@ self: {
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autoproc" = callPackage
@@ -30977,6 +31261,7 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -31461,6 +31746,7 @@ self: {
        homepage = "https://github.com/agrafix/aws-simple#readme";
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sns" = callPackage
@@ -31692,6 +31978,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "b9_0_5_41" = 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, syb, template, text, time
+     , transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.41";
+       sha256 = "1m9fj1x30gl7agzcpklyi6sql8fs7qzpamkp16yihaxas54216ga";
+       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 syb
+         template text time transformers unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "babl" = callPackage
     ({ mkDerivation, babl, base }:
      mkDerivation {
@@ -31852,6 +32171,7 @@ self: {
        homepage = "https://github.com/ndmitchell/bake#readme";
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ballast" = callPackage
@@ -32184,6 +32504,7 @@ self: {
        homepage = "https://github.com/philopon/barrier";
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barrier-monad" = callPackage
@@ -32966,6 +33287,7 @@ self: {
        homepage = "http://travis.athougies.net/projects/beam.html";
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-migrate" = callPackage
@@ -32986,6 +33308,7 @@ self: {
        homepage = "https://travis.athougies.net/projects/beam.html";
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -33004,6 +33327,7 @@ self: {
        homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-sqlite/";
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-th" = callPackage
@@ -34170,6 +34494,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cborg serialise ];
        description = "Yet Another Binary Serialisation Library (compatibility shim)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-shared" = callPackage
@@ -35379,16 +35704,16 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.4.0";
-       sha256 = "18m799psijcj81hxyrnwjvwgb9z92pw5qk5hb7yny905f0wbbar1";
+       version = "0.4.1";
+       sha256 = "0kqj88g1fx17xbdy6h56xl4qpgk6xvyfqwnvjvi4ha4rw7dhddxr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
-         case-insensitive clustering conduit-combinators containers
-         data-default-class data-ordlist double-conversion hexpat HsHTSLib
-         http-conduit IntervalMap math-functions matrices mtl parallel
-         primitive split statistics text transformers unordered-containers
-         vector vector-algorithms word8
+         case-insensitive clustering conduit containers data-default-class
+         data-ordlist double-conversion hexpat HsHTSLib http-conduit
+         IntervalMap math-functions matrices mtl parallel primitive split
+         statistics text transformers unordered-containers vector
+         vector-algorithms word8
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-combinators data-default-class
@@ -35998,6 +36323,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
        homepage = "https://github.com/haskell-works/bits-extra#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits-extras" = callPackage
@@ -37145,6 +37471,7 @@ self: {
        homepage = "http://github.com/GregorySchwartz/blosum#readme";
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloxorz" = callPackage
@@ -37820,6 +38147,7 @@ self: {
        homepage = "https://github.com/phadej/boring";
        description = "Boring and Absurd types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boring-game" = callPackage
@@ -38045,6 +38373,7 @@ self: {
        homepage = "http://github.com/githubuser/braid#readme";
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brain-bleep" = callPackage
@@ -38197,6 +38526,8 @@ self: {
        pname = "brick";
        version = "0.34.1";
        sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys";
+       revision = "1";
+       editedCabalFile = "0viqyb6qhvigpz1jf8693jw10n48r4wqnh97f5xqbjjjdjy0qr4r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38467,6 +38798,7 @@ self: {
        homepage = "https://oss.xkcd.com";
        description = "A reader and interface for the Browser Capabilities Project data files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bsb-http-chunked" = callPackage
@@ -39225,6 +39557,7 @@ self: {
        homepage = "https://github.com/benjaminselfridge/bv-sized";
        description = "a BitVector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "byline" = callPackage
@@ -39244,6 +39577,7 @@ self: {
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytable" = callPackage
@@ -40620,6 +40954,7 @@ self: {
        doHaddock = false;
        description = "Library and utiltity for processing cabal's plan.json file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-progdeps" = callPackage
@@ -40758,6 +41093,7 @@ self: {
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-test" = callPackage
@@ -40973,8 +41309,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2spec";
-       version = "2.0.1";
-       sha256 = "13nrq3nnfvs4hlqyx2nfk3mk8gi94idival6iiby6h2n6a44lqbq";
+       version = "2.0.2";
+       sha256 = "1nklzsclsyxb9y7xyrvhricmkyjhwrs7g853vlf21vbrdcnf7mfs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath time ];
@@ -41327,6 +41663,7 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -43217,6 +43554,7 @@ self: {
        homepage = "https://nest.pijul.com/lthms/celtchar";
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cerberus" = callPackage
@@ -43394,6 +43732,7 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -45131,6 +45470,7 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cjk" = callPackage
@@ -47178,6 +47518,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "codec-beam" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath, process
+     , text, zlib
+     }:
+     mkDerivation {
+       pname = "codec-beam";
+       version = "0.1.0";
+       sha256 = "0c5l4ss3pf55s8mwk01ncl5nnry9c1ha5drfmax53z40hyrxhmy8";
+       libraryHaskellDepends = [ base bytestring containers text zlib ];
+       testHaskellDepends = [ base bytestring filepath process text ];
+       homepage = "https://github.com/hkgumbs/codec-beam#readme";
+       description = "Erlang VM byte code assembler";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "codec-libevent" = callPackage
     ({ mkDerivation, array, base, binary, binary-strict, bytestring
      , containers, parsec, QuickCheck, regex-compat
@@ -47608,6 +47963,7 @@ self: {
        homepage = "https://github.com/alunduil/collection-json.hs";
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections" = callPackage
@@ -48032,6 +48388,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -50024,6 +50381,7 @@ self: {
        homepage = "https://github.com/cblp/conduit-merge#readme";
        description = "Merge multiple sorted conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-network-stream" = callPackage
@@ -50048,8 +50406,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-parse";
-       version = "0.2.0.0";
-       sha256 = "03ynwkq48ni473fzbhviyff73i4v7wy8hcdlvr0i8pv8kq1zk7v5";
+       version = "0.2.1.0";
+       sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm";
        libraryHaskellDepends = [
          base conduit dlist mtl parsers safe safe-exceptions text
          transformers
@@ -50078,6 +50436,7 @@ self: {
        homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-throttle" = callPackage
@@ -50102,6 +50461,7 @@ self: {
        homepage = "https://github.com/mtesseract/conduit-throttle#readme";
        description = "Throttle Conduit Producers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -50122,6 +50482,7 @@ self: {
        homepage = "http://github.com/haskell-works/conduit-tokenize-attoparsec#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-zstd" = callPackage
@@ -50267,6 +50628,7 @@ self: {
        homepage = "https://github.com/protoben/config-parser";
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-schema" = callPackage
@@ -50726,6 +51088,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-monads" = callPackage
@@ -51023,6 +51386,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "containers-verified" = callPackage
+    ({ mkDerivation, containers }:
+     mkDerivation {
+       pname = "containers-verified";
+       version = "0.5.11.0";
+       sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
+       libraryHaskellDepends = [ containers ];
+       homepage = "https://github.com/nomeata/containers-verified";
+       description = "Formally verified drop-in replacement of containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "content-store" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cond, conduit
      , conduit-combinators, conduit-extra, cryptonite, directory
@@ -51916,16 +52292,18 @@ self: {
      }) {};
 
   "corenlp-parser" = callPackage
-    ({ mkDerivation, aeson, base, directory, process, raw-strings-qq
+    ({ mkDerivation, aeson, base, cryptonite, data-default, directory
+     , process, raw-strings-qq, rocksdb-haskell, safe-exceptions, store
      , string-class, temporary, text, unordered-containers
      }:
      mkDerivation {
        pname = "corenlp-parser";
-       version = "0.2.0.0";
-       sha256 = "0h001djrgjds3rnmgdxmap26rb1z2zr88q1snv6gkq28p3vknyf1";
+       version = "0.3.0.0";
+       sha256 = "1mcw9nw74lca0p5kdr4mva6mz165dyipfqgc7i46kjk6pxlpcp0n";
        libraryHaskellDepends = [
-         aeson base directory process raw-strings-qq string-class temporary
-         text unordered-containers
+         aeson base cryptonite data-default directory process raw-strings-qq
+         rocksdb-haskell safe-exceptions store string-class temporary text
+         unordered-containers
        ];
        homepage = "https://github.com/k-bx/corenlp-parser#readme";
        description = "Launches CoreNLP and parses the JSON output";
@@ -51967,6 +52345,7 @@ self: {
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "couch-hs" = callPackage
@@ -52962,6 +53341,7 @@ self: {
        homepage = "https://github.com/brendanhay/credentials";
        description = "Secure Credentials Storage and Distribution";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "credentials-cli" = callPackage
@@ -53546,6 +53926,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.0.2.10";
        sha256 = "1c7baw7k9shllfxp1yg5czr9m0392pnpqiblaz8v17rc71d402p6";
+       revision = "1";
+       editedCabalFile = "0ijaqjhrv772qnjk3i5lv4yrj3cdz15jkrd3v954x281gixm9j1x";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -54896,6 +55278,7 @@ self: {
        homepage = "https://github.com/chordify/currency-codes";
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "currency-convert" = callPackage
@@ -58683,6 +59066,7 @@ self: {
        homepage = "https://github.com/ndmitchell/debug";
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug-diff" = callPackage
@@ -59657,6 +60041,7 @@ self: {
        homepage = "https://github.com/ndmitchell/derive#readme";
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-IG" = callPackage
@@ -60176,6 +60561,7 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-text" = callPackage
@@ -60273,6 +60659,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -60313,6 +60700,7 @@ self: {
        homepage = "https://github.com/mlang/diagrams-braille#readme";
        description = "Braille diagrams with plain text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-builder" = callPackage
@@ -60342,6 +60730,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -60365,6 +60754,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -60386,6 +60776,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -60413,6 +60804,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -60431,6 +60823,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -60466,6 +60859,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -60570,6 +60964,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -60657,6 +61052,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -60696,6 +61092,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -60731,6 +61128,7 @@ self: {
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-solve" = callPackage
@@ -60768,6 +61166,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -62759,6 +63158,7 @@ self: {
        homepage = "https://github.com/peti/distribution-nixpkgs#readme";
        description = "Types and functions to manipulate the Nixpkgs distribution";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "distribution-plot" = callPackage
@@ -62821,6 +63221,7 @@ self: {
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dixi" = callPackage
@@ -63260,6 +63661,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "docker_0_5_1_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , conduit-combinators, conduit-extra, connection, containers
+     , data-default-class, directory, exceptions, filemanip, filepath
+     , http-client, http-client-tls, http-conduit, http-types, lens
+     , lens-aeson, monad-control, mtl, network, process, QuickCheck
+     , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
+     , temporary, text, time, tls, transformers, transformers-base
+     , unliftio-core, unordered-containers, uuid, vector, x509
+     , x509-store, x509-system, zlib
+     }:
+     mkDerivation {
+       pname = "docker";
+       version = "0.5.1.1";
+       sha256 = "09lska2v4fngbp4pbxxwshcdz6g4sbsyx8apm95hs3hxfpd0j74a";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit conduit-combinators
+         conduit-extra containers data-default-class directory exceptions
+         filemanip filepath http-client http-conduit http-types
+         monad-control mtl network resourcet scientific tar temporary text
+         time tls transformers transformers-base unliftio-core
+         unordered-containers uuid vector x509 x509-store x509-system zlib
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection containers directory http-client
+         http-client-tls http-types lens lens-aeson process QuickCheck tasty
+         tasty-hunit tasty-quickcheck text transformers unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/denibertovic/docker-hs";
+       description = "An API client for docker written in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "docker-build-cacher" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
@@ -63399,6 +63835,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "doctemplates_0_2_2_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, hspec, parsec, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "doctemplates";
+       version = "0.2.2.1";
+       sha256 = "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers parsec
+         scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec text ];
+       homepage = "https://github.com/jgm/doctemplates#readme";
+       description = "Pandoc-style document templates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
@@ -65818,6 +66275,7 @@ self: {
        homepage = "http://github.com/brendanhay/ede";
        description = "Templating language with similar syntax and features to Liquid or Jinja2";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edenmodules" = callPackage
@@ -66047,6 +66505,7 @@ self: {
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effect-monad" = callPackage
@@ -66417,6 +66876,7 @@ self: {
        homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme";
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-core" = callPackage
@@ -67627,6 +68087,7 @@ self: {
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -67684,6 +68145,7 @@ self: {
        homepage = "http://github.com/ocharles/engine.io";
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-yesod" = callPackage
@@ -68695,6 +69157,7 @@ self: {
        homepage = "https://github.com/bitemyapp/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -68800,6 +69263,7 @@ self: {
        testHaskellDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eternal" = callPackage
@@ -70052,6 +70516,7 @@ self: {
        homepage = "https://github.com/k0001/exinst";
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -70180,6 +70645,7 @@ self: {
        homepage = "https://github.com/qfpl/exitcode";
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exp-extended" = callPackage
@@ -71308,6 +71774,7 @@ self: {
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fastbayes" = callPackage
@@ -71475,6 +71942,7 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base" = callPackage
@@ -71488,6 +71956,7 @@ self: {
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-builder" = callPackage
@@ -71575,6 +72044,7 @@ self: {
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -71616,6 +72086,7 @@ self: {
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb" = callPackage
@@ -72196,6 +72667,7 @@ self: {
        homepage = "http://feldspar.github.com";
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -72381,6 +72853,7 @@ self: {
        homepage = "http://github.com/acowley/ffmpeg-light";
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -73028,15 +73501,14 @@ self: {
      }:
      mkDerivation {
        pname = "fin";
-       version = "0";
-       sha256 = "0nzjqw6q01rc6faqp30771v8mxz6cndzskkvfaj55ygp34faycih";
-       revision = "2";
-       editedCabalFile = "1fha5i24k3lh2ncg39dgki0fh7mg3k1p21bngmiqvnika8dnin5h";
+       version = "0.0.1";
+       sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [ base inspection-testing tagged ];
        homepage = "https://github.com/phadej/vec";
        description = "Nat and Fin: peano naturals and finite numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "final" = callPackage
@@ -73555,6 +74027,7 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -74530,6 +75003,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fluent-logger-conduit" = callPackage
@@ -74545,6 +75019,7 @@ self: {
        ];
        description = "Conduit interface for fluent-logger";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fluffy" = callPackage
@@ -74882,6 +75357,7 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -74908,6 +75384,7 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -74929,6 +75406,7 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds" = callPackage
@@ -76055,6 +76533,7 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/free-functors";
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-game" = callPackage
@@ -76220,6 +76699,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/free-vector-spaces";
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vl" = callPackage
@@ -76483,6 +76963,7 @@ self: {
        ];
        description = "Fresco binding for Haskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fresh" = callPackage
@@ -78262,6 +78743,7 @@ self: {
        homepage = "https://github.com/schell/gelatin";
        description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin-freetype2" = callPackage
@@ -78280,6 +78762,7 @@ self: {
        homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme";
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin-fruity" = callPackage
@@ -78292,6 +78775,7 @@ self: {
        homepage = "https://github.com/schell/gelatin-fruity#readme";
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin-gl" = callPackage
@@ -78314,6 +78798,7 @@ self: {
        homepage = "https://github.com/schell/gelatin/gelatin-gl";
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin-sdl2" = callPackage
@@ -78332,6 +78817,7 @@ self: {
        homepage = "https://github.com/schell/gelatin";
        description = "An SDL2 backend for the gelatin renderer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin-shaders" = callPackage
@@ -78345,6 +78831,7 @@ self: {
        homepage = "https://github.com/schell/gelatin-shaders#readme";
        description = "Gelatin's OpenGL shaders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gemstone" = callPackage
@@ -78754,6 +79241,8 @@ self: {
        pname = "generic-random";
        version = "1.1.0.2";
        sha256 = "0zslrz4cizw8c76q5szgmpc58f25hx4qf01lavxshynn771cx271";
+       revision = "1";
+       editedCabalFile = "1qhjsxaadvnh41qrlnzp2wxrbxxsbsz9np4mhwq5vck07kqws5bk";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/lysxia/generic-random";
@@ -79617,6 +80106,7 @@ self: {
        homepage = "https://github.com/PaulJohnson/geodetics";
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geohash" = callPackage
@@ -80023,6 +80513,7 @@ self: {
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-dump-tree" = callPackage
@@ -80072,6 +80563,7 @@ self: {
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-dup" = callPackage
@@ -80728,6 +81220,7 @@ self: {
        homepage = "https://github.com/maoe/ghc-time-alloc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-timers" = callPackage
@@ -81048,6 +81541,7 @@ self: {
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-dom-hello" = callPackage
@@ -81083,6 +81577,7 @@ self: {
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
@@ -81125,6 +81620,7 @@ self: {
        homepage = "https://github.com/cocreature/ghcjs-fetch#readme";
        description = "GHCJS bindings for the JavaScript Fetch API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -81663,8 +82159,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.20";
-       sha256 = "0k3rbr8jajkhgmrdpv7fy4xk2kfx3b6cgm8wgfba8m8wkz1s1l7s";
+       version = "3.0.21";
+       sha256 = "01ivj9hs5jys1p4znfgrwxmd2848nhs73cscfww733rgdpwdlfw6";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -82202,6 +82698,7 @@ self: {
        homepage = "http://github.com/passy/giphy-api#readme";
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -82290,8 +82787,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180227";
-       sha256 = "11p77510vcg7sjd1y5grpgbm1299qviilf4d7xw2pr0vk5qn5mgp";
+       version = "6.20180316";
+       sha256 = "0wdsyiiswki4m9hv5j65rhivqn8g01smrhj0s19fz2rbvpcfn5cb";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -82767,6 +83264,7 @@ self: {
        homepage = "https://github-backup.branchable.com/";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -82791,6 +83289,7 @@ self: {
        homepage = "https://github.com/strake/github.hs";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-post-receive" = callPackage
@@ -83012,6 +83511,7 @@ self: {
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cmdline" = callPackage
@@ -83039,6 +83539,7 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -83086,6 +83587,7 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -83129,6 +83631,7 @@ self: {
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-test" = callPackage
@@ -83147,6 +83650,7 @@ self: {
        ];
        description = "Test library for confirming gitlib backend compliance";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-utils" = callPackage
@@ -83253,6 +83757,7 @@ self: {
        homepage = "http://github.com/passy/givegif#readme";
        description = "CLI Giphy search tool with previews in iTerm 2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gjk" = callPackage
@@ -84567,6 +85072,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Comprehensive Google Services SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-buyer" = callPackage
@@ -84579,6 +85085,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-seller" = callPackage
@@ -84591,6 +85098,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-datatransfer" = callPackage
@@ -84603,6 +85111,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-directory" = callPackage
@@ -84615,6 +85124,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Directory SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-emailmigration" = callPackage
@@ -84627,6 +85137,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-reports" = callPackage
@@ -84639,6 +85150,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Reports SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense" = callPackage
@@ -84651,6 +85163,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Management SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense-host" = callPackage
@@ -84663,6 +85176,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-affiliates" = callPackage
@@ -84675,6 +85189,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-analytics" = callPackage
@@ -84687,6 +85202,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
@@ -84699,6 +85215,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play EMM SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-publisher" = callPackage
@@ -84711,6 +85228,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Developer SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appengine" = callPackage
@@ -84723,6 +85241,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App Engine Admin SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-activity" = callPackage
@@ -84735,6 +85254,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Activity SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-calendar" = callPackage
@@ -84747,6 +85267,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-licensing" = callPackage
@@ -84759,6 +85280,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-reseller" = callPackage
@@ -84771,6 +85293,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-tasks" = callPackage
@@ -84783,6 +85306,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tasks SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appstate" = callPackage
@@ -84795,6 +85319,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App State SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-autoscaler" = callPackage
@@ -84807,6 +85332,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-bigquery" = callPackage
@@ -84819,6 +85345,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google BigQuery SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-billing" = callPackage
@@ -84831,6 +85358,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-blogger" = callPackage
@@ -84843,6 +85371,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Blogger SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-books" = callPackage
@@ -84855,6 +85384,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Books SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-civicinfo" = callPackage
@@ -84867,6 +85397,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-classroom" = callPackage
@@ -84879,6 +85410,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-cloudmonitoring" = callPackage
@@ -84891,6 +85423,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-cloudtrace" = callPackage
@@ -84903,6 +85436,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Trace SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-compute" = callPackage
@@ -84915,6 +85449,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-container" = callPackage
@@ -84927,6 +85462,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-containerbuilder" = callPackage
@@ -84939,6 +85475,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-core" = callPackage
@@ -84962,6 +85499,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-customsearch" = callPackage
@@ -84974,6 +85512,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google CustomSearch SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataflow" = callPackage
@@ -84986,6 +85525,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataproc" = callPackage
@@ -84998,6 +85538,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-datastore" = callPackage
@@ -85010,6 +85551,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Datastore SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-debugger" = callPackage
@@ -85022,6 +85564,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Debugger SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-deploymentmanager" = callPackage
@@ -85034,6 +85577,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dfareporting" = callPackage
@@ -85046,6 +85590,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-discovery" = callPackage
@@ -85058,6 +85603,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google APIs Discovery Service SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dns" = callPackage
@@ -85070,6 +85616,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud DNS SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-bids" = callPackage
@@ -85082,6 +85629,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-search" = callPackage
@@ -85094,6 +85642,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Search SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-drive" = callPackage
@@ -85106,6 +85655,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Drive SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-dynamiclinks" = callPackage
@@ -85118,6 +85668,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-rules" = callPackage
@@ -85130,6 +85681,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Rules SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fitness" = callPackage
@@ -85142,6 +85694,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fitness SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fonts" = callPackage
@@ -85154,6 +85707,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fonts Developer SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-freebasesearch" = callPackage
@@ -85166,6 +85720,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Freebase Search SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fusiontables" = callPackage
@@ -85178,6 +85733,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games" = callPackage
@@ -85190,6 +85746,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-configuration" = callPackage
@@ -85202,6 +85759,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-management" = callPackage
@@ -85214,6 +85772,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Management SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-genomics" = callPackage
@@ -85226,6 +85785,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Genomics SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-gmail" = callPackage
@@ -85238,6 +85798,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Gmail SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-migration" = callPackage
@@ -85250,6 +85811,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Migration SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-settings" = callPackage
@@ -85262,6 +85824,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-iam" = callPackage
@@ -85274,6 +85837,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-identity-toolkit" = callPackage
@@ -85286,6 +85850,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity Toolkit SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-kgsearch" = callPackage
@@ -85298,6 +85863,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-language" = callPackage
@@ -85310,6 +85876,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Natural Language SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
@@ -85322,6 +85889,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-logging" = callPackage
@@ -85334,6 +85902,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-manufacturers" = callPackage
@@ -85346,6 +85915,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Manufacturer Center SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
@@ -85358,6 +85928,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-engine" = callPackage
@@ -85370,6 +85941,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Engine SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-mirror" = callPackage
@@ -85382,6 +85954,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Mirror SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-ml" = callPackage
@@ -85394,6 +85967,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-monitoring" = callPackage
@@ -85406,6 +85980,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-oauth2" = callPackage
@@ -85418,6 +85993,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google OAuth2 SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-pagespeed" = callPackage
@@ -85430,6 +86006,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-partners" = callPackage
@@ -85442,6 +86019,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-people" = callPackage
@@ -85454,6 +86032,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google People SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-play-moviespartner" = callPackage
@@ -85466,6 +86045,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Movies Partner SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus" = callPackage
@@ -85478,6 +86058,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus-domains" = callPackage
@@ -85490,6 +86071,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-prediction" = callPackage
@@ -85502,6 +86084,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Prediction SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-proximitybeacon" = callPackage
@@ -85514,6 +86097,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-pubsub" = callPackage
@@ -85526,6 +86110,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-qpxexpress" = callPackage
@@ -85538,6 +86123,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google QPX Express SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool" = callPackage
@@ -85550,6 +86136,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Manager SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool-updater" = callPackage
@@ -85562,6 +86149,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-resourcemanager" = callPackage
@@ -85574,6 +86162,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-resourceviews" = callPackage
@@ -85586,6 +86175,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-runtimeconfig" = callPackage
@@ -85598,6 +86188,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-safebrowsing" = callPackage
@@ -85610,6 +86201,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-script" = callPackage
@@ -85622,6 +86214,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Script Execution SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicecontrol" = callPackage
@@ -85634,6 +86227,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicemanagement" = callPackage
@@ -85659,6 +86253,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-shopping-content" = callPackage
@@ -85671,6 +86266,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-siteverification" = callPackage
@@ -85683,6 +86279,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Site Verification SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-slides" = callPackage
@@ -85695,6 +86292,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Slides SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
@@ -85707,6 +86305,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Spectrum Database SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sqladmin" = callPackage
@@ -85719,6 +86318,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud SQL Administration SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-storage" = callPackage
@@ -85731,6 +86331,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-storage-transfer" = callPackage
@@ -85743,6 +86344,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-tagmanager" = callPackage
@@ -85755,6 +86357,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tag Manager SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-taskqueue" = callPackage
@@ -85767,6 +86370,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-translate" = callPackage
@@ -85779,6 +86383,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Translate SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-urlshortener" = callPackage
@@ -85791,6 +86396,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google URL Shortener SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-useraccounts" = callPackage
@@ -85803,6 +86409,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-vision" = callPackage
@@ -85815,6 +86422,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-webmaster-tools" = callPackage
@@ -85827,6 +86435,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Search Console SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube" = callPackage
@@ -85839,6 +86448,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-analytics" = callPackage
@@ -85851,6 +86461,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Analytics SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-reporting" = callPackage
@@ -85863,6 +86474,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Reporting SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gooey" = callPackage
@@ -85966,6 +86578,7 @@ self: {
        homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-maps-geocoding" = callPackage
@@ -86049,6 +86662,7 @@ self: {
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-server-api" = callPackage
@@ -86072,6 +86686,7 @@ self: {
        homepage = "https://github.com/arowM/haskell-google-server-api#readme";
        description = "Google APIs for server to server applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-static-maps" = callPackage
@@ -86092,6 +86707,7 @@ self: {
        homepage = "https://github.com/mpilgrem/google-static-maps#readme";
        description = "Bindings to the Google Static Maps API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -86108,6 +86724,7 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "googleplus" = callPackage
@@ -86599,6 +87216,7 @@ self: {
        homepage = "https://github.com/graknlabs/grakn-haskell";
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grammar-combinators" = callPackage
@@ -86786,6 +87404,7 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting" = callPackage
@@ -87446,6 +88065,7 @@ self: {
        homepage = "https://github.com/erebe/greenclip#readme";
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greg-client" = callPackage
@@ -87552,6 +88172,7 @@ self: {
        homepage = "https://github.com/debug-ito/greskell/";
        description = "Haskell binding for Gremlin graph query language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greskell-core" = callPackage
@@ -88740,6 +89361,7 @@ self: {
        homepage = "https://github.com/stites/gym-http-api#readme";
        description = "REST client to the gym-http-api project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "h-booru" = callPackage
@@ -91724,6 +92346,7 @@ self: {
        homepage = "https://github.com/tfc/hamtsolo#readme";
        description = "Intel AMT serial-over-lan (SOL) client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamusic" = callPackage
@@ -94595,6 +95218,7 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -95018,6 +95642,8 @@ self: {
        pname = "haskell-src-meta";
        version = "0.8.0.2";
        sha256 = "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb";
+       revision = "1";
+       editedCabalFile = "07xxp2r8amd420bzl7xlyfydhyrcrvaxq24ydnx7y2sz4v2nlzsz";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -95365,6 +95991,7 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
@@ -95412,6 +96039,7 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor_1_0_1_2" = callPackage
@@ -96129,6 +96757,7 @@ self: {
        homepage = "https://github.com/haskell-haskey";
        description = "A transactional, ACID compliant, embeddable key-value store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskey-btree" = callPackage
@@ -96173,6 +96802,7 @@ self: {
        homepage = "https://github.com/haskell-haskey";
        description = "A monad transformer supporting Haskey transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskgame" = callPackage
@@ -96725,6 +97355,7 @@ self: {
        homepage = "http://www.haskus.org/system";
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskyapi" = callPackage
@@ -97634,6 +98265,7 @@ self: {
        homepage = "http://github.com/tvh/haxl-amazonka#readme";
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl-facebook" = callPackage
@@ -98789,6 +99421,7 @@ self: {
        homepage = "https://github.com/portnov/heavy-logger-amazon#readme";
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hebrew-time" = callPackage
@@ -98914,6 +99547,7 @@ self: {
        testHaskellDepends = [ base either hedgehog ];
        homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers-lens" = callPackage
@@ -98926,6 +99560,7 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -99976,6 +100611,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "heterocephalus_1_0_5_2" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
+     , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "heterocephalus";
+       version = "1.0.5.2";
+       sha256 = "08sr2ps3kb2v6pglkls814w6fpvwkysd3k2s15pj9fhmhx82kf2h";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup containers dlist mtl parsec
+         shakespeare template-haskell text transformers
+       ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/heterocephalus#readme";
+       description = "A type-safe template engine for working with popular front end development tools";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heterolist" = callPackage
     ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata
      }:
@@ -100893,6 +101548,7 @@ self: {
        homepage = "https://github.com/thumphries/hgrep";
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgrev" = callPackage
@@ -101811,6 +102467,7 @@ self: {
        homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hipbot" = callPackage
@@ -102295,6 +102952,7 @@ self: {
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsonschema" = callPackage
@@ -102322,6 +102980,7 @@ self: {
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjugement" = callPackage
@@ -103598,6 +104257,7 @@ self: {
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -103792,6 +104452,7 @@ self: {
        ];
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hocilib" = callPackage
@@ -103855,6 +104516,7 @@ self: {
        homepage = "https://github.com/awakesecurity/hocker#readme";
        description = "Interact with the docker registry and generate nix build instructions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hodatime" = callPackage
@@ -103971,6 +104633,7 @@ self: {
        ];
        description = "Bindings to the Toggl.com REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hogre" = callPackage
@@ -104034,6 +104697,7 @@ self: {
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hol" = callPackage
@@ -104134,6 +104798,7 @@ self: {
        homepage = "http://github.com/yogsototh/holy-project";
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "homeomorphic" = callPackage
@@ -104434,6 +105099,7 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -104547,8 +105213,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.1";
-       sha256 = "0678kdssjmb8k08jmazg1w9lglz27ni2p3b5031likk2dp9gvf2h";
+       version = "5.0.17.2";
+       sha256 = "009brgwczkszmlk8rq6s5s73rnpi2gw94wr9wwp9rgf3r2cfs1br";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104628,8 +105294,8 @@ self: {
        pname = "hoopl";
        version = "3.10.2.2";
        sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9";
-       revision = "1";
-       editedCabalFile = "0w34az1mldbvzdywszc4japdksdbdsrb1nw44vjqv3nmz65fn14x";
+       revision = "2";
+       editedCabalFile = "0j6pz4jzhvviyrhhn1j22ikmjvzrg60nzvq26lbpkcb6y4q6rlyx";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers filepath mtl parsec test-framework
@@ -104921,6 +105587,7 @@ self: {
        homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoq" = callPackage
@@ -105347,7 +106014,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_28_1" = callPackage
+  "hpack_0_28_2" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, interpolate
@@ -105356,8 +106023,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.28.1";
-       sha256 = "0nigj421i8yw1k1aaly9qzwkahjx92w4arpj2a5mwg89v0xfw7pr";
+       version = "0.28.2";
+       sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106779,6 +107446,7 @@ self: {
        homepage = "https://github.com/aiya000/hs-snowtify#README.md";
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-twitter" = callPackage
@@ -108121,6 +108789,7 @@ self: {
        ];
        description = "A command line program for extending the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsini" = callPackage
@@ -109916,6 +110585,7 @@ self: {
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -109935,6 +110605,7 @@ self: {
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstatistics" = callPackage
@@ -111169,6 +111840,7 @@ self: {
        homepage = "https://github.com/sannsyn/http-client-session";
        description = "A simple abstraction over the \"http-client\" connection manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-streams" = callPackage
@@ -111336,6 +112008,7 @@ self: {
        homepage = "https://github.com/bazqux/http-conduit-downloader";
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-date" = callPackage
@@ -111725,6 +112398,7 @@ self: {
        homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-reverse-proxy_0_5_0_1" = callPackage
@@ -112802,6 +113476,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-fingertree-strict_0_1_0_1" = callPackage
+    ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "hw-fingertree-strict";
+       version = "0.1.0.1";
+       sha256 = "18ki65cmbvbqj97y1v25sh2bvilkkg6q6pzzyprmgv24yscqkrp3";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
+       description = "Generic strict finger-tree structure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, vector }:
      mkDerivation {
@@ -114150,6 +114844,7 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -114593,6 +115288,7 @@ self: {
        homepage = "http://github.com/chrisdone/ical#readme";
        description = "iCalendar format parser and org-mode converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "icon-fonts" = callPackage
@@ -115320,6 +116016,7 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -115595,6 +116292,7 @@ self: {
        testPkgconfigDepends = [ imagemagick ];
        description = "bindings to imagemagick library";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -116406,6 +117104,7 @@ self: {
        homepage = "http://github.com/jaspervdj/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "index-core" = callPackage
@@ -117460,6 +118159,7 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intern" = callPackage
@@ -117651,6 +118351,7 @@ self: {
        homepage = "https://sealgram.com/git/haskell/interruptible/";
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interspersed" = callPackage
@@ -119837,6 +120538,7 @@ self: {
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "japanese-holidays" = callPackage
@@ -120189,6 +120891,7 @@ self: {
        homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme";
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jespresso" = callPackage
@@ -120567,6 +121270,7 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-clib" = callPackage
@@ -120582,6 +121286,7 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-dom" = callPackage
@@ -120597,6 +121302,7 @@ self: {
        ];
        description = "DOM library that uses jsaddle to support both GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -120861,6 +121567,7 @@ self: {
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "json-b" = callPackage
@@ -121722,8 +122429,8 @@ self: {
      }:
      mkDerivation {
        pname = "juicy-gcode";
-       version = "0.1.0.4";
-       sha256 = "1nf30901jv226n7cpnbkqdh51gpmkzri79m271afzsgya3cs9gi5";
+       version = "0.1.0.5";
+       sha256 = "0gjkch103fisvr35dc86hbfbir76cmwh9cs1ppqlxajspgan9bz1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123366,6 +124073,7 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyword-args" = callPackage
@@ -124027,6 +124735,7 @@ self: {
        homepage = "https://github.com/swift-nav/labsat";
        description = "LabSat TCP Interface Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labyrinth" = callPackage
@@ -124818,6 +125527,7 @@ self: {
        homepage = "http://github.com/NorfairKing/lambdatex";
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdatwit" = callPackage
@@ -125497,6 +126207,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-javascript_0_6_0_11" = callPackage
+    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
+     , utf8-light, utf8-string
+     }:
+     mkDerivation {
+       pname = "language-javascript";
+       version = "0.6.0.11";
+       sha256 = "0hv1rj3yarv035mpnnnbqys4sgd0awqlm5hyf29wp051r6dnwxfl";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers mtl text utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         array base blaze-builder bytestring Cabal containers hspec mtl
+         QuickCheck utf8-light utf8-string
+       ];
+       homepage = "https://github.com/erikd/language-javascript";
+       description = "Parser for JavaScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-js" = callPackage
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
@@ -125782,6 +126515,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python" = callPackage
@@ -126045,6 +126779,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/lapack/";
        description = "Numerical Linear Algebra using LAPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lapack-carray" = callPackage
@@ -128035,6 +128770,7 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "liblastfm" = callPackage
@@ -128318,6 +129054,7 @@ self: {
        homepage = "https://github.com/SaneTracker/librato";
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libravatar" = callPackage
@@ -128404,6 +129141,7 @@ self: {
        homepage = "https://github.com/supki/libstackexchange";
        description = "StackExchange API interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libsystemd-daemon" = callPackage
@@ -129255,6 +129993,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/linearmap-family";
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linearscan" = callPackage
@@ -129903,6 +130642,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-grouping" = callPackage
@@ -131373,6 +132113,7 @@ self: {
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -132081,6 +132822,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loopy" = callPackage
@@ -132234,6 +132976,7 @@ self: {
        homepage = "https://github.com/swift-nav/loup";
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lowgl" = callPackage
@@ -133221,6 +133964,7 @@ self: {
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
@@ -134847,6 +135591,7 @@ self: {
        homepage = "https://marvin.readthedocs.io";
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -136155,6 +136900,7 @@ self: {
        homepage = "https://github.com/snoyberg/mega-sdist#readme";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -136265,6 +137011,7 @@ self: {
        homepage = "https://github.com/quixoftic/mellon#readme";
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "melody" = callPackage
@@ -137308,6 +138055,7 @@ self: {
        homepage = "https://github.com/BlackBrane/microsoft-translator";
        description = "Bindings to the Microsoft Translator API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microspec" = callPackage
@@ -137457,6 +138205,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/midi-music-box";
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-simple" = callPackage
@@ -138634,6 +139383,7 @@ self: {
        homepage = "http://github.com/tittoassini/model";
        description = "Derive a model of a data type using Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modelicaparser" = callPackage
@@ -138703,6 +139453,7 @@ self: {
        homepage = "https://github.com/GregorySchwartz/modify-fasta";
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modsplit" = callPackage
@@ -139266,6 +140017,7 @@ self: {
        homepage = "https://github.com/futurice/haskell-monad-http#readme";
        description = "A class of monads which can do http requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-interleave" = callPackage
@@ -139450,6 +140202,27 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "monad-logger-prefix_0_1_9" = callPackage
+    ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
+     , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-logger-prefix";
+       version = "0.1.9";
+       sha256 = "1xvw1nd9arn2v2x4a8r0nljfv0a4z9kqa5pbrhmskgr70l9py4jm";
+       libraryHaskellDepends = [
+         base exceptions monad-control monad-logger mtl resourcet text
+         transformers transformers-base
+       ];
+       testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion monad-logger ];
+       homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
+       description = "Add prefixes to your monad-logger output";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-syslog" = callPackage
     ({ mkDerivation, base, bytestring, fast-logger, hsyslog
      , monad-logger, text, transformers
@@ -139680,6 +140453,7 @@ self: {
        homepage = "https://github.com/mnacamura/monad-parallel-progressbar";
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-param" = callPackage
@@ -139736,6 +140510,7 @@ self: {
        homepage = "https://github.com/cjdev/monad-persist#readme";
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-primitive" = callPackage
@@ -140534,6 +141309,7 @@ self: {
        ];
        description = "A system state collecting library and application";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-foldable" = callPackage
@@ -140694,6 +141470,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-subclasses_0_4_6" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "0.4.6";
+       sha256 = "1rsipvaab5wpzi4qxzzb3gihg1gnsdiv0iz00gdskgjifggamh8m";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       homepage = "https://github.com/blamario/monoid-subclasses/";
+       description = "Subclasses of Monoid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
@@ -143528,6 +144325,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "n-tuple_0_0_2_0" = callPackage
+    ({ mkDerivation, base, singletons, vector }:
+     mkDerivation {
+       pname = "n-tuple";
+       version = "0.0.2.0";
+       sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva";
+       libraryHaskellDepends = [ base singletons vector ];
+       homepage = "https://github.com/athanclark/n-tuple#readme";
+       description = "Homogeneous tuples of arbitrary length";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nagios-check" = callPackage
     ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
      , QuickCheck, text
@@ -145217,6 +146027,7 @@ self: {
        homepage = "https://github.com/markhibberd/network-api-support";
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-arbitrary" = callPackage
@@ -145611,6 +146422,7 @@ self: {
        homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-multicast" = callPackage
@@ -146282,6 +147094,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "newtype-generics_0_5_2_2" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
+     , semigroups, transformers
+     }:
+     mkDerivation {
+       pname = "newtype-generics";
+       version = "0.5.2.2";
+       sha256 = "1hjw9w0hrjvf9akspgjcwidicviflf0ba3jg91dhg9n8cf9y82i9";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base hspec HUnit ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion semigroups ];
+       description = "A typeclass and set of functions for working with newtypes, with generics support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "newtype-th" = callPackage
     ({ mkDerivation, base, haskell-src-meta, newtype, syb
      , template-haskell
@@ -146632,6 +147461,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-deploy" = callPackage
@@ -146651,6 +147481,7 @@ self: {
        homepage = "https://github.com/awakesecurity/nix-deploy#readme";
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-derivation" = callPackage
@@ -146693,6 +147524,7 @@ self: {
        homepage = "https://github.com/Gabriel439/nix-diff";
        description = "Explain why two Nix derivations differ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-eval" = callPackage
@@ -146723,6 +147555,7 @@ self: {
        homepage = "https://github.com/peti/nix-paths";
        description = "Knowledge of Nix's installation directories";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) nix;};
 
   "nixfromnpm" = callPackage
@@ -147562,6 +148395,7 @@ self: {
        homepage = "https://github.com/xenog/nqe#readme";
        description = "Concurrency library in the style of Erlang/OTP";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nsis" = callPackage
@@ -148185,6 +149019,7 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -148207,6 +149042,7 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -148224,6 +149060,7 @@ self: {
        homepage = "https://github.com/saep/nvim-hs-ghcid";
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvvm" = callPackage
@@ -149006,6 +149843,7 @@ self: {
        homepage = "https://github.com/ziocroc/Ombra";
        description = "Render engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omega" = callPackage
@@ -149421,6 +150259,7 @@ 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
@@ -149486,6 +150325,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-symbology" = callPackage
@@ -150229,6 +151069,7 @@ self: {
        ];
        description = "Access data at OpenWeatherMap";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "operate-do" = callPackage
@@ -151856,6 +152697,7 @@ self: {
        homepage = "https://github.com/lierdakil/pandoc-crossref#readme";
        description = "Pandoc filter for cross-references";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -151999,6 +152841,7 @@ self: {
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -152101,7 +152944,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_4" = callPackage
+  "pandoc-types_1_17_4_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -152109,8 +152952,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.4";
-       sha256 = "0ng8nxrx85wl5fqsjfzmbhwimkqvblwplzkn8ra93pgpvqpnmrk5";
+       version = "1.17.4.1";
+       sha256 = "1v2xy6vmg9kcvax9mwqwrjdkf860jwyxkbd45snvh82p368yfxq2";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
          transformers
@@ -152908,6 +153751,7 @@ self: {
        homepage = "https://github.com/merijn/paramtree";
        description = "Generate labelled test/benchmark trees from sets of parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paranoia" = callPackage
@@ -153131,6 +153975,7 @@ self: {
        homepage = "https://github.com/jwiegley/parsec-free";
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsec-numbers" = callPackage
@@ -153766,6 +154611,7 @@ self: {
        homepage = "http://github.com/jaspervdj/patat";
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -154156,6 +155002,7 @@ self: {
        homepage = "https://github.com/githubuser/pb-next#readme";
        description = "Utility CLI for working with protobuf files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pbc4hs" = callPackage
@@ -155526,6 +156373,7 @@ self: {
        homepage = "https://github.com/gbwey/persistent-odbc";
        description = "Backend for the persistent library using ODBC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-parser" = callPackage
@@ -155589,6 +156437,7 @@ self: {
        homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-redis" = callPackage
@@ -156094,6 +156943,7 @@ self: {
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -156861,6 +157711,7 @@ self: {
        homepage = "https://github.com/quixoftic/pinpon#readme";
        description = "A gateway for various cloud notification services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -156954,6 +157805,7 @@ self: {
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-async" = callPackage
@@ -157072,6 +157924,7 @@ self: {
        homepage = "https://github.com/mindreader/pipes-break";
        description = "Pipes to group by any delimiter (such as lines with carriage returns)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -157088,6 +157941,7 @@ self: {
        ];
        description = "ByteString support for pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-bzip" = callPackage
@@ -157112,6 +157966,7 @@ self: {
        homepage = "https://github.com/chemist/pipes-bzip";
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
@@ -157375,6 +158230,7 @@ self: {
        ];
        description = "Streaming parsers for Fasta and Fastq";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-files" = callPackage
@@ -157442,6 +158298,7 @@ self: {
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-http" = callPackage
@@ -157561,6 +158418,7 @@ self: {
        homepage = "https://github.com/mindreader/pipes-lines";
        description = "Pipes for grouping by lines with carriage returns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-lzma" = callPackage
@@ -157818,14 +158676,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-safe_2_2_8" = callPackage
+  "pipes-safe_2_2_9" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, primitive, transformers, transformers-base
      }:
      mkDerivation {
        pname = "pipes-safe";
-       version = "2.2.8";
-       sha256 = "0gc02s0sc32z53l76pkp7y0r70m9acwrlbhfqmm03yyrkn4j35wd";
+       version = "2.2.9";
+       sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes primitive
          transformers transformers-base
@@ -157886,6 +158744,7 @@ self: {
        homepage = "https://github.com/michaelt/text-pipes";
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -158612,6 +159471,7 @@ self: {
        homepage = "http://github.com/cchalmers/plots";
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotserver-api" = callPackage
@@ -158948,6 +159808,7 @@ self: {
        homepage = "http://github.com/23Skidoo/pointful";
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-fun" = callPackage
@@ -159160,6 +160021,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Poly-kinded continuations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poly-control" = callPackage
@@ -160451,6 +161313,7 @@ self: {
        homepage = "https://github.com/futurice/postgresql-simple-url";
        description = "Parse postgres:// url into ConnectInfo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-syntax" = callPackage
@@ -160646,6 +161509,7 @@ self: {
        homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmark-streams" = callPackage
@@ -160681,6 +161545,7 @@ self: {
        homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "potato-tool" = callPackage
@@ -160789,6 +161654,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powermate" = callPackage
@@ -160877,6 +161743,7 @@ self: {
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
   "powerqueue-sqs" = callPackage
@@ -160891,6 +161758,7 @@ self: {
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A Amazon SQS backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ppm" = callPackage
@@ -161293,6 +162161,7 @@ self: {
        homepage = "http://github.com/kerscher/preliminaries";
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-compat" = callPackage
@@ -162337,6 +163206,7 @@ self: {
        homepage = "http://github.com/snoyberg/process-conduit";
        description = "Conduits for processes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-extras" = callPackage
@@ -162719,6 +163589,7 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -162775,6 +163646,7 @@ self: {
        homepage = "https://github.com/esoeylemez/progress-meter";
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progress-reporting" = callPackage
@@ -163081,6 +163953,7 @@ self: {
        homepage = "http://github.com/bitnomial/prometheus";
        description = "Prometheus Haskell Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prometheus-client" = callPackage
@@ -163456,6 +164329,7 @@ self: {
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -163978,6 +164852,7 @@ self: {
        ];
        description = "Pipe stdin to a redis pub/sub channel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffix" = callPackage
@@ -164484,6 +165359,7 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -164546,6 +165422,7 @@ self: {
        homepage = "https://github.com/minoki/purescript-tsd-gen#readme";
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pursuit-client" = callPackage
@@ -164776,6 +165653,7 @@ self: {
        homepage = "https://github.com/barrucadu/pusher-ws";
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pushme" = callPackage
@@ -167400,6 +168278,7 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/range";
        description = "This has a bunch of code for specifying and managing ranges in your code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-set-list" = callPackage
@@ -167421,6 +168300,7 @@ self: {
        homepage = "https://github.com/phadej/range-set-list#readme";
        description = "Memory efficient sets with ranges of elements";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-space" = callPackage
@@ -167539,6 +168419,7 @@ self: {
        homepage = "https://github.com/esoeylemez/rapid-term";
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa" = callPackage
@@ -168445,6 +169326,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana" = callPackage
@@ -168467,6 +169349,7 @@ self: {
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -168483,6 +169366,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/reactive-banana-bunch/";
        description = "Extend reactive-banana to multiple events per time point";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-gi-gtk" = callPackage
@@ -168646,6 +169530,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -168666,6 +169551,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-thread" = callPackage
@@ -169265,6 +170151,7 @@ self: {
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis" = callPackage
@@ -172141,6 +173028,7 @@ self: {
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve" = callPackage
@@ -172159,6 +173047,7 @@ self: {
        homepage = "https://github.com/riaqn/resolve#readme";
        description = "A name resolusion library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -172370,6 +173259,7 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-core" = callPackage
@@ -172450,6 +173340,7 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-happstack" = callPackage
@@ -172467,6 +173358,7 @@ self: {
        ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-snap" = callPackage
@@ -172540,6 +173432,7 @@ self: {
        ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restful-snap" = callPackage
@@ -173684,6 +174577,7 @@ self: {
        homepage = "https://www.github.com/ktvoelker/robin";
        description = "A build daemon for Haskell development";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "robot" = callPackage
@@ -173778,6 +174672,7 @@ self: {
        homepage = "http://github.com/serokell/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
@@ -175235,6 +176130,7 @@ self: {
        homepage = "https://github.com/k0001/safe-money";
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-plugins" = callPackage
@@ -175297,6 +176193,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy_0_9_4_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
+     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
+     , tasty-quickcheck, template-haskell, text, time, vector
+     }:
+     mkDerivation {
+       pname = "safecopy";
+       version = "0.9.4.1";
+       sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers old-time template-haskell
+         text time vector
+       ];
+       testHaskellDepends = [
+         array base cereal containers lens lens-action QuickCheck
+         quickcheck-instances tasty tasty-quickcheck template-haskell time
+         vector
+       ];
+       homepage = "https://github.com/acid-state/safecopy";
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safecopy-migrate" = callPackage
     ({ mkDerivation, base, base-prelude, cereal, containers, extra
      , haskell-src-meta, microlens, safecopy, template-haskell, uniplate
@@ -176050,6 +176970,7 @@ self: {
        homepage = "https://github.com/chessai/savage";
        description = "re-export of the random generators from Hedgehog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "say" = callPackage
@@ -176495,6 +177416,7 @@ self: {
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedyield" = callPackage
@@ -176548,6 +177470,7 @@ self: {
        homepage = "http://github.com/typeable/schematic";
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc" = callPackage
@@ -177083,6 +178006,7 @@ self: {
        homepage = "https://github.com/taphu/scotty-resource";
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-rest" = callPackage
@@ -177109,6 +178033,7 @@ self: {
        homepage = "http://github.com/ehamberg/scotty-rest";
        description = "Webmachine-style REST library for scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-session" = callPackage
@@ -178343,6 +179268,7 @@ self: {
        homepage = "https://owainlewis.com";
        description = "Sengrid API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sendgrid-v3" = callPackage
@@ -178513,6 +179439,7 @@ self: {
        homepage = "https://github.com/qfpl/separated";
        description = "A data type with elements separated by values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqaid" = callPackage
@@ -178804,6 +179731,7 @@ self: {
        homepage = "https://github.com/well-typed/cborg";
        description = "A binary serialisation library for Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serialize-instances" = callPackage
@@ -179076,6 +180004,7 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -179172,6 +180101,7 @@ self: {
        homepage = "http://github.com/haskell-servant/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -179275,6 +180205,7 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -179296,6 +180227,7 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -179550,6 +180482,7 @@ self: {
        homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ekg" = callPackage
@@ -179597,6 +180530,7 @@ self: {
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-examples" = callPackage
@@ -179644,6 +180578,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-flatten" = callPackage
+    ({ mkDerivation, base, servant }:
+     mkDerivation {
+       pname = "servant-flatten";
+       version = "0.1";
+       sha256 = "00swcc6dkc9nbwj69g96ysbmv9s81g5j39qk39qqapxh34wgrakq";
+       libraryHaskellDepends = [ base servant ];
+       homepage = "https://github.com/alpmestan/servant-flatten";
+       description = "Utilities for flattening servant API types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-foreign" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
@@ -179699,6 +180645,7 @@ self: {
        homepage = "http://github.com/finlay/servant-github#readme";
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -179768,6 +180715,7 @@ self: {
        homepage = "https://github.com/fgaz/servant-iCalendar#readme";
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-jquery" = callPackage
@@ -180113,6 +181061,7 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-py" = callPackage
@@ -180193,6 +181142,7 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-rawm";
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-response" = callPackage
@@ -180812,6 +181762,7 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Yesod bindings for serversession";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "services" = callPackage
@@ -180937,6 +181888,7 @@ self: {
        homepage = "https://github.com/Ferdinand-vW/sessiontypes#readme";
        description = "Session types library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sessiontypes-distributed" = callPackage
@@ -180960,6 +181912,7 @@ self: {
        homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme";
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-cover" = callPackage
@@ -181083,6 +182036,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setlocale_1_0_0_6" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "setlocale";
+       version = "1.0.0.6";
+       sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
+       description = "Haskell bindings to setlocale";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "setoid" = callPackage
     ({ mkDerivation, base, containers, mtl, smallcheck, tasty
      , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -181291,6 +182257,7 @@ self: {
        homepage = "https://github.com/dzhus/sext#readme";
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sfml-audio" = callPackage
@@ -182064,6 +183031,7 @@ self: {
        homepage = "https://github.com/psibi/shell-conduit";
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-escape" = callPackage
@@ -183031,6 +183999,7 @@ self: {
        homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-config" = callPackage
@@ -184101,6 +185070,7 @@ self: {
        homepage = "https://github.com/alunduil/siren-json.hs";
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sirkel" = callPackage
@@ -184205,6 +185175,7 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-types" = callPackage
@@ -184466,7 +185437,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_7_0_2" = callPackage
+  "skylighting_0_7_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
@@ -184475,8 +185446,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.7.0.2";
-       sha256 = "16l7sz5a5g0x9jh6v5v8has37lc29dz142zxkidd6ri25izs5bph";
+       version = "0.7.1";
+       sha256 = "0x7mn1dn6hsqwvcq6l3yx74g5lpq1zwh96mba9h24xsw0zqd9g60";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184501,8 +185472,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.7.0.2";
-       sha256 = "0j35rsrbnmarhnwqyd8ap64h7yjkqyc1faj599hfyymmy1vqahyf";
+       version = "0.7.1";
+       sha256 = "0gkjv36cbqyzvxvqfjdz816901x949zjmyasrvgwwlyvahsj5zjg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184697,6 +185668,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/slave-thread";
        description = "A principal solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sleep" = callPackage
@@ -185980,6 +186952,7 @@ self: {
        ];
        description = "Alternate authentication snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -186981,6 +187954,7 @@ self: {
        homepage = "https://github.com/aiya000/hs-snowtify#README.md";
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap" = callPackage
@@ -187009,6 +187983,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "soap_0_2_3_6" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, configurator
+     , data-default, exceptions, hspec, http-client, http-types, HUnit
+     , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
+     , xml-conduit-writer, xml-types
+     }:
+     mkDerivation {
+       pname = "soap";
+       version = "0.2.3.6";
+       sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d";
+       libraryHaskellDepends = [
+         base bytestring conduit configurator data-default exceptions
+         http-client http-types iconv mtl resourcet text
+         unordered-containers xml-conduit xml-conduit-writer xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring hspec HUnit text unordered-containers xml-conduit
+         xml-conduit-writer
+       ];
+       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
+       description = "SOAP client tools";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "soap-openssl" = callPackage
     ({ mkDerivation, base, configurator, data-default, HsOpenSSL
      , http-client, http-client-openssl, soap, text
@@ -187048,6 +188047,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "soap-tls_0_1_1_4" = callPackage
+    ({ mkDerivation, base, configurator, connection, data-default
+     , http-client, http-client-tls, soap, text, tls, x509, x509-store
+     , x509-validation
+     }:
+     mkDerivation {
+       pname = "soap-tls";
+       version = "0.1.1.4";
+       sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf";
+       libraryHaskellDepends = [
+         base configurator connection data-default http-client
+         http-client-tls soap text tls x509 x509-store x509-validation
+       ];
+       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
+       description = "TLS-enabled SOAP transport (using tls package)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sock2stream" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , haskell98, network
@@ -187121,6 +188139,7 @@ self: {
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-sctp" = callPackage
@@ -187153,6 +188172,7 @@ self: {
        homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme";
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketed" = callPackage
@@ -187989,6 +189009,7 @@ self: {
        homepage = "https://github.com/phadej/spdx";
        description = "SPDX license expression language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spe" = callPackage
@@ -188987,6 +190008,7 @@ self: {
        homepage = "https://github.com/caneroj1/sqlite-simple-errors";
        description = "Wrapper around errors from sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite-simple-typed" = callPackage
@@ -189777,6 +190799,7 @@ self: {
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage" = callPackage
@@ -189913,6 +190936,7 @@ self: {
        homepage = "https://github.com/fpco/stackage-curator";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-install" = callPackage
@@ -190375,6 +191399,7 @@ self: {
        ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statechart" = callPackage
@@ -191144,6 +192169,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-delay" = callPackage
@@ -191692,6 +192718,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_19_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , hashable, hspec, hspec-discover, lens, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.19.1";
+       sha256 = "0wfpqbhbr15qvvp9k0v1m1az02hpp25pglj4yl0ay7smm2848wi9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable lens
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable hspec
+         hspec-discover lens template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -192146,6 +193197,7 @@ self: {
        homepage = "http://github.com/bch29/streaming-png#readme";
        description = "Perfectly streaming PNG image decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-postgresql-simple" = callPackage
@@ -192163,6 +193215,7 @@ self: {
        ];
        description = "Stream postgresql-query results using the streaming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-utils" = callPackage
@@ -192894,6 +193947,7 @@ self: {
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strips" = callPackage
@@ -194408,6 +195462,7 @@ self: {
        ];
        description = "A simple web server for serving directories, similar to weborf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sxml" = callPackage
@@ -196943,6 +197998,7 @@ self: {
        homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme";
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-golden" = callPackage
@@ -197325,6 +198381,7 @@ self: {
        homepage = "https://github.com/michaelxavier/tasty-tap";
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-th" = callPackage
@@ -197417,6 +198474,7 @@ self: {
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tccli" = callPackage
@@ -199061,6 +200119,7 @@ self: {
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-feat" = callPackage
@@ -199209,6 +200268,7 @@ self: {
        homepage = "https://gitlab.com/xaverdh/tex-builder#texbuilder";
        description = "View your latex output while editing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texmath" = callPackage
@@ -199365,6 +200425,7 @@ self: {
        ];
        description = "Memory-efficient string-indexed container types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-conversions" = callPackage
@@ -200852,6 +201913,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/theatre";
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themoviedb" = callPackage
@@ -201423,6 +202485,7 @@ self: {
        homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thumbnail" = callPackage
@@ -201457,6 +202520,7 @@ self: {
        homepage = "https://github.com/prowdsponsor/thumbnail-plus";
        description = "Generate thumbnails easily and safely";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thyme" = callPackage
@@ -202323,6 +203387,7 @@ self: {
        ];
        description = "A mutable hashmap, implicitly indexed by UTCTime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeout" = callPackage
@@ -202465,6 +203530,7 @@ self: {
        homepage = "http://ariis.it/static/articles/timers-tick/page.html";
        description = "tick based timers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers-updatable" = callPackage
@@ -203048,6 +204114,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tmapmvar_0_0_4" = callPackage
+    ({ mkDerivation, async, base, containers, hashable, QuickCheck
+     , quickcheck-instances, stm, tasty, tasty-quickcheck
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "tmapmvar";
+       version = "0.0.4";
+       sha256 = "1qxl48wcbqvg6fymb8kpr4wz25ixkfvnvli2c7ncjxzdigyqrrd6";
+       libraryHaskellDepends = [
+         base containers hashable stm unordered-containers
+       ];
+       testHaskellDepends = [
+         async base containers hashable QuickCheck quickcheck-instances stm
+         tasty tasty-quickcheck unordered-containers
+       ];
+       description = "A single-entity stateful Map in STM, similar to tmapchan";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tmp-postgres" = callPackage
     ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover
      , network, postgresql-simple, process, temporary, unix
@@ -203660,6 +204747,7 @@ self: {
        homepage = "https://github.com/jpittis/toxiproxy-haskell#readme";
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toysolver" = callPackage
@@ -203712,6 +204800,7 @@ self: {
        homepage = "https://github.com/msakai/toysolver/";
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tpar" = callPackage
@@ -204526,6 +205615,7 @@ self: {
        homepage = "http://github.com/tomtau/travis#readme";
        description = "A simple client implementation using Travis CI API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "travis-meta-yaml" = callPackage
@@ -204621,8 +205711,8 @@ self: {
        pname = "tree-diff";
        version = "0.0.1";
        sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
-       revision = "1";
-       editedCabalFile = "0d3kbs32q816vlrbj17lwl1bmmv7lvwi2c2i3k3agm2a8h0psx6s";
+       revision = "2";
+       editedCabalFile = "153gffmgdpk3crw9gg4i5mx4jdwglbbx0xwwhbx088j3alim3yvb";
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
          containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -204857,6 +205947,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tries_0_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-trie, composition
+     , containers, criterion, deepseq, hashable, keys, mtl, QuickCheck
+     , quickcheck-instances, rose-trees, semigroups, sets, tasty
+     , tasty-quickcheck, unordered-containers
+     }:
+     mkDerivation {
+       pname = "tries";
+       version = "0.0.5";
+       sha256 = "1xljwkdwfwd962f7bdbds89m93hw24b54624d4fqlq4n0dyq50x0";
+       libraryHaskellDepends = [
+         base bytestring bytestring-trie composition containers deepseq
+         hashable keys QuickCheck quickcheck-instances rose-trees semigroups
+         sets unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring bytestring-trie composition containers deepseq
+         hashable keys mtl QuickCheck quickcheck-instances rose-trees
+         semigroups sets tasty tasty-quickcheck unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-trie composition containers criterion
+         deepseq hashable keys mtl QuickCheck quickcheck-instances
+         rose-trees semigroups sets unordered-containers
+       ];
+       homepage = "https://github.com/athanclark/tries#readme";
+       description = "Various trie implementations in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "trifecta" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
      , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal
@@ -205293,6 +206414,7 @@ self: {
        homepage = "https://github.com/tokiwoousaka/ttask#readme";
        description = "This is task management tool for yourself, that inspired by scrum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ttrie" = callPackage
@@ -205932,6 +207054,7 @@ self: {
        homepage = "https://github.com/wiggly/twfy-api-client#readme";
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twhs" = callPackage
@@ -206176,6 +207299,7 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -206243,6 +207367,7 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -206261,6 +207386,7 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -206802,6 +207928,7 @@ self: {
        homepage = "https://github.com/konn/type-natural";
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html" = callPackage
@@ -207621,6 +208748,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "udp-streaming" = callPackage
+    ({ mkDerivation, base, bytestring, network, resourcet, streaming }:
+     mkDerivation {
+       pname = "udp-streaming";
+       version = "0.1.0.0";
+       sha256 = "1q03bm8mdbpzalb89sjm71x97znbzddbzfxdr639jzw7516bz5js";
+       libraryHaskellDepends = [
+         base bytestring network resourcet streaming
+       ];
+       homepage = "https://hub.darcs.net/mihaigiurgeanu/udp-streaming";
+       description = "Simple fire-and-forget udp Streaming components modelled after udp-conduit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "uglymemo" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -207848,8 +208989,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "unamb";
-       version = "0.2.5";
-       sha256 = "12cbqlc7qf2sf2m4zmisx06bcc104bwivnzq2df0jqdf09bg0n9k";
+       version = "0.2.7";
+       sha256 = "0v4c4zyr2fw6g86isa4n8mbflh7mwhzl70sp48mmpr1335n403xs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -208699,6 +209840,7 @@ self: {
        homepage = "https://github.com/bhurt/unitym#readme";
        description = "Implementation of the unity monad for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universal-binary" = callPackage
@@ -209617,6 +210759,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring-aeson_0_1_0_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
+     mkDerivation {
+       pname = "uri-bytestring-aeson";
+       version = "0.1.0.6";
+       sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq";
+       libraryHaskellDepends = [
+         aeson base bytestring text uri-bytestring
+       ];
+       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
+       description = "Aeson instances for URI Bytestring";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, deepseq
      , failure, monad-control, network, system-fileio, system-filepath
@@ -209705,6 +210862,7 @@ self: {
        homepage = "https://github.com/luminescent-dreams/uri-parse#readme";
        description = "A simple library for parsing and generating URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-template" = callPackage
@@ -210795,6 +211953,7 @@ self: {
        homepage = "https://github.com/agrafix/validate-input";
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validated-literals" = callPackage
@@ -211412,19 +212571,17 @@ self: {
      }) {};
 
   "vec" = callPackage
-    ({ mkDerivation, adjunctions, base, base-compat, boring, criterion
-     , deepseq, distributive, fin, hashable, inspection-testing, lens
-     , semigroupoids, semigroups, tagged, vector
+    ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
+     , distributive, fin, hashable, inspection-testing, lens
+     , semigroupoids, tagged, vector
      }:
      mkDerivation {
        pname = "vec";
-       version = "0";
-       sha256 = "1h4s4j10z94mjdifyibpnc7zzq6a8xklbzj164ck8hdq8fp7qj52";
-       revision = "1";
-       editedCabalFile = "086vxqpskjgjqy65pckivw9flp8vk14zz1cvd3pxdh5hp5dfxlam";
+       version = "0.1";
+       sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y";
        libraryHaskellDepends = [
-         adjunctions base base-compat boring deepseq distributive fin
-         hashable lens semigroupoids semigroups
+         adjunctions base base-compat deepseq distributive fin hashable lens
+         semigroupoids
        ];
        testHaskellDepends = [ base fin inspection-testing tagged ];
        benchmarkHaskellDepends = [ base criterion fin vector ];
@@ -212032,6 +213189,7 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verilog" = callPackage
@@ -212320,15 +213478,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "vinyl_0_8_1" = callPackage
+  "vinyl_0_8_1_1" = callPackage
     ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
      , lens, linear, microlens, mwc-random, primitive
      , should-not-typecheck, singletons, tagged, vector
      }:
      mkDerivation {
        pname = "vinyl";
-       version = "0.8.1";
-       sha256 = "02ccxz95r99nzzlgr50kdha2vv8znlyrzza3k150xmh7m63dzgnr";
+       version = "0.8.1.1";
+       sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          base doctest hspec lens microlens should-not-typecheck singletons
@@ -212348,8 +213506,8 @@ self: {
      }:
      mkDerivation {
        pname = "vinyl-gl";
-       version = "0.3.2";
-       sha256 = "1g81dbcarbllij1h197j0g1x65jb4pcd8qwfwza9i4jn4sfmgps1";
+       version = "0.3.3";
+       sha256 = "09nd2v7550ivgjfby3kd27rf4b5b5ih8l7nx6v5h7r9s42vadb0r";
        libraryHaskellDepends = [
          base containers GLUtil linear OpenGL tagged transformers vector
          vinyl
@@ -213610,6 +214768,7 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-brotli" = callPackage
@@ -213778,28 +214937,29 @@ self: {
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, extractable-singleton, hashable, hspec
      , hspec-wai, http-media, http-types, lucid, mmorph, monad-control
-     , monad-control-aligned, monad-logger, mtl, pandoc, pandoc-types
-     , resourcet, shakespeare, tasty, tasty-hspec, text, transformers
-     , transformers-base, unordered-containers, urlpath, wai, wai-logger
-     , wai-transformers, warp
+     , monad-control-aligned, monad-logger, mtl, resourcet, shakespeare
+     , tasty, tasty-hspec, text, transformers, transformers-base
+     , unordered-containers, urlpath, wai, wai-logger, wai-transformers
+     , warp
      }:
      mkDerivation {
        pname = "wai-middleware-content-type";
-       version = "0.5.2";
-       sha256 = "0v9gi7lljfn58g558xlxhlmp4chq7m6a4kf0b4k23scygwh727jj";
+       version = "0.6.0";
+       sha256 = "19c5sjrgfvc12f020cssr4ydsd7ib9wxabm594mn9z32sq6qv4f8";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
          extractable-singleton hashable http-media http-types lucid mmorph
-         monad-control monad-control-aligned monad-logger mtl pandoc
-         resourcet shakespeare text transformers transformers-base
+         monad-control monad-control-aligned monad-logger mtl resourcet
+         shakespeare text transformers transformers-base
          unordered-containers urlpath wai wai-logger wai-transformers
        ];
        testHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable hspec hspec-wai http-media http-types lucid mmorph
-         monad-control monad-logger mtl pandoc pandoc-types resourcet
-         shakespeare tasty tasty-hspec text transformers transformers-base
-         unordered-containers urlpath wai wai-transformers warp
+         extractable-singleton hashable hspec hspec-wai http-media
+         http-types lucid mmorph monad-control monad-control-aligned
+         monad-logger mtl resourcet shakespeare tasty tasty-hspec text
+         transformers transformers-base unordered-containers urlpath wai
+         wai-logger wai-transformers warp
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
@@ -213835,6 +214995,7 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -214260,6 +215421,7 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -214306,6 +215468,7 @@ self: {
        executableHaskellDepends = [ base bytestring cryptonite memory ];
        homepage = "https://github.com/habibalamin/wai-secure-cookies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session" = callPackage
@@ -214706,6 +215869,7 @@ self: {
        homepage = "http://github.com/bgamari/warc";
        description = "A parser for the Web Archive (WARC) format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp" = callPackage
@@ -215910,6 +217074,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets-rpc_0_7_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , exceptions, hashable, monad-control, mtl, QuickCheck
+     , quickcheck-instances, stm, tasty, tasty-quickcheck, text
+     , transformers, unordered-containers, uuid, wai-transformers
+     , websockets, websockets-simple
+     }:
+     mkDerivation {
+       pname = "websockets-rpc";
+       version = "0.7.0";
+       sha256 = "0iywpaqp0y1mbysphz438adpj8mvlyr58wr1avj22wwm9n29yhin";
+       libraryHaskellDepends = [
+         aeson async base bytestring containers exceptions hashable
+         monad-control mtl QuickCheck stm text transformers
+         unordered-containers uuid wai-transformers websockets
+         websockets-simple
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring containers exceptions hashable
+         monad-control mtl QuickCheck quickcheck-instances stm tasty
+         tasty-quickcheck text transformers unordered-containers uuid
+         wai-transformers websockets websockets-simple
+       ];
+       homepage = "https://github.com/athanclark/websockets-rpc#readme";
+       description = "Simple streaming RPC mechanism using WebSockets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets-simple" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
      , hspec, monad-control, stm, tasty, tasty-hspec, transformers
@@ -217013,6 +218206,7 @@ self: {
        homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woot" = callPackage
@@ -217155,6 +218349,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion pandoc text ];
        description = "Get word counts and distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordcloud" = callPackage
@@ -218949,6 +220144,37 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "xlsx_0_7_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
+     , bytestring, conduit, containers, criterion, data-default, deepseq
+     , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
+     , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, text, time, transformers, vector, xeno
+     , xml-conduit, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.7.1";
+       sha256 = "029frrwin3qx9kdh4i32yfyp1nlacr5zsv9msp5x63k2xyw7p0fh";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary-search bytestring conduit
+         containers data-default deepseq errors extra filepath lens mtl
+         network-uri old-locale safe text time transformers vector xeno
+         xml-conduit zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff groom lens mtl raw-strings-qq
+         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
+         xml-conduit
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -218966,6 +220192,7 @@ self: {
        homepage = "https://github.com/kkazuo/xlsx-tabular";
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -219441,6 +220668,7 @@ self: {
        homepage = "https://github.com/sannsyn/xml-query";
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-query-xml-conduit" = callPackage
@@ -220568,6 +221796,7 @@ self: {
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme";
        description = "Yam App";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-job" = callPackage
@@ -220579,6 +221808,7 @@ self: {
        libraryHaskellDepends = [ base cron yam-app ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-job#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-servant" = callPackage
@@ -220596,6 +221826,7 @@ self: {
        ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-transaction-odbc" = callPackage
@@ -220609,6 +221840,7 @@ self: {
        ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-odbc#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-transaction-postgresql" = callPackage
@@ -220623,6 +221855,7 @@ self: {
        ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-postgresql#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yamemo" = callPackage
@@ -221478,6 +222711,7 @@ self: {
        homepage = "https://github.com/yusent/yesod-auth-bcryptdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-deskcom" = callPackage
@@ -221616,6 +222850,7 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage
@@ -221652,6 +222887,7 @@ self: {
        homepage = "https://github.com/danpalmer/yesod-auth-nopassword#readme";
        description = "A plugin for Yesod to provide email-only authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-oauth" = callPackage
@@ -221693,6 +222929,7 @@ self: {
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -221779,6 +223016,7 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -221796,6 +223034,7 @@ self: {
        homepage = "https://github.com/andrewthad/haskell-bootstrap";
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-colonnade" = callPackage
@@ -221812,6 +223051,7 @@ self: {
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-comments" = callPackage
@@ -222097,6 +223337,7 @@ self: {
        libraryHaskellDepends = [ base blaze-html yesod-core ];
        description = "Non template haskell markup building function in the spirit of lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-eventsource" = callPackage
@@ -222291,6 +223532,7 @@ self: {
        homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -222322,6 +223564,7 @@ self: {
        ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-goodies" = callPackage
@@ -222419,6 +223662,7 @@ self: {
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-mangopay" = callPackage
@@ -222756,6 +224000,7 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml-bin" = callPackage
@@ -222795,6 +224040,7 @@ self: {
        ];
        description = "A html documentation generator library for RAML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml-mock" = callPackage
@@ -222895,6 +224141,7 @@ self: {
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -223099,6 +224346,7 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-table" = callPackage
@@ -223363,6 +224611,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yhccore" = callPackage
@@ -224802,6 +226051,7 @@ self: {
        ];
        description = "ZIP archive streaming using conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zipedit" = callPackage
@@ -224921,6 +226171,7 @@ self: {
        homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zlib" = callPackage

From 7d043f036c788f367a562c4a9a07781d02d8e525 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 10:07:55 +0100
Subject: [PATCH 1249/2266] haskell-configuration-common: cosmetic, no
 functional change

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 12356ae2096..11b4df58cc6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -827,7 +827,7 @@ self: super: {
   fluid-idl-http-client = markBroken super.fluid-idl-http-client;
   fluid-idl-scotty = markBroken super.fluid-idl-scotty;
 
-   # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
+  # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
   stack2nix = doJailbreak super.stack2nix;
 
   # Hacks to work around https://github.com/haskell/c2hs/issues/192.

From 929dac413b4179ca31591e5b0e639fcb3445e110 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:03:42 +0100
Subject: [PATCH 1250/2266] cabal2nix: update hpack version override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 11b4df58cc6..9c3b981656b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -618,7 +618,7 @@ self: super: {
   }));
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_1; hackage-db = self.hackage-db_2_0_1; });
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;

From 993bcbb2257ec8ea55c775eb26f1931f3db2e005 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:07:13 +0100
Subject: [PATCH 1251/2266] ghc: drop all compiler versions prior to 7.10.3

None of these old compilers are used anywhere in Nixpkgs, and keeping those
builds working in the face of regular updates of GCC, binutils, and whatnot is
too much effort for no obvious benefit.
---
 .../compilers/ghc/7.0.4-binary.nix            | 146 ----------------
 pkgs/development/compilers/ghc/7.0.4.nix      |  67 --------
 .../compilers/ghc/7.4.2-binary.nix            | 148 -----------------
 pkgs/development/compilers/ghc/7.4.2.nix      |  77 ---------
 pkgs/development/compilers/ghc/7.6.3.nix      | 103 ------------
 .../compilers/ghc/7.8.4-binary.nix            | 156 ------------------
 pkgs/development/compilers/ghc/7.8.4.nix      |  91 ----------
 .../compilers/ghc/fix-7.0.4-clang.patch       |  74 ---------
 .../compilers/ghc/fix-7.2.2-clang.patch       |  74 ---------
 .../compilers/ghc/fix-7.4.2-clang.patch       |  57 -------
 .../compilers/ghc/fix-7.6.3-clang.patch       |  71 --------
 .../development/compilers/ghc/hpc-7.8.4.patch |  13 --
 pkgs/top-level/haskell-packages.nix           |  22 +--
 13 files changed, 1 insertion(+), 1098 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/7.0.4-binary.nix
 delete mode 100644 pkgs/development/compilers/ghc/7.0.4.nix
 delete mode 100644 pkgs/development/compilers/ghc/7.4.2-binary.nix
 delete mode 100644 pkgs/development/compilers/ghc/7.4.2.nix
 delete mode 100644 pkgs/development/compilers/ghc/7.6.3.nix
 delete mode 100644 pkgs/development/compilers/ghc/7.8.4-binary.nix
 delete mode 100644 pkgs/development/compilers/ghc/7.8.4.nix
 delete mode 100644 pkgs/development/compilers/ghc/fix-7.0.4-clang.patch
 delete mode 100644 pkgs/development/compilers/ghc/fix-7.2.2-clang.patch
 delete mode 100644 pkgs/development/compilers/ghc/fix-7.4.2-clang.patch
 delete mode 100644 pkgs/development/compilers/ghc/fix-7.6.3-clang.patch
 delete mode 100644 pkgs/development/compilers/ghc/hpc-7.8.4.patch

diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
deleted file mode 100644
index 8758ee59d38..00000000000
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ stdenv
-, fetchurl, perl
-, ncurses5, gmp, libiconv
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
-  libPath = stdenv.lib.makeLibraryPath ([
-    ncurses5 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
-
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
-    + "LD_LIBRARY_PATH";
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.0.4";
-
-  name = "ghc-${version}-binary";
-
-  src = fetchurl ({
-    "i686-linux" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2";
-      sha256 = "0mfnihiyjl06f5w1yrjp36sw9g67g2ymg5sdl0g23h1pab99jx63";
-    };
-    "x86_64-linux" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
-      sha256 = "0mc4rhqcxz427wq4zgffmnn0d2yjqvy6af4x9mha283p1gdj5q99";
-    };
-    "i686-darwin" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2";
-      sha256 = "0qj45hslrrr8zfks8m1jcb3awwx9rh35ndnpfmb0gwb6j7azq5n3";
-    };
-    "x86_64-darwin" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2";
-      sha256 = "1m2ml88p1swf4dnv2vq8hz4drcp46n3ahpfi05wh01ajkf8hnn3l";
-    };
-  }.${stdenv.hostPlatform.system}
-    or (throw "cannot bootstrap GHC on this platform"));
-
-  nativeBuildInputs = [ perl ];
-
-  # Cannot patchelf beforehand due to relative RPATHs that anticipate
-  # the final install location/
-  ${libEnvVar} = libPath;
-
-  postUnpack =
-    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
-    # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
-      export NIX_LDFLAGS+=" -no_dtrace_dof"
-    '' +
-
-    # Strip is harmful, see also below. It's important that this happens
-    # first. The GHC Cabal build system makes use of strip by default and
-    # has hardcoded paths to /usr/bin/strip in many places. We replace
-    # those below, making them point to our dummy script.
-    ''
-      mkdir "$TMP/bin"
-      for i in strip; do
-        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
-        chmod +x "$TMP/bin/$i"
-      done
-      PATH="$TMP/bin:$PATH"
-    '' +
-    # We have to patch the GMP paths for the integer-gmp package.
-    ''
-      find . -name integer-gmp.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-      find . -name base.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
-    '' +
-    # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
-      find . -type f -perm -0100 -exec patchelf \
-          --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
-
-      paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-
-      sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-      sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-      for prog in ld ar gcc strip ranlib; do
-        find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
-      done
-    '';
-
-  configurePlatforms = [ ];
-  configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
-
-  # Stripping combined with patchelf breaks the executables (they die
-  # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
-  dontStrip = true;
-
-  # No building is necessary, but calling make without flags ironically
-  # calls install-strip ...
-  dontBuild = true;
-
-  # On Linux, use patchelf to modify the executables so that they can
-  # find editline/gmp.
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
-    find "$out" -type f -executable \
-        -exec patchelf --set-rpath "${libPath}" {} \;
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # not enough room in the object files for the full path to libiconv :(
-    for exe in $(find "$out" -type f -executable); do
-      isScript $exe && continue
-      ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-      install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-    done
-
-    for file in $(find "$out" -name setup-config); do
-      substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
-    done
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    # Sanity check, can ghc create executables?
-    cd $TMP
-    mkdir test-ghc; cd test-ghc
-    cat > main.hs << EOF
-      module Main where
-      main = putStrLn "yes"
-    EOF
-    $out/bin/ghc --make main.hs
-    echo compilation ok
-    [ $(./main) == "yes" ]
-  '';
-
-  passthru = {
-    targetPrefix = "";
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.0.4";
-  };
-
-  meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
-}
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
deleted file mode 100644
index 5bd05b257ca..00000000000
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
-
-# TODO(@Ericson2314): Cross compilation support
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-stdenv.mkDerivation rec {
-  version = "7.0.4";
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2";
-    sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed";
-  };
-
-  patches = [ ./fix-7.0.4-clang.patch ./relocation.patch ];
-
-  buildInputs = [ ghc perl gmp ncurses ];
-
-  buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '';
-
-  preConfigure = ''
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    find . -name '*.hs'  | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|'
-    find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|'
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
-                                      else "--with-gcc=${stdenv.cc}/bin/gcc";
-
-  NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags=["-S" "--keep-file-symbols"];
-
-  passthru = {
-    targetPrefix = "";
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.0.4";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = [
-      stdenv.lib.maintainers.marcweber
-      stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.peti
-    ];
-    platforms = ["x86_64-linux" "i686-linux"];  # Darwin is not supported.
-    inherit (ghc.meta) license;
-  };
-
-}
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
deleted file mode 100644
index 988392e74b9..00000000000
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ /dev/null
@@ -1,148 +0,0 @@
-{ stdenv
-, fetchurl, perl
-, ncurses5, gmp, libiconv
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
-  libPath = stdenv.lib.makeLibraryPath ([
-    ncurses5 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
-
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
-    + "LD_LIBRARY_PATH";
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.4.2";
-
-  name = "ghc-${version}-binary";
-
-  src = fetchurl ({
-    "i686-linux" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2";
-      sha256 = "0gny7knhss0w0d9r6jm1gghrcb8kqjvj94bb7hxf9syrk4fxlcxi";
-    };
-    "x86_64-linux" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
-      sha256 = "043jabd0lh6n1zlqhysngbpvlsdznsa2mmsj08jyqgahw9sjb5ns";
-    };
-    "i686-darwin" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2";
-      sha256 = "1vrbs3pzki37hzym1f1nh07lrqh066z3ypvm81fwlikfsvk4djc0";
-    };
-    "x86_64-darwin" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2";
-      sha256 = "1imzqc0slpg0r6p40n5a9m18cbcm0m86z8dgyhfxcckksw54mzwf";
-    };
-  }.${stdenv.hostPlatform.system}
-    or (throw "cannot bootstrap GHC on this platform"));
-
-  nativeBuildInputs = [ perl ];
-
-  # Cannot patchelf beforehand due to relative RPATHs that anticipate
-  # the final install location/
-  ${libEnvVar} = libPath;
-
-  postUnpack =
-    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
-    # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
-      export NIX_LDFLAGS+=" -no_dtrace_dof"
-    '' +
-
-    # Strip is harmful, see also below. It's important that this happens
-    # first. The GHC Cabal build system makes use of strip by default and
-    # has hardcoded paths to /usr/bin/strip in many places. We replace
-    # those below, making them point to our dummy script.
-    ''
-      mkdir "$TMP/bin"
-      for i in strip; do
-        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
-        chmod +x "$TMP/bin/$i"
-      done
-      PATH="$TMP/bin:$PATH"
-    '' +
-    # We have to patch the GMP paths for the integer-gmp package.
-    ''
-      find . -name integer-gmp.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-      find . -name base.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
-    '' +
-    # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
-      find . -type f -perm -0100 -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
-          --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
-
-      paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-
-      sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-      sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-      for prog in ld ar gcc strip ranlib; do
-        find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
-      done
-    '';
-
-  configurePlatforms = [ ];
-  configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
-
-  # Stripping combined with patchelf breaks the executables (they die
-  # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
-  dontStrip = true;
-
-  # No building is necessary, but calling make without flags ironically
-  # calls install-strip ...
-  dontBuild = true;
-
-  # On Linux, use patchelf to modify the executables so that they can
-  # find editline/gmp.
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
-    find "$out" -type f -executable \
-        -exec patchelf --set-rpath "${libPath}" {} \;
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # not enough room in the object files for the full path to libiconv :(
-    for exe in $(find "$out" -type f -executable); do
-      isScript $exe && continue
-      ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-      install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-    done
-
-    for file in $(find "$out" -name setup-config); do
-      substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
-    done
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    # Sanity check, can ghc create executables?
-    cd $TMP
-    mkdir test-ghc; cd test-ghc
-    cat > main.hs << EOF
-      {-# LANGUAGE TemplateHaskell #-}
-      module Main where
-      main = putStrLn \$([|"yes"|])
-    EOF
-    $out/bin/ghc --make main.hs || exit 1
-    echo compilation ok
-    [ $(./main) == "yes" ]
-  '';
-
-  passthru = {
-    targetPrefix = "";
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.4.2";
-  };
-
-  meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
-}
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
deleted file mode 100644
index 86925c406cf..00000000000
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
-}:
-
-# TODO(@Ericson2314): Cross compilation support
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-assert !enableIntegerSimple -> gmp != null;
-
-stdenv.mkDerivation rec {
-  version = "7.4.2";
-
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2";
-    sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj";
-  };
-
-  patches = [ ./fix-7.4.2-clang.patch ./relocation.patch ];
-
-  buildInputs = [ ghc perl ncurses ]
-                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
-
-  buildMK = ''
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '' + (if enableIntegerSimple then ''
-    INTEGER_LIBRARY = integer-simple
-  '' else ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-  '');
-
-  preConfigure = ''
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    find . -name '*.hs'  | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|'
-    find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|'
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
-                                      else "--with-gcc=${stdenv.cc}/bin/gcc";
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  passthru = {
-    targetPrefix = "";
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.4.2";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = [
-      stdenv.lib.maintainers.marcweber
-      stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.peti
-    ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
deleted file mode 100644
index 982008563a0..00000000000
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
-}:
-
-# TODO(@Ericson2314): Cross compilation support
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-assert !enableIntegerSimple -> gmp != null;
-
-let
-  # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed
-  # to the gold linker). It prevents binaries' stacks from being marked as
-  # executable, which fails to run on a grsecurity/PaX kernel.
-  ghcFlags = "-optc-Wa,--noexecstack -opta-Wa,--noexecstack";
-  cFlags = "-Wa,--noexecstack";
-
-in stdenv.mkDerivation rec {
-  version = "7.6.3";
-
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2";
-    sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx";
-  };
-
-  patches = [ ./fix-7.6.3-clang.patch ./relocation.patch ];
-
-  buildInputs = [ ghc perl ncurses ]
-                ++ stdenv.lib.optional (!enableIntegerSimple) gmp;
-
-  buildMK = ''
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    # Set ghcFlags for building ghc itself
-    SRC_HC_OPTS += ${ghcFlags}
-    SRC_CC_OPTS += ${cFlags}
-  '' + (if enableIntegerSimple then ''
-    INTEGER_LIBRARY = integer-simple
-  '' else ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-  '');
-
-  preConfigure = ''
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    # Set ghcFlags for binaries that ghc builds
-    sed -i -e 's|"\$topdir"|"\$topdir" ${ghcFlags}|' ghc/ghc.wrapper
-
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    find . -name '*.hs'  | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|'
-    find . -name '*.lhs' | xargs sed -i -e 's|ASSERT (|ASSERT(|' -e 's|ASSERT2 (|ASSERT2(|' -e 's|WARN (|WARN(|'
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
-                                      else "--with-gcc=${stdenv.cc}/bin/gcc";
-
-  postInstall = ''
-    # ghci uses mmap with rwx protection at it implements dynamic
-    # linking on its own. See:
-    # - https://bugs.gentoo.org/show_bug.cgi?id=299709
-    # - https://ghc.haskell.org/trac/ghc/ticket/4244
-    # Therefore, we have to pax-mark the resulting binary.
-    # Haddock also seems to run with ghci, so mark it as well.
-    paxmark m $out/lib/${name}/{ghc,haddock}
-  '';
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  passthru = {
-    targetPrefix = "";
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.6.3";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = [
-      stdenv.lib.maintainers.marcweber
-      stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.peti
-    ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/development/compilers/ghc/7.8.4-binary.nix b/pkgs/development/compilers/ghc/7.8.4-binary.nix
deleted file mode 100644
index 58a9370b321..00000000000
--- a/pkgs/development/compilers/ghc/7.8.4-binary.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ stdenv
-, fetchurl, perl
-, ncurses5, gmp, libiconv
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
-  libPath = stdenv.lib.makeLibraryPath ([
-    ncurses5 gmp
-  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
-
-  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
-    + "LD_LIBRARY_PATH";
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.8.4";
-
-  name = "ghc-${version}-binary";
-
-  src = fetchurl ({
-    "i686-linux" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux-deb7.tar.bz2";
-      sha256 = "5da2cf45986f33319a92a666f1f0149915334a7b64b41892ab94f4557242b406";
-    };
-    "x86_64-linux" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux-deb7.tar.bz2";
-      sha256 = "20b5731d268613bbf6e977dbb192a3a3b7b78d954c35edbfca4fb36b652e24f7";
-    };
-    "x86_64-darwin" = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2";
-      sha256 = "dfa161c2a136ee16214a49d5902e2377407c8292dbbdbb14fa0fa6b17220cae6";
-    };
-  }.${stdenv.hostPlatform.system}
-    or (throw "cannot bootstrap GHC on this platform"));
-
-  nativeBuildInputs = [ perl ];
-
-  # Cannot patchelf beforehand due to relative RPATHs that anticipate
-  # the final install location/
-  ${libEnvVar} = libPath;
-
-  postUnpack =
-    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
-    # during linking
-    stdenv.lib.optionalString stdenv.isDarwin ''
-      export NIX_LDFLAGS+=" -no_dtrace_dof"
-      # not enough room in the object files for the full path to libiconv :(
-      for exe in $(find . -type f -executable); do
-        isScript $exe && continue
-        ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-        for file in $(find . -name setup-config); do
-          substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
-        done
-      done
-    '' +
-
-    # Some scripts used during the build need to have their shebangs patched
-    ''
-      patchShebangs ghc-${version}/utils/
-    '' +
-
-    # Strip is harmful, see also below. It's important that this happens
-    # first. The GHC Cabal build system makes use of strip by default and
-    # has hardcoded paths to /usr/bin/strip in many places. We replace
-    # those below, making them point to our dummy script.
-    ''
-      mkdir "$TMP/bin"
-      for i in strip; do
-        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
-        chmod +x "$TMP/bin/$i"
-      done
-      PATH="$TMP/bin:$PATH"
-    '' +
-    # We have to patch the GMP paths for the integer-gmp package.
-    ''
-      find . -name integer-gmp.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-      find . -name base.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
-    '' +
-    # Rename needed libraries and binaries, fix interpreter
-    stdenv.lib.optionalString stdenv.isLinux ''
-      find . -type f -perm -0100 -exec patchelf \
-          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
-          --replace-needed libtinfo.so libtinfo.so.5 \
-          --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
-
-      paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-
-      sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-      sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-    '';
-
-  configurePlatforms = [ ];
-  configureFlags = [
-    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
-    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
-
-  # Stripping combined with patchelf breaks the executables (they die
-  # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
-  dontStrip = true;
-
-  # No building is necessary, but calling make without flags ironically
-  # calls install-strip ...
-  dontBuild = true;
-
-  # On Linux, use patchelf to modify the executables so that they can
-  # find editline/gmp.
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
-    for p in $(find "$out" -type f -executable); do
-      if isELF "$p"; then
-        echo "Patchelfing $p"
-        patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
-      fi
-    done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # not enough room in the object files for the full path to libiconv :(
-    for exe in $(find "$out" -type f -executable); do
-      isScript $exe && continue
-      ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-      install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-    done
-
-    for file in $(find "$out" -name setup-config); do
-      substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
-    done
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    unset ${libEnvVar}
-    # Sanity check, can ghc create executables?
-    cd $TMP
-    mkdir test-ghc; cd test-ghc
-    cat > main.hs << EOF
-      {-# LANGUAGE TemplateHaskell #-}
-      module Main where
-      main = putStrLn \$([|"yes"|])
-    EOF
-    $out/bin/ghc --make main.hs || exit 1
-    echo compilation ok
-    [ $(./main) == "yes" ]
-  '';
-
-  passthru = { targetPrefix = ""; };
-
-  meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
-}
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
deleted file mode 100644
index 47fc090c1ff..00000000000
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ stdenv, targetPackages
-
-, fetchurl, ghc, perl
-, libffi, libiconv ? null, ncurses
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
-}:
-
-# TODO(@Ericson2314): Cross compilation support
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-assert !enableIntegerSimple -> gmp != null;
-
-let
-  buildMK = ''
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    DYNAMIC_BY_DEFAULT = NO
-    ${stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '' + (if enableIntegerSimple then ''
-    INTEGER_LIBRARY = integer-simple
-  '' else ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-  '');
-
-  # Splicer will pull out correct variations
-  libDeps = [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") libiconv;
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.8.4";
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz";
-    sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3";
-  };
-
-  enableParallelBuilding = true;
-
-  patches = [ ./relocation.patch ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./hpc-7.8.4.patch;
-
-  preConfigure = ''
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ];
-
-  nativeBuildInputs = [ ghc perl ];
-  depsBuildTarget = [ targetPackages.stdenv.cc ];
-
-  buildInputs = libDeps;
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ];
-
-  depsTargetTarget = map stdenv.lib.getDev libDeps;
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") libDeps;
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  passthru = {
-    targetPrefix = "";
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.8.4";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/development/compilers/ghc/fix-7.0.4-clang.patch b/pkgs/development/compilers/ghc/fix-7.0.4-clang.patch
deleted file mode 100644
index 51323c69c20..00000000000
--- a/pkgs/development/compilers/ghc/fix-7.0.4-clang.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
-index f704a69..37753fd 100644
---- a/compiler/codeGen/CgInfoTbls.hs
-+++ b/compiler/codeGen/CgInfoTbls.hs
-@@ -211,9 +211,7 @@ mkStackLayout = do
-                     [(offset - frame_sp - retAddrSizeW, b)
-                     | (offset, b) <- binds]
- 
--  WARN( not (all (\bind -> fst bind >= 0) rel_binds),
--	ppr binds $$ ppr rel_binds $$
--        ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-+  WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-     return $ stack_layout rel_binds frame_size
- 
- stack_layout :: [(VirtualSpOffset, CgIdInfo)]
-diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
-index 638e1db..0aee4b7 100644
---- a/compiler/main/GHC.hs
-+++ b/compiler/main/GHC.hs
-@@ -788,8 +788,7 @@ load2 how_much mod_graph = do
- 	    -- is stable).
- 	    partial_mg
- 		| LoadDependenciesOf _mod <- how_much
--		= ASSERT( case last partial_mg0 of 
--			    AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False )
-+		= ASSERT( case last partial_mg0 of AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False )
- 		  List.init partial_mg0
- 		| otherwise
- 		= partial_mg0
-@@ -879,8 +878,7 @@ load2 how_much mod_graph = do
- 	      liftIO $ cleanTempFilesExcept dflags (ppFilesFromSummaries mods_to_keep)
- 
- 	      -- there should be no Nothings where linkables should be, now
--	      ASSERT(all (isJust.hm_linkable) 
--			(eltsUFM (hsc_HPT hsc_env))) do
-+	      ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do
- 	
- 	      -- Link everything together
-               linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4
-diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
-index 99a63e4..3268726 100644
---- a/compiler/simplCore/SimplUtils.lhs
-+++ b/compiler/simplCore/SimplUtils.lhs
-@@ -388,8 +388,7 @@ mkArgInfo fun rules n_val_args call_cont
- 		   else
- 			map isStrictDmd demands ++ vanilla_stricts
- 	       | otherwise
--	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) 
--				<+> ppr n_val_args <+> ppr demands ) 
-+	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) 
- 		   vanilla_stricts	-- Not enough args, or no strictness
- 
-     add_type_str :: Type -> [Bool] -> [Bool]
-@@ -1812,4 +1811,4 @@ without getting changed to c1=I# c2.
- I don't think this is worth fixing, even if I knew how. It'll
- all come out in the next pass anyway.
- 
--  
-\ No newline at end of file
-+  
-diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
-index d0fbd8d..ef87996 100644
---- a/compiler/simplCore/Simplify.lhs
-+++ b/compiler/simplCore/Simplify.lhs
-@@ -2071,8 +2071,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs')
- 		      	     rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty)
- 			     	   	        ++ varsToCoreExprs bndrs')
- 
--		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt")
--		      	     	   	        <+> ppr case_bndr <+> ppr con )
-+		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con )
- 			           case_bndr
- 		      	   -- The case binder is alive but trivial, so why has 
- 		      	   -- it not been substituted away?
diff --git a/pkgs/development/compilers/ghc/fix-7.2.2-clang.patch b/pkgs/development/compilers/ghc/fix-7.2.2-clang.patch
deleted file mode 100644
index 9592d54188e..00000000000
--- a/pkgs/development/compilers/ghc/fix-7.2.2-clang.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
-index dbd22f3..42208f9 100644
---- a/compiler/codeGen/CgInfoTbls.hs
-+++ b/compiler/codeGen/CgInfoTbls.hs
-@@ -210,9 +210,7 @@ mkStackLayout = do
-                     [(offset - frame_sp - retAddrSizeW, b)
-                     | (offset, b) <- binds]
- 
--  WARN( not (all (\bind -> fst bind >= 0) rel_binds),
--	ppr binds $$ ppr rel_binds $$
--        ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-+  WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-     return $ stack_layout rel_binds frame_size
- 
- stack_layout :: [(VirtualSpOffset, CgIdInfo)]
-diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
-index dece548..9643f30 100644
---- a/compiler/main/GhcMake.hs
-+++ b/compiler/main/GhcMake.hs
-@@ -236,8 +236,7 @@ load2 how_much mod_graph = do
- 	    -- is stable).
- 	    partial_mg
- 		| LoadDependenciesOf _mod <- how_much
--		= ASSERT( case last partial_mg0 of 
--			    AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False )
-+		= ASSERT( case last partial_mg0 of AcyclicSCC ms -> ms_mod_name ms == _mod; _ -> False )
- 		  List.init partial_mg0
- 		| otherwise
- 		= partial_mg0
-@@ -331,8 +330,7 @@ load2 how_much mod_graph = do
-               liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1
- 
- 	      -- there should be no Nothings where linkables should be, now
--	      ASSERT(all (isJust.hm_linkable) 
--			(eltsUFM (hsc_HPT hsc_env))) do
-+	      ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do
- 	
- 	      -- Link everything together
-               linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4
-diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
-index dd0ce4b..9501e73 100644
---- a/compiler/simplCore/SimplUtils.lhs
-+++ b/compiler/simplCore/SimplUtils.lhs
-@@ -393,8 +393,7 @@ mkArgInfo fun rules n_val_args call_cont
- 		   else
- 			map isStrictDmd demands ++ vanilla_stricts
- 	       | otherwise
--	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) 
--				<+> ppr n_val_args <+> ppr demands ) 
-+	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) 
- 		   vanilla_stricts	-- Not enough args, or no strictness
- 
-     add_type_str :: Type -> [Bool] -> [Bool]
-@@ -1845,4 +1844,4 @@ without getting changed to c1=I# c2.
- I don't think this is worth fixing, even if I knew how. It'll
- all come out in the next pass anyway.
- 
--  
-\ No newline at end of file
-+  
-diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
-index adcaf13..06d939d 100644
---- a/compiler/simplCore/Simplify.lhs
-+++ b/compiler/simplCore/Simplify.lhs
-@@ -2185,8 +2185,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs')
- 		      	     rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty)
- 			     	   	        ++ varsToCoreExprs bndrs')
- 
--		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt")
--		      	     	   	        <+> ppr case_bndr <+> ppr con )
-+		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con )
- 			           case_bndr
- 		      	   -- The case binder is alive but trivial, so why has 
- 		      	   -- it not been substituted away?
diff --git a/pkgs/development/compilers/ghc/fix-7.4.2-clang.patch b/pkgs/development/compilers/ghc/fix-7.4.2-clang.patch
deleted file mode 100644
index ce1593b3e31..00000000000
--- a/pkgs/development/compilers/ghc/fix-7.4.2-clang.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
-index 25ba154..fbb7874 100644
---- a/compiler/codeGen/CgInfoTbls.hs
-+++ b/compiler/codeGen/CgInfoTbls.hs
-@@ -178,9 +178,7 @@ mkStackLayout = do
-                     [(offset - frame_sp - retAddrSizeW, b)
-                     | (offset, b) <- binds]
- 
--  WARN( not (all (\bind -> fst bind >= 0) rel_binds),
--        pprPlatform platform binds $$ pprPlatform platform rel_binds $$
--        ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-+  WARN( not (all (\bind -> fst bind >= 0) rel_binds), pprPlatform platform binds $$ pprPlatform platform rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-     return $ stack_layout rel_binds frame_size
- 
- stack_layout :: [(VirtualSpOffset, CgIdInfo)]
-diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
-index 091e1be..23447e4 100644
---- a/compiler/main/GhcMake.hs
-+++ b/compiler/main/GhcMake.hs
-@@ -338,8 +338,7 @@ load2 how_much mod_graph = do
-               liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1
- 
-               -- there should be no Nothings where linkables should be, now
--              ASSERT(all (isJust.hm_linkable) 
--                        (eltsUFM (hsc_HPT hsc_env))) do
-+              ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do
-         
-               -- Link everything together
-               linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4
-diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
-index 86dc88d..ecde4fd 100644
---- a/compiler/simplCore/SimplUtils.lhs
-+++ b/compiler/simplCore/SimplUtils.lhs
-@@ -407,8 +407,7 @@ mkArgInfo fun rules n_val_args call_cont
- 		   else
- 			map isStrictDmd demands ++ vanilla_stricts
- 	       | otherwise
--	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) 
--				<+> ppr n_val_args <+> ppr demands ) 
-+	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) 
- 		   vanilla_stricts	-- Not enough args, or no strictness
- 
-     add_type_str :: Type -> [Bool] -> [Bool]
-diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
-index 3bd95a7..4c9ee7c 100644
---- a/compiler/simplCore/Simplify.lhs
-+++ b/compiler/simplCore/Simplify.lhs
-@@ -2336,8 +2336,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs')
- 		      	     rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty)
- 			     	   	        ++ varsToCoreExprs bndrs')
- 
--		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt")
--		      	     	   	        <+> ppr case_bndr <+> ppr con )
-+		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con )
- 			           case_bndr
- 		      	   -- The case binder is alive but trivial, so why has 
- 		      	   -- it not been substituted away?
diff --git a/pkgs/development/compilers/ghc/fix-7.6.3-clang.patch b/pkgs/development/compilers/ghc/fix-7.6.3-clang.patch
deleted file mode 100644
index e83fd252d72..00000000000
--- a/pkgs/development/compilers/ghc/fix-7.6.3-clang.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/compiler/codeGen/CgInfoTbls.hs b/compiler/codeGen/CgInfoTbls.hs
-index 7cdb1b6..e953507 100644
---- a/compiler/codeGen/CgInfoTbls.hs
-+++ b/compiler/codeGen/CgInfoTbls.hs
-@@ -157,9 +157,7 @@ mkStackLayout = do
-                     [(offset - frame_sp - retAddrSizeW, b)
-                     | (offset, b) <- binds]
- 
--  WARN( not (all (\bind -> fst bind >= 0) rel_binds),
--        ppr binds $$ ppr rel_binds $$
--        ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-+  WARN( not (all (\bind -> fst bind >= 0) rel_binds), ppr binds $$ ppr rel_binds $$ ppr frame_size $$ ppr real_sp $$ ppr frame_sp )
-     return $ stack_layout rel_binds frame_size
- 
- stack_layout :: [(VirtualSpOffset, CgIdInfo)]
-diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
-index f563cd9..4ac7812 100644
---- a/compiler/main/GhcMake.hs
-+++ b/compiler/main/GhcMake.hs
-@@ -331,8 +331,7 @@ load how_much = do
-           liftIO $ intermediateCleanTempFiles dflags mods_to_keep hsc_env1
- 
-           -- there should be no Nothings where linkables should be, now
--          ASSERT(all (isJust.hm_linkable) 
--                    (eltsUFM (hsc_HPT hsc_env))) do
-+          ASSERT(all (isJust.hm_linkable) (eltsUFM (hsc_HPT hsc_env))) do
-     
-           -- Link everything together
-           linkresult <- liftIO $ link (ghcLink dflags) dflags False hpt4
-diff --git a/compiler/simplCore/SimplUtils.lhs b/compiler/simplCore/SimplUtils.lhs
-index 87aefba..479d2ef 100644
---- a/compiler/simplCore/SimplUtils.lhs
-+++ b/compiler/simplCore/SimplUtils.lhs
-@@ -415,8 +415,7 @@ mkArgInfo fun rules n_val_args call_cont
- 		   else
- 			map isStrictDmd demands ++ vanilla_stricts
- 	       | otherwise
--	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) 
--				<+> ppr n_val_args <+> ppr demands ) 
-+	       -> WARN( True, text "More demands than arity" <+> ppr fun <+> ppr (idArity fun) <+> ppr n_val_args <+> ppr demands ) 
- 		   vanilla_stricts	-- Not enough args, or no strictness
- 
-     add_type_str :: Type -> [Bool] -> [Bool]
-diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
-index f2ed224..464fad6 100644
---- a/compiler/simplCore/Simplify.lhs
-+++ b/compiler/simplCore/Simplify.lhs
-@@ -2359,8 +2359,7 @@ mkDupableAlt env case_bndr (con, bndrs', rhs')
- 		      	     rhs = mkConApp dc (map Type (tyConAppArgs scrut_ty)
- 			     	   	        ++ varsToCoreExprs bndrs')
- 
--		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt")
--		      	     	   	        <+> ppr case_bndr <+> ppr con )
-+		      LitAlt {} -> WARN( True, ptext (sLit "mkDupableAlt") <+> ppr case_bndr <+> ppr con )
- 			           case_bndr
- 		      	   -- The case binder is alive but trivial, so why has 
- 		      	   -- it not been substituted away?
-diff --git a/compiler/types/Coercion.lhs b/compiler/types/Coercion.lhs
-index 42e54ba..9b420ae 100644
---- a/compiler/types/Coercion.lhs
-+++ b/compiler/types/Coercion.lhs
-@@ -498,8 +498,7 @@ splitForAllCo_maybe _                = Nothing
- coVarKind :: CoVar -> (Type,Type) 
- coVarKind cv
-  | Just (tc, [_kind,ty1,ty2]) <- splitTyConApp_maybe (varType cv)
-- = ASSERT (tc `hasKey` eqPrimTyConKey)
--   (ty1,ty2)
-+ = ASSERT (tc `hasKey` eqPrimTyConKey) (ty1,ty2)
-  | otherwise = panic "coVarKind, non coercion variable"
- 
- -- | Makes a coercion type from two types: the types whose equality 
diff --git a/pkgs/development/compilers/ghc/hpc-7.8.4.patch b/pkgs/development/compilers/ghc/hpc-7.8.4.patch
deleted file mode 100644
index 212989200bc..00000000000
--- a/pkgs/development/compilers/ghc/hpc-7.8.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
-index 991fc57..0aad221 100644
---- a/compiler/cmm/CLabel.hs
-+++ b/compiler/cmm/CLabel.hs
-@@ -877,7 +877,7 @@ labelDynamic dflags this_pkg this_mod lbl =
- 
-    PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
- 
--   HpcTicksLabel m        -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
-+   HpcTicksLabel m        -> not (gopt Opt_Static dflags) && this_mod /= m
- 
-    -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves.
-    _                 -> False
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 51726ca730d..ae5d077f782 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -6,16 +6,11 @@
 let
   # These are attributes in compiler and packages that don't support integer-simple.
   integerSimpleExcludes = [
-    "ghc704Binary"
-    "ghc742Binary"
-    "ghc784Binary"
     "ghc7103Binary"
     "ghc821Binary"
-    "ghc704"
-    "ghc763"
+    "ghcCross"
     "ghcjs"
     "ghcjsHEAD"
-    "ghcCross"
     "integer-simple"
   ];
 
@@ -31,24 +26,9 @@ in rec {
 
   compiler = {
 
-    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { gmp = pkgs.gmp4; };
-    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { gmp = pkgs.gmp4; };
-    ghc784Binary = callPackage ../development/compilers/ghc/7.8.4-binary.nix { };
     ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { };
     ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { };
 
-    ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix {
-      ghc = compiler.ghc704Binary;
-    };
-    ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix {
-      ghc = compiler.ghc704Binary;
-    };
-    ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix {
-      ghc = compiler.ghc704Binary;
-    };
-    ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
-      ghc = compiler.ghc742Binary;
-    };
     ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
       bootPkgs = packages.ghc7103Binary;
       inherit (bootPkgs) hscolour;

From 408d441df0cc1a389f76f4fdd7f857d64dc4179f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:11:43 +0100
Subject: [PATCH 1252/2266] git-annex: update sha256 hash for the new version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9c3b981656b..6abd25121e5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -80,7 +80,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w";
+      sha256 = "0qi5wpsvw6g8xrri1pr0401370acs5sg75myr0h5mjad6pvqc667";
     };
   })).overrideScope (self: super: {
     aws = dontCheck (self.aws_0_18);

From 7f5fba75e2ab640c1d7c65294447514ec443598f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:14:51 +0100
Subject: [PATCH 1253/2266] haskell-generic-builder: compile profiling library
 variants by default

Unless specified otherwise, the default package set compiles library variants
for profiling with profiling-detail "all-functions". Executables, however, are
not built with profiling enabled.

This change increases the closure size for many Haskell programs, but the
practical advantage of having stack traces and performance measurements easily
available during development seems to outweigh that cost.

Closes https://github.com/NixOS/nixpkgs/issues/22340.
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a29056d965a..07ef985ca33 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -24,8 +24,9 @@ in
 , doBenchmark ? false
 , doHoogle ? true
 , editedCabalFile ? null
-, enableLibraryProfiling ? false
+, enableLibraryProfiling ? true
 , enableExecutableProfiling ? false
+, profilingDetail ? "all-functions"
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
@@ -135,6 +136,7 @@ let
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
     (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
+    (optionalString (enableExecutableProfiling || enableLibraryProfiling) "--profiling-detail=${profilingDetail}")
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
     (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage"))

From a62b24be6d650757deb8fe222763f436a53650ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:21:07 +0100
Subject: [PATCH 1254/2266] haskell-generic-builder: drop obsolete splitObjs
 function argument

---
 pkgs/development/haskell-modules/generic-builder.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 07ef985ca33..8802a379581 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -30,7 +30,6 @@ in
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
-, enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip  for darwin
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
@@ -67,8 +66,6 @@ in
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
-# OBSOLETE, use enableDeadCodeElimination
-assert enableSplitObjs == null;
 
 let
 

From d7beae33dc4184f22865b4e7a8d42b3e7b5e225d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:32:02 +0100
Subject: [PATCH 1255/2266] haskell-generic-builder: always compile with
 --enable-library-for-ghci

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8802a379581..495fd541770 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -140,6 +140,7 @@ let
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+    "--enable-library-for-ghci" # TODO: Should this be configurable?
   ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
      "--ghc-option=-split-sections"
   ] ++ optionals isGhcjs [

From db5be10a4a1a5949c50f838101936f1bbddf4f59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:38:55 +0100
Subject: [PATCH 1256/2266] haskell-generic-builder: fix confusion about
 --enable-static vs. --enable-library-vanilla

---
 pkgs/development/haskell-modules/generic-builder.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 495fd541770..43ab69689d9 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -137,9 +137,10 @@ let
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
     (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage"))
-    (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
+    (optionalString (versionOlder "8.4" ghc.version) (enableFeature enableStaticLibraries "static"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+    "--enable-library-vanilla"  # TODO: Should this be configurable?
     "--enable-library-for-ghci" # TODO: Should this be configurable?
   ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
      "--ghc-option=-split-sections"

From 1978fa444dda07aa2057f24511b0c39502b461eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:44:17 +0100
Subject: [PATCH 1257/2266] haskell-generic-builder: disable shared executable
 linking by default

This change raises the question of whether we should disable building of shared
libraries altogether (since we don't link them). Unfortunately, we can't,
because GHC expects shared libraries to be around when building and running
test suites, and no amount of passing --disable-shared flags at configure time
changes the fact. I *guess* that's related to the DYNAMIC_GHC_PROGRAMS = YES
flag we set when building GHC itself, but I haven't investigated it further
yet.

Closes https://github.com/NixOS/nixpkgs/issues/29011.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 43ab69689d9..9e11b870896 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -28,7 +28,7 @@ in
 , enableExecutableProfiling ? false
 , profilingDetail ? "all-functions"
 # TODO enable shared libs for cross-compiling
-, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
+, enableSharedExecutables ? false
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip  for darwin
 , enableStaticLibraries ? true

From aa0545130ba15d02d6017277a5561d4f011d0444 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:52:18 +0100
Subject: [PATCH 1258/2266] Configure Haskell bootstrapping package sets to
 perform minimal builds.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ae5d077f782..56d5aada81b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -21,6 +21,17 @@ let
 
   callPackage = newScope { inherit haskellLib; };
 
+  bootstrapPackageSet = self: super: {
+    mkDerivation = drv: super.mkDerivation (drv // {
+      doCheck = false;
+      doHaddock = false;
+      enableExecutableProfiling = false;
+      enableLibraryProfiling = false;
+      enableSharedExecutables = false;
+      enableSharedLibraries = false;
+    });
+  };
+
 in rec {
   lib = haskellLib;
 
@@ -94,6 +105,7 @@ in rec {
       buildHaskellPackages = bh.packages.ghc7103Binary;
       ghc = bh.compiler.ghc7103Binary;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+      packageSetConfig = bootstrapPackageSet;
     };
     ghc802 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc802;
@@ -104,6 +116,7 @@ in rec {
       buildHaskellPackages = bh.packages.ghc821Binary;
       ghc = bh.compiler.ghc821Binary;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
+      packageSetConfig = bootstrapPackageSet;
     };
     ghc822 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc822;

From f3f5d68ca3b78da62ad0c0423b59b923b699f658 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Mar 2018 21:55:56 +0100
Subject: [PATCH 1259/2266] haskell-generic-builder: cosmetic

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 9e11b870896..1a788ae642e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -30,7 +30,7 @@ in
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? false
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
-, enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip  for darwin
+, enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"

From fe0be794fbed99404b6e7708a7a2931d8b1a19bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 08:00:39 +0100
Subject: [PATCH 1260/2266] haskell-pandoc-types: update override for ghc 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 6df7c90536e..a2b70fe4b74 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -733,6 +733,6 @@ self: super: {
     });
 
   # https://github.com/jgm/pandoc-types/issues/37
-  pandoc-types = self.pandoc-types_1_17_4;
+  pandoc-types = self.pandoc-types_1_17_4_1;
 
 }

From 6fbf6efcf3fc75355520dcb10044d2647c2cb3ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 08:01:08 +0100
Subject: [PATCH 1261/2266] haskell-esqueleto: drop the markBroken for ghc
 8.4.1

Although accurate, the override causes evaluation errors that serve little
purpose but poison our dashboard at [1].

[1] https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index a2b70fe4b74..b35b120fe11 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -42,9 +42,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # https://github.com/bitemyapp/esqueleto/issues/77
-  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
-
   # Need newer version.
   haskell-src = super.haskell-src_1_0_3_0;
 

From 68abbd6f2e7e2c45ada7d3c6fddf489198338cea Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 00:30:54 -0700
Subject: [PATCH 1262/2266] most: 5.0.0 -> 5.0.0a

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/hl99dyzq83jifdjg00d4zcdxj3j6hqxy-most-5.0.0a/bin/most -h` got 0 exit code
- ran `/nix/store/hl99dyzq83jifdjg00d4zcdxj3j6hqxy-most-5.0.0a/bin/most help` got 0 exit code
- ran `/nix/store/hl99dyzq83jifdjg00d4zcdxj3j6hqxy-most-5.0.0a/bin/most -h` and found version 5.0.0a
- found 5.0.0a with grep in /nix/store/hl99dyzq83jifdjg00d4zcdxj3j6hqxy-most-5.0.0a
- directory tree listing: https://gist.github.com/c97521034492f9bccb53c5402a867290
---
 pkgs/tools/misc/most/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix
index 107aa094dd7..61ddec3caaa 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/pkgs/tools/misc/most/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, slang, ncurses }:
 
 stdenv.mkDerivation {
-  name = "most-5.0.0";
+  name = "most-5.0.0a";
 
   src = fetchurl {
-    url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2;
-    sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja";
+    url = ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2;
+    sha256 = "1aas904g8x48vsfh3wcr2k6mjzkm5808lfgl2qqhdfdnf4p5mjwl";
   };
 
   preConfigure = ''

From a71ce8f8d1868bef491c1f0054090273e309ba73 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 02:55:53 -0500
Subject: [PATCH 1263/2266] vassal: 3.2.15 -> 3.2.17 Semi-automatic update
 generated by https://github.com/ryantm/nix-update tools. These checks were
 done: - built on NixOS - ran
 `/nix/store/6kxxp00xj8r1qh4kvvjdg954w00vpk57-VASSAL-3.2.17/bin/vassal -h` got
 0 exit code - ran
 `/nix/store/6kxxp00xj8r1qh4kvvjdg954w00vpk57-VASSAL-3.2.17/bin/vassal --help`
 got 0 exit code - ran
 `/nix/store/6kxxp00xj8r1qh4kvvjdg954w00vpk57-VASSAL-3.2.17/bin/vassal
 --version` and found version 3.2.17 - found 3.2.17 with grep in
 /nix/store/6kxxp00xj8r1qh4kvvjdg954w00vpk57-VASSAL-3.2.17

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

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index 8961dfdce3c..84984fcbb58 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "VASSAL-3.2.15";
+  name = "VASSAL-3.2.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2";
-    sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
+    sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb";
   };
 
   buildInputs = [ makeWrapper ];

From 91bf2a19f37d5514b0b15927496103291b6f4c2f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 03:37:27 -0500
Subject: [PATCH 1264/2266] abcmidi: 2018.02.22 -> 2018.03.08 Semi-automatic
 update generated by https://github.com/ryantm/nix-update tools. These checks
 were done: - built on NixOS - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/abc2abc
 -h` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/abcmatch
 -h` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 -h` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 --help` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 help` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 -V` and found version 2018.03.08 - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 -v` and found version 2018.03.08 - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 --version` and found version 2018.03.08 - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 -h` and found version 2018.03.08 - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/mftext
 --help` and found version 2018.03.08 - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/yaps -h`
 got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/abc2midi
 -h` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/midi2abc
 -h` got 0 exit code - ran
 `/nix/store/3r7nwg28yy402gl01m9b14h5j865365g-abcMIDI-2018.03.08/bin/midi2abc
 --help` got 0 exit code

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

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 0aaf018cb22..7af507c35be 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.02.22";
+  version = "2018.03.08";
 
   src = fetchzip {
     url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "03ln05012yhlq8aalm00af6pidb44phmmidlc953453isfllg82a";
+    sha256 = "0pdia3n23l4nhc4lmyphgh6swq35nnzqk2z4ykif1xajbkbddxm3";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From 224bc7dd4a5fe9c38e1be9676783e20ae6da7428 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 01:47:30 -0700
Subject: [PATCH 1265/2266] nq: 0.2.2 -> 0.3.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/gyphh3yyw7k1m0igds051f5rnkap5j8q-nq-0.3.1/bin/nq help` got 0 exit code
- ran `/nix/store/gyphh3yyw7k1m0igds051f5rnkap5j8q-nq-0.3.1/bin/fq help` got 0 exit code
- ran `/nix/store/gyphh3yyw7k1m0igds051f5rnkap5j8q-nq-0.3.1/bin/tq help` got 0 exit code
- found 0.3.1 with grep in /nix/store/gyphh3yyw7k1m0igds051f5rnkap5j8q-nq-0.3.1
- directory tree listing: https://gist.github.com/572554e36b5b4ef6af9d80ebc5153935
---
 pkgs/tools/system/nq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
index 59980566290..5044e5c9a96 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "nq-${version}";
-  version = "0.2.2";
+  version = "0.3.1";
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "nq";
     rev = "v${version}";
-    sha256 = "0348r3j5y445psm8lj35z100cfvbfp05s7ji6bxd0gg4n66l2c4l";
+    sha256 = "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99";
   };
   makeFlags = "PREFIX=$(out)";
   postPatch = ''

From d16f9de470f55459c05fc6377d5eeae127931799 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 03:52:36 -0500
Subject: [PATCH 1266/2266] anki: 2.0.47 -> 2.0.50 Semi-automatic update
 generated by https://github.com/ryantm/nix-update tools. These checks were
 done: - built on NixOS - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/..anki-wrapped-wrapped
 -h` got 0 exit code - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/..anki-wrapped-wrapped
 --help` got 0 exit code - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/..anki-wrapped-wrapped
 --version` and found version 2.0.50 - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/anki -h` got 0
 exit code - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/anki --help` got
 0 exit code - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/anki --version`
 and found version 2.0.50 - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/.anki-wrapped
 -h` got 0 exit code - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/.anki-wrapped
 --help` got 0 exit code - ran
 `/nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50/bin/.anki-wrapped
 --version` and found version 2.0.50 - found 2.0.50 with grep in
 /nix/store/yxxxxgsdxr65bgnv1xn0h9pdivpm2bvx-anki-2.0.50

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

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 0208739706d..673ad585dbf 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -28,7 +28,7 @@ let
     qt4 = pyqt4.qt;
 
 in buildPythonApplication rec {
-    version = "2.0.47";
+    version = "2.0.50";
     name = "anki-${version}";
 
     src = fetchurl {
@@ -37,7 +37,7 @@ in buildPythonApplication rec {
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "067bsidqzy1zc301i2pk4biwp2kwvgk4kydp5z5s551acinkbdgv";
+      sha256 = "05hq1f9m4vv3zpv7d05m4y6d82ibp1kk0gpwp73vza1ffq0wdcip";
     };
 
     propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]

From 26398c030bc7811fb9ab31466d198dabe5dbdfd7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 03:53:31 -0500
Subject: [PATCH 1267/2266] ant: 1.9.6 -> 1.10.2 Semi-automatic update
 generated by https://github.com/ryantm/nix-update tools. These checks were
 done: - built on NixOS - Warning: no binary found that responded to help or
 version flags. (This warning appears even if the package isn't expected to
 have binaries.) - found 1.10.2 with grep in
 /nix/store/ymhiik4c7604dxzlnvrrzj88d2lkcy16-ant-1.10.2

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

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 8816a005ca0..b6c2702485b 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, coreutils, makeWrapper }:
 
-let version = "1.9.6"; in
+let version = "1.10.2"; in
 
 stdenv.mkDerivation {
   name = "ant-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
-    sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
+    sha256 = "0662qammjvibh9kgkxzadkayfn2r7iwnagbwaw28crqqclrb2rp1";
   };
 
   contrib = fetchurl {

From 7e59fd5b84e25e79f76d9442f2e2d6cce5d1179a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 03:53:53 -0500
Subject: [PATCH 1268/2266] antlr4: 4.7 -> 4.7.1 Semi-automatic update
 generated by https://github.com/ryantm/nix-update tools. These checks were
 done: - built on NixOS - ran
 `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun -h` got 0
 exit code - ran
 `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun --help` got
 0 exit code - ran
 `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun help` got 0
 exit code - found 4.7.1 with grep in
 /nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1

---
 pkgs/development/tools/parsing/antlr/4.7.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
index 41b079bbd23..f58d0f9904a 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "antlr-${version}";
-  version = "4.7";
+  version = "4.7.1";
   src = fetchurl {
     url ="http://www.antlr.org/download/antlr-${version}-complete.jar";
-    sha256 = "0r08ay63s5aajix5j8j7lf7j7l7wiwdkr112b66nyhkj5f6c72yd";
+    sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
   };
 
   unpackPhase = "true";

From c9e322eab50527a75594cfe1b227628bf4967946 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 03:54:57 -0500
Subject: [PATCH 1269/2266] activemq: 5.13.4 -> 5.14.5 Semi-automatic update
 generated by https://github.com/ryantm/nix-update tools. These checks were
 done: - built on NixOS - ran
 `/nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5/bin/activemq
 --version` and found version 5.14.5 - ran
 `/nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5/bin/activemq
 version` and found version 5.14.5 - ran
 `/nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5/bin/activemq
 help` and found version 5.14.5 - ran
 `/nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5/bin/macosx/wrapper
 --help` got 0 exit code - ran
 `/nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5/bin/macosx/wrapper
 --help` and found version 5.14.5 - ran
 `/nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5/bin/activemq-diag
 -h` got 0 exit code - found 5.14.5 with grep in
 /nix/store/bryzxhk66p8wvdskcgah9a3n2h12f81r-apache-activemq-5.14.5

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

diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index c71dced918a..fc79cae36f8 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "apache-activemq-${version}";
-  version = "5.13.4";
+  version = "5.14.5";
 
   src = fetchurl {
-    sha256 = "0sp806bmv9vs19zbzlv71ag09p1jbl2wn2wpxfwa20mndri8lsmz";
+    sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54";
     url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
   };
 

From 5b1189256596c2e8584d9c1a6306bdbc8f690c79 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 02:51:30 -0700
Subject: [PATCH 1270/2266] pidgin-sipe: 1.23.0 -> 1.23.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.23.2 with grep in /nix/store/r7pl30mgdnrdig95aq6qy3d4dbvy8vji-pidgin-sipe-1.23.2
- directory tree listing: https://gist.github.com/c400423782c0ab85deea92ca910a179b
---
 .../instant-messengers/pidgin-plugins/sipe/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 75251b21aea..73346888a33 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
 
-let version = "1.23.0"; in
+let version = "1.23.2"; in
 
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
-    sha256 = "795811ced33fcc5affae259828f6452bfc0e0b02737ea68483e1bd9ec0459013";
+    sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w";
   };
 
   meta = with stdenv.lib; {

From f589e77842b7cb471082fea4b68b9000ba5f4386 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 22:08:27 -0700
Subject: [PATCH 1271/2266] lighttpd: 1.4.48 -> 1.4.49

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -h` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -V` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -v` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -h` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -h` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel --help` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel help` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -V` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -v` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel --version` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -h` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel --help` and found version 1.4.49
- found 1.4.49 with grep in /nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49
- directory tree listing: https://gist.github.com/3f87cc8cd06f4c87b583c225172f1c2e
---
 pkgs/servers/http/lighttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 181e3bf134f..7bf1b1ffa64 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -9,11 +9,11 @@ assert enableMysql -> mysql != null;
 assert enableLdap -> openldap != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.48";
+  name = "lighttpd-1.4.49";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0djgsx06x3p22rjvzml5klq7gqd9nk88qzlxifa7p7ajqymdb2hg";
+    sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 38bd7183c518028c9b19318ae6ae0422113153c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 11:24:12 +0100
Subject: [PATCH 1272/2266] brick: undo update to revision 1, which breaks the
 build with GHC 8.2.2

Hopefully, upstream fixes this quickly.
---
 pkgs/development/haskell-modules/hackage-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9598298063d..607f1c82d63 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -38526,8 +38526,6 @@ self: {
        pname = "brick";
        version = "0.34.1";
        sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys";
-       revision = "1";
-       editedCabalFile = "0viqyb6qhvigpz1jf8693jw10n48r4wqnh97f5xqbjjjdjy0qr4r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 5d8fc8b3fa79a16539cd36d09f320d8fe6e0df8e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 17 Mar 2018 11:52:42 +0100
Subject: [PATCH 1273/2266] svtplay-dl: 1.9.10 -> 1.9.11

---
 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 dfd784b7248..f0abb38706b 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 requests mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9.10";
+  version = "1.9.11";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1qi5c9ii3qq5s1rk7vj6n0kxbfqanbl0151id79b2qs96bpvj7vi";
+    sha256 = "14p2362rzyblma9321z4zrcbzfs9m269ry6sz44ly0bv5fik7gdy";
   };
 
   pythonPaths = [ pycrypto requests ];

From 1cb9f643480612696de93fb2f2a2f3340d0e3156 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 03:57:32 -0700
Subject: [PATCH 1274/2266] redis: 4.0.7 -> 4.0.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/jbp7m1gshmk8an8sb14glwijgw1chvvq-redis-4.0.8/bin/redis-server -v` and found version 4.0.8
- ran `/nix/store/jbp7m1gshmk8an8sb14glwijgw1chvvq-redis-4.0.8/bin/redis-server --version` and found version 4.0.8
- ran `/nix/store/jbp7m1gshmk8an8sb14glwijgw1chvvq-redis-4.0.8/bin/redis-benchmark --help` got 0 exit code
- ran `/nix/store/jbp7m1gshmk8an8sb14glwijgw1chvvq-redis-4.0.8/bin/redis-cli -v` and found version 4.0.8
- ran `/nix/store/jbp7m1gshmk8an8sb14glwijgw1chvvq-redis-4.0.8/bin/redis-cli --version` and found version 4.0.8
- found 4.0.8 with grep in /nix/store/jbp7m1gshmk8an8sb14glwijgw1chvvq-redis-4.0.8
- directory tree listing: https://gist.github.com/2870bd85351bae2037f6c3ffd93f9d51
---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 745376f61e4..66211780021 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.7";
+  version = "4.0.8";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "1lgcc5k6bg7f34lxbfx0xv74nj66khd5x8g1igyy2h7v8inm9fhv";
+    sha256 = "1b9jqacckx4qqyz905mnclxfcpsvrwc507n6zr4r4canq6w3h37z";
   };
 
   buildInputs = [ lua ];

From 29bc0a00a1e3548df1461f378acd367c3b247e22 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 13 Mar 2018 22:03:00 +0100
Subject: [PATCH 1275/2266] aspino: fix build

Aspino patched `libglucose` for their own uses, however they currently
depend on glucose v4.0.
(see https://github.com/alviano/aspino/tree/e31c3b4e5791a454e6602439cb26bd98d23c4e78/patches)

The patches don't apply properly on `glucose-4.1` anymore, furthermore
the new source directory caused the `bootstrap.sh` from `aspino` which
was supposed to apply the patches and recompile the setup to break.

Furthermore some minor changes to the derivation were introduced:

- upgraded from `2016-01-31` to `2017-03-09`
- the name contains an `-unstable-` infix as upstream has no releases
- instead of a `patchPhase` the `postPatch` hook will be used for
  `substituteInPlace` to keep advanced patching features from `nixpkgs`
  available.
- `patchShebangs` will be called to avoid impurities because of the
  implicit reliance on `/bin/sh`
- added myself as second maintainer to have more people available in
  case of any further breackage

See https://hydra.nixos.org/build/70688471/log
See ticket #36453
---
 .../science/logic/aspino/default.nix          | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index ee9e580a7b8..5e1a448a7cf 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -1,34 +1,46 @@
-{ stdenv, fetchFromGitHub, zlib, boost, glucose }:
+{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }:
+
+let
+  glucose' = fetchurl {
+    url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
+    sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
+  };
+in
+
 stdenv.mkDerivation rec {
-  name = "aspino-2016-01-31";
+  name = "aspino-unstable-2017-03-09";
 
   src = fetchFromGitHub {
     owner = "alviano";
     repo = "aspino";
-    rev = "d28579b5967988b88bce6d9964a8f0a926286e9c";
-    sha256 = "0r9dnkq3rldv5hhnmycmzqyg23hv5w3g3i5a00a8zalnzfiyirnq";
+    rev = "e31c3b4e5791a454e6602439cb26bd98d23c4e78";
+    sha256 = "0annsjs2prqmv1lbs0lxr7yclfzh47xg9zyiq6mdxcc02rxsi14f";
   };
 
   buildInputs = [ zlib boost ];
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace Makefile \
       --replace "GCC = g++" "GCC = c++"
+
+    patchShebangs .
   '';
 
   preBuild = ''
-    cp ${glucose.src} patches/glucose-syrup.tgz
+    cp ${glucose'} patches/glucose-syrup.tgz
     ./bootstrap.sh
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin
     install -m0755 build/release/{aspino,fairino-{bs,ls,ps},maxino-2015-{k16,kdyn}} $out/bin
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
     description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
-    maintainers = with maintainers; [ gebner ];
+    maintainers = with maintainers; [ gebner ma27 ];
     platforms = platforms.unix;
     license = licenses.asl20;
     homepage = http://alviano.net/software/maxino/;

From 1744ff99fb9724795df473447aca1ca9153c0034 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 05:21:34 -0700
Subject: [PATCH 1276/2266] usb-modeswitch-data: 20170205 -> 20170806

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/8dc0e83055ce231aba53f5bb82ed0f59
---
 pkgs/development/tools/misc/usb-modeswitch/data.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 0ad79005d91..0fa854f9b2a 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "usb-modeswitch-data-${version}";
-  version = "20170205";
+  version = "20170806";
 
   src = fetchurl {
     url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
-    sha256 = "1l9q4xk02zd0l50bqhyk906wbcs26ji7259q0f7qv3cj52fzvp72";
+    sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff";
   };
 
   inherit (usb-modeswitch) makeFlags;

From a998162d7f8602ed190121881477bec2a44dd33f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 05:38:34 -0700
Subject: [PATCH 1277/2266] vim: 8.0.1451 -> 8.0.1605

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605/bin/vim -h` got 0 exit code
- ran `/nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605/bin/vim --help` got 0 exit code
- ran `/nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605/bin/vim --version` and found version 8.0.1605
- found 8.0.1605 with grep in /nix/store/5afa788kqasx65plvzwjnffq9ihzdbmn-vim-8.0.1605
- directory tree listing: https://gist.github.com/f9af564ba8cc53b90d1d262c2e786eee
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 5155f94eef5..00b2b23c6f4 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.1451";
+  version = "8.0.1605";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1vxd5mr8c62qyf7ax7gi2wka48282yplckq91154yd55xcqw36zx";
+    sha256 = "0a8zf43q806py14vq1frm350wycn47cmanj1hn1i7bqx1gdgcal9";
   };
 
   enableParallelBuilding = true;

From 4322f2b8c86c9f2d36be851d86acd8b1b8346cdf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 8 Mar 2018 10:12:24 -0500
Subject: [PATCH 1278/2266] pythonPackages.py4j: Init at 0.10.6.

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

diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix
new file mode 100644
index 00000000000..9cf9828635f
--- /dev/null
+++ b/pkgs/development/python-modules/py4j/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, stdenv }:
+
+buildPythonPackage rec {
+  pname = "py4j";
+
+  version = "0.10.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension= "zip";
+    sha256 = "10shayghsmcdr03w12a7sdm6vsxpjm8alw3ym3mr1hki45yarryk";
+  };
+
+  propagatedBuildInputs = [  ];
+
+  meta = with stdenv.lib; {
+    description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects.";
+    homepage = https://www.py4j.org/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67a088731fe..5149f1c4aa9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1570,6 +1570,8 @@ in {
 
   proboscis = callPackage ../development/python-modules/proboscis {};
 
+  py4j = callPackage ../development/python-modules/py4j { };
+
   pyechonest = self.buildPythonPackage rec {
     name = "pyechonest-8.0.2";
 

From 2963d76ca34c4ccddf81348194ca5335f30787a3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 8 Mar 2018 10:22:37 -0500
Subject: [PATCH 1279/2266] pythonPackages.pyspark: Init at 2.3.0

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

diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
new file mode 100644
index 00000000000..3447c64cf6b
--- /dev/null
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -0,0 +1,28 @@
+{ buildPythonPackage, fetchPypi, stdenv, py4j }:
+
+buildPythonPackage rec {
+  pname = "pyspark";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vlq07yqy6c7ayg401i0qynnliqz405bmw1r8alkck0m1s8kcd8b";
+  };
+
+  # pypandoc is broken with pandoc2, so we just lose docs.
+  postPatch = ''
+    sed -i "s/'pypandoc'//" setup.py
+  '';
+
+  propagatedBuildInputs = [ py4j ];
+
+  # Tests assume running spark...
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Apache Spark";
+    homepage = https://github.com/apache/spark/tree/master/python;
+    license = licenses.asl20;
+    maintainers = [ maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5149f1c4aa9..c5ab8def731 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20654,6 +20654,8 @@ EOF
 
   spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
 
+  pyspark = callPackage ../development/python-modules/pyspark { };
+
   sseclient = callPackage ../development/python-modules/sseclient { };
 
   textacy = callPackage ../development/python-modules/textacy { };

From f9134b08c2838b1fddb580c52c0d8527b7b5210a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 17 Mar 2018 15:06:49 +0100
Subject: [PATCH 1280/2266] wlroots: 2017-12-22 -> 2018-03-16

---
 pkgs/development/libraries/wlroots/default.nix    | 15 ++++++---------
 pkgs/development/libraries/wlroots/libdrm.patch   |  9 ---------
 .../development/libraries/wlroots/no-werror.patch | 10 ----------
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/wlroots/libdrm.patch
 delete mode 100644 pkgs/development/libraries/wlroots/no-werror.patch

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index a5ec872c360..3fdaeb82438 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,23 +1,20 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig
 , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap, xcbutilimage
+, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors
 }:
 
 let pname = "wlroots";
-    version = "unstable-2017-12-22";
+    version = "unstable-2018-03-16";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
-    rev = "0a370c529806077a11638e7fa856d5fbb539496b";
-    sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6";
+    rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
+    sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
   };
 
-  # TODO: Temporary workaround for compilation errors
-  patches = [ ./libdrm.patch ]; #./no-werror.patch
-
   # $out for the library and $bin for rootston
   outputs = [ "out" "bin" ];
 
@@ -25,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     wayland libGL wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap xcbutilimage
+    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors
   ];
 
   # Install rootston (the reference compositor) to $bin
@@ -33,7 +30,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $bin/bin
     cp rootston/rootston $bin/bin/
     mkdir $bin/lib
-    cp libwlroots.so $bin/lib/
+    cp libwlroots* $bin/lib/
     patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
     mkdir $bin/etc
     cp ../rootston/rootston.ini.example $bin/etc/rootston.ini
diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch
deleted file mode 100644
index 2b9d8538276..00000000000
--- a/pkgs/development/libraries/wlroots/libdrm.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/backend/meson.build	2017-10-31 22:08:01.112927610 +0100
-+++ b/backend/meson.build	2017-10-31 22:09:28.155264343 +0100
-@@ -43,5 +43,5 @@
- 	'wlr_backend',
- 	backend_files,
- 	include_directories: wlr_inc,
--	dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos],
-+	dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm],
- )
diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch
deleted file mode 100644
index 78c374d9dbb..00000000000
--- a/pkgs/development/libraries/wlroots/no-werror.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meson.build	2017-10-31 22:08:01.132927689 +0100
-+++ b/meson.build	2017-10-31 22:20:58.215784350 +0100
-@@ -5,7 +5,6 @@
- 	default_options: [
- 		'c_std=c11',
- 		'warning_level=2',
--		'werror=true',
- 	],
- )
- 

From b549f18b6c10d256a40979af16060b00427efd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 15:12:00 +0100
Subject: [PATCH 1281/2266] pythonPackages.CommonMark: move expression

---
 .../python-modules/commonmark/default.nix     | 24 ++++++++++++++
 pkgs/top-level/python-packages.nix            | 33 ++++---------------
 2 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/commonmark/default.nix

diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
new file mode 100644
index 00000000000..dcc741f8735
--- /dev/null
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, flake8, glibcLocales, future }:
+
+buildPythonPackage rec {
+  pname = "CommonMark";
+  version = "0.6.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
+  };
+
+  LC_ALL="en_US.UTF-8";
+
+  doCheck = false;
+
+  buildInputs = [ flake8 glibcLocales ];
+  propagatedBuildInputs = [ future ];
+
+  meta = with lib; {
+    description = "Python parser for the CommonMark Markdown spec";
+    homepage = https://github.com/rolandshoemaker/CommonMark-py;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67a088731fe..63f57ca27e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2347,36 +2347,15 @@ in {
 
   colorlover = callPackage ../development/python-modules/colorlover { };
 
-  CommonMark = buildPythonPackage rec {
-    name = "CommonMark-${version}";
-    version = "0.6.3";
+  CommonMark = callPackage ../development/python-modules/commonmark { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
-      sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
-    };
-
-    LC_ALL="en_US.UTF-8";
-
-    doCheck = false;
-
-    buildInputs = with self; [ flake8 pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ future ];
-
-    meta = {
-      description = "Python parser for the CommonMark Markdown spec";
-      homepage = https://github.com/rolandshoemaker/CommonMark-py;
-      license = licenses.bsd3;
-    };
-  };
-
-  CommonMark_54 = self.CommonMark.override rec {
-    name = "CommonMark-0.5.4";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
+  CommonMark_54 = self.CommonMark.overridePythonAttrs (oldAttrs: rec {
+    version = "0.5.4";
+    src = oldAttrs.src.override {
+      inherit version;
       sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
     };
-  };
+  });
 
 
   coilmq = buildPythonPackage (rec {

From 33b0ad83e976ed6bb22b6862ca0637dd2fb765f7 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sat, 17 Mar 2018 23:21:27 +0900
Subject: [PATCH 1282/2266] qemu-vm: passing QEMU_NET_OPTS would fail

because of a change in #36850.
spotted by @jtojnar https://github.com/NixOS/nixpkgs/commit/b7a2333ebe7a0916c9791f3b7a839e8095c39f7f#commitcomment-28134992
---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 674f230c810..ee327ed805b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -320,7 +320,7 @@ in
         mkOption {
           default = [
             "-net nic,netdev=user.0,model=virtio"
-            "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+            "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
           ];
           type = types.listOf types.str;
           description = ''

From 4a0c0401b53d00f0e8582715cf2e563c1ad7fd10 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 17 Mar 2018 14:04:53 +0100
Subject: [PATCH 1283/2266] pythonPackages.tablib: fix build

`openpyxl` v5 breaks `tablib`, the following patch fixes the API
incompatibility: https://github.com/kennethreitz/tablib/pull/296

See https://hydra.nixos.org/build/70694938/log
See ticket #36453
---
 .../python-modules/tablib/default.nix         | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------
 2 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/tablib/default.nix

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
new file mode 100644
index 00000000000..9f1bf2390b6
--- /dev/null
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage, stdenv, fetchPypi, pytest, unicodecsv, pandas
+, xlwt, openpyxl, pyyaml, xlrd, odfpy, fetchpatch
+}:
+
+buildPythonPackage rec {
+  pname = "tablib";
+  version = "0.12.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq";
+  };
+
+  checkInputs = [ pytest unicodecsv pandas ];
+  propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/kennethreitz/tablib/commit/0e51a2d0944022af186d2dcd34c0ab3c47141ba5.patch";
+      sha256 = "0lbbl871zdn5vpgqyjkil0c2ap3b5hz19rmihhyvrx7m4mlh1aij";
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Tablib: format-agnostic tabular dataset library";
+    homepage = http://python-tablib.org;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67a088731fe..818a05cf3ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2650,22 +2650,7 @@ in {
 
   pyunifi = callPackage ../development/python-modules/pyunifi { };
 
-  tablib = buildPythonPackage rec {
-    name = "tablib-${version}";
-    version = "0.12.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tablib/tablib-${version}.tar.gz";
-      sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq";
-    };
-
-    buildInputs = with self; [ pytest unicodecsv pandas ];
-    propagatedBuildInputs = with self; [ xlwt openpyxl pyyaml xlrd odfpy ];
-    meta = with stdenv.lib; {
-      description = "Tablib: format-agnostic tabular dataset library";
-      homepage = "http://python-tablib.org";
-    };
-  };
+  tablib = callPackage ../development/python-modules/tablib { };
 
   wakeonlan = callPackage ../development/python-modules/wakeonlan { };
 

From d7d4ce735e74a435d026b2619bd5894aa2bc62c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 15:34:40 +0100
Subject: [PATCH 1284/2266] pythonPackages.CommonMark: 0.6.3 -> 0.7.5

---
 .../python-modules/commonmark/default.nix         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
index dcc741f8735..d6cd69f6c8a 100644
--- a/pkgs/development/python-modules/commonmark/default.nix
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -1,19 +1,22 @@
-{ lib, buildPythonPackage, fetchPypi, flake8, glibcLocales, future }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }:
 
 buildPythonPackage rec {
   pname = "CommonMark";
-  version = "0.6.3";
+  version = "0.7.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
+    sha256 = "4dfbbd1dbc669a9b71a015032b2bbe5c4b019ca8b6ca410d89cf7020de46d2c0";
   };
 
-  LC_ALL="en_US.UTF-8";
+  preCheck = ''
+    export LC_ALL="en_US.UTF-8"
+  '';
 
-  doCheck = false;
+  # UnicodeEncodeError on Python 2
+  doCheck = isPy3k;
 
-  buildInputs = [ flake8 glibcLocales ];
+  checkInputs = [  glibcLocales ];
   propagatedBuildInputs = [ future ];
 
   meta = with lib; {

From 9f276ccd3887c03523fe6655670bad50ac373929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 15:42:09 +0100
Subject: [PATCH 1285/2266] pythonPackages.bleach: 2.1.2 -> 2.1.3

---
 pkgs/development/python-modules/bleach/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index e4ccb0c92d6..786564b92e0 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "bleach";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "38fc8cbebea4e787d8db55d6f324820c7f74362b70db9142c1ac7920452d1a19";
+    sha256 = "eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44";
   };
 
   checkInputs = [ pytest pytestrunner ];
@@ -41,4 +41,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ prikhi ];
   };
-}
\ No newline at end of file
+}

From 922b0cec828d31799b975c1df103cc05666c56f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 15:42:52 +0100
Subject: [PATCH 1286/2266] pythonPackages.readme_renderer: 17.2 -> 17.4

---
 .../python-modules/readme_renderer/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index af0b64fc340..d9982919493 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
+, CommonMark
 , bleach
 , docutils
 , pygments
@@ -10,18 +11,17 @@
 
 buildPythonPackage rec {
   pname = "readme_renderer";
-  version = "17.2";
-  name = "${pname}-${version}";
+  version = "17.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da";
+    sha256 = "82d68175feec897af2a38fe8590778f14c3be5324cc62e3ce5752a9b1e4b60ab";
   };
 
   checkInputs = [ pytest ];
 
   propagatedBuildInputs = [
-    bleach docutils pygments six
+    CommonMark bleach docutils pygments six
   ];
 
   checkPhase = ''
@@ -33,4 +33,4 @@ buildPythonPackage rec {
     homepage = https://github.com/pypa/readme_renderer;
     license = lib.licenses.asl20;
   };
-}
\ No newline at end of file
+}

From 7e8e3807f3b583898360311e210418c0479d1dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 16:11:59 +0100
Subject: [PATCH 1287/2266] pythonPackages.moinmoin: disable for Python 3

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

diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix
index cedd45f2f22..6891dd2b627 100644
--- a/pkgs/development/python-modules/moinmoin/default.nix
+++ b/pkgs/development/python-modules/moinmoin/default.nix
@@ -1,13 +1,16 @@
-{ lib, buildPythonPackage, fetchurl, fetchpatch
+{ lib, buildPythonPackage, fetchurl, fetchpatch, isPy3k
 , pytest, werkzeug, pygments
 }:
 
 buildPythonPackage rec {
-  name = "moinmoin-${ver}";
-  ver = "1.9.9";
+  name = "moinmoin";
+  version = "1.9.9";
+
+  # SyntaxError in setup.py
+  disabled = isPy3k;
 
   src = fetchurl {
-    url = "http://static.moinmo.in/files/moin-${ver}.tar.gz";
+    url = "http://static.moinmo.in/files/moin-${version}.tar.gz";
     sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3";
   };
 

From 2e3da6ef7ada2c3153f56b748c77e759a8524eed Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 08:41:35 -0700
Subject: [PATCH 1288/2266] ace: 6.4.6 -> 6.4.7

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/l2wdk2hk7xr28qc76xdmsnsjlialsrw3-ace-6.4.7/bin/ace_gperf -v` and found version 6.4.7
- found 6.4.7 with grep in /nix/store/l2wdk2hk7xr28qc76xdmsnsjlialsrw3-ace-6.4.7
- found 6.4.7 in filename of file in /nix/store/l2wdk2hk7xr28qc76xdmsnsjlialsrw3-ace-6.4.7
- directory tree listing: https://gist.github.com/df8ae93ced1ab4c4b624c7739501f2a7
---
 pkgs/development/libraries/ace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 230a7e64dff..d61315f7db8 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.4.6";
+  version = "6.4.7";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "0xvdwk2505s615fgsy6g33ncxx70vszqspx0bg6lm8hfd3hb4qyj";
+    sha256 = "1zbncdxkkwnx4aphy0apnp7xn4aspxvq2h9bbjh33dpsy0j81afd";
   };
 
   enableParallelBuilding = true;

From 127f99e22e23005a6cfcd2ce08b48bd8a9bbb137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 16:46:11 +0100
Subject: [PATCH 1289/2266] pythonPackages.pushbullet: move expression

---
 .../python-modules/pushbullet/default.nix     | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 12 +----------
 2 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/pushbullet/default.nix

diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix
new file mode 100644
index 00000000000..c9cccc6733b
--- /dev/null
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi
+, requests, websocket_client, python_magic }:
+
+buildPythonPackage rec {
+  pname = "pushbullet.py";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d";
+  };
+
+  propagatedBuildInputs = [ requests websocket_client python_magic ];
+
+  meta = with lib; {
+    description = "A simple python client for pushbullet.com";
+    homepage = https://github.com/randomchars/pushbullet.py;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63f57ca27e5..5a2cc8a4942 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18718,17 +18718,7 @@ EOF
     };
   };
 
-  pushbullet = buildPythonPackage rec {
-    name = "pushbullet.py-${version}";
-    version = "0.10.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pushbullet.py/pushbullet.py-0.10.0.tar.gz";
-      sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d";
-    };
-
-    propagatedBuildInputs = with self; [requests websocket_client python_magic ];
-  };
+  pushbullet = callPackage ../development/python-modules/pushbullet { };
 
   power = buildPythonPackage rec {
     name = "power-1.4";

From 4e3538887851bc86aa7c37a920fe7f5b772cdfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 16:53:31 +0100
Subject: [PATCH 1290/2266] pythonPackages.pushbullet: 0.10.0 -> 0.11.0 and fix
 build

---
 .../python-modules/pushbullet/default.nix           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix
index c9cccc6733b..74c0f66b91e 100644
--- a/pkgs/development/python-modules/pushbullet/default.nix
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@@ -1,17 +1,24 @@
 { lib, buildPythonPackage, fetchPypi
-, requests, websocket_client, python_magic }:
+, requests, websocket_client, python_magic
+, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "pushbullet.py";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d";
+    sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d";
   };
 
   propagatedBuildInputs = [ requests websocket_client python_magic ];
 
+  checkInputs = [ pytest mock ];
+
+  checkPhase = ''
+    PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth"
+  '';
+
   meta = with lib; {
     description = "A simple python client for pushbullet.com";
     homepage = https://github.com/randomchars/pushbullet.py;

From 104f58d6a1b08714e1357946c06e75c897327b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 16:57:00 +0100
Subject: [PATCH 1291/2266] pythonPackages.pyamf: disable for Python 3

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

diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix
index 59acacd5051..5ac6ef82964 100644
--- a/pkgs/development/python-modules/pyamf/default.nix
+++ b/pkgs/development/python-modules/pyamf/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchPypi, buildPythonPackage, defusedxml }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "PyAMF";
   version = "0.8.0";
 
+  # according to setup.py
+  disabled = isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1r3lp9gkph48g9lijby5rs5daa3lhxs204r14zw4kvp3hf4xcm84";

From ba5d1bb28bafe246f5edcf92c061bddb606baee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 17:03:10 +0100
Subject: [PATCH 1292/2266] pythonPackages.paypalrestsdk: move expression

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

diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix
new file mode 100644
index 00000000000..9c050ff9e1e
--- /dev/null
+++ b/pkgs/development/python-modules/paypalrestsdk/default.nix
@@ -0,0 +1,19 @@
+{ buildPythonPackage, fetchPypi, httplib2 }:
+
+buildPythonPackage rec {
+  pname = "paypalrestsdk";
+  version = "0.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
+  };
+
+  propagatedBuildInputs = [ httplib2 ];
+
+  meta = {
+    homepage = https://developer.paypal.com/;
+    description = "Python APIs to create, process and manage payment";
+    license = "PayPal SDK License";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a2cc8a4942..83b30f0ab86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11878,22 +11878,7 @@ in {
 
   pathpy = callPackage ../development/python-modules/path.py { };
 
-  paypalrestsdk = buildPythonPackage rec {
-    name = "paypalrestsdk-0.7.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/paypalrestsdk/${name}.tar.gz";
-      sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
-    };
-
-    propagatedBuildInputs = with self; [ httplib2 ];
-
-    meta = {
-      homepage = https://developer.paypal.com/;
-      description = "Python APIs to create, process and manage payment";
-      license = "PayPal SDK License";
-    };
-  };
+  paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
 
   pbr = callPackage ../development/python-modules/pbr { };
 

From 5ec4b9d8190fa31052c536051a1291e4d005297c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 17:05:53 +0100
Subject: [PATCH 1293/2266] pythonPackages.paypalrestsdk: 0.7.0 -> 1.13.1

---
 .../development/python-modules/paypalrestsdk/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix
index 9c050ff9e1e..dbc918e6c0d 100644
--- a/pkgs/development/python-modules/paypalrestsdk/default.nix
+++ b/pkgs/development/python-modules/paypalrestsdk/default.nix
@@ -1,15 +1,16 @@
-{ buildPythonPackage, fetchPypi, httplib2 }:
+{ buildPythonPackage, fetchPypi
+, requests, six, pyopenssl }:
 
 buildPythonPackage rec {
   pname = "paypalrestsdk";
-  version = "0.7.0";
+  version = "1.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
+    sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f";
   };
 
-  propagatedBuildInputs = [ httplib2 ];
+  propagatedBuildInputs = [ requests six pyopenssl ];
 
   meta = {
     homepage = https://developer.paypal.com/;

From ae3782b2fb43e57bc0209a818779e1b867d31257 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Sat, 17 Mar 2018 17:24:59 +0100
Subject: [PATCH 1294/2266] nextcloud: 13.0.0 -> 13.0.1

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 2e423246c51..e6baf9e64d8 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.0";
+  version = "13.0.1";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec";
+    sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp";
   };
 
   installPhase = ''

From 51a0ef4bdd628560078770eabe1b6a094debd1ce Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 09:40:48 -0700
Subject: [PATCH 1295/2266] allegro: 5.2.3.0 -> 5.2.4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.2.4.0 with grep in /nix/store/ffhc3yjpm6avrds564k83vgn1ppw00yr-allegro-5.2.4.0
- directory tree listing: https://gist.github.com/1045c5013f37df121b7965ce4f5c9f5a
---
 pkgs/development/libraries/allegro/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 30e0f9a0983..e20b2700f0e 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   name = "allegro-${version}";
-  version = "5.2.3.0";
+  version = "5.2.4.0";
 
   src = fetchFromGitHub {
     owner = "liballeg";
     repo = "allegro5";
     rev = version;
-    sha256 = "0bx240x0filalfarylqjgqf3g80c7dhzhy4m162swjlg0vjpgblr";
+    sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d";
   };
 
   buildInputs = [

From 788ed0e618018955f50f61dcdc87774bf86a353d Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 17 Mar 2018 18:19:50 +0100
Subject: [PATCH 1296/2266] snabb: 2016.04 -> 2018.01.2

---
 pkgs/tools/networking/snabb/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index 46580c0b802..cdf14f5af33 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }:
+{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
+,supportOpenstack ? true
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "snabb-${version}";
-  version = "2016.04";
+  version = "2018.01.2";
 
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
     rev = "v${version}";
-    sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx";
+    sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm";
   };
 
   buildInputs = [ makeWrapper ];
@@ -20,10 +24,14 @@ stdenv.mkDerivation rec {
     for f in $(find src/program/snabbnfv/ -type f); do
       substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
     done
-
+  '' + optionalString supportOpenstack ''
     # We need a way to pass $PATH to the scripts
-    sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
-    sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
+  '';
+
+  preBuild = ''
+    make clean
   '';
 
   installPhase = ''
@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
   # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory".
   enableParallelBuilding = false;
 
-  meta = with stdenv.lib; {
+  meta =  {
     homepage = https://github.com/SnabbCo/snabbswitch;
     description = "Simple and fast packet networking toolkit";
     longDescription = ''

From 91a914da3f78d91757336247c092e083ad64759c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 10:37:54 -0700
Subject: [PATCH 1297/2266] apache-jena-fuseki: 3.5.0 -> 3.6.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/hw41ds5rdx4shi4712c5njz4wrp5kyp0-apache-jena-fuseki-3.6.0/bin/fuseki-server -h` got 0 exit code
- ran `/nix/store/hw41ds5rdx4shi4712c5njz4wrp5kyp0-apache-jena-fuseki-3.6.0/bin/fuseki-server --help` got 0 exit code
- ran `/nix/store/hw41ds5rdx4shi4712c5njz4wrp5kyp0-apache-jena-fuseki-3.6.0/bin/fuseki-server --version` and found version 3.6.0
- found 3.6.0 with grep in /nix/store/hw41ds5rdx4shi4712c5njz4wrp5kyp0-apache-jena-fuseki-3.6.0
- directory tree listing: https://gist.github.com/68036e0a33596f731e456c34f3606cdd
---
 pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index 4f9b3a6b443..0e2b4029e48 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena-fuseki";
-    version = "3.5.0";
+    version = "3.6.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    sha256 = "0pdq103vqpkbwi84yyigw4dy60ch7xzazaj3gfcbipg73v81wpvp";
+    sha256 = "0wmhfr1jlk34cimpz7gvfbi4bh8ki02acbmwdksnkal61f2dxj8q";
   };
   buildInputs = [
     makeWrapper

From add347c8b20c259a784a88b42bb0b07fdae64782 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 17 Mar 2018 18:46:45 +0100
Subject: [PATCH 1298/2266] archiveopteryx: fix build w/gcc7

---
 pkgs/servers/mail/archiveopteryx/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 50f94e4688c..080cbc89775 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
     sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
     sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
   '';
+
+  # fix build on gcc7
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=builtin-declaration-mismatch"
+    "-Wno-error=implicit-fallthrough"
+  ];
+
   buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
   installPhase = ''
     jam install

From 879f144d7fb4d49cf2afacbc4e84e045d519c792 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 18:47:11 +0100
Subject: [PATCH 1299/2266] far2l: fix clang build

/cc ZHF #36454
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2257b847c8d..f52e311e675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8655,7 +8655,9 @@ with pkgs;
     inherit (pkgs.gnome2) gtkglext;
   };
 
-  far2l = callPackage ../applications/misc/far2l { };
+  far2l = callPackage ../applications/misc/far2l {
+    stdenv = if stdenv.cc.isClang then llvmPackages_4.stdenv else stdenv;
+  };
 
   farbfeld = callPackage ../development/libraries/farbfeld { };
 

From 3394feaeeffdcff4f142d44bdda113e989714ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 18:49:06 +0100
Subject: [PATCH 1300/2266] pythonPackages.hvac: move expression

---
 .../python-modules/hvac/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 12 +-----------
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/hvac/default.nix

diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
new file mode 100644
index 00000000000..067b816d58e
--- /dev/null
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "hvac";
+  version = "0.2.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with lib; {
+    description = "HashiCorp Vault API client";
+    homepage = https://github.com/ianunruh/hvac;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 83b30f0ab86..571d864e7e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8389,17 +8389,7 @@ in {
     };
   };
 
-  hvac = buildPythonPackage rec {
-    name    = "hvac-${version}";
-    version = "0.2.15";
-
-    src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/11/ba/6101780891b9d55f6174fa78b47d462c8c1f0cde34072b45fc39f7f8a77c/hvac-0.2.15.tar.gz";
-      sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c";
-    };
-
-    propagatedBuildInputs = with self; [ requests ];
-  };
+  hvac = callPackage ../development/python-modules/hvac { };
 
   hypothesis = callPackage ../development/python-modules/hypothesis { };
 

From 9dc0f229ad2b1e4f54006a4b04468111cecdf7c5 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 16 Mar 2018 12:45:29 +0100
Subject: [PATCH 1301/2266] spass: make gcc dependency explicit

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 816f0a2b597..21ff5081fc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19801,7 +19801,9 @@ with pkgs;
 
   saw-tools = callPackage ../applications/science/logic/saw-tools {};
 
-  spass = callPackage ../applications/science/logic/spass {};
+  spass = callPackage ../applications/science/logic/spass {
+    stdenv = gccStdenv;
+  };
 
   statverif = callPackage ../applications/science/logic/statverif { };
 

From 92c5097c6d4ba50e5e1b3fc23c8b5be34a197564 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 16 Mar 2018 18:31:31 +0100
Subject: [PATCH 1302/2266] samtools: make gcc dependency explicit

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..dc24a91c876 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19519,7 +19519,9 @@ with pkgs;
   });
 
   samtools = callPackage ../applications/science/biology/samtools/default.nix { };
-  samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { };
+  samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
+    stdenv = gccStdenv;
+  };
 
   snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
 

From 879ffc06fe559c0088c87181bb115c862ff55288 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 17 Mar 2018 19:17:56 +0100
Subject: [PATCH 1303/2266] libvorbis: 1.3.5 -> 1.3.6

This update includes the removed patches (CVE-2017-14632,
CVE-2017-14633) and additionally fixes CVE-2018-5146 [1].

The changelog:

libvorbis 1.3.6 (2018-03-16) -- "Xiph.Org libVorbis I 20180316 (Now 100% fewer shells)"

* Fix CVE-2018-5146 - out-of-bounds write on codebook decoding.
* Fix CVE-2017-14632 - free() on unitialized data
* Fix CVE-2017-14633 - out-of-bounds read
* Fix bitrate metadata parsing.
* Fix out-of-bounds read in codebook parsing.
* Fix residue vector size in Vorbis I spec.
* Appveyor support
* Travis CI support
* Add secondary CMake build system.
* Build system fixes

[1] http://seclists.org/oss-sec/2018/q1/243
---
 pkgs/development/libraries/libvorbis/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index f59237ee164..2f9bca5ed95 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,26 +1,16 @@
 { stdenv, fetchurl, libogg, pkgconfig, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "libvorbis-1.3.5";
+  name = "libvorbis-1.3.6";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
-    sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal";
+    sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g";
   };
 
   outputs = [ "out" "dev" "doc" ];
 
   patches = [
-    (fetchpatch {
-      url = "https://github.com/xiph/vorbis/commit/a79ec216cd119069c68b8f3542c6a425a74ab993.patch";
-      sha256 = "0xhsa96n3dlh2l85bxpz4b9m78mfxfgi2ibhjp77110a0nvkjr6h";
-      name = "CVE-2017-14633";
-    })
-    (fetchpatch {
-      url = "https://github.com/xiph/vorbis/commit/c1c2831fc7306d5fbd7bc800324efd12b28d327f.patch";
-      sha256 = "17lb86105im6fc0h0cx5sn94p004jsdbbs2vj1m9ll6z9yb4rxwc";
-      name = "CVE-2017-14632";
-    })
     (fetchpatch {
       url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch";
       sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";

From bc9dc2ccf1186f4c626104820379c7d2200f2e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 19:19:32 +0100
Subject: [PATCH 1304/2266] pythonPackages.hvac: 0.2.15 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index 067b816d58e..8bc54e9226c 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -2,15 +2,18 @@
 
 buildPythonPackage rec {
   pname = "hvac";
-  version = "0.2.15";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c";
+    sha256 = "2c9308334301daee3b5c6d56a032ca2c81eeb97d2777b73d795e201e8d037687";
   };
 
   propagatedBuildInputs = [ requests ];
 
+  # Requires running a Vault server
+  doCheck = false;
+
   meta = with lib; {
     description = "HashiCorp Vault API client";
     homepage = https://github.com/ianunruh/hvac;

From c89ec027eb51da7ab8ff8b3bfddbf2538a6c0091 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 17 Mar 2018 19:25:51 +0100
Subject: [PATCH 1305/2266] tremor: svn-17866 -> git-562307a

This updates tremor to a newer version and it's new home in a git
repository. It hasn't been updated since 2011 and is used as a build
input for other packages.

Also fixes CVE-2018-5146 [1].

[1] http://seclists.org/oss-sec/2018/q1/243
---
 pkgs/development/libraries/tremor/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index 5e08a61cd1b..6c6d144f994 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
 
 stdenv.mkDerivation rec {
-  name = "tremor-svn-${src.rev}";
+  name = "tremor-git-${src.rev}";
 
-  src = fetchsvn {
-    url = http://svn.xiph.org/trunk/Tremor;
-    rev = "17866";
-    sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568";
+  src = fetchgit {
+    url = https://git.xiph.org/tremor.git;
+    rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f";
+    sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From cc305174e233178f880b276447e459a71dcebab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 17 Mar 2018 19:35:03 +0100
Subject: [PATCH 1306/2266] pythonPackages.scikitlearn: disable doctests

fixes https://github.com/NixOS/nixpkgs/issues/35436
---
 pkgs/development/python-modules/scikitlearn/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 6d32b056a0a..00bdcae1b9a 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -21,8 +21,9 @@ buildPythonPackage rec {
   LC_ALL="en_US.UTF-8";
 
   # Disable doctests on OSX: https://github.com/scikit-learn/scikit-learn/issues/10213
+  # Disable doctests everywhere: https://github.com/NixOS/nixpkgs/issues/35436
   checkPhase = ''
-    HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ${stdenv.lib.optionalString stdenv.isDarwin "--doctest-options=+SKIP"} $out/${python.sitePackages}/sklearn/
+    HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/
   '';
 
   meta = with stdenv.lib; {

From 1798563e62e32f4c07428bdae818d15cd3c8369e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 19:40:14 +0100
Subject: [PATCH 1307/2266] libconfuse: fix tests on darwin

/cc ZHF #36454
---
 pkgs/development/libraries/libconfuse/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index d92492eb7f8..29398ac8aac 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # On darwin the tests depend on the installed libraries because of install_name.
+  doInstallCheck = true;
+  installCheckTarget = "check";
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From d69e0d99e023d0e09b09dab4dd250c0eb5aabb7d Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 16 Mar 2018 17:06:20 +0100
Subject: [PATCH 1308/2266] nixos/manual: fixed example config for
 networking.interfaces

The former example gave a "value is a list while a set was expected" error.
---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 4039e4e5163..a2d2eb1c311 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -489,7 +489,7 @@ in
     networking.interfaces = mkOption {
       default = {};
       example =
-        { eth0.ipv4 = [ {
+        { eth0.ipv4.addresses = [ {
             address = "131.211.84.78";
             prefixLength = 25;
           } ];

From 690939730ad227a19072e3390c6b0bc5ea3e2f22 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 17 Mar 2018 19:43:54 +0100
Subject: [PATCH 1309/2266] heapster: fix build

fetchFromGitHub returned a different sha256 for the same revision
---
 pkgs/servers/monitoring/heapster/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index db3c518c729..39c04857638 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "kubernetes";
     repo = "heapster";
-    sha256 = "057z9imgd2gvcbvahja3i26jzgm33dmfaxraakmcr4a2xfhj50hq";
+    sha256 = "1vg83207y7yigydnnhlvzs3s94vx02i56lqgs6a96c6i3mr3ydpb";
   };
 
   preBuild = ''

From eb7b4ce2568322892800683b10aa64dac84fd7a8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 12:32:55 -0700
Subject: [PATCH 1310/2266] bind: 9.12.0 -> 9.12.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/delv help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/delv -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker --help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker --version` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker --help` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/mdig -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/mdig -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/ddns-confgen -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-cds -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-dsfromkey -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-importkey -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-keyfromlabel -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-keygen -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-revoke -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-settime -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone --help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone --version` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -h` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone --help` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify --help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify --version` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -h` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify --help` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-checkconf -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-checkzone -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc -h` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc-confgen -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc-confgen -h` and found version 9.12.1
- found 9.12.1 with grep in /nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1
- directory tree listing: https://gist.github.com/e9daefd05b7c96cd83a144018a3b6aaf
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 55368ac9a4d..86e756a0db3 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -4,14 +4,14 @@
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.12.0"; in
+let version = "9.12.1"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9";
+    sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 6a71804bea7a950bd914cba6e98ac905e7983773 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 12:46:30 +0100
Subject: [PATCH 1311/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/04b554ad3bb00c6a9439c0a5dfdc1c126bf4c928.
---
 .../haskell-modules/hackage-packages.nix      | 421 ++++++++++++++++--
 1 file changed, 375 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 607f1c82d63..4338e39339d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9851,6 +9851,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Hoed_0_5_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, cereal-text
+     , cereal-vector, clock, containers, deepseq, directory, hashable
+     , libgraph, open-browser, primitive, process, QuickCheck
+     , regex-tdfa, regex-tdfa-text, semigroups, strict, template-haskell
+     , terminal-size, text, transformers, uniplate, unordered-containers
+     , vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "Hoed";
+       version = "0.5.1";
+       sha256 = "1rzlqd1sha6p1cw5w0gpf1w7qsmc6088sjnq1kq44mp12ybxrxm8";
+       libraryHaskellDepends = [
+         array base bytestring cereal cereal-text cereal-vector clock
+         containers deepseq directory hashable libgraph open-browser
+         primitive process QuickCheck regex-tdfa regex-tdfa-text semigroups
+         strict template-haskell terminal-size text transformers uniplate
+         unordered-containers vector vector-th-unbox
+       ];
+       testHaskellDepends = [ base process QuickCheck ];
+       homepage = "https://github.com/MaartenFaddegon/Hoed";
+       description = "Lightweight algorithmic debugging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HoleyMonoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -20545,8 +20571,8 @@ self: {
        pname = "accelerate-examples";
        version = "1.1.0.0";
        sha256 = "0zpjmk6v314jfda7fy22xghfqlqfh8vyf938qwyp6xjf1mpq1r1x";
-       revision = "2";
-       editedCabalFile = "1r53mc266gr6h2j0diyb82isaw72g6cdgvlqbhcnlidi3g7vqqcs";
+       revision = "3";
+       editedCabalFile = "1ir5i8skpyzpvwa17yw02j9rn9c5qjjincwrnjdwaixcdc7lsy4b";
        configureFlags = [ "-f-opencl" ];
        isLibrary = true;
        isExecutable = true;
@@ -22644,24 +22670,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-typescript_0_1_0_5" = callPackage
+  "aeson-typescript_0_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml
-     , tasty-hspec, template-haskell, temporary, text, th-abstraction
-     , unordered-containers
+     , filepath, hspec, interpolate, mtl, process, template-haskell
+     , temporary, text, th-abstraction, unordered-containers
      }:
      mkDerivation {
        pname = "aeson-typescript";
-       version = "0.1.0.5";
-       sha256 = "08mq1cvhgmys2jnf7jjh450ql6x800fc1a1xkczqrzw0dkbaab20";
+       version = "0.1.0.6";
+       sha256 = "11q165g6yvd87ahbfvxdpr6w61l0y9znv1x5jmznmj1c9m9s36id";
        libraryHaskellDepends = [
          aeson base containers interpolate mtl template-haskell text
          th-abstraction unordered-containers
        ];
        testHaskellDepends = [
          aeson base bytestring containers directory filepath hspec
-         interpolate mtl process tasty tasty-ant-xml tasty-hspec
-         template-haskell temporary text th-abstraction unordered-containers
+         interpolate mtl process template-haskell temporary text
+         th-abstraction unordered-containers
        ];
        homepage = "https://github.com/codedownio/aeson-typescript#readme";
        description = "Generate TypeScript definition files from your ADTs";
@@ -23220,8 +23245,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-gpss";
-       version = "0.5";
-       sha256 = "1szf6xaq7lk3l473rm8pls5s23nk08dwdzf875hx96i0m7kxmp6p";
+       version = "0.6.1";
+       sha256 = "06jx9340rr8a23gpzwwzqv0baqnv62w8cf8slcmcmlr0k84lg4ca";
        libraryHaskellDepends = [
          aivika aivika-transformers base containers hashable mtl
          unordered-containers
@@ -31343,6 +31368,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-easy" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, base, bytestring, lens
+     , resourcet, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "aws-easy";
+       version = "0.1.0.0";
+       sha256 = "0lchj79l606a2wxh72g837ys3nb1628ps03wxm61s5fl49229c0w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-core base bytestring lens resourcet
+         template-haskell text
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/rcook/aws-easy#readme";
+       description = "AWS Easy: Helper functions for working with amazonka";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aws-ec2" = callPackage
     ({ mkDerivation, aeson, aws, base, base16-bytestring
      , base64-bytestring, blaze-builder, blaze-markup, byteable
@@ -37229,6 +37274,8 @@ self: {
        pname = "blink1";
        version = "0.4";
        sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj";
+       revision = "1";
+       editedCabalFile = "107838wpl7dw7r73gf7fkkcprafih7l5wy31ic7yc8wyp9s9hkxi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring text unix usb vector ];
@@ -41272,13 +41319,12 @@ self: {
      , containers, deepseq, directory, distribution-nixpkgs, filepath
      , hackage-db, hopenssl, hpack, language-nix, lens, monad-par
      , monad-par-extras, mtl, optparse-applicative, pretty, process
-     , split, tasty, tasty-golden, text, time, transformers, utf8-string
-     , yaml
+     , split, tasty, tasty-golden, text, time, transformers, yaml
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.9";
-       sha256 = "1n6r27i4njiidij228r9fdb45pmsiidan6pxs2is2vsl8k9d65c7";
+       version = "2.9.1";
+       sha256 = "1qz5gjwzkfpmqiz5k62sxkv4prdmzwfa3hg9zma5dg1k4vs9dhkv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41290,7 +41336,7 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring Cabal containers directory
          distribution-nixpkgs filepath hopenssl language-nix lens monad-par
-         monad-par-extras mtl optparse-applicative pretty utf8-string
+         monad-par-extras mtl optparse-applicative pretty
        ];
        testHaskellDepends = [
          base Cabal filepath language-nix lens pretty tasty tasty-golden
@@ -77035,6 +77081,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "friday-juicypixels_0_1_2_4" = callPackage
+    ({ mkDerivation, base, bytestring, file-embed, friday, hspec
+     , JuicyPixels, vector
+     }:
+     mkDerivation {
+       pname = "friday-juicypixels";
+       version = "0.1.2.4";
+       sha256 = "0gxfj3x5w65dfnkf6ymjs27w2i14yv2m218qgmvx1p80wy7q4nbd";
+       libraryHaskellDepends = [ base friday JuicyPixels vector ];
+       testHaskellDepends = [
+         base bytestring file-embed friday hspec JuicyPixels
+       ];
+       homepage = "github.com/TomMD/friday-juicypixels";
+       description = "Converts between the Friday and JuicyPixels image types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "friday-scale-dct" = callPackage
     ({ mkDerivation, base, base-compat, carray, fft, friday, vector }:
      mkDerivation {
@@ -78362,6 +78426,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "garlic-bread" = callPackage
+    ({ mkDerivation, base, hspec, mtl, transformers }:
+     mkDerivation {
+       pname = "garlic-bread";
+       version = "0.1.0.1";
+       sha256 = "1mky2jm8qadlv4534xnzfn4r24dipw6ac8s3wpkf90mxw9s6m8xm";
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base hspec mtl transformers ];
+       homepage = "https://github.com/parsonsmatt/garlic-bread#readme";
+       description = "A monad transformer for keeping track of where you've come from";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "garsia-wachs" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -80960,6 +81037,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghc-parser_0_2_0_2" = callPackage
+    ({ mkDerivation, base, cpphs, ghc, happy }:
+     mkDerivation {
+       pname = "ghc-parser";
+       version = "0.2.0.2";
+       sha256 = "1130fpddf3jx84k558gsc83j3166qy15jp878w2d3lwgzxjcqx5v";
+       libraryHaskellDepends = [ base ghc ];
+       libraryToolDepends = [ cpphs happy ];
+       homepage = "https://github.com/gibiansky/IHaskell";
+       description = "Haskell source parser from GHC";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-paths" = callPackage
     ({ mkDerivation, base, Cabal, directory }:
      mkDerivation {
@@ -81936,8 +82027,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.15";
-       sha256 = "1mxiwwm6dnbxxnqm05bh73qnb27dbfsyz3pr2bvgwvhp4f2m0nn3";
+       version = "2.0.16";
+       sha256 = "1xm13f4whvi08bwq2n6axkz1sirhqpsxpnfq9c8px0j9izy9qnpb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -84309,6 +84400,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss_1_12_0_0" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
+     , gloss-rendering, GLUT, OpenGL
+     }:
+     mkDerivation {
+       pname = "gloss";
+       version = "1.12.0.0";
+       sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9";
+       libraryHaskellDepends = [
+         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
+       ];
+       homepage = "http://gloss.ouroborus.net";
+       description = "Painless 2D vector graphics, animations and simulations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
@@ -84336,6 +84444,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss-algorithms_1_12_0_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, gloss }:
+     mkDerivation {
+       pname = "gloss-algorithms";
+       version = "1.12.0.0";
+       sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb";
+       libraryHaskellDepends = [ base containers ghc-prim gloss ];
+       homepage = "http://gloss.ouroborus.net";
+       description = "Data structures and algorithms for working with 2D graphics";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-banana" = callPackage
     ({ mkDerivation, base, gloss, reactive-banana }:
      mkDerivation {
@@ -84370,10 +84491,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-examples";
-       version = "1.11.1.1";
-       sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1";
-       revision = "2";
-       editedCabalFile = "0ldnhqmxs03040m5ym0qw1ig217j893rm1sq7rnjsmvh15ziw4yh";
+       version = "1.12.0.0";
+       sha256 = "1iimmphkq89h4k8iny52kgz1a0cq6lp8dzr0lkj4j5qnfaj65lhl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84435,6 +84554,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss-raster_1_12_0_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
+     , repa
+     }:
+     mkDerivation {
+       pname = "gloss-raster";
+       version = "1.12.0.0";
+       sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8";
+       libraryHaskellDepends = [
+         base containers ghc-prim gloss gloss-rendering repa
+       ];
+       homepage = "http://gloss.ouroborus.net";
+       description = "Parallel rendering of raster images";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-raster-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, colour-accelerate, gloss
      , gloss-accelerate
@@ -84468,6 +84604,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss-rendering_1_12_0_0" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
+     mkDerivation {
+       pname = "gloss-rendering";
+       version = "1.12.0.0";
+       sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0";
+       libraryHaskellDepends = [
+         base bmp bytestring containers GLUT OpenGL
+       ];
+       description = "Gloss picture data types and rendering functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-sodium" = callPackage
     ({ mkDerivation, base, gloss, sodium }:
      mkDerivation {
@@ -99636,6 +99786,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_10_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
+     , resource-pool, scanner, slave-thread, stm, test-framework
+     , test-framework-hunit, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.10.1";
+       sha256 = "1xzma70f1p6zfihwpsnc23bdzw09yg50pig7knkj6bxkv19czbsn";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq errors HTTP mtl
+         network network-uri resource-pool scanner stm text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring doctest HUnit mtl slave-thread stm
+         test-framework test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl 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
@@ -111013,6 +111189,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsyslog-udp_0_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "hsyslog-udp";
+       version = "0.2.2";
+       sha256 = "1fr8cn3jwasnp9q23q5pmz3z6zh7z04jhcv77igacwpgw0729hd4";
+       libraryHaskellDepends = [
+         base bytestring hsyslog network text time unix
+       ];
+       testHaskellDepends = [ base hspec time ];
+       homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
+       description = "Log to syslog over a network via UDP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hszephyr" = callPackage
     ({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }:
      mkDerivation {
@@ -115940,6 +116134,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ihaskell_0_9_0_3" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , cmdargs, containers, directory, filepath, ghc, ghc-boot
+     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
+     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
+     , split, stm, strict, system-argv0, text, transformers, unix
+     , unordered-containers, utf8-string, uuid, vector
+     }:
+     mkDerivation {
+       pname = "ihaskell";
+       version = "0.9.0.3";
+       sha256 = "13cblc7wy92gbsvvbmxmp1r9c3fkmzl61adan8v9zxqbgw1w284p";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal cmdargs containers
+         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
+         haskell-src-exts hlint http-client http-client-tls ipython-kernel
+         mtl parsec process random shelly split stm strict system-argv0 text
+         transformers unix unordered-containers utf8-string uuid vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory ghc ipython-kernel
+         process strict text transformers unix
+       ];
+       testHaskellDepends = [
+         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
+         shelly text transformers
+       ];
+       homepage = "http://github.com/gibiansky/IHaskell";
+       description = "A Haskell backend kernel for the IPython project";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihaskell-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
      , ihaskell, text
@@ -116005,8 +116236,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-diagrams";
-       version = "0.3.1.1";
-       sha256 = "1c6a469ymfcjmf4larh1sh6qzaxgq260r55vzx78irh036k5h0lc";
+       version = "0.3.2.1";
+       sha256 = "0ssczqr41nrbrdr95vz457mwxcpmcrwd1bihzccmici1fvjd13rx";
        libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
@@ -118569,6 +118800,27 @@ self: {
        pname = "invertible";
        version = "0.2.0.3";
        sha256 = "0pckhl1nv6w66k3ll9q1bwbmzl2rpbwk6c3xkm7dscxzjzw43qwf";
+       revision = "1";
+       editedCabalFile = "0jkwx19gj653ribqmlpysyp2kf4rphwj837zzwwd7jf9cnmgyqlp";
+       libraryHaskellDepends = [
+         base haskell-src-meta invariant lens partial-isomorphisms
+         semigroupoids template-haskell transformers TypeCompose
+       ];
+       testHaskellDepends = [ base QuickCheck transformers ];
+       description = "bidirectional arrows, bijective functions, and invariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "invertible_0_2_0_4" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, invariant, lens
+     , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
+     , transformers, TypeCompose
+     }:
+     mkDerivation {
+       pname = "invertible";
+       version = "0.2.0.4";
+       sha256 = "0hrg58p5yz97n2xi9mbad69skldr163mr1wdvykdsvwyyxhfl4q4";
        libraryHaskellDepends = [
          base haskell-src-meta invariant lens partial-isomorphisms
          semigroupoids template-haskell transformers TypeCompose
@@ -119170,6 +119422,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ipython-kernel_0_9_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , directory, filepath, mtl, process, SHA, temporary, text
+     , transformers, unordered-containers, uuid, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.9.0.2";
+       sha256 = "01l22myk73igczzjj4b239brp80b3pfamw9w67lw4l4w6n7lc8sr";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers directory filepath mtl
+         process SHA temporary text transformers unordered-containers uuid
+         zeromq4-haskell
+       ];
+       homepage = "http://github.com/gibiansky/IHaskell";
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -127876,8 +128151,8 @@ self: {
        pname = "lens-accelerate";
        version = "0.1.0.0";
        sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4";
-       revision = "1";
-       editedCabalFile = "0mgh4px2gpbny3fnbxv91ml5anvq3gmxs3w3q0zgsbnhaw73w4cf";
+       revision = "2";
+       editedCabalFile = "1yk1zjwp7sabh90rgz4sa15vqj1wq837nypqjb0qhymslmrnvvnl";
        libraryHaskellDepends = [ accelerate base lens ];
        homepage = "https://github.com/tmcdonell/lens-accelerate";
        description = "Instances to mix lens with accelerate";
@@ -152942,7 +153217,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_4_1" = callPackage
+  "pandoc-types_1_17_4_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -152950,8 +153225,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.4.1";
-       sha256 = "1v2xy6vmg9kcvax9mwqwrjdkf860jwyxkbd45snvh82p368yfxq2";
+       version = "1.17.4.2";
+       sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
          transformers
@@ -156062,6 +156337,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_6_0_2" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , product-isomorphic, quickcheck-simple, template-haskell
+     , th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.6.0.2";
+       sha256 = "1sj2izz8ppam28qcja02jj6fx7khdjmnr4xn2yglbxyzs91fjg44";
+       libraryHaskellDepends = [
+         array base containers dlist names-th product-isomorphic
+         template-haskell th-data-compat transformers
+       ];
+       testHaskellDepends = [ base quickcheck-simple ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Binding between SQL database values and haskell records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistable-types-HDBC-pg" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC
      , persistable-record, relational-query-HDBC, text-postgresql
@@ -165564,6 +165859,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pushbullet-types_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, base, http-api-data, microlens
+     , microlens-th, scientific, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pushbullet-types";
+       version = "0.4.1.0";
+       sha256 = "0ny8nlk50cn6zgikg7xwylkrablj05vcm5gjm9y4zdzhbz7s4qb4";
+       libraryHaskellDepends = [
+         aeson base http-api-data microlens microlens-th scientific text
+         time unordered-containers
+       ];
+       description = "Datatypes used by the Pushbullet APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH
      , mtl, SHA, time
@@ -167968,8 +168280,8 @@ self: {
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.2";
-       sha256 = "132xlls7qw94y2ljc74m0qhlzb19yv3yfxmwhi25cnghggsb22qz";
+       version = "0.1.3";
+       sha256 = "0npm55xzb6rv4spqn5mhkq8r43nwm818v6f2c20yv2bzhk11a0qm";
        libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
        benchmarkHaskellDepends = [
          async base bytestring criterion cryptonite entropy ghc-prim
@@ -168389,6 +168701,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rank2classes_1_0_2" = callPackage
+    ({ mkDerivation, base, doctest, template-haskell, transformers }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.0.2";
+       sha256 = "1qkknjas2w0zrv5kx47i1cxaiyv7814fqj8y69kywsl93q919p42";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -172301,8 +172627,8 @@ self: {
        pname = "repa";
        version = "3.4.1.3";
        sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
-       revision = "1";
-       editedCabalFile = "08n1c94kds39p5gaz46cij4swycr49jz7jhpr669jf68limhrqk6";
+       revision = "2";
+       editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -172410,8 +172736,8 @@ self: {
        pname = "repa-examples";
        version = "3.4.1.1";
        sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
-       revision = "2";
-       editedCabalFile = "1ljqrqlk5h34q4mg6qipx5qsgz8fhp51p5mfkzv822d7v5qdsnv7";
+       revision = "3";
+       editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -189933,26 +190259,27 @@ self: {
      }) {inherit (pkgs) openssl;};
 
   "sqlcli" = callPackage
-    ({ mkDerivation, base, logging, text, transformers }:
+    ({ mkDerivation, base, logging, text, transformers, unixODBC }:
      mkDerivation {
        pname = "sqlcli";
-       version = "0.2.0.0";
-       sha256 = "164p1frqcazzhcwd1b5n1y890nigai79s1qg8vkailfvnzdxffvq";
+       version = "0.2.0.1";
+       sha256 = "09x9g3rjz1idyr0rh885y4pdddn08g7hwcspa47n6yf5wlx33gln";
        libraryHaskellDepends = [ base logging text transformers ];
+       librarySystemDepends = [ unixODBC ];
        homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli";
        description = "Sql Call-Level Interface bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) unixODBC;};
 
   "sqlcli-odbc" = callPackage
     ({ mkDerivation, base, logging, sqlcli }:
      mkDerivation {
        pname = "sqlcli-odbc";
-       version = "0.2.0.0";
-       sha256 = "1zq1rgj32w72arhplqfiygflg8gablpm1alppd3y03wki1gnrd95";
+       version = "0.2.0.1";
+       sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5";
        libraryHaskellDepends = [ base logging sqlcli ];
-       homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc";
-       description = "Specific ODBC definitions to be used by SQL CLI clients";
+       homepage = "https://hub.darcs.net/mihaigiurgeanu/sqlcli-odbc";
+       description = "ODBC specific definitions to be used by SQL CLI clients";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -209534,8 +209861,8 @@ self: {
        pname = "union";
        version = "0.1.1.2";
        sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
-       revision = "2";
-       editedCabalFile = "088dcgyg9bzm5qczcddssjfwywk9lsj10lq7byh4f9rnsf0jppna";
+       revision = "3";
+       editedCabalFile = "1llczfg153qqrkp2biqaa9qqyzy6li5cnxbyp5p24d7f2dr0d5fc";
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
@@ -226037,6 +226364,8 @@ self: {
        pname = "zip-stream";
        version = "0.1.0.1";
        sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq";
+       revision = "1";
+       editedCabalFile = "1g3yr6ggcxgzzdpaj7zn48k7mqfdnnz697f3midw2br1dnhv7zdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From e772848b442171c4a84ef2f04eff2dba14573b37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 11:44:49 +0100
Subject: [PATCH 1312/2266] haskell-tasty: drop obsolete override for ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix       | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b35b120fe11..cada77bd3ab 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -134,17 +134,6 @@ self: super: {
 
   ## On Hackage:
 
-  ## On Hackage, awaiting for import
-  tasty = overrideCabal super.tasty (drv: {
-    ##     • No instance for (Semigroup OptionSet)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid OptionSet’
-    version         = "1.0.0.1";
-    sha256          = "0ggqffw9kbb6nlq1pplk131qzxndqqzqyf4s2p7576nljx11a7qf";
-  });
-
-
-
   ## Upstreamed
 
   ## Upstreamed, awaiting a Hackage release

From b59905bfe46870720c170ea26cb0b6d6d76485a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 11:50:59 +0100
Subject: [PATCH 1313/2266] haskell-conduit: use latest version when compiling
 with ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index cada77bd3ab..8520477f586 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -721,4 +721,7 @@ self: super: {
   # https://github.com/jgm/pandoc-types/issues/37
   pandoc-types = self.pandoc-types_1_17_4_1;
 
+  # 1.3.0.0 does not compile.
+  conduit = self.conduit_1_3_0_1;
+
 }

From 3c978a82caad786e0a08b8d3e9ab0c104bdc7446 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 12:12:40 +0100
Subject: [PATCH 1314/2266] haskell-doctemplates: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8520477f586..25afb567941 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -524,16 +524,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  ## Issue: https://github.com/jgm/doctemplates/issues/2
-  doctemplates = overrideCabal super.doctemplates (drv: {
-    patches = (drv.patches or []) ++ [
-      (pkgs.fetchpatch
-       { url    = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch;
-         sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d";
-       })
-    ];
-  });
-
   exception-transformers = overrideCabal super.exception-transformers (drv: {
     ## Setup: Encountered missing dependencies:
     ## HUnit >=1.2 && <1.6

From bb6b99287bd3cd00eccc0bb7bbf49c9cf9b9fb3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 14:13:46 +0100
Subject: [PATCH 1315/2266] cabal2nix: drop obsolete overrides for ghc-8.4.x

---
 .../configuration-ghc-8.4.x.nix               | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 25afb567941..5390d46c6e1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -134,26 +134,6 @@ self: super: {
 
   ## On Hackage:
 
-  ## Upstreamed
-
-  ## Upstreamed, awaiting a Hackage release
-  cabal2nix = (overrideCabal super.cabal2nix (drv: {
-    ##     Ambiguous occurrence ‘<>’
-    ##     It could refer to either ‘Prelude.<>’,
-    ##                              imported from ‘Prelude’ at src/Distribution/Nixpkgs/Haskell/Derivation.hs:6:8-46
-    src = pkgs.fetchFromGitHub {
-      owner  = "nixos";
-      repo   = "cabal2nix";
-      rev    = "32974fcc3d9b485bd35167d9ae90941a5b3d06df";
-      sha256 = "1racp49z5922rvrc62clslzdkxh4axj2i0k83w5y6w5chl83abyd";
-    };
-  })).override {
-    ##     • No instance for (Semigroup (List a))
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       Possible fix:
-    hpack = self.hpack;
-  };
-
   ## Upstreamed, awaiting a Hackage release
   cabal-install = overrideCabal super.cabal-install (drv: {
     ## Setup: Encountered missing dependencies:

From 03cae069fef51eb1d09236b6026d8d77c23a02cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 14:14:28 +0100
Subject: [PATCH 1316/2266] haskell-pandoc: use current git version when
 building with ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5390d46c6e1..5a0f91615c1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -688,10 +688,20 @@ self: super: {
       stripLen = 1;
     });
 
-  # https://github.com/jgm/pandoc-types/issues/37
-  pandoc-types = self.pandoc-types_1_17_4_1;
-
   # 1.3.0.0 does not compile.
   conduit = self.conduit_1_3_0_1;
 
+  # https://github.com/jgm/pandoc-types/issues/37
+  pandoc-types = self.pandoc-types_1_17_4_2;
+
+  ## Need latest git version to support current haddock-library versions.
+  pandoc = overrideSrc super.pandoc {
+    version = "2.1.2-git";
+    src = pkgs.fetchFromGitHub {
+      owner  = "jgm";
+      repo   = "pandoc";
+      rev    = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec";
+      sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a";
+    };
+  };
 }

From 69c7aabbf82d9bcba4bcb3215fdead775c551e20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 17:30:44 +0100
Subject: [PATCH 1317/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f91c8f61e9b8be0b510f79123b7d2ed93d3d4e35.
---
 .../haskell-modules/hackage-packages.nix      | 222 ++++++++++++++++--
 1 file changed, 197 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4338e39339d..e5ebeed0405 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -38573,6 +38573,8 @@ self: {
        pname = "brick";
        version = "0.34.1";
        sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys";
+       revision = "2";
+       editedCabalFile = "0yk4wxlv693gnax8b0gr6g2zqsm53izwar0aagqc4w3bq3llx63b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38585,6 +38587,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brick_0_35" = callPackage
+    ({ mkDerivation, base, config-ini, containers, contravariant
+     , data-clist, deepseq, dlist, microlens, microlens-mtl
+     , microlens-th, stm, template-haskell, text, text-zipper
+     , transformers, vector, vty, word-wrap
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.35";
+       sha256 = "16vfm60nz2zx819nv4s83108w1bhiyqx99zmacrlc371nlpdiyby";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base config-ini containers contravariant data-clist deepseq dlist
+         microlens microlens-mtl microlens-th stm template-haskell text
+         text-zipper transformers vector vty word-wrap
+       ];
+       homepage = "https://github.com/jtdaugherty/brick/";
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brick-skylighting" = callPackage
     ({ mkDerivation, base, brick, containers, skylighting, text, vty }:
      mkDerivation {
@@ -39591,13 +39616,18 @@ self: {
      }) {};
 
   "bv-sized" = callPackage
-    ({ mkDerivation, base, containers, lens, parameterized-utils }:
+    ({ mkDerivation, base, containers, lens, parameterized-utils
+     , QuickCheck, random
+     }:
      mkDerivation {
        pname = "bv-sized";
-       version = "0.1.1.1";
-       sha256 = "127vg7759gnwlg91dbhgqaxb62mffhvq40sjixylxyz1f3lzhqmn";
+       version = "0.2.0";
+       sha256 = "0v0wrr4pf8krya5az91yqvivjg72p08x2nmsp335c66rpmg6ph1i";
        libraryHaskellDepends = [
-         base containers lens parameterized-utils
+         base containers lens parameterized-utils QuickCheck random
+       ];
+       testHaskellDepends = [
+         base lens parameterized-utils QuickCheck random
        ];
        homepage = "https://github.com/benjaminselfridge/bv-sized";
        description = "a BitVector datatype that is parameterized by the vector width";
@@ -50806,6 +50836,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "configuration-tools_0_3_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
+     , case-insensitive, connection, data-default, deepseq, directory
+     , dlist, enclosed-exceptions, filepath, http-client
+     , http-client-tls, http-types, monad-control, mtl, network-uri
+     , optparse-applicative, process, profunctors, semigroups, text, tls
+     , transformers, unordered-containers, wai, warp, warp-tls, x509
+     , x509-system, x509-validation, yaml
+     }:
+     mkDerivation {
+       pname = "configuration-tools";
+       version = "0.3.1";
+       sha256 = "0ivfz3vjf81dnxqlzp4ij8snw0bfy227b26r3j1vvhc4n1qpxpz0";
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
+         base64-bytestring bytestring Cabal case-insensitive connection
+         data-default deepseq directory dlist enclosed-exceptions filepath
+         http-client http-client-tls http-types monad-control mtl
+         network-uri optparse-applicative process profunctors semigroups
+         text tls transformers unordered-containers x509 x509-system
+         x509-validation yaml
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols bytestring Cabal enclosed-exceptions
+         http-types monad-control mtl text transformers unordered-containers
+         wai warp warp-tls yaml
+       ];
+       homepage = "https://github.com/alephcloud/hs-configuration-tools";
+       description = "Tools for specifying and parsing configurations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "configurator" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , hashable, HUnit, test-framework, test-framework-hunit, text
@@ -53979,6 +54043,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crypto-enigma_0_0_2_11" = callPackage
+    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
+     , split
+     }:
+     mkDerivation {
+       pname = "crypto-enigma";
+       version = "0.0.2.11";
+       sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1";
+       libraryHaskellDepends = [ base containers MissingH mtl split ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/orome/crypto-enigma-hs";
+       description = "An Enigma machine simulator with display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "crypto-multihash" = callPackage
     ({ mkDerivation, base, base58-bytestring, bytestring, containers
      , cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -75209,6 +75289,8 @@ self: {
        pname = "fmt";
        version = "0.5.0.0";
        sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf";
+       revision = "1";
+       editedCabalFile = "1vdgh45qv5jk1ym4y54sjgk0cnqhrqqi6iirrw8drq20v1srbpl3";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring containers
          microlens text text-format time time-locale-compat
@@ -82273,6 +82355,8 @@ self: {
        pname = "gi-gtk-hs";
        version = "0.3.5.0";
        sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv";
+       revision = "1";
+       editedCabalFile = "01gcz19v90iw2iy8mmlavin68i5w1c1zzliyqnlss7sn5dqqx8bh";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -139686,8 +139770,8 @@ self: {
        pname = "modern-uri";
        version = "0.2.1.0";
        sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
-       revision = "2";
-       editedCabalFile = "1xhm5vi9y9y0mzmyqac29d13pvm3d28glmqcd7ps9lf9fjrrpp6k";
+       revision = "3";
+       editedCabalFile = "05kk7q1bwrnffi2ya4mmmsgy8qr2s5d2lrxa2h0acygvdwg3gx7s";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -145661,30 +145745,27 @@ self: {
      }) {};
 
   "nested-routes" = callPackage
-    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, errors
-     , exceptions, extractable-singleton, hashable, hashtables, hspec
-     , hspec-wai, http-types, monad-control-aligned, mtl, poly-arity
-     , pred-set, pred-trie, regex-compat, semigroups, tasty, tasty-hspec
-     , text, transformers, tries, unordered-containers
+    ({ mkDerivation, attoparsec, base, errors, exceptions
+     , extractable-singleton, hashable, hspec, hspec-wai, http-types
+     , monad-control-aligned, mtl, poly-arity, pred-trie, regex-compat
+     , tasty, tasty-hspec, text, tries, unordered-containers
      , wai-middleware-content-type, wai-middleware-verbs
      , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "8.2.0";
-       sha256 = "1fg901fa9an4589my637lld8y4nyq3pd0gqy008p10w3c0mznhw6";
+       version = "9.0.0";
+       sha256 = "1vdmwkr69n7ybwamfazy2p65r9s2fqbgvfy31wxiqyn6phg6r57v";
        libraryHaskellDepends = [
-         attoparsec base bifunctors bytestring errors exceptions
-         extractable-singleton hashable hashtables monad-control-aligned mtl
-         poly-arity pred-set pred-trie regex-compat semigroups text
-         transformers tries unordered-containers wai-middleware-content-type
+         attoparsec base errors exceptions extractable-singleton hashable
+         monad-control-aligned mtl poly-arity pred-trie regex-compat text
+         tries unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        testHaskellDepends = [
-         attoparsec base bifunctors bytestring errors exceptions
-         extractable-singleton hashable hashtables hspec hspec-wai
-         http-types monad-control-aligned mtl poly-arity pred-set pred-trie
-         regex-compat semigroups tasty tasty-hspec text transformers tries
+         attoparsec base errors exceptions extractable-singleton hashable
+         hspec hspec-wai http-types monad-control-aligned mtl poly-arity
+         pred-trie regex-compat tasty tasty-hspec text tries
          unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
@@ -159691,6 +159772,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plot-light_0_3_1" = callPackage
+    ({ mkDerivation, base, blaze-svg, colour, containers, data-default
+     , hspec, mtl, QuickCheck, scientific, text, time
+     }:
+     mkDerivation {
+       pname = "plot-light";
+       version = "0.3.1";
+       sha256 = "02bivm4gi0sv13yx2alxkcm0ssxbgiwyn93m54x8xwnvczfavsmw";
+       libraryHaskellDepends = [
+         base blaze-svg colour containers data-default mtl scientific text
+         time
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/ocramz/plot-light";
+       description = "A lightweight plotting library, exporting to SVG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "plot-light-examples" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
+     , colour, plot-light, scientific, text, time
+     }:
+     mkDerivation {
+       pname = "plot-light-examples";
+       version = "0.1.0.0";
+       sha256 = "19r07cdv34ks0810gq1x6cmdk7jf8f1s983rf2jn4vga4w5akf0p";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         attoparsec attoparsec-time base blaze-svg colour plot-light
+         scientific text time
+       ];
+       homepage = "https://github.com/ocramz/plot-light-examples";
+       description = "Example binaries for plot-light";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plotfont" = callPackage
     ({ mkDerivation, base, containers, tasty, tasty-hunit }:
      mkDerivation {
@@ -162087,6 +162207,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pptable_0_3_0_0" = callPackage
+    ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit
+     , markdown-unlit, pretty, QuickCheck, syb, tasty, tasty-hunit
+     , tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "pptable";
+       version = "0.3.0.0";
+       sha256 = "05wkvnk2h3xvjivk8cd6z8xlscipvd2az1v1n4sdianf9r0gzdwq";
+       libraryHaskellDepends = [
+         base boxes containers generic-deriving pretty syb vector
+       ];
+       testHaskellDepends = [
+         base boxes containers HUnit markdown-unlit QuickCheck tasty
+         tasty-hunit tasty-quickcheck vector
+       ];
+       homepage = "https://github.com/gdevanla/pptable#readme";
+       description = "Pretty Print containers in a tabular format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pqc" = callPackage
     ({ mkDerivation, base, QuickCheck, random, stm }:
      mkDerivation {
@@ -162291,6 +162433,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pred-trie_0_6_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, criterion, deepseq
+     , errors, hashable, hashtables, mtl, poly-arity, pred-set
+     , QuickCheck, semigroups, sets, strict, tasty, tasty-hunit
+     , tasty-quickcheck, text, tries, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pred-trie";
+       version = "0.6.0.1";
+       sha256 = "0hymhjh7idpibzdx0214laf0zjf3a4anhsmxn0p5g9xkgh7l7m72";
+       libraryHaskellDepends = [
+         base containers deepseq hashable hashtables mtl poly-arity pred-set
+         QuickCheck semigroups strict tries unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base containers deepseq errors hashable hashtables mtl
+         poly-arity pred-set QuickCheck semigroups strict tasty tasty-hunit
+         tasty-quickcheck text tries unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base containers criterion deepseq hashable hashtables
+         mtl poly-arity pred-set QuickCheck semigroups sets strict text
+         tries unordered-containers
+       ];
+       homepage = "https://github.com/athanclark/pred-trie#readme";
+       description = "Predicative tries";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "predicates" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -208061,8 +208233,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.1.1";
-       sha256 = "02v4y8limn1kdh27w8bq3d0q1ffnalpj9bqp7km1amfqwp2ljsij";
+       version = "0.1.2";
+       sha256 = "1phi14lmwyz6qi55vnnjhibglm74xkic2xiwmd1qxkj0dnb423wj";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
@@ -226281,8 +226453,8 @@ self: {
        pname = "zip";
        version = "1.0.0";
        sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9";
-       revision = "1";
-       editedCabalFile = "0yplpja4gbfr8lkwvv5q8lx9bia2dzm178hyhlmw1s2hniqjxzkn";
+       revision = "2";
+       editedCabalFile = "14dcabh3h6b1c8yzjq848i7arprgx7imx2rb9s0y2v0ax6b4dm48";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest directory dlist exceptions filepath

From 84bd9be9ce463fb7860e84033dff263fbfac6d12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 17:30:32 +0100
Subject: [PATCH 1318/2266] haskell-cabal2spec: fix build with ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index c6e9f40a316..e37c7bb2d3e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -90,9 +90,10 @@ self: super: {
   distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
   hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
   cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
-  stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: {
+  cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
+  stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: {
     Cabal = self.Cabal_2_2_0_0;
     haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
-  })));
+  }));
 
 }

From cedf31b04af86214ccd6abbaf13fc628b03de795 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 17:31:38 +0100
Subject: [PATCH 1319/2266] haskell-brick: override to latest version to fix
 build with ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5a0f91615c1..24b7cd82fb8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -704,4 +704,8 @@ self: super: {
       sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a";
     };
   };
+
+  # Older versions don't compile.
+  brick = self.brick_0_35;
+
 }

From 8848a95575d30c0c74924a82b1e87821756e5b4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 19:26:55 +0100
Subject: [PATCH 1320/2266] haskell-boxes: drop obsolete override for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 24b7cd82fb8..5f0b6636506 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -47,11 +47,6 @@ self: super: {
 
   ## Shadowed:
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## base >=3 && <4.11
-  boxes = super.boxes_0_1_5;
-
   ## Needs bump to a versioned attribute
   ##     • No instance for (GHC.Base.Semigroup BV)
   ##         arising from the superclasses of an instance declaration

From 7d5a69c2652ca4962bb2854d1d166a790a3332e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 19:28:45 +0100
Subject: [PATCH 1321/2266] haskell-GenericPretty: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5f0b6636506..8884d853641 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -505,16 +505,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  GenericPretty = overrideCabal super.GenericPretty (drv: {
-    ## https://github.com/RazvanRanca/GenericPretty/issues/2
-    patches = (drv.patches or []) ++ [
-      (pkgs.fetchpatch
-       { url    = https://github.com/RazvanRanca/GenericPretty/pull/3.patch;
-         sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k";
-       })
-    ];
-  });
-
   github = overrideCabal super.github (drv: {
     ## Setup: Encountered missing dependencies:
     ## base >=4.7 && <4.11

From 93d241e3ddd4c33dc2fa0164f0567e81e7aae746 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 20:57:26 +0100
Subject: [PATCH 1322/2266] haskell-timezone-olson: override to latest version
 for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8884d853641..5ae7c18cc2a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -692,5 +692,6 @@ self: super: {
 
   # Older versions don't compile.
   brick = self.brick_0_35;
+  timezone-olson = self.timezone-olson_0_1_9;
 
 }

From 148646e6305a468da30f1b912f3fbba643fa9798 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 20:58:29 +0100
Subject: [PATCH 1323/2266] haskell-matrix: override to latest version for
 ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-common.nix    | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6abd25121e5..47768b948ff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1006,4 +1006,7 @@ self: super: {
     sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
   });
 
+  # https://github.com/Daniel-Diaz/matrix/issues/55
+  matrix_0_3_6_0 = dontCheck super.matrix_0_3_6_0;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 5ae7c18cc2a..0bbcf2745b2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -693,5 +693,6 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_35;
   timezone-olson = self.timezone-olson_0_1_9;
+  matrix = self.matrix_0_3_6_0;
 
 }

From c044a82caf5a07e439b712a4fa0ac291ea3dd906 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 20:59:42 +0100
Subject: [PATCH 1324/2266] haskell-json: patch to fix the build with ghc-8.4.x

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 0bbcf2745b2..23f25f17f6c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -690,6 +690,12 @@ self: super: {
     };
   };
 
+  # Fix missing semigroup instance.
+  json = appendPatch super.json (pkgs.fetchpatch
+    { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch;
+      sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z";
+    });
+
   # Older versions don't compile.
   brick = self.brick_0_35;
   timezone-olson = self.timezone-olson_0_1_9;

From b8ab77c1f0e84699f904497b5308f3391331d770 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 21:00:29 +0100
Subject: [PATCH 1325/2266] haskell-th-printf: jailbreak to fix the build with
 ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 23f25f17f6c..765dd338618 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -701,4 +701,7 @@ self: super: {
   timezone-olson = self.timezone-olson_0_1_9;
   matrix = self.matrix_0_3_6_0;
 
+  # https://github.com/pikajude/th-printf/issues/8
+  th-printf = doJailbreak super.th-printf;
+
 }

From 13b154aee44bbb55060bfd40c7fc293821919159 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 21:00:56 +0100
Subject: [PATCH 1326/2266] haskell-data-inttrie: patch to fix the build with
 ghc-8.4.x

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 765dd338618..1f2f2e24650 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -673,6 +673,12 @@ self: super: {
       stripLen = 1;
     });
 
+  # Fix missing semigroup instance.
+  data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch
+    { url = https://github.com/luqui/data-inttrie/pull/5.patch;
+      sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
+    });
+
   # 1.3.0.0 does not compile.
   conduit = self.conduit_1_3_0_1;
 

From 54c1ca5fe9c7991dfc3fff0478ebe8acefefb598 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Mar 2018 21:15:32 +0100
Subject: [PATCH 1327/2266] haskell-xmonad: patch to fix the build with
 ghc-8.4.x

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 1f2f2e24650..2cc3cdb8eba 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -710,4 +710,10 @@ self: super: {
   # https://github.com/pikajude/th-printf/issues/8
   th-printf = doJailbreak super.th-printf;
 
+  # https://github.com/xmonad/xmonad/issues/155
+  xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
+    { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
+      sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
+    })) self.semigroups;
+
 }

From 5b0985d05518cc9a8043e00af7c01b663a8bb062 Mon Sep 17 00:00:00 2001
From: Echo Nolan <echo@echonolan.net>
Date: Sat, 17 Mar 2018 13:31:45 -0700
Subject: [PATCH 1328/2266] workrave: fix alert sounds by including the right
 GST plugins

---
 pkgs/applications/misc/workrave/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 7378a8cb476..6e92e98481e 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -2,7 +2,8 @@
 , autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
 , libICE, libSM, libXScrnSaver, libXtst, cheetah
 , gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
-, cairomm , dbus, dbus-glib, gdome2, gstreamer, libsigcxx }:
+, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
+, gst-plugins-good, libsigcxx }:
 
 stdenv.mkDerivation rec {
   name = "workrave-${version}";
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libICE libSM libXScrnSaver libXtst cheetah
     gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
-    dbus dbus-glib gdome2 gstreamer libsigcxx
+    dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
   ];
 
   preConfigure = "./autogen.sh";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18c3625d38d..5c4e9ebd63b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18190,6 +18190,7 @@ with pkgs;
 
   workrave = callPackage ../applications/misc/workrave {
     inherit (python27Packages) cheetah;
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
   };
 
   worldengine-cli = python3Packages.worldengine;

From 6da3ba48a7d22b1d189e081a6327b331fc09d3d1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 22:15:49 +0100
Subject: [PATCH 1329/2266] gargoyle: fix darwin build

/cc ZHF #36454
---
 pkgs/games/gargoyle/darwin.patch | 141 +++++++++++++++++++++++++++++++
 pkgs/games/gargoyle/default.nix  |   5 ++
 2 files changed, 146 insertions(+)

diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch
index cf44dffc897..230f453acad 100644
--- a/pkgs/games/gargoyle/darwin.patch
+++ b/pkgs/games/gargoyle/darwin.patch
@@ -26,6 +26,147 @@ index 1f8829d..d8455eb 100644
  }
  
  SEARCH_SOURCE =
+diff --git a/garglk/fontmac.m b/garglk/fontmac.m
+index d6e1426..72304a3 100644
+--- a/garglk/fontmac.m
++++ b/garglk/fontmac.m
+@@ -167,7 +167,7 @@ static void propfont(char *file, int style)
+     }
+ }
+ 
+-static NSMutableArray<NSURL *> * gli_registered_fonts = nil;
++static NSMutableArray * gli_registered_fonts = nil;
+ static NSDistributedLock * gli_font_lock = nil;
+ 
+ void fontreplace(char *font, int type)
+@@ -181,7 +181,7 @@ void fontreplace(char *font, int type)
+     NSFontDescriptor * fontFamilyDescriptor =
+         [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily];
+ 
+-    NSArray<NSFontDescriptor *> * fontMatches =
++    NSArray * fontMatches =
+         [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil];
+ 
+     for (NSFontDescriptor * sysfont in fontMatches)
+@@ -197,7 +197,7 @@ void fontreplace(char *font, int type)
+ 
+         else if ([sysfont symbolicTraits] & NSFontItalicTrait)
+             style = FONTI;
+-        
++
+         /* find path for font */
+         CFURLRef urlRef = CTFontDescriptorCopyAttribute((CTFontDescriptorRef)sysfont, kCTFontURLAttribute);
+         if (!urlRef)
+@@ -259,7 +259,7 @@ void fontload(void)
+ 
+     // obtain a list of all files in the Fonts directory
+     NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"];
+-    NSArray<NSString *> * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
++    NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
+ 
+     // create a collection to hold the registered font URLs
+     gli_registered_fonts = [NSMutableArray new];
+diff --git a/garglk/launchmac.m b/garglk/launchmac.m
+index 68deca5..9f752ac 100644
+--- a/garglk/launchmac.m
++++ b/garglk/launchmac.m
+@@ -72,14 +72,14 @@ char *winfilters[] =
+            height: (unsigned int) height
+ {
+     [[self openGLContext] makeCurrentContext];
+-    
++
+     /* allocate new texture */
+     glDeleteTextures(1, &output);
+     glGenTextures(1, &output);
+ 
+     /* bind target to texture */
+-    glEnable(GL_TEXTURE_RECTANGLE_ARB);    
+-    glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output);  
++    glEnable(GL_TEXTURE_RECTANGLE_ARB);
++    glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output);
+ 
+     /* set target parameters */
+     glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE);
+@@ -460,7 +460,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
+     if (filter != FILTER_ALL)
+     {
+         NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter]
+-                                                                             encoding: NSUTF8StringEncoding]];        
++                                                                             encoding: NSUTF8StringEncoding]];
+         [openDlg setAllowedFileTypes: filterTypes];
+         [openDlg setAllowsOtherFileTypes: NO];
+     }
+@@ -485,7 +485,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
+     if (filter != FILTER_ALL)
+     {
+         NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter]
+-                                                                             encoding: NSUTF8StringEncoding]];        
++                                                                             encoding: NSUTF8StringEncoding]];
+         [saveDlg setAllowedFileTypes: filterTypes];
+         [saveDlg setAllowsOtherFileTypes: NO];
+     }
+@@ -518,7 +518,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
+                          <GargoyleApp, NSApplicationDelegate, NSWindowDelegate>
+ {
+     BOOL openedFirstGame;
+-    NSMutableDictionary<NSNumber *, GargoyleWindow *> * windows;
++    NSMutableDictionary * windows;
+     NSConnection * link;
+ }
+ - (BOOL) launchFile: (NSString *) file;
+@@ -760,20 +760,20 @@ static BOOL isTextbufferEvent(NSEvent * evt)
+ - (BOOL) launchFileDialog
+ {
+     int result;
+-    
++
+     NSOpenPanel * openDlg = [NSOpenPanel openPanel];
+ 
+     [openDlg setCanChooseFiles: YES];
+     [openDlg setCanChooseDirectories: NO];
+     [openDlg setAllowsMultipleSelection: NO];
+     [openDlg setTitle: [NSString stringWithCString: AppName encoding: NSUTF8StringEncoding]];
+-    
++
+     NSMutableArray *filterTypes = [NSMutableArray arrayWithCapacity:100];
+-    
+-    NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] 
++
++    NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary]
+                                   objectForKey:@"CFBundleDocumentTypes"] objectEnumerator];
+     NSDictionary *docType;
+-    
++
+     while (docType = [docTypeEnum nextObject])
+     {
+         [filterTypes addObjectsFromArray:[docType objectForKey: @"CFBundleTypeExtensions"]];
+diff --git a/garglk/ttsmac.m b/garglk/ttsmac.m
+index 9f6ab0e..de3d6fe 100644
+--- a/garglk/ttsmac.m
++++ b/garglk/ttsmac.m
+@@ -30,7 +30,7 @@
+ #import "sysmac.h"
+ 
+ // a queue of phrases to feed to the speech synthesizer
+-static NSMutableArray<NSString *> * phraseQueue = nil;
++static NSMutableArray * phraseQueue = nil;
+ static NSRange purgeRange;
+ 
+ @interface SpeechDelegate : NSObject <NSSpeechSynthesizerDelegate>
+@@ -96,10 +96,10 @@ void gli_initialize_tts(void)
+             NSString * lang = [NSString stringWithCString: gli_conf_speak_language
+                                                  encoding: NSUTF8StringEncoding];
+ 
+-            NSArray<NSString *> * voices = [NSSpeechSynthesizer availableVoices];
++            NSArray * voices = [NSSpeechSynthesizer availableVoices];
+             for (NSString * voice in voices)
+             {
+-                NSDictionary<NSString *, id> * attr = [NSSpeechSynthesizer attributesForVoice: voice];
++                NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice];
+                 if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]])
+                 {
+                     [synth setVoice: voice];
 diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp
 index 5e193a1..dce46f7 100644
 --- a/tads/tads3/vmtz.cpp
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index 4c5b2827a0e..fc02bdffcad 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation {
 
   patches = [ ./darwin.patch ];
 
+  postPatch = ''
+    substituteInPlace Jamrules \
+        --replace -mmacosx-version-min=10.7 -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET
+  '';
+
   buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
 
   installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + ''

From b57b1d1a2efdef3d60b7fec51722d458c739d698 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 14:55:09 -0700
Subject: [PATCH 1330/2266] cifs-utils: 6.7 -> 6.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/55ryin1a2l4h78wka5k55b223mhsv4ah-cifs-utils-6.8/bin/cifs.upcall -v` and found version 6.8
- ran `/nix/store/55ryin1a2l4h78wka5k55b223mhsv4ah-cifs-utils-6.8/bin/cifs.upcall --version` and found version 6.8
- found 6.8 with grep in /nix/store/55ryin1a2l4h78wka5k55b223mhsv4ah-cifs-utils-6.8
- directory tree listing: https://gist.github.com/97fa73e76891fadb3a329476169aa13c
---
 pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index c2bea009ab7..7b6dd6fba35 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cifs-utils-${version}";
-  version = "6.7";
+  version = "6.8";
 
   src = fetchurl {
     url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
-    sha256 = "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj";
+    sha256 = "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 0724300b5315cb6747fd3144b0f8eecb2f471ef7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 15:26:11 -0700
Subject: [PATCH 1331/2266] datamash: 1.2 -> 1.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/chqcg1al11i9hbk156k4dsn8rnigwiap-datamash-1.3/bin/datamash --help` got 0 exit code
- ran `/nix/store/chqcg1al11i9hbk156k4dsn8rnigwiap-datamash-1.3/bin/datamash --version` and found version 1.3
- ran `/nix/store/chqcg1al11i9hbk156k4dsn8rnigwiap-datamash-1.3/bin/datamash --help` and found version 1.3
- found 1.3 with grep in /nix/store/chqcg1al11i9hbk156k4dsn8rnigwiap-datamash-1.3
- directory tree listing: https://gist.github.com/0a3f8ea7a3daa6dd6ff2888a8298d6f7
---
 pkgs/tools/misc/datamash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 9b9735cbfcd..064fd00cc27 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "datamash-${version}";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchurl {
     url = "mirror://gnu/datamash/${name}.tar.gz";
-    sha256 = "15jrv3ly0vgvwwi2qjmhi39n7wrklwifdk961wwfaxyc5jr6zm78";
+    sha256 = "19jpcv4ryvbz0476d6dgpxpbjkpmih4q84wj06nslls338bm5fzf";
   };
 
   meta = with stdenv.lib; {

From 26db7314c85962ac241944a118033f6e8e5ccf4c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 17 Mar 2018 23:47:38 +0100
Subject: [PATCH 1332/2266] opkg: 0.3.5 -> 0.3.6

---
 pkgs/tools/package-management/opkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index a0368b0df89..440f91a6d64 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -2,11 +2,11 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.5";
+  version = "0.3.6";
   name = "opkg-${version}";
   src = fetchurl {
     url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
-    sha256 = "0ciz6h6sx9hnz463alpkcqwqnq8jk382ifc6z89j29hix8fw4jvk";
+    sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From db2da8097c6a14503e0809a66a13f840f33d1fae Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Sat, 17 Mar 2018 23:56:20 +0100
Subject: [PATCH 1333/2266] maintainers: Add tazjin

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 445fd712298..2128777aed4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3447,6 +3447,11 @@
     github = "tavyc";
     name = "Octavian Cerna";
   };
+  tazjin = {
+    email = "mail@tazj.in";
+    github = "tazjin";
+    name = "Vincent Ambo";
+  };
   teh = {
     email = "tehunger@gmail.com";
     github = "teh";

From e7c1817522b91974ef09a54397e62782d310607e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Sun, 18 Mar 2018 00:13:13 +0100
Subject: [PATCH 1334/2266] kontemplate: 1.3.0 -> 1.4.0

* Update to the latest release version
* Use deps.nix from upstream repository to ensure nixpkgs-built
  kontemplate is functionally equivalent to upstream releases
* extend meta attributes with long-form description
---
 .../cluster/kontemplate/default.nix           | 41 ++++----
 .../networking/cluster/kontemplate/deps.nix   | 93 +++++++++----------
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index aa5f8663331..56cbef7f005 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -1,26 +1,35 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kontemplate-${version}";
-  version = "1.3.0";
-
+  name          = "kontemplate-${version}";
+  version       = "1.4.0";
   goPackagePath = "github.com/tazjin/kontemplate";
+  goDeps        = ./deps.nix;
 
   src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "tazjin";
-    repo = "kontemplate";
-    sha256 = "0g9hs9gwwkng9vbnv07ibhll0kggdprffpmhlbz9nmv81w2z3myi";
+    owner  = "tazjin";
+    repo   = "kontemplate";
+    rev    = "v${version}";
+    sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj";
   };
 
-  goDeps = ./deps.nix;
-
-  meta = with stdenv.lib; {
-    description = "Extremely simple Kubernetes resource templates";
-    homepage = http://kontemplate.works;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ mbode ];
-    platforms = platforms.unix;
+  meta = with lib; {
+    description      = "Extremely simple Kubernetes resource templates";
+    homepage         = "http://kontemplate.works";
+    downloadPage     = "https://github.com/tazjin/kontemplate/releases";
+    license          = licenses.gpl3;
+    maintainers      = with maintainers; [ mbode tazjin ];
+    platforms        = platforms.unix;
     repositories.git = git://github.com/tazjin/kontemplate.git;
+
+    longDescription = ''
+      Kontemplate is a simple CLI tool that can take sets of
+      Kubernetes resource files with placeholders and insert values
+      per environment.
+
+      It can be used as a simple way of deploying the same set of
+      resources to different Kubernetes contexts with context-specific
+      configuration.
+    '';
   };
 }
diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix
index 1d6dfb3e64f..db2692a79e7 100644
--- a/pkgs/applications/networking/cluster/kontemplate/deps.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix
@@ -3,118 +3,109 @@
   {
     goPackagePath = "github.com/Masterminds/semver";
     fetch = {
-      type = "git";
-      url = "https://github.com/Masterminds/semver";
-      rev = "15d8430ab86497c5c0da827b748823945e1cf1e1";
-      sha256 = "0q5w6mjr1zws04z7x1ax1hp1zxdc4mbm9zsikgd6fv0c9ndnjr3q";
+      type   = "git";
+      url    = "https://github.com/Masterminds/semver";
+      rev    = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd";
+      sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6";
     };
   }
   {
     goPackagePath = "github.com/Masterminds/sprig";
     fetch = {
-      type = "git";
-      url = "https://github.com/Masterminds/sprig";
-      rev = "b217b9c388de2cacde4354c536e520c52c055563";
-      sha256 = "1f41v3c8c7zagc4qjhcb6nwkvi8nzvf70f89a7ss2m6krkxz0m2a";
+      type   = "git";
+      url    = "https://github.com/Masterminds/sprig";
+      rev    = "e039e20e500c2c025d9145be375e27cf42a94174";
+      sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m";
     };
   }
   {
     goPackagePath = "github.com/alecthomas/template";
     fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/template";
-      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      type   = "git";
+      url    = "https://github.com/alecthomas/template";
+      rev    = "a0175ee3bccc567396460bf5acd36800cb10c49c";
       sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
     };
   }
   {
     goPackagePath = "github.com/alecthomas/units";
     fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/units";
-      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      type   = "git";
+      url    = "https://github.com/alecthomas/units";
+      rev    = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
       sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
     };
   }
   {
     goPackagePath = "github.com/aokoli/goutils";
     fetch = {
-      type = "git";
-      url = "https://github.com/aokoli/goutils";
-      rev = "3391d3790d23d03408670993e957e8f408993c34";
+      type   = "git";
+      url    = "https://github.com/aokoli/goutils";
+      rev    = "3391d3790d23d03408670993e957e8f408993c34";
       sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
     };
   }
   {
     goPackagePath = "github.com/ghodss/yaml";
     fetch = {
-      type = "git";
-      url = "https://github.com/ghodss/yaml";
-      rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+      type   = "git";
+      url    = "https://github.com/ghodss/yaml";
+      rev    = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
       sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
     };
   }
   {
     goPackagePath = "github.com/huandu/xstrings";
     fetch = {
-      type = "git";
-      url = "https://github.com/huandu/xstrings";
-      rev = "37469d0c81a7910b49d64a0d308ded4823e90937";
-      sha256 = "18c2b4h7phdm71mn66x8bsmghjr1b2lpg07zcbgmab37y36bjl20";
+      type   = "git";
+      url    = "https://github.com/huandu/xstrings";
+      rev    = "3959339b333561bf62a38b424fd41517c2c90f40";
+      sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1";
     };
   }
   {
     goPackagePath = "github.com/imdario/mergo";
     fetch = {
-      type = "git";
-      url = "https://github.com/imdario/mergo";
-      rev = "7fe0c75c13abdee74b09fcacef5ea1c6bba6a874";
-      sha256 = "1hclh5kpg25s2llpk7j7sm3vf66xci5jchn8wzdcr5fj372ghsbd";
-    };
-  }
-  {
-    goPackagePath = "github.com/polydawn/meep";
-    fetch = {
-      type = "git";
-      url = "https://github.com/polydawn/meep";
-      rev = "eaf1db2168fe380b4da17a35f0adddb5ae15a651";
-      sha256 = "12n134fb2imnj67xkbznzm0gqkg36hdxwr960y91qb5s2q2krxir";
+      type   = "git";
+      url    = "https://github.com/imdario/mergo";
+      rev    = "d806ba8c21777d504a2090a2ca4913c750dd3a33";
+      sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3";
     };
   }
   {
     goPackagePath = "github.com/satori/go.uuid";
     fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
+      type   = "git";
+      url    = "https://github.com/satori/go.uuid";
+      rev    = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
       sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
     };
   }
   {
     goPackagePath = "golang.org/x/crypto";
     fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
-      sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
+      type   = "git";
+      url    = "https://go.googlesource.com/crypto";
+      rev    = "ab89591268e0c8b748cbe4047b00197516011af5";
+      sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr";
     };
   }
   {
     goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
     fetch = {
-      type = "git";
-      url = "https://gopkg.in/alecthomas/kingpin.v2";
-      rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
+      type   = "git";
+      url    = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev    = "1087e65c9441605df944fb12c33f0fe7072d18ca";
       sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
     };
   }
   {
     goPackagePath = "gopkg.in/yaml.v2";
     fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5";
-      sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831";
+      type   = "git";
+      url    = "https://gopkg.in/yaml.v2";
+      rev    = "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
+      sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
     };
   }
 ]

From 8ccd09879b8ce0ffddede2809fd686443e828107 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 16:16:13 -0700
Subject: [PATCH 1335/2266] eigen: 3.3.3 -> 3.3.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.4 with grep in /nix/store/q5xnlq781hvj0skjlhnb1qw1k69pf048-eigen-3.3.4
- directory tree listing: https://gist.github.com/d83ce54c91cb6ecf3fd3eb94b666357f
---
 pkgs/development/libraries/eigen/3.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index 94652b12934..5d13fb09dcc 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.3.3";
+  version = "3.3.4";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "0pz7k8kd9nydmsj2prjs67apixipl6pll3f0cjy0y3bvlazqr1wl";
+    sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
   };
   
   nativeBuildInputs = [ cmake ];

From d6aff3d65b6cb966b026fe072f3a7127e82466a4 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 18 Mar 2018 00:45:53 +0100
Subject: [PATCH 1336/2266] gosmore: fix build with gcc7

---
 pkgs/applications/misc/gosmore/default.nix            |  3 +++
 .../misc/gosmore/pointer_int_comparison.patch         | 11 +++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/misc/gosmore/pointer_int_comparison.patch

diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 8936d3f222f..464e0ba5334 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation {
   prePatch = ''
     sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
   '';
+
+  patches = [ ./pointer_int_comparison.patch ];
+  patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
       
   meta = with stdenv.lib; {
     description = "Open Street Map viewer";
diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
new file mode 100644
index 00000000000..4a715b6d859
--- /dev/null
+++ b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
@@ -0,0 +1,11 @@
+--- blah_/jni/gosmore.cpp	1970-01-01 01:00:01.000000000 +0100
++++ /dev/stdin	2018-03-18 00:21:08.474217132 +0100
+@@ -1273,7 +1273,7 @@
+       if (deg[i] < -180 || deg[i] > 180) break;
+       if (i == 0 && (strncasecmp (t, "lat", 3) == 0 ||
+                      strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2
+-        for (t += 3; t != '\0' && !isalnum (*t); t++) {}
++        for (t += 3; *t != '\0' && !isalnum (*t); t++) {}
+       }
+       if (i == 1) { // Success !
+         //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1],

From ef83f9ed3950c57d8ef99387a960112814e85852 Mon Sep 17 00:00:00 2001
From: Thorsten Weber <cpt.chaos83@googlemail.com>
Date: Sun, 18 Mar 2018 00:52:46 +0100
Subject: [PATCH 1337/2266] slic3r-prusa3d: 1.38.7 -> 1.39.1

---
 pkgs/applications/misc/slic3r-prusa3d/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix
index 88cb42e3f5c..3a55ea6205e 100644
--- a/pkgs/applications/misc/slic3r-prusa3d/default.nix
+++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix
@@ -33,7 +33,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.38.7";
+  version = "1.39.1";
 
   enableParallelBuilding = true;
 
@@ -70,6 +70,10 @@ stdenv.mkDerivation rec {
     XMLSAX
   ]);
 
+  prePatch = ''
+    sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
+  '';
+
   postInstall = ''
     echo 'postInstall'
     wrapProgram "$out/bin/slic3r-prusa3d" \
@@ -84,7 +88,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "1nrryd2bxmk4y59bq5fp7n2alyvc5a9xvnbx5j4fg4mqr91ccs5c";
+    sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff";
     rev = "version_${version}";
   };
 

From 34682ddc4976178f8c6f681b54a96e9753fcc730 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 17:22:14 -0700
Subject: [PATCH 1338/2266] exempi: 2.4.4 -> 2.4.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.5 with grep in /nix/store/l4nmjlanshgdwrh95g1h0714zcm1kk3z-exempi-2.4.5
- directory tree listing: https://gist.github.com/2d437e9ea408cfda7abaa772865a0b82
---
 pkgs/development/libraries/exempi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 96f4af3226b..1f58fd698da 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "exempi-2.4.4";
+  name = "exempi-2.4.5";
 
   src = fetchurl {
     url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
-    sha256 = "1c1xxiw9lazdaz4zvrnvcy9pif9l1wib7zy91m48i7a4bnf9mmd2";
+    sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
   };
 
   configureFlags = [

From 30d208ed5e5d1231426ca231d82a5151c9e6d005 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 17 Mar 2018 21:50:02 -0400
Subject: [PATCH 1339/2266] mcron: Fix missing libtool dependency

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

diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index 5863504c704..dbc679eb8ad 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, which, ed }:
+{ fetchurl, stdenv, guile, which, ed, libtool }:
 
 stdenv.mkDerivation rec {
   name = "mcron-1.0.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     substituteInPlace makefile.in --replace "rwxs" "rwx"
   '';
 
-  buildInputs = [ guile which ed ];
+  buildInputs = [ guile which ed libtool ];
 
   doCheck = true;
 

From 8b097fc7f66a657467e566ea1c1ff94f66c5b03a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 17 Mar 2018 21:57:44 -0400
Subject: [PATCH 1340/2266] release-small.nix: Fix evaluation error

---
 pkgs/top-level/release-small.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index e2acc8f0ac2..7f574574d8d 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -109,7 +109,8 @@ with import ./release-lib.nix { inherit supportedSystems; };
   mpg321 = linux;
   mutt = linux;
   mysql = linux;
-  netcat = all;
+  # netcat broken on darwin
+  netcat = linux;
   nfs-utils = linux;
   nix = all;
   nixUnstable = all;

From 1b129b0b542d4834fea35a78c85ccd1da2b2d4f5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Mar 2018 10:52:59 +0800
Subject: [PATCH 1341/2266] pythonPackages.pushover: init at 0.3

---
 .../python-modules/pushover/default.nix       | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pushover/default.nix

diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
new file mode 100644
index 00000000000..11596716a66
--- /dev/null
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests }:
+
+buildPythonPackage rec {
+  pname = "python-pushover";
+  version = "0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xlghiqd9rsgn7jdhc8v1xh3xspssihrw1vyy85gvjzxa1ah19sk";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # checks crash
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Bindings and command line utility for the Pushover notification service";
+    homepage = https://github.com/Thibauth/python-pushover;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5ca8609858..a61ea798150 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12409,7 +12409,6 @@ in {
 
   py = callPackage ../development/python-modules/py { };
 
-
   pyacoustid = buildPythonPackage rec {
     name = "pyacoustid-1.1.0";
 
@@ -12519,6 +12518,8 @@ in {
     };
   };
 
+  python-pushover = callPackage ../development/python-modules/pushover {};
+
   mongodict = buildPythonPackage rec {
     name = "mongodict-${version}";
     version = "0.3.1";

From e1080b0d4320b1e601bbcad2e0b02d666f0702a7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Mar 2018 10:53:11 +0800
Subject: [PATCH 1342/2266] home-assistant: support pushover

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 5791aac0278..e2fc90a2296 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -234,7 +234,7 @@
     "notify.message_bird" = ps: with ps; [  ];
     "notify.pushbullet" = ps: with ps; [ pushbullet ];
     "notify.pushetta" = ps: with ps; [  ];
-    "notify.pushover" = ps: with ps; [  ];
+    "notify.pushover" = ps: with ps; [ python-pushover ];
     "notify.rocketchat" = ps: with ps; [  ];
     "notify.sendgrid" = ps: with ps; [  ];
     "notify.simplepush" = ps: with ps; [  ];

From 8b1fba582a3bff1459b2a15acfedd5056ba98b35 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 18 Mar 2018 01:14:24 -0400
Subject: [PATCH 1343/2266] pyslurm: 20171102 -> 20170302 to fix after slurm
 bump

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

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 41b42bb63ec..74ff0be3833 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,14 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "20171102";
-  name = pname + "-" + version;
+  version = "20170302";
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "a2acbc820da419e308c5817998d2abe78a7b75e6";
-    sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as";
+    rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff";
+    sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx";
   };
 
   buildInputs = [ cython slurm ];

From 241160aacc8433de07b5d71be98e3c3b677c0533 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sat, 17 Mar 2018 22:16:26 -0700
Subject: [PATCH 1344/2266] jenkins: Include Deja-Vu fonts in system
 environment to silence jenkins warning.

---
 .../services/continuous-integration/jenkins/default.nix      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 54047a50caa..84e3fec5c40 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -145,6 +145,11 @@ in {
   };
 
   config = mkIf cfg.enable {
+    # server references the dejavu fonts
+    environment.systemPackages = [
+      pkgs.dejavu_fonts
+    ];
+
     users.extraGroups = optional (cfg.group == "jenkins") {
       name = "jenkins";
       gid = config.ids.gids.jenkins;

From 124d47c65adc242374931c290708ff69b1290c67 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 18 Mar 2018 00:16:43 -0500
Subject: [PATCH 1345/2266] meta: fix fallout from #36275

---
 .github/CODEOWNERS                         | 1 -
 doc/meta.xml                               | 2 +-
 maintainers/scripts/hydra-eval-failures.py | 2 +-
 maintainers/scripts/update.nix             | 2 +-
 maintainers/scripts/vanity.sh              | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bac601fbf82..dde31a2c0c0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -83,7 +83,6 @@
 /pkgs/applications/editors/eclipse @rycee
 
 # https://github.com/NixOS/nixpkgs/issues/31401
-/lib/maintainers.nix @ghost
 /lib/licenses.nix @ghost
 
 # Qt / KDE
diff --git a/doc/meta.xml b/doc/meta.xml
index 35632599186..5dbe810810d 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -174,7 +174,7 @@ meta-attributes</title>
     maintainers of this Nix expression. If
     you would like to be a maintainer of a package, you may want to add
     yourself to <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link>
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>
     and write something like <literal>[ stdenv.lib.maintainers.alice
     stdenv.lib.maintainers.bob ]</literal>.</para></listitem>
   </varlistentry>
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index ddc3c7c4a96..d0bd1913ba8 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -13,7 +13,7 @@ from pyquery import PyQuery as pq
 
 
 maintainers_json = subprocess.check_output([
-    'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json'
+    'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
 ])
 maintainers = json.loads(maintainers_json)
 MAINTAINERS = {v: k for k, v in maintainers.iteritems()}
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index c637540a5aa..8d1e47c6bc9 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -45,7 +45,7 @@ let
     let
       maintainer =
         if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
-          builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`."
+          builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
         else
           builtins.getAttr maintainer' pkgs.lib.maintainers;
     in
diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh
index 27e7741799f..aa7d4ec967d 100755
--- a/maintainers/scripts/vanity.sh
+++ b/maintainers/scripts/vanity.sh
@@ -10,7 +10,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' |
 
 # Name - nick - email correspondence from log and from maintainer list
 # Also there are a few manual entries
-maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" |
+maintainers="$(cat "$(dirname "$0")/../maintainer-list.nix" |
   grep '=' | sed -re 's/\\"/''/g;
   s/[ 	]*([^ 	=]*)[ 	]*=[ 	]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
 git_lines="$( ( echo "$git_data";

From 28a55f5bd60c5f21139de58ee01eb90e25b20b9d Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sat, 17 Mar 2018 22:16:59 -0700
Subject: [PATCH 1346/2266] jenkins: Add "java.awt.headless=true" to JDK
 options.

This is consistent with the recommended jenkins startup script. See:

* https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
---
 .../modules/services/continuous-integration/jenkins/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 84e3fec5c40..c2f4e9c0c5a 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -205,10 +205,12 @@ in {
           ${replacePlugins}
         '';
 
+      # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
       script = ''
         ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
+                                                  -Djava.awt.headless=true \
                                                   ${concatStringsSep " " cfg.extraOptions}
       '';
 

From 691fe19db9515ee20f3ae98766312b9653312f9e Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sun, 11 Mar 2018 15:42:07 +0400
Subject: [PATCH 1347/2266] lkl: 2017-11-10 -> 2018-03-10

Bump lkl version to latest that includes merge of Linux 4.15 and fix for
an issue where cptofs wasn't returning failure when image size was too
small and file copying failed with:

  error writing file: No space left on device

(see lkl/linux#427)
---
 pkgs/applications/virtualization/lkl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index cd72142e979..8d5ecfce9fd 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "lkl-2017-11-10";
-  rev  = "52a6a643c7d1dd3031c0cbec75e1ac7a999f3d57";
+  name = "lkl-2018-03-10";
+  rev  = "8772a4da6064444c5b70766b806fe272b0287c31";
 
   outputs = [ "dev" "lib" "out" ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner  = "lkl";
     repo   = "linux";
-    sha256 = "1i5ywrfxqpykjjalwh9g4rwd4s186cqk3j806d327a67xb2ivxnp";
+    sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh";
   };
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
     sed -i $out/bin/lkl-hijack.sh \
         -e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib,"
 
-    cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
+    cp tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin
+    ln -s cptofs $out/bin/cpfromfs
     cp -r tools/lkl/include $dev/
     cp tools/lkl/liblkl*.{a,so} $lib/lib
   '';

From 3315a549bf2a455cfa4f538e80ade604110f26cf Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Sun, 18 Mar 2018 13:43:58 +0700
Subject: [PATCH 1348/2266] xml2rfc: init at 2.9.6

---
 pkgs/tools/typesetting/xml2rfc/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/typesetting/xml2rfc/default.nix

diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix
new file mode 100644
index 00000000000..d1f01ccd867
--- /dev/null
+++ b/pkgs/tools/typesetting/xml2rfc/default.nix
@@ -0,0 +1,24 @@
+{ python, stdenv }:
+
+with python.pkgs;
+
+buildPythonPackage rec {
+  pname = "xml2rfc";
+  version = "2.9.6";
+
+  buildInputs = [ intervaltree lxml requests pyflakes ];
+  propagatedBuildInputs = [ intervaltree lxml requests six ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wr161lx6f1b3fq14ddr3y4jl0myrcmqs1s3fzsighvlmqfdihj7";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://xml2rfc.tools.ietf.org/";
+    license = licenses.bsdOriginal;
+    description = "Xml2rfc generates RFCs and IETF drafts from document source in XML according to the dtd in RFC2629.";
+    maintainers = [ maintainers.yrashk ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..c33bf04689b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20980,4 +20980,6 @@ with pkgs;
   simplehttp2server = callPackage ../servers/simplehttp2server { };
 
   diceware = callPackage ../tools/security/diceware { };
+
+  xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
 }

From d5de7bbc920560331bd1ba951a182c2dbe0e8462 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sun, 18 Mar 2018 09:00:35 +0100
Subject: [PATCH 1349/2266] nixos manual: fix (n)of typo

---
 nixos/doc/manual/development/option-types.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index ec940d5d2b8..13fa8d1e114 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -282,8 +282,8 @@ options.mod = mkOption {
     option set (<xref linkend='ex-submodule-listof-definition' />).</para>
     
 
-<example xml:id='ex-submodule-listof-declaration'><title>Declaration of a list 
-    nof submodules</title>
+<example xml:id='ex-submodule-listof-declaration'><title>Declaration of a list
+    of submodules</title>
 <screen>
 options.mod = mkOption {
   description = "submodule example";

From 6cd68c2ad9a5e0820b03e4c81c0c1c7dbd2ef789 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 12:06:19 -0700
Subject: [PATCH 1350/2266] autofs: 5.1.3 -> 5.1.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount -h` got 0 exit code
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount --help` got 0 exit code
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount -V` and found version 5.1.4
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount --version` and found version 5.1.4
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount -h` and found version 5.1.4
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount --help` and found version 5.1.4
- found 5.1.4 with grep in /nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4
- directory tree listing: https://gist.github.com/419a24d78045772aea1e7ca68b950f1f
---
 pkgs/os-specific/linux/autofs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 8c207e4a47d..79e12dd0f43 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -2,14 +2,14 @@
 , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
-  version = "5.1.3";
+  version = "5.1.4";
   name = "autofs-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
-    sha256 = "1gxifa93104pxlmxrikhwciy5zdgk20m63siyhq1myym7vzfnvp9";
+    sha256 = "08hpphawzcdibwbhw0r3y7hnfczlazpp90sf3bz2imgza7p31klg";
   };
 
   preConfigure = ''

From d5c077b109c4a609d078f3a444b5bd32b6c2d755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 17 Mar 2018 23:17:08 +0000
Subject: [PATCH 1351/2266] telegraf: 1.5.1 -> 1.5.3

---
 pkgs/servers/monitoring/telegraf/default.nix                    | 2 +-
 .../monitoring/telegraf/{deps-1.5.1.nix => deps-1.5.3.nix}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.5.1.nix => deps-1.5.3.nix} (100%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 65a95c021c4..e06aaa9faa4 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.5.1";
+  version = "1.5.3";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
similarity index 100%
rename from pkgs/servers/monitoring/telegraf/deps-1.5.1.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.5.3.nix

From 2d8a8080eb058f0966caf9120ffbcadb086be8fc Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 14 Mar 2018 10:22:49 -0400
Subject: [PATCH 1352/2266] perlPackages.ConfigIniFiles: init at 2.94

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5f3e725c0ad..f4e5c28d8c7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2349,6 +2349,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ConfigIniFiles = buildPerlPackage rec {
+    name = "Config-IniFiles-2.94";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "d6d38a416da79de874c5f1825221f22e972ad500b6527d190cc6e9ebc45194b4";
+    };
+    buildInputs = [ ModuleBuild perl ];
+    propagatedBuildInputs = [ IOstringy ];
+    meta = {
+      description = "A module for reading .ini-style configuration files";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   ConfigMerge = buildPerlPackage {
     name = "Config-Merge-1.04";
     src = fetchurl {

From 9495c9218c777d001fcc35da1325a1e048e5ec49 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Mon, 12 Mar 2018 08:23:49 -0400
Subject: [PATCH 1353/2266] perlPackages.PkgConfig: init at 0.19026

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f4e5c28d8c7..dacfeb97644 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11290,6 +11290,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PkgConfig = buildPerlPackage rec {
+    name = "PkgConfig-0.19026";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
+      sha256 = "5cb6e934d29dd93e04c2fa779f4b7e51361edaf56957b47a232017a4bb7e922c";
+    };
+    meta = {
+      homepage = https://metacpan.org/pod/PkgConfig;
+      description = "Pure-Perl Core-Only replacement for pkg-config";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   Plack = buildPerlPackage rec {
     name = "Plack-1.0039";
     src = fetchurl {

From 3336a7b8acb5bca93912d6f602278c10e4fb6623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Mar 2018 09:02:55 +0000
Subject: [PATCH 1354/2266] python.pkgs.pushover: there are no tests

---
 pkgs/development/python-modules/pushover/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
index 11596716a66..e9c5d938101 100644
--- a/pkgs/development/python-modules/pushover/default.nix
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  # checks crash
+  # there are no tests
   doCheck = false;
 
   meta = with stdenv.lib; {

From fa76c9a38554731933d53a41e741266f43f617d0 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 18 Mar 2018 10:11:02 +0100
Subject: [PATCH 1355/2266] gitea: fix usage over ssh

Using gitea over ssh had two isses:
 1. No shell was set for the user
 2. Gitea tried to write logs to
 /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
 serving the ssh usage.
---
 nixos/modules/services/misc/gitea.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 458d0087dbd..63e976ae566 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -40,6 +40,10 @@ let
     SECRET_KEY = #secretkey#
     INSTALL_LOCK = true
 
+    [log]
+    ROOT_PATH = ${cfg.log.rootPath}
+    LEVEL = ${cfg.log.level}
+
     ${cfg.extraConfig}
   '';
 in
@@ -65,6 +69,19 @@ in
         description = "gitea data directory.";
       };
 
+      log = {
+        rootPath = mkOption {
+          default = "${cfg.stateDir}/log";
+          type = types.str;
+          description = "Root path for log files.";
+        };
+        level = mkOption {
+          default = "Trace";
+          type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ];
+          description = "General log level.";
+        };
+      };
+
       user = mkOption {
         type = types.str;
         default = "gitea";
@@ -287,6 +304,7 @@ in
         description = "Gitea Service";
         home = cfg.stateDir;
         createHome = true;
+        useDefaultShell = true;
       };
     };
 

From 488ef9a7a09378047289db2285c59239349a2c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 Mar 2018 10:17:57 +0100
Subject: [PATCH 1356/2266] SDL: avoid cryptic error from /bin/sh impurity

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 534f31ad1f4..5e1c527eb8b 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation rec {
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
+  # make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'.  Stop.
+  postPatch = "patchShebangs ./configure";
+
   outputs = [ "out" "dev" ];
   outputBin = "dev"; # sdl-config
 

From 66d2ec52e7341b03b0cec21b6eafa6a4c74dcb4e Mon Sep 17 00:00:00 2001
From: Vasyl Solovei <svsdep@gmail.com>
Date: Sun, 18 Mar 2018 10:57:37 +0200
Subject: [PATCH 1357/2266] gnomeExtensions.timepp: init at 2018.03.17

---
 .../gnome-3/extensions/timepp/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/extensions/timepp/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
new file mode 100644
index 00000000000..dcc018d1883
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extension-timepp-${version}";
+  version = "2018.03.17";
+
+  src = fetchFromGitHub {
+    owner = "zagortenay333";
+    repo = "timepp__gnome";
+    rev = "440cf85dc68d9e6ba876793f13910ee6239622cf";
+    sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v";
+  };
+
+  uuid = "timepp@zagortenay333";
+  installPhase = ''
+    mkdir -p $out/share/gnome-shell/extensions/${uuid}
+    cp -r . $out/share/gnome-shell/extensions/${uuid}
+  '';
+
+  meta = with stdenv.lib; {
+    description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension.";
+    homepage = https://github.com/zagortenay333/timepp__gnome;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ svsdep ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..e997abc2c3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19355,6 +19355,7 @@ with pkgs;
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
     remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
     taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { };
+    timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
   };
 

From bbe8c1e593b05e5ce0f75c59c92e9f5adc707556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 Mar 2018 10:19:18 +0100
Subject: [PATCH 1358/2266] tremor: rename according to our docs

https://nixos.org/nixpkgs/manual/#sec-package-naming
I forgot to include this commit in the parent merge.
---
 pkgs/development/libraries/tremor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index 6c6d144f994..5609f1d67d1 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
 
 stdenv.mkDerivation rec {
-  name = "tremor-git-${src.rev}";
+  name = "tremor-unstable-2018-03-16";
 
   src = fetchgit {
     url = https://git.xiph.org/tremor.git;

From 23e6689578d8d4dbc498d70874546512df7c656c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 15 Mar 2018 22:34:10 +0100
Subject: [PATCH 1359/2266] pythonPackages.thumbor: 6.3.2 -> 6.4.2; fix build

Origianlly the package was broken as bumping `pythonPackages.pillow` to
5.x broke `thumbor`. The latest upstream version `6.4.2` solved this
issue, so a simple package bump was sufficient.

Furthermore the following changes were made:

- moved the expression into its own file
- added myself as maintainer in case of any further breackage
- re-enabled python3 build: 6.4.2 is fine with python3, however the
  `futures` dependency can't be satisfied anymore as it's part of
  Python3. Therefore a patch for `setup.py` will be applied for Python3
  buildsto drop the dependency

Note: the testsuite is disabled for now as several impure tests are done
and our testing environment seems to be unable to work the with the
natively compiled python modules properly.

Therefore I tested the module using the following expression:

``` nix
with import ./. {};

stdenv.mkDerivation {
  name = "thumbor-test";
  src = null;
  buildInputs = [ python pythonPackages.thumbor ];
}
```

Inside this nix shell `thumbor` works fine and the native modules can be
imported.

See https://hydra.nixos.org/build/71062729/log
See ticket #36453
---
 .../python-modules/thumbor/default.nix        | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 46 +---------------
 2 files changed, 55 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/development/python-modules/thumbor/default.nix

diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
new file mode 100644
index 00000000000..21b391b8e75
--- /dev/null
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -0,0 +1,54 @@
+{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
+, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
+, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib
+}:
+
+buildPythonPackage rec {
+  pname = "thumbor";
+  version = "6.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
+      sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace "setup.py" \
+      --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
+  '';
+
+  propagatedBuildInputs = [
+    tornado
+    pycrypto
+    pycurl
+    pytz
+    pillow
+    derpconf
+    python_magic
+    pexif
+    libthumbor
+    opencv
+    webcolors
+    piexif
+    statsd
+  ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ];
+
+  # disabled due to too many impure tests and issues with native modules in
+  # the pure testing environment. See https://github.com/NixOS/nixpkgs/pull/37147
+  # for further reference.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A smart imaging service";
+    homepage = https://github.com/thumbor/thumbor/wiki;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a61ea798150..b92f3c8e83e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19011,51 +19011,7 @@ EOF
   };
 
 
-  thumbor = buildPythonPackage rec {
-    name = "thumbor-${version}";
-    version = "6.3.2";
-
-    disabled = ! isPy27;
-
-    buildInputs = with self; [ statsd nose ];
-
-    propagatedBuildInputs = with self; [
-      tornado
-      pycrypto
-      pycurl
-      pytz
-      pillow
-      derpconf
-      python_magic
-      # thumborPexif
-      pexif
-      libthumbor
-      opencv
-    ] ++ optionals (!isPy3k) [ futures ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/thumbor/${name}.tar.gz";
-      sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31";
-    };
-
-    patches = [
-      (pkgs.fetchurl {
-          url = "https://github.com/thumbor/thumbor/commit/376f688a8a0b82e50388c885d9d733572f2eb3e6.patch";
-          sha256 = "1j2434yqb6pz61d65dsy8w6lvyzvh5ksizadi5hgjzfw6s46v6yn";
-      })
-    ];
-
-    prePatch = ''
-      substituteInPlace setup.py \
-        --replace '"argparse",' ""
-    '';
-
-    meta = {
-      description = "A smart imaging service";
-      homepage = https://github.com/globocom/thumbor/wiki;
-      license = licenses.mit;
-    };
-  };
+  thumbor = callPackage ../development/python-modules/thumbor { };
 
   thumborPexif = self.buildPythonPackage rec {
     name = "thumbor-pexif-0.14";

From c99a2da0bfbd058676e97b77e188d6fdfb724393 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Sat, 17 Mar 2018 10:38:05 +0700
Subject: [PATCH 1360/2266] mmark: init at 1.3.6

---
 pkgs/tools/typesetting/mmark/default.nix | 26 ++++++++++++++++++++++++
 pkgs/tools/typesetting/mmark/deps.nix    | 12 +++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/typesetting/mmark/default.nix
 create mode 100644 pkgs/tools/typesetting/mmark/deps.nix

diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix
new file mode 100644
index 00000000000..2b7a6f3ffb4
--- /dev/null
+++ b/pkgs/tools/typesetting/mmark/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "mmark-${version}";
+  version = "1.3.6";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/miekg/mmark";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "miekg";
+    repo = "mmark";
+    sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "A powerful markdown processor in Go geared towards the IETF";
+    homepage = https://github.com/miekg/mmark;
+    license = with stdenv.lib.licenses; bsd2;
+    maintainers = with stdenv.lib.maintainers; [ yrashk ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/typesetting/mmark/deps.nix b/pkgs/tools/typesetting/mmark/deps.nix
new file mode 100644
index 00000000000..47f964c6a47
--- /dev/null
+++ b/pkgs/tools/typesetting/mmark/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc10a3903e5..68a30546799 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20993,4 +20993,6 @@ with pkgs;
   diceware = callPackage ../tools/security/diceware { };
 
   xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
+
+  mmark = callPackage ../tools/typesetting/mmark { };
 }

From c3535901c3b64e244604be89b144a0e3330525f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Mar 2018 10:05:24 +0000
Subject: [PATCH 1361/2266] python.pkgs.pushover: tests exists, but require
 network

---
 pkgs/development/python-modules/pushover/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
index e9c5d938101..f5d1a9568c3 100644
--- a/pkgs/development/python-modules/pushover/default.nix
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
-  # there are no tests
+  # tests require network
   doCheck = false;
 
   meta = with stdenv.lib; {

From 10be0615c838ac4dc452b14eddde1435be9010a2 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 18 Mar 2018 10:30:13 +0000
Subject: [PATCH 1362/2266] xnbd: do not build html docs

---
 pkgs/tools/networking/xnbd/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix
index 40351fbd130..e898904c6d4 100644
--- a/pkgs/tools/networking/xnbd/default.nix
+++ b/pkgs/tools/networking/xnbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson, asciidoc, libxml2, libxslt, docbook_xml_dtd_45 }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }:
 
 stdenv.mkDerivation rec {
   name = "xnbd-0.4.0";
@@ -12,7 +12,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ glib jansson asciidoc libxml2 libxslt docbook_xml_dtd_45 ];
+  buildInputs = [ glib jansson ];
+
+  # do not build docs, it is slow and it fails on Hydra
+  prePatch = ''
+    rm -rf doc
+    substituteInPlace configure.ac --replace "doc/Makefile" ""
+    substituteInPlace Makefile.am --replace "lib doc ." "lib ."
+  '';
 
   meta = {
     homepage = https://bitbucket.org/hirofuchi/xnbd;

From 84f3c068dfe61f6356b9550be4d2274ad1725e76 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 02:19:27 -0500
Subject: [PATCH 1363/2266] languagetool: 3.9 -> 4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/q7ycrljxhd7pbkgvbhsh8fz4496x798n-LanguageTool-4.0/bin/languagetool-commandline --version` and found version 4.0
- found 4.0 with grep in /nix/store/q7ycrljxhd7pbkgvbhsh8fz4496x798n-LanguageTool-4.0
---
 pkgs/tools/text/languagetool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 6fcfd6fff85..2d18edeb44d 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "LanguageTool-${version}";
-  version = "3.9";
+  version = "4.0";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${name}.zip";
-    sha256 = "0hqb4hbl7iryw1xk8q1i606azzgzdr17sy6xfr1zpas4r2pnvhfq";
+    sha256 = "0nfqn04fb5kvxvpsc6xbgj03rmqcsn8vy2xj0zazijhvbxaf0zfb";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];

From bd3280fbae09151db9368b8e11e4b4400ec13804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 11:46:37 +0100
Subject: [PATCH 1364/2266] pythonPackages.python-ctags3: init at 1.2.4

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

diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix
new file mode 100644
index 00000000000..ba29154df3a
--- /dev/null
+++ b/pkgs/development/python-modules/python-ctags3/default.nix
@@ -0,0 +1,17 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "python-ctags3";
+  version = "1.2.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e";
+  };
+
+  meta = with lib; {
+    description = "Ctags indexing python bindings";
+    homepage = https://github.com/jonashaag/python-ctags3;
+    license = licenses.lgpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 571d864e7e6..6ee0aa377f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6107,6 +6107,8 @@ in {
     };
   };
 
+  python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
+
   junos-eznc = callPackage ../development/python-modules/junos-eznc {};
 
   raven = callPackage ../development/python-modules/raven { };

From c0866e19907b22de09eb85a59cb5affefc6f1d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Sun, 18 Mar 2018 11:42:07 +0100
Subject: [PATCH 1365/2266] calaos_installer: init at 3.1

---
 pkgs/misc/calaos/installer/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/misc/calaos/installer/default.nix

diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
new file mode 100644
index 00000000000..36c8825d27a
--- /dev/null
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }:
+
+stdenv.mkDerivation rec {
+  name = "calaos_installer-3.1";
+  version = "3.1";
+
+  src = fetchFromGitHub {
+    owner = "calaos";
+    repo = "calaos_installer";
+    rev = "v${version}";
+    sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd";
+  };
+
+  nativeBuildInputs = [ qmake qttools ];
+  buildInputs = [ qtbase ];
+
+  qmakeFlags = [ "REVISION=${version}" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a calaos_installer $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Calaos Installer, a tool to create calaos configuration";
+    homepage = https://www.calaos.fr/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ tiramiseb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc10a3903e5..ec889fe8b7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20112,6 +20112,8 @@ with pkgs;
 
   brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {};
 
+  calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {};
+
   cups = callPackage ../misc/cups {
     libusb = libusb1;
   };

From 19797d84642958122f911f1243bca15e5caf0c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 12:25:09 +0100
Subject: [PATCH 1366/2266] klaus: move out of pythonPackages and 0.9.1 ->
 1.2.2

---
 pkgs/servers/web-apps/klaus/default.nix | 40 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 pkgs/top-level/python-packages.nix      | 21 -------------
 3 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/servers/web-apps/klaus/default.nix

diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/servers/web-apps/klaus/default.nix
new file mode 100644
index 00000000000..bb953ecc03a
--- /dev/null
+++ b/pkgs/servers/web-apps/klaus/default.nix
@@ -0,0 +1,40 @@
+{ lib, python, fetchFromGitHub }:
+
+python.pkgs.buildPythonApplication rec {
+  pname = "klaus";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "jonashaag";
+    repo = pname;
+    rev = version;
+    sha256 = "0hkl1ycyd5ccijmknr3yfp3ga43y01m7390xnibqqgaisfvcm9wp";
+  };
+
+  prePatch = ''
+    substituteInPlace runtests.sh \
+      --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd"
+  '';
+
+  propagatedBuildInputs = with python.pkgs; [
+    six flask pygments dulwich httpauth humanize
+  ];
+
+  checkInputs = with python.pkgs; [
+    pytest requests python-ctags3
+  ] ++ lib.optional (!isPy3k) mock;
+
+  checkPhase = ''
+    ./runtests.sh
+  '';
+
+  # Needs to set up some git repos
+  doCheck = false;
+
+  meta = with lib; {
+    description = "The first Git web viewer that Just Works";
+    homepage    = https://github.com/jonashaag/klaus;
+    license     = licenses.isc;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..15276ebe51a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1276,6 +1276,8 @@ with pkgs;
 
   kisslicer = callPackage ../tools/misc/kisslicer { };
 
+  klaus = callPackage ../servers/web-apps/klaus { };
+
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
   languagetool = callPackage ../tools/text/languagetool {  };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ee0aa377f2..75f88517d67 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8944,27 +8944,6 @@ in {
 
   keyutils = callPackage ../development/python-modules/keyutils { };
 
-  klaus = buildPythonPackage rec {
-    version = "0.9.1";
-    name = "klaus-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
-      sha256 = "0k3v3p56hq8alm083grrp98znxkz1zqx0pczm2lah8qddbyrdkgm";
-    };
-
-    propagatedBuildInputs = with self;
-      [ humanize httpauth dulwich pygments flask six ];
-
-    meta = {
-      description = "The first Git web viewer that Just Works";
-      homepage    = "https://github.com/jonashaag/klaus";
-      #license     = licenses.mit; # I'm not sure about the license
-      maintainers = with maintainers; [ matthiasbeyer ];
-      platforms   = platforms.linux; # Can only test linux
-    };
-  };
-
   klein = buildPythonPackage rec {
     name = "klein-15.3.1";
     src = pkgs.fetchurl {

From 0b6a2b20371061a6771bb909f336bd1e35d6e221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 12:36:09 +0100
Subject: [PATCH 1367/2266] pythonPackages.odo: mark as broken

Odo is incompatible with Networkx 2.
See https://github.com/blaze/odo/pull/601.
---
 pkgs/development/python-modules/odo/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix
index fc3747ac59a..f18420b676b 100644
--- a/pkgs/development/python-modules/odo/default.nix
+++ b/pkgs/development/python-modules/odo/default.nix
@@ -37,5 +37,8 @@ buildPythonPackage rec {
     description = "Data migration utilities";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ fridh ];
+    # incomaptible with Networkx 2
+    # see https://github.com/blaze/odo/pull/601
+    broken = true;
   };
-}
\ No newline at end of file
+}

From 2859483fe952adf3fca90ae6615fec90ef955b4f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 18 Mar 2018 19:46:36 +0800
Subject: [PATCH 1368/2266] nixos home-assistant: a couple of fixes (#36338)

a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)
---
 nixos/modules/services/misc/home-assistant.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index cc60a143fa6..ac37c11106e 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -104,7 +104,6 @@ in {
   config = mkIf cfg.enable {
     systemd.services.home-assistant = {
       description = "Home Assistant";
-      wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       preStart = lib.optionalString (cfg.config != null) ''
         rm -f ${cfg.configDir}/configuration.yaml
@@ -121,6 +120,16 @@ in {
         ReadWritePaths = "${cfg.configDir}";
         PrivateTmp = true;
       };
+      path = [
+        "/run/wrappers" # needed for ping
+      ];
+    };
+
+    systemd.targets.home-assistant = rec {
+      description = "Home Assistant";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "home-assistant.service" ];
+      after = wants;
     };
 
     users.extraUsers.hass = {

From 14ed0f5fe0953c990d080abb97611bd0bf8cabf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 12:53:48 +0100
Subject: [PATCH 1369/2266] pythonPackages.credstash: fix build

This applies https://github.com/fugue/credstash/pull/178.
---
 pkgs/development/python-modules/credstash/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 6a9e1240b86..8be1780aa99 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }:
 
 buildPythonPackage rec {
-  pname    = "credstash";
+  pname = "credstash";
   version = "1.14.0";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d";
   };
 
+  patches = fetchpatch {
+    url = https://github.com/fugue/credstash/pull/178.patch;
+    sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc";
+    excludes = [ ".travis.yml" ];
+  };
+
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
 
   # No tests in archive

From 97e54c4f758c3032c9da94cdca45981127a042f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 12:55:27 +0100
Subject: [PATCH 1370/2266] pythonPackages.pyhomematic: disable tests because
 of unreliable timimg

---
 pkgs/development/python-modules/pyhomematic/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 1191b09ec38..be6fb7c8bb6 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -14,6 +14,9 @@ buildPythonPackage rec {
     sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz";
   };
 
+  # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Python 3 Interface to interact with Homematic devices";
     homepage = https://github.com/danielperna84/pyhomematic;

From 097dd635facf9be587edba59ae63ad0b37a2ad3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 13:03:29 +0100
Subject: [PATCH 1371/2266] pythonPackages.pyshphere: uninit

Build is broken and project is unmaintained since 2013.
---
 pkgs/top-level/python-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75f88517d67..2327aaea400 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13862,23 +13862,6 @@ in {
     };
   };
 
-  pysphere = buildPythonPackage rec {
-    name = "pysphere-0.1.8";
-
-    src = pkgs.fetchurl {
-      url = "http://pysphere.googlecode.com/files/${name}.zip";
-      sha256 = "b3f9ba1f67afb17ac41725b01737cd42e8a39d9e745282dd9b692ae631af0add";
-    };
-
-    disabled = isPy3k;
-
-    meta = {
-      homepage    = "https://code.google.com/p/pysphere/";
-      license     = "BSD";
-      description = "Python API for interaction with the VMWare vSphere";
-    };
-  };
-
   pysqlite = buildPythonPackage rec {
     name = "pysqlite-2.8.3";
 

From a807035927a07c56d084689addb59b2a4b0a853f Mon Sep 17 00:00:00 2001
From: Nicolas Schneider <nioncode+git@gmail.com>
Date: Sun, 11 Mar 2018 13:23:31 +0100
Subject: [PATCH 1372/2266] spacefm: fix segfault by exporting
 shared-mime-info/share in XDG_DATA_DIRS

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

diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 1e4e72c4e48..d601455931c 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gtk3 udev desktop-file-utils shared-mime-info intltool

From bd7a7bd817367b3c77f7184ca9fbca6e437d321e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 13:17:58 +0100
Subject: [PATCH 1373/2266] pythonPackages.allpairspy: init at 2.4.0

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

diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
new file mode 100644
index 00000000000..e21b43c60e0
--- /dev/null
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, six, pytest }:
+
+buildPythonPackage rec {
+  pname = "allpairspy";
+  version = "2.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9fb7962ee523bd96c5098cd3c97ac1b8eb73021d3df9314657ee9de00f52e034";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "Pairwise test combinations generator";
+    homepage = https://github.com/thombashi/allpairspy;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2327aaea400..de559564edf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -456,6 +456,8 @@ in {
 
   alembic = callPackage ../development/python-modules/alembic {};
 
+  allpairspy = callPackage ../development/python-modules/allpairspy { };
+
   ansicolors = callPackage ../development/python-modules/ansicolors {};
 
   aniso8601 = callPackage ../development/python-modules/aniso8601 {};

From edc94294c89d1f3f1188e7192578e83efbbda8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 13:19:44 +0100
Subject: [PATCH 1374/2266] pythonPackages.robomachine: fix build

---
 .../python-modules/robomachine/default.nix            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
index 72407131cb1..f29cafb7aee 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }:
+{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }:
 
 buildPythonPackage rec {
-  pname = "robomachine";
+  pname = "RoboMachine";
   version = "0.8.0";
-  name = pname + "-" + version;
 
-  src = fetchurl {
-    url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45";
   };
 
-  propagatedBuildInputs = [ pyparsing argparse robotframework ];
+  propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ];
 
   # Remove Windows .bat files
   postInstall = ''

From f41a3e7d7d327ea66459d17bfbe4a751b2496cb1 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 18 Mar 2018 13:34:46 +0100
Subject: [PATCH 1375/2266] Emscripten 1.37.16 to 1.37.36 (#37291)

* trying to build emscriptenPackages not all fail

* reading the console.log it turns out python executable is not in place and that is why emconfigure didnt work

* backup commit

* much more targets are compiling now

* added common revisioning

* revision bump to 1.37.36 (not tested)

* fixed xmllint

* forcing unit testing, will implement the tests after i get home

* json_c test working

* added tests

* tiny fixes

* added documentation
---
 doc/default.nix                               |   4 +
 doc/languages-frameworks/emscripten.md        | 185 ++++++++++++++++++
 doc/languages-frameworks/index.xml            |   1 +
 .../emscripten-fastcomp.nix                   |  17 +-
 .../compilers/emscripten/default.nix          |  24 ++-
 .../em-modules/generic/default.nix            |  15 +-
 pkgs/top-level/all-packages.nix               |   2 +
 pkgs/top-level/emscripten-packages.nix        | 130 +++++++++---
 8 files changed, 340 insertions(+), 38 deletions(-)
 create mode 100644 doc/languages-frameworks/emscripten.md

diff --git a/doc/default.nix b/doc/default.nix
index 60c613878c7..ec458634a42 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -81,6 +81,10 @@ pkgs.stdenv.mkDerivation {
       inputFile = ./languages-frameworks/vim.md;
       outputFile = "./languages-frameworks/vim.xml";
     }
+  + toDocbook {
+      inputFile = ./languages-frameworks/emscripten.md;
+      outputFile = "./languages-frameworks/emscripten.xml";
+    }
   + ''
     echo ${lib.nixpkgsVersion} > .version
 
diff --git a/doc/languages-frameworks/emscripten.md b/doc/languages-frameworks/emscripten.md
new file mode 100644
index 00000000000..24c49ec1409
--- /dev/null
+++ b/doc/languages-frameworks/emscripten.md
@@ -0,0 +1,185 @@
+# User's Guide to Emscripten in Nixpkgs
+
+[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler
+
+This section of the manual covers how to use `emscripten` in nixpkgs.
+
+Minimal requirements:
+
+* nix
+* nixpkgs
+
+Modes of use of `emscripten`:
+
+* **Imperative usage** (on the command line):
+
+   If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands:
+
+    * `nix-env -i emscripten`
+    * `nix-shell -p emscripten`
+
+* **Declarative usage**:
+
+    This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
+    * build and install all packages: 
+        * `nix-env -iA emscriptenPackages` 
+          
+    * dev-shell for zlib implementation hacking: 
+        * `nix-shell -A emscriptenPackages.zlib` 
+
+
+## Imperative usage
+
+A few things to note:
+
+* `export EMCC_DEBUG=2` is nice for debugging
+* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time
+
+
+## Declarative usage
+
+Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`:
+
+* `pkgs.zlib.override`
+* `pkgs.buildEmscriptenPackage`
+
+Both are interesting concepts.
+
+A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented.
+
+* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong.
+* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic.
+
+### Usage 1: pkgs.zlib.override
+
+This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside...
+
+See the `zlib` example:
+
+    zlib = (pkgs.zlib.override {
+      stdenv = pkgs.emscriptenStdenv;
+    }).overrideDerivation
+    (old: rec {
+      buildInputs = old.buildInputs ++ [ pkgconfig ];
+      # we need to reset this setting!
+      NIX_CFLAGS_COMPILE="";
+      configurePhase = ''
+        # FIXME: Some tests require writing at $HOME
+        HOME=$TMPDIR
+        runHook preConfigure
+
+        #export EMCC_DEBUG=2
+        emconfigure ./configure --prefix=$out --shared
+
+        runHook postConfigure
+      '';
+      dontStrip = true;
+      outputs = [ "out" ];
+      buildPhase = ''
+        emmake make
+      '';
+      installPhase = ''
+        emmake make install
+      '';
+      checkPhase = ''
+        echo "================= testing zlib using node ================="
+
+        echo "Compiling a custom test"
+        set -x
+        emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
+        libz.so.${old.version} -I . -o example.js
+
+        echo "Using node to execute the test"
+        ${pkgs.nodejs}/bin/node ./example.js 
+
+        set +x
+        if [ $? -ne 0 ]; then
+          echo "test failed for some reason"
+          exit 1;
+        else
+          echo "it seems to work! very good."
+        fi
+        echo "================= /testing zlib using node ================="
+      '';
+
+      postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
+        substituteInPlace configure \
+          --replace '/usr/bin/libtool' 'ar' \
+          --replace 'AR="libtool"' 'AR="ar"' \
+          --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
+      '';
+    });
+
+### Usage 2: pkgs.buildEmscriptenPackage
+
+This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. 
+
+    xmlmirror = pkgs.buildEmscriptenPackage rec {
+      name = "xmlmirror";
+
+      buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
+      nativeBuildInputs = [ pkgconfig zlib ];
+
+      src = pkgs.fetchgit {
+        url = "https://gitlab.com/odfplugfest/xmlmirror.git";
+        rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd";
+        sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b";
+      };
+
+      configurePhase = ''
+        rm -f fastXmlLint.js*
+        # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728
+        # https://gitlab.com/odfplugfest/xmlmirror/issues/8
+        sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv
+        # https://github.com/kripken/emscripten/issues/6344
+        # https://gitlab.com/odfplugfest/xmlmirror/issues/9
+        sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv
+        # https://gitlab.com/odfplugfest/xmlmirror/issues/11
+        sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv
+      '';
+
+      buildPhase = ''
+        HOME=$TMPDIR
+        make -f Makefile.emEnv
+      '';
+
+      outputs = [ "out" "doc" ];
+
+      installPhase = ''
+        mkdir -p $out/share
+        mkdir -p $doc/share/${name}
+
+        cp Demo* $out/share
+        cp -R codemirror-5.12 $out/share
+        cp fastXmlLint.js* $out/share
+        cp *.xsd $out/share
+        cp *.js $out/share
+        cp *.xhtml $out/share
+        cp *.html $out/share
+        cp *.json $out/share
+        cp *.rng $out/share
+        cp README.md $doc/share/${name}
+      '';
+      checkPhase = ''
+
+      '';
+    }; 
+
+### Declarative debugging
+
+Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project.
+
+1. `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz`
+2. `cd /tmp/`
+3. `unpackPhase`
+4. cd libz-1.2.3
+5. `configurePhase`
+6. `buildPhase`
+7. ... happy hacking...
+
+## Summary
+
+Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
+
+If in trouble, ask the maintainers.
+
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index fc15d847d15..6743c131201 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -30,6 +30,7 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <xi:include href="rust.xml" />
 <xi:include href="texlive.xml" />
 <xi:include href="vim.xml" />
+<xi:include href="emscripten.xml" />
 
 
 </chapter>
diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix
index f35ca26584f..5317cf25d41 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, python, ... }:
+{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }:
 
 let
-  rev = "1.37.16";
+  rev = emscriptenVersion;
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 stdenv.mkDerivation rec {
@@ -10,18 +10,18 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
-    sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by";
+    sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7";
+    sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5";
     inherit rev;
   };
 
-  nativeBuildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake python gtest ];
   preConfigure = ''
     cp -Lr ${srcFL} tools/clang
     chmod +w -R tools/clang
@@ -30,9 +30,10 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
     "-DLLVM_INCLUDE_EXAMPLES=OFF"
-    "-DLLVM_INCLUDE_TESTS=OFF"
-    # "-DCLANG_INCLUDE_EXAMPLES=OFF"
-    "-DCLANG_INCLUDE_TESTS=OFF"
+    "-DLLVM_INCLUDE_TESTS=ON"
+    #"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DCLANG_INCLUDE_TESTS=ON"
   ] ++ (stdenv.lib.optional stdenv.isLinux
     # necessary for clang to find crtend.o
     "-DGCC_INSTALL_PREFIX=${gcc}"
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ae80ad6fc80..ac972c99a95 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
-, jre, binaryen, enableWasm ? true
+{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs
+, jre, binaryen, enableWasm ? true ,  python2Packages, cmake
 }:
 
 let
-  rev = "1.37.16";
+  rev = emscriptenVersion;
   appdir = "share/emscripten";
 in
 
@@ -13,10 +13,12 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
+    sha256 = "02p0cp86vd1mydlpq544xbydggpnrq9dhbxx7h08j235frjm5cdc";
     inherit rev;
   };
 
+  buildInputs = [ nodejs cmake python ];
+
   buildCommand = ''
     mkdir -p $out/${appdir}
     cp -r $src/* $out/${appdir}
@@ -38,9 +40,23 @@ stdenv.mkDerivation {
     echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
     echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
     echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
+    # to make the test(s) below work
+    echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
   ''
   + stdenv.lib.optionalString enableWasm ''
     echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config
+  ''
+  +
+  ''
+    echo "--------------- running test -----------------"
+    # quick hack to get the test working
+    HOME=$TMPDIR
+    cp $out/${appdir}/config $HOME/.emscripten
+    export PATH=$PATH:$out/bin
+
+    #export EMCC_DEBUG=2  
+    ${python}/bin/python $src/tests/runner.py test_hello_world
+    echo "--------------- /running test -----------------"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index 16b8f1df595..332fab8e14a 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, emscripten }:
+{ pkgs, lib, emscripten, python }:
 
 { buildInputs ? [], nativeBuildInputs ? []
 
@@ -11,8 +11,8 @@ pkgs.stdenv.mkDerivation (
   {
 
   name = "emscripten-${args.name}";
-  buildInputs = [ emscripten ] ++ buildInputs;
-  nativeBuildInputs = [ emscripten ] ++ nativeBuildInputs;
+  buildInputs = [ emscripten python ] ++ buildInputs;
+  nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
 
   # fake conftest results with emscripten's python magic
   EMCONFIGURE_JS=2;
@@ -38,9 +38,18 @@ pkgs.stdenv.mkDerivation (
     runHook postBuild
   '';
 
+  doCheck = true;
+
   checkPhase = args.checkPhase or ''
     runHook preCheck
 
+    echo "Please provide a test for your emscripten based library/tool, see libxml2 as an exmple on how to use emcc/node to verify your build"
+    echo ""
+    echo "In normal C 'unresolved symbols' would yield an error and a breake of execution. In contrast, in emscripten they are only a warning which is ok given that emscripten assumptions about shared libraries."
+    echo "  -> https://github.com/kripken/emscripten/wiki/Linking"
+    echo "So just assume the dependencies were built using hydra, then YOU WILL NEVER see the warning and your code depending on a library will always fail!"
+    exit 1
+
     runHook postCheck
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0676d59d25a..054febb6223 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2079,6 +2079,8 @@ with pkgs;
 
   buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
 
+  emscriptenVersion = "1.37.36";
+
   emscripten = callPackage ../development/compilers/emscripten { };
 
   emscriptenfastcompPackages = callPackage ../development/compilers/emscripten-fastcomp { };
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix
index 7e63041867d..5b5b32b89da 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/pkgs/top-level/emscripten-packages.nix
@@ -1,49 +1,92 @@
 { pkgs }:
 
+with pkgs;
+
 # emscripten toolchain abstraction for nix
 # https://github.com/NixOS/nixpkgs/pull/16208
 
-with pkgs; rec {
-  json_c = pkgs.json_c.override {
-    stdenv = emscriptenStdenv;
-  };
+rec {
+  json_c = (pkgs.json_c.override {
+    stdenv = pkgs.emscriptenStdenv;
+  }).overrideDerivation
+    (old: {
+      nativeBuildInputs = [ autoreconfHook pkgconfig ];
+      propagatedBuildInputs = [ zlib ];
+      buildInputs = old.buildInputs ++ [ automake autoconf ];
+      configurePhase = ''
+        HOME=$TMPDIR
+        emconfigure ./configure --prefix=$out 
+      '';
+      checkPhase = ''
+        echo "================= testing json_c using node ================="
+
+        echo "Compiling a custom test"
+        set -x
+        emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 tests/test1.c \
+          `pkg-config zlib --cflags` \
+          `pkg-config zlib --libs` \
+          -I . \
+          .libs/libjson-c.so \
+          -o ./test1.js
+
+        echo "Using node to execute the test which basically outputs an error on stderr which we grep for" 
+        ${pkgs.nodejs}/bin/node ./test1.js 
+
+        set +x
+        if [ $? -ne 0 ]; then
+          echo "test1.js execution failed -> unit test failed, please fix"
+          exit 1;
+        else
+          echo "test1.js execution seems to work! very good."
+        fi
+        echo "================= /testing json_c using node ================="
+      '';
+    });
   
   libxml2 = (pkgs.libxml2.override {
     stdenv = emscriptenStdenv;
     pythonSupport = false;
   }).overrideDerivation
     (old: { 
-      nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ];
-      buildInputs = old.buildInputs ++ [ zlib nodejs ];
+      propagatedBuildInputs = [ zlib ];
+      buildInputs = old.buildInputs ++ [ pkgconfig ];
+
       # just override it with nothing so it does not fail
       autoreconfPhase = "echo autoreconfPhase not used..."; 
+      configurePhase = ''
+        HOME=$TMPDIR
+        emconfigure ./configure --prefix=$out --without-python
+      '';
       checkPhase = ''
-        echo "================= testing xmllint using node ================="
+        echo "================= testing libxml2 using node ================="
+
+        echo "Compiling a custom test"
+        set -x
         emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \
         ./.libs/libxml2.a `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \
         --embed-file ./test/xmlid/id_err1.xml  
-        # test/xmlid/id_err2.xml:3: validity error : xml:id : attribute type should be ID
-        # <!ATTLIST foo xml:id CDATA #IMPLIED>
-        #                                    ^
-        node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1  | grep 0bar   
+
+        echo "Using node to execute the test which basically outputs an error on stderr which we grep for" 
+        ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar   
+
+        set +x
         if [ $? -ne 0 ]; then
           echo "xmllint unit test failed, please fix this package"
           exit 1;
         else
           echo "since there is no stupid text containing 'foo xml:id' it seems to work! very good."
         fi
-        echo "================= /testing xmllint using node ================="
+        echo "================= /testing libxml2 using node ================="
       '';
     });            
   
-  xmlmirror = buildEmscriptenPackage rec {
+  xmlmirror = pkgs.buildEmscriptenPackage rec {
     name = "xmlmirror";
 
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ autoconf automake libtool gnumake libxml2 nodejs 
-       python openjdk json_c zlib ];
+    buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
+    nativeBuildInputs = [ pkgconfig zlib ];
 
-    src = fetchgit {
+    src = pkgs.fetchgit {
       url = "https://gitlab.com/odfplugfest/xmlmirror.git";
       rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd";
       sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b";
@@ -51,6 +94,14 @@ with pkgs; rec {
      
     configurePhase = ''
       rm -f fastXmlLint.js*
+      # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728
+      # https://gitlab.com/odfplugfest/xmlmirror/issues/8
+      sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv
+      # https://github.com/kripken/emscripten/issues/6344
+      # https://gitlab.com/odfplugfest/xmlmirror/issues/9
+      sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv
+      # https://gitlab.com/odfplugfest/xmlmirror/issues/11
+      sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv
     '';
     
     buildPhase = ''
@@ -75,25 +126,58 @@ with pkgs; rec {
       cp *.rng $out/share
       cp README.md $doc/share/${name}
     '';
-    
-    postInstall = ''
+    checkPhase = ''
+      
     '';
   };  
 
   zlib = (pkgs.zlib.override {
-    stdenv = emscriptenStdenv;
+    stdenv = pkgs.emscriptenStdenv;
   }).overrideDerivation
-    (old: { 
+    (old: rec { 
+      buildInputs = old.buildInputs ++ [ pkgconfig ];
+      # we need to reset this setting!
+      NIX_CFLAGS_COMPILE="";
       configurePhase = ''
         # FIXME: Some tests require writing at $HOME
         HOME=$TMPDIR
         runHook preConfigure
 
-        emconfigure ./configure --prefix=$out
+        #export EMCC_DEBUG=2
+        emconfigure ./configure --prefix=$out --shared
 
         runHook postConfigure
       '';
-      postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+      dontStrip = true;
+      outputs = [ "out" ];
+      buildPhase = ''
+        emmake make
+      '';
+      installPhase = ''
+        emmake make install
+      '';
+      checkPhase = ''
+        echo "================= testing zlib using node ================="
+
+        echo "Compiling a custom test"
+        set -x
+        emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
+        libz.so.${old.version} -I . -o example.js
+
+        echo "Using node to execute the test"
+        ${pkgs.nodejs}/bin/node ./example.js 
+
+        set +x
+        if [ $? -ne 0 ]; then
+          echo "test failed for some reason"
+          exit 1;
+        else
+          echo "it seems to work! very good."
+        fi
+        echo "================= /testing zlib using node ================="
+      '';
+
+      postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
         substituteInPlace configure \
           --replace '/usr/bin/libtool' 'ar' \
           --replace 'AR="libtool"' 'AR="ar"' \

From b6ca5726948a490017852bd123449f48c6701c20 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 18 Mar 2018 13:34:11 +0100
Subject: [PATCH 1376/2266] epoxy: fix darwin build

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

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index 306c5e756ec..81966f14a56 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -2,6 +2,8 @@
 , libGL, libX11
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "epoxy-${version}";
   version = "1.5.0";
@@ -18,17 +20,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
   buildInputs = [ libGL libX11 ];
 
-  preConfigure = stdenv.lib.optional stdenv.isDarwin ''
+  preConfigure = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace build_glx=no build_glx=yes
     substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
   '';
 
   # add libGL to rpath because libepoxy dlopen()s libEGL
-  postFixup = ''
+  postFixup = optionalString stdenv.isLinux ''
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libGL ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A library for handling OpenGL function pointer management";
     homepage = https://github.com/anholt/libepoxy;
     license = licenses.mit;

From fa534f3509d91cc3cf740ba18baa45b63177da91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Mar 2018 12:42:43 +0000
Subject: [PATCH 1377/2266] edbrowse: use fetchFromGitHub instead of fetchurl

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

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 9ca64678cb9..a6611d2f167 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
 
 stdenv.mkDerivation rec {
   name = "edbrowse-${version}";
@@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "-C src prefix=$(out)";
 
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/CMB/edbrowse/archive/v${version}.tar.gz";
-    sha256 = "1g9cwk4wszahk2m8k34i3rx44yhqfnv67zls0lk5g7jhrhpbf433";
+  src = fetchFromGitHub {
+    owner = "CMB";
+    repo = "edbrowse";
+    rev = "v${version}";
+    sha256 = "00wi0m91zf8p8wk4ixlz99dndgv4xqy93m2vsiwdr3khw3jwipp2";
   };
   meta = with stdenv.lib; {
     description = "Command Line Editor Browser";

From d0a9dcb01d19837cb5e0a801fd5e40984cb59360 Mon Sep 17 00:00:00 2001
From: Nicolas Schneider <nioncode+git@gmail.com>
Date: Mon, 5 Mar 2018 21:21:33 +0100
Subject: [PATCH 1378/2266] conky: provide option to build with pulseaudio
 support

---
 pkgs/os-specific/linux/conky/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix          | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index ea9c3f937d0..e4c45a9440a 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -27,6 +27,7 @@
 
 , wirelessSupport     ? true      , wirelesstools ? null
 , nvidiaSupport       ? false     , libXNVCtrl ? null
+, pulseSupport        ? false     , libpulseaudio ? null
 
 , curlSupport         ? true      , curl ? null
 , rssSupport          ? curlSupport
@@ -54,6 +55,7 @@ assert luaCairoSupport || luaImlib2Support
 
 assert wirelessSupport     -> wirelesstools != null;
 assert nvidiaSupport       -> libXNVCtrl != null;
+assert pulseSupport        -> libpulseaudio != null;
 
 assert curlSupport         -> curl != null;
 assert rssSupport          -> curlSupport && libxml2 != null;
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
     ++ optional  rssSupport         libxml2
     ++ optional  weatherXoapSupport libxml2
     ++ optional  nvidiaSupport      libXNVCtrl
+    ++ optional  pulseSupport       libpulseaudio
     ;
 
   cmakeFlags = []
@@ -119,6 +122,7 @@ stdenv.mkDerivation rec {
     ++ optional weatherXoapSupport  "-DBUILD_WEATHER_XOAP=ON"
     ++ optional wirelessSupport     "-DBUILD_WLAN=ON"
     ++ optional nvidiaSupport       "-DBUILD_NVIDIA=ON"
+    ++ optional pulseSupport        "-DBUILD_PULSEAUDIO=ON"
     ;
 
   # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 476ebd37096..4f830996e9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12928,6 +12928,7 @@ with pkgs;
   conky = callPackage ../os-specific/linux/conky ({
     lua = lua5_1; # conky can use 5.2, but toluapp can not
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+    pulseSupport = config.pulseaudio or false;
   } // config.conky or {});
 
   conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };

From a6cbdeaef3b29c3d83c5524c1143b92c998f6927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 15:47:04 +0100
Subject: [PATCH 1379/2266] pythonPackages.colander: move expression

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

diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix
new file mode 100644
index 00000000000..f286d1a9950
--- /dev/null
+++ b/pkgs/development/python-modules/colander/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi
+, translationstring, iso8601 }:
+
+buildPythonPackage rec {
+  pname = "colander";
+  version = "1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3";
+  };
+
+  propagatedBuildInputs = [ translationstring iso8601 ];
+
+  meta = with lib; {
+    description = "A simple schema-based serialization and deserialization library";
+    homepage = https://docs.pylonsproject.org/projects/colander/en/latest/;
+    license = licenses.free; # http://repoze.org/LICENSE.txt
+    maintainers = with maintainers; [ garbas domenkozar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de559564edf..1f9e1275fa3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2384,21 +2384,7 @@ in {
   });
 
 
-  colander = buildPythonPackage rec {
-    name = "colander-1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/colander/${name}.tar.gz";
-      sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3";
-    };
-
-    propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
+  colander = callPackage ../development/python-modules/colander { };
 
   # Backported version of the ConfigParser library of Python 3.3
   configparser = if isPy3k then null else buildPythonPackage rec {

From 93b10cd879f41ff2913acf20c969e450384b3582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 15:47:52 +0100
Subject: [PATCH 1380/2266] pythonPackages.colander: 1.0 -> 1.4

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

diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix
index f286d1a9950..ed27464d1fe 100644
--- a/pkgs/development/python-modules/colander/default.nix
+++ b/pkgs/development/python-modules/colander/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "colander";
-  version = "1.0";
+  version = "1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3";
+    sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72";
   };
 
   propagatedBuildInputs = [ translationstring iso8601 ];

From fb6c53524d8189b008ea5642fc722d34012b9575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 18 Mar 2018 11:52:37 -0300
Subject: [PATCH 1381/2266] deepin-gtk-theme: 17.10.5 -> 17.10.6

---
 pkgs/desktops/deepin/deepin-gtk-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index bdddc28cc44..26520889c7d 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "deepin-gtk-theme-${version}";
-  version = "17.10.5";
+  version = "17.10.6";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-gtk-theme";
     rev = version;
-    sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3";
+    sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From f047d5d75451dfdd1017206416b8f51fccf3806f Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 11 Mar 2018 19:44:55 -0400
Subject: [PATCH 1382/2266] qtkeychain: 0.7.0 -> 0.8.0, fix darwin build

The darwin build was failing for two reasons
  1) cmake incorrectly detected the compiler
  2) missing Frameworks

/cc ZHF #36454
---
 .../libraries/qtkeychain/default.nix          | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index ef0f5d4014e..b2c513541fa 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchFromGitHub, cmake, qt4 ? null
 , withQt5 ? false, qtbase ? null, qttools ? null
+, darwin ? null
 }:
 
 assert withQt5 -> qtbase != null;
 assert withQt5 -> qttools != null;
+assert stdenv.isDarwin -> darwin != null;
 
 stdenv.mkDerivation rec {
   name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "frankosterfeld";
@@ -16,16 +18,26 @@ stdenv.mkDerivation rec {
     sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52";
   };
 
-  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
+  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
+    ++ stdenv.lib.optional stdenv.isDarwin [
+       # correctly detect the compiler
+       # for details see cmake --help-policy CMP0025
+       "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
+       ]
+   ;
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ];
+  buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]
+    ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+         CoreFoundation Security
+    ])
+  ;
 
   meta = {
     description = "Platform-independent Qt API for storing passwords securely";
     homepage = https://github.com/frankosterfeld/qtkeychain;
     license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From e7be332a994f1172bdf5cad28059ad29ca4c53a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 18 Mar 2018 12:02:39 -0300
Subject: [PATCH 1383/2266] mate-sensors-applet: 1.20.0 -> 1.20.1

---
 pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index dfd3766df29..d82cd4b073a 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-sensors-applet-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1yj8zr9w0a1h4bpd27w7ssg97vnrz7yr10jqhx67yyb900ccr3ik";
+    sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x";
   };
 
   nativeBuildInputs = [

From 4779989c4e2a577d1a3af3b4152bdb073e1a8df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 16:04:52 +0100
Subject: [PATCH 1384/2266] pythonPackages.dlib: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f9e1275fa3..27ce2cf7ee1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1463,6 +1463,8 @@ in {
     inherit (pkgs.dlib) name src nativeBuildInputs meta;
 
     buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ];
+
+    checkInputs = with self; [ pytest ];
   };
 
   datadog = buildPythonPackage rec {

From 4d8749e9503d774769f0347af2d6a5118b639c05 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 17 Mar 2018 03:40:15 -0500
Subject: [PATCH 1385/2266] acpica-tools: 20180209 -> 20180313 Semi-automatic
 update generated by https://github.com/ryantm/nix-update tools. These checks
 were done: - built on NixOS - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 -h` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 --help` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 -V` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 -v` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 --version` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 -h` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpixtract
 --help` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 -h` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 --help` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 -V` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 -v` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 --version` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 -h` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpinames
 --help` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpidump
 -h` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpidump
 --help` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpidump
 -v` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpibin
 help` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpibin
 version` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpibin
 help` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpihelp
 help` got 0 exit code - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpihelp
 version` and found version 20180313 - ran
 `/nix/store/86dnirfxpl3fcdfj6d923yhzsx0jbd6k-acpica-tools-20180313/bin/acpihelp
 help` and found version 20180313

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

diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index 1381f13fd3c..a8fb57b2fba 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180209";
+  version = "20180313";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1rpdfwa4vwnvyxdp9ygqjckmabc3s8kyg3jyq4n4f0rhr1zl4zy5";
+    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 5c897bdd59ad1bc117cdee4b9c39cb8f43bcd64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 16:12:48 +0100
Subject: [PATCH 1386/2266] pythonPackages.flake8-debugger: fix build

---
 .../flake8-debugger/default.nix               | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
index 9d69c0389b6..32e9a08b741 100644
--- a/pkgs/development/python-modules/flake8-debugger/default.nix
+++ b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -1,15 +1,24 @@
-{ lib, fetchurl, buildPythonPackage, flake8, nose }:
+{ lib, fetchPypi, buildPythonPackage, flake8, pycodestyle, pytestrunner, pytest }:
 
 buildPythonPackage rec {
   pname = "flake8-debugger";
-  name = "${pname}-${version}";
   version = "3.1.0";
-  src = fetchurl {
-    url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";
+
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "be4fb88de3ee8f6dd5053a2d347e2c0a2b54bab6733a2280bb20ebd3c4ca1d97";
   };
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ flake8 ];
+
+  nativeBuildInputs = [ pytestrunner ];
+
+  propagatedBuildInputs = [ flake8 pycodestyle ];
+
+  checkInputs = [ pytest ];
+
+  # Tests not included in PyPI tarball
+  # FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged
+  doCheck = false;
+
   meta = {
     homepage = https://github.com/jbkahn/flake8-debugger;
     description = "ipdb/pdb statement checker plugin for flake8";

From 4708b4e03b9bfa18435dbd2eb368c7726e1cb82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Sun, 18 Mar 2018 15:57:57 +0000
Subject: [PATCH 1387/2266] godot: fix stupid typo

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index b2a4684ffeb..3c4914cd7cd 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -41,14 +41,14 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -r bin/godot.x11.tools.64 $out/bin/godot
+    cp bin/godot.x11.tools.* $out/bin/godot
   '';
 
   meta = {
     homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
-    platforms   = [ "i646-linux" "x86_64-linux" ];
+    platforms   = [ "i686-linux" "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }

From d1d320f4935408b4535e8d4feaffc69cec2038a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Sun, 18 Mar 2018 16:18:03 +0000
Subject: [PATCH 1388/2266] godot_headers: set platforms = all

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

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
index c60fbdd3acc..940882b1742 100644
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/GodotNativeTools/godot_headers/";
     description = "Headers for the Godot API supplied by the GDNative module";
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }

From 9d98f0cbe80111c283ed87a7d470ef4184c268ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 17:31:14 +0100
Subject: [PATCH 1389/2266] appdaemon: 3.0.0b4 -> 3.0.0

---
 pkgs/servers/home-assistant/appdaemon.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index db6380bcf12..a6119e58d7c 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -33,16 +33,11 @@ let
 
 in python.pkgs.buildPythonApplication rec {
   pname = "appdaemon";
-  version = "3.0.0b4";
+  version = "3.0.0";
 
   src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0dfc37ecd8e1344001d4970d32813c581aba1385cf3b82c69f8b7df2eca6c019";
-  };
-
-  patches = fetchpatch {
-    url = "${meta.homepage}/pull/252.patch";
-    sha256 = "164qvgdibd2645yxm4n16bhnan13wrchfi70jp2ff806fwdg9mg0";
+    sha256 = "ed925d3cb25db2c3f57304a0bca8fd0d9072d7ffe347ac5fcf68c4a30b7f1721";
   };
 
   propagatedBuildInputs = with python.pkgs; [

From 7a263b9af911303c18dfbdebe1a48b92f4fb8a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Mar 2018 17:45:09 +0100
Subject: [PATCH 1390/2266] pythonPackages.netdisco: 1.2.4 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index 105607fe375..b9b50d98ebf 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "netdisco";
-  version = "1.2.4";
+  version = "1.3.1";
 
   disabled = !isPy3k;
 
@@ -11,13 +11,7 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = pname;
     rev = version;
-    sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm";
-  };
-
-  # Allow newer zeroconf versions
-  patches = fetchpatch {
-    url = "${meta.homepage}/commit/78f83046a2a0d77527274c8be9c3fd75737c19d0.patch";
-    sha256 = "098zkwqg9181vavw97yhi9rsdsf023gnapg4gkr1n0awz3f3l9nm";
+    sha256 = "082ihazpcmf7qh4671kgdr5kzglyj10gp9hyy52snh0c1rz468fd";
   };
 
   propagatedBuildInputs = [ requests zeroconf netifaces ];

From 5804547243010ec8e341e98e8acbc5c96263682e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 17:50:24 -0500
Subject: [PATCH 1391/2266] uboot: 2017.11 -> 2018.03, cross fixes

---
 pkgs/misc/uboot/default.nix | 77 ++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1bfcea1057e..9e07c22fe2a 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2
-, hostPlatform
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, hostPlatform, buildPackages
 }:
 
 let
-  buildUBoot = { targetPlatforms
-            , filesToInstall
+  buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
             , extraMakeFlags ? []
@@ -13,18 +12,14 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2017.11";
+    version = "2018.03";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
+      sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
     };
 
     patches = [
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch;
-        sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm";
-      })
       (fetchpatch {
         url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
         sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
@@ -34,8 +29,8 @@ let
         sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
       })
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
-        sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
+        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
+        sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
     ];
 
@@ -43,14 +38,22 @@ let
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc openssl python2 ];
+    nativeBuildInputs = [ bc dtc openssl python2 swig ];
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
 
     hardeningDisable = [ "all" ];
 
-    makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags;
+    makeFlags = [
+      "DTC=dtc"
+      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    ] ++ extraMakeFlags;
 
     configurePhase = ''
+      runHook preConfigure
+
       make ${defconfig}
+
+      runHook postConfigure
     '';
 
     installPhase = ''
@@ -65,21 +68,13 @@ let
     enableParallelBuilding = true;
     dontStrip = true;
 
-    crossAttrs = {
-      makeFlags = [
-        "ARCH=${hostPlatform.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      ];
-    };
-
     meta = with stdenv.lib; {
       homepage = http://www.denx.de/wiki/U-Boot/;
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
       maintainers = [ maintainers.dezgeg ];
-      platforms = targetPlatforms;
     } // extraMeta;
-  } // args);
+  } // removeAttrs args [ "extraMeta" ]);
 
 in rec {
   inherit buildUBoot;
@@ -88,10 +83,14 @@ in rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
     buildFlags = "tools NO_SDL=1";
+    hardeningDisable = [];
     dontStrip = false;
-    targetPlatforms = stdenv.lib.platforms.linux;
+    extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
     extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    postConfigure = ''
+      sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
+    '';
     filesToInstall = [
       "tools/dumpimage"
       "tools/fdtgrep"
@@ -103,86 +102,86 @@ in rec {
 
   ubootA20OlinuxinoLime = buildUBoot rec {
     defconfig = "A20-OLinuXino-Lime_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBananaPi = buildUBoot rec {
     defconfig = "Bananapi_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBeagleboneBlack = buildUBoot rec {
     defconfig = "am335x_boneblack_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["MLO" "u-boot.img"];
   };
 
   # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
   ubootClearfog = buildUBoot rec {
     defconfig = "clearfog_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-dtb.bin"];
   };
 
   ubootOrangePiPc = buildUBoot rec {
     defconfig = "orangepi_pc_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi = buildUBoot rec {
     defconfig = "rpi_defconfig";
-    targetPlatforms = ["armv6l-linux"];
+    extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi2 = buildUBoot rec {
     defconfig = "rpi_2_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_32bit = buildUBoot rec {
     defconfig = "rpi_3_32b_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_64bit = buildUBoot rec {
     defconfig = "rpi_3_defconfig";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
     buildFlags = "u-boot-with-nand-spl.imx";
     postConfigure = ''
@@ -196,7 +195,7 @@ in rec {
 
   ubootWandboard = buildUBoot rec {
     defconfig = "wandboard_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
   };
 }

From 6f5a0bded2ae20759003d8be9548b5358c8aefcd Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 20:29:24 -0500
Subject: [PATCH 1392/2266] uboot: add Rock64 support

The bootloader is currently non-functional because it lacks the ARM Trusted
Firmware image (bl31.elf).
---
 pkgs/misc/uboot/rock64.nix      | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/misc/uboot/rock64.nix

diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
new file mode 100644
index 00000000000..b6dd99ac6a6
--- /dev/null
+++ b/pkgs/misc/uboot/rock64.nix
@@ -0,0 +1,26 @@
+{ buildUBoot, fetchFromGitHub }: buildUBoot rec {
+  name = "uboot-${defconfig}-${version}";
+  version = "2018.01";
+
+  src = fetchFromGitHub {
+    owner = "ayufan-rock64";
+    repo = "linux-u-boot";
+    rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495";
+    sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg";
+  };
+
+  extraMakeFlags = [ "u-boot.itb" "all" ];
+  postBuild = ''
+    ./tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img
+    cat spl/u-boot-spl.bin >> idbloader.img
+    dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
+  '';
+
+  defconfig = "rock64-rk3328_defconfig";
+  filesToInstall = [ "spl/u-boot-spl.bin" "tpl/u-boot-tpl.bin" "u-boot.itb" "idbloader.img"];
+
+  extraMeta = {
+    maintainers = [ lib.maintainers.lopsided98 ];
+    platforms = ["aarch64-linux"];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27ed3cb0bcf..f709ca6e67f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13882,6 +13882,8 @@ with pkgs;
 
   ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
 
+  ubootRock64 = callPackage ../misc/uboot/rock64.nix { };
+
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {

From 0264c9bb4785b283f888418a53be223696c844fa Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 21:27:11 -0500
Subject: [PATCH 1393/2266] maintainers: add lopsided98

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a350888a367..a951317d37b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2037,6 +2037,11 @@
     github = "lo1tuma";
     name = "Mathias Schreck";
   };
+  lopsided98 = {
+    email = "benwolsieffer@gmail.com";
+    github = "lopsided98";
+    name = "Ben Wolsieffer";
+  };
   loskutov = {
     email = "ignat.loskutov@gmail.com";
     github = "loskutov";

From 0ab76c5a4ed28baba3e0bfcdf25a89b78c44e0d8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 21:46:39 -0500
Subject: [PATCH 1394/2266] arm-trusted-firmware: init

ARM trusted firmware is required as part of the boot process on some ARMv8-A
boards. Currently, only the RK3328 is supported in nixpkgs.

This makes the Rock64 u-boot image bootable.
---
 pkgs/misc/arm-trusted-firmware/default.nix | 63 ++++++++++++++++++++++
 pkgs/misc/uboot/rock64.nix                 |  4 +-
 pkgs/top-level/all-packages.nix            |  5 ++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/misc/arm-trusted-firmware/default.nix

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
new file mode 100644
index 00000000000..fdaf109ebff
--- /dev/null
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, buildPackages }:
+
+let
+  buildArmTrustedFirmware = { targetPlatforms
+            , filesToInstall
+            , installDir ? "$out"
+            , platform
+            , extraMakeFlags ? []
+            , extraMeta ? {}
+            , ... } @ args:
+           stdenv.mkDerivation (rec {
+
+    name = "arm-trusted-firmware-${platform}-${version}";
+    version = "1.4";
+
+    src = fetchFromGitHub {
+      owner = "ARM-software";
+      repo = "arm-trusted-firmware";
+      rev = "b762fc7481c66b64eb98b6ff694d569e66253973";
+      sha256 = "15m10dfgqkgw6rmzgfg1xzp1si9d5jwzyrcb7cp3y9ckj6mvp3i3";
+    };
+
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+    makeFlags = [
+      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+      "PLAT=${platform}"
+    ] ++ extraMakeFlags;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p ${installDir}
+      cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir}
+
+      runHook postInstall
+    '';
+
+    hardeningDisable = [ "all" ];
+    dontStrip = true;
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/ARM-software/arm-trusted-firmware;
+      description = "A reference implementation of secure world software for ARMv8-A";
+      license = licenses.bsd3;
+      maintainers = [ maintainers.lopsided98 ];
+      # TODO: Fix when #34444 is merged
+      # platforms = targetPlatforms;
+    } // extraMeta;
+  } // builtins.removeAttrs args [ "extraMeta" ]);
+
+in rec {
+  inherit buildArmTrustedFirmware;
+
+  armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec {
+    extraMakeFlags = [ "bl31" ];
+    platform = "rk3328";
+    targetPlatforms = ["aarch64-linux"];
+    filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
+  };
+}
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
index b6dd99ac6a6..8c3af2a35a4 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/pkgs/misc/uboot/rock64.nix
@@ -1,4 +1,4 @@
-{ buildUBoot, fetchFromGitHub }: buildUBoot rec {
+{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: buildUBoot rec {
   name = "uboot-${defconfig}-${version}";
   version = "2018.01";
 
@@ -9,7 +9,7 @@
     sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg";
   };
 
-  extraMakeFlags = [ "u-boot.itb" "all" ];
+  extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
   postBuild = ''
     ./tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img
     cat spl/u-boot-spl.bin >> idbloader.img
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f709ca6e67f..fe8c1eeae61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12874,6 +12874,11 @@ with pkgs;
   alsaOss = callPackage ../os-specific/linux/alsa-oss { };
   alsaTools = callPackage ../os-specific/linux/alsa-tools { };
 
+  inherit (callPackage ../misc/arm-trusted-firmware {})
+    buildArmTrustedFirmware
+    armTrustedFirmwareRK3328
+    ;
+
   microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { };
 
   microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };

From 1f4bb8c61d71f2ac12f1cc6cf50aaa590df40a45 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 3 Mar 2018 21:17:13 -0500
Subject: [PATCH 1395/2266] uboot: add patch to increase maximum path length in
 extlinux.conf

This fixes problems with cross compiled kernels failing to boot.
---
 pkgs/misc/uboot/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9e07c22fe2a..800c0057282 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -32,6 +32,10 @@ let
         url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
         sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
+      (fetchpatch {
+        url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
+        sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
+      })
     ];
 
     postPatch = ''

From ba3e470651cbfeff1ad28fae1d1d5dcad6fb020b Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 3 Mar 2018 21:18:05 -0500
Subject: [PATCH 1396/2266] uboot: rock64: use binary blob for TPL

This stops the kernel from crashing immediately after boot.
---
 pkgs/misc/uboot/rock64.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
index 8c3af2a35a4..623c6015534 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/pkgs/misc/uboot/rock64.nix
@@ -1,4 +1,11 @@
-{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: buildUBoot rec {
+{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: let
+  rkbin = fetchFromGitHub {
+    owner = "ayufan-rock64";
+    repo = "rkbin";
+    rev = "d8b90685b3d93c358936babdd854f1018bc6d35e";
+    sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr";
+  };
+in buildUBoot rec {
   name = "uboot-${defconfig}-${version}";
   version = "2018.01";
 
@@ -10,8 +17,10 @@
   };
 
   extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
+
+  # So close to being blob free... But U-Boot TPL causes the kernel to hang
   postBuild = ''
-    ./tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img
+    ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.06.bin idbloader.img
     cat spl/u-boot-spl.bin >> idbloader.img
     dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
   '';
@@ -19,8 +28,10 @@
   defconfig = "rock64-rk3328_defconfig";
   filesToInstall = [ "spl/u-boot-spl.bin" "tpl/u-boot-tpl.bin" "u-boot.itb" "idbloader.img"];
 
-  extraMeta = {
-    maintainers = [ lib.maintainers.lopsided98 ];
+  extraMeta = with lib; {
+    maintainers = [ maintainers.lopsided98 ];
     platforms = ["aarch64-linux"];
+    # Because of the TPL blob
+    license = licenses.unfreeRedistributableFirmware;
   };
 }

From 01020b3263629be5a8697aa781dcb267df8de0a0 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 23:47:27 -0500
Subject: [PATCH 1397/2266] uboot: sheevplug and guruplug: use mainline U-Boot

These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.
---
 pkgs/misc/uboot/default.nix                   |  12 ++
 pkgs/misc/uboot/gas220.patch                  |  18 ---
 pkgs/misc/uboot/guruplug-file-systems.patch   |  48 --------
 .../uboot/guruplug-usb-msd-multi-lun.patch    | 106 ------------------
 pkgs/misc/uboot/guruplug.nix                  |  57 ----------
 pkgs/misc/uboot/sheevaplug.nix                |  61 ----------
 pkgs/top-level/all-packages.nix               |   6 +-
 7 files changed, 14 insertions(+), 294 deletions(-)
 delete mode 100644 pkgs/misc/uboot/gas220.patch
 delete mode 100644 pkgs/misc/uboot/guruplug-file-systems.patch
 delete mode 100644 pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
 delete mode 100644 pkgs/misc/uboot/guruplug.nix
 delete mode 100644 pkgs/misc/uboot/sheevaplug.nix

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 800c0057282..9da52e49437 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -129,6 +129,12 @@ in rec {
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
+  ubootGuruplug = buildUBoot rec {
+    defconfig = "guruplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
@@ -183,6 +189,12 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSheevaplug = buildUBoot rec {
+    defconfig = "sheevaplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/misc/uboot/gas220.patch b/pkgs/misc/uboot/gas220.patch
deleted file mode 100644
index c5a91b0f3d0..00000000000
--- a/pkgs/misc/uboot/gas220.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to allow assembling with binutils 2.20. It worked without this patch in 2.19.1
-diff --git a/board/mv_feroceon/USP/jump.S b/board/mv_feroceon/USP/jump.S
-index 4b6b9ee..58037fc 100644
---- a/board/mv_feroceon/USP/jump.S
-+++ b/board/mv_feroceon/USP/jump.S
-@@ -29,9 +29,11 @@ disclaimer.
- #include "sys/mvCpuIfRegs.h"
- 
- 
--jumpStart:
- 
- .section	".reset_vector_sect",#alloc, #execinstr
-+
-+jumpStart:
-+
- #if defined(MV_88F6082) || defined(MV_88F6183) || defined(DB_88F5181_OLD) || defined(DB_FPGA) || \
- 	defined(MV88F6281) || defined(MV88F6192) || defined(MV88F6180)  || defined(MV_88F6183L) || \
-     defined(MV88F6190)
diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
deleted file mode 100644
index 30dc1994303..00000000000
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for the various file systems as found in `sheevaplug.h'.
-As for the SheevaPlug, the increase in size means that the environment
-must be pushed further away.
-
-In addition, increase the malloc area size to allow compilation of UbiFS.
-
---- u-boot/include/configs/guruplug.h	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/include/configs/guruplug.h	2010-09-29 18:59:52.000000000 +0200
-@@ -123,8 +123,8 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0x40000
--#define CONFIG_ENV_OFFSET		0x40000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0x60000
-+#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
- 
- /*
-  * Default environment variables
-@@ -145,7 +145,7 @@
- /*
-  * Size of malloc() pool
-  */
--#define CONFIG_SYS_MALLOC_LEN	(1024 * 128) /* 128kB for malloc() */
-+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024) /* 1 MiB for malloc() */
- /* size in bytes reserved for initial data */
- #define CONFIG_SYS_GBL_DATA_SIZE	128
- 
-@@ -195,4 +195,18 @@
- 
- #define CONFIG_SYS_ALT_MEMTEST
- 
-+/*
-+ * File system
-+ */
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_CMD_JFFS2
-+#define CONFIG_CMD_UBI
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
-+#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
-+
- #endif /* _CONFIG_GURUPLUG_H */
-
diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
deleted file mode 100644
index 4f32dd89031..00000000000
--- a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-The GuruPlug's microSD card reader is a USB mass storage device that
-has two logical units (LUNs), i.e., two "SCSI disks".  This patch
-adds multi-LUN support to the USB MSD driver.
-
-See the thread at <http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/85425>.
-
---- u-boot/common/usb_storage.c	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/common/usb_storage.c	2010-10-02 00:38:15.000000000 +0200
-@@ -204,6 +204,22 @@ int usb_stor_info(void)
- 	return 1;
- }
- 
-+static unsigned int usb_get_max_lun(struct us_data *us)
-+{
-+	int len;
-+	unsigned char result;
-+	len = usb_control_msg(us->pusb_dev,
-+			      usb_rcvctrlpipe(us->pusb_dev, 0),
-+			      US_BBB_GET_MAX_LUN,
-+			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-+			      0, us->ifnum,
-+			      &result, sizeof(result),
-+			      USB_CNTL_TIMEOUT * 5);
-+	USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
-+			len, (int) result);
-+	return (len > 0) ? result : 0;
-+}
-+
- /*******************************************************************************
-  * scan the usb and reports device info
-  * to the user if mode = 1
-@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
- 			break; /* no more devices avaiable */
- 
- 		if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
--			/* ok, it is a storage devices
--			 * get info and fill it in
--			 */
--			if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
--						&usb_dev_desc[usb_max_devs]) == 1)
-+			/* OK, it's a storage device.  Iterate over its LUNs
-+			 * and populate `usb_dev_desc'.  */
-+			int lun, max_lun, start = usb_max_devs;
-+
-+			max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
-+			for (lun = 0;
-+			     lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
-+			     lun++) {
-+				usb_dev_desc[usb_max_devs].lun = lun;
-+				if (usb_stor_get_info(dev, &usb_stor[start],
-+						      &usb_dev_desc[usb_max_devs]) == 1) {
- 				usb_max_devs++;
- 		}
-+			}
-+		}
- 		/* if storage device */
- 		if (usb_max_devs == USB_MAX_STOR_DEV) {
- 			printf("max USB Storage Device reached: %d stopping\n",
-@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct 
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_INQUIRY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->cmd[4] = 36;
- 		srb->datalen = 36;
- 		srb->cmdlen = 12;
-@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
- 	ptr = (char *)srb->pdata;
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_REQ_SENSE;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[4] = 18;
- 	srb->datalen = 18;
- 	srb->pdata = &srb->sense_buf[0];
-@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_TST_U_RDY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 0;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_RD_CAPAC;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 8;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct 
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_READ10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
-@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_WRITE10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix
deleted file mode 100644
index 9f24f1da86a..00000000000
--- a/pkgs/misc/uboot/guruplug.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{stdenv, fetchgit, unzip}:
-
-# Marvell's branch of U-Boot for the GuruPlug.
-
-let
-  # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
-  # See
-  # <http://www.openplug.org/plugwiki/index.php/Re-building_the_kernel_and_U-Boot>
-  # for details.
-  rev = "f106056095049c2c748c2a2797e5353295240e04";
-in
-stdenv.mkDerivation {
-  name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
-
-  src = fetchgit {
-    url = "git://git.denx.de/u-boot-marvell.git";
-    sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
-    inherit rev;
-  };
-
-  patches =
-    [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
-
-  enableParallelBuilding = true;
-
-  # Remove the cross compiler prefix.
-  configurePhase = ''
-    make mrproper
-    make guruplug_config
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make all u-boot.kwb
-    else
-        make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -v u-boot u-boot.{kwb,map} $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
deleted file mode 100644
index 53d811d1a44..00000000000
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-   
-stdenv.mkDerivation {
-  name = "uboot-sheevaplug-3.4.27";
-   
-  src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2";
-    sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s";
-  };
-
-  srcAddon = fetchurl {
-    url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip";
-    sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg";
-  };
-
-  postUnpack = ''
-    mv u-boot-1.1.4 u-boot-3.4.27
-    unzip -o $srcAddon
-    sourceRoot=u-boot-3.4.27
-  '';
-
-  patches = [ ./gas220.patch ];
-
-  # Remove the cross compiler prefix, and add reiserfs support
-  configurePhase = ''
-    make mrproper
-    make rd88f6281Sheevaplug_config NBOOT=1 LE=1
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make clean all
-    else
-        make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
-    cp u-boot u-boot.map $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe8c1eeae61..a545fa53a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13867,6 +13867,7 @@ with pkgs;
     ubootBananaPi
     ubootBeagleboneBlack
     ubootClearfog
+    ubootGuruplug
     ubootJetsonTK1
     ubootOdroidXU3
     ubootOrangePiPc
@@ -13876,17 +13877,14 @@ with pkgs;
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
+    ubootSheevaplug
     ubootUtilite
     ubootWandboard
     ;
 
   # Non-upstream U-Boots:
-  ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
-
   ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
 
-  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
-
   ubootRock64 = callPackage ../misc/uboot/rock64.nix { };
 
   uclibc = callPackage ../os-specific/linux/uclibc { };

From 28fd7d9594fa0ed1a1b80a9652b5ab065a29e077 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 6 Mar 2018 00:04:10 -0500
Subject: [PATCH 1398/2266] uboot: fix cross-build of ubootTools

---
 pkgs/misc/uboot/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9da52e49437..dbb2bbef1a4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -86,12 +86,11 @@ in rec {
   ubootTools = buildUBoot rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
-    buildFlags = "tools NO_SDL=1";
     hardeningDisable = [];
     dontStrip = false;
     extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
-    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
     postConfigure = ''
       sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
     '';

From 6b069c656abf9704662317dc0173f18cdf4dfc91 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 15 Mar 2018 09:03:39 +0200
Subject: [PATCH 1399/2266] U-Boot: Add AArch64 QEMU build

See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.
---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index dbb2bbef1a4..b56ca269357 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -158,6 +158,12 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootQemuAarch64 = buildUBoot rec {
+    defconfig = "qemu_arm64_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a545fa53a1c..9d85ad39c9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13872,6 +13872,7 @@ with pkgs;
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi
     ubootRaspberryPi2

From f2175e1bd47038759a5f6621f6ead97e4680c48e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 10 Dec 2017 20:54:11 -0500
Subject: [PATCH 1400/2266] arm-trusted-firmware: Inits at various versions

For qemu, at 1.4 from upstream.

For Sopine / Pine A64-LTS, at 1.0 from fork.
---
 pkgs/misc/arm-trusted-firmware/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index fdaf109ebff..4b5a1957938 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -54,6 +54,30 @@ let
 in rec {
   inherit buildArmTrustedFirmware;
 
+  armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
+    version = "1.0";
+    src = fetchFromGitHub {
+      owner = "apritzel";
+      repo = "arm-trusted-firmware";
+      # Branch: `allwinner`
+      rev = "91f2402d941036a0db092d5375d0535c270b9121";
+      sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys";
+    };
+    platform = "sun50iw1p1";
+    targetPlatforms = ["aarch64-linux"];
+    filesToInstall = ["build/${platform}/release/bl31.bin"];
+  };
+
+  armTrustedFirmwareQemu = buildArmTrustedFirmware rec {
+    platform = "qemu";
+    targetPlatforms = ["aarch64-linux"];
+    filesToInstall = [
+      "build/${platform}/release/bl1.bin"
+      "build/${platform}/release/bl2.bin"
+      "build/${platform}/release/bl31.bin"
+    ];
+  };
+
   armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec {
     extraMakeFlags = [ "bl31" ];
     platform = "rk3328";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d85ad39c9a..6e8b403e179 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12876,6 +12876,8 @@ with pkgs;
 
   inherit (callPackage ../misc/arm-trusted-firmware {})
     buildArmTrustedFirmware
+    armTrustedFirmwareAllwinner
+    armTrustedFirmwareQemu
     armTrustedFirmwareRK3328
     ;
 

From 2ff31f71ae1f10b3d1779b876ac94bf2a9998bd9 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 10 Dec 2017 20:56:36 -0500
Subject: [PATCH 1401/2266] U-Boot: Add SOPINE Baseboard build

This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]
---
 pkgs/misc/uboot/default.nix     | 19 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index b56ca269357..aac5f5a2c80 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,11 +1,20 @@
 { stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, armTrustedFirmwareAllwinner
 , hostPlatform, buildPackages
 }:
 
 let
+  # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
+  sunxiPatch = fetchpatch {
+    name = "sunxi.patch";
+    url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
+    sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+  };
+
   buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraPatches ? []
             , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
@@ -36,7 +45,7 @@ let
         url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
         sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
       })
-    ];
+    ] ++ extraPatches;
 
     postPatch = ''
       patchShebangs tools
@@ -200,6 +209,14 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSopine = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "sopine_baseboard_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e8b403e179..7c535d63e3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13881,6 +13881,7 @@ with pkgs;
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
     ubootSheevaplug
+    ubootSopine
     ubootUtilite
     ubootWandboard
     ;

From 4b77663edfba2c4e15db46c1ba900fa9819e4325 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 19 Jan 2018 22:14:00 +0200
Subject: [PATCH 1402/2266] U-Boot: Add Pine64 build

---
 pkgs/misc/uboot/default.nix     | 8 ++++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 9 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index aac5f5a2c80..4a96deadaea 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -167,6 +167,14 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootPine64 = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "pine64_plus_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootQemuAarch64 = buildUBoot rec {
     defconfig = "qemu_arm64_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c535d63e3e..b84bf64a3ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13874,6 +13874,7 @@ with pkgs;
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootPine64
     ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi

From 4fe75d11b2efdd3325ee8eaa4347626f1a950dbd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 16 Mar 2018 19:27:01 +0200
Subject: [PATCH 1403/2266] U-Boot: Make ubootJetsonTK1 install even more files

---
 pkgs/misc/uboot/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4a96deadaea..807bc48a642 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -147,6 +147,11 @@ in rec {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
+    # tegra-uboot-flasher expects this exact directory layout, sigh...
+    postInstall = ''
+      mkdir -p $out/spl
+      cp spl/u-boot-spl $out/spl/
+    '';
   };
 
   ubootOdroidXU3 = buildUBoot rec {

From ec15ef011a4488a4eb77b114bc3d03797dff43d3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 18 Mar 2018 18:02:14 +0100
Subject: [PATCH 1404/2266] gnu-apl: fix clang build

/cc ZHF #36454
---
 pkgs/development/interpreters/gnu-apl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 2f5ce0e7635..599126d2eff 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, readline, gettext, ncurses }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "gnu-apl-${version}";
   version = "1.7";
@@ -13,9 +12,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline gettext ncurses ];
 
   # Needed with GCC 7
-  NIX_CFLAGS_COMPILE = "-Wno-error=int-in-bool-context";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context"
+    + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference";
 
-  patchPhase = optionalString stdenv.isDarwin ''
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
   '';
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     find $out/share/doc/support-files -name 'Makefile*' -delete
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Free interpreter for the APL programming language";
     homepage    = http://www.gnu.org/software/apl/;
     license     = licenses.gpl3Plus;

From 2d9f031334f123e56637ab613adf1985406769dd Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 18 Mar 2018 10:06:00 -0700
Subject: [PATCH 1405/2266] libsForQt5.quazip: 0.7.1 -> 0.7.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/fd2172c4a80f17d789d4e62fcb99e8a0
---
 pkgs/development/libraries/quazip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 4379f5cf667..8d096e18f08 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, zip, zlib, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "quazip-0.7.1";
+  name = "quazip-0.7.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/quazip/${name}.tar.gz";
-    sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq";
+    sha256 = "1db9w8ax1ki0p67a47h4cnbwfgi2di4y3k9nc3a610kffiag7m1a";
   };
 
   preConfigure = "cd quazip";

From 0a3902b40b36d2cc8db88b5d949c92e13c86e1fd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Mar 2018 18:08:11 +0100
Subject: [PATCH 1406/2266] zim: 0.67 -> 0.68

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

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 48b278cc1df..9f7048f3646 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "zim-${version}";
-  version = "0.67";
+  version = "0.68";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k";
+    sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr";
   };
 
   propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];

From 6b0732a9561849047fbc85bb221dad0da5105512 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 15 Mar 2018 10:34:30 +0400
Subject: [PATCH 1407/2266] chromium: 65.0.3325.146 -> 65.0.3325.162

Also bump dev branch to ensure that next beta will work.
---
 .../networking/browsers/chromium/upstream-info.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index a714e5b47a1..66d41a9c165 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -6,13 +6,13 @@
     version = "65.0.3325.124";
   };
   dev = {
-    sha256 = "196k48qy97b7x25vv5gvqhnbkjb8vql42qi1h0x8y8sp216sdspg";
-    sha256bin64 = "13jq19jg1hy5w1bdf0wpv5qmr44161clsxjk01m0iysipkbldpn5";
-    version = "66.0.3355.0";
+    sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8";
+    sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw";
+    version = "66.0.3359.26";
   };
   stable = {
-    sha256 = "18w1mfsfd2yy7sf30d5wypv6mrdlsj3807xnab2gfi1kb8zjykyb";
-    sha256bin64 = "1g2i3cj6hgr4p0mfvv6xd8lvk217li7lrzgk4j6k563zpqhh863p";
-    version = "65.0.3325.146";
+    sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2";
+    sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v";
+    version = "65.0.3325.162";
   };
 }

From 02e269d0ea2a14f7aa3aef7d81514dea3508c49f Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 18 Mar 2018 13:35:55 -0400
Subject: [PATCH 1408/2266] use correct 0.8.0 sha256

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

diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index b2c513541fa..5baeb76820a 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null;
 
 stdenv.mkDerivation rec {
   name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
-  version = "0.8.0";
+  version = "0.8.0";            # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
 
   src = fetchFromGitHub {
     owner = "frankosterfeld";
     repo = "qtkeychain";
     rev = "v${version}";
-    sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52";
+    sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0
   };
 
   cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]

From 04c3713755379ee4b8e020881adf5e5eae4c01f5 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Fri, 16 Feb 2018 20:59:50 +0000
Subject: [PATCH 1409/2266] pythonPackages.requests-unixsocket: init at 0.1.5

---
 .../requests-unixsocket/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/requests-unixsocket/default.nix

diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix
new file mode 100644
index 00000000000..4eb3a33926f
--- /dev/null
+++ b/pkgs/development/python-modules/requests-unixsocket/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pbr, requests
+, pytest, pytestpep8, waitress }:
+
+buildPythonPackage rec {
+  pname = "requests-unixsocket";
+  version = "0.1.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k19knydh0fzd7w12lfy18arl1ndwa0zln33vsb37yv1iw9w06x9";
+  };
+
+  nativeBuildInputs = [ pbr ];
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ pytest pytestpep8 waitress ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "Use requests to talk HTTP via a UNIX domain socket";
+    homepage = https://github.com/msabramo/requests-unixsocket;
+    license = licenses.asl20;
+    maintainers = [ maintainers.catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4568d4b7ec2..49ae07efe2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3706,6 +3706,8 @@ in {
     };
   });
 
+  requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {};
+
   howdoi = buildPythonPackage (rec {
     name = "howdoi-${version}";
     version = "1.1.7";

From bb165a9d6f6535fb291f668d007c271844e8638b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 18 Mar 2018 11:19:14 -0700
Subject: [PATCH 1410/2266] spaceFM: 1.0.5 -> 1.0.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped -h` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped --version` and found version 1.0.6
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm -h` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm --version` and found version 1.0.6
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-installer-wrapped --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-installer-wrapped help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm-installer --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm-installer help` got 0 exit code
- found 1.0.6 with grep in /nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6
- directory tree listing: https://gist.github.com/1af4e8f53a36978c67e557c6c4c22b8d
---
 pkgs/applications/misc/spacefm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index d601455931c..6fa594dec04 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "spacefm-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "IgnorantGuru";
     repo = "spacefm";
     rev = "${version}";
-    sha256 = "06askkrwls09d1x382zjrmnvcm0ghfgz4cms2qbhdkazfyy0ff65";
+    sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
   };
 
   configureFlags = [

From 3aa3738bb2582f9142675c952f7e6e3621081c1e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Mar 2018 18:08:24 -0500
Subject: [PATCH 1411/2266] vault: Fix test

---
 nixos/tests/vault.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index 2c08d06f286..515d5c8bac2 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ... }:
       $machine->waitForUnit('multi-user.target');
       $machine->waitForUnit('vault.service');
       $machine->waitForOpenPort(8200);
-      $machine->succeed('vault init');
-      $machine->succeed('vault status | grep "Sealed: true"');
+      $machine->succeed('vault operator init');
+      $machine->succeed('vault status | grep Sealed | grep true');
     '';
 })

From 18ea001472267404cb3be716be40973207f4a76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20K=C3=BCttel?= <moritz.kuettel@wsl.ch>
Date: Wed, 7 Mar 2018 21:16:40 +0100
Subject: [PATCH 1412/2266] projectlibre: init at 1.7.0

Closes #24466
---
 .../misc/projectlibre/default.nix             | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/misc/projectlibre/default.nix

diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
new file mode 100644
index 00000000000..579e3dd776b
--- /dev/null
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
+
+stdenv.mkDerivation rec {
+  name = "projectlibre-${version}";
+  version = "1.7.0";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/projectlibre/code";
+    rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged
+    sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";
+  };
+
+  buildInputs = [ ant jdk makeWrapper ];
+  buildPhase = ''
+    export ANT_OPTS=-Dbuild.sysclasspath=ignore
+    ${ant}/bin/ant -f openproj_build/build.xml
+  '';
+
+  resourcesPath = "openproj_build/resources";
+  desktopItem = "${resourcesPath}/projectlibre.desktop";
+
+  installPhase = ''
+    mkdir -p $out/share/{applications,projectlibre/samples,pixmaps,doc/projectlibre} $out/bin
+
+    substitute $resourcesPath/projectlibre $out/bin/projectlibre \
+      --replace "\"/usr/share/projectlibre\"" "\"$out/share/projectlibre\""
+    chmod +x $out/bin/projectlibre
+    wrapProgram $out/bin/projectlibre \
+     --prefix PATH : "${jre}/bin:${coreutils}/bin:${which}/bin"
+
+    cp -R openproj_build/dist/* $out/share/projectlibre
+    cp -R openproj_build/license $out/share/doc/projectlibre
+    cp $desktopItem $out/share/applications
+    cp $resourcesPath/projectlibre.png $out/share/pixmaps
+    cp -R $resourcesPath/samples/* $out/share/projectlibre/samples
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.projectlibre.com/";
+    descripton = "Project-Management Software similar to MS-Project";
+    maintainer = maintainers.mogria;
+    license = licenses.cpal10;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b08c1bebf1f..1f5bb304211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4354,6 +4354,8 @@ with pkgs;
 
   profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { };
 
+  projectlibre = callPackage ../applications/misc/projectlibre { };
+
   projectm = callPackage ../applications/audio/projectm { };
 
   proot = callPackage ../tools/system/proot { };

From 335394ff8155c46c03607bf343c8c3b3419ee9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20K=C3=BCttel?= <moritz.kuettel@wsl.ch>
Date: Wed, 7 Mar 2018 21:16:14 +0100
Subject: [PATCH 1413/2266] add myself (Mogria) to maintainers list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a951317d37b..07ec21841f1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -87,6 +87,11 @@
     github = "MP2E";
     name = "Cray Elliott";
   };
+  Mogria = {
+    email = "m0gr14@gmail.com";
+    github = "mogria";
+    name = "Mogria";
+  };
   MostAwesomeDude = {
     email = "cds@corbinsimpson.com";
     github = "MostAwesomeDude";

From d17e6f2c3e9fca9e5291a5dda17b9f7ce78d7e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20K=C3=BCttel?= <moritz.kuettel@wsl.ch>
Date: Wed, 7 Mar 2018 21:15:33 +0100
Subject: [PATCH 1414/2266] add the CPAL-1.0 license

The 'Common Public Attribution License 1.0' is used
for projectlibre and required for packaging it into nixpkgs.
---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 03af13b990e..ba575c27052 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -179,6 +179,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName  = "CeCILL-C Free Software License Agreement";
   };
 
+  cpal10 = spdx {
+    spdxId = "CPAL-1.0";
+    fullName = "Common Public Attribution License 1.0";
+  };
+
   cpl10 = spdx {
     spdxId = "CPL-1.0";
     fullName = "Common Public License 1.0";

From a4752e1132461a2909a80f2adee46edf5bb0bd7b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Mar 2018 20:43:54 +0100
Subject: [PATCH 1415/2266] icmake: 9.02.06 -> 9.02.07

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

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 4a37ca011c2..2f4daa2edc8 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "9.02.06";
+  version = "9.02.07";
 
   src = fetchFromGitHub {
-    sha256 = "1hs7fhqpkhlrjvjhfarf5bmxl8dw3r0immzdib27gwh3sfzgpx0b";
+    sha256 = "1q3rwri5s1sqm4h75bahkjnlym4bk2ygg4fb75yrniwnj8rhdp12";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";

From 1c361548d481682e0aa84c3c08bc6cb4582f0de1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Mar 2018 20:49:32 +0100
Subject: [PATCH 1416/2266] homebank: 5.1.7 -> 5.1.8

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index f4e59d1ca04..28b85936a28 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.1.7";
+  name = "homebank-5.1.8";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "19szz86jxya8v4r3pa5czng9q2kn5hhbk273x1wqvdv40z0577jp";
+    sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From 6550590521b9aea190aee5e3b217c3c56e0d433b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 Mar 2018 21:58:13 +0100
Subject: [PATCH 1417/2266] projectlibre: meta fixes

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

diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
index 579e3dd776b..5ba8e1b6e31 100644
--- a/pkgs/applications/misc/projectlibre/default.nix
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "http://www.projectlibre.com/";
-    descripton = "Project-Management Software similar to MS-Project";
-    maintainer = maintainers.mogria;
+    description = "Project-Management Software similar to MS-Project";
+    maintainers = [ maintainers.Mogria ];
     license = licenses.cpal10;
   };
 }

From 4e1ab9d44c02cbbff452d5c60288d764542e72a3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 18 Mar 2018 22:27:13 +0100
Subject: [PATCH 1418/2266] guile-lint: disable tests on darwin

---
 pkgs/development/tools/guile/guile-lint/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index 19441c54017..fd9347a4007 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       "exec guile" "exec ${guile}/bin/guile"
   '';
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
     description = "Checks syntax and semantics in a Guile program or module";

From af0f9fa26b02fd8c5808d89a3781d3777f8c0d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Thu, 15 Mar 2018 19:49:09 +0100
Subject: [PATCH 1419/2266] pythonPackages.tkinter: fix darwin build

---
 .../python/cpython/2.7/default.nix            |  2 +
 .../2.7/use-correct-tcl-tk-on-darwin.patch    | 48 +++++++++++++++++++
 .../python/cpython/3.4/default.nix            |  2 +
 .../3.4/use-correct-tcl-tk-on-darwin.patch    | 48 +++++++++++++++++++
 .../python/cpython/3.5/default.nix            |  2 +
 .../3.5/use-correct-tcl-tk-on-darwin.patch    | 48 +++++++++++++++++++
 .../python/cpython/3.6/default.nix            |  2 +
 .../3.6/use-correct-tcl-tk-on-darwin.patch    | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 +-
 9 files changed, 202 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
 create mode 100644 pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
 create mode 100644 pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
 create mode 100644 pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 61f17a959bd..a934d6c3bcf 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -60,6 +60,8 @@ let
 
       ./properly-detect-curses.patch
 
+    ] ++ optionals (x11Support && stdenv.isDarwin) [
+      ./use-correct-tcl-tk-on-darwin.patch
     ] ++ optionals stdenv.isLinux [
 
       # Disable the use of ldconfig in ctypes.util.find_library (since
diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+         # Rather than complicate the code below, detecting and building
+         # AquaTk is a separate method. Only one Tkinter will be built on
+         # Darwin - either AquaTk, if it is found, or X11 based Tk.
+-        if (host_platform == 'darwin' and
+-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+-            return
+
+         # Assume we haven't found any of the libraries or include files
+         # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+             if dir not in include_dirs:
+                 include_dirs.append(dir)
+
+-        # Check for various platform-specific directories
+-        if host_platform == 'sunos5':
+-            include_dirs.append('/usr/openwin/include')
+-            added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
+-            # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
+-
+         # If Cygwin, then verify that X is installed before proceeding
+         if host_platform == 'cygwin':
+             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
+-            libs.append('X11')
+-
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
+                         include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 4c0979ca0e3..d4391d873af 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -67,6 +67,8 @@ in stdenv.mkDerivation {
   patches = [
     ./no-ldconfig.patch
     ./ld_library_path.patch
+  ] ++ optionals (x11Support && stdenv.isDarwin) [
+    ./use-correct-tcl-tk-on-darwin.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+         # Rather than complicate the code below, detecting and building
+         # AquaTk is a separate method. Only one Tkinter will be built on
+         # Darwin - either AquaTk, if it is found, or X11 based Tk.
+-        if (host_platform == 'darwin' and
+-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+-            return
+
+         # Assume we haven't found any of the libraries or include files
+         # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+             if dir not in include_dirs:
+                 include_dirs.append(dir)
+
+-        # Check for various platform-specific directories
+-        if host_platform == 'sunos5':
+-            include_dirs.append('/usr/openwin/include')
+-            added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
+-            # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
+-
+         # If Cygwin, then verify that X is installed before proceeding
+         if host_platform == 'cygwin':
+             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
+-            libs.append('X11')
+-
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
+                         include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index a8519a76a23..4f9e79c1d5f 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -67,6 +67,8 @@ in stdenv.mkDerivation {
   patches = [
     ./no-ldconfig.patch
     ./ld_library_path.patch
+  ] ++ optionals (x11Support && stdenv.isDarwin) [
+    ./use-correct-tcl-tk-on-darwin.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+         # Rather than complicate the code below, detecting and building
+         # AquaTk is a separate method. Only one Tkinter will be built on
+         # Darwin - either AquaTk, if it is found, or X11 based Tk.
+-        if (host_platform == 'darwin' and
+-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+-            return
+
+         # Assume we haven't found any of the libraries or include files
+         # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+             if dir not in include_dirs:
+                 include_dirs.append(dir)
+
+-        # Check for various platform-specific directories
+-        if host_platform == 'sunos5':
+-            include_dirs.append('/usr/openwin/include')
+-            added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
+-            # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
+-
+         # If Cygwin, then verify that X is installed before proceeding
+         if host_platform == 'cygwin':
+             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
+-            libs.append('X11')
+-
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
+                         include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index fb58d0871ec..317a335b344 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -69,6 +69,8 @@ in stdenv.mkDerivation {
 
   patches = [
     ./no-ldconfig.patch
+  ] ++ optionals (x11Support && stdenv.isDarwin) [
+    ./use-correct-tcl-tk-on-darwin.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+         # Rather than complicate the code below, detecting and building
+         # AquaTk is a separate method. Only one Tkinter will be built on
+         # Darwin - either AquaTk, if it is found, or X11 based Tk.
+-        if (host_platform == 'darwin' and
+-            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+-            return
+
+         # Assume we haven't found any of the libraries or include files
+         # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+             if dir not in include_dirs:
+                 include_dirs.append(dir)
+
+-        # Check for various platform-specific directories
+-        if host_platform == 'sunos5':
+-            include_dirs.append('/usr/openwin/include')
+-            added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
+-            # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
+-
+         # If Cygwin, then verify that X is installed before proceeding
+         if host_platform == 'cygwin':
+             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
+-            libs.append('X11')
+-
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
+                         include_dirs = include_dirs,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8acec15fd71..8e4da97d3d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16394,15 +16394,14 @@ in {
       # Move the tkinter module
       mkdir -p $out/${py.sitePackages}
       mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
+    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
       # Update the rpath to point to python without x11Support
       old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
       new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
       patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
     '';
 
-    meta = py.meta // {
-      platforms = platforms.linux;
-    };
+    meta = py.meta;
   };
 
   tlslite = buildPythonPackage rec {

From f9dda86b39bb40da707c50191ba11f537ff68149 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 18 Mar 2018 23:28:34 +0100
Subject: [PATCH 1420/2266] sqldeveloper: 17.4.0.355.2349 -> 17.4.1.054.0712

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

diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 72c0aaabf85..a5d5702029b 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, requireFile, unzip, openjdk }:
 
 stdenv.mkDerivation rec {
-  version = "17.4.0.355.2349";
+  version = "17.4.1.054.0712";
   name = "sqldeveloper-${version}";
 
   src = requireFile rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
         nix-prefetch-url --type sha256 file:///path/to/${name}
     '';
     # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip`
-    sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850";
+    sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a";
   };
 
   buildInputs = [ makeWrapper unzip ];

From bd836b7761a495e6c48979b728fa279a42241a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 18 Mar 2018 23:37:12 +0100
Subject: [PATCH 1421/2266] python3Packages.pycurl: fix darwin build

---
 pkgs/development/python-modules/pycurl/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index e1d9158a4f7..27a9790dce0 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -24,7 +24,13 @@ buildPythonPackage rec {
   checkInputs = [ bottle pytest nose flaky ];
 
   checkPhase = ''
-    py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
+    py.test -k "not ssh_key_cb_test \
+                and not test_libcurl_ssl_gnutls \
+                and not test_libcurl_ssl_nss \
+                and not test_libcurl_ssl_openssl \
+                and not test_libcurl_ssl_unrecognized \
+                and not test_request_with_verifypeer \
+                and not test_ssl_in_static_libs" tests
   '';
 
   preConfigure = ''

From c146f603ce50b7fd48c744c24782fbc7cd2ae3f3 Mon Sep 17 00:00:00 2001
From: rardiol <ricardo.ardissone@gmail.com>
Date: Wed, 15 Feb 2017 04:11:59 -0200
Subject: [PATCH 1422/2266] widelands: fix launchpad url

and .desktop name
---
 pkgs/games/widelands/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index 94fd23cd8cb..222275a2ba1 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://launchpad.net/widelands/build${version}/build${version}/+download/"
-        + "widelands-build${version}-src.tar.bz2";
-    sha256 = "19h1gina7k1ai2mn2fd75lxm8iz8wrs6dz6dchdvg8i8d39gj4g5";
+    url = "http://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-src-gcc7.tar.bz2";
+    sha256 = "0n2lb1c2dix32j90nir96zfqivn63izr1pmabjnhns3wbb7vhwzg";
   };
 
   preConfigure = ''
@@ -47,12 +46,12 @@ stdenv.mkDerivation rec {
   ];
 
   prePatch = ''
-    substituteInPlace ./debian/widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/"
+    substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/"
   '';
 
   postInstall = ''
     mkdir -p "$out/share/applications/"
-    cp -v "../debian/widelands.desktop" "$out/share/applications/"
+    cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/"
   '';
 
   enableParallelBuilding = true;

From 754911847e2a5ab3bebb252facd222ae4f87c3c9 Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 18 Mar 2018 19:17:44 -0400
Subject: [PATCH 1423/2266] unifi: 5.6.30 -> 5.6.36

[Release Notes](https://community.ubnt.com/t5/UniFi-Updates-Blog/UniFi-5-6-36-LTS-Stable-has-been-released/ba-p/2277323)
---
 pkgs/servers/unifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 040a2ece303..e9d2fd07dc5 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "unifi-controller-${version}";
-  version = "5.6.30";
+  version = "5.6.36";
 
   src = fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
-    sha256 = "083bh29i7dpn0ajc6h584vhkybiavnln3xndpb670chfrbywxyj4";
+    sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
   };
 
   buildInputs = [ dpkg ];

From 8aaa17c52a1b07874a0cf4fb03d2ac3ca9e8c2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Mon, 19 Mar 2018 01:02:14 +0100
Subject: [PATCH 1424/2266] pythonPackages.notebook: fix darwin build

The send2trash library, which is now included in the notebook doesn't
succeed during build, even though it works.
---
 pkgs/development/python-modules/notebook/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index be5a798b6c6..d4e7de2872d 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
 , nose
@@ -48,7 +49,11 @@ buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
     mkdir tmp
-    HOME=tmp nosetests -v
+    HOME=tmp nosetests -v ${if (stdenv.isDarwin) then ''
+      --exclude test_delete \
+      --exclude test_checkpoints_follow_file
+    ''
+    else ""}
   '';
 
   meta = {

From 734323872a7271625e4948d9732f8ad0d59e9332 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 09:03:18 +0800
Subject: [PATCH 1425/2266] qscintilla: fix build on darwin

---
 .../libraries/qscintilla/default.nix          | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index f5c5a667418..d6bd90fa47d 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, unzip
+{ stdenv, lib, fetchurl, unzip
 , qt4 ? null, qmake4Hook ? null
-, withQt5 ? false, qtbase ? null, qmake ? null
+, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -14,29 +14,25 @@ stdenv.mkDerivation rec {
     sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
   };
 
-  buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
-  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
+  buildInputs = [ (if withQt5 then qtbase else qt4) ]
+    ++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+  nativeBuildInputs = [ unzip ]
+    ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
 
   enableParallelBuilding = true;
 
   preConfigure = ''
     cd Qt4Qt5
-    ${if withQt5
-      then ''
-    sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
-           -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
-           -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \
-           -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \
-           -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \
-           -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share," \
-           qscintilla.pro
-    ''
-      else ''
-    sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
-           -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
-           -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
-           -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
-           qscintilla.pro
+    sed -i qscintilla.pro \
+      -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
+      -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
+      -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \
+    ${if withQt5 then ''
+      -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \
+      -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \
+      -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share,"
+    '' else ''
+      -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt,"
     ''}
   '';
 

From 9ff2b67dbc45acd915891b2da757197d50ddb80e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 18 Mar 2018 22:38:06 -0300
Subject: [PATCH 1426/2266] src: 1.17 -> 1.18

---
 .../version-management/src/default.nix           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 2bde0a68480..4a4879600ae 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "src-${version}";
-  version = "1.17";
+  version = "1.18";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${name}.tar.gz";
-    sha256 = "17885hpq8nxhqzwl50nrgdk1q9dq4cxjxldgkk8shdf08s5hcqhk";
+    sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c";
   };
 
   buildInputs = [ python rcs git makeWrapper ];
@@ -24,9 +24,17 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple single-file revision control";
-    homepage = http://www.catb.org/~esr/src/;
+    longDescription = ''
+      SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a
+      modern UI, designed to manage single-file solo projects kept more than one
+      to a directory. Use it for FAQs, ~/bin directories, config files, and the
+      like. Features integer sequential revision numbers, a command set that
+      will seem familiar to Subversion/Git/hg users, and no binary blobs
+      anywhere.
+    '';
+    homepage = http://www.catb.org/esr/src/;
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ calvertvl ];
+    maintainers = with maintainers; [ calvertvl AndersonTorres ];
   };
 }

From 8254d2cfb0edaa6d80da4e0f512c9201666c96ea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 19 Mar 2018 05:11:01 +0200
Subject: [PATCH 1427/2266] nss: Fix aarch64 build

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 5c23f3dfde9..8662b956ce2 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -2,6 +2,12 @@
 
 let
 
+  # Fix aarch64 build, shouldn't be needed after 3.35
+  aarch64Patch = fetchurl {
+    url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b;
+    sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq";
+  };
+
   nssPEM = fetchurl {
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
@@ -23,6 +29,8 @@ in stdenv.mkDerivation rec {
 
   prePatch = ''
     xz -d < ${nssPEM} | patch -p1
+  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+      (cd nss && patch -p1 < ${aarch64Patch})
   '';
 
   patches =

From 94ff822eec9376f998a2e6f9255ab9643a53c860 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 19 Mar 2018 03:33:13 +0000
Subject: [PATCH 1428/2266] jogl: init at 2.3.2

---
 .../development/java-modules/jogl/default.nix | 56 +++++++++++++++++++
 pkgs/top-level/java-packages.nix              |  3 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/java-modules/jogl/default.nix

diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
new file mode 100644
index 00000000000..03d5a05942f
--- /dev/null
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchgit, makeWrapper, ant, jdk, git, xorg, udev }:
+
+{
+  jogl_2_3_2 =
+    let
+      version = "2.3.2";
+
+      gluegen-src = fetchgit {
+        url = git://jogamp.org/srv/scm/gluegen.git;
+        rev = "v${version}";
+        sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
+        fetchSubmodules = true;
+      };
+    in stdenv.mkDerivation rec {
+      name = "jogl-${version}";
+
+      src = fetchgit {
+        url = http://jogamp.org/srv/scm/jogl.git;
+        rev = "v${version}";
+        sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = [ jdk ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
+
+      buildPhase = ''
+        cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
+        chmod -R +w $NIX_BUILD_TOP/gluegen
+        ( cd ../gluegen/make
+          ant )
+
+        ( cd make
+
+          # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
+          # if arm/aarch64 support will be added, this block might be commented out on those platforms
+          # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
+          cp build-newt.xml build-newt.xml.old
+          fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml
+
+          ant )
+      '';
+
+      installPhase = ''
+        mkdir -p $out/share/java
+        cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
+        cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar  $out/share/java/
+      '';
+
+      meta = with stdenv.lib; {
+        description = "Java libraries for 3D Graphics, Multimedia and Processing";
+        homepage = http://jogamp.org/;
+        license = licenses.bsd3;
+        platforms = [ "x86_64-linux" ];
+      };
+    };
+}
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 0df0b5a51c9..77cd5b0eba5 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -61,6 +61,9 @@ in {
     junit_3_8_2
     junit_4_12;
 
+  inherit (callPackage ../development/java-modules/jogl { })
+    jogl_2_3_2;
+
   inherit (callPackage ../development/java-modules/log4j { inherit fetchMaven; })
     log4j_1_2_12;
 

From 059f33c6dec158d3c0aec6f00f741fafad94b50f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 15:11:39 +0800
Subject: [PATCH 1429/2266] terraform: 0.11.3 -> 0.11.4

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 890fe231cbf..8b3e83ea86f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -100,8 +100,8 @@ in rec {
   terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
 
   terraform_0_11 = pluggable (generic {
-    version = "0.11.3";
-    sha256 = "0637x7jcm62pdnivmh4rggly6dmlvdh3jpsd1z4vba15gbm203nz";
+    version = "0.11.4";
+    sha256 = "1r3x7qv0bfsnmj7l3hmsww26rb9hkg361515gpvjjzafz5b7bz0c";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 446837818770ff40f8d0b89dfdbfd37e471cb7e7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 15:11:49 +0800
Subject: [PATCH 1430/2266] terraform: update plugins

---
 .../networking/cluster/terraform/providers/data.nix  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index ce5e9ac048e..ab00cc7772b 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -11,8 +11,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-archive";
-      version = "1.0.1";
-      sha256  = "1qxw9c38hsdmxyrrnl7s9iwlzjrwzml2m74bs4iw120gljpqphqz";
+      version = "1.0.2";
+      sha256  = "0n8939qai01lrk4kq3w344a73z6bfqbfq9yl28yh93fvmpkv6jz2";
     };
   arukas =
     {
@@ -46,8 +46,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.2.0";
-      sha256  = "10j7lk3rrlix04pcnnz25h0bm336nnmf3c2a1760v272sjdph51z";
+      version = "1.3.0";
+      sha256  = "0szw7fmdwy8r99w40z2h7fp5znj8s0ddbcwrgm1g3vdcp757vcg5";
     };
   bitbucket =
     {
@@ -431,8 +431,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.1.0";
-      sha256  = "10ghzwss3n95yln7brzwghkc0gv7bkmyml7zlj7hfbkjr3382m1p";
+      version = "1.2.0";
+      sha256  = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v";
     };
   softlayer =
     {

From 5e0cf582c1337c53bd796fc952a1e7417e30754b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 3 Aug 2017 02:30:42 +0200
Subject: [PATCH 1431/2266] node_webkit/nwjs: 0.12 -> 0.23.6

Keep 0.12, because it is still needed by `nixui`.
Keep 0.9, because it is still needed by `zed`.
---
 pkgs/development/tools/node-webkit/nw11.nix | 59 --------------
 pkgs/development/tools/nwjs/default.nix     | 87 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 22 +++---
 3 files changed, 99 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/tools/node-webkit/nw11.nix
 create mode 100644 pkgs/development/tools/nwjs/default.nix

diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix
deleted file mode 100644
index 5028ac9580c..00000000000
--- a/pkgs/development/tools/node-webkit/nw11.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper
-, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
-, libnotify}:
-let
-  bits = if stdenv.system == "x86_64-linux" then "x64"
-         else "ia32";
-
-  nwEnv = buildEnv {
-    name = "node-webkit-env";
-    paths = [
-      xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf
-      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
-      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
-      xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
-      libnotify
-    ];
-    
-    extraOutputsToInstall = [ "lib" "out" ];
-  };
-
-in stdenv.mkDerivation rec {
-  name = "node-webkit-${version}";
-  version = "0.11.2";
-
-  src = fetchurl {
-    url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
-    sha256 = if bits == "x64" then
-      "1iby0yrnbk9xfcsfz59f6g00l6rxiyxvq78shs0c145ky7lknq5q" else
-      "1hk3c9z3kwmqaj87vc5k1a7fv8jhkyqw1wjmsl3q5i50w880h398";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/node-webkit
-    cp -R * $out/share/node-webkit
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
-
-    ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0
-
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
-
-    mkdir -p $out/bin
-    ln -s $out/share/node-webkit/nw $out/bin
-    ln -s $out/share/node-webkit/nwsnapshot $out/bin
-  '';
-
-  buildInputs = [ makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "An app runtime based on Chromium and node.js";
-    homepage = https://github.com/rogerwang/node-webkit;
-    platforms = ["i686-linux" "x86_64-linux"];
-    maintainers = [ maintainers.offline ];
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
new file mode 100644
index 00000000000..6a2995b2bbe
--- /dev/null
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper
+
+, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
+, libnotify
+, ffmpeg, libxcb, libXScrnSaver, cups
+, sqlite, udev
+}:
+let
+  bits = if stdenv.system == "x86_64-linux" then "x64"
+         else "ia32";
+
+  nwEnv = buildEnv {
+    name = "nwjs-env";
+    paths = [
+      xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk_pixbuf
+      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
+      xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
+      xorg.libXScrnSaver cups
+      libcap libnotify
+      # libnw-specific (not chromium dependencies)
+      ffmpeg libxcb
+      # chromium runtime deps (dlopen’d)
+      sqlite udev
+    ];
+
+    extraOutputsToInstall = [ "lib" "out" ];
+  };
+
+in stdenv.mkDerivation rec {
+  name = "nwjs-${version}";
+  version = "0.23.6";
+
+  src = fetchurl {
+    url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
+    sha256 = if bits == "x64" then
+      "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else
+      "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  # we have runtime deps like sqlite3 that should remain
+  dontPatchELF = true;
+
+  installPhase =
+    let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+    in ''
+      mkdir -p $out/share/nwjs
+      cp -R * $out/share/nwjs
+      find $out/share/nwjs
+
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
+
+      ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0
+
+      libpath="$out/share/nwjs/lib/"
+      for f in "$libpath"/*.so; do
+        patchelf --set-rpath "${nwEnv}/lib:${ccPath}:$libpath" "$f"
+      done
+      patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${ccPath}:$libpath" $out/share/nwjs/nw
+      # check, whether all RPATHs are correct (all dependencies found)
+      checkfile=$(mktemp)
+      for f in "$libpath"/*.so "$out/share/nwjs/nw"; do
+         (echo "$f:";
+          ldd "$f"  ) > "$checkfile"
+      done
+      if <"$checkfile" grep -e "not found"; then
+        cat "$checkfile"
+        exit 1
+      fi
+
+      mkdir -p $out/bin
+      ln -s $out/share/nwjs/nw $out/bin
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "An app runtime based on Chromium and node.js";
+    homepage = http://nwjs.io/;
+    platforms = ["i686-linux" "x86_64-linux"];
+    maintainers = [ maintainers.offline ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f5bb304211..9811c991477 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7955,20 +7955,20 @@ with pkgs;
 
   nexus = callPackage ../development/tools/repository-managers/nexus { };
 
-  node_webkit = node_webkit_0_9;
+  nwjs = callPackage ../development/tools/nwjs {
+    gconf = pkgs.gnome2.GConf;
+  };
 
+  # only kept for zed, see https://github.com/NixOS/nixpkgs/issues/37361
+  nwjs_0_9 = callPackage ../development/tools/node-webkit/nw9.nix {
+    gconf = pkgs.gnome2.GConf;
+  };
+
+  # only kept for nixui, see https://github.com/matejc/nixui/issues/27
   nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
     gconf = pkgs.gnome2.GConf;
   };
 
-  node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix {
-    gconf = pkgs.gnome2.GConf;
-  };
-
-  node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix {
-    gconf = pkgs.gnome2.GConf;
-  };
-
   noweb = callPackage ../development/tools/literate-programming/noweb { };
   nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
 
@@ -18581,7 +18581,9 @@ with pkgs;
     useMupdf = config.zathura.useMupdf or true;
   };
 
-  zed = callPackage ../applications/editors/zed { };
+  zed = callPackage ../applications/editors/zed {
+    node_webkit = nwjs_0_9;
+  };
 
   zeroc_ice = callPackage ../development/libraries/zeroc-ice {
     inherit (darwin.apple_sdk.frameworks) Security;

From 635114b889be9f99d4bd05bdb95b949a7e41ec67 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 6 Mar 2018 10:01:01 -0600
Subject: [PATCH 1432/2266] emacs: use unstable melpa for dependencies

remove melpaStablePackages from default scope
---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 99863eb76a8..fbad836bc1b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -385,9 +385,9 @@ let
 in
   lib.makeScope newScope (self:
     {}
+    // melpaStablePackages self
     // melpaPackages self
     // elpaPackages self
-    // melpaStablePackages self
     // orgPackages self
     // packagesFun self
   )

From 887e6302bdfa9b93fedf022181b0f20c510b9cc0 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 19 Mar 2018 08:44:21 +0000
Subject: [PATCH 1433/2266] jogl: temporary workaround for openjdk8

---
 pkgs/development/java-modules/jogl/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 03d5a05942f..474eaa0e1dc 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchgit, makeWrapper, ant, jdk, git, xorg, udev }:
+{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }:
 
+let
+  # workaround https://github.com/NixOS/nixpkgs/issues/37364
+  jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
+in
 {
   jogl_2_3_2 =
     let
@@ -21,7 +25,7 @@
         fetchSubmodules = true;
       };
 
-      buildInputs = [ jdk ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
+      buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
 
       buildPhase = ''
         cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen

From 1e2eec169a06dc6510f961a2850a3c52a774d2b1 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 19 Mar 2018 03:37:29 +0000
Subject: [PATCH 1434/2266] gephi: build from sources

---
 .../science/misc/gephi/default.nix            | 83 ++++++++++++-------
 1 file changed, 55 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index 82b95132d88..3a0bcb66813 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -1,37 +1,64 @@
-{stdenv, fetchurl, jdk}:
+{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }:
 
-with stdenv.lib;
+let
+  version = "0.9.2";
 
-let version = "0.9.2"; in
-stdenv.mkDerivation {
-  name = "gephi-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/gephi/gephi/releases/download/v${version}/gephi-${version}-linux.tar.gz";
-    sha256 = "1wr3rka8j2y10nnwbg27iaxkbrp4d7d07ccs9n94yqv6wqawj5z8";
+  src = fetchFromGitHub {
+    owner = "gephi";
+    repo = "gephi";
+    rev = "v${version}";
+    sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r";
   };
 
-  meta = {
-    inherit version;
+  # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
+  deps = stdenv.mkDerivation {
+    name = "gephi-${version}-deps";
+    inherit src;
+    buildInputs = [ jdk maven ];
+    buildPhase = ''
+      while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
+        echo "timeout, restart maven to continue downloading"
+      done
+    '';
+    # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
+    installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "gephi-${version}";
+
+  inherit src;
+
+  buildInputs = [ jdk maven ];
+
+  buildPhase = ''
+    # 'maven.repo.local' must be writable so copy it out of nix store
+    mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+  '';
+
+  installPhase = ''
+    cp -r modules/application/target/gephi $out
+
+    # remove garbage
+    find $out -type f -name  .lastModified -delete
+    find $out -type f -regex '.+\.exe'     -delete
+
+    # use self-compiled JOGL to avoid patchelf'ing .so inside jars
+    rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
+    cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
+    cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
+
+    echo "jdkhome=${jdk}" >> $out/etc/gephi.conf
+  '';
+
+  meta = with stdenv.lib; {
     description = "A platform for visualizing and manipulating large graphs";
     homepage = https://gephi.org;
     license = licenses.gpl3;
-    maintainers = [maintainers.taeer];
-    platforms = platforms.linux;
+    maintainers = [ maintainers.taeer ];
+    platforms = [ "x86_64-linux" ];
   };
-
-  buildInputs = [jdk];
-
-  configurePhase = "
-    echo \"jdkhome=${jdk}\" >> etc/gephi.conf
-  ";
-
-  dontBuild = true;
-
-  installPhase = "
-    mkdir $out
-    for a in ./*; do
-      mv $a $out
-    done
-  ";
 }

From d8c26c0db7a510d586167ec6d7a10fe1c53d7048 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Mon, 19 Mar 2018 15:49:28 +0800
Subject: [PATCH 1435/2266] pythonPackages.thumbor: mark as broken under Python
 3

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

diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 21b391b8e75..94261b10e3d 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -7,6 +7,8 @@ buildPythonPackage rec {
   pname = "thumbor";
   version = "6.4.2";
 
+  disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";

From 6634049f220ac0cde10cf9c3725c7f41d21e020a Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Tue, 13 Mar 2018 15:49:34 +0100
Subject: [PATCH 1436/2266] stabber: init at 2016-11-09

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

diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
new file mode 100644
index 00000000000..ec8ef076c2f
--- /dev/null
+++ b/pkgs/misc/stabber/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat
+, libmicrohttpd
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "stabber-unstable-${version}";
+  version = "2016-11-09";
+
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "stabber";
+    rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4";
+    sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p";
+  };
+
+  preAutoreconf = ''
+    mkdir m4
+  '';
+
+  buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ];
+
+  meta = {
+    description = "Stubbed XMPP Server";
+    homepage = https://github.com/boothj5/stabber;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ hschaeidt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8858029a687..b3cd06e92aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4894,6 +4894,8 @@ with pkgs;
 
   ssss = callPackage ../tools/security/ssss { };
 
+  stabber = callPackage ../misc/stabber { };
+
   stress = callPackage ../tools/system/stress { };
 
   stress-ng = callPackage ../tools/system/stress-ng { };

From 86ff559f8282cdffd108933f48f9d3b13539ab74 Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Wed, 14 Mar 2018 16:38:06 +0100
Subject: [PATCH 1437/2266] add hschaeidt to maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f4e4355673..b31ed2d083d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1523,6 +1523,11 @@
     github = "hrdinka";
     name = "Christoph Hrdinka";
   };
+  hschaeidt = {
+    email = "he.schaeidt@gmail.com";
+    github = "hschaeidt";
+    name = "Hendrik Schaeidt";
+  };
   htr = {
     email = "hugo@linux.com";
     github = "htr";

From c9bbf071bdb79270b0028885dcea3783d99b611b Mon Sep 17 00:00:00 2001
From: y0no <yoann.onoditbiot@synhack.fr>
Date: Tue, 6 Feb 2018 11:30:26 +0100
Subject: [PATCH 1438/2266] pythonPackages.ipy: 0.74 -> 0.83

---
 .../python-modules/IPy/default.nix            | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +--------------
 2 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/IPy/default.nix

diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix
new file mode 100644
index 00000000000..eacfe8dda5b
--- /dev/null
+++ b/pkgs/development/python-modules/IPy/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  pname = "IPy";
+  version = "0.83";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8";
+  };
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests -e fuzz
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
+    homepage = "https://github.com/autocracy/python-ipy";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ y0no ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eea50ebd3eb..657d399696b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8637,24 +8637,7 @@ in {
     };
   };
 
-
-  ipy = buildPythonPackage rec {
-    version = "0.74";
-    name = "ipy-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/I/IPy/IPy-${version}.tar.gz";
-      sha256 = "5d6abb870c25f946c45c35cf50e66155598660f2765b35cb12e36ed5223c2b89";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
-      homepage = https://pypi.python.org/pypi/IPy;
-    };
-  };
+  ipy = callPackage ../development/python-modules/IPy { };
 
   ipykernel = callPackage ../development/python-modules/ipykernel { };
 

From a15544d5f5103c5a6e8bb0fabbe35669b2ede75f Mon Sep 17 00:00:00 2001
From: y0no <yoann.onoditbiot@synhack.fr>
Date: Tue, 6 Feb 2018 11:32:44 +0100
Subject: [PATCH 1439/2266] pythonPackages.ajpy: init at 0.0.2

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

diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix
new file mode 100644
index 00000000000..9d1905fe914
--- /dev/null
+++ b/pkgs/development/python-modules/ajpy/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "ajpy";
+  version = "0.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "740e7daf728ba58dabaf4af2c4305262eb207a6e41791424a146a21396ceb9ad";
+  };
+
+  # ajpy doesn't have tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "AJP package crafting library";
+    homepage = "https://github.com/hypn0s/AJPy/";
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ y0no ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 657d399696b..24aff6da851 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -452,6 +452,8 @@ in {
 
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
+  ajpy = callPackage ../development/python-modules/ajpy { };
+
   alabaster = callPackage ../development/python-modules/alabaster {};
 
   alembic = callPackage ../development/python-modules/alembic {};

From c9366518fa710258e8f4c3810761b08fabe47caf Mon Sep 17 00:00:00 2001
From: y0no <yoann.onoditbiot@synhack.fr>
Date: Tue, 6 Feb 2018 11:33:55 +0100
Subject: [PATCH 1440/2266] pythonPackages.cx_oracle: init at 6.1

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

diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
new file mode 100644
index 00000000000..e63c4107e09
--- /dev/null
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }:
+
+buildPythonPackage rec {
+  pname = "cx_Oracle";
+  version = "6.1";
+
+  buildInputs = [
+    oracle-instantclient
+  ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "80545fc7acbdda917dd2b1604c938141256bdfed3ad464a44586c9c2f09c3004";
+  };
+
+  # Check need an Oracle database to run  
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python interface to Oracle";
+    homepage = "https://oracle.github.io/python-cx_Oracle";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ y0no ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 24aff6da851..06adc7018f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1435,6 +1435,8 @@ in {
 
   cx_Freeze = callPackage ../development/python-modules/cx_freeze {};
 
+  cx_oracle = callPackage ../development/python-modules/cx_oracle {};
+
   cvxopt = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "cvxopt";

From 38719d170d13926bfe36f22ab0e8ae12f2d20105 Mon Sep 17 00:00:00 2001
From: y0no <yoann.onoditbiot@synhack.fr>
Date: Tue, 6 Feb 2018 11:34:54 +0100
Subject: [PATCH 1441/2266] pythonPackages.mysqlclient: init at 1.3.12

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

diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
new file mode 100644
index 00000000000..0be0f892d73
--- /dev/null
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, libmysql }:
+
+buildPythonPackage rec {
+  pname = "mysqlclient";
+  version = "1.3.12";
+
+  buildInputs = [
+    libmysql
+  ];
+
+  # Tests need a MySQL database
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python interface to MySQL";
+    homepage = "https://github.com/PyMySQL/mysqlclient-python";
+    license = licenses.gpl1;
+    maintainers = with maintainers; [ y0no ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06adc7018f0..86b08455cd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10123,6 +10123,8 @@ in {
 
   mygpoclient = callPackage ../development/python-modules/mygpoclient { };
 
+  mysqlclient = callPackage ../development/python-modules/mysqlclient { };
+
   mwclient = buildPythonPackage rec {
     version = "0.8.3";
     pname = "mwclient";

From 0725d666d6eee92f2cc810ff61cb4b86669c1aa7 Mon Sep 17 00:00:00 2001
From: y0no <yoann.onoditbiot@synhack.fr>
Date: Tue, 6 Feb 2018 11:37:11 +0100
Subject: [PATCH 1442/2266] pythonPackages.patator: init at 0.7

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

diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix
new file mode 100644
index 00000000000..46601c16755
--- /dev/null
+++ b/pkgs/development/python-modules/patator/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi,
+  paramiko, pycurl, ajpy, pyopenssl, cx_oracle, mysqlclient,
+  psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1 }:
+
+
+buildPythonPackage rec {
+  pname = "patator";
+  version = "0.7";
+  disabled = !(isPy3k);
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1";
+  };
+
+  propagatedBuildInputs = [
+    paramiko
+    pycurl
+    ajpy
+    pyopenssl
+    cx_oracle
+    mysqlclient
+    psycopg2
+    pycrypto
+    dnspython
+    ipy
+    pysnmp
+    pyasn1
+  ];
+
+  # No tests provided by patator
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "multi-purpose brute-forcer";
+    homepage = "https://github.com/lanjelot/patator";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ y0no ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86b08455cd7..b8f8167902c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11792,6 +11792,8 @@ in {
     };
   };
 
+  patator = callPackage ../development/python-modules/patator { };
+
   pathlib = buildPythonPackage rec {
     name = "pathlib-${version}";
     version = "1.0.1";

From 4cc1cd851648a7122fcf9751d1f9bdde05d24878 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 13 Nov 2017 00:38:41 -0600
Subject: [PATCH 1443/2266] cmake-2.8: supports darwin

builds fine, just need to enable to
---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index b4b2a4210d2..fcf06782e4d 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
+  postPatch = ''
+    substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \
+      --replace '"-framework CoreServices"' '""'
+  '';
+
   buildInputs = [ curl expat zlib bzip2 ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
@@ -76,7 +81,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux;
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ ];
   };
 }

From 80b8caf435109504022586647e0fe6a6699b71bd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 13 Nov 2017 00:39:51 -0600
Subject: [PATCH 1444/2266] opencolorio: fix on darwin

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

diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index db9a5aeed21..3b0e60fca39 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, unzip }:
+{ stdenv, lib, fetchurl, cmake, unzip, boost }:
 
 stdenv.mkDerivation rec {
   name = "opencolorio-${version}";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "out" "dev" ];
 
-  buildInputs = [ cmake unzip ];
+  buildInputs = [ cmake unzip ] ++ lib.optional stdenv.isDarwin boost;
+
+  cmakeFlags = lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON";
 
   postInstall = ''
     rm $out/lib/*.a
@@ -23,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "A color management framework for visual effects and animation";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 397532de76e88f97f5ad2720a82547f1e3e4a18c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 13 Nov 2017 15:42:42 -0600
Subject: [PATCH 1445/2266] openimageio: supports darwin

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

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index a52515ed1a3..c33c0b31a95 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    boost ilmbase libjpeg libpng 
+    boost ilmbase libjpeg libpng
     libtiff opencolorio openexr
     unzip
   ];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "A library and tools for reading and writing images";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 8416c458652ac6a945d600e9e526893eb62c1437 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 13 Nov 2017 16:14:46 -0600
Subject: [PATCH 1446/2266] opensubdiv: fix darwin build

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

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 2886ef2b6b0..62c093f310f 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
 , libGL, glew, ocl-icd, python3
 , cudaSupport ? false, cudatoolkit
+, darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -17,17 +18,21 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs =
-    [ cmake pkgconfig libGLU libGL ocl-icd python3
+    [ cmake pkgconfig libGLU libGL python3
       # FIXME: these are not actually needed, but the configure script wants them.
       glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
       xorg.libXinerama xorg.libXi
     ]
+    ++ lib.optional (!stdenv.isDarwin) ocl-icd
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ])
     ++ lib.optional cudaSupport cudatoolkit;
 
   cmakeFlags =
     [ "-DNO_TUTORIALS=1"
       "-DNO_REGRESSION=1"
       "-DNO_EXAMPLES=1"
+      "-DNO_METAL=1" # don’t have metal in apple sdk
+    ] ++ lib.optionals (!stdenv.isDarwin) [
       "-DGLEW_INCLUDE_DIR=${glew.dev}/include"
       "-DGLEW_LIBRARY=${glew.dev}/lib"
     ] ++ lib.optionals cudaSupport [
@@ -42,7 +47,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An Open-Source subdivision surface library";
     homepage = http://graphics.pixar.com/opensubdiv;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.eelco ];
     license = lib.licenses.asl20;
   };

From 867fb4981d84f50e0fd835005bdc0a573e443b79 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 13 Nov 2017 16:18:04 -0600
Subject: [PATCH 1447/2266] opencollada: fix on darwin

---
 pkgs/development/libraries/opencollada/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index af01c23fe1a..fb119936703 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre
+, darwin}:
 
 stdenv.mkDerivation rec {
   name = "opencollada-${version}";
@@ -13,16 +14,22 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake ];
+  buildInputs = [ cmake ]
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]);
 
   propagatedBuildInputs = [ libxml2 pcre ];
 
   enableParallelBuilding = true;
 
+  patchPhase = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
+      --replace math.h cmath
+  '';
+
   meta = {
     description = "A library for handling the COLLADA file format";
     homepage = https://github.com/KhronosGroup/OpenCOLLADA/;
     maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 2220b5fe99acf5f31f825ee659f23c9b729c228f Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 19 Mar 2018 11:59:55 +0000
Subject: [PATCH 1448/2266] godot: update patches for 3.0.2

---
 .../tools/godot/pkg_config_additions.patch         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index 4870ec3cd70..f20226c5819 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,15 +1,17 @@
 +++ build/platform/x11/detect.py
-@@ -142,3 +142,10 @@
+@@ -142,8 +142,13 @@
      env.ParseConfig('pkg-config xcursor --cflags --libs')
      env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
+-
+-    if (env['touch']):
 +    env.ParseConfig('pkg-config xrender --cflags --libs')
-+    env.ParseConfig('pkg-config xi --cflags --libs')
 +    env.ParseConfig('pkg-config xext --cflags --libs')
 +    env.ParseConfig('pkg-config xfixes --cflags --libs')
-+    env.ParseConfig('pkg-config oslibGLU_combined --cflags')
 +    env.ParseConfig('pkg-config glu --cflags --libs')
 +    env.ParseConfig('pkg-config zlib --cflags --libs')
-
-     if (env['builtin_openssl'] == 'no'):
-         # Currently not compatible with OpenSSL 1.1.0+
++
++    if (env['touch']):
+         x11_error = os.system("pkg-config xi --modversion > /dev/null ")
+         if (x11_error):
+             print("xi not found.. cannot build with touch. Aborting.")

From fdf0f037be55c5c14e24667b1ad7eeedf2057295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 12 Mar 2018 20:20:24 +0100
Subject: [PATCH 1449/2266] nixos/borgbackup: init

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/backup/borgbackup.nix | 580 +++++++++++++++++++
 nixos/tests/borgbackup.nix                   | 163 +++++-
 3 files changed, 733 insertions(+), 11 deletions(-)
 create mode 100644 nixos/modules/services/backup/borgbackup.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3bb65c6b295..aa7806a7a9e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -159,6 +159,7 @@
   ./services/audio/ympd.nix
   ./services/backup/almir.nix
   ./services/backup/bacula.nix
+  ./services/backup/borgbackup.nix
   ./services/backup/crashplan.nix
   ./services/backup/crashplan-small-business.nix
   ./services/backup/mysql-backup.nix
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
new file mode 100644
index 00000000000..1b730e0c2b7
--- /dev/null
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -0,0 +1,580 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  isLocalPath = x:
+    builtins.substring 0 1 x == "/"      # absolute path
+    || builtins.substring 0 1 x == "."   # relative path
+    || builtins.match "[.*:.*]" == null; # not machine:path
+ 
+  mkExcludeFile = cfg:
+    # Write each exclude pattern to a new line
+    pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude);
+
+  mkKeepArgs = cfg:
+    # If cfg.prune.keep e.g. has a yearly attribute,
+    # its content is passed on as --keep-yearly
+    concatStringsSep " "
+      (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep);
+
+  mkBackupScript = cfg: ''
+    on_exit()
+    {
+      exitStatus=$?
+      # Reset the EXIT handler, or else we're called again on 'exit' below
+      trap - EXIT
+      ${cfg.postHook}
+      exit $exitStatus
+    }
+    trap 'on_exit' INT TERM QUIT EXIT
+
+    archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})"
+    archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"
+    ${cfg.preHook}
+  '' + optionalString cfg.doInit ''
+    # Run borg init if the repo doesn't exist yet
+    if ! borg list > /dev/null; then
+      borg init \
+        --encryption ${cfg.encryption.mode} \
+        $extraInitArgs
+      ${cfg.postInit}
+    fi
+  '' + ''
+    borg create \
+      --compression ${cfg.compression} \
+      --exclude-from ${mkExcludeFile cfg} \
+      $extraCreateArgs \
+      "::$archiveName$archiveSuffix" \
+      ${escapeShellArgs cfg.paths}
+  '' + optionalString cfg.appendFailedSuffix ''
+    borg rename "::$archiveName$archiveSuffix" "$archiveName"
+  '' + ''
+    ${cfg.postCreate}
+  '' + optionalString (cfg.prune.keep != { }) ''
+    borg prune \
+      ${mkKeepArgs cfg} \
+      --prefix ${escapeShellArg cfg.prune.prefix} \
+      $extraPruneArgs
+    ${cfg.postPrune}
+  '';
+
+  mkPassEnv = cfg: with cfg.encryption;
+    if passCommand != null then
+      { BORG_PASSCOMMAND = passCommand; }
+    else if passphrase != null then
+      { BORG_PASSPHRASE = passphrase; }
+    else { };
+
+  mkBackupService = name: cfg: 
+    let
+      userHome = config.users.users.${cfg.user}.home;
+    in nameValuePair "borgbackup-job-${name}" {
+      description = "BorgBackup job ${name}";
+      path = with pkgs; [
+        borgbackup openssh
+      ];
+      script = mkBackupScript cfg;
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        # Only run when no other process is using CPU or disk
+        CPUSchedulingPolicy = "idle";
+        IOSchedulingClass = "idle";
+        ProtectSystem = "strict";
+        ReadWritePaths =
+          [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ]
+          # Borg needs write access to repo if it is not remote
+          ++ optional (isLocalPath cfg.repo) cfg.repo;
+        PrivateTmp = true;
+      };
+      environment = {
+        BORG_REPO = cfg.repo;
+        inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs;
+      } // (mkPassEnv cfg) // cfg.environment;
+      inherit (cfg) startAt;
+    };
+
+  # Paths listed in ReadWritePaths must exist before service is started
+  mkActivationScript = name: cfg:
+    let
+      install = "install -o ${cfg.user} -g ${cfg.group}";
+    in
+      nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] (''
+        # Eensure that the home directory already exists
+        # We can't assert createHome == true because that's not the case for root
+        cd "${config.users.users.${cfg.user}.home}"                                                                                                         
+        ${install} -d .config/borg
+        ${install} -d .cache/borg
+      '' + optionalString (isLocalPath cfg.repo) ''
+        ${install} -d ${escapeShellArg cfg.repo}
+      ''));
+
+  mkPassAssertion = name: cfg: {
+    assertion = with cfg.encryption;
+      mode != "none" -> passCommand != null || passphrase != null;
+    message =
+      "passCommand or passphrase has to be specified because"
+      + '' borgbackup.jobs.${name}.encryption != "none"'';
+  };
+
+  mkRepoService = name: cfg:
+    nameValuePair "borgbackup-repo-${name}" {
+      description = "Create BorgBackup repository ${name} directory";
+      script = ''
+        mkdir -p ${escapeShellArg cfg.path}
+        chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path}
+      '';
+      serviceConfig = {
+        # The service's only task is to ensure that the specified path exists
+        Type = "oneshot";
+      };
+      wantedBy = [ "multi-user.target" ];
+    };
+
+  mkAuthorizedKey = cfg: appendOnly: key:
+    let
+      # Because of the following line, clients do not need to specify an absolute repo path
+      cdCommand = "cd ${escapeShellArg cfg.path}";
+      restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} .";
+      appendOnlyArg = optionalString appendOnly "--append-only";
+      quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}";
+      serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}";
+    in
+      ''command="${cdCommand} && ${serveCommand}",restrict ${key}'';
+
+  mkUsersConfig = name: cfg: {
+    users.${cfg.user} = {
+      openssh.authorizedKeys.keys =
+        (map (mkAuthorizedKey cfg false) cfg.authorizedKeys
+        ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly);
+      useDefaultShell = true;
+    };
+    groups.${cfg.group} = { };
+  };
+
+  mkKeysAssertion = name: cfg: {
+    assertion = cfg.authorizedKeys != [ ] || cfg.authorizedKeysAppendOnly != [ ];
+    message =
+      "borgbackup.repos.${name} does not make sense"
+      + " without at least one public key";
+  };
+
+in {
+  meta.maintainers = with maintainers; [ dotlambda ];
+
+  ###### interface
+
+  options.services.borgbackup.jobs = mkOption {
+    description = "Deduplicating backups using BorgBackup.";
+    default = { };
+    example = literalExample ''
+      {
+        rootBackup = {
+          paths = "/";
+          exclude = [ "/nix" ];
+          repo = "/path/to/local/repo";
+          encryption = {
+            mode = "repokey";
+            passphrase = "secret";
+          };
+          compression = "auto,lzma";
+          startAt = "weekly";
+        };
+      }
+    '';
+    type = types.attrsOf (types.submodule (let globalConfig = config; in
+      { name, config, ... }: {
+        options = {
+
+          paths = mkOption {
+            type = with types; either path (nonEmptyListOf path);
+            description = "Path(s) to back up.";
+            example = "/home/user";
+            apply = x: if isList x then x else [ x ];
+          };
+
+          repo = mkOption {
+            type = types.str;
+            description = "Remote or local repository to back up to.";
+            example = "user@machine:/path/to/repo";
+          };
+
+          archiveBaseName = mkOption {
+            type = types.strMatching "[^/{}]+";
+            default = "${globalConfig.networking.hostName}-${name}";
+            defaultText = "\${config.networking.hostName}-<name>";
+            description = ''
+              How to name the created archives. A timestamp, whose format is
+              determined by <option>dateFormat</option>, will be appended. The full
+              name can be modified at runtime (<literal>$archiveName</literal>).
+              Placeholders like <literal>{hostname}</literal> must not be used.
+            '';
+          };
+
+          dateFormat = mkOption {
+            type = types.str;
+            description = ''
+              Arguments passed to <command>date</command>
+              to create a timestamp suffix for the archive name.
+            '';
+            default = "+%Y-%m-%dT%H:%M:%S";
+            example = "-u +%s";
+          };
+
+          startAt = mkOption {
+            type = with types; either str (listOf str);
+            default = "daily";
+            description = ''
+              When or how often the backup should run.
+              Must be in the format described in
+              <citerefentry><refentrytitle>systemd.time</refentrytitle>
+              <manvolnum>7</manvolnum></citerefentry>.
+              If you do not want the backup to start
+              automatically, use <literal>[ ]</literal>.
+            '';
+          };
+
+          user = mkOption {
+            type = types.str;
+            description = ''
+              The user <command>borg</command> is run as.
+              User or group need read permission
+              for the specified <option>paths</option>.
+            '';
+            default = "root";
+          };
+
+          group = mkOption {
+            type = types.str;
+            description = ''
+              The group borg is run as. User or group needs read permission
+              for the specified <option>paths</option>.
+            '';
+            default = "root";
+          };
+
+          encryption.mode = mkOption {
+            type = types.enum [
+              "repokey" "keyfile"
+              "repokey-blake2" "keyfile-blake2"
+              "authenticated" "authenticated-blake2"
+              "none"
+            ];
+            description = ''
+              Encryption mode to use. Setting a mode
+              other than <literal>"none"</literal> requires
+              you to specify a <option>passCommand</option>
+              or a <option>passphrase</option>.
+            '';
+          };
+
+          encryption.passCommand = mkOption {
+            type = with types; nullOr str;
+            description = ''
+              A command which prints the passphrase to stdout.
+              Mutually exclusive with <option>passphrase</option>.
+            '';
+            default = null;
+            example = "cat /path/to/passphrase_file";
+          };
+
+          encryption.passphrase = mkOption {
+            type = with types; nullOr str;
+            description = ''
+              The passphrase the backups are encrypted with.
+              Mutually exclusive with <option>passCommand</option>.
+              If you do not want the passphrase to be stored in the
+              world-readable Nix store, use <option>passCommand</option>.
+            '';
+            default = null;
+          };
+
+          compression = mkOption {
+            # "auto" is optional,
+            # compression mode must be given,
+            # compression level is optional
+            type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?";
+            description = ''
+              Compression method to use. Refer to
+              <command>borg help compression</command>
+              for all available options.
+            '';
+            default = "lz4";
+            example = "auto,lzma";
+          };
+
+          exclude = mkOption {
+            type = with types; listOf str;
+            description = ''
+              Exclude paths matching any of the given patterns. See
+              <command>borg help patterns</command> for pattern syntax.
+            '';
+            default = [ ];
+            example = [
+              "/home/*/.cache"
+              "/nix"
+            ];
+          };
+
+          doInit = mkOption {
+            type = types.bool;
+            description = ''
+              Run <command>borg init</command> if the
+              specified <option>repo</option> does not exist.
+              You should set this to <literal>false</literal>
+              if the repository is located on an external drive
+              that might not always be mounted.
+            '';
+            default = true;
+          };
+
+          appendFailedSuffix = mkOption {
+            type = types.bool;
+            description = ''
+              Append a <literal>.failed</literal> suffix
+              to the archive name, which is only removed if
+              <command>borg create</command> has a zero exit status.
+            '';
+            default = true;
+          };
+
+          prune.keep = mkOption {
+            # Specifying e.g. `prune.keep.yearly = -1`
+            # means there is no limit of yearly archives to keep
+            # The regex is for use with e.g. --keep-within 1y
+            type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]"));
+            description = ''
+              Prune a repository by deleting all archives not matching any of the
+              specified retention options. See <command>borg help prune</command>
+              for the available options.
+            '';
+            default = { };
+            example = literalExample ''
+              {
+                within = "1d"; # Keep all archives from the last day
+                daily = 7;
+                weekly = 4;
+                monthly = -1;  # Keep at least one archive for each month
+              }
+            '';
+          };
+
+          prune.prefix = mkOption {
+            type = types.str;
+            description = ''
+              Only consider archive names starting with this prefix for pruning.
+              By default, only archives created by this job are considered.
+              Use <literal>""</literal> to consider all archives.
+            '';
+            default = config.archiveBaseName;
+            defaultText = "\${archiveBaseName}";
+          };
+
+          environment = mkOption {
+            type = with types; attrsOf str;
+            description = ''
+              Environment variables passed to the backup script.
+              You can for example specify which SSH key to use.
+            '';
+            default = { };
+            example = { BORG_RSH = "ssh -i /path/to/key"; };
+          };
+
+          preHook = mkOption {
+            type = types.lines;
+            description = ''
+              Shell commands to run before the backup.
+              This can for example be used to mount file systems.
+            '';
+            default = "";
+            example = ''
+              # To add excluded paths at runtime
+              extraCreateArgs="$extraCreateArgs --exclude /some/path"
+            '';
+          };
+
+          postInit = mkOption {
+            type = types.lines;
+            description = ''
+              Shell commands to run after <command>borg init</command>.
+            '';
+            default = "";
+          };
+
+          postCreate = mkOption {
+            type = types.lines;
+            description = ''
+              Shell commands to run after <command>borg create</command>. The name
+              of the created archive is stored in <literal>$archiveName</literal>.
+            '';
+            default = "";
+          };
+
+          postPrune = mkOption {
+            type = types.lines;
+            description = ''
+              Shell commands to run after <command>borg prune</command>.
+            '';
+            default = "";
+          };
+
+          postHook = mkOption {
+            type = types.lines;
+            description = ''
+              Shell commands to run just before exit. They are executed
+              even if a previous command exits with a non-zero exit code.
+              The latter is available as <literal>$exitStatus</literal>.
+            '';
+            default = "";
+          };
+
+          extraInitArgs = mkOption {
+            type = types.str;
+            description = ''
+              Additional arguments for <command>borg init</command>.
+              Can also be set at runtime using <literal>$extraInitArgs</literal>.
+            '';
+            default = "";
+            example = "--append-only";
+          };
+
+          extraCreateArgs = mkOption {
+            type = types.str;
+            description = ''
+              Additional arguments for <command>borg create</command>.
+              Can also be set at runtime using <literal>$extraCreateArgs</literal>.
+            '';
+            default = "";
+            example = "--stats --checkpoint-interval 600";
+          };
+
+          extraPruneArgs = mkOption {
+            type = types.str;
+            description = ''
+              Additional arguments for <command>borg prune</command>.
+              Can also be set at runtime using <literal>$extraPruneArgs</literal>.
+            '';
+            default = "";
+            example = "--save-space";
+          };
+
+        };
+      }
+    ));
+  };
+
+  options.services.borgbackup.repos = mkOption {
+    description = ''
+      Serve BorgBackup repositories to given public SSH keys,
+      restricting their access to the repository only.
+      Also, clients do not need to specify the absolute path when accessing the repository,
+      i.e. <literal>user@machine:.</literal> is enough. (Note colon and dot.)
+    '';
+    default = { };
+    type = types.attrsOf (types.submodule (
+      { name, config, ... }: {
+        options = {
+          
+          path = mkOption {
+            type = types.path;
+            description = ''
+              Where to store the backups. Note that the directory
+              is created automatically, with correct permissions.
+            '';
+            default = "/var/lib/borgbackup";
+          };
+
+          user = mkOption {
+            type = types.str;
+            description = ''
+              The user <command>borg serve</command> is run as.
+              User or group needs write permission
+              for the specified <option>path</option>.
+            '';
+            default = "borg";
+          };
+
+          group = mkOption {
+            type = types.str;
+            description = ''
+              The group <command>borg serve</command> is run as.
+              User or group needs write permission
+              for the specified <option>path</option>.
+            '';
+            default = "borg";
+          };
+
+          authorizedKeys = mkOption {
+            type = with types; listOf str;
+            description = ''
+              Public SSH keys that are given full write access to this repository.
+              You should use a different SSH key for each repository you write to, because
+              the specified keys are restricted to running <command>borg serve</command>
+              and can only access this single repository.
+            '';
+            default = [ ];
+          };
+
+          authorizedKeysAppendOnly = mkOption {
+            type = with types; listOf str;
+            description = ''
+              Public SSH keys that can only be used to append new data (archives) to the repository.
+              Note that archives can still be marked as deleted and are subsequently removed from disk
+              upon accessing the repo with full write access, e.g. when pruning.
+            '';
+            default = [ ];
+          };
+
+          allowSubRepos = mkOption {
+            type = types.bool;
+            description = ''
+              Allow clients to create repositories in subdirectories of the
+              specified <option>path</option>. These can be accessed using
+              <literal>user@machine:path/to/subrepo</literal>. Note that a
+              <option>quota</option> applies to repositories independently.
+              Therefore, if this is enabled, clients can create multiple
+              repositories and upload an arbitrary amount of data.
+            '';
+            default = false;
+          };
+
+          quota = mkOption {
+            # See the definition of parse_file_size() in src/borg/helpers/parseformat.py
+            type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?");
+            description = ''
+              Storage quota for the repository. This quota is ensured for all
+              sub-repositories if <option>allowSubRepos</option> is enabled
+              but not for the overall storage space used.
+            '';
+            default = null;
+            example = "100G";
+          };
+
+        };
+      }
+    ));
+  };
+
+  ###### implementation
+
+  config = mkIf (with config.services.borgbackup; jobs != { } || repos != { })
+    (with config.services.borgbackup; {
+      assertions =
+        mapAttrsToList mkPassAssertion jobs
+        ++ mapAttrsToList mkKeysAssertion repos;
+
+      system.activationScripts = mapAttrs' mkActivationScript jobs;
+
+      systemd.services =
+        # A job named "foo" is mapped to systemd.services.borgbackup-job-foo
+        mapAttrs' mkBackupService jobs
+        # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo
+        // mapAttrs' mkRepoService repos;
+
+      users = mkMerge (mapAttrsToList mkUsersConfig repos);
+
+      environment.systemPackages = with pkgs; [ borgbackup ];
+    });
+}
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index 123b02be725..36731773de2 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -1,21 +1,162 @@
-import ./make-test.nix ({ pkgs, ...}: {
+import ./make-test.nix ({ pkgs, ... }:
+
+let
+  passphrase = "supersecret";
+  dataDir = "/ran:dom/data";
+  excludeFile = "not_this_file";
+  keepFile = "important_file";
+  keepFileData = "important_data";
+  localRepo = "/root/back:up";
+  archiveName = "my_archive";
+  remoteRepo = "borg@server:."; # No need to specify path
+  privateKey = pkgs.writeText "id_ed25519" ''
+    -----BEGIN OPENSSH PRIVATE KEY-----
+    b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+    QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe
+    RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw
+    AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg
+    9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ=
+    -----END OPENSSH PRIVATE KEY-----
+  '';
+  publicKey = ''
+    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv root@client
+  '';
+  privateKeyAppendOnly = pkgs.writeText "id_ed25519" ''
+    -----BEGIN OPENSSH PRIVATE KEY-----
+    b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+    QyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLwAAAJC9YTxxvWE8
+    cQAAAAtzc2gtZWQyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLw
+    AAAEAAhV7wTl5dL/lz+PF/d4PnZXuG1Id6L/mFEiGT1tZsuFpxm7PUQsZB2Ejs8Xp0YVp8
+    IOW+HylIRzhweORbRCMvAAAADXJzY2h1ZXR6QGt1cnQ=
+    -----END OPENSSH PRIVATE KEY-----
+  '';
+  publicKeyAppendOnly = ''
+    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpxm7PUQsZB2Ejs8Xp0YVp8IOW+HylIRzhweORbRCMv root@client
+  '';
+
+in {
   name = "borgbackup";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ mic92 ];
+  meta = with pkgs.stdenv.lib; {
+    maintainers = with maintainers; [ dotlambda ];
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
-      environment.systemPackages = [ pkgs.borgbackup ];
+    client = { config, pkgs, ... }: {
+      services.borgbackup.jobs = {
+        
+        local = rec {
+          paths = dataDir;
+          repo = localRepo;
+          preHook = ''
+            # Don't append a timestamp
+            archiveName="${archiveName}"
+          '';
+          encryption = {
+            mode = "repokey";
+            inherit passphrase;
+          };
+          compression = "auto,zlib,9";
+          prune.keep = {
+            within = "1y";
+            yearly = 5;
+          };
+          exclude = [ "*/${excludeFile}" ];
+          postHook = "echo post";
+          startAt = [ ]; # Do not run automatically
+        };
+
+        remote = {
+          paths = dataDir;
+          repo = remoteRepo;
+          encryption.mode = "none";
+          startAt = [ ];
+          environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519";
+        };
+
+        remoteAppendOnly = {
+          paths = dataDir;
+          repo = remoteRepo;
+          encryption.mode = "none";
+          startAt = [ ];
+          environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly";
+        };
+
+      };
+    };
+
+    server = { config, pkgs, ... }: {
+      services.openssh = {
+        enable = true;
+        passwordAuthentication = false;
+        challengeResponseAuthentication = false;
+      };
+
+      services.borgbackup.repos.repo1 = {
+        authorizedKeys = [ publicKey ];
+        path = "/data/borgbackup";
+      };
+
+      # Second repo to make sure the authorizedKeys options are merged correctly
+      services.borgbackup.repos.repo2 = {
+        authorizedKeysAppendOnly = [ publicKeyAppendOnly ];
+        path = "/data/borgbackup";
+        quota = ".5G";
+      };
     };
   };
 
   testScript = ''
-    my $borg = "BORG_PASSPHRASE=supersecret borg";
-    $machine->succeed("$borg init --encryption=repokey /tmp/backup");
-    $machine->succeed("mkdir /tmp/data/ && echo 'data' >/tmp/data/file");
-    $machine->succeed("$borg create --stats /tmp/backup::test /tmp/data");
-    $machine->succeed("$borg extract /tmp/backup::test");
-    $machine->succeed('c=$(cat data/file) && echo "c = $c" >&2 && [[ "$c" == "data" ]]');
+    startAll;
+
+    $client->fail('test -d "${remoteRepo}"');
+
+    $client->succeed("cp ${privateKey} /root/id_ed25519");
+    $client->succeed("chmod 0600 /root/id_ed25519");
+    $client->succeed("cp ${privateKeyAppendOnly} /root/id_ed25519.appendOnly");
+    $client->succeed("chmod 0600 /root/id_ed25519.appendOnly");
+
+    $client->succeed("mkdir -p ${dataDir}");
+    $client->succeed("touch ${dataDir}/${excludeFile}");
+    $client->succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}");
+
+    subtest "local", sub {
+      my $borg = "BORG_PASSPHRASE='${passphrase}' borg";
+      $client->systemctl("start --wait borgbackup-job-local");
+      $client->fail("systemctl is-failed borgbackup-job-local");
+      # Make sure exactly one archive has been created
+      $client->succeed("c=\$($borg list '${localRepo}' | wc -l) && [[ \$c == '1' ]]");
+      # Make sure excludeFile has been excluded
+      $client->fail("$borg list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'");
+      # Make sure keepFile has the correct content
+      $client->succeed("$borg extract '${localRepo}::${archiveName}'");
+      $client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
+    };
+
+    subtest "remote", sub {
+      my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg";
+      $server->waitForUnit("sshd.service");
+      $client->waitForUnit("network.target");
+      $client->systemctl("start --wait borgbackup-job-remote");
+      $client->fail("systemctl is-failed borgbackup-job-remote");
+
+      # Make sure we can't access repos other than the specified one
+      $client->fail("$borg list borg\@server:wrong");
+
+      #TODO: Make sure that data is actually deleted
+    };
+
+    subtest "remoteAppendOnly", sub {
+      my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly' borg";
+      $server->waitForUnit("sshd.service");
+      $client->waitForUnit("network.target");
+      $client->systemctl("start --wait borgbackup-job-remoteAppendOnly");
+      $client->fail("systemctl is-failed borgbackup-job-remoteAppendOnly");
+
+      # Make sure we can't access repos other than the specified one
+      $client->fail("$borg list borg\@server:wrong");
+
+      #TODO: Make sure that data is not actually deleted
+    };
+
   '';
 })

From c0cf13e52ea9757ded4294521fbe266637006548 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Mon, 19 Mar 2018 13:18:49 +0100
Subject: [PATCH 1450/2266] Add space for NIX_CXXSTDLIB_COMPILE+=' ...' as
 NIX_CXXSTDLIB_COMPILE might not be empty.

---
 pkgs/development/compilers/gcc/libstdc++-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
index 2d30c845b5a..893bbbc0c2d 100644
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh
@@ -1,2 +1,2 @@
-export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
 export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++"

From 04f11faa687026eb6798412e30b9f6d2a7911570 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Mar 2018 08:59:22 -0400
Subject: [PATCH 1451/2266] linux: 4.4.121 -> 4.4.122

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 7980f7c212e..5994a081600 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.121";
+  version = "4.4.122";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ad7djpbwapk126jddrnnq0a5a9mmhrr36qcnckc7388nml85a24";
+    sha256 = "1hxph2bn2wdamk1p5sxl2szgsk4aybb0245x1rvf85a6skhjqc7g";
   };
 } // (args.argsOverride or {}))

From c4963d395d3bc5b29387e38ab1d59e6175c44fc3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Mar 2018 08:59:40 -0400
Subject: [PATCH 1452/2266] linux: 4.9.87 -> 4.9.88

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index cb2650a5a68..3bcfa3912aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.87";
+  version = "4.9.88";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "05y9wjmshd3pr3ymfpx80hjv5973i6l3zk1mpww7wnnwd6pzdjbs";
+    sha256 = "094cxc86ajnsai1vwy76mmg7l3b9lvhk6mw6746lsr3fnzv1fkq7";
   };
 } // (args.argsOverride or {}))

From e9ce4c019b480d83f53ffa96e525fc24cbe9d223 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Mar 2018 08:59:56 -0400
Subject: [PATCH 1453/2266] linux: 4.14.27 -> 4.14.28

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 3d950252e1c..adf9dbd818c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.27";
+  version = "4.14.28";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1si8l3clpkyhwawrjxz6yzx7xl0v0k6dy1yf5qiwf1hsqx4s8489";
+    sha256 = "0byx2824ml2ck97p66gfipnasbn9zz6rhjps61n6gprg3ac5fd07";
   };
 } // (args.argsOverride or {}))

From 80d0ccaaabf2bc093fdd71d0b35d415f04bcbf87 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Mar 2018 09:00:10 -0400
Subject: [PATCH 1454/2266] linux: 4.15.10 -> 4.15.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 933339f5818..5c4a452dd12 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.10";
+  version = "4.15.11";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14i6028l1y8y88sw5cbfihzs3wp66vwy33g1598i0dkyf1sbw5cg";
+    sha256 = "0rjzlkp24ch58vx0xljrf6l33i8xv2mal0x821kwfqp551npdxfc";
   };
 } // (args.argsOverride or {}))

From f97c4668abb630875318f057d452f8ebfe52f8e2 Mon Sep 17 00:00:00 2001
From: Bert Moens <bert.moens@gmail.com>
Date: Fri, 22 Dec 2017 15:35:33 +0100
Subject: [PATCH 1455/2266] rhvoice: init at unstable-2018-02-10

---
 pkgs/applications/audio/rhvoice/default.nix   | 48 +++++++++++++++++++
 .../audio/rhvoice/honor_nix_environment.patch | 14 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/audio/rhvoice/default.nix
 create mode 100644 pkgs/applications/audio/rhvoice/honor_nix_environment.patch

diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
new file mode 100644
index 00000000000..65cb7dab34a
--- /dev/null
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao
+}:
+
+let
+  version = "unstable-2018-02-10";
+in stdenv.mkDerivation rec {
+  name = "rhvoice-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Olga-Yakovleva";
+    repo = "RHVoice";
+    rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312";
+    sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b";
+  };
+
+  nativeBuildInputs = [
+    scons pkgconfig
+  ];
+
+  buildInputs = [
+    python glibmm libpulseaudio libao
+  ];
+
+  # SConstruct patch
+  #     Scons creates an independent environment that assumes standard POSIX paths.
+  #     The patch is needed to push the nix environment.
+  #     - PATH
+  #     - PKG_CONFIG_PATH, to find available (sound) libraries
+  #     - RPATH, to link to the newly built libraries
+
+  patches = [ ./honor_nix_environment.patch ];
+
+  buildPhase = ''
+    scons prefix=$out
+  '';
+
+  installPhase = ''
+    scons install
+  '';
+
+  meta = {
+    description = "A free and open source speech synthesizer for Russian language and others";
+    homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ berce ];
+    platforms = with lib.platforms; all;
+  };
+}
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
new file mode 100644
index 00000000000..ed180c92deb
--- /dev/null
+++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
@@ -0,0 +1,14 @@
+diff --git a/SConstruct b/SConstruct
+index 2421399..ba39254 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -147,6 +147,9 @@ def create_base_env(vars):
+     env_args["package_name"]="RHVoice"
+     env_args["CPPDEFINES"]=[("RHVOICE","1")]
+     env=Environment(**env_args)
++    env.PrependENVPath("PATH", os.environ["PATH"])
++    env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
++    env["RPATH"]=env["libdir"]
+     env["package_version"]=get_version(env["release"])
+     env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
+     env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"')))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 300c648031a..919373ba9b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15836,6 +15836,8 @@ with pkgs;
 
   quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
 
+  rhvoice = callPackage ../applications/audio/rhvoice { };
+
   svox = callPackage ../applications/audio/svox { };
 
   gkrellm = callPackage ../applications/misc/gkrellm {

From 76f022841579f517ae709b0c7c5365c87d12c193 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Mon, 19 Mar 2018 14:18:07 +0100
Subject: [PATCH 1456/2266] mq-cli: init at 1.0.0

Adds mq-cli, a simple command line utility to administrate POSIX
message queues.
---
 pkgs/tools/system/mq-cli/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/system/mq-cli/default.nix

diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
new file mode 100644
index 00000000000..b01b91452dc
--- /dev/null
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -0,0 +1,24 @@
+{ fetchFromGitHub, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name    = "mq-cli-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner  = "aprilabank";
+    repo   = "mq-cli";
+    rev    = "v${version}";
+    sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7";
+  };
+
+  cargoSha256 = "0kpv52474bp3k2wmz8xykca8iz46dwnjmly2nivblnaap49w2zsz";
+
+  meta = with lib; {
+    description      = "CLI tool to manage POSIX message queues";
+    homepage         = "https://github.com/aprilabank/mq-cli";
+    license          = licenses.mit;
+    maintainers      = with maintainers; [ tazjin ];
+    platforms        = platforms.linux;
+    repositories.git = git://github.com/aprilabank/mq-cli.git;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 300c648031a..71c00e049b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1316,6 +1316,8 @@ with pkgs;
 
   mpdris2 = callPackage ../tools/audio/mpdris2 { };
 
+  mq-cli = callPackage ../tools/system/mq-cli { };
+
   nfdump = callPackage ../tools/networking/nfdump { };
 
   noteshrink = callPackage ../tools/misc/noteshrink { };

From 368ed89aa08e1e27c8bd210c160ec301c38832d1 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 19 Mar 2018 14:51:18 +0000
Subject: [PATCH 1457/2266] godot: simplify pkg_config_additions.patch

---
 .../tools/godot/pkg_config_additions.patch           | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index f20226c5819..286372f060a 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,17 +1,13 @@
-+++ build/platform/x11/detect.py
-@@ -142,8 +142,13 @@
++++ b/platform/x11/detect.py
+@@ -142,6 +142,11 @@
      env.ParseConfig('pkg-config xcursor --cflags --libs')
      env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
--
--    if (env['touch']):
 +    env.ParseConfig('pkg-config xrender --cflags --libs')
 +    env.ParseConfig('pkg-config xext --cflags --libs')
 +    env.ParseConfig('pkg-config xfixes --cflags --libs')
 +    env.ParseConfig('pkg-config glu --cflags --libs')
 +    env.ParseConfig('pkg-config zlib --cflags --libs')
-+
-+    if (env['touch']):
+ 
+     if (env['touch']):
          x11_error = os.system("pkg-config xi --modversion > /dev/null ")
-         if (x11_error):
-             print("xi not found.. cannot build with touch. Aborting.")

From 9508150198c2d02b4b674eecd06834fd049639e0 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 19 Mar 2018 14:51:36 +0000
Subject: [PATCH 1458/2266] godot: don't require gcc5

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 3c4914cd7cd..e89b2f62b15 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
+{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor
 , libXinerama, libXrandr, libXrender, libpulseaudio ? null
 , libXi ? null, libXext, libXfixes, freetype, openssl
 , alsaLib, libGLU, zlib, yasm ? null }:
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
+    scons libX11 libXcursor libXinerama libXrandr libXrender
     libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
     libGLU zlib yasm
   ];

From e46b27cc90e0b6795e61605e96dd91d501721d09 Mon Sep 17 00:00:00 2001
From: Adam Copp <adamcopp@adamcopp4.lon.corp.google.com>
Date: Mon, 19 Mar 2018 15:55:06 +0000
Subject: [PATCH 1459/2266] Add platform to vo-amrwbenc

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

diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix
index 70c5b5bda3e..ba6e437ca3c 100644
--- a/pkgs/development/libraries/vo-amrwbenc/default.nix
+++ b/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation {
     description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
     license = "stdenv.lib.licenses.apache";
     maintainers = [ stdenv.lib.maintainers.Esteth ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From bbfa2f97014de8aa928485a07b722d792b09238f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 00:16:25 -0400
Subject: [PATCH 1460/2266] lib: Split Darwin into macOS and iOS

I noticed LLVM accepts `ios` as its own OS in platform triples; a
recent change as far as I know. I see it also accepts `macos*` for macOS
(formerly OS X). If it's now customary to distinguish iOS like so
(rather than guessing from the aarch, lets add both so our OSes are
still disjoint, and make Darwin a family instead.

But changing the config everywhere would probably be a mass rebuild, and
I'm not sure how well other software supports OSes besides "darwin", so
I'm keeping that the default name for macOS for now.
---
 lib/systems/inspect.nix |  4 +++-
 lib/systems/parse.nix   | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index ab220af46e3..4cdd2629547 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -21,9 +21,11 @@ rec {
     LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
 
     BSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+    Darwin       = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
     Unix         = [ BSD Darwin Linux SunOS Hurd Cygwin ];
 
-    Darwin       = { kernel = kernels.darwin; };
+    MacOS        = { kernel = kernels.macos; };
+    iOS          = { kernel = kernels.ios; };
     Linux        = { kernel = kernels.linux; };
     SunOS        = { kernel = kernels.solaris; };
     FreeBSD      = { kernel = kernels.freebsd; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 03d052f5f19..641a7f5d758 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -134,6 +134,7 @@ rec {
 
   kernelFamilies = setTypes types.openKernelFamily {
     bsd = {};
+    darwin = {};
   };
 
   ################################################################################
@@ -149,7 +150,10 @@ rec {
   types.kernel = enum (attrValues kernels);
 
   kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
-    darwin  = { execFormat = macho;   families = { }; };
+    # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
+    # the nnormalized name for macOS.
+    macos   = { execFormat = macho;   families = { inherit darwin; }; name = "darwin"; };
+    ios     = { execFormat = macho;   families = { inherit darwin; }; };
     freebsd = { execFormat = elf;     families = { inherit bsd; }; };
     hurd    = { execFormat = elf;     families = { }; };
     linux   = { execFormat = elf;     families = { }; };
@@ -159,9 +163,13 @@ rec {
     solaris = { execFormat = elf;     families = { }; };
     windows = { execFormat = pe;      families = { }; };
   } // { # aliases
+    # 'darwin' is the kernel for all of them. We choose macOS by default.
+    darwin = kernels.macos;
     # TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
-    darwin10 = kernels.darwin;
-    darwin14 = kernels.darwin;
+    darwin10 = kernels.macos;
+    darwin14 = kernels.macos;
+    watchos = kernels.ios;
+    tvos = kernels.ios;
     win32 = kernels.windows;
   };
 
@@ -263,8 +271,8 @@ rec {
   mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
 
   doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
-    if abi == abis.cygnus
-    then "${cpu.name}-cygwin"
+    /**/ if abi == abis.cygnus       then "${cpu.name}-cygwin"
+    else if kernel.families ? darwin then "${cpu.name}-darwin"
     else "${cpu.name}-${kernel.name}";
 
   tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let

From 4607201cf2216eefe025f22eec739aa45783b2b4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 08:58:41 -0700
Subject: [PATCH 1461/2266] Revert "cdrtools: 3.02a06 -> 3.01"

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

diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 688f9a0a46b..a46565eb76b 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cdrtools-${version}";
-  version = "3.01";
+  version = "3.02a06";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
-    sha256 = "03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d";
+    sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
   };
 
   patches = [ ./fix-paths.patch ];

From 9ede31bfbe54adad7a464416c767af4884f5aa7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 19 Mar 2018 17:16:24 +0100
Subject: [PATCH 1462/2266] asciidoc: add enableJava option

fixes https://github.com/NixOS/nixpkgs/issues/37045
---
 pkgs/tools/typesetting/asciidoc/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 9df89a8072a..d5da10b5cd4 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -37,6 +37,9 @@
 # backends
 , enableDeckjsBackend ? false
 , enableOdfBackend ? false
+
+# java is problematic on some platforms, where it is unfree
+, enableJava ? true
 }:
 
 assert enableStandardFeatures ->
@@ -55,7 +58,7 @@ assert enableStandardFeatures ->
   docbook_xml_dtd_45 != null &&
   docbook5_xsl != null &&
   docbook_xsl != null &&
-  fop != null &&
+  (fop != null || !enableJava) &&
 # TODO: Package this:
 #  epubcheck != null &&
   gnused != null &&
@@ -63,7 +66,7 @@ assert enableStandardFeatures ->
 
 # filters
 assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null;
-assert enableExtraPlugins || enableDitaaFilter -> jre != null;
+assert (enableExtraPlugins && enableJava) || enableDitaaFilter -> jre != null;
 assert enableExtraPlugins || enableMscgenFilter -> mscgen != null;
 assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
 assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;
@@ -73,7 +76,7 @@ assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip !=
 
 let
 
-  _enableDitaaFilter = enableExtraPlugins || enableDitaaFilter;
+  _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;
   _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
   _enableDiagFilter = enableExtraPlugins || enableDiagFilter;
   _enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter;
@@ -239,7 +242,7 @@ stdenv.mkDerivation rec {
         -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
         -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
         -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
-        -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \
+        ${optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
         -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
         -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
         -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \

From 08a9e31c42b8df70debc1b0d2366f9cda64428ce Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 19 Mar 2018 17:39:04 +0100
Subject: [PATCH 1463/2266] zed: remove

`zed` is obviously dead and not maintained anymore
(https://zef.me/how-to-abandon-open-source-d5ebbc6e45e5).

As the last upstream commit was in 2015 we faced and will face many
issues with its dependencies due to the outdated upstream which can be
fatal when having security issues in the NodeJS ecosystem to fix.

One example is the handling of `nwjs` which is currently version `0.23`,
but `zed` relies on `0.9`. In order to reduce the maintenance overload
because of dead packages it's better to get rid of `zed` entirely.

Fixes #37361
---
 pkgs/applications/editors/zed/default.nix     |  82 --
 pkgs/applications/editors/zed/deps.json       |   6 -
 pkgs/applications/editors/zed/deps.sh         |   7 -
 .../editors/zed/node-packages.nix             | 882 ------------------
 pkgs/applications/editors/zed/node.nix        |  17 -
 pkgs/top-level/all-packages.nix               |   9 -
 6 files changed, 1003 deletions(-)
 delete mode 100644 pkgs/applications/editors/zed/default.nix
 delete mode 100644 pkgs/applications/editors/zed/deps.json
 delete mode 100755 pkgs/applications/editors/zed/deps.sh
 delete mode 100644 pkgs/applications/editors/zed/node-packages.nix
 delete mode 100644 pkgs/applications/editors/zed/node.nix

diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
deleted file mode 100644
index bcf262957bc..00000000000
--- a/pkgs/applications/editors/zed/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs
-, node_webkit }:
-
-let
-  name = "zed-${version}";
-  version = "1.1.0";
-
-  nodePackages = import ./node.nix {
-    inherit pkgs;
-    system = stdenv.system;
-  };
-
-  node_env = buildEnv {
-    name = "node_env";
-    paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
-      nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
-      nodePackages."ws-~0.4.32" ];
-    pathsToLink = [ "/lib" ];
-    ignoreCollisions = true;
-  };
-
-  zed = stdenv.mkDerivation rec {
-    inherit name version;
-
-    src = fetchgit {
-        url = "git://github.com/zedapp/zed";
-        rev = "refs/tags/v${version}";
-        sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p";
-      };
-
-    buildInputs = [ makeWrapper zip ];
-
-    dontBuild = true;
-
-    installPhase = ''
-      export NWPATH="${node_webkit}/share/node-webkit";
-
-      mkdir -p $out/zed
-
-      cd ${src}/app; zip -r $out/zed/app.nw *; cd ..
-
-      cat $NWPATH/nw $out/zed/app.nw > $out/zed/zed-bin
-      cp $NWPATH/nw.pak $out/zed/
-      cp nw/zed-linux $out/zed/zed
-      chmod +x $out/zed/zed*
-      cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed
-      rm $out/zed/app.nw
-    '';
-
-    postFixup = ''
-      wrapProgram $out/zed/zed-bin \
-        --prefix NODE_PATH : ${node_env}/lib/node_modules
-    '';
-  };
-
-  zed_script = writeScript "zed.sh" ''
-    if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then
-        PROJECT=$1
-    elif [ "" != "$1" ]; then
-       PROJECT=$(readlink -f $1)
-    fi
-    ${zed}/zed/zed-bin $PROJECT
-  '';
-
-in stdenv.mkDerivation rec {
-  inherit name version;
-
-  src = zed;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    ln -s ${zed_script} $out/bin/zed
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
-    license = licenses.mit;
-    homepage = http://zedapp.org/;
-    maintainers = with maintainers; [ matejc ma27 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/editors/zed/deps.json b/pkgs/applications/editors/zed/deps.json
deleted file mode 100644
index d3a7708d156..00000000000
--- a/pkgs/applications/editors/zed/deps.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[ { "body-parser": "~1.6.3" }
-, { "express": "~4.8.3" }
-, { "request": "~2.34.0" }
-, { "tar": "~0.1.19" }
-, { "ws": "~0.4.32" }
-]
diff --git a/pkgs/applications/editors/zed/deps.sh b/pkgs/applications/editors/zed/deps.sh
deleted file mode 100755
index 6d2bf29532e..00000000000
--- a/pkgs/applications/editors/zed/deps.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-
-node2nix -6 -i deps.json \
-  -e ../../../development/node-packages/node-env.nix \
-  --no-copy-node-env \
-  -c node.nix
diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix
deleted file mode 100644
index e47f11e6eb5..00000000000
--- a/pkgs/applications/editors/zed/node-packages.nix
+++ /dev/null
@@ -1,882 +0,0 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
-
-let
-  sources = {
-    "accepts-1.0.7" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
-        sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
-      };
-    };
-    "asn1-0.1.11" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
-      };
-    };
-    "assert-plus-0.1.5" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
-      };
-    };
-    "async-0.9.2" = {
-      name = "async";
-      packageName = "async";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
-        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
-      };
-    };
-    "aws-sign2-0.5.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
-      };
-    };
-    "balanced-match-1.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
-      };
-    };
-    "block-stream-0.0.9" = {
-      name = "block-stream";
-      packageName = "block-stream";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
-        sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
-      };
-    };
-    "boom-0.4.2" = {
-      name = "boom";
-      packageName = "boom";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
-      };
-    };
-    "brace-expansion-1.1.11" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
-      };
-    };
-    "buffer-crc32-0.2.3" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
-        sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
-      };
-    };
-    "bytes-1.0.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
-        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
-      };
-    };
-    "combined-stream-0.0.7" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
-      };
-    };
-    "commander-2.1.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "cookie-0.1.2" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
-        sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
-      };
-    };
-    "cookie-signature-1.0.4" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
-        sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
-      };
-    };
-    "cryptiles-0.2.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
-      };
-    };
-    "ctype-0.5.3" = {
-      name = "ctype";
-      packageName = "ctype";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
-      };
-    };
-    "debug-1.0.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
-        sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
-      };
-    };
-    "delayed-stream-0.0.5" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
-      };
-    };
-    "depd-0.4.4" = {
-      name = "depd";
-      packageName = "depd";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
-        sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
-      };
-    };
-    "destroy-1.0.3" = {
-      name = "destroy";
-      packageName = "destroy";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
-        sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
-      };
-    };
-    "ee-first-1.0.5" = {
-      name = "ee-first";
-      packageName = "ee-first";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
-        sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
-      };
-    };
-    "escape-html-1.0.1" = {
-      name = "escape-html";
-      packageName = "escape-html";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
-        sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
-      };
-    };
-    "finalhandler-0.1.0" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
-        sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
-      };
-    };
-    "forever-agent-0.5.2" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
-      };
-    };
-    "form-data-0.1.4" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
-        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
-      };
-    };
-    "fresh-0.2.2" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
-        sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "fstream-0.1.31" = {
-      name = "fstream";
-      packageName = "fstream";
-      version = "0.1.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
-      };
-    };
-    "glob-7.1.2" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
-      };
-    };
-    "graceful-fs-3.0.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "3.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
-        sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
-      };
-    };
-    "hawk-1.0.0" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
-        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
-      };
-    };
-    "hoek-0.9.1" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "0.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
-      };
-    };
-    "http-signature-0.10.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
-      };
-    };
-    "iconv-lite-0.4.4" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
-        sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "ipaddr.js-0.1.2" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
-        sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
-      };
-    };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "media-typer-0.2.0" = {
-      name = "media-typer";
-      packageName = "media-typer";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
-        sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
-      };
-    };
-    "merge-descriptors-0.0.2" = {
-      name = "merge-descriptors";
-      packageName = "merge-descriptors";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
-        sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
-      };
-    };
-    "methods-1.1.0" = {
-      name = "methods";
-      packageName = "methods";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
-        sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
-      };
-    };
-    "mime-1.2.11" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-      };
-    };
-    "mime-types-1.0.2" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
-        sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
-      };
-    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "ms-0.6.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
-        sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
-      };
-    };
-    "nan-1.0.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
-        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
-      };
-    };
-    "natives-1.1.1" = {
-      name = "natives";
-      packageName = "natives";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz";
-        sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i";
-      };
-    };
-    "negotiator-0.4.7" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
-        sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
-      };
-    };
-    "node-uuid-1.4.8" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
-        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
-      };
-    };
-    "oauth-sign-0.3.0" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
-        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
-      };
-    };
-    "on-finished-2.1.0" = {
-      name = "on-finished";
-      packageName = "on-finished";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
-        sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "options-0.0.6" = {
-      name = "options";
-      packageName = "options";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
-        sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
-      };
-    };
-    "parseurl-1.3.2" = {
-      name = "parseurl";
-      packageName = "parseurl";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
-        sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "path-to-regexp-0.1.3" = {
-      name = "path-to-regexp";
-      packageName = "path-to-regexp";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
-        sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
-      };
-    };
-    "proxy-addr-1.0.1" = {
-      name = "proxy-addr";
-      packageName = "proxy-addr";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
-        sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "qs-0.6.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.6.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
-      };
-    };
-    "qs-2.2.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
-        sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
-      };
-    };
-    "range-parser-1.0.0" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
-        sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
-      };
-    };
-    "raw-body-1.3.0" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
-        sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
-      };
-    };
-    "rimraf-2.6.2" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
-        sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
-      };
-    };
-    "send-0.8.5" = {
-      name = "send";
-      packageName = "send";
-      version = "0.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
-        sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
-      };
-    };
-    "serve-static-1.5.4" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
-        sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
-      };
-    };
-    "sntp-0.2.4" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "0.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
-        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
-      };
-    };
-    "tinycolor-0.0.1" = {
-      name = "tinycolor";
-      packageName = "tinycolor";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
-        sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
-      };
-    };
-    "tough-cookie-2.3.4" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
-        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
-      };
-    };
-    "tunnel-agent-0.3.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
-        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
-      };
-    };
-    "type-is-1.3.2" = {
-      name = "type-is";
-      packageName = "type-is";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
-        sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
-      };
-    };
-    "utils-merge-1.0.0" = {
-      name = "utils-merge";
-      packageName = "utils-merge";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
-        sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
-      };
-    };
-    "vary-0.1.0" = {
-      name = "vary";
-      packageName = "vary";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
-        sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-  };
-in
-{
-  "body-parser-~1.6.3" = nodeEnv.buildNodePackage {
-    name = "body-parser";
-    packageName = "body-parser";
-    version = "1.6.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
-      sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
-    };
-    dependencies = [
-      sources."bytes-1.0.0"
-      sources."depd-0.4.4"
-      sources."ee-first-1.0.5"
-      sources."iconv-lite-0.4.4"
-      sources."media-typer-0.2.0"
-      sources."mime-types-1.0.2"
-      sources."on-finished-2.1.0"
-      sources."qs-2.2.2"
-      sources."raw-body-1.3.0"
-      sources."type-is-1.3.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Node.js body parsing middleware";
-      homepage = https://github.com/expressjs/body-parser;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = false;
-  };
-  "express-~4.8.3" = nodeEnv.buildNodePackage {
-    name = "express";
-    packageName = "express";
-    version = "4.8.8";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
-      sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
-    };
-    dependencies = [
-      sources."accepts-1.0.7"
-      sources."buffer-crc32-0.2.3"
-      sources."cookie-0.1.2"
-      sources."cookie-signature-1.0.4"
-      sources."debug-1.0.4"
-      sources."depd-0.4.4"
-      sources."destroy-1.0.3"
-      sources."ee-first-1.0.5"
-      sources."escape-html-1.0.1"
-      sources."finalhandler-0.1.0"
-      sources."fresh-0.2.2"
-      sources."ipaddr.js-0.1.2"
-      sources."media-typer-0.2.0"
-      sources."merge-descriptors-0.0.2"
-      sources."methods-1.1.0"
-      sources."mime-1.2.11"
-      sources."mime-types-1.0.2"
-      sources."ms-0.6.2"
-      sources."negotiator-0.4.7"
-      sources."on-finished-2.1.0"
-      sources."parseurl-1.3.2"
-      sources."path-to-regexp-0.1.3"
-      sources."proxy-addr-1.0.1"
-      sources."qs-2.2.2"
-      sources."range-parser-1.0.0"
-      sources."send-0.8.5"
-      sources."serve-static-1.5.4"
-      sources."type-is-1.3.2"
-      sources."utils-merge-1.0.0"
-      sources."vary-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Fast, unopinionated, minimalist web framework";
-      homepage = http://expressjs.com/;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = false;
-  };
-  "request-~2.34.0" = nodeEnv.buildNodePackage {
-    name = "request";
-    packageName = "request";
-    version = "2.34.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
-      sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
-    };
-    dependencies = [
-      sources."asn1-0.1.11"
-      sources."assert-plus-0.1.5"
-      sources."async-0.9.2"
-      sources."aws-sign2-0.5.0"
-      sources."boom-0.4.2"
-      sources."combined-stream-0.0.7"
-      sources."cryptiles-0.2.2"
-      sources."ctype-0.5.3"
-      sources."delayed-stream-0.0.5"
-      sources."forever-agent-0.5.2"
-      sources."form-data-0.1.4"
-      sources."hawk-1.0.0"
-      sources."hoek-0.9.1"
-      sources."http-signature-0.10.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."mime-1.2.11"
-      sources."node-uuid-1.4.8"
-      sources."oauth-sign-0.3.0"
-      sources."punycode-1.4.1"
-      sources."qs-0.6.6"
-      sources."sntp-0.2.4"
-      sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.3.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Simplified HTTP request client.";
-      homepage = https://github.com/mikeal/request;
-      license = "Apache, Version 2.0";
-    };
-    production = true;
-    bypassCache = false;
-  };
-  "tar-~0.1.19" = nodeEnv.buildNodePackage {
-    name = "tar";
-    packageName = "tar";
-    version = "0.1.20";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
-      sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
-    };
-    dependencies = [
-      sources."balanced-match-1.0.0"
-      sources."block-stream-0.0.9"
-      sources."brace-expansion-1.1.11"
-      sources."concat-map-0.0.1"
-      sources."fs.realpath-1.0.0"
-      sources."fstream-0.1.31"
-      sources."glob-7.1.2"
-      sources."graceful-fs-3.0.11"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."natives-1.1.1"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.6.2"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "tar for node";
-      homepage = https://github.com/isaacs/node-tar;
-      license = "BSD";
-    };
-    production = true;
-    bypassCache = false;
-  };
-  "ws-~0.4.32" = nodeEnv.buildNodePackage {
-    name = "ws";
-    packageName = "ws";
-    version = "0.4.32";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
-      sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
-    };
-    dependencies = [
-      sources."commander-2.1.0"
-      sources."nan-1.0.0"
-      sources."options-0.0.6"
-      sources."tinycolor-0.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
-      homepage = https://github.com/einaros/ws;
-    };
-    production = true;
-    bypassCache = false;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
deleted file mode 100644
index 75bc6ec109c..00000000000
--- a/pkgs/applications/editors/zed/node.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
-
-let
-  nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages.nix {
-  inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd68686cc9c..26778bc7098 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7963,11 +7963,6 @@ with pkgs;
     gconf = pkgs.gnome2.GConf;
   };
 
-  # only kept for zed, see https://github.com/NixOS/nixpkgs/issues/37361
-  nwjs_0_9 = callPackage ../development/tools/node-webkit/nw9.nix {
-    gconf = pkgs.gnome2.GConf;
-  };
-
   # only kept for nixui, see https://github.com/matejc/nixui/issues/27
   nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
     gconf = pkgs.gnome2.GConf;
@@ -18589,10 +18584,6 @@ with pkgs;
     useMupdf = config.zathura.useMupdf or true;
   };
 
-  zed = callPackage ../applications/editors/zed {
-    node_webkit = nwjs_0_9;
-  };
-
   zeroc_ice = callPackage ../development/libraries/zeroc-ice {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 242abf396f978d76b0c6de034681f30f2498a8c2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Mar 2018 14:08:55 -0400
Subject: [PATCH 1464/2266] linux: 4.16-rc5 -> 4.16-rc6

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 48aaeebc4d2..bcc1ec14561 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc5";
-  modDirVersion = "4.16.0-rc5";
+  version = "4.16-rc6";
+  modDirVersion = "4.16.0-rc6";
   extraMeta.branch = "4.16";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0yfa0qrs6fwh88xgn252j7nc8q4x5qhf20dlax9hcnza0ai6nk3z";
+    sha256 = "0kwn1qj44pyb404qhwm4qr8mmfni8qfh1raf010d62i48n7pgv0d";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 19 Mar 2018 21:42:25 +0300
Subject: [PATCH 1465/2266] cgit: wrap python scripts

---
 .../version-management/git-and-tools/cgit/default.nix       | 6 +++++-
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 3c7d0a86be0..d890001489f 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
 , docbook_xml_xslt, pkgconfig, luajit
 , gzip, bzip2, xz
+, python, wrapPython, pygments, markdown
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +21,11 @@ stdenv.mkDerivation rec {
     sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
   buildInputs = [
     openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
   ];
+  pythonPath = [ pygments markdown ];
 
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
     a2x --no-xmllint -f manpage cgitrc.5.txt
     mkdir -p "$out/share/man/man5"
     cp cgitrc.5 "$out/share/man/man5"
+
+    wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5540e1fe58..03a572c2231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14880,7 +14880,9 @@ with pkgs;
 
   centerim = callPackage ../applications/networking/instant-messengers/centerim { };
 
-  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
+  cgit = callPackage ../applications/version-management/git-and-tools/cgit {
+    inherit (python3Packages) python wrapPython pygments markdown;
+  };
 
   cgminer = callPackage ../applications/misc/cgminer {
     amdappsdk = amdappsdk28;

From 26fac59c328663529d44924d7569e4457d1ba3ed Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 19 Mar 2018 11:43:28 -0700
Subject: [PATCH 1466/2266] gapi-ocaml: 0.3.4 -> 0.3.6. Also change to use
 opam/jbuilder for build.

---
 .../ocaml-modules/gapi-ocaml/default.nix            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index a993a64a49a..b4e06d3c999 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
 stdenv.mkDerivation rec {
   name = "gapi-ocaml-${version}";
-  version = "0.3.4";
+  version = "0.3.6";
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "gapi-ocaml";
     rev = "v${version}";
-    sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv";
+    sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
   };
-  buildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ ocaml jbuilder findlib ];
   propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
-  buildPhase = "ocaml setup.ml -build";
-  installPhase = "ocaml setup.ml -install";
+  installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+
   createFindlibDestdir = true;
 
   meta = {

From a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 19 Mar 2018 11:45:06 -0700
Subject: [PATCH 1467/2266] google-drive-ocamlfuse: 0.6.21 -> 0.6.25.

Also change to use jbuilder for build per upstream instructions. In this case, the build needs to be
driven by jbuilder but opam still needs to be in PATH.
---
 .../networking/google-drive-ocamlfuse/default.nix   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index ddc9df75999..87ef5f2a41a 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,24 +1,23 @@
 { stdenv, fetchFromGitHub, zlib
-, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
+, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
   name = "google-drive-ocamlfuse-${version}";
-  version = "0.6.21";
+  version = "0.6.25";
 
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "google-drive-ocamlfuse";
     rev = "v${version}";
-    sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59";
+    sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
   };
 
-  nativeBuildInputs = [ ocamlbuild ];
+  nativeBuildInputs = [ jbuilder opam ];
 
   buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
-  buildPhase = "ocaml setup.ml -build";
-  installPhase = "ocaml setup.ml -install";
+  buildPhase = "jbuilder build @install";
+  installPhase = "mkdir $out && jbuilder install --prefix $out";
 
   meta = {
     homepage = http://gdfuse.forge.ocamlcore.org/;

From ca7b29050fed6283c701148e8135b01d61328379 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 19 Mar 2018 17:04:39 +0100
Subject: [PATCH 1468/2266] grafana: 5.0.2 -> 5.0.3, fix headless phantomjs

---
 nixos/modules/services/monitoring/grafana.nix | 14 +++++++++++++-
 pkgs/servers/monitoring/grafana/default.nix   |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 921be23f368..a5b6dbab157 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -25,6 +25,7 @@ let
     DATABASE_USER = cfg.database.user;
     DATABASE_PASSWORD = cfg.database.password;
     DATABASE_PATH = cfg.database.path;
+    DATABASE_CONN_MAX_LIFETIME = cfg.database.connMaxLifetime;
 
     SECURITY_ADMIN_USER = cfg.security.adminUser;
     SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword;
@@ -143,6 +144,15 @@ in {
         default = "${cfg.dataDir}/data/grafana.db";
         type = types.path;
       };
+
+      connMaxLifetime = mkOption {
+        description = ''
+          Sets the maximum amount of time (in seconds) a connection may be reused.
+          For MySQL this setting should be shorter than the `wait_timeout' variable.
+        '';
+        default = 14400;
+        type = types.int;
+      };
     };
 
     security = {
@@ -241,7 +251,9 @@ in {
       description = "Grafana Service Daemon";
       wantedBy = ["multi-user.target"];
       after = ["networking.target"];
-      environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
+      environment = {
+        QT_QPA_PLATFORM = "offscreen";
+      } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
       serviceConfig = {
         ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";
         WorkingDirectory = cfg.dataDir;
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index dbc24e55c20..61ff67ed993 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.2";
+  version = "5.0.3";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0lwv6k8yp1jpp3ghizvrnnb5zpnsbkyd1i9ggy4gbs68mg8xzp19";
+    sha256 = "0508dvkanrfrvdnddjsaz8qm3qbgavznia5hqr8zx3qvq4789hj2";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "06qqi5v9s9ni4a380alsc3f53hvmmypqgm3cc25hl3ld5w3zdlkd";
+    sha256 = "0dzb93vx72sm6iri6c96k3a15zn8mp26pd2r78m6k3nhg8rsrqmm";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 82f2c19d9812bab4e6af3969560d9125ef883630 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 19 Mar 2018 12:01:08 -0700
Subject: [PATCH 1469/2266] browserpass: 2.0.11 -> 2.0.13

---
 pkgs/tools/security/browserpass/default.nix | 4 ++--
 pkgs/tools/security/browserpass/deps.nix    | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index af1bb14d02a..c6d4a78e6b4 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "2.0.11";
+  version = "2.0.13";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "browserpass";
     owner = "dannyvankooten";
     rev = version;
-    sha256 = "0d6rpkka27a57nv69yiw71jj3m6axdj5hygsz36dznnn8w76vvyv";
+    sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l";
   };
 
   postInstall = ''
diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix
index 763317aafc7..631463a69d1 100644
--- a/pkgs/tools/security/browserpass/deps.nix
+++ b/pkgs/tools/security/browserpass/deps.nix
@@ -18,6 +18,15 @@
       sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
     };
   }
+  {
+    goPackagePath = "github.com/sahilm/fuzzy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sahilm/fuzzy";
+      rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
+      sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
+    };
+  }
   {
     goPackagePath = "rsc.io/qr";
     fetch = {

From 4cb10bf3296e4afb2f35e539ecda62e139c6baf6 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 19 Mar 2018 12:31:11 -0700
Subject: [PATCH 1470/2266] gmailieer: 0.5 -> 0.6

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

diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index e56dbe0817e..c3085519ec4 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "gmailieer";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "gauteh";
     repo = "gmailieer";
     rev = "v${version}";
-    sha256 = "152ky06k1wc3jffb48c6zh7c7pr732m9f4g1i316zaa4nx2ynfsa";
+    sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76";
   };
 
   propagatedBuildInputs = with python3Packages; [

From e2b8dfa867df441bfb32c90bf2ebb4c14ba829cd Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+github@schneefux.xyz>
Date: Mon, 19 Mar 2018 21:27:18 +0100
Subject: [PATCH 1471/2266] metabase: init at 0.28.1 (#33460)

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

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
new file mode 100644
index 00000000000..90bd5b614dd
--- /dev/null
+++ b/pkgs/servers/metabase/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "metabase-${version}";
+  version = "0.28.1";
+
+  jar = fetchurl {
+    url = "http://downloads.metabase.com/v${version}/metabase.jar";
+    sha256 = "1nv3y4pnvzd7lwyj14nmhr3k52qd8hilcjxvd7qr3hb7kzmjvbzk";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $jar"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The easy, open source way for everyone in your company to ask questions and learn from data.";
+    homepage = https://metabase.com;
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ schneefux ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ffd4ac592a..908dbf4f0a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1306,6 +1306,8 @@ with pkgs;
 
   meson = callPackage ../development/tools/build-managers/meson { };
 
+  metabase = callPackage ../servers/metabase { };
+
   mp3blaster = callPackage ../applications/audio/mp3blaster { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };

From de63ff83a7660b83c4e2ac7e86f0acff2dfe2a4e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 19 Mar 2018 22:39:56 +0100
Subject: [PATCH 1472/2266] pythonPackages.svg-path: 2.0b1 -> 2.2

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

diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix
new file mode 100644
index 00000000000..04031fcbc10
--- /dev/null
+++ b/pkgs/development/python-modules/svg-path/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "svg.path";
+  version = "2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08kp03i4yiqdkz7a7l7d7kzszahmhigrml2502zi1ybndrh7ayxw";
+  };
+
+  meta = with stdenv.lib; {
+    description = "SVG path objects and parser";
+    homepage = https://github.com/regebro/svg.path;
+    license = licenses.mit;
+    maintainers = with maintainers; [ goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 917f1c9e30a..5c49b6bc0c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6348,22 +6348,7 @@ in {
 
   };
 
-  svg-path = buildPythonPackage rec {
-    name = "svg.path-${version}";
-    version = "2.0b1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/svg.path/${name}.zip";
-      sha256 = "038x4wqkbvcs71x6n6kzr4kn99csyv8v4gqzssr8pqylqpxi56bm";
-    };
-
-    meta = {
-      description = "SVG path objects and parser";
-      homepage = https://github.com/regebro/svg.path;
-      license = licenses.cc0;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  svg-path = callPackage ../development/python-modules/svg-path { };
 
   regex = callPackage ../development/python-modules/regex { };
 

From 8ade9e6705701c1445c82cf895ddbe99b2557c41 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 15 Mar 2018 12:04:54 +0100
Subject: [PATCH 1473/2266] h5utils: init at 1.13.1

---
 pkgs/tools/misc/h5utils/default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  5 ++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/misc/h5utils/default.nix

diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix
new file mode 100644
index 00000000000..db18cae77b1
--- /dev/null
+++ b/pkgs/tools/misc/h5utils/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, lib
+, hdf5, libpng, libjpeg
+, hdf4 ? null
+, libmatheval ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.13.1";
+  name = "h5utils-${version}";
+
+  # fetchurl is used instead of fetchFromGitHub because the git repo version requires
+  # additional tools to build compared to the tarball release; see the README for details.
+  src = fetchurl {
+    url = "https://github.com/stevengj/h5utils/releases/download/${version}/h5utils-${version}.tar.gz";
+    sha256 = "0rbx3m8p5am8z5m0f3sryryfc41541hjpkixb1jkxakd9l36z9y5";
+  };
+
+  # libdf is an alternative name for libhdf (hdf4)
+  preConfigure = lib.optionalString (hdf4 != null)
+  ''
+    substituteInPlace configure \
+    --replace "-ldf" "-lhdf" \
+  '';
+
+  preBuild = lib.optionalString hdf5.mpiSupport "export CC=${hdf5.mpi}/bin/mpicc";
+
+  buildInputs = with lib; [ hdf5 libjpeg libpng ] ++ optional hdf5.mpiSupport hdf5.mpi
+    ++ optional (hdf4 != null) hdf4
+    ++ optional (libmatheval != null) libmatheval;
+
+  meta = with lib; {
+    description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format";
+    homepage = https://github.com/stevengj/h5utils;
+    license = with licenses; [ mit gpl2 ];
+    maintainers = with maintainers; [ sfrijters ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 908dbf4f0a1..7fe87becb09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2769,6 +2769,11 @@ with pkgs;
 
   h2 = callPackage ../servers/h2 { };
 
+  h5utils = callPackage ../tools/misc/h5utils {
+    libmatheval = null;
+    hdf4 = null;
+  };
+
   haproxy = callPackage ../tools/networking/haproxy { };
 
   haveged = callPackage ../tools/security/haveged { };

From f9ed23d2716a2561efec68840b188341e5724fd4 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Mon, 19 Mar 2018 22:59:59 +0100
Subject: [PATCH 1474/2266] altermime: fix build

---
 pkgs/tools/networking/altermime/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index f05669a4e50..f1e85487d8f 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=format";
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=format"
+    "-Wno-error=format-truncation"
+    "-Wno-error=pointer-compare"
+    "-Wno-error=memset-elt-size"
+  ];
 
   postPatch = ''
     sed -i Makefile -e "s@/usr/local@$out@"

From 3928fd90814fb8d7ef0bab19f40b6a619c7cd8c4 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 16 Mar 2018 00:51:20 +0900
Subject: [PATCH 1475/2266] Chromium: fix skia build on aarch64

Patch imported from Arch Linux ARM
---
 .../networking/browsers/chromium/common.nix   |  5 ++++-
 .../chromium/patches/skia_buildfix.patch      | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index def771c2f72..44310b05462 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -176,7 +176,10 @@ let
       (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
       (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
       (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
-    ] ++ optional enableWideVine ./patches/widevine.patch;
+    ] ++ optional enableWideVine ./patches/widevine.patch
+      ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [
+        ./patches/skia_buildfix.patch
+    ];
 
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
new file mode 100644
index 00000000000..5348b9ac905
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
@@ -0,0 +1,22 @@
+Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
+===================================================================
+--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
++++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
+@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
+ }
+ 
+ SI F from_half(U16 h) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+     return vcvt_f32_f16(h);
+ 
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
+ }
+ 
+ SI U16 to_half(F f) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+     return vcvt_f16_f32(f);
+ 
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)

From d7856d3c2ae5720844b8cfcb68736308cd844b50 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 19 Mar 2018 22:24:42 +0100
Subject: [PATCH 1476/2266] ii: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/networking/irc/ii/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix
index 15f9def1151..b4532c5470b 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "ii-1.8";
-  
+
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
     sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 908dbf4f0a1..dc2c0a7da32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16070,7 +16070,9 @@ with pkgs;
 
   ifenslave = callPackage ../os-specific/linux/ifenslave { };
 
-  ii = callPackage ../applications/networking/irc/ii { };
+  ii = callPackage ../applications/networking/irc/ii {
+    stdenv = gccStdenv;
+  };
 
   ike = callPackage ../applications/networking/ike { };
 

From e616725ba0756720c4990cf441f289666a4cc735 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 19 Mar 2018 22:33:57 +0100
Subject: [PATCH 1477/2266] imatix_gsl: fix clang build

/cc ZHF #36454
---
 pkgs/development/tools/imatix_gsl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index a35af00f449..61f211b9580 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pcre ];
 
+  CCNAME = "cc";
+
   postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile";
   preBuild = "cd src";
   installFlags = "DESTDIR=$(out)";

From 176b9ae0953282c93c4f1b1b28a8cbc262586604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 19 Mar 2018 23:41:03 +0100
Subject: [PATCH 1478/2266] kitty: 0.8.0 -> 0.8.2

---
 pkgs/applications/misc/kitty/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 17746563c56..52f1c9fb1a1 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext }:
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz,
+  fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel,
+  libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
+  libxkbcommon, libXi, libXext }:
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.8.0";
+  version = "0.8.2";
   name = "kitty-${version}";
   format = "other";
 
@@ -10,10 +13,13 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "12pj4js704r4f6idam3ljg7yllij9v158ayq6ym24zq18bv1nmbz";
+    sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c";
   };
 
-  buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ];
+  buildInputs = [
+    fontconfig glfw ncurses libunistring harfbuzz libX11
+    libXrandr libXinerama libXcursor libxkbcommon libXi libXext
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
 

From 5873a3418b0fdd0df60931403023fd2b9f73e461 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 19 Mar 2018 22:57:31 +0100
Subject: [PATCH 1479/2266] iniparser: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/iniparser/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index e586b30393e..8beda8663c5 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   patches = ./no-usr.patch;
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile \
+        --replace -Wl,-soname= -Wl,-install_name,
+  '';
+
   doCheck = true;
   preCheck = "patchShebangs test/make-tests.sh";
 

From 031492cbfe2f2768c9b271c194c74e3f75e7316c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 19 Mar 2018 23:55:59 +0100
Subject: [PATCH 1480/2266] kore: fix clang build

/cc ZHF #36454
---
 pkgs/development/web/kore/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
index 3da932b6b17..b0dc2ba041a 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/pkgs/development/web/kore/default.nix
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  # added to fix build w/gcc7
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isLinux [ "-Wno-error=pointer-compare" ];
+  # added to fix build w/gcc7 and clang5
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
+    + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
 
   enableParallelBuilding = true;
 

From 3f964978d867b7555a23d8dbc722ce79a170d052 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 20 Mar 2018 00:01:52 +0100
Subject: [PATCH 1481/2266] libftdi: mark linux only

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

diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index fff760c5519..f90e741a57e 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libftdi-0.20";
-  
+
   src = fetchurl {
     url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
     sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "A library to talk to FTDI chips using libusb";
     homepage = https://www.intra2net.com/en/developer/libftdi/;
     license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From e547bd0dc419cdbe2e8d8440224b252f723590ab Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 18:03:46 -0400
Subject: [PATCH 1482/2266] lib: Factor in tiny bit of `meta.platform` checking

I need it in stdenv and release-lib, so that seems motivation enough.
---
 lib/meta.nix                       | 19 +++++++++++++++++++
 pkgs/stdenv/generic/check-meta.nix |  6 ++----
 pkgs/top-level/release-lib.nix     | 16 +++++-----------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 07b1710fff7..199030c103a 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -67,4 +67,23 @@ rec {
   */
   hiPrioSet = set: mapDerivationAttrset hiPrio set;
 
+
+  /* Check to see if a platform is matched by the given `meta.platforms`
+     element.
+
+     A `meta.platform` pattern is either
+
+       1. (legacy) a system string.
+
+       2. (modern) a pattern for the platform `parsed` field.
+
+     We can inject these into a patten for the whole of a structured platform,
+     and then match that.
+  */
+  platformMatch = platform: elem: let
+      pattern =
+        if builtins.isString elem
+        then { system = elem; }
+        else { parsed = elem; };
+    in lib.matchAttrs pattern platform;
 }
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 444bad84d8d..6a8d97458e5 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -173,10 +173,8 @@ let
     else "key '${k}' is unrecognized; expected one of: \n\t      [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
   checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
 
-  checkPlatform = attrs: let
-      raw = attrs.meta.platforms;
-      uniform = map (x: if builtins.isString x then { system = x; } else { parsed = x; }) raw;
-    in lib.any (pat: lib.matchAttrs pat hostPlatform) uniform;
+  checkPlatform = attrs:
+    lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms;
 
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index e377ca30f3a..dbeb13d4bd3 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -98,18 +98,12 @@ rec {
   packagePlatforms = mapAttrs (name: value:
     let res = builtins.tryEval (
       if isDerivation value then
-        # TODO(@Ericson2314) deduplicate with `checkPlatform` in
-        # `pkgs/stdenv/generic/check-meta.nix`.
         value.meta.hydraPlatforms or (let
-            raw = value.meta.platforms or [ "x86_64-linux" ];
-            toPattern = x: if builtins.isString x
-                           then { system = x; }
-                           else { parsed = x; };
-            uniform = map toPattern raw;
-            pred = hostPlatform:
-              lib.any (pat: lib.matchAttrs pat hostPlatform) uniform;
-            pred' = system: pred (lib.systems.elaborate { inherit system; });
-         in lib.filter pred' supportedSystems)
+            linuxDefaulted = value.meta.platforms or [ "x86_64-linux" ];
+            pred = system: lib.any
+              (lib.meta.platformMatch (lib.systems.elaborate { inherit system; }))
+              linuxDefaulted;
+          in lib.filter pred supportedSystems)
       else if value.recurseForDerivations or false || value.recurseForRelease or false then
         packagePlatforms value
       else

From e8fe2e15489665ac02c3702763b9dcd817beca13 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 20 Mar 2018 00:42:33 +0100
Subject: [PATCH 1483/2266] tdesktopPackages.preview: init at 1.2.12

Start tracking the pre-releases. I'll have to refactor/improve the
patching soon.
---
 .../telegram/tdesktop/default.nix             | 140 ++----------------
 .../telegram/tdesktop/generic.nix             | 140 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +-
 3 files changed, 153 insertions(+), 132 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 74a477b537c..134066cd352 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,133 +1,15 @@
-{ mkDerivation, lib, fetchgit, fetchpatch
-, pkgconfig, gyp, cmake, makeWrapper
-, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
-, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
-}:
+{ qt5, stdenv }:
 
-with lib;
-
-mkDerivation rec {
-  name = "telegram-desktop-${version}";
-  version = "1.2.6";
-
-  # Submodules
-  src = fetchgit {
-    url = "git://github.com/telegramdesktop/tdesktop";
-    rev = "v${version}";
-    sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
-    fetchSubmodules = true;
+let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
+in {
+  stable = mkTelegram {
+    stable = true;
+    version = "1.2.6";
+    sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
   };
-
-  # TODO: Not active anymore.
-  tgaur = fetchgit {
-    url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
-    rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
-    sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "tdesktop.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
-      sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
-    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
-  '';
-
-  nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ];
-
-  buildInputs = [
-    qtbase qtimageformats gtk3 libappindicator-gtk3
-    dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
-  ];
-
-  enableParallelBuilding = true;
-
-  GYP_DEFINES = concatStringsSep "," [
-    "TDESKTOP_DISABLE_CRASH_REPORTS"
-    "TDESKTOP_DISABLE_AUTOUPDATE"
-    "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
-  ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-DTDESKTOP_DISABLE_AUTOUPDATE"
-    "-DTDESKTOP_DISABLE_CRASH_REPORTS"
-    "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
-    "-I${minizip}/include/minizip"
-    # See Telegram/gyp/qt.gypi
-    "-I${getDev qtbase}/mkspecs/linux-g++"
-  ] ++ concatMap (x: [
-    "-I${getDev qtbase}/include/${x}"
-    "-I${getDev qtbase}/include/${x}/${qtbase.version}"
-    "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
-    "-I${getDev libopus}/include/opus"
-    "-I${getDev alsaLib}/include/alsa"
-    "-I${getDev libpulseaudio}/include/pulse"
-  ]) [ "QtCore" "QtGui" "QtDBus" ];
-  CPPFLAGS = NIX_CFLAGS_COMPILE;
-
-  preConfigure = ''
-
-    pushd "Telegram/ThirdParty/libtgvoip"
-    patch -Np1 -i "${tgaur}/libtgvoip.patch"
-    popd
-
-    sed -i Telegram/gyp/telegram_linux.gypi \
-      -e 's,/usr,/does-not-exist,g' \
-      -e 's,appindicator-0.1,appindicator3-0.1,g' \
-      -e 's,-flto,,g'
-
-    sed -i Telegram/gyp/qt.gypi \
-      -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
-      -e 's,\d+",\d+" | head -n1,g'
-    sed -i Telegram/gyp/qt_moc.gypi \
-      -e "s,/usr/bin/moc,moc,g"
-    sed -i Telegram/gyp/qt_rcc.gypi \
-      -e "s,/usr/bin/rcc,rcc,g"
-
-    gyp \
-      -Dbuild_defines=${GYP_DEFINES} \
-      -Gconfig=Release \
-      --depth=Telegram/gyp \
-      --generator-output=../.. \
-      -Goutput_dir=out \
-       --format=cmake \
-      Telegram/gyp/Telegram.gyp
-
-    cd out/Release
-
-    NUM=$((`wc -l < CMakeLists.txt` - 2))
-    sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
-
-    export ASM=$(type -p gcc)
-  '';
-
-  installPhase = ''
-    install -Dm755 Telegram $out/bin/telegram-desktop
-    mkdir -p $out/share/applications $out/share/kde4/services
-    sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
-    sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
-    for icon_size in 16 32 48 64 128 256 512; do
-      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
-    done
-
-    # This is necessary to run Telegram in a pure environment.
-    wrapProgram $out/bin/telegram-desktop \
-      --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
-      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
-    sed -i $out/bin/telegram-desktop \
-      -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
-  '';
-
-  meta = {
-    description = "Telegram Desktop messaging app";
-    license = licenses.gpl3;
-    platforms = [ "x86_64-linux" "i686-linux" ];
-    homepage = https://desktop.telegram.org/;
-    maintainers = with maintainers; [ abbradar garbas primeos ];
+  preview = mkTelegram {
+    stable = false;
+    version = "1.2.12";
+    sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m";
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
new file mode 100644
index 00000000000..a165e90c3bd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -0,0 +1,140 @@
+{ stable, version, sha256Hash }:
+
+{ mkDerivation, lib, fetchgit, fetchpatch
+, pkgconfig, pythonPackages, cmake, makeWrapper
+, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
+, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
+}:
+
+with lib;
+
+mkDerivation rec {
+  name = "telegram-desktop-${version}";
+  inherit version;
+
+  # Submodules
+  src = fetchgit {
+    url = "git://github.com/telegramdesktop/tdesktop";
+    rev = "v${version}";
+    sha256 = sha256Hash;
+    fetchSubmodules = true;
+  };
+
+  # TODO: Not active anymore.
+  tgaur = fetchgit {
+    url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
+    rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
+    sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
+  };
+
+  patches = [ (if stable
+    then (fetchpatch {
+      name = "tdesktop.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
+      sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
+    })
+    else (fetchpatch {
+      name = "tdesktop.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=59ca8bd4428cf2fb3f02d7f1e1a5558545a4c075";
+      sha256 = "0jj2kifzx83f9nhk30csy2373avpyx0ci70a8bc7j2dm3wxym50l";
+    }))
+  ];
+
+  postPatch = ''
+    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
+  '';
+
+  nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
+
+  buildInputs = [
+    qtbase qtimageformats gtk3 libappindicator-gtk3
+    dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
+  ];
+
+  enableParallelBuilding = true;
+
+  GYP_DEFINES = concatStringsSep "," [
+    "TDESKTOP_DISABLE_CRASH_REPORTS"
+    "TDESKTOP_DISABLE_AUTOUPDATE"
+    "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-DTDESKTOP_DISABLE_AUTOUPDATE"
+    "-DTDESKTOP_DISABLE_CRASH_REPORTS"
+    "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+    "-I${minizip}/include/minizip"
+    # See Telegram/gyp/qt.gypi
+    "-I${getDev qtbase}/mkspecs/linux-g++"
+  ] ++ concatMap (x: [
+    "-I${getDev qtbase}/include/${x}"
+    "-I${getDev qtbase}/include/${x}/${qtbase.version}"
+    "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
+    "-I${getDev libopus}/include/opus"
+    "-I${getDev alsaLib}/include/alsa"
+    "-I${getDev libpulseaudio}/include/pulse"
+  ]) [ "QtCore" "QtGui" "QtDBus" ];
+  CPPFLAGS = NIX_CFLAGS_COMPILE;
+
+  preConfigure = ''
+
+    pushd "Telegram/ThirdParty/libtgvoip"
+    patch -Np1 -i "${tgaur}/libtgvoip.patch"
+    popd
+
+    sed -i Telegram/gyp/telegram_linux.gypi \
+      -e 's,/usr,/does-not-exist,g' \
+      -e 's,appindicator-0.1,appindicator3-0.1,g' \
+      -e 's,-flto,,g'
+
+    sed -i Telegram/gyp/qt.gypi \
+      -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
+      -e 's,\d+",\d+" | head -n1,g'
+    sed -i Telegram/gyp/qt_moc.gypi \
+      -e "s,/usr/bin/moc,moc,g"
+    sed -i Telegram/gyp/qt_rcc.gypi \
+      -e "s,/usr/bin/rcc,rcc,g"
+
+    gyp \
+      -Dbuild_defines=${GYP_DEFINES} \
+      -Gconfig=Release \
+      --depth=Telegram/gyp \
+      --generator-output=../.. \
+      -Goutput_dir=out \
+       --format=cmake \
+      Telegram/gyp/Telegram.gyp
+
+    cd out/Release
+
+    NUM=$((`wc -l < CMakeLists.txt` - 2))
+    sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
+
+    export ASM=$(type -p gcc)
+  '';
+
+  installPhase = ''
+    install -Dm755 Telegram $out/bin/telegram-desktop
+    mkdir -p $out/share/applications $out/share/kde4/services
+    sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
+    sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
+    for icon_size in 16 32 48 64 128 256 512; do
+      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
+    done
+
+    # This is necessary to run Telegram in a pure environment.
+    wrapProgram $out/bin/telegram-desktop \
+      --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
+      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
+    sed -i $out/bin/telegram-desktop \
+      -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
+  '';
+
+  meta = {
+    description = "Telegram Desktop messaging app";
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    homepage = https://desktop.telegram.org/;
+    maintainers = with maintainers; [ abbradar garbas primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c273b038c..2b8af584bf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17773,9 +17773,8 @@ with pkgs;
 
   taskserver = callPackage ../servers/misc/taskserver { };
 
-  tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
-    inherit (pythonPackages) gyp;
-  };
+  tdesktopPackages = callPackage ../applications/networking/instant-messengers/telegram/tdesktop { };
+  tdesktop = tdesktopPackages.stable;
 
   telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };
 

From a2d8a9aad70d76e965ff33c8722604b068ca4bc8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 20 Mar 2018 02:31:31 +0200
Subject: [PATCH 1484/2266] armTrustedFirmware: Remove targetPlatforms like was
 done in U-Boot

Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289
---
 pkgs/misc/arm-trusted-firmware/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 4b5a1957938..b4fa3662675 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, buildPackages }:
 
 let
-  buildArmTrustedFirmware = { targetPlatforms
-            , filesToInstall
+  buildArmTrustedFirmware = { filesToInstall
             , installDir ? "$out"
             , platform
             , extraMakeFlags ? []
@@ -46,8 +45,6 @@ let
       description = "A reference implementation of secure world software for ARMv8-A";
       license = licenses.bsd3;
       maintainers = [ maintainers.lopsided98 ];
-      # TODO: Fix when #34444 is merged
-      # platforms = targetPlatforms;
     } // extraMeta;
   } // builtins.removeAttrs args [ "extraMeta" ]);
 
@@ -64,13 +61,13 @@ in rec {
       sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys";
     };
     platform = "sun50iw1p1";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["build/${platform}/release/bl31.bin"];
   };
 
   armTrustedFirmwareQemu = buildArmTrustedFirmware rec {
     platform = "qemu";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = [
       "build/${platform}/release/bl1.bin"
       "build/${platform}/release/bl2.bin"
@@ -81,7 +78,7 @@ in rec {
   armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec {
     extraMakeFlags = [ "bl31" ];
     platform = "rk3328";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
   };
 }

From 48c3e600612d74ce71706cd3b603d9db839c68f7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 9 Mar 2018 16:36:38 -0600
Subject: [PATCH 1485/2266] aws-sdk-cpp: 1.4.10 -> 1.4.15

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

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 8d13a55887d..3e1edcdcfbf 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.4.10";
+  version = "1.4.15";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0gw0ph6v2w4zqmixqfw5ab08c0r3d7iy2z1hll5pydlp5vwfmn7g";
+    sha256 = "10nk8zbrh2sgw7cp03g8yqylyi29bb99w8v6dbw97pnxf689m635";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 192f4144b282a7f04695fcb79d84e8278ee6af8c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 21:29:48 -0400
Subject: [PATCH 1486/2266] release-lib: Filter supportedSystems with
 `meta.platforms`-style patterns

Instead of intersecting system strings, we filter with the sort of
patterns used in `meta.platforms`.

Indicating this change `forTheseSystems` has been renamed to
`forMatchingSystems`, since the given list is now patterns to match, and
not the systems themselves. [Just as with `meta.platforms`, systems
strings are also supported for backwards compatibility.]

This is more flexible, and makes the `forMatchingSystems` and
packagePlatforms` cases more analogous.
---
 nixos/release.nix                | 10 ++++----
 pkgs/top-level/release-cross.nix |  2 +-
 pkgs/top-level/release-lib.nix   | 43 +++++++++++++++++++++++---------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 1db2da51144..a7d373d1f7c 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -16,7 +16,7 @@ let
     inherit system;
   } // args);
 
-  callTestOnTheseSystems = systems: fn: args: forTheseSystems systems (system: hydraJob (importTest fn args system));
+  callTestOnTheseSystems = systems: fn: args: forMatchingSystems systems (system: hydraJob (importTest fn args system));
   callTest = callTestOnTheseSystems supportedSystems;
 
   callSubTests = callSubTestsOnTheseSystems supportedSystems;
@@ -123,7 +123,7 @@ in rec {
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
 
-  netboot = forTheseSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
+  netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
     inherit system;
     modules = [
       ./modules/installer/netboot/netboot-minimal.nix
@@ -137,7 +137,7 @@ in rec {
     inherit system;
   });
 
-  iso_graphical = forTheseSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
     type = "graphical";
     inherit system;
@@ -145,7 +145,7 @@ in rec {
 
   # A variant with a more recent (but possibly less stable) kernel
   # that might support more hardware.
-  iso_minimal_new_kernel = forTheseSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
     type = "minimal-new-kernel";
     inherit system;
@@ -153,7 +153,7 @@ in rec {
 
 
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
-  ova = forTheseSystems [ "x86_64-linux" ] (system:
+  ova = forMatchingSystems [ "x86_64-linux" ] (system:
 
     with import nixpkgs { inherit system; };
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index ef99dbd619e..0d15d817a66 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -88,7 +88,7 @@ in
         f (["buildPackages"] ++ path) { inherit system crossSystem; }
       );
 
-    testEqual = path: systems: forTheseSystems systems (testEqualOne path);
+    testEqual = path: systems: forMatchingSystems systems (testEqualOne path);
 
     mapTestEqual = lib.mapAttrsRecursive testEqual;
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index dbeb13d4bd3..b410348d1e8 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -48,33 +48,56 @@ rec {
   pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; };
 
 
+  # Given a list of 'meta.platforms'-style patterns, return the sublist of
+  # `supportedSystems` containing systems that matches at least one of the given
+  # patterns.
+  #
+  # This is written in a funny way so that we only elaborate the systems once.
+  supportedMatches = let
+      supportedPlatforms = map
+        (system: lib.systems.elaborate { inherit system; })
+        supportedSystems;
+    in metaPatterns: let
+      anyMatch = platform:
+        lib.any (lib.meta.platformMatch platform) metaPatterns;
+      matchingPlatforms = lib.filter anyMatch supportedPlatforms;
+    in map ({ system, ...}: system) matchingPlatforms;
+
+
   assertTrue = bool:
     if bool
     then pkgs.runCommand "evaluated-to-true" {} "touch $out"
     else pkgs.runCommand "evaluated-to-false" {} "false";
 
+
   /* The working or failing mails for cross builds will be sent only to
      the following maintainers, as most package maintainers will not be
      interested in the result of cross building a package. */
   crossMaintainers = [ maintainers.viric ];
 
+
+  # Generate attributes for all supported systems.
   forAllSystems = genAttrs supportedSystems;
-  forTheseSystems = systems: f:
-    genAttrs (filter (x: elem x supportedSystems) systems) f;
+
+
+  # Generate attributes for all sytems matching at least one of the given
+  # patterns
+  forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns);
+
 
   /* Build a package on the given set of platforms.  The function `f'
      is called for each supported platform with Nixpkgs for that
      platform as an argument .  We return an attribute set containing
      a derivation for each supported platform, i.e. ‘{ x86_64-linux =
      f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
-  testOn = systems: f: forTheseSystems systems
+  testOn = metaPatterns: f: forMatchingSystems metaPatterns
     (system: hydraJob' (f (pkgsFor system)));
 
 
   /* Similar to the testOn function, but with an additional
      'crossSystem' parameter for allPackages, defining the target
      platform for cross builds. */
-  testOnCross = crossSystem: systems: f: forTheseSystems systems
+  testOnCross = crossSystem: metaPatterns: f: forMatchingSystems metaPatterns
     (system: hydraJob' (f (allPackages { inherit system crossSystem; })));
 
 
@@ -82,14 +105,14 @@ rec {
      map each leaf node to `testOn [platforms...] (pkgs:
      pkgs.<attrPath>)'. */
   mapTestOn = mapAttrsRecursive
-    (path: systems: testOn systems (pkgs: getAttrFromPath path pkgs));
+    (path: metaPatterns: testOn metaPatterns (pkgs: getAttrFromPath path pkgs));
 
 
   /* Similar to the testOn function, but with an additional 'crossSystem'
    * parameter for allPackages, defining the target platform for cross builds,
    * and triggering the build of the host derivation (cross built - crossDrv). */
   mapTestOnCross = crossSystem: mapAttrsRecursive
-    (path: systems: testOnCross crossSystem systems
+    (path: metaPatterns: testOnCross crossSystem metaPatterns
       (pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs)));
 
 
@@ -98,12 +121,8 @@ rec {
   packagePlatforms = mapAttrs (name: value:
     let res = builtins.tryEval (
       if isDerivation value then
-        value.meta.hydraPlatforms or (let
-            linuxDefaulted = value.meta.platforms or [ "x86_64-linux" ];
-            pred = system: lib.any
-              (lib.meta.platformMatch (lib.systems.elaborate { inherit system; }))
-              linuxDefaulted;
-          in lib.filter pred supportedSystems)
+        value.meta.hydraPlatforms
+          or supportedMatches (value.meta.platforms or [ "x86_64-linux" ])
       else if value.recurseForDerivations or false || value.recurseForRelease or false then
         packagePlatforms value
       else

From 88c04a8b6b6714a61c8a28ec8bbd5ecf580ed2c7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 22:14:45 -0400
Subject: [PATCH 1487/2266] lib: Make platform predicates greppable

---
 lib/systems/for-meta.nix | 28 +++++++--------
 lib/systems/inspect.nix  | 74 +++++++++++++++++++---------------------
 2 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 0a7a4bf5b0c..fa713b1e613 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -7,21 +7,21 @@ in rec {
   inherit (lib.systems.doubles) all mesaPlatforms;
   none = [];
 
-  arm     = [ patterns.Arm ];
-  aarch64 = [ patterns.Aarch64 ];
-  x86     = [ patterns.x86 ];
-  i686    = [ patterns.i686 ];
-  x86_64  = [ patterns.x86_64 ];
-  mips    = [ patterns.Mips ];
+  arm     = [ patterns.isArm ];
+  aarch64 = [ patterns.isAarch64 ];
+  x86     = [ patterns.isx86 ];
+  i686    = [ patterns.isi686 ];
+  x86_64  = [ patterns.isx86_64 ];
+  mips    = [ patterns.isMips ];
 
-  cygwin  = [ patterns.Cygwin ];
-  darwin  = [ patterns.Darwin ];
-  freebsd = [ patterns.FreeBSD ];
+  cygwin  = [ patterns.isCygwin ];
+  darwin  = [ patterns.isDarwin ];
+  freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
   gnu     = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
-  illumos = [ patterns.SunOS ];
-  linux   = [ patterns.Linux ];
-  netbsd  = [ patterns.NetBSD ];
-  openbsd = [ patterns.OpenBSD ];
-  unix    = patterns.Unix; # Actually a list
+  illumos = [ patterns.isSunOS ];
+  linux   = [ patterns.isLinux ];
+  netbsd  = [ patterns.isNetBSD ];
+  openbsd = [ patterns.isOpenBSD ];
+  unix    = patterns.isUnix; # Actually a list
 }
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 4cdd2629547..e8ea2bed25f 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -5,53 +5,51 @@ with lib.lists;
 
 rec {
   patterns = rec {
-    i686         = { cpu = cpuTypes.i686; };
-    x86_64       = { cpu = cpuTypes.x86_64; };
-    PowerPC      = { cpu = cpuTypes.powerpc; };
-    x86          = { cpu = { family = "x86"; }; };
-    Arm          = { cpu = { family = "arm"; }; };
-    Aarch64      = { cpu = { family = "aarch64"; }; };
-    Mips         = { cpu = { family = "mips"; }; };
-    RiscV        = { cpu = { family = "riscv"; }; };
-    Wasm         = { cpu = { family = "wasm"; }; };
+    isi686         = { cpu = cpuTypes.i686; };
+    isx86_64       = { cpu = cpuTypes.x86_64; };
+    isPowerPC      = { cpu = cpuTypes.powerpc; };
+    isx86          = { cpu = { family = "x86"; }; };
+    isArm          = { cpu = { family = "arm"; }; };
+    isAarch64      = { cpu = { family = "aarch64"; }; };
+    isMips         = { cpu = { family = "mips"; }; };
+    isRiscV        = { cpu = { family = "riscv"; }; };
+    isWasm         = { cpu = { family = "wasm"; }; };
 
-    "32bit"      = { cpu = { bits = 32; }; };
-    "64bit"      = { cpu = { bits = 64; }; };
-    BigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
-    LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
+    is32bit        = { cpu = { bits = 32; }; };
+    is64bit        = { cpu = { bits = 64; }; };
+    isBigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
+    isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
 
-    BSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
-    Darwin       = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
-    Unix         = [ BSD Darwin Linux SunOS Hurd Cygwin ];
+    isBSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+    isDarwin       = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
+    isUnix         = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ];
 
-    MacOS        = { kernel = kernels.macos; };
-    iOS          = { kernel = kernels.ios; };
-    Linux        = { kernel = kernels.linux; };
-    SunOS        = { kernel = kernels.solaris; };
-    FreeBSD      = { kernel = kernels.freebsd; };
-    Hurd         = { kernel = kernels.hurd; };
-    NetBSD       = { kernel = kernels.netbsd; };
-    OpenBSD      = { kernel = kernels.openbsd; };
-    Windows      = { kernel = kernels.windows; };
-    Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
-    MinGW        = { kernel = kernels.windows; abi = abis.gnu; };
+    isMacOS        = { kernel = kernels.macos; };
+    isiOS          = { kernel = kernels.ios; };
+    isLinux        = { kernel = kernels.linux; };
+    isSunOS        = { kernel = kernels.solaris; };
+    isFreeBSD      = { kernel = kernels.freebsd; };
+    isHurd         = { kernel = kernels.hurd; };
+    isNetBSD       = { kernel = kernels.netbsd; };
+    isOpenBSD      = { kernel = kernels.openbsd; };
+    isWindows      = { kernel = kernels.windows; };
+    isCygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
+    isMinGW        = { kernel = kernels.windows; abi = abis.gnu; };
 
-    Android      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
-    Musl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+    isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
+    isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
 
-    Kexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
-                     [ "x86" "arm" "aarch64" "mips" ];
-    Efi          = map (family: { cpu.family = family; })
-                     [ "x86" "arm" "aarch64" ];
-    Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
-                      [ "x86" "arm" "aarch64" "mips" ];
+    isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
+                       [ "x86" "arm" "aarch64" "mips" ];
+    isEfi          = map (family: { cpu.family = family; })
+                       [ "x86" "arm" "aarch64" ];
+    isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
+                        [ "x86" "arm" "aarch64" "mips" ];
   };
 
   matchAnyAttrs = patterns:
     if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
     else matchAttrs patterns;
 
-  predicates = mapAttrs'
-    (name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
-    patterns;
+  predicates = mapAttrs (_: matchAnyAttrs) patterns;
 }

From ec2aff0be670646bd5dbb3da7ae6f59afd36e215 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 22:25:49 -0400
Subject: [PATCH 1488/2266] lib: Messed up `or` operator precedence

Github broke oddly on my previous PR, so I tested and merged by hand.
Otherwise ofborg would have caught this.
---
 pkgs/top-level/release-lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index b410348d1e8..623c9d9cb00 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -122,7 +122,7 @@ rec {
     let res = builtins.tryEval (
       if isDerivation value then
         value.meta.hydraPlatforms
-          or supportedMatches (value.meta.platforms or [ "x86_64-linux" ])
+          or (supportedMatches (value.meta.platforms or [ "x86_64-linux" ]))
       else if value.recurseForDerivations or false || value.recurseForRelease or false then
         packagePlatforms value
       else

From 73d101af00d6c59f4cfa08c2298ad765838b0e1e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Mar 2018 22:32:33 -0400
Subject: [PATCH 1489/2266] linux-copperhead: 4.15.10.a -> 4.15.11.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index f59106746fe..cb0b9b10be1 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.10";
+  version = "4.15.11";
   revision = "a";
-  sha256 = "02plwrj6d7wzwf6w8q2cxspy2q58i3v46clm2vf8m9x6mm88jrzx";
+  sha256 = "09xyg3i2m5cv9cpl3pry579p40iphzsn1pif7046rvc7zfrjzl8d";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 7770e378a1fe98a7f57682ccd8f86298713c5650 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 21:03:33 -0700
Subject: [PATCH 1490/2266] AgdaStdlib: 0.14 -> 0.15

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.15 with grep in /nix/store/6787gs55hpa46z4507ji4jz5za51lyqy-agda-stdlib-0.15
- directory tree listing: https://gist.github.com/386f03ce4900379ef75d5d01bcc2cebb
---
 pkgs/development/libraries/agda/agda-stdlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 815e0f20b54..c72572139c6 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, agda, fetchFromGitHub, ghcWithPackages }:
 
 agda.mkDerivation (self: rec {
-  version = "0.14";
+  version = "0.15";
   name = "agda-stdlib-${version}";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    sha256 = "0qx72w6lwskp18q608f95j5dcxb9xr4q4mzdkxp01sgib8v2v56l";
+    sha256 = "0c2vfib4fmljy98c3s3s7jmpjlqxvsbv7wf6qxr38kamwzbryrjj";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];

From c79cc60e643ecace48ca207d39fc61b04126e572 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 6 Jun 2017 15:36:13 +0800
Subject: [PATCH 1491/2266] elisa: init at 0.0.20180320

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

diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
new file mode 100644
index 00000000000..6affb16e073
--- /dev/null
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -0,0 +1,36 @@
+{ mkDerivation, fetchFromGitHub, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
+, qtmultimedia, qtquickcontrols2, qtwebsockets
+, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit
+, baloo
+}:
+
+mkDerivation rec {
+  name = "elisa-${version}";
+  # 0.1 is expected in early/mid 2018-04
+  version = "0.0.20180320";
+
+  src = fetchFromGitHub {
+    owner  = "KDE";
+    repo   = "elisa";
+    rev    = "9dd35d7244a8a3553275152f5b50fbe6d272ce64";
+    sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+
+  propagatedBuildInputs = [
+    qtmultimedia qtquickcontrols2 qtwebsockets
+    kconfig kcmutils kcrash kdeclarative kfilemetadata kinit
+    baloo
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Elisa Music Player";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+    inherit (kconfig.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b8af584bf0..865107e0272 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3160,6 +3160,8 @@ with pkgs;
 
   kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
 
+  elisa = libsForQt5.callPackage ../applications/audio/elisa { };
+
   kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
   kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };

From 2ebf72573ea79c86a1cdb741bef989297a8921d2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 22:12:04 -0700
Subject: [PATCH 1492/2266] bash-completion: 2.7 -> 2.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.8 with grep in /nix/store/svgfjl0v59ff90l6h2gzbsplhbk3aqhp-bash-completion-2.8
- directory tree listing: https://gist.github.com/23a9bb8eddc5667ef5a94d69ea7ab340
---
 pkgs/shells/bash-completion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 1c1b83d67b9..b5f600da8f7 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bash-completion-${version}";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchurl {
     url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
-    sha256 = "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1";
+    sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
   };
 
   doCheck = true;

From e506914cfb484195153490673eb558ec9e604325 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 22:39:42 -0700
Subject: [PATCH 1493/2266] commonsCompress: 1.8.1 -> 1.16.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.16.1 in filename of file in /nix/store/bkj0f3csgr7z46ancws66bzgcxpamq8x-commons-compress-1.16.1
- directory tree listing: https://gist.github.com/2f7f8d5e9ede388260bcf5a3e305bd80
---
 pkgs/development/libraries/java/commons/compress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index a35eaa0b260..eff57d6f2fd 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.1";
+  version = "1.16.1";
   name    = "commons-compress-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
-    sha256 = "11viabgf34r3zx1avj51n00hzmx89kym3i90l6a5v5dbfh61h0lp";
+    sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37";
   };
 
   installPhase = ''

From 23ee7c9d8d510a781c9796d392e968537d254883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Fri, 16 Mar 2018 12:40:17 +0100
Subject: [PATCH 1494/2266] idrisPackages: add packages

---
 pkgs/development/idris-modules/array.nix      |  30 ++++
 pkgs/development/idris-modules/bi.nix         |  29 ++++
 pkgs/development/idris-modules/bifunctors.nix |  31 ++++
 pkgs/development/idris-modules/bytes.nix      |  29 ++++
 pkgs/development/idris-modules/canvas.nix     |  26 +++
 pkgs/development/idris-modules/categories.nix |  27 +++
 pkgs/development/idris-modules/coda.nix       |  28 +++
 pkgs/development/idris-modules/comonad.nix    |  28 +++
 .../development/idris-modules/composition.nix |  28 +++
 pkgs/development/idris-modules/config.nix     |  31 ++++
 pkgs/development/idris-modules/console.nix    |  30 ++++
 pkgs/development/idris-modules/containers.nix |  34 ++++
 pkgs/development/idris-modules/cube.nix       |  29 ++++
 pkgs/development/idris-modules/curses.nix     |  36 ++++
 pkgs/development/idris-modules/data.nix       |  28 +++
 pkgs/development/idris-modules/default.nix    | 163 +++++++++++++++++-
 pkgs/development/idris-modules/derive.nix     |  29 ++++
 .../development/idris-modules/descncrunch.nix |  28 +++
 pkgs/development/idris-modules/dict.nix       |  32 ++++
 pkgs/development/idris-modules/dom.nix        |  30 ++++
 pkgs/development/idris-modules/electron.nix   |  36 ++++
 pkgs/development/idris-modules/eternal.nix    |  35 ++++
 pkgs/development/idris-modules/farrp.nix      |  28 +++
 pkgs/development/idris-modules/free.nix       |  27 +++
 pkgs/development/idris-modules/fsm.nix        |  28 +++
 pkgs/development/idris-modules/glfw.nix       |  32 ++++
 pkgs/development/idris-modules/graphviz.nix   |  32 ++++
 pkgs/development/idris-modules/hamt.nix       |  29 ++++
 .../idris-modules/heyting-algebra.nix         |  28 +++
 pkgs/development/idris-modules/hezarfen.nix   |  28 +++
 pkgs/development/idris-modules/hrtime.nix     |  28 +++
 pkgs/development/idris-modules/html.nix       |  34 ++++
 pkgs/development/idris-modules/http.nix       |  30 ++++
 pkgs/development/idris-modules/http4idris.nix |  29 ++++
 pkgs/development/idris-modules/httpclient.nix |  36 ----
 pkgs/development/idris-modules/iaia.nix       |  28 +++
 .../idris-modules/idrishighlighter.nix        |  29 ++++
 .../development/idris-modules/idrisscript.nix |  28 +++
 pkgs/development/idris-modules/ipkgparser.nix |  29 ++++
 .../idris-modules/jheiling-extras.nix         |  29 ++++
 .../development/idris-modules/jheiling-js.nix |  30 ++++
 pkgs/development/idris-modules/js.nix         |  29 ++++
 pkgs/development/idris-modules/lens.nix       |  29 ++++
 pkgs/development/idris-modules/lightyear.nix  |   7 +-
 pkgs/development/idris-modules/logic.nix      |  31 ++++
 pkgs/development/idris-modules/mapping.nix    |  28 +++
 pkgs/development/idris-modules/mhd.nix        |  33 ++++
 pkgs/development/idris-modules/pacman.nix     |  32 ++++
 pkgs/development/idris-modules/patricia.nix   |  32 ++++
 .../idris-modules/permutations.nix            |  32 ++++
 pkgs/development/idris-modules/pfds.nix       |  28 +++
 pkgs/development/idris-modules/pipes.nix      |  28 +++
 pkgs/development/idris-modules/posix.nix      |  30 ++++
 pkgs/development/idris-modules/protobuf.nix   |  28 +++
 pkgs/development/idris-modules/rationals.nix  |  28 +++
 .../idris-modules/recursion_schemes.nix       |  36 ++++
 pkgs/development/idris-modules/refined.nix    |  32 ++++
 pkgs/development/idris-modules/sdl.nix        |  32 ++++
 pkgs/development/idris-modules/sdl2.nix       |  33 ++++
 pkgs/development/idris-modules/semidirect.nix |  28 +++
 pkgs/development/idris-modules/setoids.nix    |  26 +++
 pkgs/development/idris-modules/smproc.nix     |  29 ++++
 pkgs/development/idris-modules/snippets.nix   |  28 +++
 .../idris-modules/software_foundations.nix    |  27 +++
 pkgs/development/idris-modules/specdris.nix   |  11 +-
 pkgs/development/idris-modules/tap.nix        |  32 ++++
 pkgs/development/idris-modules/test.nix       |  32 ++++
 pkgs/development/idris-modules/tlhydra.nix    |  30 ++++
 pkgs/development/idris-modules/tomladris.nix  |  30 ++++
 pkgs/development/idris-modules/tp.nix         |  31 ++++
 pkgs/development/idris-modules/tparsec.nix    |  28 +++
 .../development/idris-modules/transducers.nix |  28 +++
 pkgs/development/idris-modules/trees.nix      |  28 +++
 pkgs/development/idris-modules/union_type.nix |  28 +++
 pkgs/development/idris-modules/vecspace.nix   |  27 +++
 pkgs/development/idris-modules/webgl.nix      |  28 +++
 pkgs/development/idris-modules/wl-pprint.nix  |   4 -
 pkgs/development/idris-modules/wyvern.nix     |  33 ++++
 pkgs/development/idris-modules/xhr.nix        |  28 +++
 pkgs/development/idris-modules/yaml.nix       |  29 ++++
 pkgs/development/idris-modules/yampa.nix      |  27 +++
 81 files changed, 2422 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/development/idris-modules/array.nix
 create mode 100644 pkgs/development/idris-modules/bi.nix
 create mode 100644 pkgs/development/idris-modules/bifunctors.nix
 create mode 100644 pkgs/development/idris-modules/bytes.nix
 create mode 100644 pkgs/development/idris-modules/canvas.nix
 create mode 100644 pkgs/development/idris-modules/categories.nix
 create mode 100644 pkgs/development/idris-modules/coda.nix
 create mode 100644 pkgs/development/idris-modules/comonad.nix
 create mode 100644 pkgs/development/idris-modules/composition.nix
 create mode 100644 pkgs/development/idris-modules/config.nix
 create mode 100644 pkgs/development/idris-modules/console.nix
 create mode 100644 pkgs/development/idris-modules/containers.nix
 create mode 100644 pkgs/development/idris-modules/cube.nix
 create mode 100644 pkgs/development/idris-modules/curses.nix
 create mode 100644 pkgs/development/idris-modules/data.nix
 create mode 100644 pkgs/development/idris-modules/derive.nix
 create mode 100644 pkgs/development/idris-modules/descncrunch.nix
 create mode 100644 pkgs/development/idris-modules/dict.nix
 create mode 100644 pkgs/development/idris-modules/dom.nix
 create mode 100644 pkgs/development/idris-modules/electron.nix
 create mode 100644 pkgs/development/idris-modules/eternal.nix
 create mode 100644 pkgs/development/idris-modules/farrp.nix
 create mode 100644 pkgs/development/idris-modules/free.nix
 create mode 100644 pkgs/development/idris-modules/fsm.nix
 create mode 100644 pkgs/development/idris-modules/glfw.nix
 create mode 100644 pkgs/development/idris-modules/graphviz.nix
 create mode 100644 pkgs/development/idris-modules/hamt.nix
 create mode 100644 pkgs/development/idris-modules/heyting-algebra.nix
 create mode 100644 pkgs/development/idris-modules/hezarfen.nix
 create mode 100644 pkgs/development/idris-modules/hrtime.nix
 create mode 100644 pkgs/development/idris-modules/html.nix
 create mode 100644 pkgs/development/idris-modules/http.nix
 create mode 100644 pkgs/development/idris-modules/http4idris.nix
 delete mode 100644 pkgs/development/idris-modules/httpclient.nix
 create mode 100644 pkgs/development/idris-modules/iaia.nix
 create mode 100644 pkgs/development/idris-modules/idrishighlighter.nix
 create mode 100644 pkgs/development/idris-modules/idrisscript.nix
 create mode 100644 pkgs/development/idris-modules/ipkgparser.nix
 create mode 100644 pkgs/development/idris-modules/jheiling-extras.nix
 create mode 100644 pkgs/development/idris-modules/jheiling-js.nix
 create mode 100644 pkgs/development/idris-modules/js.nix
 create mode 100644 pkgs/development/idris-modules/lens.nix
 create mode 100644 pkgs/development/idris-modules/logic.nix
 create mode 100644 pkgs/development/idris-modules/mapping.nix
 create mode 100644 pkgs/development/idris-modules/mhd.nix
 create mode 100644 pkgs/development/idris-modules/pacman.nix
 create mode 100644 pkgs/development/idris-modules/patricia.nix
 create mode 100644 pkgs/development/idris-modules/permutations.nix
 create mode 100644 pkgs/development/idris-modules/pfds.nix
 create mode 100644 pkgs/development/idris-modules/pipes.nix
 create mode 100644 pkgs/development/idris-modules/posix.nix
 create mode 100644 pkgs/development/idris-modules/protobuf.nix
 create mode 100644 pkgs/development/idris-modules/rationals.nix
 create mode 100644 pkgs/development/idris-modules/recursion_schemes.nix
 create mode 100644 pkgs/development/idris-modules/refined.nix
 create mode 100644 pkgs/development/idris-modules/sdl.nix
 create mode 100644 pkgs/development/idris-modules/sdl2.nix
 create mode 100644 pkgs/development/idris-modules/semidirect.nix
 create mode 100644 pkgs/development/idris-modules/setoids.nix
 create mode 100644 pkgs/development/idris-modules/smproc.nix
 create mode 100644 pkgs/development/idris-modules/snippets.nix
 create mode 100644 pkgs/development/idris-modules/software_foundations.nix
 create mode 100644 pkgs/development/idris-modules/tap.nix
 create mode 100644 pkgs/development/idris-modules/test.nix
 create mode 100644 pkgs/development/idris-modules/tlhydra.nix
 create mode 100644 pkgs/development/idris-modules/tomladris.nix
 create mode 100644 pkgs/development/idris-modules/tp.nix
 create mode 100644 pkgs/development/idris-modules/tparsec.nix
 create mode 100644 pkgs/development/idris-modules/transducers.nix
 create mode 100644 pkgs/development/idris-modules/trees.nix
 create mode 100644 pkgs/development/idris-modules/union_type.nix
 create mode 100644 pkgs/development/idris-modules/vecspace.nix
 create mode 100644 pkgs/development/idris-modules/webgl.nix
 create mode 100644 pkgs/development/idris-modules/wyvern.nix
 create mode 100644 pkgs/development/idris-modules/xhr.nix
 create mode 100644 pkgs/development/idris-modules/yaml.nix
 create mode 100644 pkgs/development/idris-modules/yampa.nix

diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix
new file mode 100644
index 00000000000..cab7ccbcf7a
--- /dev/null
+++ b/pkgs/development/idris-modules/array.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "array";
+  version = "2016-10-14";
+
+  idrisDeps = [ prelude base ];
+
+  extraBuildInputs = [ idris ];
+
+  src = fetchFromGitHub {
+    owner = "idris-hackers";
+    repo = "idris-array";
+    rev = "eb5c034d3c65b5cf465bd0715e65859b8f69bf15";
+    sha256 = "148dnyd664vnxi04zjsyjbs1y51dq0zz98005q9c042k4jcfpfjh";
+  };
+
+  meta = {
+    description = "Primitive flat arrays containing Idris values";
+    homepage = https://github.com/idris-hackers/idris-array;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
new file mode 100644
index 00000000000..fb43fbf209b
--- /dev/null
+++ b/pkgs/development/idris-modules/bi.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "bi";
+  version = "2018-01-17";
+
+  idrisDeps = [ prelude contrib pruviloj ];
+
+  src = fetchFromGitHub {
+    owner = "sbp";
+    repo = "idris-bi";
+    rev = "8ab40bc482ca948ac0f6ffb5b4c545a73688dd3a";
+    sha256 = "1lra945q2d6anwzjs94srprqj867lrz66rsns08p8828vg55fv97";
+  };
+
+  meta = {
+    description = "Idris Binary Integer Arithmetic, porting PArith, NArith, and ZArith from Coq";
+    homepage = https://github.com/sbp/idris-bi;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix
new file mode 100644
index 00000000000..d8212fa3830
--- /dev/null
+++ b/pkgs/development/idris-modules/bifunctors.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "bifunctors";
+  version = "2017-02-07";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "japesinator";
+    repo = "Idris-Bifunctors";
+    rev = "be7b8bde88331ad3af87e5c0a23fc0f3d52f3868";
+    sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq";
+  };
+
+  postUnpack = ''
+    rm source/test.ipkg
+  '';
+
+  meta = {
+    description = "A small bifunctor library for idris";
+    homepage = https://github.com/japesinator/Idris-Bifunctors;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix
new file mode 100644
index 00000000000..2e5518c953c
--- /dev/null
+++ b/pkgs/development/idris-modules/bytes.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "bytes";
+  version = "2018-02-10";
+
+  idrisDeps = [ prelude ];
+
+  extraBuildInputs = [ idris ];
+
+  src = fetchFromGitHub {
+    owner = "ziman";
+    repo = "idris-bytes";
+    rev = "c0ed9db526d4529780f9d7d2636a40faa07661a5";
+    sha256 = "1xyb7k0mrk5imjf5jr2gvqwvasbfy6j4lxvz99r9icfz7crz8dfp";
+  };
+
+  meta = {
+    description = "FFI-based byte buffers for Idris";
+    homepage = https://github.com/ziman/idris-bytes;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix
new file mode 100644
index 00000000000..f29d59e5050
--- /dev/null
+++ b/pkgs/development/idris-modules/canvas.nix
@@ -0,0 +1,26 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "canvas";
+  version = "2017-11-09";
+
+  idrisDeps = [ prelude ];
+
+  src = fetchFromGitHub {
+    owner = "JinWuZhao";
+    repo = "idriscanvas";
+    rev = "2957c78c0721ec3afaee9d64e051a8f8d9b6f426";
+    sha256 = "0jirkqciv3j1phpm2v6fmch40b5a01rmqdng16y8mihq1wb70ayy";
+  };
+
+  meta = {
+    description = "Idris FFI binding for html5 canvas 2d api";
+    homepage = https://github.com/JinWuZhao/idriscanvas;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
new file mode 100644
index 00000000000..32be0f6a379
--- /dev/null
+++ b/pkgs/development/idris-modules/categories.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "categories";
+  version = "2017-03-01";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "danilkolikov";
+    repo = "categories";
+    rev = "933fe418d154e10df39ddb09a74419cb4c4a57e8";
+    sha256 = "1dmpcv13zh7j4k6s2nlpf08gmpawaqaqkbqbg8zrgw253piwb0ci";
+  };
+
+  meta = {
+    description = "Category Theory";
+    homepage = https://github.com/danilkolikov/categories;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix
new file mode 100644
index 00000000000..ed51bcfec6d
--- /dev/null
+++ b/pkgs/development/idris-modules/coda.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "coda";
+  version = "2018-01-25";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "ostera";
+    repo = "idris-coda";
+    rev = "0d8b29b7b73aa1ea80bf216e5e6dea5e81156e32";
+    sha256 = "07wps3pyp4ph0vj3640x561gkjkbcdq1if9h6sjjb30924sbdxfg";
+  };
+
+  meta = {
+    description = "Some Idris libraries including nodejs bindings and ISO8601 Date and Time";
+    homepage = https://github.com/ostera/idris-coda;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix
new file mode 100644
index 00000000000..5ecd6d9c585
--- /dev/null
+++ b/pkgs/development/idris-modules/comonad.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "comonad";
+  version = "2018-02-26";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "vmchale";
+    repo = "comonad";
+    rev = "23282592d4506708bdff79bfe1770c5f7a4ccb92";
+    sha256 = "0iiknx6gj4wr9s59iz439c63h3887pilymxrc80v79lj1lsk03ac";
+  };
+
+  meta = {
+    description = "Comonads for Idris";
+    homepage = https://github.com/vmchale/comonad;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix
new file mode 100644
index 00000000000..17dda31a5d1
--- /dev/null
+++ b/pkgs/development/idris-modules/composition.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, hezarfen
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "composition";
+  version = "2017-11-12";
+
+  idrisDeps = [ prelude hezarfen ];
+
+  src = fetchFromGitHub {
+    owner = "vmchale";
+    repo = "composition";
+    rev = "8f05e8db750793a9992b315dc0a2c327b837ec8b";
+    sha256 = "05424xzxx6f3ig0ravib15nr34nqvaq8spcj6b1512raqrvkkay8";
+  };
+
+  meta = {
+    description = "Composition extras for Idris";
+    homepage = https://github.com/vmchale/composition;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix
new file mode 100644
index 00000000000..29cb828e061
--- /dev/null
+++ b/pkgs/development/idris-modules/config.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, containers
+, lightyear
+, test
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "config";
+  version = "2017-11-06";
+
+  idrisDeps = [ prelude effects containers lightyear test ];
+
+  src = fetchFromGitHub {
+    owner = "benclifford";
+    repo = "idris-config";
+    rev = "92f98652f5cb06a76c47809f16c661ec6cf11048";
+    sha256 = "1w2w2l4drvkf8mdzh3lwn6l5lnkbxlx9p22s7spw82n5s4wib6c9";
+  };
+
+  meta = {
+    description = "Parsers for various configuration files written in Idris.";
+    homepage = https://github.com/benclifford/idris-config;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix
new file mode 100644
index 00000000000..27b85c97c68
--- /dev/null
+++ b/pkgs/development/idris-modules/console.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, hrtime
+, webgl
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "console";
+  version = "2017-04-20";
+
+  idrisDeps = [ prelude idrisscript hrtime webgl ];
+
+  src = fetchFromGitHub {
+    owner = "pierrebeaucamp";
+    repo = "idris-console";
+    rev = "14b6bd6bf6bd78dd3935e3de12e16f8ee41e29e4";
+    sha256 = "0cn4fwnf3sg6269pbfbhnmsvyaya4d8479n2hy039idxzzkxw0yb";
+  };
+
+  meta = {
+    description = "An Idris library to interact with the browser console";
+    homepage = https://github.com/pierrebeaucamp/idris-console;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix
new file mode 100644
index 00000000000..fe4e729d0e0
--- /dev/null
+++ b/pkgs/development/idris-modules/containers.nix
@@ -0,0 +1,34 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, test
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "containers";
+  version = "2017-09-10";
+
+  idrisDeps = [ prelude effects test ];
+
+  src = fetchFromGitHub {
+    owner = "jfdm";
+    repo = "idris-containers";
+    rev = "fb96aaa3f40faa432cd7a36d956dbc4fe9279234";
+    sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d";
+  };
+
+  postUnpack = ''
+    rm source/containers-travis.ipkg
+  '';
+
+  meta = {
+    description = "Various data structures for use in the Idris Language.";
+    homepage = https://github.com/jfdm/idris-containers;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix
new file mode 100644
index 00000000000..ce46c4538b5
--- /dev/null
+++ b/pkgs/development/idris-modules/cube.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "cube";
+  version = "2017-07-05";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "aatxe";
+    repo = "cube.idr";
+    rev = "edf66d82b3a363dc65c6f5416c9e24e746bad71e";
+    sha256 = "11k45j0b4qabj6zhwjvynyj56nmssf7d4fnkv66bd2w1pxnshzxg";
+  };
+
+  meta = {
+    description = "An implementation of the Lambda Cube in Idris";
+    homepage = https://github.com/aatxe/cube.idr;
+    license = lib.licenses.agpl3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/curses.nix b/pkgs/development/idris-modules/curses.nix
new file mode 100644
index 00000000000..71bd9023840
--- /dev/null
+++ b/pkgs/development/idris-modules/curses.nix
@@ -0,0 +1,36 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, ncurses
+}:
+build-idris-package  {
+  name = "curses";
+  version = "2017-10-12";
+
+  idrisDeps = [ prelude effects ];
+
+  extraBuildInputs = [ ncurses.out ncurses.dev ];
+
+  postUnpack = ''
+    sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
+    sed -i 's/\#include <curses.h>/#include \<ncurses.h\>/g' source/src/cursesrun.h
+  '';
+
+  src = fetchFromGitHub {
+    owner = "JakobBruenker";
+    repo = "curses-idris";
+    rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb";
+    sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1";
+  };
+
+  meta = {
+    description = "libusb binding for idris and Effectful curses programming";
+    homepage = https://github.com/JakobBruenker/curses-idris;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix
new file mode 100644
index 00000000000..3cb78eabe96
--- /dev/null
+++ b/pkgs/development/idris-modules/data.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "data";
+  version = "2018-03-19";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "jdevuyst";
+    repo = "idris-data";
+    rev = "105b78ac13235edc596287367a675d7cd04ce5d5";
+    sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii";
+  };
+
+  meta = {
+    description = "Functional data structures in Idris";
+    homepage = https://github.com/jdevuyst/idris-data;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 4309039f498..12fbc8dfd17 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -28,12 +28,15 @@
   in
     {
     inherit idris-no-deps callPackage;
-    # See #10450 about why we have to wrap the executable
+
+    # Idris wrapper with specified compiler and library paths, used to build packages
+
     idris =
         (pkgs.callPackage ./idris-wrapper.nix {})
           idris-no-deps
           { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
 
+    # Utilities for building packages
 
     with-packages = callPackage ./with-packages.nix {} ;
 
@@ -41,19 +44,169 @@
 
     build-idris-package = callPackage ./build-idris-package.nix {};
 
-    # Libraries
+    # The set of libraries that comes with idris
 
-    # A list of all of the libraries that come with idris
     builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
 
-    httpclient = callPackage ./httpclient.nix {};
+    # Libraries
+
+    array = callPackage ./array.nix {};
+
+    bi = callPackage ./bi.nix {};
+
+    bifunctors = callPackage ./bifunctors.nix {};
+
+    bytes = callPackage ./bytes.nix {};
+
+    canvas = callPackage ./canvas.nix {};
+
+    categories = callPackage ./categories.nix {};
+
+    coda = callPackage ./coda.nix {};
+
+    config = callPackage ./config.nix {};
+
+    comonad = callPackage ./comonad.nix {};
+
+    composition = callPackage ./composition.nix {};
+
+    console = callPackage ./console.nix {};
+
+    containers = callPackage ./containers.nix {};
+
+    cube = callPackage ./cube.nix {};
+
+    curses = callPackage ./curses.nix {};
+
+    data = callPackage ./data.nix {};
+
+    derive = callPackage ./derive.nix {};
+
+    descncrunch = callPackage ./descncrunch.nix {};
+
+    dict = callPackage ./dict.nix {};
+
+    dom = callPackage ./dom.nix {};
+
+    electron = callPackage ./electron.nix {};
+
+    eternal = callPackage ./eternal.nix {};
+
+    farrp = callPackage ./farrp.nix {};
+
+    free = callPackage ./free.nix {};
+
+    fsm = callPackage ./fsm.nix {};
+
+    glfw = callPackage ./glfw.nix {};
+
+    graphviz = callPackage ./graphviz.nix {};
+
+    hamt = callPackage ./hamt.nix {};
+
+    html = callPackage ./html.nix {};
+
+    heyting-algebra = callPackage ./heyting-algebra.nix {};
+
+    hezarfen = callPackage ./hezarfen.nix {};
+
+    hrtime = callPackage ./hrtime.nix {};
+
+    http = callPackage ./http.nix {};
+
+    http4idris = callPackage ./http4idris.nix {};
+
+    iaia = callPackage ./iaia.nix {};
+
+    idrishighlighter = callPackage ./idrishighlighter.nix {};
+
+    idrisscript = callPackage ./idrisscript.nix {};
+
+    ipkgparser = callPackage ./ipkgparser.nix {};
+
+    jheiling-extras = callPackage ./jheiling-extras.nix {};
+
+    jheiling-js = callPackage ./jheiling-js.nix {};
+
+    js = callPackage ./js.nix {};
+
+    lens = callPackage ./lens.nix {};
 
     lightyear = callPackage ./lightyear.nix {};
 
-    wl-pprint = callPackage ./wl-pprint.nix {};
+    logic = callPackage ./logic.nix {};
+
+    mapping = callPackage ./mapping.nix {};
+
+    mhd = callPackage ./mhd.nix {};
+
+    pacman = callPackage ./pacman.nix {};
+
+    patricia = callPackage ./patricia.nix {};
+
+    permutations = callPackage ./permutations.nix {};
+
+    pfds = callPackage ./pfds.nix {};
+
+    pipes = callPackage ./pipes.nix {};
+
+    posix = callPackage ./posix.nix {};
+
+    protobuf = callPackage ./protobuf.nix {};
+
+    rationals = callPackage ./rationals.nix {};
+
+    recursion_schemes = callPackage ./recursion_schemes.nix {};
+
+    refined = callPackage ./refined.nix {};
+
+    sdl = callPackage ./sdl.nix {};
+
+    sdl2 = callPackage ./sdl2.nix {};
+
+    semidirect = callPackage ./semidirect.nix {};
+
+    setoids = callPackage ./setoids.nix {};
+
+    smproc = callPackage ./smproc.nix {};
+
+    snippets = callPackage ./snippets.nix {};
+
+    software_foundations = callPackage ./software_foundations.nix {};
 
     specdris = callPackage ./specdris.nix {};
 
+    tap = callPackage ./tap.nix {};
+
+    test = callPackage ./test.nix {};
+
+    tlhydra = callPackage ./tlhydra.nix {};
+
+    tomladris = callPackage ./tomladris.nix {};
+
+    tp = callPackage ./tp.nix {};
+
+    tparsec = callPackage ./tparsec.nix {};
+
+    transducers = callPackage ./transducers.nix {};
+
+    trees = callPackage ./trees.nix {};
+
+    union_type = callPackage ./union_type.nix {};
+
+    vecspace = callPackage ./vecspace.nix {};
+
+    webgl = callPackage ./webgl.nix {};
+
+    wl-pprint = callPackage ./wl-pprint.nix {};
+
+    wyvern = callPackage ./wyvern.nix {};
+
+    xhr = callPackage ./xhr.nix {};
+
+    yaml = callPackage ./yaml.nix {};
+
+    yampa = callPackage ./yampa.nix {};
 
   } // builtins_;
 in fix' (extends overrides idrisPackages)
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
new file mode 100644
index 00000000000..6cc2ead71fc
--- /dev/null
+++ b/pkgs/development/idris-modules/derive.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "derive";
+  version = "2018-02-15";
+
+  idrisDeps = [ prelude contrib pruviloj ];
+
+  src = fetchFromGitHub {
+    owner = "davlum";
+    repo = "derive-all-the-instances";
+    rev = "2c8956807bd094ba33569227de921c6726401c42";
+    sha256 = "0l7263s04r52ql292vnnx2kngld6s1dipmaz5na7m82lj9p4x17y";
+  };
+
+  meta = {
+    description = "Type class deriving with elaboration reflection";
+    homepage = https://github.com/davlum/derive-all-the-instances;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix
new file mode 100644
index 00000000000..736b25c9684
--- /dev/null
+++ b/pkgs/development/idris-modules/descncrunch.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "descncrunch";
+  version = "2017-11-15";
+
+  idrisDeps = [ prelude pruviloj ];
+
+  src = fetchFromGitHub {
+    owner = "ahmadsalim";
+    repo = "desc-n-crunch";
+    rev = "261d9718504b8f0572c4fe7ae407a0231779bcab";
+    sha256 = "09fh334aga1z1hbw79507rdv7qsh0mqzb89lvpznn7vzi9zkl8fx";
+  };
+
+  meta = {
+    description = "Descriptions, levitation, and reflecting the elaborator";
+    homepage = https://github.com/ahmadsalim/desc-n-crunch;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix
new file mode 100644
index 00000000000..ea1cd5a9fe1
--- /dev/null
+++ b/pkgs/development/idris-modules/dict.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "dict";
+  version = "2016-12-26";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "be5invis";
+    repo = "idris-dict";
+    rev = "dddc7c9f45e079b151ee03c9752b968ceeab9dab";
+    sha256 = "18riq40vapg884y92w10w51j4896ah984zm5hisfv1sm9qbgx8ii";
+  };
+
+  postUnpack = ''
+    sed -i 's/\"//g' source/dict.ipkg
+  '';
+
+  meta = {
+    description = "Dict k v in Idris";
+    homepage = https://github.com/be5invis/idris-dict;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix
new file mode 100644
index 00000000000..0aee97f92e6
--- /dev/null
+++ b/pkgs/development/idris-modules/dom.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, html
+, xhr
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "dom";
+  version = "2017-04-22";
+
+  idrisDeps = [ prelude idrisscript html xhr ];
+
+  src = fetchFromGitHub {
+    owner = "pierrebeaucamp";
+    repo = "idris-dom";
+    rev = "6e5a2d143f62ef422358924ee7db6e8147cdc531";
+    sha256 = "16z9mykw2d9rjikn07kd6igb53jgaqi8zby4nc4n0gmplmhwdx4x";
+  };
+
+  meta = {
+    description = "Idris library to interact with the DOM";
+    homepage = https://github.com/pierrebeaucamp/idris-dom;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix
new file mode 100644
index 00000000000..7dabfd8f45c
--- /dev/null
+++ b/pkgs/development/idris-modules/electron.nix
@@ -0,0 +1,36 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, jheiling-extras
+, jheiling-js
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "electron";
+  version = "2016-03-07";
+
+  idrisDeps = [ prelude contrib jheiling-extras jheiling-js ];
+
+  src = fetchFromGitHub {
+    owner = "jheiling";
+    repo = "idris-electron";
+    rev = "f0e86f52b8e5a546a2bf714709b659c1c0b04395";
+    sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn";
+  };
+
+  postUnpack = ''
+    rm source/example_main.ipkg
+    rm source/example_view.ipkg
+  '';
+
+  meta = {
+    description = "Electron bindings for Idris";
+    homepage = https://github.com/jheiling/idris-electron;
+    license = lib.licenses.unlicense;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix
new file mode 100644
index 00000000000..ddbc0d79b84
--- /dev/null
+++ b/pkgs/development/idris-modules/eternal.nix
@@ -0,0 +1,35 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "eternal";
+  version = "2018-01-25";
+
+  idrisDeps = [ prelude effects ];
+
+  src = fetchFromGitHub {
+    owner = "Heather";
+    repo = "Control.Eternal.Idris";
+    rev = "7ead56ce6065b55104460ace945adbce38fb13eb";
+    sha256 = "0b4zys4mhl6r4rbpdxr7n2n20cdc0nkh4lm8n5v4wxkmjzna5cpd";
+  };
+
+  postUnpack = ''
+    printf 'makefile = Makefile\n' >> source/eternal.ipkg
+    printf 'objs = readProcess.o\n' >> source/eternal.ipkg
+    sed -i 's/\/usr\/local\/idris\/readProcess.h/readProcess.h/g' source/Control/Eternal/System/Process.idr
+    sed -i 's/\/usr\/local\/idris\/readProcess.o/readProcess.o/g' source/Control/Eternal/System/Process.idr
+  '';
+
+  meta = {
+    description = "Infix pipe operators and some Nat, Float, String conversions";
+    homepage = https://github.com/Heather/Control.Eternal.Idris;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix
new file mode 100644
index 00000000000..2c88399eb3c
--- /dev/null
+++ b/pkgs/development/idris-modules/farrp.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "farrp";
+  version = "2018-02-13";
+
+  idrisDeps = [ prelude effects ];
+
+  src = fetchFromGitHub {
+    owner = "lambda-11235";
+    repo = "FarRP";
+    rev = "d592957232968743f8862e49d5a8d52e13340444";
+    sha256 = "1zrf750d7x1cz7kkgcx4ipa87hkg10adwii4qqvz9vpjap7vh7h0";
+  };
+
+  meta = {
+    description = "Arrowized FRP library for Idris with static safety guarantees";
+    homepage = https://github.com/lambda-11235/FarRP;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix
new file mode 100644
index 00000000000..cc0820d3c64
--- /dev/null
+++ b/pkgs/development/idris-modules/free.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "free";
+  version = "2017-07-03";
+
+  idrisDeps = [ prelude ];
+
+  src = fetchFromGitHub {
+    owner = "idris-hackers";
+    repo = "idris-free";
+    rev = "919950fb6a9d97c139c2d102402fec094a99c397";
+    sha256 = "1n4daf1acjkd73an4m31yp9g616crjb7h5z02f1gj29wm3dbx5s7";
+  };
+
+  meta = {
+    description = "Free Monads and useful constructions to work with them";
+    homepage = https://github.com/idris-hackers/idris-free;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix
new file mode 100644
index 00000000000..24f57af5257
--- /dev/null
+++ b/pkgs/development/idris-modules/fsm.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "fsm";
+  version = "2017-04-16";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "ctford";
+    repo = "flying-spaghetti-monster";
+    rev = "9253db1048d155b9d72dd5319f0a2072b574d406";
+    sha256 = "0n1kqpxysl3dji0zd8c47ir4144s0n3pb8i1mqp6ylma3r7rlg1l";
+  };
+
+  meta = {
+    description = "Comonads for Idris";
+    homepage = https://github.com/ctford/flying-spaghetti-monster;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix
new file mode 100644
index 00000000000..041c18faedc
--- /dev/null
+++ b/pkgs/development/idris-modules/glfw.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, pkgs
+}:
+
+build-idris-package  {
+  name = "glfw";
+  version = "2016-12-05";
+
+  idrisDeps = [ prelude effects ];
+
+  extraBuildInputs = [ pkgs.glfw ];
+
+  src = fetchFromGitHub {
+    owner = "eckart";
+    repo = "glfw-idris";
+    rev = "10220a734b69f3b884683041a1a9c533800b663a";
+    sha256 = "045ylaj66g5m4syzhqxlaxmivy8y7jznkcf1y7w4awa4y5znyqqd";
+  };
+
+  meta = {
+    description = "GLFW bindings for Idris";
+    homepage = https://github.com/eckart/glfw-idris;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix
new file mode 100644
index 00000000000..3ea20d3d906
--- /dev/null
+++ b/pkgs/development/idris-modules/graphviz.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitLab
+, prelude
+, lightyear
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "graphviz";
+  version = "2017-01-16";
+
+  idrisDeps = [ prelude lightyear ];
+
+  src = fetchFromGitLab {
+    owner = "mgttlinger";
+    repo = "idris-graphviz";
+    rev = "805da92ac888530134c3b4090fae0d025d86bb05";
+    sha256 = "12kzgjlwq6adflfc5zxpgjnaiszhiab6dcp878ysbz3zr2sihljx";
+  };
+
+  postUnpack = ''
+    sed -i "/^author /cauthor = Merlin Goettlinger" source/graphviz.ipkg
+  '';
+
+  meta = {
+    description = "Parser and library for graphviz dot files";
+    homepage = https://github.com/mgttlinger/idris-graphviz;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix
new file mode 100644
index 00000000000..7a2d0d77c83
--- /dev/null
+++ b/pkgs/development/idris-modules/hamt.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "idris-hamt";
+  version = "2016-11-15";
+
+  idrisDeps = [ prelude contrib effects ];
+
+  src = fetchFromGitHub {
+    owner = "bamboo";
+    repo = "idris-hamt";
+    rev = "e70f3eedddb5ccafea8e386762b8421ba63c495a";
+    sha256 = "0m2yjr20dxkfmn3nzc68l6vh0rdaw6b637yijwl4c83b5xiac1mi";
+  };
+
+  meta = {
+    description = "Idris Hash Array Mapped Trie";
+    homepage = https://github.com/bamboo/idris-hamt;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
new file mode 100644
index 00000000000..8a283eada8a
--- /dev/null
+++ b/pkgs/development/idris-modules/heyting-algebra.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "heyting-algebra";
+  version = "2017-08-18";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "Risto-Stevcev";
+    repo = "idris-heyting-algebra";
+    rev = "2c814c48246a5e19bff66e64a753208c7d59d397";
+    sha256 = "199cvhxiimlhchvsc66zwn0dls78f9lamam256ad65mv4cjmxv40";
+  };
+
+  meta = {
+    description = "Interfaces for heyting algebras and verified bounded join and meet semilattices";
+    homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix
new file mode 100644
index 00000000000..712508220a6
--- /dev/null
+++ b/pkgs/development/idris-modules/hezarfen.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "hezarfen";
+  version = "2018-02-03";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "joom";
+    repo = "hezarfen";
+    rev = "079884d85619cd187ae67230480a1f37327f8d78";
+    sha256 = "0z4150gavpx64m3l0xbjjz9dcir7zij9hvd69k98zvhw7i27b1xp";
+  };
+
+  meta = {
+    description = "a theorem prover for intuitionistic propositional logic in Idris, with metaprogramming features";
+    homepage = https://github.com/joom/hezarfen;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix
new file mode 100644
index 00000000000..ba4df28ab26
--- /dev/null
+++ b/pkgs/development/idris-modules/hrtime.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "hrtime";
+  version = "2017-04-16";
+
+  idrisDeps = [ prelude idrisscript ];
+
+  src = fetchFromGitHub {
+    owner = "pierrebeaucamp";
+    repo = "idris-hrtime";
+    rev = "e1f54ce74bde871010ae76d9afd42048cd2aae83";
+    sha256 = "0rmmpi1kp1h7ficmcxbxkny9lq9pjli2qhwy17vgbgx8fx60m8l0";
+  };
+
+  meta = {
+    description = "Idris library for high resolution time";
+    homepage = https://github.com/pierrebeaucamp/idris-hrtime;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix
new file mode 100644
index 00000000000..deec5b0eb6d
--- /dev/null
+++ b/pkgs/development/idris-modules/html.nix
@@ -0,0 +1,34 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, hrtime
+, webgl
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "html";
+  version = "2017-04-23";
+
+  idrisDeps = [ prelude idrisscript hrtime webgl ];
+
+  src = fetchFromGitHub {
+    owner = "pierrebeaucamp";
+    repo = "idris-html";
+    rev = "f59ecc560d7008ba26dda83f11319bb24ed6c508";
+    sha256 = "0r2clvkyld3y3r6smkfb7s47qnndikwds3bx9hphidbn41wjnh0i";
+  };
+
+  postUnpack = ''
+    sed -i "s/hrTime/hrtime/g" source/html.ipkg
+  '';
+
+  meta = {
+    description = "Idris library to interact with HTML";
+    homepage = https://github.com/pierrebeaucamp/idris-html;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix
new file mode 100644
index 00000000000..800a3a2eeb4
--- /dev/null
+++ b/pkgs/development/idris-modules/http.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lightyear
+, bytes
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "http";
+  version = "2018-02-25";
+
+  idrisDeps = [ prelude contrib lightyear bytes ];
+
+  src = fetchFromGitHub {
+    owner = "uwap";
+    repo = "idris-http";
+    rev = "dc4a31543f87c0bc44cbaa98192f0303cd8dd82e";
+    sha256 = "1abrwi5ikymff4g7a0g5wskycvhpnn895z1z1bz9r71ks554ypl8";
+  };
+
+  meta = {
+    description = "An HTTP library for idris";
+    homepage = https://github.com/uwap/idris-http;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix
new file mode 100644
index 00000000000..5b79644c3a0
--- /dev/null
+++ b/pkgs/development/idris-modules/http4idris.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "http4idris";
+  version = "2018-01-16";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "A1kmm";
+    repo = "http4idris";
+    rev = "f44ffd2a15628869c7aadf241e3c9b1ee7b40941";
+    sha256 = "16bs7rxbsq7m7jm96zkqiq8hj68l907m8xgmjrcxzl158qvzhw1w";
+  };
+
+  meta = {
+    description = "An experimental HTTP framework for Idris";
+    homepage = https://github.com/A1kmm/http4idris;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/httpclient.nix b/pkgs/development/idris-modules/httpclient.nix
deleted file mode 100644
index 13c33d04da5..00000000000
--- a/pkgs/development/idris-modules/httpclient.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ curl
-, build-idris-package
-, fetchFromGitHub
-, lightyear
-, contrib
-, effects
-, prelude
-, base
-, lib
-, idris
-}:
-
-let
-in
-build-idris-package {
-  name = "httpclient";
-  version = "2016-12-20";
-
-  src = fetchFromGitHub {
-    owner = "justjoheinz";
-    repo = "idris-httpclient";
-    rev = "4a7296d572d7f7fde87d27da07d5c9566dc4ff14";
-    sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl";
-  };
-
-  idrisDeps = [ prelude base effects lightyear contrib ];
-
-  extraBuildInputs = [ curl ];
-
-  meta = {
-    description = "HTTP Client for Idris";
-    homepage = https://github.com/justjoheinz/idris-httpclient;
-    inherit (idris.meta) platforms;
-    broken = true;
-  };
-}
diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix
new file mode 100644
index 00000000000..5b4f450fdf7
--- /dev/null
+++ b/pkgs/development/idris-modules/iaia.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "iaia";
+  version = "2017-11-10";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "sellout";
+    repo = "Iaia";
+    rev = "dce68d2b63a26dad7c94459773eae2d42686fa05";
+    sha256 = "0209fhv8x3sw6ijrwc8a85pch97z821ygaz78va3l274xam4l659";
+  };
+
+  meta = {
+    description = "Recursion scheme library for Idris";
+    homepage = https://github.com/sellout/Iaia;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix
new file mode 100644
index 00000000000..f3d06216976
--- /dev/null
+++ b/pkgs/development/idris-modules/idrishighlighter.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lightyear
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "idrishighlighter";
+  version = "2018-02-22";
+
+  idrisDeps = [ prelude effects lightyear ];
+
+  src = fetchFromGitHub {
+    owner = "david-christiansen";
+    repo = "idris-code-highlighter";
+    rev = "708a29c7d1433adf7b0f69d1aec50e69b2915bba";
+    sha256 = "16ahzf2jzh7wzi4jjq94s5z9nzkgnj2962dy13s1crim53csjgw5";
+  };
+
+  meta = {
+    description = "Semantic highlighter for Idris code";
+    homepage = https://github.com/david-christiansen/idris-code-highlighter;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix
new file mode 100644
index 00000000000..fd2f9e58218
--- /dev/null
+++ b/pkgs/development/idris-modules/idrisscript.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "idrisscript";
+  version = "2017-07-01";
+
+  idrisDeps = [ prelude ];
+
+  src = fetchFromGitHub {
+    owner = "idris-hackers";
+    repo = "IdrisScript";
+    rev = "4bb7019182392f24d2246a3e616f829156c8f091";
+    sha256 = "074ignh2hqwq4ng5nk7dswga4lm7342w7h4bmx4n03ygrn7w89ff";
+  };
+
+  meta = {
+    description = "FFI Bindings to interact with the unsafe world of JavaScript";
+    homepage = https://github.com/idris-hackers/IdrisScript;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix
new file mode 100644
index 00000000000..cdc1d593c01
--- /dev/null
+++ b/pkgs/development/idris-modules/ipkgparser.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, lightyear
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "ipkgparser";
+  version = "2017-11-14";
+
+  idrisDeps = [ prelude contrib effects lightyear ];
+
+  src = fetchFromGitHub {
+    owner = "emptyflash";
+    repo = "idris-ipkg-parser";
+    rev = "35cc2f54d4f3b3710f637d0a8c897bfbb32fe183";
+    sha256 = "0vn3pigqddfy7cld0386hxzdv2nkl8mdpsx97hvyvqzrdpz4wl2q";
+  };
+
+  meta = {
+    description = "Parser for Idris iPkg files written in Idris using Lightyear";
+    homepage = https://github.com/emptyflash/idris-ipkg-parser;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix
new file mode 100644
index 00000000000..34981d28d3e
--- /dev/null
+++ b/pkgs/development/idris-modules/jheiling-extras.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "extras";
+  version = "2018-03-06";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "jheiling";
+    repo = "idris-extras";
+    rev = "20e79087043ddb00301cdc3036964a2b1c5b1c5f";
+    sha256 = "0j34a7vawrkc7nkwwnv6lsjjdcr00d85csjw06nnbh8rj4vj5ps0";
+  };
+
+  meta = {
+    description = "Some useful functions for Idris";
+    homepage = https://github.com/jheiling/idris-extras;
+    license = lib.licenses.unlicense;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix
new file mode 100644
index 00000000000..5139631b9d5
--- /dev/null
+++ b/pkgs/development/idris-modules/jheiling-js.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, jheiling-extras
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "jheiling-js";
+  version = "2016-03-09";
+
+  idrisDeps = [ prelude contrib jheiling-extras ];
+
+  src = fetchFromGitHub {
+    owner = "jheiling";
+    repo = "idris-js";
+    rev = "59763cd0c9715a9441931ae1077e501bb2ec6020";
+    sha256 = "1mvpxwszh56cfrf509qiadn7gp2l4syanhvdq6v1br0y03g8wk9v";
+  };
+
+  meta = {
+    description = "Js library for Idris";
+    homepage = https://github.com/jheiling/idris-js;
+    license = lib.licenses.unlicense;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix
new file mode 100644
index 00000000000..0792a8c0f5d
--- /dev/null
+++ b/pkgs/development/idris-modules/js.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "js";
+  version = "2018-11-27";
+
+  idrisDeps = [ prelude contrib pruviloj ];
+
+  src = fetchFromGitHub {
+    owner = "rbarreiro";
+    repo = "idrisjs";
+    rev = "1ce91ecec69a7174c20bff927aeac3928a01ed3f";
+    sha256 = "13whhccb7yjq10hnngdc8bc9z9vvyir1wjkclpz006cr4cd266ca";
+  };
+
+  meta = {
+    description = "Js libraries for idris";
+    homepage = https://github.com/rbarreiro/idrisjs;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix
new file mode 100644
index 00000000000..e97c7cfafda
--- /dev/null
+++ b/pkgs/development/idris-modules/lens.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, bifunctors
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "lens";
+  version = "2017-09-25";
+
+  idrisDeps = [ prelude bifunctors ];
+
+  src = fetchFromGitHub {
+    owner = "HuwCampbell";
+    repo = "idris-lens";
+    rev = "421aa76c19607693ac2f23003dc0fe82c1a3760a";
+    sha256 = "1q6lmhrwd1qg18s253sim4hg2a2wk5439p3izy1f9ygi6pv4a6mk";
+  };
+
+  meta = {
+    description = "van Laarhoven lenses for Idris";
+    homepage = https://github.com/HuwCampbell/idris-lens;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix
index e217e76e2a7..6cedda0170f 100644
--- a/pkgs/development/idris-modules/lightyear.nix
+++ b/pkgs/development/idris-modules/lightyear.nix
@@ -7,12 +7,9 @@
 , idris
 }:
 
-let
-  date = "2017-09-10";
-in
 build-idris-package  {
   name = "lightyear";
-  version = date;
+  version = "2017-09-10";
 
   idrisDeps = [ prelude base effects ];
 
@@ -27,7 +24,7 @@ build-idris-package  {
     description = "Parser combinators for Idris";
     homepage = https://github.com/ziman/lightyear;
     license = lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.siddharthist ];
+    maintainers = with lib.maintainers; [ siddharthist brainrape ];
     inherit (idris.meta) platforms;
   };
 }
diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix
new file mode 100644
index 00000000000..342a84882cd
--- /dev/null
+++ b/pkgs/development/idris-modules/logic.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, bifunctors
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "logic";
+  version = "2016-12-02";
+
+  idrisDeps = [ prelude bifunctors ];
+
+  src = fetchFromGitHub {
+    owner = "yurrriq";
+    repo = "idris-logic";
+    rev = "e0bed57e17fde1237fe0358cb77b25f488a04d2f";
+    sha256 = "0kvn1p0v71vkwlchf20243c47jcfid44w5r0mx4dydijq9gylxfz";
+  };
+
+  # tests fail
+  doCheck = false;
+
+  meta = {
+    description = "Propositional logic tools, inspired by the Coq standard library";
+    homepage = https://github.com/yurrriq/idris-logic;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix
new file mode 100644
index 00000000000..84429c88765
--- /dev/null
+++ b/pkgs/development/idris-modules/mapping.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "mapping";
+  version = "2018-02-27";
+
+  idrisDeps = [ prelude ];
+
+  src = fetchFromGitHub {
+    owner = "zaoqi";
+    repo = "Mapping.idr";
+    rev = "4f226933d4491b8fd09f9d9a7b862c0cc646b936";
+    sha256 = "1skkb7jz2lv0xg4n5m0vd9xddg3x01459dwx1jxnpc7ifask4cda";
+  };
+
+  meta = {
+    description = "Idris mapping library";
+    homepage = https://github.com/zaoqi/Mapping.idr;
+    license = lib.licenses.agpl3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix
new file mode 100644
index 00000000000..eae30886cd6
--- /dev/null
+++ b/pkgs/development/idris-modules/mhd.nix
@@ -0,0 +1,33 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, libmicrohttpd
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "mhd";
+  version = "2016-04-22";
+
+  idrisDeps = [ prelude contrib effects ];
+
+  extraBuildInputs = [ libmicrohttpd ];
+
+  src = fetchFromGitHub {
+    owner = "colin-adams";
+    repo = "idris-libmicrohttpd";
+    rev = "a8808bc06fa292d4b3389f32cb00716e43122a46";
+    sha256 = "0wvp1qi3bn4hk52vsid6acfwvwbs58sggylbpjvkxzycsbhz4nx4";
+  };
+
+  meta = {
+    description = "A binding of the GNU libmicrohttpd library to the Idris C backend";
+    homepage = https://github.com/colin-adams/idris-libmicrohttpd;
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix
new file mode 100644
index 00000000000..3650a3990f2
--- /dev/null
+++ b/pkgs/development/idris-modules/pacman.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, sdl2
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "pacman";
+  version = "2017-11-10";
+
+  idrisDeps = [ prelude contrib sdl2 ];
+
+  src = fetchFromGitHub {
+    owner = "jdublu10";
+    repo = "pacman";
+    rev = "263ae58aeb5147e2af9cc76411970ccd90fa9121";
+    sha256 = "02m3ic2fk3a8j50xdpq70yx30hkxzjg6idsia482sm1nlkmxxin9";
+  };
+
+  postUnpack = ''
+    mv source/src/board.idr source/src/Board.idr
+  '';
+
+  meta = {
+    description = "Proof that Idris is pacman complete";
+    homepage = https://github.com/jdublu10/pacman;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix
new file mode 100644
index 00000000000..e3c1cb82f28
--- /dev/null
+++ b/pkgs/development/idris-modules/patricia.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, specdris
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "patricia";
+  version = "2017-10-27";
+
+  idrisDeps = [ prelude specdris ];
+
+  src = fetchFromGitHub {
+    owner = "ChShersh";
+    repo = "idris-patricia";
+    rev = "24724e6d0564f2f813d0d0a58f5c5db9afe35313";
+    sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz";
+  };
+
+  postUnpack = ''
+    rm source/patricia-nix.ipkg
+  '';
+
+  meta = {
+    description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array.";
+    homepage = https://github.com/ChShersh/idris-patricia;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix
new file mode 100644
index 00000000000..af93f4af5e0
--- /dev/null
+++ b/pkgs/development/idris-modules/permutations.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "permutations";
+  version = "2018-01-19";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "vmchale";
+    repo = "permutations";
+    rev = "f0de6bc721bb9d31e16f9168ded6eb6e34935881";
+    sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s";
+  };
+
+  postUnpack = ''
+    rm source/test.ipkg
+  '';
+
+  meta = {
+    description = "Type-safe way of working with permutations in Idris";
+    homepage = https://github.com/vmchale/permutations;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix
new file mode 100644
index 00000000000..8ab75b9ee50
--- /dev/null
+++ b/pkgs/development/idris-modules/pfds.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "pfds";
+  version = "2017-09-25";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "timjb";
+    repo = "idris-pfds";
+    rev = "9ba39348adc45388eccf6463855f42b81333620a";
+    sha256 = "0jbrwdpzg5hgmkfk2kj5y8lgaynl79h48qdvkl1glypfh392w35f";
+  };
+
+  meta = {
+    description = "Purely functional data structures in Idris";
+    homepage = https://github.com/timjb/idris-pfds;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix
new file mode 100644
index 00000000000..943d8e470f0
--- /dev/null
+++ b/pkgs/development/idris-modules/pipes.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "pipes";
+  version = "2017-12-02";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "QuentinDuval";
+    repo = "IdrisPipes";
+    rev = "888abe405afce42015014899682c736028759d42";
+    sha256 = "1dxbqzg0qy7lkabmkj0qypywdjz5751g7h2ql8b2253dy3v0ndbs";
+  };
+
+  meta = {
+    description = "Composable and effectful production, transformation and consumption of streams of data";
+    homepage = https://github.com/QuentinDuval/IdrisPipes;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix
new file mode 100644
index 00000000000..c6c44874b06
--- /dev/null
+++ b/pkgs/development/idris-modules/posix.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "posix";
+  version = "2017-11-18";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "idris-hackers";
+    repo = "idris-posix";
+    rev = "1e4787bc4dfcf901f2e1858e5334a6bafa5d27c4";
+    sha256 = "14y51vn18v23k56gi3b33rjjwpf02qfb00w8cfy8qycrl8rbgsmb";
+  };
+
+  # tests need file permissions
+  doCheck = false;
+
+  meta = {
+    description = "System POSIX bindings for Idris.";
+    homepage = https://github.com/idris-hackers/idris-posix;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix
new file mode 100644
index 00000000000..4b4c2694202
--- /dev/null
+++ b/pkgs/development/idris-modules/protobuf.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lightyear
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "protobuf";
+  version = "2017-08-12";
+
+  idrisDeps = [ prelude lightyear ];
+
+  src = fetchFromGitHub {
+    owner = "artagnon";
+    repo = "idris-protobuf";
+    rev = "c21212534639518453d16ae1b0f07d94464ff8eb";
+    sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05";
+  };
+
+  meta = {
+    description = "A partial implementation of Protocol Buffers in Idris";
+    homepage = https://github.com/artagnon/idris-protobuf;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix
new file mode 100644
index 00000000000..693d580fdd5
--- /dev/null
+++ b/pkgs/development/idris-modules/rationals.nix
@@ -0,0 +1,28 @@
+{ curl
+, build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+  name = "rationals";
+  version = "2017-04-29";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "mcgordonite";
+    repo = "idris-binary-rationals";
+    rev = "0d7010b267662d89e76e2cc8b27fd95ecca009b8";
+    sha256 = "0fc93n4pyqyrjxrspnr3vjzc09m78ni1ardq1vx9g40vmvl0n49s";
+  };
+
+  meta = {
+    description = "An idris rational number type built from paths in the Stern Brocot tree";
+    homepage = https://github.com/mcgordonite/idris-binary-rationals;
+    inherit (idris.meta) platforms;
+    maintainers = [ lib.maintainers.brainrape ];
+  };
+}
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix
new file mode 100644
index 00000000000..06e99da3608
--- /dev/null
+++ b/pkgs/development/idris-modules/recursion_schemes.nix
@@ -0,0 +1,36 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, free
+, composition
+, comonad
+, bifunctors
+, hezarfen
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "recursion_schemes";
+  version = "2018-01-19";
+
+  idrisDeps = [ prelude free composition comonad bifunctors hezarfen ];
+
+  src = fetchFromGitHub {
+    owner = "vmchale";
+    repo = "recursion_schemes";
+    rev = "6bcbe0da561f461e7a05e29965a18ec9f87f8d82";
+    sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf";
+  };
+
+  postUnpack = ''
+    rm source/test.ipkg
+  '';
+
+  meta = {
+    description = "Recursion schemes for Idris";
+    homepage = https://github.com/vmchale/recursion_schemes;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix
new file mode 100644
index 00000000000..bd8e37f2b7f
--- /dev/null
+++ b/pkgs/development/idris-modules/refined.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "refined";
+  version = "2017-12-28";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "janschultecom";
+    repo = "idris-refined";
+    rev = "e21cdef16106a77b42d193806c1749ba6448a128";
+    sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh";
+  };
+
+  postUnpack = ''
+    rm source/idris-refined-test.ipkg
+  '';
+
+  meta = {
+    description = "Port of Scala/Haskell Refined library to Idris";
+    homepage = https://github.com/janschultecom/idris-refined;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix
new file mode 100644
index 00000000000..181959dca06
--- /dev/null
+++ b/pkgs/development/idris-modules/sdl.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, SDL
+, SDL_gfx
+}:
+
+build-idris-package  {
+  name = "sdl";
+  version = "2017-03-24";
+
+  idrisDeps = [ prelude effects ];
+
+  extraBuildInputs = [ idris SDL SDL_gfx ];
+
+  src = fetchFromGitHub {
+    owner = "edwinb";
+    repo = "SDL-idris";
+    rev = "095ce70da7ea9f163b018b690105edf375f1befe";
+    sha256 = "0nryssnaqfq2pvz2mbl2kkx6mig310f9dpgrbcx788nxi0qzsig6";
+  };
+
+  meta = {
+    description = "SDL-idris framework for Idris";
+    homepage = https://github.com/edwinb/SDL-idris;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
new file mode 100644
index 00000000000..46d4e9fb8dd
--- /dev/null
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -0,0 +1,33 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, pkgconfig
+, SDL2
+, SDL2_gfx
+}:
+
+build-idris-package  {
+  name = "sdl2";
+  version = "2018-01-19";
+
+  idrisDeps = [ prelude effects ];
+
+  extraBuildInputs = [ idris pkgconfig SDL2 SDL2_gfx ];
+
+  src = fetchFromGitHub {
+    owner = "steshaw";
+    repo = "idris-sdl2";
+    rev = "ebc36a0efb3e8086f2999120e7a8a8ac4952c6f6";
+    sha256 = "060k0i1pjilrc4pcz7v70hbipaw2crz14yxjlyjlhn6qm03131q0";
+  };
+
+  meta = {
+    description = "SDL2 binding for Idris";
+    homepage = https://github.com/steshaw/idris-sdl2;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix
new file mode 100644
index 00000000000..d10a85eb4f4
--- /dev/null
+++ b/pkgs/development/idris-modules/semidirect.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, patricia
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "semidirect";
+  version = "2018-02-06";
+
+  idrisDeps = [ prelude contrib patricia ];
+
+  src = fetchFromGitHub {
+    owner = "clayrat";
+    repo = "idris-semidirect";
+    rev = "884c26c095784f8fd489c323d6673f2a8710a741";
+    sha256 = "0w36xkfxsqm6r91f0vs6qpmallrfwa09ql8i317xwm86nfk7akj9";
+  };
+
+  meta = {
+    description = "Semidirect products in Idris";
+    homepage = https://github.com/clayrat/idris-semidirect;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix
new file mode 100644
index 00000000000..76bf127818c
--- /dev/null
+++ b/pkgs/development/idris-modules/setoids.nix
@@ -0,0 +1,26 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "setoids";
+  version = "2017-03-13";
+
+  idrisDeps = [ prelude ];
+
+  src = fetchFromGitHub {
+    owner = "danilkolikov";
+    repo = "setoids";
+    rev = "a50cfc010cb4321cc9b7988c0a4f387d83d34839";
+    sha256 = "0q0h2qj9vylkm16h70l78l2p5xjkx4qmg2a2ixfl8vq8b1zm8gch";
+  };
+
+  meta = {
+    description = "Idris proofs for extensional equalities";
+    homepage = https://github.com/danilkolikov/setoids;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix
new file mode 100644
index 00000000000..c751f27d1c9
--- /dev/null
+++ b/pkgs/development/idris-modules/smproc.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "smproc";
+  version = "2018-02-08";
+
+  idrisDeps = [ prelude base contrib ];
+
+  src = fetchFromGitHub {
+    owner = "jameshaydon";
+    repo = "smproc";
+    rev = "b292d6c94fe005bcd984b8e5134b6f99933aa0af";
+    sha256 = "02gqa2a32dwrvgz6pwsg8bniszbzwxlkzm53fq81sz3l9ja8ax1n";
+  };
+
+  meta = {
+    description = "Well-typed symmetric-monoidal category of concurrent processes";
+    homepage = https://github.com/jameshaydon/smproc;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix
new file mode 100644
index 00000000000..9dc2dd3f8e2
--- /dev/null
+++ b/pkgs/development/idris-modules/snippets.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "snippets";
+  version = "2018-03-17";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "palladin";
+    repo = "idris-snippets";
+    rev = "c26d6f5ffc1cc0456279f5ac74fec5af8c09025e";
+    sha256 = "1vwyzck6yan3wifsyj02ji9l6x9rs2r02aybm90gl676s2x4mhjn";
+  };
+
+  meta = {
+    description = "Collection of Idris snippets";
+    homepage = https://github.com/palladin/idris-snippets;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix
new file mode 100644
index 00000000000..3d16e91e10f
--- /dev/null
+++ b/pkgs/development/idris-modules/software_foundations.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "software_foundations";
+  version = "2017-11-04";
+
+  idrisDeps = [ prelude pruviloj ];
+
+  src = fetchFromGitHub {
+    owner = "idris-hackers";
+    repo = "software-foundations";
+    rev = "eaa63d1a572c78e7ce68d27fd49ffdc01457e720";
+    sha256 = "1rkjm0x79n1r3ah041a5bik7sc3rvqs42a2c3g139hlg5xd028xf";
+  };
+
+  meta = {
+    description = "Code for Software Foundations in Idris";
+    homepage = https://github.com/idris-hackers/software-foundations;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix
index e20af375237..b18d4a07d46 100644
--- a/pkgs/development/idris-modules/specdris.nix
+++ b/pkgs/development/idris-modules/specdris.nix
@@ -7,22 +7,19 @@
 , idris
 }:
 
-let
-  date = "2017-11-11";
-in
 build-idris-package {
   name = "specdris";
-  version = date;
+  version = "2018-01-23";
 
   src = fetchgit {
     url = "https://github.com/pheymann/specdris";
-    rev = "88b80334b8e0b6601324e2410772d35022fc8eaa";
-    sha256 = "4813c4be1d4c3dd1dad35964b085f83cf9fb44b16824257c72b468d4bafd0e4f";
+    rev = "625f88f5e118e53f30bcf5e5f3dcf48eb268ac21";
+    sha256 = "1gc717xf4i7z75aqazy5wqm7b1dqfyx5pprdypxz1h3980m67fsa";
   };
 
   idrisDeps = [ prelude base effects idris ];
 
-  # The tests attribute is very strange as the tests are a different ipkg
+  # tests use a different ipkg and directory structure
   doCheck = false;
 
   meta = {
diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix
new file mode 100644
index 00000000000..5f6eccd98cd
--- /dev/null
+++ b/pkgs/development/idris-modules/tap.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "tap";
+  version = "2017-04-08";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "ostera";
+    repo = "tap-idris";
+    rev = "0d019333e1883c1d60e151af1acb02e2b531e72f";
+    sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs";
+  };
+
+  postUnpack = ''
+    rm source/Draft.ipkg
+  '';
+
+  meta = {
+    description = "A simple TAP producer and consumer/reporter for Idris";
+    homepage = https://github.com/ostera/tap-idris;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix
new file mode 100644
index 00000000000..d0688c54a65
--- /dev/null
+++ b/pkgs/development/idris-modules/test.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "test";
+  version = "2017-03-30";
+
+  idrisDeps = [ prelude effects ];
+
+  src = fetchFromGitHub {
+    owner = "jfdm";
+    repo = "idris-testing";
+    rev = "604d56f77054931b21975198be669e22427b1f52";
+    sha256 = "1pmyhs3jx6wd0pzjd3igfxb9zjs8pqmk4ah352bxjrqdnhqwrl51";
+  };
+
+
+  doCheck = false;
+
+  meta = {
+    description = "Testing Utilities for Idris programs";
+    homepage = https://github.com/jfdm/idris-testing;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix
new file mode 100644
index 00000000000..9106e485c5f
--- /dev/null
+++ b/pkgs/development/idris-modules/tlhydra.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, contrib
+, lightyear
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "tlhydra";
+  version = "2017-13-26";
+
+  idrisDeps = [ prelude effects contrib lightyear ];
+
+  src = fetchFromGitHub {
+    owner = "Termina1";
+    repo = "tlhydra";
+    rev = "3fc9049447d9560fe16f4d36a2f2996494ac2b33";
+    sha256 = "1y3gcbc1ypv00vwa0w3v0n6ckf7gnz26xsfmgnidsaxzff3y0ymh";
+  };
+
+  meta = {
+    description = "Idris parser and serializer/deserealizer for TL language";
+    homepage = https://github.com/Termina1/tlhydra;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix
new file mode 100644
index 00000000000..a5d99d19284
--- /dev/null
+++ b/pkgs/development/idris-modules/tomladris.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lightyear
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "tomladris";
+  version = "2017-11-14";
+
+  idrisDeps = [ prelude lightyear contrib ];
+
+  src = fetchFromGitHub {
+    owner = "emptyflash";
+    repo = "tomladris";
+    rev = "0fef663e20528c455f410f01124c8e3474a96606";
+    sha256 = "0a0fc0bsr356plgzsr5sr4qmqx4838998wjwmflz10qwsv1j3zsw";
+  };
+
+  meta = {
+    description = "TOML parser for Idris";
+    homepage = https://github.com/emptyflash/tomladris;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ siddharthist brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix
new file mode 100644
index 00000000000..db45f0408ab
--- /dev/null
+++ b/pkgs/development/idris-modules/tp.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "tp";
+  version = "2017-08-15";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "superfunc";
+    repo = "tp";
+    rev = "ef59ccf355ae462bd4f55d596e6d03a9376b67b2";
+    sha256 = "1a924qvm1dqfg419x8n35w0sz74vyyqsynz5g393f82jsrrwci8z";
+  };
+
+  # tests fail with permission error
+  doCheck = false;
+
+  meta = {
+    description = "Strongly Typed Paths for Idris";
+    homepage = https://github.com/superfunc/tp;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
new file mode 100644
index 00000000000..a2077fca20d
--- /dev/null
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package  {
+  name = "tparsec";
+  version = "2017-12-12";
+
+  idrisDeps = [ prelude ];
+
+  src = fetchFromGitHub {
+    owner = "gallais";
+    repo = "idris-tparsec";
+    rev = "fb87d08f8f58c934f37d8324b43b0979abcf2183";
+    sha256 = "0362076bfs976gqki4b4pxblhnk4xglgx5v2aycjpxsxlpxh6cfd";
+  };
+
+  meta = {
+    description = "TParsec - Total Parser Combinators in Idris";
+    homepage = https://github.com/gallais/idris-tparsec;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix
new file mode 100644
index 00000000000..d63a11a0234
--- /dev/null
+++ b/pkgs/development/idris-modules/transducers.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "transducers";
+  version = "2017-07-28";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "QuentinDuval";
+    repo = "IdrisReducers";
+    rev = "2947ffa3559b642baeb3e43d7bb382e16bd073a8";
+    sha256 = "0wzbbp5n113mva99mqr119zwp5pgj4l6wq9033z4f0kbm2nhmcfr";
+  };
+
+  meta = {
+    description = "Composable algorithmic transformation";
+    homepage = https://github.com/QuentinDuval/IdrisReducers;
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix
new file mode 100644
index 00000000000..78ad70690b3
--- /dev/null
+++ b/pkgs/development/idris-modules/trees.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, bi
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "trees";
+  version = "2018-03-19";
+
+  idrisDeps = [ prelude contrib bi ];
+
+  src = fetchFromGitHub {
+    owner = "clayrat";
+    repo = "idris-trees";
+    rev = "dc17f9598bd78ec2b283d91b3c58617960d88c85";
+    sha256 = "1c3p69875qc4zdk28im9xz45zw46ajgcmxpqmig63y0z4v3gwxww";
+  };
+
+  meta = {
+    description = "Trees in Idris";
+    homepage = https://github.com/clayrat/idris-trees;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix
new file mode 100644
index 00000000000..845bec3d84e
--- /dev/null
+++ b/pkgs/development/idris-modules/union_type.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "union_type";
+  version = "2018-01-30";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "berewt";
+    repo = "UnionType";
+    rev = "f7693036237585fe324a815a96ad101d9659c689";
+    sha256 = "1ky0h03kja2y1fjg18j46akw03wi5ng80pghh2j3ib6hxlg1rbs7";
+  };
+
+  meta = {
+    description = "UnionType in Idris";
+    homepage = https://github.com/berewt/UnionType;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix
new file mode 100644
index 00000000000..d2fa9e31ae3
--- /dev/null
+++ b/pkgs/development/idris-modules/vecspace.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "vecspace";
+  version = "2018-01-12";
+
+  idrisDeps = [ prelude contrib ];
+
+  src = fetchFromGitHub {
+    owner = "clayrat";
+    repo = "idris-vecspace";
+    rev = "6830fa13232f25e9874b3f857b79508b5f82cb99";
+    sha256 = "1dwz69cmzblyh7lnyqq2gp0a042z7h02sh5q5wf4xb500vizwkq2";
+  };
+
+  meta = {
+    description = "Abstract vector spaces in Idris";
+    homepage = https://github.com/clayrat/idris-vecspace;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix
new file mode 100644
index 00000000000..3793a812e57
--- /dev/null
+++ b/pkgs/development/idris-modules/webgl.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "webgl";
+  version = "2017-05-08";
+
+  idrisDeps = [ prelude idrisscript ];
+
+  src = fetchFromGitHub {
+    owner = "pierrebeaucamp";
+    repo = "idris-webgl";
+    rev = "1b4ee00a06b0bccfe33eea0fa8f068cdae690e9e";
+    sha256 = "097l2pj8p33d0n3ryb8y2vp0n5isnc8bkdnad3y6raa9z1xjn3d6";
+  };
+
+  meta = {
+    description = "Idris library to interact with WebGL";
+    homepage = https://github.com/pierrebeaucamp/idris-webgl;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 9ecf0591805..55a926d780d 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -16,10 +16,6 @@ build-idris-package {
     sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d";
   };
 
-  # The tests for this package fail. We should attempt to enable them when
-  # updating this package again.
-  doCheck = false;
-
   idrisDeps = [ prelude base ];
 
   meta = {
diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix
new file mode 100644
index 00000000000..a1724476f6c
--- /dev/null
+++ b/pkgs/development/idris-modules/wyvern.nix
@@ -0,0 +1,33 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "wyvern";
+  version = "2017-06-26";
+
+  idrisDeps = [ prelude contrib effects ];
+
+  src = fetchFromGitHub {
+    owner = "ericqweinstein";
+    repo = "wyvern";
+    rev = "b9e3e5747c5b23608c6ed5e2ccf43b86caa04292";
+    sha256 = "0zihf95w7i0903zy1mzn1ldn697nf57yl80nl32dpgji72h98kh2";
+  };
+
+  postUnpack = ''
+    sed -i "s/Wyvern.Core/Wyvern.Main/g" source/src/Wyvern.idr
+  '';
+
+  meta = {
+    description = "Little web server written in Idris";
+    homepage = https://github.com/ericqweinstein/wyvern;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix
new file mode 100644
index 00000000000..15573cc9461
--- /dev/null
+++ b/pkgs/development/idris-modules/xhr.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "xhr";
+  version = "2017-04-22";
+
+  idrisDeps = [ prelude idrisscript ];
+
+  src = fetchFromGitHub {
+    owner = "pierrebeaucamp";
+    repo = "idris-xhr";
+    rev = "fb32a748ccdb9070de3f2d6048564e34c064b362";
+    sha256 = "0l07mnarvrb4xdw0b2xqgyxq4rljw1axz5mc9w4gmhvcrzxnyfnr";
+  };
+
+  meta = {
+    description = "Idris library to interact with xhr";
+    homepage = https://github.com/pierrebeaucamp/idris-xhr;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix
new file mode 100644
index 00000000000..ff935753ce9
--- /dev/null
+++ b/pkgs/development/idris-modules/yaml.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lightyear
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "yaml";
+  version = "2018-01-25";
+
+  idrisDeps = [ prelude contrib lightyear ];
+
+  src = fetchFromGitHub {
+    owner = "Heather";
+    repo = "Idris.Yaml";
+    rev = "5afa51ffc839844862b8316faba3bafa15656db4";
+    sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";
+  };
+
+  meta = {
+    description = "Idris YAML lib";
+    homepage = https://github.com/Heather/Idris.Yaml;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix
new file mode 100644
index 00000000000..661a55bfd74
--- /dev/null
+++ b/pkgs/development/idris-modules/yampa.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, bifunctors
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "yampa";
+  version = "2016-07-05";
+
+  idrisDeps = [ prelude bifunctors ];
+
+  src = fetchFromGitHub {
+    owner = "BartAdv";
+    repo = "idris-yampa";
+    rev = "2120dffb3ea0de906ba2b40080956c900457cf33";
+    sha256 = "0zp495zpbvsagdzrmg9iig652zbm34qc0gdr81x0viblwqxhicx6";
+  };
+
+  meta = {
+    description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types";
+    homepage = https://github.com/BartAdv/idris-yampa;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}

From f05d4b8161c9c4713cb4b576784a9b3b390de5d8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 23:30:59 -0700
Subject: [PATCH 1495/2266] deepin.deepin-gtk-theme: 17.10.5 -> 17.10.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 17.10.6 with grep in /nix/store/ga3bv13qx17rpki527kh2wzmb8ri5h5w-deepin-gtk-theme-17.10.6
- directory tree listing: https://gist.github.com/8406a3329d9f397b5fe75ab8f0eea6ad
---
 pkgs/desktops/deepin/deepin-gtk-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index bdddc28cc44..26520889c7d 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "deepin-gtk-theme-${version}";
-  version = "17.10.5";
+  version = "17.10.6";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-gtk-theme";
     rev = version;
-    sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3";
+    sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 31cd8ced032b904319d97322f6fba626c35a9397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 20 Mar 2018 07:00:16 +0000
Subject: [PATCH 1496/2266] riemann-c-client: 1.9.1 -> 1.10.2

also fix compilation,
found while reviewing #37412
---
 pkgs/tools/misc/riemann-c-client/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index 07c14ac7626..42a94207be7 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }:
 
 stdenv.mkDerivation rec {
-  pname = "riemann-c-client";
-  version = "1.9.1";
-  name = "${pname}-${version}";
+  name = "riemann-c-client-1.10.1";
 
   src = fetchFromGitHub {
     owner = "algernon";
     repo = "riemann-c-client";
     rev = "${name}";
-    sha256 = "1j3wgf9xigsv6ckmv82gjj4wavi7xjn2zvj1f63fzbaa1rv7pf3s";
+    sha256 = "1pzyngvj9aq1w2185qpg6rxrjn406pnpy40bnh4c21fn4ql5kk9p";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ file protobufc ];
 
+  preBuild = ''
+    make lib/riemann/proto/riemann.pb-c.h
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/algernon/riemann-c-client;
     description = "A C client library for the Riemann monitoring system";

From 002b46082276693574dc7d13f1d4950106b963f3 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 20 Mar 2018 06:19:32 +0000
Subject: [PATCH 1497/2266] varnish4: init at 4.1.9; varnish6: init at 6.0.0

---
 .../services/web-servers/varnish/default.nix  | 19 +++--
 pkgs/servers/varnish/default.nix              | 74 +++++++++++--------
 pkgs/servers/varnish/digest.nix               | 10 +--
 pkgs/servers/varnish/dynamic.nix              | 26 +++++++
 pkgs/servers/varnish/geoip.nix                |  2 +-
 pkgs/servers/varnish/modules.nix              | 21 ++++--
 pkgs/servers/varnish/packages.nix             | 22 ++++++
 pkgs/servers/varnish/rtstatus.nix             |  3 +-
 pkgs/top-level/all-packages.nix               | 14 ++--
 9 files changed, 137 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/servers/varnish/dynamic.nix
 create mode 100644 pkgs/servers/varnish/packages.nix

diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index d63fb954ef9..bc74d62b116 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -6,13 +6,22 @@ let
   cfg = config.services.varnish;
 
   commandLine = "-f ${pkgs.writeText "default.vcl" cfg.config}" +
-      optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
+      optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([cfg.package] ++ cfg.extraModules)}' -r vmod_path";
 in
 {
   options = {
     services.varnish = {
       enable = mkEnableOption "Varnish Server";
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.varnish5;
+        defaultText = "pkgs.varnish5";
+        description = ''
+          The package to use
+        '';
+      };
+
       http_address = mkOption {
         type = types.str;
         default = "*:6081";
@@ -39,7 +48,7 @@ in
       extraModules = mkOption {
         type = types.listOf types.package;
         default = [];
-        example = literalExample "[ pkgs.varnish-geoip ]";
+        example = literalExample "[ pkgs.varnish5Packages.geoip ]";
         description = "
           Varnish modules (except 'std').
         ";
@@ -73,7 +82,7 @@ in
       serviceConfig = {
         Type = "simple";
         PermissionsStartOnly = true;
-        ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
+        ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
         Restart = "always";
         RestartSec = "5s";
         User = "varnish";
@@ -84,13 +93,13 @@ in
       };
     };
 
-    environment.systemPackages = [ pkgs.varnish ];
+    environment.systemPackages = [ cfg.package ];
 
     # check .vcl syntax at compile time (e.g. before nixops deployment)
     system.extraDependencies = [
       (pkgs.stdenv.mkDerivation {
         name = "check-varnish-syntax";
-        buildCommand = "${pkgs.varnish}/sbin/varnishd -C ${commandLine} 2> $out";
+        buildCommand = "${cfg.package}/sbin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)";
       })
     ];
 
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 9efb4e4dfe5..85192b11c30 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,37 +1,53 @@
 { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
 , python, pythonPackages, makeWrapper }:
 
-stdenv.mkDerivation rec {
-  version = "5.2.1";
-  name = "varnish-${version}";
+let
+  common = { version, sha256 }:
+    stdenv.mkDerivation rec {
+      name = "varnish-${version}";
 
-  src = fetchurl {
-    url = "http://varnish-cache.org/_downloads/${name}.tgz";
+      src = fetchurl {
+        url = "http://varnish-cache.org/_downloads/${name}.tgz";
+        inherit sha256;
+      };
+
+      nativeBuildInputs = [ pkgconfig ];
+      buildInputs = [
+        pcre libxslt groff ncurses readline python libedit
+        pythonPackages.docutils makeWrapper
+      ];
+
+      buildFlags = "localstatedir=/var/spool";
+
+      postInstall = ''
+        wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}"
+      '';
+
+      # https://github.com/varnishcache/varnish-cache/issues/1875
+      NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard";
+
+      outputs = [ "out" "dev" "man" ];
+
+      meta = with stdenv.lib; {
+        description = "Web application accelerator also known as a caching HTTP reverse proxy";
+        homepage = https://www.varnish-cache.org;
+        license = licenses.bsd2;
+        maintainers = with maintainers; [ garbas fpletz ];
+        platforms = platforms.unix;
+      };
+    };
+in
+{
+  varnish4 = common {
+    version = "4.1.9";
+    sha256 = "11zwyasz2fn9qxc87r175wb5ba7388sd79mlygjmqn3yv2m89n12";
+  };
+  varnish5 = common {
+    version = "5.2.1";
     sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
   };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    pcre libxslt groff ncurses readline python libedit
-    pythonPackages.docutils makeWrapper
-  ];
-
-  buildFlags = "localstatedir=/var/spool";
-
-  postInstall = ''
-    wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}"
-  '';
-
-  # https://github.com/varnishcache/varnish-cache/issues/1875
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard";
-
-  outputs = [ "out" "dev" "man" ];
-
-  meta = with stdenv.lib; {
-    description = "Web application accelerator also known as a caching HTTP reverse proxy";
-    homepage = https://www.varnish-cache.org;
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ garbas fpletz ];
-    platforms = platforms.unix;
+  varnish6 = common {
+    version = "6.0.0";
+    sha256 = "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7";
   };
 }
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 530ae504771..2ccb0419c04 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
-  name = "varnish-digest-${version}";
+  version = "1.0.2";
+  name = "${varnish.name}-digest-${version}";
 
   src = fetchFromGitHub {
     owner = "varnish";
     repo = "libvmod-digest";
     rev = "libvmod-digest-${version}";
-    sha256 = "0v18bqbsblhajpx5qvczic3psijhx5l2p2qlw1dkd6zl33hhppy7";
+    sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
   buildInputs = [ varnish libmhash ];
 
   postPatch = ''
-    substituteInPlace autogen.sh  --replace "-I \''${dataroot}/aclocal"                  ""
-    substituteInPlace Makefile.am --replace "-I \''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" ""
+    substituteInPlace autogen.sh  --replace "''${dataroot}/aclocal"                  "${varnish.dev}/share/aclocal"
+    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
   '';
 
   configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
new file mode 100644
index 00000000000..711bc1cf78f
--- /dev/null
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }:
+
+stdenv.mkDerivation rec {
+  version = "0.3";
+  name = "${varnish.name}-dynamic-${version}";
+
+  src = fetchFromGitHub {
+    owner = "nigoroll";
+    repo = "libvmod-dynamic";
+    rev = "475be183fddbd727c3d2523f0518effa9aa881f8"; # 5.2 branch for Varnish-5.2 https://github.com/nigoroll/libvmod-dynamic/commits/5.2
+    sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
+  };
+
+  nativeBuildInputs = [ pkgconfig docutils autoreconfHook ];
+  buildInputs = [ varnish python ];
+  postPatch = ''
+    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
+  '';
+  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
+
+  meta = with stdenv.lib; {
+    description = "Dynamic director similar to the DNS director from Varnish 3";
+    homepage = https://github.com/nigoroll/libvmod-dynamic;
+    inherit (varnish.meta) license platforms maintainers;
+  };
+}
diff --git a/pkgs/servers/varnish/geoip.nix b/pkgs/servers/varnish/geoip.nix
index 7816b27b14f..d1790252065 100644
--- a/pkgs/servers/varnish/geoip.nix
+++ b/pkgs/servers/varnish/geoip.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.2";
-  name = "varnish-geoip-${version}";
+  name = "${varnish.name}-geoip-${version}";
 
   src = fetchFromGitHub {
     owner = "varnish";
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 8fdcf63e5b9..7775221d163 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, varnish, python, docutils, removeReferencesTo }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.13.0";
-  name = "varnish-modules-${version}";
+  version = "0.14.0";
+  name = "${varnish.name}-modules-${version}";
 
-  src = fetchurl {
-    url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz";
-    sha256 = "1nj52va7cp0swcv87zd3si80knpaa4a7na37cy9wkvgyvhf9k8mh";
+  src = fetchFromGitHub {
+    owner = "varnish";
+    repo = "varnish-modules";
+    rev = version;
+    sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
   };
 
-  nativeBuildInputs = [ pkgconfig docutils removeReferencesTo ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ];
   buildInputs = [ varnish python ];
 
+  postPatch = ''
+    substituteInPlace bootstrap   --replace "''${dataroot}/aclocal"                  "${varnish.dev}/share/aclocal"
+    substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
+  '';
+
   postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
new file mode 100644
index 00000000000..f468ac58e6c
--- /dev/null
+++ b/pkgs/servers/varnish/packages.nix
@@ -0,0 +1,22 @@
+{ callPackage, varnish4, varnish5, varnish6 }:
+
+{
+  varnish4Packages = {
+    varnish = varnish4;
+    digest   = callPackage ./digest.nix   { varnish = varnish4; };
+    rtstatus = callPackage ./rtstatus.nix { varnish = varnish4; }; # varnish4 only
+    modules  = callPackage ./modules.nix  { varnish = varnish4; }; # varnish4 and varnish5 only
+    geoip    = callPackage ./geoip.nix    { varnish = varnish4; }; # varnish4 and varnish5 only
+  };
+  varnish5Packages = {
+    varnish = varnish5;
+    digest   = callPackage ./digest.nix   { varnish = varnish5; };
+    dynamic  = callPackage ./dynamic.nix  { varnish = varnish5; }; # varnish5 only (upstream has a separate branch for varnish4)
+    modules  = callPackage ./modules.nix  { varnish = varnish5; }; # varnish4 and varnish5 only
+    geoip    = callPackage ./geoip.nix    { varnish = varnish5; }; # varnish4 and varnish5 only
+  };
+  varnish6Packages = {
+    varnish = varnish6;
+    digest   = callPackage ./digest.nix   { varnish = varnish6; };
+  };
+}
diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix
index e92559f038d..99c0bb17659 100644
--- a/pkgs/servers/varnish/rtstatus.nix
+++ b/pkgs/servers/varnish/rtstatus.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
-  name = "varnish-rtstatus-${version}";
+  name = "${varnish.name}-rtstatus-${version}";
 
   src = fetchurl {
     url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz";
@@ -17,6 +17,5 @@ stdenv.mkDerivation rec {
     description = "Varnish realtime status page";
     homepage = https://github.com/varnish/libvmod-rtstatus;
     inherit (varnish.meta) license platforms maintainers;
-    broken = true; # it has not ported to varnish 5.2 yet (5.1 is ok)
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 865107e0272..9966f862f90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5483,11 +5483,15 @@ with pkgs;
     inherit (gnome3) libgee;
   };
 
-  varnish = callPackage ../servers/varnish { };
-  varnish-modules = callPackage ../servers/varnish/modules.nix { };
-  varnish-digest = callPackage ../servers/varnish/digest.nix { };
-  varnish-geoip = callPackage ../servers/varnish/geoip.nix { };
-  varnish-rtstatus = callPackage ../servers/varnish/rtstatus.nix { };
+  inherit (callPackages ../servers/varnish { })
+    varnish4 varnish5 varnish6;
+  inherit (callPackages ../servers/varnish/packages.nix { })
+    varnish4Packages
+    varnish5Packages
+    varnish6Packages;
+
+  varnishPackages = varnish5Packages;
+  varnish = varnishPackages.varnish;
 
   venus = callPackage ../tools/misc/venus {
     python = python27;

From d6d140f15963456fe05ed726865b8ce6ab5ef582 Mon Sep 17 00:00:00 2001
From: Joel Thompson <joel@jthompson.io>
Date: Tue, 20 Mar 2018 07:25:13 +0000
Subject: [PATCH 1498/2266] hologram: 2017-01-30 -> 2018-03-19

---
 pkgs/tools/security/hologram/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index 911c1b12562..5d873885b1f 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "hologram-${version}";
-  version = "20170130-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1";
+  name = "hologram-2018-03-19";
+  rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "AdRoll";
+    repo = "hologram";
     inherit rev;
-    url = "https://github.com/AdRoll/hologram";
-    sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn";
+    sha256 = "00scryz8js6gbw8lp2y23qikbazz2dd992r97rqh0l1q4baa0ckn";
   };
 
   goPackagePath = "github.com/AdRoll/hologram";

From fe2e4d6fb952fabd69d9636ee5e6b8464923f4b4 Mon Sep 17 00:00:00 2001
From: Joel Thompson <joel@jthompson.io>
Date: Tue, 20 Mar 2018 07:26:23 +0000
Subject: [PATCH 1499/2266] hologram: Enable configuring LDAP authorization

In AdRoll/hologram#62 support was added to hologram to configure
LDAP-based authorization of which roles a user was allowed to get
credentials for. This adds the ability to configure that.

Additionally, AdRoll/hologram/#94 added support to customize the LDAP
group query, so this also feeds that configuration through.

fixes #37393
---
 .../services/security/hologram-server.nix     | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index e267fed2795..bb56e2df09b 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -12,9 +12,12 @@ let
         dn       = cfg.ldapBindDN;
         password = cfg.ldapBindPassword;
       };
-      insecureldap = cfg.ldapInsecure;
-      userattr     = cfg.ldapUserAttr;
-      baseDN       = cfg.ldapBaseDN;
+      insecureldap    = cfg.ldapInsecure;
+      userattr        = cfg.ldapUserAttr;
+      baseDN          = cfg.ldapBaseDN;
+      enableldapRoles = cfg.enableLdapRoles;
+      roleAttr        = cfg.roleAttr;
+      groupClassAttr  = cfg.groupClassAttr;
     };
     aws = {
       account     = cfg.awsAccount;
@@ -70,6 +73,24 @@ in {
         description = "Password of account to use to query the LDAP server";
       };
 
+      enableLdapRoles = mkOption {
+        type        = types.bool;
+        default     = false;
+        description = "Whether to assign user roles based on the user's LDAP group memberships";
+      };
+
+      groupClassAttr = mkOption {
+        type = types.str;
+        default = "groupOfNames";
+        description = "The objectclass attribute to search for groups when enableLdapRoles is true";
+      };
+
+      roleAttr = mkOption {
+        type        = types.str;
+        default     = "businessCategory";
+        description = "Which LDAP group attribute to search for authorized role ARNs";
+      };
+
       awsAccount = mkOption {
         type        = types.str;
         description = "AWS account number";

From 1857c35359f180274a57647f4a893a7b1a605e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 19 Mar 2018 06:24:34 -0300
Subject: [PATCH 1500/2266] enlightenment: 0.22.1 -> 0.22.2

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

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 58fff802080..5dc9e9a7262 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "1q57fz57d0b26z06m1wiq7c1sniwh885b0vs02mk4jgwva46nyr0";
+    sha256 = "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d";
   };
 
   nativeBuildInputs = [

From ba74cf4d5ceb3aa516af2a10d2ee86b79ff75ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 09:58:15 +0100
Subject: [PATCH 1501/2266] pythonPackages.django_pipeline: move expression

---
 .../django-pipeline/default.nix               | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +----------------
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/django-pipeline/default.nix

diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix
new file mode 100644
index 00000000000..f29ae365877
--- /dev/null
+++ b/pkgs/development/python-modules/django-pipeline/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi
+, django, futures }:
+
+buildPythonPackage rec {
+  pname = "django-pipeline";
+  version = "1.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
+  };
+
+  propagatedBuildInputs = [ django futures ];
+
+  meta = with lib; {
+    description = "Pipeline is an asset packaging library for Django";
+    homepage = https://github.com/cyberdelia/django-pipeline;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8acec15fd71..b5e3f96d849 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6883,23 +6883,7 @@ in {
     };
   };
 
-  django_pipeline = buildPythonPackage rec {
-    name = "django-pipeline-${version}";
-    version = "1.5.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
-      sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
-    };
-
-    propagatedBuildInputs = with self; [ django futures ];
-
-    meta = with stdenv.lib; {
-      description = "Pipeline is an asset packaging library for Django";
-      homepage = https://github.com/cyberdelia/django-pipeline;
-      license = stdenv.lib.licenses.mit;
-    };
-  };
+  django_pipeline = callPackage ../development/python-modules/django-pipeline { };
 
   django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
     name = "django-pipeline-1.3.27";

From 366c79e17f212e581d16a17ca67eb186fd005c61 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 20 Mar 2018 11:45:36 +0900
Subject: [PATCH 1502/2266] pythonPackages.neovim: 0.2.3 -> 0.2.4

required to work with latest deoplete for instance
---
 pkgs/development/python-modules/neovim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix
index c4b2a7e9cc8..646a8e7bb11 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/neovim/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "neovim";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "989d720dc7636aa4260aa7774fa79aa524f51515b262eb8d7e9ba4336f758a99";
+    sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3";
   };
 
   checkInputs = [ nose ];

From 7d639b174813c721fc60495cbd35c2542ae426d9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 02:41:07 -0700
Subject: [PATCH 1503/2266] gnustep.back: 0.25.0 -> 0.26.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/7jhldrzqcz3ymbm30j635m9sf6q7b3ac-gnustep-back-0.26.2/bin/gpbs --help` got 0 exit code
- ran `/nix/store/7jhldrzqcz3ymbm30j635m9sf6q7b3ac-gnustep-back-0.26.2/bin/gpbs help` got 0 exit code
- ran `/nix/store/7jhldrzqcz3ymbm30j635m9sf6q7b3ac-gnustep-back-0.26.2/bin/.gpbs-wrapped --help` got 0 exit code
- ran `/nix/store/7jhldrzqcz3ymbm30j635m9sf6q7b3ac-gnustep-back-0.26.2/bin/.gpbs-wrapped help` got 0 exit code
- found 0.26.2 with grep in /nix/store/7jhldrzqcz3ymbm30j635m9sf6q7b3ac-gnustep-back-0.26.2
- directory tree listing: https://gist.github.com/54fd76edf6d8b2835f52c660d901708a
---
 pkgs/desktops/gnustep/back/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 02f58f81200..7920c8e1f45 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -8,13 +8,13 @@
 , libXmu
 }:
 let
-  version = "0.25.0";
+  version = "0.26.2";
 in
 gsmakeDerivation {
   name = "gnustep-back-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
-    sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2";
+    sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cairo base gui freetype x11 libXmu ];

From d74331de4a2c0fee0180119ccaff9eb76c0fe18a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 02:43:22 -0700
Subject: [PATCH 1504/2266] gnustep.base: 1.24.9 -> 1.25.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/HTMLLinker -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/HTMLLinker --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/HTMLLinker help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/HTMLLinker -V` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/HTMLLinker --version` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/cvtenc -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/cvtenc --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/cvtenc help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/defaults --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/defaults help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdnc --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap -V` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap -v` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap --version` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap version` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap -h` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap --help` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/gdomap help` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/make_strings --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/make_strings --help` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/pl -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/pl --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/pl help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/pldes -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/pldes --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/pldes help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plmerge -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plmerge --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plmerge help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plparse -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plparse --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plparse help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plser -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plser --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/plser help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/sfparse -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/sfparse --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/sfparse help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/xmlparse -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/xmlparse --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/xmlparse help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.HTMLLinker-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.HTMLLinker-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.HTMLLinker-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.HTMLLinker-wrapped -V` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.HTMLLinker-wrapped --version` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.cvtenc-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.cvtenc-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.cvtenc-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.defaults-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.defaults-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdnc-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped -V` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped -v` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped --version` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped version` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped -h` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped --help` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.gdomap-wrapped help` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.make_strings-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.make_strings-wrapped --help` and found version 1.25.1
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.pl-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.pl-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.pl-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.pldes-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.pldes-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.pldes-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plmerge-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plmerge-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plmerge-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plparse-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plparse-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plparse-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plser-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plser-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.plser-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.sfparse-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.sfparse-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.sfparse-wrapped help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.xmlparse-wrapped -h` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.xmlparse-wrapped --help` got 0 exit code
- ran `/nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1/bin/.xmlparse-wrapped help` got 0 exit code
- found 1.25.1 with grep in /nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1
- found 1.25.1 in filename of file in /nix/store/2r2d8ah4kwyz7xzsidhj35qqzz04cay9-gnustep-base-1.25.1
- directory tree listing: https://gist.github.com/c986015538b421054f0bb49a5b5bf2ca
---
 pkgs/desktops/gnustep/base/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix
index 4d9f763acc4..40c79274aae 100644
--- a/pkgs/desktops/gnustep/base/default.nix
+++ b/pkgs/desktops/gnustep/base/default.nix
@@ -11,13 +11,13 @@
 , pkgconfig, portaudio
 }:
 let
-  version = "1.24.9";
+  version = "1.25.1";
 in
 gsmakeDerivation {
   name = "gnustep-base-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz";
-    sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585";
+    sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj";
   };
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [

From 127045d8e0a9481084649567c1520468582e3f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 10:31:35 +0100
Subject: [PATCH 1505/2266] pythonPackages.slimit: init at 0.8.1

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

diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix
new file mode 100644
index 00000000000..ff4c63891e5
--- /dev/null
+++ b/pkgs/development/python-modules/slimit/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }:
+
+buildPythonPackage rec {
+  pname = "slimit";
+  version = "0.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b";
+  };
+
+  # Some patches from https://github.com/rspivak/slimit/pull/65
+  patches = lib.optionals isPy3k [
+    (fetchpatch {
+      url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch;
+      sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5";
+    })
+    (fetchpatch {
+      url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch;
+      sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni";
+    })
+  ];
+
+  propagatedBuildInputs = [ ply ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s src/slimit
+  '';
+
+  meta = with lib; {
+    description = "JavaScript minifier";
+    homepage = http://slimit.readthedocs.org/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5e3f96d849..96d3cd2f75e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15021,6 +15021,8 @@ in {
     };
   };
 
+  slimit = callPackage ../development/python-modules/slimit { };
+
   slob = buildPythonPackage rec {
     name = "slob-unstable-2016-11-03";
 

From 564b218ef5ed500532203215ecd9efb98558c957 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 03:13:31 -0700
Subject: [PATCH 1506/2266] gnustep.gorm: 1.2.22 -> 1.2.23

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.2.23 with grep in /nix/store/x5gjxvy65qxjln9hrv42f7ki1d60qjds-gorm-1.2.23
- found 1.2.23 in filename of file in /nix/store/x5gjxvy65qxjln9hrv42f7ki1d60qjds-gorm-1.2.23
- directory tree listing: https://gist.github.com/1ae30a61c919a26161284bdb24b06d7d
---
 pkgs/desktops/gnustep/gorm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix
index 5075ec5500c..9f1b0ef47fe 100644
--- a/pkgs/desktops/gnustep/gorm/default.nix
+++ b/pkgs/desktops/gnustep/gorm/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, base, back, gsmakeDerivation, gui }:
 let
-  version = "1.2.22";
+  version = "1.2.23";
 in
 gsmakeDerivation {
   name = "gorm-${version}";
   
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
-    sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi";
+    sha256 = "18pf9vvzvdk8bg4lhjb96y1kdkmb9ahmvrqv2581vn45pjxmmlnb";
   };
   buildInputs = [ base back gui ];
 

From 47bbd819c78b6966165b5a35050191e5700e8460 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 13:34:06 +0100
Subject: [PATCH 1507/2266] haskell-configuration-common: disable some tests
 depending on tasty-hunit-0.9

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 47768b948ff..6153c68a0dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -463,6 +463,11 @@ self: super: {
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
 
+  # Test suite won't compile against tasty-hunit 0.10.x.
+  binary-parser = dontCheck super.binary-parser;
+  bytestring-strict-builder = dontCheck super.bytestring-strict-builder;
+  bytestring-tree-builder = dontCheck super.bytestring-tree-builder;
+
   # https://github.com/ndmitchell/shake/issues/206
   # https://github.com/ndmitchell/shake/issues/267
   shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });

From 7e44f19fceaae77422b04f74407f600c404e8ab2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Mar 2018 13:41:38 +0100
Subject: [PATCH 1508/2266] zstd: Fix install name on macOS

It had an install name '/usr/local/lib/libzstd.1.dylib'.
---
 pkgs/tools/compression/zstd/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 457170013ce..6617a4346e5 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, gnugrep
+, fixDarwinDylibNames
 , legacySupport ? false }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +13,8 @@ stdenv.mkDerivation rec {
     owner = "facebook";
   };
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
   makeFlags = [
     "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}"
   ];

From 54d16c1075d99b7bbe4dc3e32ad769d06fb2f95a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 06:02:04 -0700
Subject: [PATCH 1509/2266] ibus-engines.table: 1.9.16 -> 1.9.18

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18/bin/ibus-table-createdb -h` got 0 exit code
- ran `/nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18/bin/ibus-table-createdb --help` got 0 exit code
- found 1.9.18 with grep in /nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18
- directory tree listing: https://gist.github.com/8f2d6146d5348401ca9117762e2befbc
---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 8c552799432..04a0a1e36db 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
-  version = "1.9.16";
+  version = "1.9.18";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb";
+    sha256 = "0isxgz7f6xhrcv5qrdd6gm3ysmqp3mi5ngnbqz08f7pclllaridp";
   };
 
   postPatch = ''

From 9aa22191cf38df2c99ef79c505f6e7d85a16adb8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Mar 2018 08:10:08 -0500
Subject: [PATCH 1510/2266] python*: set thread stack size on musl

Ensure recursion limit is reached before stack overflow.

Python does this for OSX and BSD:
https://github.com/python/cpython/blob/13ff24582c99dfb439b1af7295b401415e7eb05b/Python/thread_pthread.h#L22

Size of 1MB chosen to match value in Alpine:
https://git.alpinelinux.org/cgit/aports/commit/main/python2/APKBUILD?id=2f35283fec8ec451fe5fb477dd32ffdcc0776e89

Manual testing via Alpine's test-stacksize.py crashes on these
previously, and works with these changes.
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++-
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 3 +++
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 3 +++
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index a934d6c3bcf..98e5b4b1da0 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -176,7 +176,8 @@ in stdenv.mkDerivation {
     LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
     inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
-    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
+    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"
+      + optionalString hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";
     DETERMINISTIC_BUILD = 1;
 
     setupHook = python-setup-hook sitePackages;
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index d4391d873af..797a5be40ff 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -105,6 +105,9 @@ in stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''
+     + optionalString stdenv.hostPlatform.isMusl ''
+      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
      ''}
   '';
 
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 4f9e79c1d5f..6dbf9a09cf5 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -99,6 +99,9 @@ in stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''
+     + optionalString stdenv.hostPlatform.isMusl ''
+      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
      ''}
   '';
 
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 317a335b344..63a70b7496d 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -122,6 +122,9 @@ in stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''
+     + optionalString stdenv.hostPlatform.isMusl ''
+      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
      ''}
   '';
 

From b651d55dc3e278bd212bdb02b6292ac0f0d02b0c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 06:16:40 -0700
Subject: [PATCH 1511/2266] ibus-engines.table-others: 1.3.7 -> 1.3.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.9 with grep in /nix/store/xjlb70932y0prqlw4p7iizbffm89pi7a-ibus-table-others-1.3.9
- directory tree listing: https://gist.github.com/aafa62fbd6afde2d7ca2d96e39eaa850
---
 .../inputmethods/ibus-engines/ibus-table-others/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 328c803e7db..ff01c841926 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-table-others-${version}";
-  version = "1.3.7";
+  version = "1.3.9";
 
   src = fetchurl {
     url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx";
+    sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From de0ea1dd18e77733e604a972d7fc88bba4a069b2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 20 Mar 2018 09:37:59 -0400
Subject: [PATCH 1512/2266] scala: 2.12.4 -> 2.12.5

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 7622fbb9d18..bfbd9d05d05 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.4";
+  name = "scala-2.12.5";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "089a54qj8psh4jxqbrrwk5zahw13fyqq24l87s3031xa675a0m4m";
+    sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 497e50cf161f2873490e19ae392553f6d2bdcac3 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Wed, 21 Mar 2018 01:45:19 +1100
Subject: [PATCH 1513/2266] emscripten: use matching binaryen version (#37427)

This changes the emscripten package so that it specifies the rev from
the binaryen repo to use, and sets it to always use the version that has
been tagged for use with that version of emscripten.  This should force
future updates of emscripten to also update binaryen.

Binaryen can also be installed as a stand-alone package, so there's some
logic added to the binaryen package to allow building in both ways, and
distinguishing between them.
---
 .../compilers/binaryen/default.nix            | 25 ++++++++++++++++---
 .../compilers/emscripten/default.nix          |  3 ++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 2b3919160e4..2c2869f76e7 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,14 +1,31 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }:
+
+let
+  defaultVersion = "44";
+
+  # Map from git revs to SHA256 hashes
+  sha256s = {
+    "version_44" = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
+    "1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
+  };
+in
 
 stdenv.mkDerivation rec {
-  version = "44";
-  rev = "version_${version}";
+  version = if emscriptenRev == null
+            then defaultVersion
+            else "emscripten-${emscriptenRev}";
+  rev = if emscriptenRev == null
+        then "version_${version}"
+        else emscriptenRev;
   name = "binaryen-${version}";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "binaryen";
-    sha256 = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
+    sha256 =
+      if builtins.hasAttr rev sha256s
+      then builtins.getAttr rev sha256s
+      else null;
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ac972c99a95..8e268aa7eb7 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -5,6 +5,7 @@
 let
   rev = emscriptenVersion;
   appdir = "share/emscripten";
+  binaryenVersioned = binaryen.override { emscriptenRev = rev; };
 in
 
 stdenv.mkDerivation {
@@ -44,7 +45,7 @@ stdenv.mkDerivation {
     echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
   ''
   + stdenv.lib.optionalString enableWasm ''
-    echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config
+    echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config
   ''
   +
   ''

From d3396058317d5a0d72685458ee743e3b324d3e53 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 08:18:38 -0700
Subject: [PATCH 1514/2266] jsonnet: 0.9.5 -> 0.10.0 (#37455)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet -h` got 0 exit code
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet --help` got 0 exit code
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet -v` and found version 0.10.0
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet --version` and found version 0.10.0
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet -h` and found version 0.10.0
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet --help` and found version 0.10.0
- found 0.10.0 with grep in /nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0
- directory tree listing: https://gist.github.com/9a4279146abdaa645fdcd5481889e783
---
 pkgs/development/compilers/jsonnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index d4664673306..839e3e71e81 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, emscripten }:
 
-let version = "0.9.5"; in
+let version = "0.10.0"; in
 
 stdenv.mkDerivation {
   name = "jsonnet-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "193sa4hdhvml0c32nmdkjii41hbyc5l0zisdn699ar0gaq7yiqan";
+    sha256 = "0xj540140r89qrdh3h4kzlz4x8c576ynq9i1x82zzl3d7fxbk5f0";
   };
 
   buildInputs = [ emscripten ];

From 61d4538812f12a46acc24693e71fcbe5d9c44f1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 18:03:00 +0100
Subject: [PATCH 1515/2266] LTS Haskell 11.1

This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6aec0b311cc2d5685d1d55c277148c9bfe1580da.
---
 .../configuration-hackage2nix.yaml            |  218 +-
 .../haskell-modules/hackage-packages.nix      | 4035 ++++++++---------
 2 files changed, 1879 insertions(+), 2374 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 24a96299635..901d49a4fae 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.0
+  # LTS Haskell 11.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -60,7 +60,7 @@ default-package-overrides:
   - active ==0.2.0.13
   - ad ==4.3.5
   - adjunctions ==4.4
-  - adler32 ==0.1.1.0
+  - adler32 ==0.1.2.0
   - aern2-mp ==0.1.2.0
   - aern2-real ==0.1.1.0
   - aeson ==1.2.4.0
@@ -71,10 +71,10 @@ default-package-overrides:
   - aeson-extra ==0.4.1.0
   - aeson-generic-compat ==0.0.1.1
   - aeson-injector ==1.1.0.0
-  - aeson-picker ==0.1.0.3
+  - aeson-picker ==0.1.0.4
   - aeson-pretty ==0.8.5
   - aeson-qq ==0.8.2
-  - aeson-typescript ==0.1.0.3
+  - aeson-typescript ==0.1.0.6
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
   - Agda ==2.5.3
@@ -108,7 +108,7 @@ default-package-overrides:
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
-  - asciidiagram ==1.3.3
+  - asciidiagram ==1.3.3.1
   - ascii-progress ==0.3.3.0
   - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
@@ -136,11 +136,11 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.4
+  - autoexporter ==1.1.9
   - auto-update ==0.1.4
   - avwx ==0.3.0.2
   - axiom ==0.4.6
-  - b9 ==0.5.35
+  - b9 ==0.5.41
   - backprop ==0.1.3.0
   - bank-holidays-england ==0.1.0.6
   - barrier ==0.1.1
@@ -205,7 +205,7 @@ default-package-overrides:
   - blas-hs ==0.1.1.0
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
-  - blaze-builder ==0.4.0.2
+  - blaze-builder ==0.4.1.0
   - blaze-html ==0.9.0.1
   - blaze-markup ==0.8.2.0
   - blaze-svg ==0.3.6.1
@@ -230,6 +230,7 @@ default-package-overrides:
   - brick ==0.34.1
   - brittany ==0.9.0.1
   - broadcast-chan ==0.1.1
+  - bsb-http-chunked ==0.0.0.2
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
@@ -266,7 +267,7 @@ default-package-overrides:
   - carray ==0.1.6.8
   - cartel ==0.18.0.2
   - cased ==0.1.0.0
-  - case-insensitive ==1.2.0.10
+  - case-insensitive ==1.2.0.11
   - cases ==0.1.3.2
   - casing ==0.1.2.1
   - cassava ==0.5.1.0
@@ -316,7 +317,7 @@ default-package-overrides:
   - clr-host ==0.2.0.1
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
-  - ClustalParser ==1.2.2
+  - ClustalParser ==1.2.3
   - cmark ==0.5.6
   - cmark-gfm ==0.1.3
   - cmark-highlight ==0.2.0.0
@@ -345,12 +346,13 @@ default-package-overrides:
   - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.4.0.2
-  - concurrent-extra ==0.7.0.11
-  - concurrent-output ==1.10.4
+  - concurrent-extra ==0.7.0.12
+  - concurrent-output ==1.10.5
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0
+  - conduit ==1.3.0.1
+  - conduit-algorithms ==0.0.8.0
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
   - conduit-extra ==1.3.0
@@ -358,7 +360,7 @@ default-package-overrides:
   - conduit-throttle ==0.3.1.0
   - ConfigFile ==1.1.4
   - config-ini ==0.2.2.0
-  - configuration-tools ==0.3.0
+  - configuration-tools ==0.3.1
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.8
@@ -393,7 +395,7 @@ default-package-overrides:
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
   - cryptocompare ==0.1.1
-  - crypto-enigma ==0.0.2.10
+  - crypto-enigma ==0.0.2.11
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -414,15 +416,15 @@ default-package-overrides:
   - csv-conduit ==0.6.8.1
   - ctrie ==0.2
   - cubicspline ==0.1.2
-  - cublas ==0.4.0.0
-  - cuda ==0.9.0.2
+  - cublas ==0.4.0.1
+  - cuda ==0.9.0.3
   - cue-sheet ==1.0.1
   - cufft ==0.8.0.0
   - curl ==1.3.8
   - curl-runnings ==0.2.0
   - currencies ==0.1.1.1
-  - cusolver ==0.1.0.0
-  - cusparse ==0.1.0.0
+  - cusolver ==0.1.0.1
+  - cusparse ==0.1.0.1
   - cutter ==0.0
   - czipwith ==1.0.0.0
   - data-accessor ==0.2.2.7
@@ -468,13 +470,14 @@ default-package-overrides:
   - debug ==0.1
   - Decimal ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.3.1.0
+  - dejafu ==1.3.2.0
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2
   - deriving-compat ==0.4.1
   - descriptive ==0.9.4
+  - dhall ==1.11.1
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
@@ -506,17 +509,17 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.2
-  - docker ==0.5.1.0
-  - docker-build-cacher ==1.9.1
+  - docker ==0.5.1.1
+  - docker-build-cacher ==1.9.2
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
-  - doctemplates ==0.2.2
+  - doctemplates ==0.2.2.1
   - doctest ==0.13.0
   - doctest-discover ==0.1.0.7
   - doctest-driver-gen ==0.2.0.0
   - do-list ==1.0.1
   - dom-parser ==3.0.0
-  - dotenv ==0.5.2.3
+  - dotenv ==0.5.2.4
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
@@ -529,7 +532,7 @@ default-package-overrides:
   - dvorak ==0.1.0.0
   - dynamic-state ==0.3
   - dyre ==0.8.12
-  - Earley ==0.12.0.1
+  - Earley ==0.12.1.0
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
@@ -550,8 +553,9 @@ default-package-overrides:
   - eliminators ==0.3
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
+  - elm-export-persistent ==0.2.0
   - emailaddress ==0.2.0.0
-  - email-validate ==2.3.2.3
+  - email-validate ==2.3.2.5
   - enclosed-exceptions ==1.0.2
   - entropy ==0.3.8
   - enummapset ==0.5.2.1
@@ -564,7 +568,7 @@ default-package-overrides:
   - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
-  - errors ==2.2.4
+  - errors ==2.2.5
   - errors-ext ==0.4.1
   - error-util ==0.0.1.2
   - ersatz ==0.4.2
@@ -595,7 +599,7 @@ default-package-overrides:
   - exhaustive ==1.1.5
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
-  - exp-pairs ==0.1.5.2
+  - exp-pairs ==0.1.6.0
   - extensible ==0.4.8
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
@@ -644,7 +648,7 @@ default-package-overrides:
   - fmt ==0.5.0.0
   - fn ==0.3.0.2
   - focus ==0.1.5.2
-  - fold-debounce ==0.2.0.6
+  - fold-debounce ==0.2.0.7
   - fold-debounce-conduit ==0.2.0.0
   - foldl ==1.3.7
   - folds ==0.7.4
@@ -655,7 +659,7 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.3.0
+  - formatting ==6.3.1
   - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
@@ -665,7 +669,7 @@ default-package-overrides:
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
   - friday ==0.2.3.1
-  - friday-juicypixels ==0.1.2.3
+  - friday-juicypixels ==0.1.2.4
   - friendly-time ==0.4.1
   - frisby ==0.2.2
   - from-sum ==0.2.1.0
@@ -688,7 +692,7 @@ default-package-overrides:
   - generic-lens ==0.5.1.0
   - GenericPretty ==1.2.2
   - generic-random ==1.1.0.2
-  - generics-eot ==0.2.1.1
+  - generics-eot ==0.2.1.2
   - generics-sop ==0.3.2.0
   - generics-sop-lens ==0.1.2.1
   - generic-xmlpickler ==0.1.0.5
@@ -698,7 +702,7 @@ default-package-overrides:
   - genvalidity-bytestring ==0.1.0.0
   - genvalidity-containers ==0.3.0.0
   - genvalidity-hspec ==0.5.0.0
-  - genvalidity-hspec-aeson ==0.1.0.1
+  - genvalidity-hspec-aeson ==0.1.0.2
   - genvalidity-hspec-binary ==0.1.0.0
   - genvalidity-hspec-cereal ==0.1.0.0
   - genvalidity-hspec-hashable ==0.1.0.0
@@ -713,20 +717,20 @@ default-package-overrides:
   - getopt-generics ==0.13.0.1
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
-  - ghc-events ==0.7.1
+  - ghc-events ==0.7.2
   - ghc-exactprint ==0.5.6.1
   - ghcid ==0.6.10
   - ghcjs-base-stub ==0.1.0.4
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-perch ==0.3.3.2
-  - ghc-parser ==0.2.0.1
+  - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.1
   - ghc-syb-utils ==0.2.3.3
-  - ghc-tcplugins-extra ==0.2.2
+  - ghc-tcplugins-extra ==0.2.4
   - ghc-typelits-extra ==0.2.4
-  - ghc-typelits-knownnat ==0.4
-  - ghc-typelits-natnormalise ==0.5.8
+  - ghc-typelits-knownnat ==0.4.1
+  - ghc-typelits-natnormalise ==0.5.9
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.15
@@ -779,7 +783,7 @@ default-package-overrides:
   - groundhog-sqlite ==0.8.0.1
   - groundhog-th ==0.8.0.2
   - group-by-date ==0.1.0.2
-  - grouped-list ==0.2.1.5
+  - grouped-list ==0.2.2.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.3.1
   - H ==0.9.0.1
@@ -816,14 +820,14 @@ default-package-overrides:
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.4.0
   - haskell-spacegoo ==0.2.0.1
-  - haskell-src ==1.0.2.0
+  - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.2
   - haskell-src-exts-util ==0.2.2
   - haskell-src-meta ==0.8.0.2
   - haskell-tools-ast ==1.0.1.1
   - haskell-tools-backend-ghc ==1.0.1.1
   - haskell-tools-prettyprint ==1.0.1.1
-  - haskell-tools-refactor ==1.0.1.1
+  - haskell-tools-refactor ==1.0.1.2
   - haskell-tools-rewrite ==1.0.1.1
   - haskintex ==0.8.0.0
   - hasmin ==1.0.1
@@ -849,14 +853,14 @@ default-package-overrides:
   - heaps ==0.3.6
   - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
-  - hedgehog ==0.5.2
+  - hedgehog ==0.5.3
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.10.0
+  - hedis ==0.10.1
   - heist ==1.0.1.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - herms ==1.8.1.4
-  - heterocephalus ==1.0.5.1
+  - heterocephalus ==1.0.5.2
   - hex ==0.1.2
   - hexml ==0.3.3
   - hexml-lens ==0.2.1
@@ -892,7 +896,7 @@ default-package-overrides:
   - hmatrix-vector-sized ==0.1.1.0
   - hmpfr ==0.4.4
   - hocilib ==0.2.0
-  - Hoed ==0.5.0
+  - Hoed ==0.5.1
   - hOpenPGP ==2.6
   - hopfli ==0.2.2.1
   - hosc ==0.16
@@ -958,7 +962,7 @@ default-package-overrides:
   - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
-  - hsyslog-udp ==0.2.1
+  - hsyslog-udp ==0.2.2
   - htaglib ==1.1.1
   - HTF ==0.13.2.2
   - html ==1.0.1.2
@@ -966,10 +970,10 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.10
+  - HTTP ==4000.3.11
   - http2 ==1.6.3
   - http-api-data ==0.3.7.2
-  - http-client ==0.5.10
+  - http-client ==0.5.11
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
@@ -977,7 +981,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
-  - http-reverse-proxy ==0.5.0
+  - http-reverse-proxy ==0.5.0.1
   - http-streams ==0.8.5.5
   - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
@@ -992,7 +996,7 @@ default-package-overrides:
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
   - hw-fingertree ==0.1.0.0
-  - hw-fingertree-strict ==0.1.0.0
+  - hw-fingertree-strict ==0.1.0.1
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.2
   - hw-int ==0.0.0.3
@@ -1025,7 +1029,7 @@ default-package-overrides:
   - if ==0.1.0.0
   - iff ==0.0.6
   - ignore ==0.1.1.0
-  - ihaskell ==0.9.0.2
+  - ihaskell ==0.9.0.3
   - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
@@ -1058,7 +1062,7 @@ default-package-overrides:
   - intervals ==0.8.1
   - intro ==0.3.1.0
   - invariant ==0.5
-  - invertible ==0.2.0.3
+  - invertible ==0.2.0.4
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1069,10 +1073,10 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.0.2
   - ip ==1.1.2
   - ip6addr ==0.5.3
-  - iproute ==1.7.2
+  - iproute ==1.7.3
   - IPv6Addr ==1.0.1
   - IPv6DB ==0.2.5
-  - ipython-kernel ==0.9.0.1
+  - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
   - irc-client ==1.1.0.2
   - irc-conduit ==0.3.0.1
@@ -1103,7 +1107,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.3
   - json-schema ==0.7.4.1
   - json-stream ==0.4.2.0
-  - JuicyPixels ==3.2.9.4
+  - JuicyPixels ==3.2.9.5
   - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.1.2
   - justified-containers ==0.3.0.0
@@ -1112,7 +1116,7 @@ default-package-overrides:
   - jvm-streaming ==0.3.1
   - jwt ==0.7.2
   - kan-extensions ==5.1
-  - kanji ==3.1.0
+  - kanji ==3.1.0.1
   - katydid ==0.1.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
@@ -1136,7 +1140,7 @@ default-package-overrides:
   - language-glsl ==0.2.1
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
-  - language-javascript ==0.6.0.10
+  - language-javascript ==0.6.0.11
   - lapack-carray ==0.0.1
   - lapack-ffi ==0.0.1
   - lapack-ffi-tools ==0.1
@@ -1160,7 +1164,7 @@ default-package-overrides:
   - lens-properties ==4.11.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
-  - lentil ==1.0.10.0
+  - lentil ==1.0.10.1
   - leveldb-haskell ==0.6.5
   - lexer-applicative ==2.1.0.1
   - libffi ==0.1
@@ -1174,7 +1178,7 @@ default-package-overrides:
   - LibZip ==1.0.1
   - licensor ==0.2.2
   - lifted-async ==0.9.3.3
-  - lifted-base ==0.2.3.11
+  - lifted-base ==0.2.3.12
   - lift-generics ==0.1.2
   - line ==4.0.1
   - linear ==1.20.7
@@ -1210,7 +1214,7 @@ default-package-overrides:
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
-  - lucid ==2.9.9
+  - lucid ==2.9.10
   - lxd-client ==0.1.0.6
   - lxd-client-config ==0.1.0.1
   - lzma ==0.0.0.3
@@ -1225,12 +1229,12 @@ default-package-overrides:
   - mandrill ==0.5.3.3
   - mapquest-api ==0.3.1
   - map-syntax ==0.2.0.2
-  - markdown ==0.1.16
+  - markdown ==0.1.17
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - markup ==4.0.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.1.1.0
+  - massiv ==0.1.2.0
   - massiv-io ==0.1.1.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1298,9 +1302,9 @@ default-package-overrides:
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monadloc ==0.7.1
-  - monad-logger ==0.3.28.1
+  - monad-logger ==0.3.28.2
   - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.8
+  - monad-logger-prefix ==0.1.9
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
@@ -1322,10 +1326,10 @@ default-package-overrides:
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.3.0.4
+  - mongoDB ==2.3.0.5
   - monoidal-containers ==0.3.1.0
   - monoid-extras ==0.4.2
-  - monoid-subclasses ==0.4.4
+  - monoid-subclasses ==0.4.6
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
@@ -1387,7 +1391,7 @@ default-package-overrides:
   - network-transport-tests ==0.2.4.2
   - network-uri ==2.6.1.0
   - newtype ==0.2
-  - newtype-generics ==0.5.2.1
+  - newtype-generics ==0.5.2.2
   - next-ref ==0.1.0.2
   - nfc ==0.1.0
   - nicify-lib ==1.0.1
@@ -1402,7 +1406,7 @@ default-package-overrides:
   - normalization-insensitive ==2.0.1
   - NoTrace ==0.3.0.2
   - nsis ==0.3.2
-  - n-tuple ==0.0.1.1
+  - n-tuple ==0.0.2.0
   - numbers ==3000.2.0.1
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3
@@ -1410,7 +1414,7 @@ default-package-overrides:
   - numhask-range ==0.1.3.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - nvvm ==0.8.0.2
+  - nvvm ==0.8.0.3
   - oauthenticated ==0.2.1.0
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
@@ -1492,7 +1496,7 @@ default-package-overrides:
   - pem ==0.2.4
   - perf ==0.3.1.1
   - perfect-hash-generator ==0.2.0.6
-  - persistable-record ==0.6.0.1
+  - persistable-record ==0.6.0.2
   - persistable-types-HDBC-pg ==0.0.1.5
   - persistent ==2.8.1
   - persistent-mongoDB ==2.8.0
@@ -1512,7 +1516,7 @@ default-package-overrides:
   - pid1 ==0.1.2.0
   - pinboard ==0.9.12.9
   - pinch ==0.3.2.0
-  - pipes ==4.3.8
+  - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
@@ -1528,7 +1532,7 @@ default-package-overrides:
   - pipes-network ==0.6.4.1
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.4
-  - pipes-safe ==2.2.6
+  - pipes-safe ==2.2.9
   - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
   - pixelated-avatar-generator ==0.1.3
@@ -1608,14 +1612,14 @@ default-package-overrides:
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
-  - psqueues ==0.2.5.0
+  - psqueues ==0.2.6.0
   - pthread ==0.2.0
   - publicsuffix ==0.20171229
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
-  - pushbullet-types ==0.4.0.2
-  - pusher-http-haskell ==1.5.1.2
+  - pushbullet-types ==0.4.1.0
+  - pusher-http-haskell ==1.5.1.3
   - pwstore-fast ==2.4.4
   - qchas ==1.1.0.0
   - qm-interpolated-string ==0.3.0.0
@@ -1647,10 +1651,10 @@ default-package-overrides:
   - random-tree ==0.6.0.5
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.4.0
-  - rank2classes ==1.0.1
+  - rank2classes ==1.0.2
   - rank-product ==0.2.0.1
-  - Rasterific ==0.7.2.1
-  - rasterific-svg ==0.3.3
+  - Rasterific ==0.7.2.3
+  - rasterific-svg ==0.3.3.1
   - ratel ==1.0.2
   - ratel-wai ==1.0.1
   - ratio-int ==0.1.2
@@ -1727,7 +1731,7 @@ default-package-overrides:
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
   - safe ==0.3.17
-  - safecopy ==0.9.4
+  - safecopy ==0.9.4.1
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safeio ==0.0.5.0
@@ -1739,13 +1743,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.9
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.5.2
+  - scientific ==0.3.5.3
   - scotty ==0.11.0
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1804,10 +1808,10 @@ default-package-overrides:
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
-  - setlocale ==1.0.0.5
+  - setlocale ==1.0.0.6
   - set-monad ==0.2.0.0
   - sets ==0.0.5.2
-  - SHA ==1.6.4.2
+  - SHA ==1.6.4.4
   - shake ==0.16.3
   - shake-language-c ==0.11.0
   - shakespeare ==2.0.15
@@ -1822,7 +1826,7 @@ default-package-overrides:
   - silently ==1.2.5
   - simple ==0.11.2
   - simple-log ==0.9.3
-  - simple-reflect ==0.3.2
+  - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
@@ -1844,9 +1848,9 @@ default-package-overrides:
   - snap-core ==1.0.3.1
   - snap-server ==1.0.3.3
   - snowflake ==0.1.1.1
-  - soap ==0.2.3.5
+  - soap ==0.2.3.6
   - soap-openssl ==0.1.0.2
-  - soap-tls ==0.1.1.2
+  - soap-tls ==0.1.1.4
   - socket ==0.8.0.1
   - socket-activation ==0.1.0.2
   - socks ==0.5.6
@@ -1886,7 +1890,7 @@ default-package-overrides:
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
   - stateWriter ==0.2.10
-  - static-text ==0.2
+  - static-text ==0.2.0.1
   - statistics ==0.14.0.2
   - stb-image-redux ==0.2.1.2
   - stitch ==0.5.0.0
@@ -1900,7 +1904,7 @@ default-package-overrides:
   - stm-split ==0.0.2
   - stm-stats ==0.2.0.0
   - stm-supply ==0.2.0.0
-  - stopwatch ==0.1.0.4
+  - stopwatch ==0.1.0.5
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.4
@@ -1909,7 +1913,7 @@ default-package-overrides:
   - store ==0.4.3.2
   - store-core ==0.4.1
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.19.0
+  - stratosphere ==0.19.1
   - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
@@ -1936,7 +1940,7 @@ default-package-overrides:
   - sundown ==0.6
   - superbuffer ==0.3.1.1
   - svg-builder ==0.1.0.2
-  - svg-tree ==0.6.2.1
+  - svg-tree ==0.6.2.2
   - swagger ==0.3.0
   - swagger2 ==2.2
   - swish ==0.9.2.0
@@ -1964,7 +1968,7 @@ default-package-overrides:
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==1.1.0.1
   - tasty-discover ==4.2.0
-  - tasty-expected-failure ==0.11.1
+  - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
   - tasty-hspec ==1.1.3.3
@@ -2015,7 +2019,7 @@ default-package-overrides:
   - text-region ==0.3.0.0
   - text-short ==0.1.2
   - text-show ==3.7.2
-  - text-show-instances ==3.6.2
+  - text-show-instances ==3.6.3
   - text-zipper ==0.10.1
   - tfp ==1.0.0.2
   - tf-random ==0.5
@@ -2030,7 +2034,7 @@ default-package-overrides:
   - th-orphans ==0.13.5
   - thread-hierarchy ==0.3.0.0
   - thread-local-storage ==0.1.2
-  - threads ==0.5.1.5
+  - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-editors ==0.5.6
   - threepenny-gui ==0.8.2.2
@@ -2057,8 +2061,8 @@ default-package-overrides:
   - time-parsers ==0.1.2.0
   - timerep ==2.0.0.2
   - timespan ==0.3.0.0
-  - timezone-olson ==0.1.8
-  - timezone-series ==0.1.8
+  - timezone-olson ==0.1.9
+  - timezone-series ==0.1.9
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
   - titlecase ==1.0.1
@@ -2067,7 +2071,7 @@ default-package-overrides:
   - tls-debug ==0.4.5
   - tls-session-manager ==0.0.0.2
   - tmapchan ==0.0.3
-  - tmapmvar ==0.0.3
+  - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.1.1
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
@@ -2082,7 +2086,7 @@ default-package-overrides:
   - traverse-with-class ==1.0.0.0
   - tree-diff ==0.0.1
   - tree-fun ==0.8.1.0
-  - tries ==0.0.4.2
+  - tries ==0.0.5
   - trifecta ==1.7.1.1
   - triplesec ==0.1.2.0
   - true-name ==0.1.0.3
@@ -2091,7 +2095,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.5
+  - turtle ==1.5.6
   - turtle-options ==0.1.0.4
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
@@ -2127,8 +2131,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - Unique ==0.4.7.2
   - unique ==0
+  - Unique ==0.4.7.2
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2141,14 +2145,14 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.4.0
+  - unliftio ==0.2.5.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
   - uri-bytestring ==0.3.1.1
-  - uri-bytestring-aeson ==0.1.0.5
+  - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
   - urlpath ==8.0.1
@@ -2231,7 +2235,7 @@ default-package-overrides:
   - warp ==3.2.18.1
   - warp-tls ==3.2.4.2
   - wave ==0.1.5
-  - wavefront ==0.7.1.1
+  - wavefront ==0.7.1.2
   - webdriver ==0.8.5
   - webdriver-angular ==0.1.11
   - webpage ==0.0.5
@@ -2243,14 +2247,14 @@ default-package-overrides:
   - web-routes-th ==0.22.6.2
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.3.1
+  - websockets ==0.12.4.0
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.4
   - weigh ==0.0.7
-  - wide-word ==0.1.0.5
+  - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
-  - wild-bind ==0.1.1.0
+  - wild-bind ==0.1.1.1
   - wild-bind-x11 ==0.2.0.1
   - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
@@ -2291,11 +2295,11 @@ default-package-overrides:
   - x509-validation ==1.6.10
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.2
+  - xeno ==0.3.3
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
-  - xlsx ==0.7.0
+  - xlsx ==0.7.1
   - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5ebeed0405..be3d3ae673f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2957,23 +2957,6 @@ self: {
      }) {};
 
   "ClustalParser" = callPackage
-    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "ClustalParser";
-       version = "1.2.2";
-       sha256 = "1x6ag9knvc18pwvm3cdj936pn8k2nbd54n3ii44r7b7kjcb7cgk6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec text vector ];
-       executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec text ];
-       description = "Libary for parsing Clustal tools output";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "ClustalParser_1_2_3" = callPackage
     ({ mkDerivation, base, cmdargs, either-unwrap, hspec
      , hspec-discover, parsec, text, vector
      }:
@@ -2988,7 +2971,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover parsec text ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Coadjute" = callPackage
@@ -4684,27 +4666,6 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "Earley";
-       version = "0.12.0.1";
-       sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ListLike ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ListLike parsec
-       ];
-       description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Earley_0_12_1_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -4723,7 +4684,6 @@ self: {
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -8756,29 +8716,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.10";
-       sha256 = "12cy8yn06cm9xqcnvvk0s0yh6w67r6bxs8wn37q97y0b6fjiwdfj";
-       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_11" = 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
@@ -8799,7 +8736,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
@@ -9060,6 +8996,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HaTeX_3_19_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, matrix
+     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
+     , wl-pprint-extras
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.19.0.0";
+       sha256 = "0ja7w9l1pnf4pgbggr8cmsq0234cvsn75b9jzvd64jplhajpgn8z";
+       libraryHaskellDepends = [
+         base bytestring containers hashable matrix parsec QuickCheck text
+         transformers wl-pprint-extras
+       ];
+       testHaskellDepends = [
+         base parsec QuickCheck tasty tasty-quickcheck text
+       ];
+       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
+       description = "The Haskell LaTeX library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX-meta" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , haddock, haskell-src-exts, mtl, parsec
@@ -9826,32 +9784,6 @@ self: {
      }) {};
 
   "Hoed" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, cereal-text
-     , cereal-vector, clock, containers, deepseq, directory, hashable
-     , hashtables, libgraph, open-browser, primitive, process
-     , QuickCheck, regex-tdfa, regex-tdfa-text, semigroups, strict
-     , template-haskell, terminal-size, text, transformers, uniplate
-     , vector, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "Hoed";
-       version = "0.5.0";
-       sha256 = "1pj2scisdissbhlf6gn5bxqp09zvi5v7h8n7l3y1rirkqwwf74a8";
-       libraryHaskellDepends = [
-         array base bytestring cereal cereal-text cereal-vector clock
-         containers deepseq directory hashable hashtables libgraph
-         open-browser primitive process QuickCheck regex-tdfa
-         regex-tdfa-text semigroups strict template-haskell terminal-size
-         text transformers uniplate vector vector-th-unbox
-       ];
-       testHaskellDepends = [ base process QuickCheck ];
-       homepage = "https://github.com/MaartenFaddegon/Hoed";
-       description = "Lightweight algorithmic debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Hoed_0_5_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, cereal-text
      , cereal-vector, clock, containers, deepseq, directory, hashable
      , libgraph, open-browser, primitive, process, QuickCheck
@@ -10465,6 +10397,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_1_0_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "1.0.2";
+       sha256 = "09gb38m1fw0a1x8saldgsd5x58ycqirk8h6z8dqzpcd7vz23vayn";
+       libraryHaskellDepends = [
+         aeson attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/MichelBoucey/IPv6Addr";
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IPv6DB" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
@@ -10495,6 +10447,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IPv6DB_0_2_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
+     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
+     , optparse-applicative, text, unordered-containers, vector, wai
+     , wai-logger, warp
+     }:
+     mkDerivation {
+       pname = "IPv6DB";
+       version = "0.2.6";
+       sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
+         optparse-applicative text unordered-containers vector wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-types vector
+       ];
+       homepage = "http://ipv6db.cybervisible.com";
+       description = "A RESTful Web Service for IPv6-related data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10903,23 +10885,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.2.9.4";
-       sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       homepage = "https://github.com/Twinside/Juicy.Pixels";
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_2_9_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -10934,7 +10899,6 @@ self: {
        homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-blp" = callPackage
@@ -10944,8 +10908,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels-blp";
-       version = "0.1.0.0";
-       sha256 = "02hw885a47smwbnyk5fxvb44bdpaspsair9fmsj23sbp6f2wi0hk";
+       version = "0.1.0.1";
+       sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15778,23 +15742,6 @@ self: {
      }) {};
 
   "Rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
-     , free, JuicyPixels, mtl, primitive, transformers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "Rasterific";
-       version = "0.7.2.1";
-       sha256 = "0x2dyk72krfxwz2kk7w8cr8ws9imv7c2sgy1v4nsffjsb94qcvbz";
-       libraryHaskellDepends = [
-         base bytestring containers dlist FontyFruity free JuicyPixels mtl
-         primitive transformers vector vector-algorithms
-       ];
-       description = "A pure haskell drawing engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Rasterific_0_7_2_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
@@ -15809,7 +15756,6 @@ self: {
        ];
        description = "A pure haskell drawing engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReadArgs" = callPackage
@@ -16269,25 +16215,6 @@ self: {
      }) {};
 
   "SHA" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
-     , test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "SHA";
-       version = "1.6.4.2";
-       sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ array base binary bytestring ];
-       testHaskellDepends = [
-         array base binary bytestring QuickCheck test-framework
-         test-framework-quickcheck2
-       ];
-       description = "Implementations of the SHA suite of message digest functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "SHA_1_6_4_4" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, QuickCheck
      , test-framework, test-framework-quickcheck2
      }:
@@ -16304,7 +16231,6 @@ self: {
        ];
        description = "Implementations of the SHA suite of message digest functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SHA2" = callPackage
@@ -20420,6 +20346,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-arithmetic_1_0_0_1" = callPackage
+    ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "accelerate-arithmetic";
+       version = "1.0.0.1";
+       sha256 = "05hnbsccd8wm984zpkrkk7653rwml33rq3hymy2llzbi010jm82y";
+       libraryHaskellDepends = [
+         accelerate accelerate-utility base QuickCheck utility-ht
+       ];
+       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;
+     }) {};
+
   "accelerate-bignum" = callPackage
     ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm
      , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion
@@ -20634,6 +20580,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-fftw_1_0_0_1" = callPackage
+    ({ mkDerivation, accelerate, accelerate-io, base, carray, fft
+     , storable-complex
+     }:
+     mkDerivation {
+       pname = "accelerate-fftw";
+       version = "1.0.0.1";
+       sha256 = "1qakxrm0f61zb21awjvpiw5054p7lhrm9sa2bha4jfzksw9phypy";
+       libraryHaskellDepends = [
+         accelerate accelerate-io base carray fft storable-complex
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
+       description = "Accelerate frontend to the FFTW library (Fourier transform)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-fourier" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic
      , accelerate-llvm-native, accelerate-utility, base, containers
@@ -20660,6 +20623,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-fourier_1_0_0_5" = callPackage
+    ({ mkDerivation, accelerate, accelerate-arithmetic
+     , accelerate-llvm-native, accelerate-utility, base, containers
+     , criterion, QuickCheck, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "accelerate-fourier";
+       version = "1.0.0.5";
+       sha256 = "03bbs6k6mn76nsgjhi823mzmhl3fsgyqjqix9wsslj8jh2vg3kr8";
+       libraryHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-utility base containers
+         QuickCheck transformers utility-ht
+       ];
+       testHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-utility base QuickCheck
+         utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-llvm-native
+         accelerate-utility base criterion utility-ht
+       ];
+       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;
+     }) {};
+
   "accelerate-fourier-benchmark" = callPackage
     ({ mkDerivation, accelerate, accelerate-cuda, accelerate-cufft
      , accelerate-fftw, accelerate-fourier, base, criterion
@@ -20809,6 +20799,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-utility_1_0_0_1" = callPackage
+    ({ mkDerivation, accelerate, base, utility-ht }:
+     mkDerivation {
+       pname = "accelerate-utility";
+       version = "1.0.0.1";
+       sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh";
+       libraryHaskellDepends = [ accelerate base utility-ht ];
+       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;
+     }) {};
+
   "accentuateus" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, json, network, text }:
      mkDerivation {
@@ -21775,22 +21778,6 @@ self: {
      }) {};
 
   "adler32" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, zlib }:
-     mkDerivation {
-       pname = "adler32";
-       version = "0.1.1.0";
-       sha256 = "1v18d4xfbgqflx957xy6wiv7zhkgimpy85fy49d91p2ifkmbk32p";
-       revision = "1";
-       editedCabalFile = "087fykdlay78g9zg1w6a36xwd4pizcyi5wqzvj7cw5sh6gq493km";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/redneb/hs-adler32";
-       description = "An implementation of Adler-32, supporting rolling checksum operation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zlib;};
-
-  "adler32_0_1_2_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, zlib }:
      mkDerivation {
        pname = "adler32";
@@ -21802,7 +21789,6 @@ self: {
        homepage = "https://github.com/redneb/hs-adler32";
        description = "An implementation of Adler-32, supporting rolling checksum operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "adobe-swatch-exchange" = callPackage
@@ -22170,6 +22156,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.1.0";
        sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y";
+       revision = "1";
+       editedCabalFile = "0fqhf8prdgjskr3qpryx2pn5s78l9dpapm4kmghak0dxh90sfp33";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat
          bytestring containers deepseq exceptions hashable parsec
@@ -22291,12 +22279,17 @@ self: {
      }) {};
 
   "aeson-iproute" = callPackage
-    ({ mkDerivation, aeson, base, iproute, text }:
+    ({ mkDerivation, aeson, base, doctest, iproute, text
+     , unordered-containers
+     }:
      mkDerivation {
        pname = "aeson-iproute";
-       version = "0.1.2";
-       sha256 = "09l1q44869hl6pknrrkg7ccwfj4w3mhr3k43j9a7sg7961lnqnsz";
-       libraryHaskellDepends = [ aeson base iproute text ];
+       version = "0.2";
+       sha256 = "13r6vyyw1pbk5sz32ari5kig23vsg57a5pir037adi7xicrm6kgf";
+       libraryHaskellDepends = [
+         aeson base iproute text unordered-containers
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/greydot/aeson-iproute";
        description = "Aeson instances for iproute types";
        license = stdenv.lib.licenses.bsd3;
@@ -22381,19 +22374,6 @@ self: {
      }) {};
 
   "aeson-picker" = callPackage
-    ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
-     mkDerivation {
-       pname = "aeson-picker";
-       version = "0.1.0.3";
-       sha256 = "0ipkl5plyhbkld3i6jrlzy9y1kpvb69gy1nqb45rbnjbdxafslpk";
-       libraryHaskellDepends = [ aeson base lens lens-aeson text ];
-       testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/ozzzzz/aeson-picker#readme";
-       description = "Tiny library to get fields from JSON format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-picker_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
      mkDerivation {
        pname = "aeson-picker";
@@ -22404,7 +22384,6 @@ self: {
        homepage = "https://github.com/ozzzzz/aeson-picker#readme";
        description = "Tiny library to get fields from JSON format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-prefix" = callPackage
@@ -22646,31 +22625,6 @@ self: {
      }) {};
 
   "aeson-typescript" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml
-     , tasty-hspec, template-haskell, temporary, text, th-abstraction
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "aeson-typescript";
-       version = "0.1.0.3";
-       sha256 = "0f5s26fhkpcciqy5wcdsq123nzgcxf2dx9g2v0n9i6h3jkp5800b";
-       libraryHaskellDepends = [
-         aeson base containers interpolate mtl template-haskell text
-         th-abstraction unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath hspec
-         interpolate mtl process tasty tasty-ant-xml tasty-hspec
-         template-haskell temporary text th-abstraction unordered-containers
-       ];
-       homepage = "https://github.com/codedownio/aeson-typescript#readme";
-       description = "Generate TypeScript definition files from your ADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-typescript_0_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, hspec, interpolate, mtl, process, template-haskell
      , temporary, text, th-abstraction, unordered-containers
@@ -23339,8 +23293,8 @@ self: {
     ({ mkDerivation, base, c2hs, mtl, openal }:
      mkDerivation {
        pname = "al";
-       version = "0.1.4.1";
-       sha256 = "1mmka0cc9kl6s3sq6jgw82qk77psym2yibr922f6c3k3b528rr9h";
+       version = "0.1.4.2";
+       sha256 = "1lpcdh2dak1r9lwd6irjs8p56p1fjphq58ixwjwbg9syl2rz7w4b";
        libraryHaskellDepends = [ base mtl ];
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
@@ -26926,8 +26880,8 @@ self: {
      }:
      mkDerivation {
        pname = "ansi-terminal-game";
-       version = "0.2.0.0";
-       sha256 = "0lh3yhx5ylfi7m35p5kbnfh0vrcp2p7yrr6lxpfab6y0gs683snk";
+       version = "0.2.1.0";
+       sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27234,14 +27188,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs_0_3_0_0" = callPackage
+  "apecs_0_3_0_1" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.3.0.0";
-       sha256 = "0iir47vj8fgclppynav0skda7q91kw0nnw6pjr4cz6gz9ragh9wh";
+       version = "0.3.0.1";
+       sha256 = "04vqhkikyxgyzm61jlw21ycg3iv5fsx24q31a7gy5cxh5fqmw76k";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
@@ -28124,6 +28078,8 @@ self: {
        pname = "arbtt";
        version = "0.10";
        sha256 = "0klxsxyq4yij11c9z11jgrarmz1fya2rpx0zax7kqpvc26xbc24n";
+       revision = "1";
+       editedCabalFile = "13a0qvaqlaw6pcg4dizvs6p2g2kjabgznkl6789dw21nry2xqynb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29036,29 +28992,6 @@ self: {
      }) {};
 
   "asciidiagram" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
-     , rasterific-svg, svg-tree, text, vector
-     }:
-     mkDerivation {
-       pname = "asciidiagram";
-       version = "1.3.3";
-       sha256 = "062zcirgkjlypyzj7igjmhyisgs19svyzzqpmgy7vah8ykslhjb9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers FontyFruity JuicyPixels lens linear mtl
-         rasterific-svg svg-tree text vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath FontyFruity JuicyPixels
-         optparse-applicative rasterific-svg svg-tree text
-       ];
-       description = "Pretty rendering of Ascii diagram into svg or png";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "asciidiagram_1_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
      , rasterific-svg, svg-tree, text, vector
@@ -29079,7 +29012,6 @@ self: {
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asic" = callPackage
@@ -29761,8 +29693,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.5.0";
-       sha256 = "0dzswy71awgxqchb3ydq8idxlvqaalal45fx5prhr7xg4077apm0";
+       version = "0.4.6.0";
+       sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -30790,12 +30722,12 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "1.1.4";
-       sha256 = "08jkmh4zlgzp5wc6qivriqqf4n0ddh4wqffk3dpg8rsvj299648l";
+       version = "1.1.9";
+       sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
@@ -31991,39 +31923,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.35";
-       sha256 = "11j2mr03hn9xz7dq1p7kr448mdj1dva360xf6n7qmq3nq4vrl1av";
-       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_41" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -32053,7 +31952,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
@@ -32564,12 +32462,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_10_1_0" = callPackage
+  "base_4_11_0_0" = callPackage
     ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.10.1.0";
-       sha256 = "0hnzhqdf2bxz9slia67sym6s0hi5szh8596kcckighchs9jzl9wx";
+       version = "4.11.0.0";
+       sha256 = "1p18cm61ql911nqfld1kc7h6qpmhfxrf1xyahik180a7rbygbkq3";
        libraryHaskellDepends = [
          ghc-prim invalid-cabal-flag-settings rts
        ];
@@ -32633,8 +32531,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.10.1.0";
-       sha256 = "0nsgqfkxzp762i2c06lgpkza9a6a31aq5qx2cd820rpqg5yllbx2";
+       version = "4.11.0.0";
+       sha256 = "11q2cqy865q13hy2kc9k41cprdmlzh172prh5dhy3xp6zsbppjnh";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/hvr/base-noprelude";
@@ -33079,6 +32977,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "battleplace" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, data-default
+     , hashable, memory, servant, text, vector
+     }:
+     mkDerivation {
+       pname = "battleplace";
+       version = "0.1.0.0";
+       sha256 = "1p3dxz8a752wc6fmj6kip4gcwj77c96ic5wzlhgv670xsh4ac1qg";
+       libraryHaskellDepends = [
+         aeson base bytestring cereal data-default hashable memory servant
+         text vector
+       ];
+       description = "Core definitions for BattlePlace.io service";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "battleplace-api" = callPackage
+    ({ mkDerivation, base, battleplace, servant, servant-client }:
+     mkDerivation {
+       pname = "battleplace-api";
+       version = "0.1.0.0";
+       sha256 = "0hy1y5n064i7g2zknvj7yl7zw3bljqjrfr2sg68cmk9gkd854rlw";
+       libraryHaskellDepends = [
+         base battleplace servant servant-client
+       ];
+       description = "Public API definitions of BattlePlace.io service";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "battleship-combinatorics" = callPackage
     ({ mkDerivation, base, combinatorial, containers, deepseq
      , directory, filepath, non-empty, pooled-io, prelude-compat
@@ -36924,27 +36851,6 @@ self: {
      }) {};
 
   "blaze-builder" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, utf8-string
-     }:
-     mkDerivation {
-       pname = "blaze-builder";
-       version = "0.4.0.2";
-       sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws";
-       revision = "1";
-       editedCabalFile = "1n8z1zcvrslsa9dvflx8528hsialmnljl1zzdjf1azs24xdq2npm";
-       libraryHaskellDepends = [ base bytestring deepseq text ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text utf8-string
-       ];
-       homepage = "http://github.com/lpsmith/blaze-builder";
-       description = "Efficient buffered output";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-builder_0_4_1_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, utf8-string
@@ -36961,7 +36867,6 @@ self: {
        homepage = "http://github.com/lpsmith/blaze-builder";
        description = "Efficient buffered output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-builder-conduit" = callPackage
@@ -37930,14 +37835,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bookkeeping_0_3_3_0" = callPackage
+    ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
+     mkDerivation {
+       pname = "bookkeeping";
+       version = "0.3.3.0";
+       sha256 = "040ivbr9slbsxghrgys2ym9mxfmc5jh579f2x8cl7yqr851gq1g6";
+       libraryHaskellDepends = [ base dlist mtl text time ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
+       description = "A module for bookkeeping by double entry";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bookkeeping-jp" = callPackage
     ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable
      , text, time
      }:
      mkDerivation {
        pname = "bookkeeping-jp";
-       version = "0.1.1.1";
-       sha256 = "1mnjwfdzhp1kbd02g7vdc1x2rrm10hzi96j6ljin17vynh06dmm0";
+       version = "0.1.1.2";
+       sha256 = "0i0il5h6zf8hps8i3y4s6s80sqpvv0xgld1g3pm752v91r3z3dgv";
        libraryHaskellDepends = [
          base bookkeeping mono-traversable text time
        ];
@@ -39147,6 +39066,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "buffer-builder_0_2_4_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "buffer-builder";
+       version = "0.2.4.5";
+       sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc";
+       libraryHaskellDepends = [
+         base bytestring mtl text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring criterion deepseq HTF
+         quickcheck-instances text vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq http-types json-builder
+         text vector
+       ];
+       homepage = "https://github.com/chadaustin/buffer-builder";
+       description = "Library for efficiently building up buffers, one piece at a time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "buffer-builder-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, buffer-builder
      , bytestring, criterion, deepseq, hashable, HUnit, integer-gmp
@@ -41353,8 +41298,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.9.1";
-       sha256 = "1qz5gjwzkfpmqiz5k62sxkv4prdmzwfa3hg9zma5dg1k4vs9dhkv";
+       version = "2.9.2";
+       sha256 = "1wcc7a2xzi8kq7k0rv0jc0z4z1w9ry6h71a730m3rz601j8n7q2v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42620,26 +42565,6 @@ self: {
      }) {};
 
   "case-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
-     , HUnit, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "case-insensitive";
-       version = "1.2.0.10";
-       sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
-       revision = "2";
-       editedCabalFile = "197c93pa4lq6rgv59s9q9m11lziyyy6jlizvqap4lz0ijfnmj1gx";
-       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit text
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       homepage = "https://github.com/basvandijk/case-insensitive";
-       description = "Case insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "case-insensitive_1_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
      , HUnit, test-framework, test-framework-hunit, text
      }:
@@ -42655,7 +42580,6 @@ self: {
        homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "case-insensitive-match" = callPackage
@@ -43363,6 +43287,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_5" = 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.4.5";
+       sha256 = "12gmav4bwf3i44wbwc68vgrnal7j6q3428d6wl5zq078pv2c3x7w";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -49815,24 +49760,6 @@ self: {
      }) {};
 
   "concurrent-extra" = callPackage
-    ({ mkDerivation, async, base, HUnit, random, stm, test-framework
-     , test-framework-hunit, unbounded-delays
-     }:
-     mkDerivation {
-       pname = "concurrent-extra";
-       version = "0.7.0.11";
-       sha256 = "0bvfgm26hyix074c36l7cqdq40xx8zzml6v50qdfly04g1bb05m5";
-       libraryHaskellDepends = [ base stm unbounded-delays ];
-       testHaskellDepends = [
-         async base HUnit random stm test-framework test-framework-hunit
-         unbounded-delays
-       ];
-       homepage = "https://github.com/basvandijk/concurrent-extra";
-       description = "Extra concurrency primitives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "concurrent-extra_0_7_0_12" = callPackage
     ({ mkDerivation, async, base, HUnit, random, stm, test-framework
      , test-framework-hunit, unbounded-delays
      }:
@@ -49848,7 +49775,6 @@ self: {
        homepage = "https://github.com/basvandijk/concurrent-extra";
        description = "Extra concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-machines" = callPackage
@@ -49873,22 +49799,6 @@ self: {
      }) {};
 
   "concurrent-output" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , process, stm, terminal-size, text, transformers, unix
-     }:
-     mkDerivation {
-       pname = "concurrent-output";
-       version = "1.10.4";
-       sha256 = "0zq50g3l9f55vhwjw6s6jf1nqyi0a7f1ih7vas686ckj2z33z9ay";
-       libraryHaskellDepends = [
-         ansi-terminal async base directory exceptions process stm
-         terminal-size text transformers unix
-       ];
-       description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "concurrent-output_1_10_5" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -49902,7 +49812,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -50143,8 +50052,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0";
-       sha256 = "1520pdyb8lawcbqapr1v8lj9zzxnm6d20zfgawa6ds0dxskz1kyp";
+       version = "1.3.0.1";
+       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mono-traversable mtl
          primitive resourcet text transformers unix unliftio-core vector
@@ -50163,7 +50072,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "conduit_1_3_0_1" = callPackage
+  "conduit_1_3_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -50172,8 +50081,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0.1";
-       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
+       version = "1.3.0.2";
+       sha256 = "0nqy9bffg2p2ij8isz99r7i5zm7sib0m9fqwisknakjh8b99kw60";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mono-traversable mtl
          primitive resourcet text transformers unix unliftio-core vector
@@ -50804,39 +50713,6 @@ self: {
      }) {};
 
   "configuration-tools" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
-     , case-insensitive, connection, data-default, deepseq, directory
-     , dlist, enclosed-exceptions, filepath, http-client
-     , http-client-tls, http-types, monad-control, mtl, network-uri
-     , optparse-applicative, process, profunctors, text, tls
-     , transformers, unordered-containers, wai, warp, warp-tls, x509
-     , x509-system, x509-validation, yaml
-     }:
-     mkDerivation {
-       pname = "configuration-tools";
-       version = "0.3.0";
-       sha256 = "0kpjmnmc7vzdarqczk4z1hxizm9fsnbvhazb6xg4y1a7j8ps99wz";
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
-         base64-bytestring bytestring Cabal case-insensitive connection
-         data-default deepseq directory dlist enclosed-exceptions filepath
-         http-client http-client-tls http-types monad-control mtl
-         network-uri optparse-applicative process profunctors text tls
-         transformers unordered-containers x509 x509-system x509-validation
-         yaml
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols bytestring Cabal enclosed-exceptions
-         http-types monad-control mtl text transformers unordered-containers
-         wai warp warp-tls yaml
-       ];
-       homepage = "https://github.com/alephcloud/hs-configuration-tools";
-       description = "Tools for specifying and parsing configurations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "configuration-tools_0_3_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base-unicode-symbols, base64-bytestring, bytestring, Cabal
      , case-insensitive, connection, data-default, deepseq, directory
@@ -50867,7 +50743,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configurator" = callPackage
@@ -51354,8 +51229,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.1.0.0";
-       sha256 = "19pi32g1kpjasapg7bkrn3rxhzwl4ml1ndg5is3pjckm72awkf5y";
+       version = "2.1.1.0";
+       sha256 = "0p52j96kcgrdiccx48j24jdfsfhwi3n3x2rq75n660qrqiab2gf2";
        libraryHaskellDepends = [
          base containers exceptions extra hpqtypes lifted-base
          lifted-threads log-base monad-control monad-time mtl stm time
@@ -51500,6 +51375,8 @@ self: {
        pname = "containers-verified";
        version = "0.5.11.0";
        sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
+       revision = "1";
+       editedCabalFile = "12jw1aq053wbbam8n2vvfdl00yha551bbk4xnwxk9rwfday45m4j";
        libraryHaskellDepends = [ containers ];
        homepage = "https://github.com/nomeata/containers-verified";
        description = "Formally verified drop-in replacement of containers";
@@ -53190,6 +53067,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crackNum_2_0" = callPackage
+    ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+     mkDerivation {
+       pname = "crackNum";
+       version = "2.0";
+       sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-binary-ieee754 FloatingHex ieee754
+       ];
+       executableHaskellDepends = [
+         base data-binary-ieee754 FloatingHex ieee754
+       ];
+       description = "Crack various integer, floating-point data formats";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "craft" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-combinators, conduit-extra
@@ -54027,23 +53923,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.10";
-       sha256 = "1c7baw7k9shllfxp1yg5czr9m0392pnpqiblaz8v17rc71d402p6";
-       revision = "1";
-       editedCabalFile = "0ijaqjhrv772qnjk3i5lv4yrj3cdz15jkrd3v954x281gixm9j1x";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/orome/crypto-enigma-hs";
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_0_2_11" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -54056,7 +53935,6 @@ self: {
        homepage = "https://github.com/orome/crypto-enigma-hs";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -54658,6 +54536,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "csg" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, doctest, doctest-discover, gloss, gloss-raster
+     , QuickCheck, simple-vec3, strict, system-filepath, tasty
+     , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
+     }:
+     mkDerivation {
+       pname = "csg";
+       version = "0.1";
+       sha256 = "06fc7j1izwwalngjvgvkg90xvp3cjr53c4laqp5giwl2vdqrj2zs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers QuickCheck simple-vec3 strict
+         transformers
+       ];
+       executableHaskellDepends = [
+         base gloss gloss-raster QuickCheck simple-vec3 strict
+         system-filepath turtle
+       ];
+       testHaskellDepends = [
+         base bytestring doctest doctest-discover simple-vec3 tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion simple-vec3 strict vector
+       ];
+       homepage = "https://github.com/dzhus/csg#readme";
+       description = "Analytical CSG (Constructive Solid Geometry) library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "csound-catalog" = callPackage
     ({ mkDerivation, base, csound-expression, csound-sampler
      , sharc-timbre, transformers
@@ -55102,24 +55012,6 @@ self: {
      }) {};
 
   "cublas" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
-     , storable-complex, template-haskell
-     }:
-     mkDerivation {
-       pname = "cublas";
-       version = "0.4.0.0";
-       sha256 = "1y1vwrsgiirzn83iza2k1h699qw5m2bimx6r5vv0im8gxr9fgvkw";
-       setupHaskellDepends = [ base Cabal cuda directory filepath ];
-       libraryHaskellDepends = [
-         base cuda half storable-complex template-haskell
-       ];
-       libraryToolDepends = [ c2hs ];
-       description = "FFI bindings to the CUDA BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cublas_0_4_0_1" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
      , storable-complex, template-haskell
      }:
@@ -55151,27 +55043,6 @@ self: {
      }) {};
 
   "cuda" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
-     , pretty, template-haskell
-     }:
-     mkDerivation {
-       pname = "cuda";
-       version = "0.9.0.2";
-       sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         base bytestring filepath template-haskell
-       ];
-       libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/tmcdonell/cuda";
-       description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cuda_0_9_0_3" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
      , pretty, template-haskell
      }:
@@ -55190,7 +55061,6 @@ self: {
        homepage = "https://github.com/tmcdonell/cuda";
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cudd" = callPackage
@@ -55393,8 +55263,8 @@ self: {
      }:
      mkDerivation {
        pname = "currency-codes";
-       version = "3.0.0.0";
-       sha256 = "0xv5mad6d5y0slizwvh3q9m4n2nxjlav4lxy30s3fv0cfkx4hhwn";
+       version = "3.0.0.1";
+       sha256 = "0b3yqybpd8lk5jw7ajrmn6d4minxqr8l6sq35v1yxhjl81zbria8";
        libraryHaskellDepends = [
          aeson base bson deepseq random safe text
        ];
@@ -55580,24 +55450,6 @@ self: {
      }) {};
 
   "cusolver" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
-     , directory, filepath, half, storable-complex
-     }:
-     mkDerivation {
-       pname = "cusolver";
-       version = "0.1.0.0";
-       sha256 = "00ki40s6z9llsbxlp4c46qn7iaamrhnr5yfr983gqg2mfc3wx355";
-       setupHaskellDepends = [ base Cabal cuda directory filepath ];
-       libraryHaskellDepends = [
-         base cublas cuda cusparse half storable-complex
-       ];
-       libraryToolDepends = [ c2hs ];
-       description = "FFI bindings to CUDA Solver, a LAPACK-like library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cusolver_0_1_0_1" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
      , directory, filepath, half, storable-complex
      }:
@@ -55616,22 +55468,6 @@ self: {
      }) {};
 
   "cusparse" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
-     , storable-complex
-     }:
-     mkDerivation {
-       pname = "cusparse";
-       version = "0.1.0.0";
-       sha256 = "0a45b7y18v50r5lzgkbjapivajqymndl3yvdzp1x25n3imi4knxn";
-       setupHaskellDepends = [ base Cabal cuda directory filepath ];
-       libraryHaskellDepends = [ base cuda half storable-complex ];
-       libraryToolDepends = [ c2hs ];
-       description = "FFI bindings to the CUDA Sparse BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cusparse_0_1_0_1" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
      , storable-complex
      }:
@@ -56453,6 +56289,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-accessor-template_0_2_1_15" = callPackage
+    ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
+     }:
+     mkDerivation {
+       pname = "data-accessor-template";
+       version = "0.2.1.15";
+       sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0";
+       libraryHaskellDepends = [
+         base data-accessor template-haskell utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Record_access";
+       description = "Utilities for accessing and manipulating fields of records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-accessor-transformers" = callPackage
     ({ mkDerivation, base, data-accessor, transformers }:
      mkDerivation {
@@ -58127,6 +57979,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "datadog_0_2_2_0" = callPackage
+    ({ mkDerivation, aeson, auto-update, base, buffer-builder
+     , bytestring, Cabal, dlist, exceptions, hspec, http-client
+     , http-client-tls, http-types, lens, lifted-base, monad-control
+     , network, old-locale, random, text, time, transformers-base
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "datadog";
+       version = "0.2.2.0";
+       sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5";
+       libraryHaskellDepends = [
+         aeson auto-update base buffer-builder bytestring dlist http-client
+         http-client-tls http-types lens lifted-base monad-control network
+         old-locale text time transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson auto-update base buffer-builder bytestring Cabal dlist
+         exceptions hspec http-client http-client-tls http-types lens
+         lifted-base monad-control network old-locale random text time
+         transformers-base unordered-containers vector
+       ];
+       homepage = "https://github.com/iand675/datadog";
+       description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dataenc" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -59193,6 +59073,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "debug_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, clock, containers
+     , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
+     , libgraph, open-browser, prettyprinter
+     , prettyprinter-compat-ansi-wl-pprint, template-haskell, text
+     , uniplate, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "debug";
+       version = "0.1.1";
+       sha256 = "0j4jskz8zq2ww81mfarshi5g2m6xfivgl26grkhcacqq6k3483rk";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring clock containers deepseq directory extra
+         ghc-prim hashable Hoed libgraph open-browser prettyprinter
+         prettyprinter-compat-ansi-wl-pprint template-haskell text uniplate
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [ aeson base directory filepath yaml ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory extra filepath text
+       ];
+       homepage = "https://github.com/ndmitchell/debug";
+       description = "Simple trace-based debugger";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "debug-diff" = callPackage
     ({ mkDerivation, base, groom, process, temporary }:
      mkDerivation {
@@ -59722,8 +59632,8 @@ self: {
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.1.0";
-       sha256 = "09c2gsgqxnr9kpkhbz4g1wrl66qy02vp3sckp8vsg194r5xx4s1b";
+       version = "1.3.2.0";
+       sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
          profunctors random ref-fd transformers
@@ -59733,17 +59643,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_3_2_0" = callPackage
+  "dejafu_1_4_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, profunctors, random, ref-fd, transformers
+     , leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.2.0";
-       sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9";
+       version = "1.4.0.0";
+       sha256 = "0ydfhgl8011lx5yp3nxhaz1418y7p1d1yfsj9fg1c59djsfrnd45";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
-         profunctors random ref-fd transformers
+         profunctors random transformers
        ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "A library for unit-testing concurrent programs";
@@ -60355,8 +60265,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "1.0.0";
-       sha256 = "0ylfaj73yv9bzp1sygbhcipji2g9jws2r4alvhns1y7wzl74fgbz";
+       version = "1.0.1";
+       sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -60807,8 +60717,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-braille";
-       version = "0.1.0.0";
-       sha256 = "0825zczccr878ghlw26x1skg56g8wxa9c0zq3dfaxhfyvxi9d6aq";
+       version = "0.1.0.1";
+       sha256 = "11xq2mx4mmg12cyhs2r7brjn00jy7rh7rwh15gr7piynmx723xhl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63752,40 +63662,6 @@ self: {
      }) {};
 
   "docker" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , conduit-combinators, conduit-extra, connection, containers
-     , data-default-class, directory, exceptions, filemanip, filepath
-     , http-client, http-client-tls, http-conduit, http-types, lens
-     , lens-aeson, monad-control, mtl, network, process, QuickCheck
-     , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, time, tls, transformers, transformers-base
-     , unliftio-core, unordered-containers, uuid, vector, x509
-     , x509-store, x509-system, zlib
-     }:
-     mkDerivation {
-       pname = "docker";
-       version = "0.5.1.0";
-       sha256 = "1g1bmz185hibm0n23yxkili4v8768yascd8mc8z2pil9bky7lvww";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit conduit-combinators
-         conduit-extra containers data-default-class directory exceptions
-         filemanip filepath http-client http-conduit http-types
-         monad-control mtl network resourcet scientific tar temporary text
-         time tls transformers transformers-base unliftio-core
-         unordered-containers uuid vector x509 x509-store x509-system zlib
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection containers directory http-client
-         http-client-tls http-types lens lens-aeson process QuickCheck tasty
-         tasty-hunit tasty-quickcheck text transformers unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/denibertovic/docker-hs";
-       description = "An API client for docker written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "docker_0_5_1_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , conduit-combinators, conduit-extra, connection, containers
      , data-default-class, directory, exceptions, filemanip, filepath
@@ -63817,7 +63693,6 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -63826,8 +63701,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.1";
-       sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4";
+       version = "1.9.2";
+       sha256 = "11k91vvdisnh031w9l5r650ibngjd3fgylkcllp01wz1s67w78v7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63940,26 +63815,6 @@ self: {
      }) {};
 
   "doctemplates" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, hspec, parsec, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "doctemplates";
-       version = "0.2.2";
-       sha256 = "1bfi33r48ifgrnj2iyx9d39vadzaq4ssqmf1k3cal5q0ywiw2srz";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers parsec
-         scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec text ];
-       homepage = "https://github.com/jgm/doctemplates#readme";
-       description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "doctemplates_0_2_2_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, hspec, parsec, scientific, text, unordered-containers
      , vector
@@ -63977,7 +63832,6 @@ self: {
        homepage = "https://github.com/jgm/doctemplates#readme";
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest" = callPackage
@@ -64373,36 +64227,6 @@ self: {
      }) {};
 
   "dotenv" = callPackage
-    ({ mkDerivation, base, base-compat, directory, exceptions, hspec
-     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
-     , transformers, yaml
-     }:
-     mkDerivation {
-       pname = "dotenv";
-       version = "0.5.2.3";
-       sha256 = "194cjf641q54b19daldg9nyi9gf8j4fxql6aslqzbgy7bfg5aj5b";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base base-compat directory exceptions megaparsec process text
-         transformers yaml
-       ];
-       executableHaskellDepends = [
-         base base-compat megaparsec optparse-applicative process text
-         transformers yaml
-       ];
-       testHaskellDepends = [
-         base base-compat directory exceptions hspec hspec-megaparsec
-         megaparsec process text transformers yaml
-       ];
-       homepage = "https://github.com/stackbuilders/dotenv-hs";
-       description = "Loads environment variables from dotenv files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "dotenv_0_5_2_4" = callPackage
     ({ mkDerivation, base, base-compat, directory, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers, yaml
@@ -65586,15 +65410,15 @@ self: {
      }) {};
 
   "dwarf-el" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, transformers
-     , utf8-string
+    ({ mkDerivation, base, binary, bytestring, containers, text
+     , text-show, transformers
      }:
      mkDerivation {
        pname = "dwarf-el";
-       version = "0.2.1.1";
-       sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w";
+       version = "0.3";
+       sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7";
        libraryHaskellDepends = [
-         base binary bytestring containers transformers utf8-string
+         base binary bytestring containers text text-show transformers
        ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
@@ -65602,17 +65426,17 @@ self: {
 
   "dwarfadt" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-mmap, containers
-     , dwarf-el, elf, lens, pretty, transformers
+     , dwarf-el, elf, lens, pretty, text, text-show, transformers
      }:
      mkDerivation {
        pname = "dwarfadt";
-       version = "0.4";
-       sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi";
+       version = "0.6";
+       sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bytestring-mmap containers dwarf-el elf lens pretty
-         transformers
+         text text-show transformers
        ];
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
@@ -67011,6 +66835,8 @@ self: {
        pname = "ekg-core";
        version = "0.1.1.4";
        sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
+       revision = "1";
+       editedCabalFile = "01hp42jjp1cg8z692xahbwlv4x521pdxhyd8d89fjdkvccf8gvnk";
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
@@ -67839,23 +67665,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.3.2.3";
-       sha256 = "1alz5j2bz7x3cwlksdxdynzgcrbbf7jyxmgh61n0wmqnav509y96";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       homepage = "https://github.com/Porges/email-validate-hs";
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_2_5" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -67870,7 +67679,6 @@ self: {
        homepage = "https://github.com/Porges/email-validate-hs";
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -68510,6 +68318,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "enummapset_0_5_2_2" = callPackage
+    ({ mkDerivation, base, containers, deepseq, semigroups }:
+     mkDerivation {
+       pname = "enummapset";
+       version = "0.5.2.2";
+       sha256 = "0x6fihrgvb2y6m0z2gi8n97b54aidydd8fnbmj02bq3x73gxnbvr";
+       libraryHaskellDepends = [ base containers deepseq semigroups ];
+       homepage = "https://github.com/michalt/enummapset";
+       description = "IntMap and IntSet with Enum keys/elements";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "enummapset-th" = callPackage
     ({ mkDerivation, base, containers, deepseq, template-haskell }:
      mkDerivation {
@@ -69069,22 +68890,6 @@ self: {
      }) {};
 
   "errors" = callPackage
-    ({ mkDerivation, base, exceptions, safe, text, transformers
-     , transformers-compat, unexceptionalio
-     }:
-     mkDerivation {
-       pname = "errors";
-       version = "2.2.4";
-       sha256 = "0v5jdjh6k3wys2m1ff6pgiydy6fzd0r0pn2k3bsisrj6nf6gff7a";
-       libraryHaskellDepends = [
-         base exceptions safe text transformers transformers-compat
-         unexceptionalio
-       ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_2_5" = callPackage
     ({ mkDerivation, base, exceptions, safe, text, transformers
      , transformers-compat, unexceptionalio
      }:
@@ -69098,7 +68903,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "errors-ext" = callPackage
@@ -70788,27 +70592,6 @@ self: {
      }) {};
 
   "exp-pairs" = callPackage
-    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
-     , QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, wl-pprint
-     }:
-     mkDerivation {
-       pname = "exp-pairs";
-       version = "0.1.5.2";
-       sha256 = "17dcmv08xvbq11b8dkka7na9hxdh3r566s00wygnqrjg9gfc5bcd";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim wl-pprint
-       ];
-       testHaskellDepends = [
-         base matrix QuickCheck random smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/Bodigrim/exp-pairs";
-       description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "exp-pairs_0_1_6_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
      , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck
@@ -70827,7 +70610,6 @@ self: {
        homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -71482,8 +71264,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-braids";
-       version = "0.1.0";
-       sha256 = "0imf4cd8gl5hq4qrrp5jgfhv4k0vmrm2qm124nbnj65zhgxvm9lz";
+       version = "0.1.1";
+       sha256 = "1d8ca0lnvkpqbrfmvk8mash0kgkxwzlzzspsp35n7csp6iyll543";
        libraryHaskellDepends = [
          base containers data-default diagrams diagrams-lib
          diagrams-rasterific lens random
@@ -71499,8 +71281,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-xml";
-       version = "1.1.0";
-       sha256 = "0wm4kj544zyg2rfb0qdcc9m60l5awskcc0w0rs5bw0v5jdzk2d3j";
+       version = "1.1.1";
+       sha256 = "0xsklyavmgi0b2qn7758i3ph7ifnkkjyz0yczw5zj4586q184am5";
        libraryHaskellDepends = [
          base containers Decimal lens mtl parsec xml
        ];
@@ -71832,8 +71614,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.4";
-       sha256 = "17gnpf5w9a3k4wjwzj6qrsn5fm508pqq8wy4zsqjy3pfprm3239z";
+       version = "1.4.1";
+       sha256 = "0d3i5npmc9nx91nmfbd2cwq33yd48b269gbc9k2ls6sbj9qdi172";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -74428,8 +74210,8 @@ self: {
        pname = "flac";
        version = "0.1.2";
        sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
-       revision = "1";
-       editedCabalFile = "1hl2dgf4ccbk0qk6yqdwr1qbdjp4yi25dhs595lmnf7wrhk7662f";
+       revision = "2";
+       editedCabalFile = "0pn5mw1n152i106x60gz05bnpfhn50ll005v4ihvawq5faq3h44l";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
@@ -74851,6 +74633,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_12" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.12";
+       sha256 = "0c9mg6d8krv7c0sxlkgcpvhcspb8g65hp0h7pgjql4644ivqpn3p";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       homepage = "https://github.com/tfausak/flow#readme";
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -75363,23 +75159,6 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
-     , time
-     }:
-     mkDerivation {
-       pname = "fold-debounce";
-       version = "0.2.0.6";
-       sha256 = "133q81c6gvk6zgn3zv5wkvp5sa6b5fvzf9i4facs9s00l7y2nrgk";
-       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_7" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
      }:
@@ -75394,7 +75173,6 @@ 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
@@ -76010,23 +75788,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
-     , integer-gmp, old-locale, scientific, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.3.0";
-       sha256 = "16xngayk1jd92bj2qaf7fmrgzdskdnc7rsgpk1ij06xd8cdgahf1";
-       libraryHaskellDepends = [
-         array base bytestring clock ghc-prim integer-gmp old-locale
-         scientific text time transformers
-       ];
-       testHaskellDepends = [ base hspec ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_1" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, text, time, transformers
      }:
@@ -76041,7 +75802,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -77147,23 +76907,6 @@ self: {
      }) {inherit (pkgs) libdevil;};
 
   "friday-juicypixels" = callPackage
-    ({ mkDerivation, base, bytestring, file-embed, friday, hspec
-     , JuicyPixels, vector
-     }:
-     mkDerivation {
-       pname = "friday-juicypixels";
-       version = "0.1.2.3";
-       sha256 = "19j321vqca8sl366j3acdskr8zhzcki429zxzs8xawdmxqh93vzv";
-       libraryHaskellDepends = [ base friday JuicyPixels vector ];
-       testHaskellDepends = [
-         base bytestring file-embed friday hspec JuicyPixels
-       ];
-       homepage = "https://github.com/TomMD/friday-juicypixels";
-       description = "Converts between the Friday and JuicyPixels image types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "friday-juicypixels_0_1_2_4" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, friday, hspec
      , JuicyPixels, vector
      }:
@@ -77178,7 +76921,6 @@ self: {
        homepage = "github.com/TomMD/friday-juicypixels";
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -77341,6 +77083,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "frpnow-vty" = callPackage
+    ({ mkDerivation, base, containers, frpnow, vty }:
+     mkDerivation {
+       pname = "frpnow-vty";
+       version = "0.2.0.1";
+       sha256 = "06rd09a13kssxzbspm1r172m5wf94fph0sjm78jd29d8ml279p1h";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base frpnow vty ];
+       executableHaskellDepends = [ base containers frpnow vty ];
+       homepage = "https://github.com/noughtmare/frpnow-vty";
+       description = "Program terminal applications with vty and frpnow!";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "frquotes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79502,24 +79259,6 @@ self: {
      }) {};
 
   "generics-eot" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, hspec
-     , interpolate, markdown-unlit, mockery, QuickCheck, shake
-     }:
-     mkDerivation {
-       pname = "generics-eot";
-       version = "0.2.1.1";
-       sha256 = "1n6h90vjr0q1xckr5xyv2gfncvhs8l4k63r4mf3bqdxdsa6jkbw9";
-       libraryHaskellDepends = [ base markdown-unlit ];
-       testHaskellDepends = [
-         base directory doctest filepath hspec interpolate markdown-unlit
-         mockery QuickCheck shake
-       ];
-       homepage = "https://github.com/soenkehahn/generics-eot#readme";
-       description = "A library for generic programming that aims to be easy to understand";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-eot_0_2_1_2" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, hspec
      , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
      , shake
@@ -79537,7 +79276,6 @@ self: {
        homepage = "https://github.com/soenkehahn/generics-eot#readme";
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop" = callPackage
@@ -79903,29 +79641,6 @@ self: {
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , genvalidity, genvalidity-aeson, genvalidity-hspec
-     , genvalidity-text, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-aeson";
-       version = "0.1.0.1";
-       sha256 = "0ww43pcmya7gqjfxsp7a9f4pf3dpc0g57988l92rl5arix17fkr2";
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
-         QuickCheck
-       ];
-       testHaskellDepends = [
-         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
-         genvalidity-text hspec text
-       ];
-       homepage = "http://cs-syd.eu";
-       description = "Standard spec's for aeson-related instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec-aeson_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
      , genvalidity-text, hspec, QuickCheck, text
@@ -80432,6 +80147,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "getopt-generics_0_13_0_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, filepath
+     , generics-sop, hspec, QuickCheck, safe, silently, tagged
+     }:
+     mkDerivation {
+       pname = "getopt-generics";
+       version = "0.13.0.2";
+       sha256 = "0330f63gy5gk461hvyy79jxrz5bcxdh2sgl0r1g1ffl4swjsl176";
+       libraryHaskellDepends = [
+         base base-compat base-orphans generics-sop tagged
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans filepath generics-sop hspec
+         QuickCheck safe silently tagged
+       ];
+       homepage = "https://github.com/soenkehahn/getopt-generics#readme";
+       description = "Create command line interfaces with ease";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "getopt-simple" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -80736,25 +80472,6 @@ self: {
      }) {};
 
   "ghc-events" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "ghc-events";
-       version = "0.7.1";
-       sha256 = "0cpmc107rhy28700qa2jixdp78jw7hsmni40v90z5is9b048mk3i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers text vector
-       ];
-       executableHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base ];
-       description = "Library and tool for parsing .eventlog files from GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-events_0_7_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers, text
      , vector
      }:
@@ -80771,7 +80488,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-events-analyze" = callPackage
@@ -81107,19 +80823,6 @@ self: {
      }) {};
 
   "ghc-parser" = callPackage
-    ({ mkDerivation, base, cpphs, ghc, happy }:
-     mkDerivation {
-       pname = "ghc-parser";
-       version = "0.2.0.1";
-       sha256 = "10xx2d9awgizjz1jrlw2m30nsl938mh297azp7zay7zkdzsv0fyh";
-       libraryHaskellDepends = [ base ghc ];
-       libraryToolDepends = [ cpphs happy ];
-       homepage = "https://github.com/gibiansky/IHaskell";
-       description = "Haskell source parser from GHC";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ghc-parser_0_2_0_2" = callPackage
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
@@ -81130,7 +80833,6 @@ self: {
        homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -81215,6 +80917,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_1" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.1";
+       sha256 = "1zxk2fs0zykpqklyfwssbi5hfmzm7hc1yx8l8x1fy29qxim3y2z5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -81365,8 +81090,8 @@ self: {
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
-       version = "0.2.2";
-       sha256 = "1k52r8hdbhsp5ydfi010976nck81q38lm8x069x6sdvslmwda1wq";
+       version = "0.2.4";
+       sha256 = "03lxph20m33ipa117i917khgk8rv3fljly3fh31j92d0l02bh9sb";
        libraryHaskellDepends = [ base ghc ];
        homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
        description = "Utilities for writing GHC type-checker plugins";
@@ -81435,8 +81160,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.4";
-       sha256 = "0qwp44jpp8jbrgri0i3yviqnypdj79b8hpxxbk80dwwsjg1q5ynv";
+       version = "0.4.1";
+       sha256 = "0m3flri3y82wvqania3yj7mhnnxvx8z5hxwl6mr5ppavxak169q9";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -81455,8 +81180,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.5.8";
-       sha256 = "0xkhj0kka7j9achgzn66zbxs84pxr5h9jq35x4kdnha5hw34c0i1";
+       version = "0.5.9";
+       sha256 = "1aw0pgcplljll86gk9jvqc22zpnb17amamna11n9b4xzrw2lrnkg";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp
        ];
@@ -82012,6 +81737,50 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
+  "gi-dbusmenu" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-glib
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-dbusmenu";
+       version = "0.4.1";
+       sha256 = "0fi07jf6bsrxsk101ffpyv17lirjgyx4afz26lhbpkqadnpc3kp4";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ dbusmenu-glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Dbusmenu bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {dbusmenu-glib = null;};
+
+  "gi-dbusmenugtk3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-gtk3
+     , gi-atk, gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject
+     , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-dbusmenugtk3";
+       version = "0.4.1";
+       sha256 = "0gl37jsska2qsakzbmvwvb33lskdrbxpk1hmw907y187d0hq7pry";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf
+         gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ dbusmenu-gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "DbusmenuGtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {dbusmenu-gtk3 = null;};
+
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
@@ -82355,8 +82124,8 @@ self: {
        pname = "gi-gtk-hs";
        version = "0.3.5.0";
        sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv";
-       revision = "1";
-       editedCabalFile = "01gcz19v90iw2iy8mmlavin68i5w1c1zzliyqnlss7sn5dqqx8bh";
+       revision = "2";
+       editedCabalFile = "0cv2ca8skkz4gfnw7xxy9ppcxcr9d97rnxr1jj5ii7nki9njb693";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -83503,6 +83272,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_1_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.1.6";
+       sha256 = "1amvbrs7sb6d2l20rr4qc8gjj6m9xlhgkbrr13nrnjfg5fg0midn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -83894,8 +83688,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.3.0";
-       sha256 = "13mi1c4z80nmj00adikbkdjijkciy2zkkyqbvf10r5zilqhdbaw1";
+       version = "0.4";
+       sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
@@ -84009,6 +83803,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_3_5" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.3.5";
+       sha256 = "0n3mqpcmxz9z339r18dac5s4zdgkknlx470cd1mfi9gd932cr4z9";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       homepage = "https://github.com/MichelBoucey/glabrous";
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
      , libglade
@@ -84306,8 +84122,8 @@ self: {
        pname = "glirc";
        version = "2.25";
        sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb";
-       revision = "1";
-       editedCabalFile = "13bf4rcwik6lq4rv1ci9i01hpmvvbqd1xs7fixrk10qsjm31cakw";
+       revision = "2";
+       editedCabalFile = "10n3vhnb77ai3qw2xdkwlhjr3wa6146djk6780l2nc8yfg4axi9j";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -88749,22 +88565,6 @@ self: {
      }) {};
 
   "grouped-list" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, pointed
-     , QuickCheck, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "grouped-list";
-       version = "0.2.1.5";
-       sha256 = "18y3v4jjrj1vrf3q8ki3yamb1n2sm8azp0cnaylpd6xslyr08yv5";
-       libraryHaskellDepends = [ base containers deepseq pointed ];
-       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "grouped-list_0_2_2_0" = callPackage
     ({ mkDerivation, base, binary, containers, criterion, deepseq
      , pointed, QuickCheck, tasty, tasty-quickcheck
      }:
@@ -88778,7 +88578,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -92561,19 +92360,19 @@ self: {
   "hamtsolo" = callPackage
     ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
      , bytestring, conduit, conduit-combinators, conduit-extra
-     , exceptions, optparse-applicative, resourcet, stm-conduit, unix
-     , word8
+     , exceptions, gitrev, optparse-applicative, resourcet, stm-conduit
+     , unix
      }:
      mkDerivation {
        pname = "hamtsolo";
-       version = "1.0.2";
-       sha256 = "0756ffnh1fxwagwkj3zy8axnwkwhnn8m37583sr0ymwyp9vwi3sx";
+       version = "1.0.3";
+       sha256 = "0dbhpdfmbs6ydin2p75wqia9lcrw82gfv3kx8659gnw2ll3dmpnh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
-         conduit-combinators conduit-extra exceptions optparse-applicative
-         resourcet stm-conduit unix word8
+         conduit-combinators conduit-extra exceptions gitrev
+         optparse-applicative resourcet stm-conduit unix
        ];
        homepage = "https://github.com/tfc/hamtsolo#readme";
        description = "Intel AMT serial-over-lan (SOL) client";
@@ -95706,20 +95505,6 @@ self: {
      }) {};
 
   "haskell-src" = callPackage
-    ({ mkDerivation, array, base, happy, pretty, syb }:
-     mkDerivation {
-       pname = "haskell-src";
-       version = "1.0.2.0";
-       sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
-       revision = "1";
-       editedCabalFile = "13lipvh20r35vcgschkvxl8csfi6bn7nqk6avzp7jwrhmpgi9wi0";
-       libraryHaskellDepends = [ array base pretty syb ];
-       libraryToolDepends = [ happy ];
-       description = "Support for manipulating Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src_1_0_3_0" = callPackage
     ({ mkDerivation, array, base, happy, pretty, syb }:
      mkDerivation {
        pname = "haskell-src";
@@ -95729,7 +95514,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts_1_19_1" = callPackage
@@ -96244,37 +96028,6 @@ self: {
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-rewrite, mtl, old-time, polyparse, references
-     , split, tasty, tasty-hunit, template-haskell, time, transformers
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-refactor";
-       version = "1.0.1.1";
-       sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2";
-       libraryHaskellDepends = [
-         aeson base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-refactor_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -99709,33 +99462,6 @@ self: {
      }) {};
 
   "hedgehog" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, semigroups, stm, template-haskell, text
-     , th-lift, time, transformers, transformers-base, unix
-     , wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
-       version = "0.5.2";
-       sha256 = "1nl6q4hlsqbwqjk3ywpd6hdyi3qyz34agrp9533lmkx7120jfblh";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet semigroups stm
-         template-haskell text th-lift time transformers transformers-base
-         unix wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers pretty-show semigroups text transformers
-       ];
-       homepage = "https://hedgehog.qa";
-       description = "Hedgehog will eat all your bugs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog_0_5_3" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions
      , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
@@ -99762,7 +99488,6 @@ self: {
        homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -99846,31 +99571,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
-     , resource-pool, scanner, slave-thread, stm, test-framework
-     , test-framework-hunit, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.10.0";
-       sha256 = "02f095461v812csrncf4bdhvgpn1a3wqpd66gpb72pxij4mrh5zy";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq errors HTTP mtl
-         network network-uri resource-pool scanner stm text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring doctest HUnit mtl slave-thread stm
-         test-framework test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl 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_10_1" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, slave-thread, stm, test-framework
@@ -99893,7 +99593,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
@@ -100851,25 +100550,6 @@ self: {
      }) {};
 
   "heterocephalus" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
-     , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "heterocephalus";
-       version = "1.0.5.1";
-       sha256 = "01klxr6wmibav30yaxz0mf8xhd57frs6ika8c26qsgwjlj5qd94p";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup containers dlist mtl parsec
-         shakespeare template-haskell text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/heterocephalus#readme";
-       description = "A type-safe template engine for working with popular front end development tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "heterocephalus_1_0_5_2" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
      , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
      , transformers
@@ -100886,7 +100566,6 @@ self: {
        homepage = "https://github.com/arowM/heterocephalus#readme";
        description = "A type-safe template engine for working with popular front end development tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heterolist" = callPackage
@@ -106754,20 +106433,51 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
+  "hpqtypes_1_5_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , data-default-class, directory, exceptions, filepath, HUnit
+     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
+     , resource-pool, scientific, semigroups, test-framework
+     , test-framework-hunit, text, text-show, time, transformers
+     , transformers-base, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hpqtypes";
+       version = "1.5.2.0";
+       sha256 = "0ghqrayylsm68nkqzrb7y81n3zslqv0rjpd0fyya67cy26ks43gw";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default-class exceptions
+         lifted-base monad-control mtl resource-pool semigroups text
+         text-show time transformers transformers-base vector
+       ];
+       librarySystemDepends = [ postgresql ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions HUnit lifted-base monad-control
+         mtl QuickCheck random scientific test-framework
+         test-framework-hunit text text-show time transformers-base
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/scrive/hpqtypes";
+       description = "Haskell bindings to libpqtypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
      , cryptohash, data-default, exceptions, fields-json, hpqtypes
-     , lifted-base, log-base, monad-control, mtl, safe, tasty
-     , tasty-hunit, text, text-show, transformers
+     , lifted-base, log-base, monad-control, mtl, safe, semigroups
+     , tasty, tasty-hunit, text, text-show, transformers
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.6.0.0";
-       sha256 = "1cp4dnamc0gia8xsf9f6hp8gfmhkfrfs8ijjcl9dqaka87m4hkmx";
+       version = "1.6.1.0";
+       sha256 = "1k23dk3f1d3d3a1qdkvwjk91nw7iz4906clnwhd9k2s70zgsw111";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash
          data-default exceptions fields-json hpqtypes lifted-base log-base
-         monad-control mtl safe text text-show
+         monad-control mtl safe semigroups text text-show
        ];
        testHaskellDepends = [
          base exceptions hpqtypes lifted-base log-base monad-control tasty
@@ -111257,23 +110967,6 @@ self: {
      }) {};
 
   "hsyslog-udp" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "hsyslog-udp";
-       version = "0.2.1";
-       sha256 = "0133yr6cg7z1ix6dqskjzi36d62803549vdbpg9a29lb49kl1yv3";
-       libraryHaskellDepends = [
-         base bytestring hsyslog network text time unix
-       ];
-       testHaskellDepends = [ base hspec time ];
-       homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
-       description = "Log to syslog over a network via UDP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsyslog-udp_0_2_2" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
      , time, unix
      }:
@@ -111288,7 +110981,6 @@ self: {
        homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hszephyr" = callPackage
@@ -111928,35 +111620,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
-     , http-types, mime-types, monad-control, network, network-uri
-     , random, stm, streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.5.10";
-       sha256 = "1hmshs97smigqy334rfkgv3vri5fas3cj8zz2gqlby9jsrp6kygm";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie deepseq exceptions filepath
-         ghc-prim http-types mime-types network network-uri random stm
-         streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_11" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -111982,7 +111645,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -112650,34 +112312,6 @@ self: {
      }) {};
 
   "http-reverse-proxy" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, containers
-     , data-default-class, hspec, http-client, http-conduit, http-types
-     , lifted-base, monad-control, network, resourcet, streaming-commons
-     , text, transformers, wai, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "http-reverse-proxy";
-       version = "0.5.0";
-       sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive conduit
-         conduit-extra containers data-default-class http-client http-types
-         lifted-base monad-control network resourcet streaming-commons text
-         transformers wai wai-logger word8
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra hspec
-         http-conduit http-types lifted-base network resourcet
-         streaming-commons transformers wai warp
-       ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
-       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "http-reverse-proxy_0_5_0_1" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -113268,6 +112902,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_1_1_0_3" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "1.1.0.3";
+       sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -113734,25 +113381,6 @@ self: {
      }) {};
 
   "hw-fingertree-strict" = callPackage
-    ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hw-fingertree-strict";
-       version = "0.1.0.0";
-       sha256 = "02bgqcjjhxpzd5nql50abbbjlg5pan2wy1dhdwc2br87n3jhx90x";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
-       description = "Generic strict finger-tree structure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-fingertree-strict_0_1_0_1" = callPackage
     ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -113769,7 +113397,6 @@ self: {
        homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
        description = "Generic strict finger-tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hedgehog" = callPackage
@@ -113921,8 +113548,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.4.0";
-       sha256 = "1c7q05wrwwk2mqr09r14q2c38k5fdpn8phhdzxby0nj1q28azmmk";
+       version = "2.4.1";
+       sha256 = "0mhi85czipxk0mxrzxchljabhkiq5a6y3xn9k5rivi2dgy28mrrk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116183,42 +115810,6 @@ self: {
      }) {};
 
   "ihaskell" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
-     , cmdargs, containers, directory, filepath, ghc, ghc-boot
-     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
-     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
-     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
-     , split, stm, strict, system-argv0, text, transformers, unix
-     , unordered-containers, utf8-string, uuid, vector
-     }:
-     mkDerivation {
-       pname = "ihaskell";
-       version = "0.9.0.2";
-       sha256 = "0pa366b4vn5hc9ymd4g1pr4dsffvk80x9c8yq4d1pf4jngjfayql";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring cereal cmdargs containers
-         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
-         haskell-src-exts hlint http-client http-client-tls ipython-kernel
-         mtl parsec process random shelly split stm strict system-argv0 text
-         transformers unix unordered-containers utf8-string uuid vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory ghc ipython-kernel
-         process strict text transformers unix
-       ];
-       testHaskellDepends = [
-         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
-         shelly text transformers
-       ];
-       homepage = "http://github.com/gibiansky/IHaskell";
-       description = "A Haskell backend kernel for the IPython project";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ihaskell_0_9_0_3" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
      , cmdargs, containers, directory, filepath, ghc, ghc-boot
      , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
@@ -116252,7 +115843,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -118876,27 +118466,6 @@ self: {
      }) {};
 
   "invertible" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, invariant, lens
-     , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
-     , transformers, TypeCompose
-     }:
-     mkDerivation {
-       pname = "invertible";
-       version = "0.2.0.3";
-       sha256 = "0pckhl1nv6w66k3ll9q1bwbmzl2rpbwk6c3xkm7dscxzjzw43qwf";
-       revision = "1";
-       editedCabalFile = "0jkwx19gj653ribqmlpysyp2kf4rphwj837zzwwd7jf9cnmgyqlp";
-       libraryHaskellDepends = [
-         base haskell-src-meta invariant lens partial-isomorphisms
-         semigroupoids template-haskell transformers TypeCompose
-       ];
-       testHaskellDepends = [ base QuickCheck transformers ];
-       description = "bidirectional arrows, bijective functions, and invariant functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "invertible_0_2_0_4" = callPackage
     ({ mkDerivation, base, haskell-src-meta, invariant, lens
      , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
      , transformers, TypeCompose
@@ -119399,26 +118968,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
-     , network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.2";
-       sha256 = "15w56dia70hbqdmd16bbl68sjr0y3195hhykr4vb21krlr821dlp";
-       libraryHaskellDepends = [
-         appar base byteorder containers network
-       ];
-       testHaskellDepends = [
-         appar base byteorder containers doctest hspec network QuickCheck
-         safe
-       ];
-       homepage = "http://www.mew.org/~kazu/proj/iproute/";
-       description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "iproute_1_7_3" = callPackage
     ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
      , network, QuickCheck, safe
      }:
@@ -119436,7 +118985,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/iproute/";
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -119485,28 +119033,6 @@ self: {
      }) {};
 
   "ipython-kernel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, process, SHA, temporary, text
-     , transformers, unordered-containers, uuid, zeromq4-haskell
-     }:
-     mkDerivation {
-       pname = "ipython-kernel";
-       version = "0.9.0.1";
-       sha256 = "0nzl5zcl03cdp0l6idscp648n64qjnhvfyj2j47fiiy1fkz133s7";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring cereal containers directory filepath mtl
-         process SHA temporary text transformers unordered-containers uuid
-         zeromq4-haskell
-       ];
-       homepage = "http://github.com/gibiansky/IHaskell";
-       description = "A library for creating kernels for IPython frontends";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ipython-kernel_0_9_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , directory, filepath, mtl, process, SHA, temporary, text
      , transformers, unordered-containers, uuid, zeromq4-haskell
@@ -119526,7 +119052,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc" = callPackage
@@ -120673,6 +120198,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ixset-typed_0_4" = callPackage
+    ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
+     , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "ixset-typed";
+       version = "0.4";
+       sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
+       libraryHaskellDepends = [
+         base containers deepseq safecopy syb template-haskell
+       ];
+       testHaskellDepends = [
+         base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Efficient relational queries on Haskell sets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ixshader" = callPackage
     ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec
      , prettyclass, singletons, template-haskell, text
@@ -121802,6 +121347,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json_0_9_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
+     , pretty, syb, text
+     }:
+     mkDerivation {
+       pname = "json";
+       version = "0.9.2";
+       sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl parsec pretty syb text
+       ];
+       description = "Support for serialising Haskell to and from JSON";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-api" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , data-default, hspec, lens, lens-aeson, text, unordered-containers
@@ -122048,8 +121609,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "1.0.0";
-       sha256 = "06h9qji4cnzqw4nmxs6dka7ywhz8jr56v5pcb3dlvganjg3s0gdx";
+       version = "1.0.1";
+       sha256 = "16x0k1iwq9z9sq7z6a2007w8cczy6yd7sniylhacqnf1gsjfb4q6";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -123281,10 +122842,8 @@ self: {
      }:
      mkDerivation {
        pname = "kanji";
-       version = "3.1.0";
-       sha256 = "0l1fbznzw6z8cpcrkmchabwf7zfhb3zj18s323xlxiq3537bxjz4";
-       revision = "2";
-       editedCabalFile = "0n88shf40v4jiqyj24dv1ha8m6s8mja4x5yrh8427byf2s80780c";
+       version = "3.1.0.1";
+       sha256 = "1qxjaqqb3i8w65qda3nxnqxwvgcpfics38yifzf3chy49c3v04wj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123662,6 +123221,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "katydid_0_2_0_1" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, directory
+     , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "katydid";
+       version = "0.2.0.1";
+       sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers deepseq hxt json mtl parsec regex-tdfa
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base containers directory filepath HUnit hxt json mtl parsec tasty
+         tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq directory filepath hxt mtl text
+       ];
+       homepage = "https://github.com/katydid/katydid-haskell";
+       description = "A haskell implementation of Katydid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kawa" = callPackage
     ({ mkDerivation, attoparsec, base, directory, hashable, hedgehog
      , optparse-applicative, text, unordered-containers
@@ -125166,6 +124753,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_1_0_2" = callPackage
+    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
+     mkDerivation {
+       pname = "lackey";
+       version = "1.0.2";
+       sha256 = "00zvbdls0nr4q18889xr8z3cpfldi5gg3m2g7d572bcxvwfhm4y4";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base hspec servant servant-foreign text ];
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -126543,28 +126144,6 @@ self: {
      }) {};
 
   "language-javascript" = callPackage
-    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
-     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
-     , utf8-light, utf8-string
-     }:
-     mkDerivation {
-       pname = "language-javascript";
-       version = "0.6.0.10";
-       sha256 = "0m1yk0v4myzjjv3czhavwlsgzp8ffpmbkwks97d3yipl1d0lrwfa";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers mtl text utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         array base blaze-builder bytestring Cabal containers hspec mtl
-         QuickCheck utf8-light utf8-string
-       ];
-       homepage = "https://github.com/erikd/language-javascript";
-       description = "Parser for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-javascript_0_6_0_11" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, hspec, mtl, QuickCheck, text
      , utf8-light, utf8-string
@@ -126584,7 +126163,6 @@ self: {
        homepage = "https://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-js" = callPackage
@@ -127194,6 +126772,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lapack-ffi-tools_0_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers
+     , explicit-exception, filepath, non-empty, optparse-applicative
+     , parsec, pathtype, transformers, unordered-containers, utility-ht
+     , vector
+     }:
+     mkDerivation {
+       pname = "lapack-ffi-tools";
+       version = "0.1.0.1";
+       sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base bytestring cassava containers explicit-exception filepath
+         non-empty optparse-applicative parsec pathtype transformers
+         unordered-containers utility-ht vector
+       ];
+       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
+       description = "Generator for Haskell interface to Fortran LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "large-hashable" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
      , bytestring, cereal, containers, cryptohash, deepseq, hashable
@@ -128352,6 +127954,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels_0_2_0_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.2.0.0";
+       sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf";
+       libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-named" = callPackage
     ({ mkDerivation, base, lens, template-haskell }:
      mkDerivation {
@@ -128558,33 +128173,6 @@ self: {
      }) {};
 
   "lentil" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
-     , filepath, hspec, natural-sort, optparse-applicative, parsec
-     , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "lentil";
-       version = "1.0.10.0";
-       sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         ansi-wl-pprint base csv directory filemanip filepath natural-sort
-         optparse-applicative parsec pipes regex-tdfa semigroups
-         terminal-progress-bar text transformers
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base csv directory filemanip filepath hspec
-         natural-sort optparse-applicative parsec pipes regex-tdfa
-         semigroups terminal-progress-bar text transformers
-       ];
-       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
-       description = "frugal issue tracker";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "lentil_1_0_10_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
@@ -128609,7 +128197,6 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz" = callPackage
@@ -129772,30 +129359,6 @@ self: {
      }) {};
 
   "lifted-base" = callPackage
-    ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
-     , test-framework, test-framework-hunit, transformers
-     , transformers-base, transformers-compat
-     }:
-     mkDerivation {
-       pname = "lifted-base";
-       version = "0.2.3.11";
-       sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f";
-       revision = "1";
-       editedCabalFile = "0vrik0j1xv2yp759ffa7jb7q838z4wglnbgsrja97mx0dwsbavnx";
-       libraryHaskellDepends = [ base monad-control transformers-base ];
-       testHaskellDepends = [
-         base HUnit monad-control test-framework test-framework-hunit
-         transformers transformers-base transformers-compat
-       ];
-       benchmarkHaskellDepends = [
-         base criterion monad-control monad-peel transformers
-       ];
-       homepage = "https://github.com/basvandijk/lifted-base";
-       description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-base_0_2_3_12" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
      , test-framework, test-framework-hunit, transformers
      , transformers-base, transformers-compat
@@ -129815,7 +129378,6 @@ self: {
        homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -131094,6 +130656,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t_1_0_1" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
+     , mtl, mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "1.0.1";
+       sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3";
+       libraryHaskellDepends = [
+         base mmorph monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       homepage = "https://github.com/nikita-volkov/list-t";
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "list-t-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
      , list-t-text, text, transformers
@@ -133669,30 +133249,6 @@ self: {
      }) {};
 
   "lucid" = callPackage
-    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
-     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
-     , mtl, parsec, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lucid";
-       version = "2.9.9";
-       sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers hashable mmorph mtl text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base bifunctors hspec HUnit mtl parsec text
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq text transformers
-       ];
-       homepage = "https://github.com/chrisdone/lucid";
-       description = "Clear to write, read and edit DSL for HTML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lucid_2_9_10" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
      , mtl, parsec, text, transformers, unordered-containers
@@ -133714,7 +133270,6 @@ self: {
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lucid-colonnade" = callPackage
@@ -135619,30 +135174,6 @@ self: {
      }) {};
 
   "markdown" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , conduit, conduit-extra, containers, data-default, directory
-     , filepath, hspec, text, transformers, xml-conduit, xml-types
-     , xss-sanitize
-     }:
-     mkDerivation {
-       pname = "markdown";
-       version = "0.1.16";
-       sha256 = "11gdawvwji7301lm07z5q94g5jlf9iq63wf6k7f6sc88w99b7c08";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup conduit conduit-extra
-         containers data-default text transformers xml-conduit xml-types
-         xss-sanitize
-       ];
-       testHaskellDepends = [
-         base blaze-html conduit conduit-extra containers directory filepath
-         hspec text transformers
-       ];
-       homepage = "https://github.com/snoyberg/markdown";
-       description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "markdown_0_1_17" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , call-stack, conduit, conduit-extra, containers, data-default
      , directory, filepath, hspec, text, transformers, xml-conduit
@@ -135664,7 +135195,6 @@ self: {
        homepage = "https://github.com/snoyberg/markdown";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-kate" = callPackage
@@ -136021,10 +135551,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.1.1.0";
-       sha256 = "0xl6f3cxhfbyz15p4mayj0489mjgrvla7hz0sf0i58bfcl2b8r8q";
-       revision = "2";
-       editedCabalFile = "06d7lkd65bd5gfpgfgppcg8pagfc8k03qf7psggv2d3sixm088bn";
+       version = "0.1.2.0";
+       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -136036,14 +135564,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_1_2_0" = callPackage
+  "massiv_0_1_3_0" = callPackage
     ({ mkDerivation, base, data-default, data-default-class, deepseq
      , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.1.2.0";
-       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
+       version = "0.1.3.0";
+       sha256 = "0bpy370004rvsz7qq41x7cdim8l4rj79zlz7jzpw7casm6ly0473";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -136356,14 +135884,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "matrix_0_3_6_0" = callPackage
+  "matrix_0_3_6_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, loop, primitive
      , QuickCheck, semigroups, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrix";
-       version = "0.3.6.0";
-       sha256 = "1l1pwj6j4k9da4c507z0k17zjvni895qgcgjvln2ggxinzz88fcb";
+       version = "0.3.6.1";
+       sha256 = "0b1v17rc9q7ni44gkzp124kmc5d6xmlpiqvskgjrq54qpjinr5zs";
        libraryHaskellDepends = [
          base deepseq loop primitive semigroups vector
        ];
@@ -139355,6 +138883,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso_0_15_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
+     , http-types, lucid, network-uri, servant, servant-lucid, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "0.15.0.0";
+       sha256 = "1kkh71psj0acia9r1mzvp16lzmc6gsma81shp7bhfy35yhbvwsl4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-api-data http-types lucid
+         network-uri servant servant-lucid text transformers vector
+       ];
+       homepage = "http://github.com/dmjio/miso";
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "missing-foreign" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139770,8 +139319,8 @@ self: {
        pname = "modern-uri";
        version = "0.2.1.0";
        sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
-       revision = "3";
-       editedCabalFile = "05kk7q1bwrnffi2ya4mmmsgy8qr2s5d2lrxa2h0acygvdwg3gx7s";
+       revision = "4";
+       editedCabalFile = "00vr4g5cmhd3d1329hwcdq55yjq8n5jxz15sgl0sawcg5mw5ihyy";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -140480,28 +140029,6 @@ self: {
      }) {};
 
   "monad-logger" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, conduit
-     , conduit-extra, exceptions, fast-logger, lifted-base
-     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
-     , template-haskell, text, transformers, transformers-base
-     , transformers-compat, unliftio-core
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.28.1";
-       sha256 = "15gpr6wgyqfiz780p8l4lfxmxnanpviyvkba20hdsx92czq64cgr";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra exceptions
-         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
-         stm-chans template-haskell text transformers transformers-base
-         transformers-compat unliftio-core
-       ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_28_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , exceptions, fast-logger, lifted-base, monad-control, monad-loops
      , mtl, resourcet, stm, stm-chans, template-haskell, text
@@ -140521,7 +140048,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -140540,26 +140066,6 @@ self: {
      }) {};
 
   "monad-logger-prefix" = callPackage
-    ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
-     , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "monad-logger-prefix";
-       version = "0.1.8";
-       sha256 = "1p8sqynxl898vf2fq5lw8j7r50jrxp8npbsw6sc2mbsi336j79xj";
-       libraryHaskellDepends = [
-         base exceptions monad-control monad-logger mtl resourcet text
-         transformers transformers-base
-       ];
-       testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
-       benchmarkHaskellDepends = [ base criterion monad-logger ];
-       homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
-       description = "Add prefixes to your monad-logger output";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "monad-logger-prefix_0_1_9" = callPackage
     ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
      , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
      , transformers, transformers-base
@@ -140577,7 +140083,6 @@ self: {
        homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-syslog" = callPackage
@@ -140923,6 +140428,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-recorder_0_1_1" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-recorder";
+       version = "0.1.1";
+       sha256 = "05d27h3lx7p4qzby8jrxf6wj5z69s11pgpbkdacxrag0v8vynqq8";
+       libraryHaskellDepends = [
+         base exceptions monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/harendra-kumar/monad-recorder";
+       description = "Record and replay the results of monadic actions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-resumption" = callPackage
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
@@ -141529,37 +141052,6 @@ self: {
      }) {};
 
   "mongoDB" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, conduit, conduit-extra, containers
-     , criterion, cryptohash, data-default-class, hashtables, hspec
-     , lifted-base, monad-control, mtl, network, nonce, old-locale
-     , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text
-     , time, tls, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "mongoDB";
-       version = "2.3.0.4";
-       sha256 = "0qxwk154wd2ir3z7qjn8b7p6lx34ga5r7gcpmf4yp1z8vzsbxn57";
-       libraryHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring conduit conduit-extra containers cryptohash
-         data-default-class hashtables lifted-base monad-control mtl network
-         nonce parsec pureMD5 random random-shuffle resourcet tagged text
-         time tls transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec mtl old-locale text time ];
-       benchmarkHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring containers criterion cryptohash data-default-class
-         hashtables lifted-base monad-control mtl network nonce parsec
-         random random-shuffle text transformers-base
-       ];
-       homepage = "https://github.com/mongodb-haskell/mongodb";
-       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "mongoDB_2_3_0_5" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
@@ -141588,7 +141080,6 @@ self: {
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -141808,26 +141299,6 @@ self: {
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.4";
-       sha256 = "1ycrcrw3gnsb8zxx8hvrfclj1skfapkvxp37r2j4j31wjhv3fycp";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_0_4_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -141845,7 +141316,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -142170,6 +141640,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_17" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, formatting, http-client
+     , http-client-tls, microlens, microlens-mtl, mtl
+     , optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.17";
+       sha256 = "1sw986mprhlbgzz3zgjlr3mynj4caj3dyl7b6ln7y6y8jb567h3n";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley formatting http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page formatting optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -144671,18 +144175,6 @@ self: {
      }) {};
 
   "n-tuple" = callPackage
-    ({ mkDerivation, base, singletons, vector }:
-     mkDerivation {
-       pname = "n-tuple";
-       version = "0.0.1.1";
-       sha256 = "1pwz4rs0bbanhlwcm7v06s4dkwr3h41w203kab1s7k201na7j9r1";
-       libraryHaskellDepends = [ base singletons vector ];
-       homepage = "https://github.com/athanclark/n-tuple#readme";
-       description = "Homogeneous tuples of arbitrary length";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "n-tuple_0_0_2_0" = callPackage
     ({ mkDerivation, base, singletons, vector }:
      mkDerivation {
        pname = "n-tuple";
@@ -144692,7 +144184,6 @@ self: {
        homepage = "https://github.com/athanclark/n-tuple#readme";
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nagios-check" = callPackage
@@ -147433,22 +146924,6 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
-     , semigroups, transformers
-     }:
-     mkDerivation {
-       pname = "newtype-generics";
-       version = "0.5.2.1";
-       sha256 = "1wdm6mg78a5cipbvqinbh33266rgk0axxzdchpzfdxw1iz4xs4nk";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base hspec HUnit ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion semigroups ];
-       description = "A typeclass and set of functions for working with newtypes, with generics support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "newtype-generics_0_5_2_2" = callPackage
     ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
      , semigroups, transformers
      }:
@@ -147462,7 +146937,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -149418,25 +148892,6 @@ self: {
      }) {};
 
   "nvvm" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
-     , filepath, template-haskell
-     }:
-     mkDerivation {
-       pname = "nvvm";
-       version = "0.8.0.2";
-       sha256 = "05px0bxqqxph5ancvklg1fmp6p7c15vghzrwq8alsfjg7lvrd933";
-       setupHaskellDepends = [
-         base Cabal cuda directory filepath template-haskell
-       ];
-       libraryHaskellDepends = [ base bytestring cuda template-haskell ];
-       libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/tmcdonell/nvvm";
-       description = "FFI bindings to NVVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "nvvm_0_8_0_3" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
      , filepath, template-haskell
      }:
@@ -149785,6 +149240,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ochintin-daicho_0_1_0_2" = callPackage
+    ({ mkDerivation, base, bookkeeping, doctest, Glob, text }:
+     mkDerivation {
+       pname = "ochintin-daicho";
+       version = "0.1.0.2";
+       sha256 = "1j44dbp0fdsbm117rgwfsg2n3hbl782nz4484p5fif489yqv62vp";
+       libraryHaskellDepends = [ base bookkeeping text ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme";
+       description = "A module to manage payroll books for Japanese companies";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octane" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
@@ -152495,8 +151964,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "packcheck";
-       version = "0.1.1";
-       sha256 = "10c822mx6vjf42d0lzi950s61s8hcw6451ckxq5g7wg4pavyr7zp";
+       version = "0.2.0";
+       sha256 = "0frxr78vkwm0yjxz1rq71h8b01krdidi19ld1yragkfk54krcz1n";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
@@ -152964,6 +152433,57 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_1_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , Cabal, case-insensitive, cmark-gfm, containers, criterion
+     , data-default, deepseq, Diff, directory, doctemplates, exceptions
+     , executable-path, filepath, Glob, haddock-library, hslua
+     , hslua-module-text, HTTP, http-client, http-client-tls, http-types
+     , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
+     , process, QuickCheck, random, safe, scientific, SHA, skylighting
+     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, temporary, texmath, text, time, unix
+     , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.1.3";
+       sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base-compat base64-bytestring binary
+         blaze-html blaze-markup bytestring case-insensitive cmark-gfm
+         containers data-default deepseq directory doctemplates exceptions
+         filepath Glob haddock-library hslua hslua-module-text HTTP
+         http-client http-client-tls http-types JuicyPixels mtl network
+         network-uri pandoc-types parsec process random safe scientific SHA
+         skylighting split syb tagsoup temporary texmath text time unix
+         unordered-containers vector xml yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [ base base-compat ];
+       testHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers Diff
+         directory executable-path filepath Glob hslua pandoc-types process
+         QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck
+         temporary text time xml zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base base-compat bytestring containers criterion mtl text time
+         weigh
+       ];
+       doCheck = false;
+       homepage = "https://pandoc.org";
+       description = "Conversion between markup formats";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -152999,6 +152519,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_14_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, 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.14.2";
+       sha256 = "1dz3ybvi7bydpjfwpk72whmy9agz6g1xa60nazs1r9im97apfgw5";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       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 containers 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
      }:
@@ -153025,8 +152581,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.0.1";
-       sha256 = "0lhjbkgmd9hshi3lxvciwviknbbj8lyrzinzfxbwssgqrdzcaayn";
+       version = "0.3.0.3";
+       sha256 = "1w24s76w5jj6nngq0q13m7szqs2d5jc70gm94n37pwvxgm4kabrc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -153050,7 +152606,7 @@ self: {
        ];
        homepage = "https://github.com/lierdakil/pandoc-crossref#readme";
        description = "Pandoc filter for cross-references";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -155038,6 +154594,8 @@ self: {
        pname = "path";
        version = "0.6.1";
        sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb";
+       revision = "1";
+       editedCabalFile = "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath hashable template-haskell
        ];
@@ -155068,8 +154626,8 @@ self: {
        pname = "path-io";
        version = "1.3.3";
        sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a";
-       revision = "1";
-       editedCabalFile = "16jfcjpqbzj6jr0sqxq2ys1z9qd2d8xr9k9vyij08ywynmwwvvzm";
+       revision = "2";
+       editedCabalFile = "1zipck6lhhff9v86s4awgl6z35znjd7wcy1x25xplsdrxpzps3nl";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
@@ -156400,25 +155958,6 @@ self: {
      }) {};
 
   "persistable-record" = callPackage
-    ({ mkDerivation, array, base, containers, dlist, names-th
-     , product-isomorphic, quickcheck-simple, template-haskell
-     , th-data-compat, transformers
-     }:
-     mkDerivation {
-       pname = "persistable-record";
-       version = "0.6.0.1";
-       sha256 = "1jjydxzjvkw3jzm968ngj0v531fly0h4f7621fjzgbkdcjfgkgm1";
-       libraryHaskellDepends = [
-         array base containers dlist names-th product-isomorphic
-         template-haskell th-data-compat transformers
-       ];
-       testHaskellDepends = [ base quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-record_0_6_0_2" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , product-isomorphic, quickcheck-simple, template-haskell
      , th-data-compat, transformers
@@ -156435,7 +155974,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Binding between SQL database values and haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
@@ -158063,8 +157601,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinpon";
-       version = "0.2.0.1";
-       sha256 = "0l21lh66iwqk5bq2zxpjxp04gypcpy74xj4xnxmgbj7qzcxp9xha";
+       version = "0.2.0.2";
+       sha256 = "1fwdzmzm1s0bpxcw79hifpsc0ksaz2rdn76hprk7bqiw81c4amxs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -158118,29 +157656,6 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
-     , optparse-applicative, QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.3.8";
-       sha256 = "1wlppz7vlkmbrrvjv6cjrp8x39lhvdqp2sgc9w6hv25y3qirz9wi";
-       libraryHaskellDepends = [
-         base exceptions mmorph mtl semigroups transformers void
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_9" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, transformers, void
@@ -158161,7 +157676,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -158468,6 +157982,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-concurrency_2_0_10" = callPackage
+    ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
+     , void
+     }:
+     mkDerivation {
+       pname = "pipes-concurrency";
+       version = "2.0.10";
+       sha256 = "1qrnwr7m8yjn80k4qzcr75g64jvbh7f903apvmlsqrgppwfp4xa6";
+       libraryHaskellDepends = [
+         async base contravariant pipes semigroups stm void
+       ];
+       testHaskellDepends = [ async base pipes stm ];
+       description = "Concurrency for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-conduit" = callPackage
     ({ mkDerivation, base, conduit, mtl, pipes-core }:
      mkDerivation {
@@ -159035,22 +158566,6 @@ self: {
      }) {};
 
   "pipes-safe" = callPackage
-    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
-     , pipes, primitive, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "pipes-safe";
-       version = "2.2.6";
-       sha256 = "1y891xqp5qdv0lkgv66v7b2wnmvximmh6fjb2i5apm8p4rwih6wz";
-       libraryHaskellDepends = [
-         base containers exceptions monad-control mtl pipes primitive
-         transformers transformers-base
-       ];
-       description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-safe_2_2_9" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, primitive, transformers, transformers-base
      }:
@@ -159064,7 +158579,6 @@ self: {
        ];
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-shell" = callPackage
@@ -159772,17 +159286,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_1" = callPackage
-    ({ mkDerivation, base, blaze-svg, colour, containers, data-default
-     , hspec, mtl, QuickCheck, scientific, text, time
+  "plot-light_0_3_2_1" = callPackage
+    ({ mkDerivation, base, blaze-svg, colour, containers
+     , data-default-class, hspec, mtl, QuickCheck, scientific, text
+     , time
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.1";
-       sha256 = "02bivm4gi0sv13yx2alxkcm0ssxbgiwyn93m54x8xwnvczfavsmw";
+       version = "0.3.2.1";
+       sha256 = "00gl17lsavwn1cglaa8jqzl1v3vczskkiz0zg51xg4g7v1v1irr7";
        libraryHaskellDepends = [
-         base blaze-svg colour containers data-default mtl scientific text
-         time
+         base blaze-svg colour containers data-default-class mtl scientific
+         text time
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -159797,11 +159312,12 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light-examples";
-       version = "0.1.0.0";
-       sha256 = "19r07cdv34ks0810gq1x6cmdk7jf8f1s983rf2jn4vga4w5akf0p";
-       isLibrary = false;
+       version = "0.2.0.0";
+       sha256 = "0sw7hxp96s8sbaghs3lzl856q72y0gxn58px0wd4568fdbvgd6vl";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ attoparsec base ];
        executableHaskellDepends = [
          attoparsec attoparsec-time base blaze-svg colour plot-light
          scientific text time
@@ -162216,6 +161732,8 @@ self: {
        pname = "pptable";
        version = "0.3.0.0";
        sha256 = "05wkvnk2h3xvjivk8cd6z8xlscipvd2az1v1n4sdianf9r0gzdwq";
+       revision = "1";
+       editedCabalFile = "0c1srvgwyczbfnw3zw5pbsjqgxifq9yb1h60w3aq91q7iamrvdgb";
        libraryHaskellDepends = [
          base boxes containers generic-deriving pretty syb vector
        ];
@@ -164683,6 +164201,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens_0_3_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, deepseq, lens-family, lens-labels, parsec
+     , pretty, text, transformers, void
+     }:
+     mkDerivation {
+       pname = "proto-lens";
+       version = "0.3.0.0";
+       sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class deepseq
+         lens-family lens-labels parsec pretty text transformers void
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "A lens-based implementation of protocol buffers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-arbitrary" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
@@ -164699,6 +164237,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-arbitrary_0_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.2.0";
+       sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
@@ -164706,18 +164261,17 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.8";
-       sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz";
+       version = "0.1.0.9";
+       sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
-         base data-default-class lens-family proto-lens proto-lens-protoc
-         transformers
+         base data-default-class lens-family proto-lens-protoc transformers
        ];
        testHaskellDepends = [
          base HUnit lens-family lens-family-core proto-lens
          proto-lens-protoc test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/google/proto-lens";
+       homepage = "https://github.com/google/proto-lens#readme";
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164753,19 +164307,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-optparse_0_1_1_0" = callPackage
+    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
+     mkDerivation {
+       pname = "proto-lens-optparse";
+       version = "0.1.1.0";
+       sha256 = "0m32sb05mjajwli9ivrcblkxyy8hrgi8sm2zwjlrjai6aq0ckh1c";
+       libraryHaskellDepends = [
+         base optparse-applicative proto-lens text
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Adapting proto-lens to optparse-applicative ReadMs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
      , proto-lens-protoc, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
-       version = "0.2.2.0";
-       sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72";
+       version = "0.3.0.0";
+       sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
        ];
-       homepage = "https://github.com/google/proto-lens";
+       homepage = "https://github.com/google/proto-lens#readme";
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164773,25 +164342,26 @@ self: {
 
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
-     , data-default-class, directory, filepath, haskell-src-exts
-     , lens-family, lens-labels, process, proto-lens
-     , proto-lens-descriptors, text
+     , data-default-class, deepseq, directory, filepath
+     , haskell-src-exts, lens-family, lens-labels, pretty, process
+     , proto-lens, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.2.2.3";
-       sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq";
+       version = "0.3.0.0";
+       sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers data-default-class directory
-         filepath haskell-src-exts lens-family lens-labels process
-         proto-lens proto-lens-descriptors text
+         base bytestring Cabal containers data-default-class deepseq
+         directory filepath haskell-src-exts lens-family lens-labels pretty
+         process proto-lens text
        ];
        executableHaskellDepends = [
-         base bytestring containers data-default-class filepath
-         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+         base bytestring containers data-default-class deepseq filepath
+         haskell-src-exts lens-family proto-lens text
        ];
+       homepage = "https://github.com/google/proto-lens#readme";
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165203,29 +164773,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.5.0";
-       sha256 = "1fy2rflmk2g5qkrbdz53wcxbr2nzxlnvkwwf4xf56yhm1ciffgqn";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq fingertree-psqueue ghc-prim
-         hashable mtl PSQueue random unordered-containers
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_6_0" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
      , QuickCheck, random, tagged, test-framework, test-framework-hunit
@@ -165246,7 +164793,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pstemmer" = callPackage
@@ -166016,22 +165562,6 @@ self: {
      }) {};
 
   "pushbullet-types" = callPackage
-    ({ mkDerivation, aeson, base, http-api-data, microlens
-     , microlens-th, scientific, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "pushbullet-types";
-       version = "0.4.0.2";
-       sha256 = "0r6cg0g98b7zzf4sjl4mrpnwmffhz2dnba9bgjw3943xf06afnn1";
-       libraryHaskellDepends = [
-         aeson base http-api-data microlens microlens-th scientific text
-         time unordered-containers
-       ];
-       description = "Datatypes used by the Pushbullet APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pushbullet-types_0_4_1_0" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, microlens
      , microlens-th, scientific, text, time, unordered-containers
      }:
@@ -166045,7 +165575,6 @@ self: {
        ];
        description = "Datatypes used by the Pushbullet APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -166067,31 +165596,6 @@ self: {
      }) {};
 
   "pusher-http-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-types, memory
-     , QuickCheck, scientific, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
-       version = "1.5.1.2";
-       sha256 = "1jrb0ni157a9wa5mbqz1dmd1i7nkjh1nhjyvx52mbk530hslcnnn";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
-         http-client http-types memory text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hspec
-         http-client http-types QuickCheck scientific text time transformers
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/pusher-community/pusher-http-haskell";
-       description = "Haskell client library for the Pusher HTTP API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pusher-http-haskell_1_5_1_3" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, hashable, hspec, http-client, http-types, memory
      , QuickCheck, scientific, text, time, transformers
@@ -166114,7 +165618,6 @@ self: {
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -168452,8 +167955,8 @@ self: {
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.3";
-       sha256 = "0npm55xzb6rv4spqn5mhkq8r43nwm818v6f2c20yv2bzhk11a0qm";
+       version = "0.1.3.1";
+       sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
        libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
        benchmarkHaskellDepends = [
          async base bytestring criterion cryptonite entropy ghc-prim
@@ -168860,20 +168363,6 @@ self: {
      }) {};
 
   "rank2classes" = callPackage
-    ({ mkDerivation, base, doctest, template-haskell, transformers }:
-     mkDerivation {
-       pname = "rank2classes";
-       version = "1.0.1";
-       sha256 = "1m48d5paxagx0916miiya09f8myfv7i4swjbi2yymh80xdjq5wxh";
-       libraryHaskellDepends = [ base template-haskell transformers ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
-       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "rank2classes_1_0_2" = callPackage
     ({ mkDerivation, base, doctest, template-haskell, transformers }:
      mkDerivation {
        pname = "rank2classes";
@@ -169158,31 +168647,6 @@ self: {
      }) {};
 
   "rasterific-svg" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
-     , optparse-applicative, primitive, Rasterific, scientific, svg-tree
-     , text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "rasterific-svg";
-       version = "0.3.3";
-       sha256 = "0jqdqf3y61z98sxdziqhafgsf5m01a00gkfdnv1w4vd6zli8xpaa";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl primitive Rasterific scientific
-         svg-tree text transformers vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath FontyFruity JuicyPixels
-         optparse-applicative Rasterific svg-tree
-       ];
-       description = "SVG renderer based on Rasterific";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rasterific-svg_0_3_3_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
      , optparse-applicative, primitive, Rasterific, scientific, svg-tree
@@ -169205,7 +168669,6 @@ self: {
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rate-limit" = callPackage
@@ -169239,6 +168702,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_1_0_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, hspec, http-client, http-client-tls
+     , http-types, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "1.0.3";
+       sha256 = "1f49nrkvyms9a8q46dpjgcx3h51l1x4zlq6pxnw26bvf8xx0yj4h";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive containers filepath hspec
+         http-client http-client-tls http-types text uuid
+       ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -169255,6 +168741,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "1.0.2";
+       sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rating-systems" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -169286,8 +168789,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.0.5";
-       sha256 = "0yxmym79xrs35lz8qyrkyqa9vihng4p3448085ybwbfqmaqk6pl5";
+       version = "4.0.6";
+       sha256 = "0ph0kcf8rzn99j6c98786x0kdvbxpi355kqzxj0ia5748jk7ds0m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173362,6 +172865,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "req-oauth2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , data-default-class, hspec, http-client, http-types, lens
+     , modern-uri, req, req-url-extra, text, transformers
+     }:
+     mkDerivation {
+       pname = "req-oauth2";
+       version = "0.1.0.0";
+       sha256 = "1qx5f4flyainc0m87fjyn6z65bfh10y6bh6vbbqmyy4m4aw47wia";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring data-default-class
+         http-client http-types lens modern-uri req req-url-extra text
+         transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/rcook/req-oauth2#readme";
+       description = "Provides OAuth2 authentication for use with Req";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "req-url-extra" = callPackage
     ({ mkDerivation, aeson, base, data-default-class, hspec, modern-uri
      , req, text
@@ -176667,29 +176193,6 @@ self: {
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.4";
-       sha256 = "1zss1k1yxa8gky9vx1w8bb8lkbz0nrwzq5n0rhmxary49nhp31n1";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       homepage = "https://github.com/acid-state/safecopy";
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_9_4_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -176710,7 +176213,6 @@ self: {
        homepage = "https://github.com/acid-state/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -176959,8 +176461,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "1.0.0";
-       sha256 = "0s7np2xdzc7sbhyh0hwfx6bznjxji5cg4ymvqncjdcdkb8w31gdk";
+       version = "1.0.2";
+       sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/tfausak/salve#readme";
@@ -177562,6 +177064,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
+  "sbv_7_6" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, data-binary-ieee754, deepseq, directory, doctest
+     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
+     , process, QuickCheck, random, syb, tasty, tasty-golden
+     , tasty-hunit, template-haskell, time, z3
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "7.6";
+       sha256 = "0ycrwmyi1ba5v71qjladn0mn2hlrxdswy5mlx2dxzhrf2r6k6zd9";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array async base containers crackNum data-binary-ieee754 deepseq
+         directory filepath generic-deriving ghc mtl pretty process
+         QuickCheck random syb template-haskell time
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-binary-ieee754 directory doctest
+         filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit
+         template-haskell
+       ];
+       testSystemDepends = [ z3 ];
+       homepage = "http://leventerkok.github.com/sbv/";
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) z3;};
+
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -177755,6 +177286,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scanf" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "scanf";
+       version = "0.1.0.0";
+       sha256 = "0xf3g3dajaci71mgnd7z5xy4a29w40gg43a41x3fvd1a2wpi6xan";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/Lysxia/scanf#readme";
+       description = "Easy and type-safe format strings for parsing and printing";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "scanner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
      , hspec, text
@@ -178142,32 +177686,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.5.2";
-       sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w";
-       revision = "5";
-       editedCabalFile = "19rrdna5f75rc21x6wr9m6x9h7776qbmi4z1cwwipfpij8hah54n";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq hashable integer-gmp
-         integer-logarithms primitive text
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_5_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -178189,7 +177707,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -179701,6 +179218,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semirings" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "semirings";
+       version = "0.0.0";
+       sha256 = "0dc4vi7zlpvz12b9hvq5b6v621aw84hp331rcbn617gpw7dvflcq";
+       doHaddock = false;
+       description = "TBA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "semver" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty
      , tasty-hunit, text
@@ -181078,8 +180606,8 @@ self: {
     ({ mkDerivation, base, servant }:
      mkDerivation {
        pname = "servant-flatten";
-       version = "0.1";
-       sha256 = "00swcc6dkc9nbwj69g96ysbmv9s81g5j39qk39qqapxh34wgrakq";
+       version = "0.2";
+       sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i";
        libraryHaskellDepends = [ base servant ];
        homepage = "https://github.com/alpmestan/servant-flatten";
        description = "Utilities for flattening servant API types";
@@ -182521,18 +182049,6 @@ self: {
      }) {};
 
   "setlocale" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "setlocale";
-       version = "1.0.0.5";
-       sha256 = "1w4zgpjjy56bpgjjcxh2fj3v4pqwmfhfwwvs5nhys12h8y8q8hsp";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
-       description = "Haskell bindings to setlocale";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "setlocale_1_0_0_6" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "setlocale";
@@ -182542,7 +182058,6 @@ self: {
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setoid" = callPackage
@@ -182679,18 +182194,18 @@ self: {
 
   "sexp-grammar" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
-     , criterion, happy, mtl, profunctors, QuickCheck, scientific
-     , semigroups, split, tagged, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, transformers, wl-pprint-text
+     , criterion, happy, mtl, prettyprinter, profunctors, QuickCheck
+     , scientific, semigroups, split, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.2.3";
-       sha256 = "107mfa4g13k6asfwddfbjphjpgnc58ddjir85srz2dmp06paf539";
+       version = "1.3.0";
+       sha256 = "0h9b9rmymfy0qwr51yllapmp7g0j3f70pmhwyzag782giff8q0x3";
        libraryHaskellDepends = [
-         array base bytestring containers mtl profunctors scientific
-         semigroups split tagged template-haskell text transformers
-         wl-pprint-text
+         array base bytestring containers mtl prettyprinter profunctors
+         scientific semigroups split tagged template-haskell text
+         transformers
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -183693,6 +183208,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_7_2" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , system-fileio, system-filepath, text, time, transformers
+     , transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.7.2";
+       sha256 = "04gi3vixi69s95kwbbh0yxmfrkga1aafdp80zs2zfwcai13cfqkn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec hspec-contrib HUnit lifted-async
+         lifted-base monad-control mtl process system-fileio system-filepath
+         text time transformers transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -184875,18 +184421,6 @@ self: {
      }) {};
 
   "simple-reflect" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "simple-reflect";
-       version = "0.3.2";
-       sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
-       description = "Simple reflection of expressions containing variables";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-reflect_0_3_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "simple-reflect";
@@ -184896,7 +184430,6 @@ self: {
        homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
        description = "Simple reflection of expressions containing variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-rope" = callPackage
@@ -185093,8 +184626,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4";
-       sha256 = "13qlnpjl5n6rpvhgn0pdnljx0g7nvjk2xr4mds3nvd93d9ciqcxl";
+       version = "0.4.0.1";
+       sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
          base doctest doctest-discover tasty tasty-quickcheck
@@ -185657,17 +185190,17 @@ self: {
 
   "sized" = callPackage
     ({ mkDerivation, base, constraints, containers, deepseq
-     , equational-reasoning, hashable, lens, ListLike, mono-traversable
-     , monomorphic, singletons, type-natural, vector
+     , equational-reasoning, ghc-typelits-presburger, hashable, lens
+     , ListLike, mono-traversable, singletons, type-natural, vector
      }:
      mkDerivation {
        pname = "sized";
-       version = "0.2.1.1";
-       sha256 = "1agy5yyj6ci89v1jp6k2lj2316h9sap7x65j8n5w7d4ldqsb3i7z";
+       version = "0.3.0.0";
+       sha256 = "1w00s0wgbr1n2x2ariixixy07bhxiyp5728givdrz0xg63gnw1s7";
        libraryHaskellDepends = [
-         base constraints containers deepseq equational-reasoning hashable
-         lens ListLike mono-traversable monomorphic singletons type-natural
-         vector
+         base constraints containers deepseq equational-reasoning
+         ghc-typelits-presburger hashable lens ListLike mono-traversable
+         singletons type-natural vector
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
@@ -188454,32 +187987,6 @@ self: {
      }) {};
 
   "soap" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, configurator
-     , data-default, exceptions, hspec, http-client, http-types, HUnit
-     , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
-     , xml-conduit-writer, xml-types
-     }:
-     mkDerivation {
-       pname = "soap";
-       version = "0.2.3.5";
-       sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs";
-       revision = "3";
-       editedCabalFile = "0kdxd31csfmixq3jps9kqhcbqirrvrlxh4lv07gyb761dpfpc039";
-       libraryHaskellDepends = [
-         base bytestring conduit configurator data-default exceptions
-         http-client http-types iconv mtl resourcet text
-         unordered-containers xml-conduit xml-conduit-writer xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring hspec HUnit text unordered-containers xml-conduit
-         xml-conduit-writer
-       ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
-       description = "SOAP client tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "soap_0_2_3_6" = callPackage
     ({ mkDerivation, base, bytestring, conduit, configurator
      , data-default, exceptions, hspec, http-client, http-types, HUnit
      , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
@@ -188501,7 +188008,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-openssl" = callPackage
@@ -188524,26 +188030,6 @@ self: {
      }) {};
 
   "soap-tls" = callPackage
-    ({ mkDerivation, base, configurator, connection, data-default
-     , http-client, http-client-tls, soap, text, tls, x509, x509-store
-     , x509-validation
-     }:
-     mkDerivation {
-       pname = "soap-tls";
-       version = "0.1.1.2";
-       sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4";
-       revision = "1";
-       editedCabalFile = "0h6jgiifrphdphxfvgk95and4a86xp6afxi90v0b93cs2zyi0vsy";
-       libraryHaskellDepends = [
-         base configurator connection data-default http-client
-         http-client-tls soap text tls x509 x509-store x509-validation
-       ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
-       description = "TLS-enabled SOAP transport (using tls package)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "soap-tls_0_1_1_4" = callPackage
     ({ mkDerivation, base, configurator, connection, data-default
      , http-client, http-client-tls, soap, text, tls, x509, x509-store
      , x509-validation
@@ -188559,7 +188045,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using tls package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sock2stream" = callPackage
@@ -189314,6 +188799,42 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "sparrow" = callPackage
+    ({ mkDerivation, aeson, aeson-attoparsec, async, attoparsec
+     , attoparsec-uri, base, bytestring, deepseq, exceptions
+     , extractable-singleton, hashable, http-client, http-client-tls
+     , http-types, list-t, monad-control, monad-control-aligned, mtl
+     , nested-routes, path, path-extra, pred-trie, stm, strict, text
+     , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
+     , uuid, wai-middleware-content-type, wai-transformers, websockets
+     , websockets-simple, wuss
+     }:
+     mkDerivation {
+       pname = "sparrow";
+       version = "0.0.0";
+       sha256 = "1qjrzfwcscdaz828l1rm0nyr7965kj5bbk777n8l2ylk287xnyjb";
+       libraryHaskellDepends = [
+         aeson aeson-attoparsec async attoparsec attoparsec-uri base
+         bytestring deepseq exceptions extractable-singleton hashable
+         http-client http-client-tls http-types list-t monad-control
+         monad-control-aligned mtl nested-routes path path-extra pred-trie
+         stm strict text tmapchan tmapmvar transformers unordered-containers
+         urlpath uuid wai-middleware-content-type wai-transformers
+         websockets websockets-simple wuss
+       ];
+       testHaskellDepends = [
+         aeson aeson-attoparsec async attoparsec attoparsec-uri base
+         bytestring deepseq exceptions extractable-singleton hashable
+         http-client http-client-tls http-types list-t monad-control
+         monad-control-aligned mtl nested-routes path path-extra pred-trie
+         stm strict text tmapchan tmapmvar transformers unordered-containers
+         urlpath uuid wai-middleware-content-type wai-transformers
+         websockets websockets-simple wuss
+       ];
+       description = "Unified streaming dependency management for web apps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , criterion, deepseq, directory, doctest, filepath, hlint
@@ -192070,27 +191591,6 @@ self: {
      }) {};
 
   "static-text" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty
-     , tasty-hunit, template-haskell, text, vector
-     }:
-     mkDerivation {
-       pname = "static-text";
-       version = "0.2";
-       sha256 = "1rilg9izmw29s33abz5prhzkfay1c482n3y7zbcxjbssvc5c2vhz";
-       libraryHaskellDepends = [
-         base bytestring template-haskell text vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest doctest-discover tasty tasty-hunit
-         template-haskell
-       ];
-       homepage = "https://github.com/dzhus/static-text#readme";
-       description = "Lists, Texts, ByteStrings and Vectors of statically known length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "static-text_0_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty
      , tasty-hunit, template-haskell, text, vector
      }:
@@ -192947,19 +192447,6 @@ self: {
      }) {};
 
   "stopwatch" = callPackage
-    ({ mkDerivation, base, clock, hspec, transformers }:
-     mkDerivation {
-       pname = "stopwatch";
-       version = "0.1.0.4";
-       sha256 = "1hmmn4jf3rwk68himknzm9vy1mxbz4gvv810zp4r351mjcpw5x5r";
-       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_5" = callPackage
     ({ mkDerivation, base, clock, hspec, transformers }:
      mkDerivation {
        pname = "stopwatch";
@@ -192970,7 +192457,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
@@ -193192,30 +192678,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.19.0";
-       sha256 = "0j43znxgsxm8g7vk74hfqyn30ay6371ndmq11xf6qxdnpxn65fgf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_19_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -193237,7 +192699,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -193715,6 +193176,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "streaming-sort" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, exceptions
+     , hspec, QuickCheck, streaming, streaming-binary
+     , streaming-bytestring, streaming-with, transformers
+     }:
+     mkDerivation {
+       pname = "streaming-sort";
+       version = "0.1.0.0";
+       sha256 = "0zv66xdrg457gskfnviic9mmh38zk9vxsigrlbci8a2fwmphmjxg";
+       libraryHaskellDepends = [
+         base binary bytestring directory exceptions streaming
+         streaming-binary streaming-bytestring streaming-with transformers
+       ];
+       testHaskellDepends = [
+         base binary directory exceptions hspec QuickCheck streaming
+         streaming-with transformers
+       ];
+       description = "Sorting streams";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "streaming-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
      , http-client-tls, json-stream, mtl, network, network-simple, pipes
@@ -193792,6 +193274,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_1_1" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, criterion
+     , exceptions, hspec, lifted-base, lockfree-queue, monad-control
+     , mtl, stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.1.1";
+       sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions lifted-base
+         lockfree-queue monad-control mtl stm transformers transformers-base
+       ];
+       testHaskellDepends = [ base containers hspec ];
+       benchmarkHaskellDepends = [ atomic-primops base criterion mtl ];
+       homepage = "https://github.com/composewell/streamly";
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -194481,6 +193986,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_5_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
+     , http-client, http-client-tls, http-types, markdown-unlit
+     , template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "strive";
+       version = "5.0.4";
+       sha256 = "1lj3fqyl1a6nix32y5irvlvsdl518gv7zvz67my5dp5fa3z9hklg";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types template-haskell text time transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types markdown-unlit template-haskell text
+         time transformers
+       ];
+       homepage = "https://github.com/tfausak/strive#readme";
+       description = "A client for the Strava V3 API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -195589,23 +195118,6 @@ self: {
      }) {};
 
   "svg-tree" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
-     , vector, xml
-     }:
-     mkDerivation {
-       pname = "svg-tree";
-       version = "0.6.2.1";
-       sha256 = "03xwx2gr3fi19rdkskxl1jwncngnjra234d378mfxxfvfs820f9q";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "svg-tree_0_6_2_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
      , vector, xml
@@ -195620,7 +195132,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -198142,6 +197653,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tao" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "tao";
+       version = "1.0.0";
+       sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/jship/tao#readme";
+       description = "Type-level assertion operators";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tao-example" = callPackage
+    ({ mkDerivation, base, tao }:
+     mkDerivation {
+       pname = "tao-example";
+       version = "1.0.0";
+       sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5";
+       libraryHaskellDepends = [ base tao ];
+       homepage = "https://github.com/jship/tao#readme";
+       description = "Example usage of the tao package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tar_0_4_1_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time }:
      mkDerivation {
@@ -198428,6 +197963,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_1_1_0_2" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "1.1.0.2";
+       sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -198456,18 +198004,6 @@ self: {
      }) {};
 
   "tasty-expected-failure" = callPackage
-    ({ mkDerivation, base, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-expected-failure";
-       version = "0.11.1";
-       sha256 = "1hr9fgypxz8f9hanxnq6r0gbfdfglcx0c3iqyjximy9sn6nsvndy";
-       libraryHaskellDepends = [ base tagged tasty ];
-       homepage = "http://github.com/nomeata/tasty-expected-failure";
-       description = "Mark tasty tests as failure expected";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-expected-failure_0_11_1_1" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
        pname = "tasty-expected-failure";
@@ -198477,7 +198013,6 @@ self: {
        homepage = "http://github.com/nomeata/tasty-expected-failure";
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-fail-fast" = callPackage
@@ -198594,6 +198129,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hspec_1_1_4" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.4";
+       sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck 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
@@ -199632,8 +199185,8 @@ self: {
     ({ mkDerivation, base, Boolean }:
      mkDerivation {
        pname = "temporal-media";
-       version = "0.6.1";
-       sha256 = "1bmnii427fdpms23p8dinhs1zi34cin3qfap2csgrmsgcn1qs6bc";
+       version = "0.6.2";
+       sha256 = "0dsvpag8j2lfn6nz9wbzcbdfrzmq35ww9n8p5db638b11749sc97";
        libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
@@ -201474,41 +201027,6 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
-     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
-     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
-     , process, QuickCheck, quickcheck-instances, random, semigroups
-     , tagged, template-haskell, terminfo, text, text-show, th-orphans
-     , time, transformers, transformers-compat, unix
-     , unordered-containers, vector, xhtml
-     }:
-     mkDerivation {
-       pname = "text-show-instances";
-       version = "3.6.2";
-       sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5";
-       revision = "3";
-       editedCabalFile = "1nzl40bcg17i98xnlcm5djhriaz6pcmhyzmmd0pavkgyra57arz0";
-       libraryHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
-         random semigroups tagged template-haskell terminfo text text-show
-         time transformers transformers-compat unix unordered-containers
-         vector xhtml
-       ];
-       testHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
-         old-locale old-time pretty process QuickCheck quickcheck-instances
-         random semigroups tagged template-haskell terminfo text text-show
-         th-orphans time transformers transformers-compat unix
-         unordered-containers vector xhtml
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show-instances";
-       description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show-instances_3_6_3" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale
@@ -201540,7 +201058,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -202228,8 +201745,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-printf";
-       version = "0.5.0";
-       sha256 = "1fn1l503x3y5dgv8wsgyxhm66dyvdvfalzmwmsqf86sy643qjpw6";
+       version = "0.5.1";
+       sha256 = "0dgi93pb3zci1isxjmnzhn6apm4pyg12ayz8l1gxlilli8q1z4l6";
        libraryHaskellDepends = [
          ansi-wl-pprint attoparsec base charset containers template-haskell
          text transformers trifecta utf8-string
@@ -202677,24 +202194,6 @@ self: {
      }) {};
 
   "threads" = callPackage
-    ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
-     , test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "threads";
-       version = "0.5.1.5";
-       sha256 = "0phbspm8k2k6w66hv6ldccvy3kc4rjnspj0jwabiwklinkv7wpd1";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base stm ];
-       testHaskellDepends = [
-         base concurrent-extra HUnit stm test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/basvandijk/threads";
-       description = "Fork threads and wait for their result";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threads_0_5_1_6" = callPackage
     ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
      , test-framework, test-framework-hunit
      }:
@@ -202710,7 +202209,6 @@ self: {
        homepage = "https://github.com/basvandijk/threads";
        description = "Fork threads and wait for their result";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threads-extras" = callPackage
@@ -204108,22 +203606,6 @@ self: {
      }) {};
 
   "timezone-olson" = callPackage
-    ({ mkDerivation, base, binary, bytestring, extensible-exceptions
-     , time, timezone-series
-     }:
-     mkDerivation {
-       pname = "timezone-olson";
-       version = "0.1.8";
-       sha256 = "0irpvmqpiw4j2wq4rn3jrndgn2jg10yvrnxvsrb1l6g5b80h2sxr";
-       libraryHaskellDepends = [
-         base binary bytestring extensible-exceptions time timezone-series
-       ];
-       homepage = "http://projects.haskell.org/time-ng/";
-       description = "A pure Haskell parser and renderer for binary Olson timezone files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timezone-olson_0_1_9" = callPackage
     ({ mkDerivation, base, binary, bytestring, extensible-exceptions
      , time, timezone-series
      }:
@@ -204137,7 +203619,6 @@ self: {
        homepage = "http://projects.haskell.org/time-ng/";
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-olson-th" = callPackage
@@ -204157,18 +203638,6 @@ self: {
      }) {};
 
   "timezone-series" = callPackage
-    ({ mkDerivation, base, deepseq, time }:
-     mkDerivation {
-       pname = "timezone-series";
-       version = "0.1.8";
-       sha256 = "1xndlg0n46qjdh5yjzkkg285x3k76073aaizx1ibdzbq9q7dj6c1";
-       libraryHaskellDepends = [ base deepseq time ];
-       homepage = "http://projects.haskell.org/time-ng/";
-       description = "Enhanced timezone handling for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timezone-series_0_1_9" = callPackage
     ({ mkDerivation, base, deepseq, time }:
      mkDerivation {
        pname = "timezone-series";
@@ -204178,7 +203647,6 @@ self: {
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-unix" = callPackage
@@ -204591,27 +204059,6 @@ self: {
      }) {};
 
   "tmapmvar" = callPackage
-    ({ mkDerivation, async, base, containers, hashable, QuickCheck
-     , quickcheck-instances, stm, tasty, tasty-quickcheck
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "tmapmvar";
-       version = "0.0.3";
-       sha256 = "1w5afnh7v04cjwb6qmgmmzgqhqj58rrxl6m31myk2rgd8i9j1fvf";
-       libraryHaskellDepends = [
-         base containers hashable stm unordered-containers
-       ];
-       testHaskellDepends = [
-         async base containers QuickCheck quickcheck-instances stm tasty
-         tasty-quickcheck
-       ];
-       homepage = "https://github.com/athanclark/tmapmvar#readme";
-       description = "A single-entity stateful Map in STM, similar to tmapchan";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tmapmvar_0_0_4" = callPackage
     ({ mkDerivation, async, base, containers, hashable, QuickCheck
      , quickcheck-instances, stm, tasty, tasty-quickcheck
      , unordered-containers
@@ -204629,7 +204076,6 @@ self: {
        ];
        description = "A single-entity stateful Map in STM, similar to tmapchan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmp-postgres" = callPackage
@@ -205597,8 +205043,8 @@ self: {
      }:
      mkDerivation {
        pname = "transfer-db";
-       version = "0.3.1.1";
-       sha256 = "1wgxg576dqivwxfks75nc0yaxxiaf8zyxz0fpay0qgdfwd218f2n";
+       version = "0.3.1.2";
+       sha256 = "1vpcf4k78cnpb5n1bwn2v9l7g38nlgr2y9j8kvmi7ncfvh1nvbqw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205614,6 +205060,7 @@ self: {
          base bytestring cpu hspec QuickCheck sqlcli store time transformers
        ];
        homepage = "http://hub.darcs.net/mihaigiurgeanu/transfer-db";
+       description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -206418,33 +205865,6 @@ self: {
      }) {};
 
   "tries" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-trie, composition
-     , composition-extra, containers, criterion, deepseq, hashable, keys
-     , mtl, QuickCheck, quickcheck-instances, rose-trees, semigroups
-     , sets, tasty, tasty-quickcheck, unordered-containers
-     }:
-     mkDerivation {
-       pname = "tries";
-       version = "0.0.4.2";
-       sha256 = "152rs6g3p6nc4xw3fnh0psmlqmchq038y0p18nandgggsnl2ck0n";
-       libraryHaskellDepends = [
-         base bytestring bytestring-trie composition composition-extra
-         containers deepseq hashable keys QuickCheck quickcheck-instances
-         rose-trees semigroups sets unordered-containers
-       ];
-       testHaskellDepends = [
-         base containers mtl QuickCheck quickcheck-instances tasty
-         tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion mtl rose-trees unordered-containers
-       ];
-       description = "Various trie implementations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tries_0_0_5" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, composition
      , containers, criterion, deepseq, hashable, keys, mtl, QuickCheck
      , quickcheck-instances, rose-trees, semigroups, sets, tasty
@@ -207235,29 +206655,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.5";
-       sha256 = "0iv87zlb5pzn5ljvkf0440gia3mkhn7m35falm3yvyn9d8pz8ym1";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_6" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -207278,7 +206675,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -208233,8 +207629,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.1.2";
-       sha256 = "1phi14lmwyz6qi55vnnjhibglm74xkic2xiwmd1qxkj0dnb423wj";
+       version = "0.1.3";
+       sha256 = "0gv1782vj48v9cybsyc8wqsgndg966gkpnzxaw7s9f2g1c18jj1s";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
@@ -208409,18 +207805,16 @@ self: {
 
   "type-natural" = callPackage
     ({ mkDerivation, base, constraints, equational-reasoning
-     , ghc-typelits-natnormalise, ghc-typelits-presburger, monomorphic
-     , singletons, template-haskell
+     , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
+     , template-haskell
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.7.1.4";
-       sha256 = "1rs0sbkzjlvwjsp4yz7mg4sd2y422vqnzj13fdcssfdmkbs0ybyn";
-       revision = "1";
-       editedCabalFile = "0g75rszhy7fj3riy0j8y6j78m7gx6pp8h4j67zqax6anq3ry12fn";
+       version = "0.8.0.0";
+       sha256 = "0cdym66cvidccimhfpy9i5wa29c1aa6vchnywniyaxlmivqjybj4";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
-         ghc-typelits-presburger monomorphic singletons template-haskell
+         ghc-typelits-presburger singletons template-haskell
        ];
        homepage = "https://github.com/konn/type-natural";
        description = "Type-level natural and proofs of their properties";
@@ -208667,6 +208061,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typed-process_0_2_2_0" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+     , process, stm, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.2.2.0";
+       sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2";
+       libraryHaskellDepends = [
+         async base bytestring process stm transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring hspec process stm temporary
+         transformers
+       ];
+       homepage = "https://haskell-lang.org/library/typed-process";
+       description = "Run external processes, with strong typing of streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -209249,13 +208664,13 @@ self: {
     ({ mkDerivation, base, bytestring, network, resourcet, streaming }:
      mkDerivation {
        pname = "udp-streaming";
-       version = "0.1.0.0";
-       sha256 = "1q03bm8mdbpzalb89sjm71x97znbzddbzfxdr639jzw7516bz5js";
+       version = "0.2.0.0";
+       sha256 = "18xamvak7zr4d826141jqkhs45ij2xgp4s5b2fn955prs0iq7bnb";
        libraryHaskellDepends = [
          base bytestring network resourcet streaming
        ];
        homepage = "https://hub.darcs.net/mihaigiurgeanu/udp-streaming";
-       description = "Simple fire-and-forget udp Streaming components modelled after udp-conduit";
+       description = "Streaming to and from UDP socket";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -210650,17 +210065,16 @@ self: {
   "unjson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , free, hashable, HUnit, invariant, pretty, primitive, scientific
-     , text, time, unordered-containers, vector
+     , semigroups, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "unjson";
-       version = "0.15.1.0";
-       sha256 = "1k61lak22snr7fimpr7pjri33rg0gm1hhfn253bwlz3pvpn85vmp";
-       revision = "1";
-       editedCabalFile = "1icfcg8dbqw48a96w6j9jwa6xf08nms55pfixjwf4332qk7q7hkc";
+       version = "0.15.2.0";
+       sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
-         pretty primitive scientific text time unordered-containers vector
+         pretty primitive scientific semigroups text time
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable HUnit
@@ -210687,27 +210101,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , stm, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.4.0";
-       sha256 = "0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath stm transformers unix
-         unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec stm transformers unix
-         unliftio-core
-       ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_5_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, transformers, unix, unliftio-core
      }:
@@ -210726,6 +210119,27 @@ self: {
        homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "unliftio_0_2_6_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, time, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.6.0";
+       sha256 = "0rmklk2d2ip1mcizqn8j38lbqy58lc8h9hwigvab5ggilxpmnzgq";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm time
+         transformers unix unliftio-core
+       ];
+       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -211243,20 +210657,6 @@ self: {
      }) {};
 
   "uri-bytestring-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
-     mkDerivation {
-       pname = "uri-bytestring-aeson";
-       version = "0.1.0.5";
-       sha256 = "1rcy3afmm1faapnw5y4pbxn4m0h2bp2pa51g3r8lh6gffk1xi9x3";
-       libraryHaskellDepends = [
-         aeson base bytestring text uri-bytestring
-       ];
-       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
-       description = "Aeson instances for URI Bytestring";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring-aeson_0_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
        pname = "uri-bytestring-aeson";
@@ -211268,7 +210668,6 @@ self: {
        homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
        description = "Aeson instances for URI Bytestring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -213339,6 +212738,8 @@ self: {
        pname = "vector-fftw";
        version = "0.1.3.8";
        sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
+       revision = "1";
+       editedCabalFile = "0417f7grdvs3ws508a7k9ngpnisw7f7b6bcmmasflvvr66m6166f";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
        homepage = "http://hackage.haskell.org/package/vector-fftw";
@@ -214468,6 +213869,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_21" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.21";
+       sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       homepage = "https://github.com/jtdaugherty/vty";
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -214657,6 +214094,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai_3_2_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-discover
+     , http-types, network, text, transformers, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.1.2";
+       sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8";
+       libraryHaskellDepends = [
+         base bytestring http-types network text transformers vault
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-accept-language" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, http-types, text
      , wai, wai-app-static, wai-extra, warp, word8
@@ -214742,6 +214198,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-app-static_3_1_6_2" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, cryptonite, directory, file-embed, filepath, hspec
+     , http-date, http-types, memory, mime-types, mockery, network
+     , old-locale, optparse-applicative, template-haskell, temporary
+     , text, time, transformers, unix-compat, unordered-containers, wai
+     , wai-extra, warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.6.2";
+       sha256 = "0gnwq6ad5m8w8sqq4dzpz23l5rjdphfsf8h9h27lrvv1prkabc6h";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers cryptonite
+         directory file-embed filepath http-date http-types memory
+         mime-types old-locale optparse-applicative template-haskell text
+         time transformers unix-compat unordered-containers wai wai-extra
+         warp zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         mockery network old-locale temporary text time transformers
+         unix-compat wai wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-cli" = callPackage
     ({ mkDerivation, ansi-terminal, base, http-types, monads-tf
      , network, options, socket-activation, stm, streaming-commons, unix
@@ -214777,6 +214268,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-conduit_3_0_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, http-types
+     , transformers, wai
+     }:
+     mkDerivation {
+       pname = "wai-conduit";
+       version = "3.0.0.4";
+       sha256 = "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417";
+       libraryHaskellDepends = [
+         base bytestring conduit http-types transformers wai
+       ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "conduit wrappers for WAI";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-cors" = callPackage
     ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
      , case-insensitive, directory, filepath, http-types, mtl, network
@@ -214906,6 +214414,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_22_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , 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.22.1";
+       sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring 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 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -216235,6 +215775,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-websockets_3_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, file-embed
+     , http-types, network, text, transformers, wai, wai-app-static
+     , warp, websockets
+     }:
+     mkDerivation {
+       pname = "wai-websockets";
+       version = "3.0.1.2";
+       sha256 = "0b2xmdsrsqpssyib53wbr6r8hf75789ndyyanv37sv99iyqcwz4i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring case-insensitive http-types network transformers
+         wai websockets
+       ];
+       executableHaskellDepends = [
+         base bytestring case-insensitive file-embed http-types network text
+         transformers wai wai-app-static warp websockets
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provide a bridge between WAI and the websockets package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wait-handle" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -216404,6 +215969,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_18_2" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+     , bytestring, case-insensitive, containers, directory, doctest
+     , gauge, ghc-prim, hashable, hspec, http-client, 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.18.2";
+       sha256 = "01jmwq9a5xxig14qh30w2fspjv4rhprv6q6i6bsv1qy9m9n2mczb";
+       libraryHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         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 bsb-http-chunked bytestring
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec http-client 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
+       ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers gauge hashable http-date
+         http-types network unix unix-compat
+       ];
+       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 {
@@ -216601,8 +216202,8 @@ self: {
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.7.1.1";
-       sha256 = "1d9hh3si3fwbb42y9nlqwp3ccl8gpip65fh75gidfzzricjyw7fw";
+       version = "0.7.1.2";
+       sha256 = "047hdcvrkh4xwyp8i18w45qx7nhd59iii34nrh6ih9k77l6rr4qj";
        libraryHaskellDepends = [
          attoparsec base dlist filepath mtl text transformers vector
        ];
@@ -217475,41 +217076,6 @@ self: {
      }) {};
 
   "websockets" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , blaze-builder, bytestring, case-insensitive, containers
-     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.12.3.1";
-       sha256 = "019jkvmbs5wvjwczqy06spd6545mly08n5pqbsaacmff4xznkz39";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy network random SHA
-         streaming-commons text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy HUnit network QuickCheck random
-         SHA streaming-commons test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers criterion entropy network random SHA
-         text
-       ];
-       doCheck = false;
-       homepage = "http://jaspervdj.be/websockets";
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_12_4_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , bytestring, bytestring-builder, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -217542,7 +217108,6 @@ self: {
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -217619,23 +217184,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-simple_0_1_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
-     , hspec, monad-control, profunctors, stm, tasty, tasty-hspec
-     , transformers, wai-transformers, websockets
+  "websockets-simple_0_1_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , monad-control, profunctors, stm, tasty, tasty-hspec, transformers
+     , vector, wai-transformers, websockets
      }:
      mkDerivation {
        pname = "websockets-simple";
-       version = "0.1.0";
-       sha256 = "0jxqgnrmchn3sabyz0f2733cgvay0ksasc9qnil9kvj0z3n2h4zz";
+       version = "0.1.1";
+       sha256 = "0hakr1vrfj0n3sgax08vsa1bcnddqkizr2fb9pjk9abhw4hn5k2y";
        libraryHaskellDepends = [
-         aeson async base bytestring every exceptions monad-control
-         profunctors stm transformers wai-transformers websockets
+         aeson async base bytestring exceptions monad-control profunctors
+         stm transformers vector wai-transformers websockets
        ];
        testHaskellDepends = [
-         aeson async base bytestring every exceptions hspec monad-control
-         profunctors stm tasty tasty-hspec transformers wai-transformers
-         websockets
+         aeson async base bytestring exceptions hspec monad-control
+         profunctors stm tasty tasty-hspec transformers vector
+         wai-transformers websockets
        ];
        homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Composable websockets clients";
@@ -218011,21 +217576,6 @@ self: {
      }) {};
 
   "wide-word" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "wide-word";
-       version = "0.1.0.5";
-       sha256 = "0aj0jpj2w46fdzvddc76l62cmcwvsndc1vj6z391bybw4q8khlmd";
-       libraryHaskellDepends = [ base deepseq ghc-prim ];
-       testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
-       homepage = "https://github.com/erikd/wide-word";
-       description = "Data types for large but fixed width signed and unsigned integers";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "wide-word_0_1_0_6" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
      , QuickCheck
      }:
@@ -218038,7 +217588,6 @@ self: {
        homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wigner-symbols" = callPackage
@@ -218113,23 +217662,6 @@ self: {
      }) {};
 
   "wild-bind" = callPackage
-    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
-     , stm, text, transformers
-     }:
-     mkDerivation {
-       pname = "wild-bind";
-       version = "0.1.1.0";
-       sha256 = "1z9jiqbla3nxfij6cxcpd5lpgnixz89mhnfr5ksma5khfyc01sis";
-       libraryHaskellDepends = [ base containers text transformers ];
-       testHaskellDepends = [
-         base hspec microlens QuickCheck stm transformers
-       ];
-       homepage = "https://github.com/debug-ito/wild-bind";
-       description = "Dynamic key binding framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind_0_1_1_1" = callPackage
     ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
      , stm, text, transformers
      }:
@@ -218144,7 +217676,6 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "Dynamic key binding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-indicator" = callPackage
@@ -219452,23 +218983,26 @@ self: {
      }) {};
 
   "ws" = callPackage
-    ({ mkDerivation, async, base, bytestring, exceptions, haskeline
-     , mtl, network, network-uri, optparse-applicative, text, websockets
-     , wuss
+    ({ mkDerivation, async, attoparsec, attoparsec-uri, base
+     , bytestring, exceptions, haskeline, mtl, network
+     , optparse-applicative, strict, text, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "ws";
-       version = "0.0.3";
-       sha256 = "01awmbs6dmf9crhp6vvwzh8pjqyjpgjgxzcy62nh52s959snwc9m";
+       version = "0.0.4";
+       sha256 = "00jz7a7x260ix2rg46bmp6c3rjnra9c7j4p0in7cpk2iap28106q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring exceptions haskeline mtl network network-uri
-         text websockets wuss
+         async attoparsec-uri base bytestring exceptions haskeline mtl
+         network text websockets wuss
        ];
        executableHaskellDepends = [
-         base exceptions network-uri optparse-applicative
+         async attoparsec attoparsec-uri base bytestring exceptions
+         haskeline mtl network optparse-applicative strict text vector
+         websockets wuss
        ];
+       homepage = "https://github.com/athanclark/ws#readme";
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219682,6 +219216,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_8" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.8";
+       sha256 = "1isw32n4qdaip350928v7v7cph4p4sb28hva5vd3jvq4309n65df";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -220232,27 +219782,6 @@ self: {
      }) {};
 
   "xeno" = callPackage
-    ({ mkDerivation, array, base, bytestring, criterion, deepseq
-     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
-     , weigh, xml
-     }:
-     mkDerivation {
-       pname = "xeno";
-       version = "0.3.2";
-       sha256 = "14vwfkhfrxpa0mszjlbvm704nnv1xpbnb4klsyifihp7j4hngpp9";
-       libraryHaskellDepends = [
-         array base bytestring deepseq mtl mutable-containers vector
-       ];
-       testHaskellDepends = [ base bytestring hexml hspec ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
-       ];
-       homepage = "https://github.com/ocramz/xeno";
-       description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xeno_0_3_3" = callPackage
     ({ mkDerivation, array, base, bytestring, criterion, deepseq
      , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
      , weigh, xml
@@ -220271,7 +219800,6 @@ self: {
        homepage = "https://github.com/ocramz/xeno";
        description = "A fast event-based XML parser in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xenstore" = callPackage
@@ -220615,36 +220143,6 @@ self: {
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
-     , bytestring, conduit, containers, criterion, data-default, deepseq
-     , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
-     , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xeno
-     , xml-conduit, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.7.0";
-       sha256 = "1fg0y6raxavqnk6hnchjppizc01zszav78hdf38d3c7rgnd0vnmd";
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary-search bytestring conduit
-         containers data-default deepseq errors extra filepath lens mtl
-         network-uri old-locale safe text time transformers vector xeno
-         xml-conduit zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
-         xml-conduit
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "xlsx_0_7_1" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
      , bytestring, conduit, containers, criterion, data-default, deepseq
      , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
@@ -223285,8 +222783,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hmac-keccak";
-       version = "0.0.0.4";
-       sha256 = "17i3xxxdpq58q7y80xrh266lzkl8dh686v25kpapn2r0c4vxm291";
+       version = "0.0.0.5";
+       sha256 = "1va81j58abhfi2hwgiac8d819yisy4g6nxq6l6gh0qvsg5r36j0g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
@@ -224054,11 +223552,14 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-gitrev";
-       version = "0.1.0.0";
-       sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
+       version = "0.2.0.0";
+       sha256 = "0lp0zraj6015bl8pcgi9b9w4d1yf0lb4awy25jv5xrcrc173g7yz";
+       revision = "1";
+       editedCabalFile = "1b0df34lz569gnwbbz0p20dml6bi2nbva9wfdsxyvva0dhvxjaz5";
        libraryHaskellDepends = [
          aeson base gitrev template-haskell yesod-core
        ];
+       homepage = "https://github.com/DanBurton/yesod-gitrev";
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226793,8 +226294,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.8.1";
-       sha256 = "1n6bcblk8ck1xgbyd7gspisg3i3zw3pqzi6s402ivsi03ns0iysv";
+       version = "0.8.2";
+       sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh";
        libraryHaskellDepends = [ base binary bytestring containers ];
        homepage = "https://github.com/stephentetley/zmidi-core";
        description = "Read and write MIDI files";

From 53309758e39eb1ddc302114848d7c70138260de4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:55:12 +0100
Subject: [PATCH 1516/2266] haskell-matrix: the new version has fixed the test
 suite failure

---
 pkgs/development/haskell-modules/configuration-common.nix    | 3 ---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6153c68a0dc..c76f0df91f6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1011,7 +1011,4 @@ self: super: {
     sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
   });
 
-  # https://github.com/Daniel-Diaz/matrix/issues/55
-  matrix_0_3_6_0 = dontCheck super.matrix_0_3_6_0;
-
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 2cc3cdb8eba..c910b0856be 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -705,7 +705,7 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_35;
   timezone-olson = self.timezone-olson_0_1_9;
-  matrix = self.matrix_0_3_6_0;
+  matrix = self.matrix_0_3_6_1;
 
   # https://github.com/pikajude/th-printf/issues/8
   th-printf = doJailbreak super.th-printf;

From a413639a26c03229f3d7639b0cb00f3374cfff76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:55:44 +0100
Subject: [PATCH 1517/2266] haskell-th-printf: drop obsolete override for ghc
 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index c910b0856be..bf450f76ce6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -707,9 +707,6 @@ self: super: {
   timezone-olson = self.timezone-olson_0_1_9;
   matrix = self.matrix_0_3_6_1;
 
-  # https://github.com/pikajude/th-printf/issues/8
-  th-printf = doJailbreak super.th-printf;
-
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
     { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;

From c9777cdf9d8ba789a495e7f833bb6088654c392f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:56:15 +0100
Subject: [PATCH 1518/2266] haskell-SHA: the new version has fixed the test
 suite failure

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c76f0df91f6..935fec829dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1005,10 +1005,4 @@ self: super: {
   # https://github.com/fpco/inline-c/issues/72
   inline-c = dontCheck super.inline-c;
 
-  # Avoid GHC compiler crash a la https://ghc.haskell.org/trac/ghc/ticket/5361.
-  SHA = appendPatch super.SHA (pkgs.fetchpatch {
-    url = https://github.com/GaloisInc/SHA/commit/c258350e953c3de2f98c5625ac3857f1a6863afc.patch;
-    sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
-  });
-
 }

From e4a5fea87fdfa0431c068661c32fc6781b629577 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:56:36 +0100
Subject: [PATCH 1519/2266] haskell-blaze-builder: drop obsolete override for
 ghc 8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index bf450f76ce6..d2b7f369fc8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -301,23 +301,6 @@ self: super: {
 
   ## Unmerged
 
-  ## Unmerged.  PR: https://github.com/lpsmith/blaze-builder/pull/10
-  ## Issue: https://github.com/lpsmith/blaze-builder/issues/12
-  blaze-builder = overrideCabal super.blaze-builder (drv: {
-    ##     • No instance for (Semigroup Poke)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Poke’
-    src = pkgs.fetchFromGitHub {
-      owner  = "bgamari";
-      repo   = "blaze-builder";
-      rev    = "b7195f160795a081adbb9013810d843f1ba5e062";
-      sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## base >=4 && <4.11
-    jailbreak       = true;
-  });
-
   ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3
   bytestring-trie = overrideCabal super.bytestring-trie (drv: {
     ##     • Could not deduce (Semigroup (Trie a))

From 92935aeac850d5ae4ad0a3bd94e1e5a2177a384c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Mar 2018 14:01:36 +0100
Subject: [PATCH 1520/2266] haskell-conduit: drop obsolete override for ghc
 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d2b7f369fc8..9757b485fdd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -662,9 +662,6 @@ self: super: {
       sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
     });
 
-  # 1.3.0.0 does not compile.
-  conduit = self.conduit_1_3_0_1;
-
   # https://github.com/jgm/pandoc-types/issues/37
   pandoc-types = self.pandoc-types_1_17_4_2;
 

From ad1cd53ec875f91fa70493b8e755cf27893d249d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Mar 2018 14:05:03 +0100
Subject: [PATCH 1521/2266] haskell-src: drop obsolete override for ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9757b485fdd..807efe3f61d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -42,9 +42,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Need newer version.
-  haskell-src = super.haskell-src_1_0_3_0;
-
   ## Shadowed:
 
   ## Needs bump to a versioned attribute

From 97d56e94faf202348214f542517fb8947a19690f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Mar 2018 09:18:23 +0100
Subject: [PATCH 1522/2266] haskell-getopt-generics: override to latest version
 for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 807efe3f61d..b39efcbde77 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -683,6 +683,7 @@ self: super: {
   brick = self.brick_0_35;
   timezone-olson = self.timezone-olson_0_1_9;
   matrix = self.matrix_0_3_6_1;
+  getopt-generics = self.getopt-generics_0_13_0_2;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From e8e7e78d9fbc5eb8cfb49d51d796123a79a08799 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 20 Mar 2018 17:22:32 +0100
Subject: [PATCH 1523/2266] titaniumenv: add 7.1 SDK and make it the default

---
 .../mobile/titaniumenv/build-app.nix          |   5 +-
 .../mobile/titaniumenv/default.nix            |   3 +-
 .../mobile/titaniumenv/examples/default.nix   |   2 +-
 .../examples/kitchensink/default.nix          |   2 +-
 .../mobile/titaniumenv/titaniumsdk-7.1.nix    | 102 ++++++++++++++++++
 5 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 4079adaef51..25713a1b88b 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -47,7 +47,7 @@ in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   inherit src;
-  
+
   buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
   
   buildPhase = ''
@@ -84,7 +84,8 @@ stdenv.mkDerivation {
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec
 
           export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH
-          
+          export GRADLE_USER_HOME=$TMPDIR/gradle
+
           ${if release then
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out''
           else
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 031fe3b18c6..6765a9cc5c3 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.3.1.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;
@@ -10,6 +10,7 @@ rec {
   
   titaniumsdk = let
     titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix
+      else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 5753c8d7da9..78f91dd39fb 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -2,7 +2,7 @@
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "9.2"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "6.3.1.GA"
+, tiVersion ? "7.1.0.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2"
 , enableWirelessDistribution ? false, installURL ? null
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 5849ee368c1..42f80cbd9d0 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,4 +1,4 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "6.3.1.GA", release ? false
+{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false
 , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2"
 , enableWirelessDistribution ? false, installURL ? null
 }:
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
new file mode 100644
index 00000000000..61c23a6d0b3
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
@@ -0,0 +1,102 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+let
+  # Gradle is a build system that bootstraps itself. This is what it actually
+  # downloads in the bootstrap phase.
+  gradleAllZip = fetchurl {
+    url = http://services.gradle.org/distributions/gradle-4.1-all.zip;
+    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
+  };
+
+  # A Titanium-Android build requires proguard plugins. We create a fake
+  # repository so that Gradle does not attempt to download them in the builder.
+  # Since there are only 3 plugins required, this is still (sort of) manageable
+  # without a generator.
+  proguardVersion = "5.3.3";
+
+  proguardGradlePOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
+    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
+  };
+  proguardGradleJAR = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
+    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
+  };
+  proguardParentPOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
+    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
+  };
+  proguardBasePOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
+    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
+  };
+  proguardBaseJAR = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
+    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
+  };
+
+  # Put the download plugins in a fake Maven repository
+  fakeMavenRepo = stdenv.mkDerivation {
+    name = "fake-maven-repo";
+    buildCommand = ''
+      mkdir -p $out
+      cd $out
+      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
+      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
+      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
+      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
+      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
+      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
+      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
+      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
+    '';
+  };
+in
+stdenv.mkDerivation {
+  name = "mobilesdk-7.1.0.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip;
+    sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip;
+    sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+
+  buildInputs = [ unzip makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    (yes y | unzip $src) || true
+
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv * 7.1.0.GA
+    cd *
+
+    # Patch bundled gradle build infrastructure to make shebangs work
+    patchShebangs android/templates/gradle
+
+    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
+    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
+    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
+    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
+
+    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
+    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
+
+    # Patch some executables
+
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
+      ''
+      else ""}
+  '';
+}

From 6e78005ef1de6dca89abc6df4877722cc3ed841a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 11:04:43 +0100
Subject: [PATCH 1524/2266] pythonPackages.django_pipeline: 1.5.1 -> 1.6.14

---
 .../django-pipeline/default.nix               | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix
index f29ae365877..58e9d746b97 100644
--- a/pkgs/development/python-modules/django-pipeline/default.nix
+++ b/pkgs/development/python-modules/django-pipeline/default.nix
@@ -1,16 +1,32 @@
-{ lib, buildPythonPackage, fetchPypi
-, django, futures }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, django, futures, mock, jinja2, jsmin, slimit }:
 
 buildPythonPackage rec {
   pname = "django-pipeline";
-  version = "1.5.1";
+  version = "1.6.14";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
+  # no tests on PyPI
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = pname;
+    rev = version;
+    sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j";
   };
 
-  propagatedBuildInputs = [ django futures ];
+  postPatch = ''
+    substituteInPlace tests/tests/test_compiler.py \
+      --replace "/usr/bin/env" ""
+  '';
+
+  propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures;
+
+  checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock;
+
+  checkPhase = ''
+    export PYTHONPATH=.:$PYTHONPATH
+    export DJANGO_SETTINGS_MODULE=tests.settings
+    ${django}/bin/django-admin.py test tests
+  '';
 
   meta = with lib; {
     description = "Pipeline is an asset packaging library for Django";

From fbff08f2f213c8cb09f845f8c4d8bfd40eff2699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 11:20:13 +0100
Subject: [PATCH 1525/2266] pythonPackages.{reviewboard,djblets}: uninit

Djblets is unmaintained: has not been updated since 2015, but had many releases.
Dependency django_pipeline_1_3 is broken and should anyway be removed from pythonPackages because we want to have a consistent package set.
Because the reviewboard package also hasn't been updated since 2015 and depends on djblets, it is removed as well.
---
 pkgs/top-level/python-packages.nix | 50 ------------------------------
 1 file changed, 50 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96d3cd2f75e..5a5012f10d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6885,35 +6885,6 @@ in {
 
   django_pipeline = callPackage ../development/python-modules/django-pipeline { };
 
-  django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
-    name = "django-pipeline-1.3.27";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
-      sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k";
-    };
-  });
-
-
-  djblets = if (versionOlder self.django.version "1.6.11") ||
-               (versionAtLeast self.django.version "1.9")
-            then throw "djblets only suported for Django<1.8.999,>=1.6.11"
-            else buildPythonPackage rec {
-    name = "Djblets-0.9";
-
-    src = pkgs.fetchurl {
-      url = "http://downloads.reviewboard.org/releases/Djblets/0.9/${name}.tar.gz";
-      sha256 = "1rr5vjwiiw3kih4k9nawislf701l838dbk5xgizadvwp6lpbpdpl";
-    };
-
-    propagatedBuildInputs = with self; [
-      django feedparser django_pipeline_1_3 pillowfight pytz ];
-
-    meta = {
-      description = "A collection of useful extensions for Django";
-      homepage = https://github.com/djblets/djblets;
-    };
-  };
-
   dj-database-url = callPackage ../development/python-modules/dj-database-url { };
 
   djmail = callPackage ../development/python-modules/djmail { };
@@ -14404,27 +14375,6 @@ in {
 
   django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
 
-  reviewboard = buildPythonPackage rec {
-    name = "ReviewBoard-2.5.1.1";
-
-    src = pkgs.fetchurl {
-      url = "http://downloads.reviewboard.org/releases/ReviewBoard/2.5/${name}.tar.gz";
-      sha256 = "14m8yy2aqxnnzi822b797wc9nmkfkp2fqmq24asdnm66bxhyzjwn";
-    };
-
-    patchPhase = ''
-      sed -i 's/mimeparse/python-mimeparse/' setup.py
-      sed -i 's/markdown>=2.4.0,<2.4.999/markdown/' setup.py
-    '';
-
-    propagatedBuildInputs = with self;
-      [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup
-        pygments djblets django_evolution pycrypto pysvn pillow
-        psycopg2 django-haystack python_mimeparse markdown django-multiselectfield
-      ];
-  };
-
-
   rdflib = callPackage ../development/python-modules/rdflib { };
 
   isodate = buildPythonPackage rec {

From 061e79806e35b6477d67a9c9ba6b3ed997b4572b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 11:38:02 +0100
Subject: [PATCH 1526/2266] pythonPackages.stem: move expression

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

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
new file mode 100644
index 00000000000..68ad178bd4b
--- /dev/null
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "stem";
+  version = "1.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
+  };
+
+  meta = with lib; {
+    description = "Controller library that allows applications to interact with Tor";
+    homepage = https://stem.torproject.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ phreedom ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a5012f10d1..431ae02c9fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6324,23 +6324,7 @@ in {
 
   schema = callPackage ../development/python-modules/schema {};
 
-  stem = buildPythonPackage rec {
-    name = "stem-${version}";
-    version = "1.6.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/stem/${name}.tar.gz";
-      sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
-    };
-
-    meta = {
-      description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/";
-      homepage = https://stem.torproject.org/;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ phreedom ];
-    };
-
-  };
+  stem = callPackage ../development/python-modules/stem { };
 
   svg-path = buildPythonPackage rec {
     name = "svg.path-${version}";

From 685dd8d21db16ffb3d8888f4f9cd5e6d5dd3c6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:06:31 +0100
Subject: [PATCH 1527/2266] pythonPackages.stem: run unit tests

---
 pkgs/development/python-modules/stem/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index 68ad178bd4b..1df139ab29c 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, python, mock }:
 
 buildPythonPackage rec {
   pname = "stem";
@@ -9,6 +9,18 @@ buildPythonPackage rec {
     sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
   };
 
+  postPatch = ''
+    rm test/unit/installation.py
+    sed -i "/test.unit.installation/d" test/settings.cfg
+  '';
+
+  checkInputs = [ mock ];
+
+  checkPhase = ''
+    touch .gitignore
+    ${python.interpreter} run_tests.py -u
+  '';
+
   meta = with lib; {
     description = "Controller library that allows applications to interact with Tor";
     homepage = https://stem.torproject.org/;

From 12695be641abb28ba4abb42b331431b143938a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:22:32 +0100
Subject: [PATCH 1528/2266] pythonPackages.zope_copy: 4.0.2 -> 4.1.0

---
 .../python-modules/zope_copy/default.nix            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix
index 305928c1846..6bd7ae33fb9 100644
--- a/pkgs/development/python-modules/zope_copy/default.nix
+++ b/pkgs/development/python-modules/zope_copy/default.nix
@@ -8,20 +8,23 @@
 
 
 buildPythonPackage rec {
-  pname = "zope_copy";
-  version = "4.0.2";
+  pname = "zope.copy";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457";
+    sha256 = "702dbb52e2427a1cc2e2b4b3f5a40c64dcbf9ebed85888ae8fa67172263a6994";
   };
 
   propagatedBuildInputs = [ zope_interface ];
 
   checkInputs = [ zope_location zope_schema ];
 
+  checkPhase = ''
+    python -m unittest discover -s src/zope/copy
+  '';
+
   meta = {
     maintainers = with lib.maintainers; [ domenkozar ];
   };
-}
\ No newline at end of file
+}

From a1b9cc79386a0c41789e4bbb6af8ee9ac1472bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:38:29 +0100
Subject: [PATCH 1529/2266] pythonPackages.deform: move expression

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

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
new file mode 100644
index 00000000000..60b8c0814c8
--- /dev/null
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi
+, beautifulsoup4, peppercorn, colander, translationstring
+, chameleon, zope_deprecation, coverage, nose }:
+
+buildPythonPackage rec {
+  pname = "deform";
+  version = "2.0a2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
+  };
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    peppercorn
+    colander
+    translationstring
+    chameleon
+    zope_deprecation
+    coverage
+    nose
+  ];
+
+  meta = with lib; {
+    description = "Form library with advanced features like nested forms";
+    homepage = https://docs.pylonsproject.org/projects/deform/en/latest/;
+    license = licenses.free; # http://www.repoze.org/LICENSE.txt
+    maintainers = with maintainers; [ garbas domenkozar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 431ae02c9fd..81740f34e52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3651,32 +3651,7 @@ in {
 
   decorator = callPackage ../development/python-modules/decorator { };
 
-  deform = buildPythonPackage rec {
-    name = "deform-2.0a2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/deform/${name}.tar.gz";
-      sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
-    };
-
-    buildInputs = with self; [] ++ optional isPy26 unittest2;
-
-    propagatedBuildInputs =
-      [ self.beautifulsoup4
-        self.peppercorn
-        self.colander
-        self.translationstring
-        self.chameleon
-        self.zope_deprecation
-        self.coverage
-        self.nose
-      ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
+  deform = callPackage ../development/python-modules/deform { };
 
   demjson = callPackage ../development/python-modules/demjson { };
 

From 86f21360acb0319509536164046da918d0002dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:44:08 +0100
Subject: [PATCH 1530/2266] pythonPackages.deform: 2.0.a2 -> 2.0.5

---
 .../python-modules/deform/default.nix         | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index 60b8c0814c8..53286b38722 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -1,25 +1,35 @@
 { lib, buildPythonPackage, fetchPypi
-, beautifulsoup4, peppercorn, colander, translationstring
-, chameleon, zope_deprecation, coverage, nose }:
+, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation
+, nose, coverage, beautifulsoup4, flaky }:
 
 buildPythonPackage rec {
   pname = "deform";
-  version = "2.0a2";
+  version = "2.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
+    sha256 = "874d3346a02c500432efdcc73b1a7174aa0ea69cd52a99bb9a812967f54f6f79";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "iso8601<=0.1.11" iso8601
+  '';
+
   propagatedBuildInputs = [
-    beautifulsoup4
-    peppercorn
-    colander
-    translationstring
     chameleon
+    colander
+    iso8601
+    peppercorn
+    translationstring
     zope_deprecation
-    coverage
+  ];
+
+  checkInputs = [
     nose
+    coverage
+    beautifulsoup4
+    flaky
   ];
 
   meta = with lib; {

From 86e007bd31391c4bddf6c1610aa3fb2538896861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:55:22 +0100
Subject: [PATCH 1531/2266] pythonPackages.klein: move expression

---
 .../python-modules/klein/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 ++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/klein/default.nix

diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix
new file mode 100644
index 00000000000..f4748a93277
--- /dev/null
+++ b/pkgs/development/python-modules/klein/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, werkzeug, twisted }:
+
+buildPythonPackage rec {
+  pname = "klein";
+  version = "15.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
+  };
+
+  disabled = isPy3k;
+
+  propagatedBuildInputs = [ werkzeug twisted ];
+
+  meta = with lib; {
+    description = "Klein Web Micro-Framework";
+    homepage    = "https://github.com/twisted/klein";
+    license     = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81740f34e52..246f92e8e73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8835,24 +8835,8 @@ in {
 
   keyutils = callPackage ../development/python-modules/keyutils { };
 
-  klein = buildPythonPackage rec {
-    name = "klein-15.3.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/klein/${name}.tar.gz";
-      sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ werkzeug twisted ];
-
-    meta = {
-      description = "Klein Web Micro-Framework";
-      homepage    = "https://github.com/twisted/klein";
-      license     = licenses.mit;
-    };
-  };
-
+  klein = callPackage ../development/python-modules/klein { };
+ 
   koji = callPackage ../development/python-modules/koji { };
 
   kombu = buildPythonPackage rec {

From b34af91889356f815156adf9dd13263ded5ab773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 13:04:04 +0100
Subject: [PATCH 1532/2266] pythonPackages.klein: 15.3.1 -> 17.10.0

---
 .../development/python-modules/klein/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix
index f4748a93277..3dfbb4e17db 100644
--- a/pkgs/development/python-modules/klein/default.nix
+++ b/pkgs/development/python-modules/klein/default.nix
@@ -1,17 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, werkzeug, twisted }:
+{ lib, buildPythonPackage, fetchPypi
+, six, twisted, werkzeug, incremental
+, mock }:
 
 buildPythonPackage rec {
   pname = "klein";
-  version = "15.3.1";
+  version = "17.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
+    sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0";
   };
 
-  disabled = isPy3k;
+  propagatedBuildInputs = [ six twisted werkzeug incremental ];
 
-  propagatedBuildInputs = [ werkzeug twisted ];
+  checkInputs = [ mock ];
+
+  checkPhase = ''
+    trial klein
+  '';
 
   meta = with lib; {
     description = "Klein Web Micro-Framework";

From 3d989e3d7a27c0c01f97ee5817f5dd1223f13f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 14:30:01 +0100
Subject: [PATCH 1533/2266] pythonPackages.astropy: disable for python 2

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index ccf988fc56d..4ff4841cf5f 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -1,16 +1,18 @@
 { lib
 , fetchPypi
 , buildPythonPackage
+, isPy3k
 , numpy
 , pytest }:
 
 buildPythonPackage rec {
-  
   pname = "astropy";
   version = "3.0";
 
-  name = "${pname}-${version}";
+  disabled = !isPy3k; # according to setup.py
+
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "9e0ad19b9d6d227bdf0932bbe64a8c5dd4a47d4ec078586cf24bf9f0c61d9ecf";
@@ -18,7 +20,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
 
-
   meta = {
     description = "Astronomy/Astrophysics library for Python";
     homepage = http://www.astropy.org;

From 9f54b031fdbda6ebf71fb92222537786039abc75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 15:40:43 +0100
Subject: [PATCH 1534/2266] pythonPackages.WSME: move expression

---
 .../python-modules/WSME/default.nix           | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 29 +-------------
 2 files changed, 41 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/WSME/default.nix

diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
new file mode 100644
index 00000000000..fc2b066ce1e
--- /dev/null
+++ b/pkgs/development/python-modules/WSME/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, pbr, six, simplegeneric, netaddr, pytz, webob
+, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx }:
+
+buildPythonPackage rec {
+  pname = "WSME";
+  version = "0.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
+  };
+
+  checkPhase = ''
+    # remove turbogears tests as we don't have it packaged
+    rm tests/test_tg*
+    # remove flask since we don't have flask-restful
+    rm tests/test_flask*
+    # https://bugs.launchpad.net/wsme/+bug/1510823
+    ${if isPy3k then "rm tests/test_cornice.py" else ""}
+
+    nosetests tests/
+  '';
+
+  nativeBuildInputs = [ pbr ];
+
+  propagatedBuildInputs = [
+    six simplegeneric netaddr pytz webob
+  ];
+
+  checkInputs = [
+    cornice nose webtest pecan transaction cherrypy sphinx
+  ];
+
+  meta = with lib; {
+    description = "Simplify the writing of REST APIs, and extend them with additional protocols";
+    homepage = http://git.openstack.org/cgit/openstack/wsme;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 246f92e8e73..54ec6192016 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11165,34 +11165,7 @@ in {
     };
   };
 
-  WSME = buildPythonPackage rec {
-    name = "WSME-${version}";
-    version = "0.8.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/W/WSME/${name}.tar.gz";
-      sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
-    };
-
-    checkPhase = ''
-      # remove turbogears tests as we don't have it packaged
-      rm tests/test_tg*
-      # remove flask since we don't have flask-restful
-      rm tests/test_flask*
-      # https://bugs.launchpad.net/wsme/+bug/1510823
-      ${if isPy3k then "rm tests/test_cornice.py" else ""}
-
-      nosetests tests/
-    '';
-
-    propagatedBuildInputs = with self; [
-      pbr six simplegeneric netaddr pytz webob
-    ];
-    buildInputs = with self; [
-      cornice nose webtest pecan transaction cherrypy sphinx
-    ];
-  };
-
+  WSME = callPackage ../development/python-modules/WSME { };
 
   zake = buildPythonPackage rec {
     name = "zake-${version}";

From 2773b76f33549f68ca53e4d9f0457314ce87f9e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 16:13:38 +0100
Subject: [PATCH 1535/2266] pythonPackages.WSME: 0.8.0 -> 0.9.2

---
 .../python-modules/WSME/default.nix           | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
index fc2b066ce1e..8cbbd2c767f 100644
--- a/pkgs/development/python-modules/WSME/default.nix
+++ b/pkgs/development/python-modules/WSME/default.nix
@@ -1,27 +1,35 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
 , pbr, six, simplegeneric, netaddr, pytz, webob
-, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx }:
+, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx
+, flask, flask-restful, suds-jurko, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "WSME";
-  version = "0.8.0";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
+    sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976";
   };
 
-  checkPhase = ''
+  postPatch = ''
     # remove turbogears tests as we don't have it packaged
     rm tests/test_tg*
-    # remove flask since we don't have flask-restful
-    rm tests/test_flask*
+    # WSME seems incompatible with recent SQLAlchemy version
+    rm wsmeext/tests/test_sqlalchemy*
     # https://bugs.launchpad.net/wsme/+bug/1510823
     ${if isPy3k then "rm tests/test_cornice.py" else ""}
-
-    nosetests tests/
   '';
 
+  checkPhae = ''
+    nosetests --exclude test_buildhtml \
+              --exlcude test_custom_clientside_error \
+              --exclude test_custom_non_http_clientside_error
+  '';
+
+  # UnicodeEncodeError, ImportError, ...
+  doCheck = !isPy3k;
+
   nativeBuildInputs = [ pbr ];
 
   propagatedBuildInputs = [
@@ -30,6 +38,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     cornice nose webtest pecan transaction cherrypy sphinx
+    flask flask-restful suds-jurko glibcLocales
   ];
 
   meta = with lib; {

From 43d822178bc933bc5dce38d4ff71b50dab081758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 16:33:08 +0100
Subject: [PATCH 1536/2266] pythonPackages.altair: fix build

---
 pkgs/development/python-modules/altair/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index d3cdc0f43f2..d98eba693d2 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -1,17 +1,20 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, vega, pandas, ipython, traitlets }:
+, pytest, glibcLocales, vega, pandas, ipython, traitlets }:
 
 buildPythonPackage rec {
   pname = "altair";
   version = "1.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7";
   };
 
-  buildInputs = [ pytest ];
+  postPatch = ''
+    sed -i "s/vega==/vega>=/g" setup.py
+  '';
+
+  checkInputs = [ pytest glibcLocales ];
 
   checkPhase = ''
     export LANG=en_US.UTF-8
@@ -19,8 +22,6 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ vega pandas ipython traitlets ];
-  # Disabling checks, MockRequest object has no method send()
-  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A declarative statistical visualization library for Python.";

From 175d4ab1db65088c008e667f0423efbf325c179f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 22:14:45 -0400
Subject: [PATCH 1537/2266] lib: Make platform predicates greppable

Should have commited on here and on merged master to begin with, but I
didn't, so instead I cherry-pick.

(cherry picked from commit 88c04a8b6b6714a61c8a28ec8bbd5ecf580ed2c7)
---
 lib/systems/for-meta.nix | 28 ++++++++--------
 lib/systems/inspect.nix  | 70 +++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 0a7a4bf5b0c..fa713b1e613 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -7,21 +7,21 @@ in rec {
   inherit (lib.systems.doubles) all mesaPlatforms;
   none = [];
 
-  arm     = [ patterns.Arm ];
-  aarch64 = [ patterns.Aarch64 ];
-  x86     = [ patterns.x86 ];
-  i686    = [ patterns.i686 ];
-  x86_64  = [ patterns.x86_64 ];
-  mips    = [ patterns.Mips ];
+  arm     = [ patterns.isArm ];
+  aarch64 = [ patterns.isAarch64 ];
+  x86     = [ patterns.isx86 ];
+  i686    = [ patterns.isi686 ];
+  x86_64  = [ patterns.isx86_64 ];
+  mips    = [ patterns.isMips ];
 
-  cygwin  = [ patterns.Cygwin ];
-  darwin  = [ patterns.Darwin ];
-  freebsd = [ patterns.FreeBSD ];
+  cygwin  = [ patterns.isCygwin ];
+  darwin  = [ patterns.isDarwin ];
+  freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
   gnu     = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
-  illumos = [ patterns.SunOS ];
-  linux   = [ patterns.Linux ];
-  netbsd  = [ patterns.NetBSD ];
-  openbsd = [ patterns.OpenBSD ];
-  unix    = patterns.Unix; # Actually a list
+  illumos = [ patterns.isSunOS ];
+  linux   = [ patterns.isLinux ];
+  netbsd  = [ patterns.isNetBSD ];
+  openbsd = [ patterns.isOpenBSD ];
+  unix    = patterns.isUnix; # Actually a list
 }
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index ab220af46e3..a7bd17f68a4 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -5,51 +5,49 @@ with lib.lists;
 
 rec {
   patterns = rec {
-    i686         = { cpu = cpuTypes.i686; };
-    x86_64       = { cpu = cpuTypes.x86_64; };
-    PowerPC      = { cpu = cpuTypes.powerpc; };
-    x86          = { cpu = { family = "x86"; }; };
-    Arm          = { cpu = { family = "arm"; }; };
-    Aarch64      = { cpu = { family = "aarch64"; }; };
-    Mips         = { cpu = { family = "mips"; }; };
-    RiscV        = { cpu = { family = "riscv"; }; };
-    Wasm         = { cpu = { family = "wasm"; }; };
+    isi686         = { cpu = cpuTypes.i686; };
+    isx86_64       = { cpu = cpuTypes.x86_64; };
+    isPowerPC      = { cpu = cpuTypes.powerpc; };
+    isx86          = { cpu = { family = "x86"; }; };
+    isArm          = { cpu = { family = "arm"; }; };
+    isAarch64      = { cpu = { family = "aarch64"; }; };
+    isMips         = { cpu = { family = "mips"; }; };
+    isRiscV        = { cpu = { family = "riscv"; }; };
+    isWasm         = { cpu = { family = "wasm"; }; };
 
-    "32bit"      = { cpu = { bits = 32; }; };
-    "64bit"      = { cpu = { bits = 64; }; };
-    BigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
-    LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
+    is32bit        = { cpu = { bits = 32; }; };
+    is64bit        = { cpu = { bits = 64; }; };
+    isBigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
+    isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
 
-    BSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
-    Unix         = [ BSD Darwin Linux SunOS Hurd Cygwin ];
+    isBSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+    isUnix         = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ];
 
-    Darwin       = { kernel = kernels.darwin; };
-    Linux        = { kernel = kernels.linux; };
-    SunOS        = { kernel = kernels.solaris; };
-    FreeBSD      = { kernel = kernels.freebsd; };
-    Hurd         = { kernel = kernels.hurd; };
-    NetBSD       = { kernel = kernels.netbsd; };
-    OpenBSD      = { kernel = kernels.openbsd; };
-    Windows      = { kernel = kernels.windows; };
-    Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
-    MinGW        = { kernel = kernels.windows; abi = abis.gnu; };
+    isDarwin       = { kernel = kernels.darwin; };
+    isLinux        = { kernel = kernels.linux; };
+    isSunOS        = { kernel = kernels.solaris; };
+    isFreeBSD      = { kernel = kernels.freebsd; };
+    isHurd         = { kernel = kernels.hurd; };
+    isNetBSD       = { kernel = kernels.netbsd; };
+    isOpenBSD      = { kernel = kernels.openbsd; };
+    isWindows      = { kernel = kernels.windows; };
+    isCygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
+    isMinGW        = { kernel = kernels.windows; abi = abis.gnu; };
 
-    Android      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
-    Musl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+    isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
+    isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
 
-    Kexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
-                     [ "x86" "arm" "aarch64" "mips" ];
-    Efi          = map (family: { cpu.family = family; })
-                     [ "x86" "arm" "aarch64" ];
-    Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
-                      [ "x86" "arm" "aarch64" "mips" ];
+    isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
+                       [ "x86" "arm" "aarch64" "mips" ];
+    isEfi          = map (family: { cpu.family = family; })
+                       [ "x86" "arm" "aarch64" ];
+    isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
+                        [ "x86" "arm" "aarch64" "mips" ];
   };
 
   matchAnyAttrs = patterns:
     if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
     else matchAttrs patterns;
 
-  predicates = mapAttrs'
-    (name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
-    patterns;
+  predicates = mapAttrs (_: matchAnyAttrs) patterns;
 }

From c234c01de04ca3e2cff5b126a536f42ab9e0ba95 Mon Sep 17 00:00:00 2001
From: Ken Micklas <kmicklas@gmail.com>
Date: Fri, 16 Mar 2018 15:03:15 -0400
Subject: [PATCH 1538/2266] zoom-us: add desktop item

---
 .../instant-messengers/zoom-us/default.nix         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index e13f0001f02..49311bc5930 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, system, makeWrapper,
+{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
   alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
   libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
 
@@ -88,9 +88,19 @@ in stdenv.mkDerivation {
     Prefix = $packagePath
     EOF
 
-    $postInstallHooks
+    runHook postInstall
   '';
 
+  postInstall = (makeDesktopItem {
+    name = "zoom-us";
+    exec = "$out/bin/zoom-us %U";
+    icon = "$out/share/zoom-us/application-x-zoom.png";
+    desktopName = "Zoom";
+    genericName = "Video Conference";
+    categories = "Network;Application;";
+    mimeType = "x-scheme-handler/zoommtg;";
+  }).buildCommand;
+
   meta = {
     homepage = https://zoom.us/;
     description = "zoom.us video conferencing application";

From 5532cc1641c0d2f2dae2893e5980861bb4fd8062 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 20 Mar 2018 17:39:45 +0100
Subject: [PATCH 1539/2266] titaniumenv: remove obsolete java fix wrapper on
 darwin

---
 .../mobile/titaniumenv/build-app.nix          | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 25713a1b88b..a6bf05c2465 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -15,34 +15,12 @@ let
     abiVersions = androidAbiVersions;
     useGoogleAPIs = true;
   };
-  
+
   deleteKeychain = ''
     security default-keychain -s login.keychain
     security delete-keychain $keychainName
     rm -f $HOME/lock-keychain
   '';
-  
-  # On macOS, the java executable shows an -unoffical postfix in the version
-  # number. This confuses the build script's version detector.
-  # We fix this by creating a wrapper that strips it out of the output.
-  
-  javaVersionFixWrapper = stdenv.mkDerivation {
-    name = "javaVersionFixWrapper";
-    buildCommand = ''
-      mkdir -p $out/bin
-      cat > $out/bin/javac <<EOF
-      #! ${stdenv.shell} -e
-      
-      if [ "\$1" = "-version" ]
-      then
-          ${jdk}/bin/javac "\$@" 2>&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2
-      else
-          exec ${jdk}/bin/javac "\$@"
-      fi
-      EOF
-      chmod +x $out/bin/javac
-    '';
-  };
 in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
@@ -74,13 +52,6 @@ stdenv.mkDerivation {
     
     ${if target == "android" then
         ''
-          ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-            # Hack to make version detection work with OpenJDK on macOS
-            export PATH=${javaVersionFixWrapper}/bin:$PATH
-            export JAVA_HOME=${javaVersionFixWrapper}
-            javac -version
-          ''}
-
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec
 
           export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH

From 0e9d1fad4d42ef72f34140641804f16f6db8c198 Mon Sep 17 00:00:00 2001
From: Ken Micklas <kmicklas@gmail.com>
Date: Tue, 20 Mar 2018 12:40:04 -0400
Subject: [PATCH 1540/2266] zoom-us: fix preInstall

---
 .../networking/instant-messengers/zoom-us/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 49311bc5930..03b4b980929 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
   ];
 
   installPhase = ''
-    $preInstallHooks
+    runHook preInstall
 
     packagePath=$out/share/zoom-us
     mkdir -p $packagePath

From 8add42f90c5457a256225469d4a6d865e967b87d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 20 Mar 2018 16:40:35 +0000
Subject: [PATCH 1541/2266] nix-serve: patch for nix 2.0 (#37459)

Fixes incompatible secret file handling. See https://github.com/edolstra/nix-serve/pull/8
---
 pkgs/tools/package-management/nix-serve/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index dadcab1ea4f..d03e6f614e5 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub,
+{ stdenv, fetchFromGitHub, fetchpatch,
   bzip2, nix, perl, perlPackages,
 }:
 
 with stdenv.lib;
 
 let
-  rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d";
-  sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+  rev = "e4675e38ab54942e351c7686e40fabec822120b9";
+  sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
 in
 
 stdenv.mkDerivation rec {

From 3c8ae01a45196759cd01de639f0d200fdfcb6d77 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 11:46:12 -0400
Subject: [PATCH 1542/2266] lib: Make `platforms.all` actually match all
 platforms

Otherwise obscure cross-compilations are hampered. `all` breaks all but
the initial derivation (which we can't even write yet) in an open world
setting however, so we really shouldn't have it.
---
 lib/systems/for-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index fa713b1e613..3402fa0ca19 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -4,8 +4,8 @@ let
   inherit (lib.systems.inspect) patterns;
 
 in rec {
-  inherit (lib.systems.doubles) all mesaPlatforms;
-  none = [];
+  all     = [ {} ]; # `{}` matches anything
+  none    = [];
 
   arm     = [ patterns.isArm ];
   aarch64 = [ patterns.isAarch64 ];
@@ -24,4 +24,6 @@ in rec {
   netbsd  = [ patterns.isNetBSD ];
   openbsd = [ patterns.isOpenBSD ];
   unix    = patterns.isUnix; # Actually a list
+
+  inherit (lib.systems.doubles) mesaPlatforms;
 }

From d9a1800239620425ef3608487f87002b1a4d1437 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 12:31:07 -0400
Subject: [PATCH 1543/2266] lib: Add `lib.platforms.windows`

---
 lib/systems/for-meta.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 3402fa0ca19..63f24b46535 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -24,6 +24,7 @@ in rec {
   netbsd  = [ patterns.isNetBSD ];
   openbsd = [ patterns.isOpenBSD ];
   unix    = patterns.isUnix; # Actually a list
+  windows = [ patterns.isWindows ];
 
   inherit (lib.systems.doubles) mesaPlatforms;
 }

From 87420118242bf77e71e4d712db7416789b974699 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 09:49:12 -0700
Subject: [PATCH 1544/2266] lazarus: 1.8.0 -> 1.8.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.8.2 with grep in /nix/store/z3r30kr064x672zqnrs1pwzshlvgnv9n-lazarus-1.8.2
- found 1.8.2 in filename of file in /nix/store/z3r30kr064x672zqnrs1pwzshlvgnv9n-lazarus-1.8.2
- directory tree listing: https://gist.github.com/895d2d01174298ff36a30bc7387286a2
---
 pkgs/development/compilers/fpc/lazarus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index e646debd9d7..0793a9d7ed0 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -8,10 +8,10 @@ stdenv, fetchurl
 let
   s =
   rec {
-    version = "1.8.0";
+    version = "1.8.2";
     versionSuffix = "";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "0i58ngrr1vjyazirfmz0cgikglc02z1m0gcrsfw9awpi3ax8h21j";
+    sha256 = "06ajdnyba3v3d37mjq1yim96hsmbx1w5n695m5zlhjbydgw62a15";
     name = "lazarus-${version}";
   };
   buildInputs = [

From e38d28840dabb21e53c73a44aa0089804f46955f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 09:53:14 -0700
Subject: [PATCH 1545/2266] lua51Packages.lgi: 0.9.1 -> 0.9.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/q6lcshhmi0dn8ndz2jz9nlircfww4fcm-lgi-0.9.2
- directory tree listing: https://gist.github.com/48d4d638fbd1169b1c96b7e506202b93
---
 pkgs/top-level/lua-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 75f2ab9e582..0cc4482f402 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -696,13 +696,13 @@ let
 
   lgi = stdenv.mkDerivation rec {
     name = "lgi-${version}";
-    version = "0.9.1";
+    version = "0.9.2";
 
     src = fetchFromGitHub {
       owner = "pavouk";
       repo = "lgi";
       rev = version;
-      sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9";
+      sha256 = "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj";
     };
 
     nativeBuildInputs = [ pkgconfig ];

From e49c14c35b73d464d0b3070de7802ca309f7bb6b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 12:31:43 -0400
Subject: [PATCH 1546/2266] libatomic_ops: Allow Building on Windows too

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

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index fe4cd3ca0a9..04cf1c1e696 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = with stdenv.lib.platforms; unix ++ windows;
   };
 }

From 65e24f22e69ea18b5ec638f89a87e070d4e2154a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 11:51:37 -0400
Subject: [PATCH 1547/2266] haskell-generic-builder: Default to window + unix
 platforms,

Since GHC is a cross compiler, it's perfectly possible to make haskell
binaries on platforms without GHCs. `windows ++ unix` seems good enough
for now.

Also don't default `hydraPlatforms` to `platforms`. The former must be a
list of systems (strings), but the latter is a list of systems or
patterns.
---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1a788ae642e..3cdf2e2252b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,8 +34,8 @@ in
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
-, platforms ? ghc.meta.platforms
-, hydraPlatforms ? platforms
+, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
+, hydraPlatforms ? null
 , hyperlinkSource ? true
 , isExecutable ? false, isLibrary ? !isExecutable
 , jailbreak ? false
@@ -404,7 +404,7 @@ stdenv.mkDerivation ({
          // optionalAttrs broken               { inherit broken; }
          // optionalAttrs (description != "")  { inherit description; }
          // optionalAttrs (maintainers != [])  { inherit maintainers; }
-         // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; }
+         // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; }
          ;
 
 }

From aec57cfabe44acf0b87fa0bf9512da6b808f3c5f Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Mon, 19 Mar 2018 16:45:37 -0400
Subject: [PATCH 1548/2266] mingw-w64: Add enable-idl / enable-secure-api flags

---
 pkgs/os-specific/windows/mingw-w64/common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
index ece2586dc80..05f2fbe5a86 100644
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -8,4 +8,9 @@ rec {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
     sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
   };
+
+  configureFlags = [
+    "--enable-idl"
+    "--enable-secure-api"
+  ];
 }

From 1d3db8139ea1e15d02b77e6ac0c20426fa9301cf Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Tue, 27 Feb 2018 09:46:03 +0800
Subject: [PATCH 1549/2266] mingw-w64: 4.0.6 -> 5.0.3

This came up with GHC, as GHC requires `_(un)lock_file`, which are only present in mingw-w64 >= 5.
---
 pkgs/os-specific/windows/mingw-w64/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
index 05f2fbe5a86..102d9489fe9 100644
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -1,12 +1,12 @@
 { fetchurl }:
 
 rec {
-  version = "4.0.6";
+  version = "5.0.3";
   name = "mingw-w64-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
-    sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
+    sha256 = "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a";
   };
 
   configureFlags = [

From 7e1a1889a78006200cf0b3c16d22d2063acd287d Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 20 Mar 2018 18:19:58 +0100
Subject: [PATCH 1550/2266] journalbeat: 5.6.0 -> 5.6.8

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

diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index b914ffaa0cb..20951fe5240 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -7,7 +7,7 @@ let
 in buildGoPackage rec {
 
   name = "journalbeat-${version}";
-  version = "5.6.0";
+  version = "5.6.8";
 
   goPackagePath = "github.com/mheese/journalbeat";
 
@@ -23,7 +23,7 @@ in buildGoPackage rec {
     owner = "mheese";
     repo = "journalbeat";
     rev = "v${version}";
-    sha256 = "0b5yqzw1h945mwwyy7cza6bc7kzv3x1p9w2xkzmvr7rw3pd32r06";
+    sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a";
   };
 
   meta = with lib; {

From 7db841512abf6484155448504f1c2f3586db8d9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Mar 2018 18:26:13 +0100
Subject: [PATCH 1551/2266] Remove obsolete
 /nix/var/nix/{manifests,channel-cache}

---
 doc/languages-frameworks/haskell.md        | 4 +---
 lib/tests/release.nix                      | 1 -
 nixos/modules/services/misc/nix-daemon.nix | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 764fae3ce93..1623e0d276f 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -689,9 +689,7 @@ might be necessary to purge the local caches that store data from those
 machines to disable these binary channels for the duration of the previous
 command, i.e. by running:
 ```shell
-rm /nix/var/nix/binary-cache-v3.sqlite
-rm /nix/var/nix/manifests/*
-rm /nix/var/nix/channel-cache/*
+rm ~/.cache/nix/binary-cache*.sqlite
 ```
 
 ### Builds on Darwin fail with `math.h` not found
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 9904a25ecc4..d9a8a006725 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -13,7 +13,6 @@ pkgs.stdenv.mkDerivation {
     export NIX_DB_DIR=$TEST_ROOT/db
     export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
     export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
-    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
     export NIX_STATE_DIR=$TEST_ROOT/var/nix
     export NIX_STORE_DIR=$TEST_ROOT/store
     export PAGER=cat
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 484079ed62d..ea964fd68e4 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -445,12 +445,10 @@ in
         mkdir -m 0755 -p \
           /nix/var/nix/gcroots \
           /nix/var/nix/temproots \
-          /nix/var/nix/manifests \
           /nix/var/nix/userpool \
           /nix/var/nix/profiles \
           /nix/var/nix/db \
-          /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache
+          /nix/var/log/nix/drvs
         mkdir -m 1777 -p \
           /nix/var/nix/gcroots/per-user \
           /nix/var/nix/profiles/per-user \

From f1f6b462fff6e84031a522adb311991b8a173570 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 10:34:42 -0700
Subject: [PATCH 1552/2266] libfixposix: 0.4.1 -> 0.4.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.4.3 with grep in /nix/store/ksrz74w4gzxb2mf8yb3f3i67i80cr93v-libfixposix-0.4.3
- directory tree listing: https://gist.github.com/ddc89b6def68fbc70c046bfdaa1c02b8
---
 pkgs/development/libraries/libfixposix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index f56dc60771d..2d2d56dda4f 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name="libfixposix-${version}";
-  version="0.4.1";
+  version="0.4.3";
 
   src = fetchFromGitHub {
     owner = "sionescu";
     repo = "libfixposix";
     rev = "v${version}";
-    sha256 = "19wjb43mn16f4lin5a2dfi3ym2hy7kqibs0z631d205b16vxas15";
+    sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 7c3b57c7cd3352cad10412876b7d1f858ffdf025 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 11:26:03 -0700
Subject: [PATCH 1553/2266] mpd_clientlib: 2.13 -> 2.14

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.14 with grep in /nix/store/8q00s6prlgljs1imp7r40rq3jyafzlhc-libmpdclient-2.14
- found 2.14 in filename of file in /nix/store/8q00s6prlgljs1imp7r40rq3jyafzlhc-libmpdclient-2.14
- directory tree listing: https://gist.github.com/acd3295fdde722768ff964a7284a00c4
---
 pkgs/servers/mpd/clientlib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index dab63a5bad8..478d4372267 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  version = "2.13";
+  version = "2.14";
   name = "libmpdclient-${version}";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "libmpdclient";
     rev    = "v${version}";
-    sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq";
+    sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm";
   };
 
   nativeBuildInputs = [ meson ninja ]

From 9836ae98e76e9007bff7805f64d0b344432e0b80 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 11:44:29 -0700
Subject: [PATCH 1554/2266] libsForQt5.libopenshot: 0.1.7 -> 0.1.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.1.9 with grep in /nix/store/nrg54a2kxlz3r8c4wf2if5vzq0y452fs-libopenshot-0.1.9
- found 0.1.9 in filename of file in /nix/store/nrg54a2kxlz3r8c4wf2if5vzq0y452fs-libopenshot-0.1.9
- directory tree listing: https://gist.github.com/a521e923923cd5ac4f188b8dede33a2e
---
 pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 02a19c935e7..f84e2e83761 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.1.7";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
+    sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3";
   };
 
   patchPhase = ''

From e675217786da54caa39115193e667194309807c8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 12:04:55 -0700
Subject: [PATCH 1555/2266] krita: 3.3.3 -> 4.0.0 (#37461)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0.0 with grep in /nix/store/k8xscjzkd9w5n6hly18qcwgg62m3fjh9-krita-4.0.0
- directory tree listing: https://gist.github.com/c2d48bc58cc453eac241620389f2b9ce
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 1f7e779e88a..f74ad3c877c 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "3.3.3";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y";
+    sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From 792161895fbdf29e58bdf5ec168317d4174885f3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Mar 2018 22:06:14 +0300
Subject: [PATCH 1556/2266] steam: add dependencies for Surviving Mars

---
 pkgs/games/steam/chrootenv.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index ce6e86c50b8..e896c74ca35 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -109,6 +109,7 @@ in buildFHSUserEnv rec {
     networkmanager098
 
     # Verified games requirements
+    xorg.libXt
     xorg.libXmu
     xorg.libxcb
     libGLU
@@ -121,6 +122,9 @@ in buildFHSUserEnv rec {
     openssl
     libidn
     tbb
+    wayland
+    mesa_noglu
+    libxkbcommon
 
     # Other things from runtime
     flac

From ab67f36e7376e6e5d09f5bdfb00944ef2f7abaf0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Mar 2018 22:15:56 +0300
Subject: [PATCH 1557/2266] xdg_utils: fix xdg-screensaver

---
 pkgs/tools/X11/xdg-utils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 52ecdc26734..28839891aa5 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, which, gnugrep, gnused, coreutils
+, w3m, which, gnugrep, gnused, coreutils, xset
 , mimiSupport ? false, gawk ? null }:
 
 assert mimiSupport -> gawk != null;
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     file()  { ${file}/bin/file      "$@"; }\
     awk()   { ${gawk}/bin/awk       "$@"; }\
     sort()  { ${coreutils}/bin/sort "$@"; }\
+    xset()  { ${xset}/bin/xset      "$@"; }\
     &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \

From 918edbe485333376549aef70f923dd224bca6395 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 5 Mar 2018 21:33:49 +0800
Subject: [PATCH 1558/2266] haskell-generic-builder: Add `enableHsc2hsViaAsm`
 for Windows cross compilation

---
 pkgs/development/haskell-modules/generic-builder.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3cdf2e2252b..45299e01369 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -32,6 +32,7 @@ in
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
 , enableStaticLibraries ? true
+, enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
 , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
@@ -114,9 +115,13 @@ let
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
     "--with-gcc=${stdenv.cc.targetPrefix}cc"
     "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
-    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one
+    # use the one that comes with the cross compiler.
+    "--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
     "--with-strip=${stdenv.cc.bintools.targetPrefix}strip"
-  ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]);
+  ] ++ optionals (!isHaLVM) [
+    "--hsc2hs-option=--cross-compile"
+    (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
+  ];
 
   crossCabalFlagsString =
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);

From abf27609c6ffd4d90932219a2c839679fbeb0da3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@yahoo.com>
Date: Tue, 1 Aug 2017 13:15:08 -0400
Subject: [PATCH 1559/2266] top-level: Move comma for stylistic consistency

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

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 9cf9eb4db65..da7fc1bed34 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -22,9 +22,9 @@
   # `*Platform`s.
   localSystem
 
-  # The system packages will ultimately be run on. Null if the two should be the
+, # The system packages will ultimately be run on. Null if the two should be the
   # same.
-, crossSystem ? null
+  crossSystem ? null
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}

From 8727284a4b211556f59d700c41fa40ec33a78cd2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Mar 2018 14:38:40 -0500
Subject: [PATCH 1560/2266] haskell: only use glibcLocales when using glibc

Fixes eval w/musl.

Possible alternative would be using glibcLocales
when it is non-null, to avoid duplicating the logic.
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1a788ae642e..0f948f42f25 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -386,7 +386,7 @@ stdenv.mkDerivation ({
       buildInputs = systemBuildInputs;
       nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs;
       LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''
         export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
         export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
@@ -430,5 +430,5 @@ stdenv.mkDerivation ({
 // optionalAttrs (postFixup != "")      { inherit postFixup; }
 // optionalAttrs (dontStrip)            { inherit dontStrip; }
 // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; }
-// optionalAttrs (buildPlatform.isLinux){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
+// optionalAttrs (buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
 )

From 45e253cacbd272f9bab414b260dd5bf5331d0409 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 16:25:54 -0400
Subject: [PATCH 1561/2266] cross stdenv: Make depsBuildBuild overrideable by
 config too.

---
 pkgs/stdenv/cross/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 8da3555c6c6..6e306571853 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -10,9 +10,15 @@ let
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
 
-in bootStages ++ [
+in lib.init bootStages ++ [
 
-  # Build Packages
+  # Regular native packages
+  (somePrevStage: lib.last bootStages somePrevStage // {
+    # It's OK to change the built-time dependencies
+    allowCustomOverrides = true;
+  })
+
+  # Build tool Packages
   (vanillaPackages: {
     inherit config overlays;
     selfBuild = false;

From 300a28bb31cf3f0de962e0b9313c3ba2c4879b38 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Tue, 20 Mar 2018 17:37:23 +0100
Subject: [PATCH 1562/2266] todolist: init at 0.8

---
 maintainers/maintainer-list.nix             |  5 +++++
 pkgs/applications/misc/todolist/default.nix | 22 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/todolist/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 867cd0b4888..369508f842c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3670,6 +3670,11 @@
     github = "utdemir";
     name = "Utku Demir";
   };
+  uvnikita = {
+    email = "uv.nikita@gmail.com";
+    github = "uvNikita";
+    name = "Nikita Uvarov";
+  };
   uwap = {
     email = "me@uwap.name";
     github = "uwap";
diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix
new file mode 100644
index 00000000000..61e10b6d1a6
--- /dev/null
+++ b/pkgs/applications/misc/todolist/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "todolist-${version}";
+  version = "0.8";
+
+  goPackagePath = "github.com/gammons/todolist";
+
+  src = fetchFromGitHub {
+    owner = "gammons";
+    repo = "todolist";
+    rev = "${version}";
+    sha256 = "0agv9a44q81qr960b7m1jxk0pb8ahk6lvmzmijvw4v6mbip2720z";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Simple GTD-style todo list for the command line";
+    homepage = "http://todolist.site";
+    license = licenses.mit;
+    maintainers = with maintainers; [ uvnikita ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9966f862f90..007a128f18a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8204,6 +8204,8 @@ with pkgs;
 
   texi2mdoc = callPackage ../tools/misc/texi2mdoc { };
 
+  todolist = callPackage ../applications/misc/todolist { };
+
   travis = callPackage ../development/tools/misc/travis { };
 
   tweak = callPackage ../applications/editors/tweak { };

From cc6dc2cefc0f534283ab22de0a63e65da71d8568 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 13:22:09 -0700
Subject: [PATCH 1563/2266] libyamlcpp: 0.6.1 -> 0.6.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.2 with grep in /nix/store/cfm3y6c18a0ys0ndbv4g4zixay7zh331-libyaml-cpp-0.6.2
- found 0.6.2 in filename of file in /nix/store/cfm3y6c18a0ys0ndbv4g4zixay7zh331-libyaml-cpp-0.6.2
- directory tree listing: https://gist.github.com/54fa524e8988d3fbe9920824135802a0
---
 pkgs/development/libraries/libyaml-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index fc4c280d47c..ff09aeab2c6 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libyaml-cpp-${version}";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
     rev = "yaml-cpp-${version}";
-    sha256 = "16x53p9gfch7gpyg865j7m1zhqsixx2hbbd206ffjv0ip8cjipjf";
+    sha256 = "16lclpa487yghf9019wymj419wkyx4795wv9q7539hhimajw9kpb";
   };
 
   outputs = [ "out" "dev" ];

From c1912bdedec2d7924c8c4b6d31cb9fe425cfb8ee Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 13:39:39 -0700
Subject: [PATCH 1564/2266] libtirpc: 1.0.2 -> 1.0.3 (#37487)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.3 with grep in /nix/store/npaq7mvly8z13h38c8g1x0y4ggxi77k0-libtirpc-1.0.3
- directory tree listing: https://gist.github.com/ad3687f7d46ffd3201e6fbe6e2e090b9
---
 pkgs/development/libraries/ti-rpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index d34a6dca783..aa134d35104 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-1.0.2";
+  name = "libtirpc-1.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";
+    sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6";
   };
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl

From 00fb7d29bfd860b8593caa2906281a9afb27bb62 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Mar 2018 15:48:50 -0500
Subject: [PATCH 1565/2266] vim-plugins: updates!

Only updated the ones I have experience with,
so this is not exhaustive.
---
 pkgs/misc/vim-plugins/default.nix | 126 +++++++++++++++---------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bce13612fd6..3198086ffb6 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -309,11 +309,11 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2018-03-06";
+    name = "The_NERD_tree-2018-03-13";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "ed446e5cbe0733a8f98befc88d33e42edebb67d2";
-      sha256 = "0i5qy8lb8w5ri30905i7411754g2vzj4jlccak5lj852vyzgdp56";
+      rev = "a172d7cfcb4fe9b927dcc24184204fc89d826301";
+      sha256 = "1nfk1j2n2jgrdhcahva1kq3qjj4fdn1x20xxvgl88v3j3fj62n0f";
     };
     dependencies = [];
 
@@ -493,11 +493,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2018-01-25";
+    name = "fugitive-2018-03-14";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "b82abd5bd583cfb90be63ae12adc36a84577bd45";
-      sha256 = "0y3fkw7f5gqb339qlby19f444085c929gjbmbibmgig7hrarqrz4";
+      rev = "3e0bd86b99c50691f830d9e25a4bbe2a88078f8f";
+      sha256 = "1prfb0m61r499i35qn1ql2pag5w64mhpkby4wbbvlpm50xwq8w9b";
     };
     dependencies = [];
 
@@ -661,11 +661,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-03-07";
+    name = "neomake-2018-03-18";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "666e20797f8e8c9d2fdab906d313a5b9714543f0";
-      sha256 = "0wx82bal16jfq1kk2rxrpl79brqfhpdmwbx55wggh7rc893ll4v4";
+      rev = "b225234f71983ed95aac6efb8e4c43ee950a4f20";
+      sha256 = "19v0c710yyjd0rlhz43frsh1kcdnj602xz7flqfpv6kbcr5lsq22";
     };
     dependencies = [];
 
@@ -826,11 +826,11 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-03-11";
+    name = "vim-2018-03-19";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "1f44625290f0f1488f7056e166f69ee6f171d273";
-      sha256 = "0xs5mbqgs5nvymiiwgbycb278v9mmjm3pxybqlyg5r09ri6ncfkq";
+      rev = "0743d3d7b3769d012827bc8d1e5375164791cc2f";
+      sha256 = "0fxkwvz3a8gpcg958hikpkn8rrhivb40yybvm1lrab5vzzbpphb3";
     };
     dependencies = [];
 
@@ -892,11 +892,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2018-02-28";
+    name = "vim-elixir-2018-03-20";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "bd75abb934c97a3d6d753f019e0f3aef3c132c2e";
-      sha256 = "1qic3av5avf50dvxkz1iq98impdabflk64xj5wmzr9iag1p0qwz9";
+      rev = "99022e6a7df9581109a26a369eb12d87eeabb2dc";
+      sha256 = "1gs9f0mgp17iib7pxc79gjifwr8qzvl48ybjp985qvlbf5bq0n9z";
     };
     dependencies = [];
 
@@ -969,11 +969,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-03-07";
+    name = "vim-go-2018-03-20";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "d2b0a234ffb5441a3488c78fe8e5f551ddbdd454";
-      sha256 = "1qcy1w9p23gxrii4ddg6mn8kn4i9d0q3rmkrblvxhbk7snxbh7n8";
+      rev = "37e2587aa82fc7a7106a95e86fa54ae54ecb744b";
+      sha256 = "00sgij05fs0mqvd1cw4rrym0zv8h45kfiihijwmrlw72jqhys919";
     };
     dependencies = [];
 
@@ -1376,11 +1376,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-03-10";
+    name = "vimtex-2018-03-20";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "38a434a38a11d10da43dea1aac8f1143404c3eaf";
-      sha256 = "0hz807i3byhrvbv98rl8k4r3n6dyninaqlr1kga95dllg6xr0k5p";
+      rev = "17d809706edcb277f1ee7fa5e33aff3619926fe4";
+      sha256 = "0hq9zyrr1c5myi7llh9s2s7qchzsvyz8gdiq6y5r44idwa53na2w";
     };
     dependencies = [];
 
@@ -1648,22 +1648,22 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2018-01-20";
+    name = "vim-markdown-2018-03-19";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "861e84fc0bc97be8387e92ac2fc180599dc2b5a3";
-      sha256 = "1lfcl6rsjqyzny5rvipm1wd4qxnv96ff8anjaba0rv4m7b99yv6z";
+      rev = "45852fa3e937150aae93efb3dc10f4370b4763a9";
+      sha256 = "131njs5pw72sknb6kb64g86biw4zmfaibcvm25kbwhxqkl27wxhn";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2018-02-19";
+    name = "python-mode-2018-03-17";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "d5e7be11a74e8bda57388415d07d0faa0bcf9c5c";
-      sha256 = "13863z80dwzmyi2adjc3hywqqd14w43nkhzy7lqarqiv7ks207kv";
+      rev = "585b369e9cc4710432ae50466f8292725211c2ff";
+      sha256 = "03lp9fk6vzagxqiv6lw3p4063hf5ipjss1m7wvhcwkxm8x1i605v";
     };
     dependencies = [];
 
@@ -1800,11 +1800,11 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2018-03-03";
+    name = "neoformat-2018-03-13";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "c042511faa57fbe9c0c55ca30c710c1605345cf5";
-      sha256 = "0rdd4jsk1l7yfbfd7v9z9rb6k0darlms2hxsy602v7j485n4ayd9";
+      rev = "9ab966a6def98bab5cd88bcdd9b376da3ce471b4";
+      sha256 = "1d745zhmx8ghh9s09kwpmxflgff5lgczcg3gzb46gk7vq7y6s47d";
     };
     dependencies = [];
 
@@ -1921,22 +1921,22 @@ rec {
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2018-01-28";
+    name = "neosnippet-snippets-2018-03-12";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "5902053e0202248f0855d7a2b4f562425447493e";
-      sha256 = "12a89hlpz0gydl7wpqnanybmrl88r6pqznm0p76y6ir9m460gxw6";
+      rev = "4aaa1713c88a74e340a97afa80d0b935f60bfecd";
+      sha256 = "10i2b9b8la3ia2f0nkg2bfjz54h0b1slqn1jrb7a8iwg5jmsn7yh";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2018-02-22";
+    name = "neosnippet-vim-2018-03-12";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "e38afeab494bbc66be15e181bc96b78df3654a88";
-      sha256 = "1pm2drwq3hmbibai03pn6qh373kwfqf49npv1gq8d566wfmg0qrq";
+      rev = "8cf286e3bf7a5fc859f4c5f1bef52c351f24fefa";
+      sha256 = "15mxckg5s9pjfm7xkhs4awx0vpmwdwwifqrvrh1r4mbia39pk6ry";
     };
     dependencies = [];
 
@@ -2115,11 +2115,11 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-03-02";
+    name = "vim-dispatch-2018-03-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "e83ac42fefa4bcf2b4197bec2b4d917e15225815";
-      sha256 = "1mkhygh5pgp9z6gn2chn8kvj6fgfvg9gnym9icfdlm0hl2ldig1w";
+      rev = "4104901e9d6a304a5022b780f8e20d3becc7da93";
+      sha256 = "1n01g7q6cvdjz3fw7pfmx2r8kzhilxprd25nfj9zj01mbxbkz3mc";
     };
     dependencies = [];
 
@@ -2203,11 +2203,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-03-09";
+    name = "youcompleteme-2018-03-19";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "3a760212cb306655780a2c3be6412890ba5cf89b";
-      sha256 = "0q0gjlsb0l3k7a1fiz4lqa75r146y4myr42kwri0rm8y4fgpbc12";
+      rev = "788c293aee78c6ab60cbc06bbc3339e7b2bff98f";
+      sha256 = "1a7dgk04lgai51s9yjxzc87cdmm9wix2fx4kfm95s02qm2dnryci";
     };
     dependencies = [];
     buildPhase = ''
@@ -2525,11 +2525,11 @@ rec {
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2018-02-28";
+    name = "zig-vim-2018-03-16";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "1ce1b03ace88c447733cd5f398f09ff1d83d6831";
-      sha256 = "0y96dwfh1291gn7ia749nc8r03ndq7f29lgqag4dcs59x0pk4f5w";
+      rev = "7d2905a945308cc5ac4e0c32d9f5be86edf08399";
+      sha256 = "1afy9md2xb7acrphwmplyrln8h6cckbfd6a6ls0hlmb3jybzk0zy";
     };
     dependencies = [];
 
@@ -2602,11 +2602,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2017-08-04";
+    name = "pathogen-2018-03-14";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "e7857bed4e0705f91f781dbe99706f07d08d104b";
-      sha256 = "15s08q1chrdywj7fdiwzygxywg4cpcbvk5r1r8zvw6d82kyhadw1";
+      rev = "f4fd6044e37a4e255f2ea934e9e1ebc7bfe70f70";
+      sha256 = "1fjnfr8zjk39xvv64qg7ydic87gmg547siqplxgdv9a0vkk0p7jd";
     };
     dependencies = [];
 
@@ -2723,11 +2723,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2018-02-13";
+    name = "table-mode-2018-03-17";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "c35fd9b104fb75017f3866a28a77cf38f61b7801";
-      sha256 = "0l52ipl7a1g3js6lfig4xjw17nmmjvpv7gsrpn166kwgrxgis802";
+      rev = "d0a640518957417ce689411d807dff3bf9eca194";
+      sha256 = "1b6mka45lhb7n06pjxg697ha63gg4vw6zgj0v037w1izj619xa33";
     };
     dependencies = [];
 
@@ -2997,11 +2997,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-03-06";
+    name = "vim-airline-2018-03-20";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "958f78335eafe419ee002ad58d358854323de33a";
-      sha256 = "1h0a0rsnbbwhw55r2hcpfkxqamnx62jzqb451lh3ipvfs0ral6w7";
+      rev = "b9f55455fb50234b3f2ac86f5d70607efade31bd";
+      sha256 = "1yqx5mabanykaqrmgnppw870k25qs59vh5wpcwghwf2qf033mfll";
     };
     dependencies = [];
 
@@ -3063,11 +3063,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-03-08";
+    name = "vim-gitgutter-2018-03-16";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "380e7935b7b4cac10d3bc3031d492deaf5008495";
-      sha256 = "0c1dh3rkhgrp1sala1y5y2wn7b94c75y7h3j3dsl8lmbl64y2vl8";
+      rev = "37bdd03d176c5e182c7e8dbdc79c3f71d2a04898";
+      sha256 = "0l7sz77ymy5g6j7ads70r3xhvaymwmvlqi7hy1k40giq4dxzivv7";
     };
     dependencies = [];
 
@@ -3140,11 +3140,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2018-03-02";
+    name = "vim-multiple-cursors-2018-03-20";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "c9b95e49a48937903c9fc41d87d9b4c9aded10d7";
-      sha256 = "1r8xlfydarvaags541xn1mc5ry97ikyvjhkrpyngzfw48jlc0aaa";
+      rev = "13232e4b544775cf2b039571537b0e630406f801";
+      sha256 = "0ib0gj5ybmlb4lajhl1pc41kgfxaj19z22jsxc5sr0q67xwfpki4";
     };
     dependencies = [];
 
@@ -3239,11 +3239,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2018-02-26";
+    name = "vimwiki-2018-03-18";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "4bacbe00005f23d72d247fdde3a9e857d690b44b";
-      sha256 = "1kbblgzl311ksgyy4q44cngzacn3i2sfmfgmv441vzc7lq0fpmd6";
+      rev = "16b9e45b03baa377cee807f2bef7d97682e8bad6";
+      sha256 = "1ja3rspabsva6ja4jrbl19mck5k8lvss82sl3l2wgc8cv8ya1kkq";
     };
     dependencies = [];
 

From 7da0786caaabfef8544674fed88ba8f6e827f21b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 20 Mar 2018 21:50:32 +0100
Subject: [PATCH 1566/2266] st: 0.8 -> 0.8.1

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

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 4b6873ea33f..825a37faf1e 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 
 let patches' = if patches == null then [] else patches;
 in stdenv.mkDerivation rec {
-  name = "st-0.8";
+  name = "st-0.8.1";
 
   src = fetchurl {
     url = "http://dl.suckless.org/st/${name}.tar.gz";
-    sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
+    sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
   };
 
   patches = patches';

From 7a0027804cf04b6907a1a0cc9186649c2a24011a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Mar 2018 22:25:02 +0100
Subject: [PATCH 1567/2266] josepy: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix
new file mode 100644
index 00000000000..541455642ef
--- /dev/null
+++ b/pkgs/development/python-modules/josepy/default.nix
@@ -0,0 +1,35 @@
+{ lib, fetchPypi, buildPythonPackage
+# buildInputs
+, six
+, setuptools
+, pyopenssl
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "josepy";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z";
+  };
+
+  propagatedBuildInputs = [
+    pyopenssl
+    cryptography
+    six
+    setuptools
+  ];
+
+  # too many unpackaged check requirements
+  doCheck = false;
+
+  meta = with lib; {
+    description = "JOSE protocol implementation in Python";
+    homepage = https://github.com/jezdez/josepy;
+    license = licenses.asl20;
+    maintainers = with maintainers; [  ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b513288da69..1d3aa948877 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5219,6 +5219,8 @@ in {
 
   JPype1 = callPackage ../development/python-modules/JPype1 {};
 
+  josepy = callPackage ../development/python-modules/josepy {};
+
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier {};
 
   jug = callPackage ../development/python-modules/jug {};

From e9f176a09a6a21119f6ba4a0ac7b3b0d1db330d1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Mar 2018 22:25:50 +0100
Subject: [PATCH 1568/2266] certbot: 0.19.0 -> 0.22.2

---
 .../python-modules/acme/default.nix           | 20 +++++++++++++++----
 pkgs/tools/admin/certbot/default.nix          | 12 +++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index 71357e5bef2..ccf56c208f2 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -1,6 +1,18 @@
 { stdenv, buildPythonPackage, fetchPypi
-, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339
-, pytz, requests, six, werkzeug, mock, ndg-httpsclient }:
+, certbot
+, nose
+, cryptography
+, pyasn1
+, pyopenssl
+, pyRFC3339
+, josepy
+, pytz
+, requests
+, six
+, werkzeug
+, mock
+, ndg-httpsclient
+}:
 
 buildPythonPackage rec {
   inherit (certbot) src version;
@@ -10,10 +22,10 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
-    ndg-httpsclient
+    ndg-httpsclient josepy
   ];
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/acme";
 }
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 78a38e07cc2..bf2b4ac6799 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, python2Packages, fetchFromGitHub, dialog }:
+{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
 
 # Latest version of certbot supports python3 and python3 version of pythondialog
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.19.0";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "14i3q59v7j0q2pa1dri420fhil4h0vgl4vb471hp81f4y14gq6h7";
+    sha256 = "08x80x9d71j84mwjm5wzd0x5gcw6gwyvkvadi2js39js6hfnc6jg";
   };
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = with pythonPackages; [
     ConfigArgParse
     acme
     configobj
@@ -28,7 +28,7 @@ python2Packages.buildPythonApplication rec {
     zope_component
     zope_interface
   ];
-  buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
+  buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
 
   patchPhase = ''
     substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"

From e144fa07b9f635ebef591b4c029a66fedaa7b7db Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Mar 2018 22:26:30 +0100
Subject: [PATCH 1569/2266] simp_le: 0.6.2 -> 0.8.0

---
 pkgs/tools/admin/simp_le/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index ce416e7cd25..91656eb0c55 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,26 +1,26 @@
 { stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
-
+ 
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
-  version = "0.6.1";
-  name = "${pname}-${version}";
+  version = "0.8.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0x4fky9jizs3xi55cdy217cvm3ikpghiabysan71b07ackkdfj6k";
+    sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i";
   };
 
   checkPhase = ''
     $out/bin/simp_le --test
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
+  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/zenhack/simp_le;
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ gebner ];
+    maintainers = with maintainers; [ gebner makefu ];
     platforms = platforms.all;
   };
 }
+

From 3c64662e14145f2f8d7ca2be7418611e49a3342b Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 20 Mar 2018 16:55:42 -0500
Subject: [PATCH 1570/2266] awscli: 1.14.47 -> 1.14.50

Fixes a broken build introduced when botocore was updated in ce34a9a3
---
 pkgs/tools/admin/awscli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index eb735a04abb..23908a8b66f 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.14.47";
+  version = "1.14.50";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
+    sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c";
   };
 
   # No tests included

From 0458c7b88557e6d11ad4b748dc7741e7e0d31ee6 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 20 Mar 2018 15:26:00 -0700
Subject: [PATCH 1571/2266] fix static libs on darwin

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1a788ae642e..60a4e28609e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -244,7 +244,11 @@ stdenv.mkDerivation ({
         configureFlags+=" --extra-lib-dirs=$p/lib"
       fi
     done
-  '' + (optionalString stdenv.isDarwin ''
+  ''
+  # only use the links hack if we're actually building dylibs. otherwise, the
+  # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
+  # "ln -s $out/lib/links", which tries to recreate the links dir and fails
+  + (optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     # Work around a limit in the macOS Sierra linker on the number of paths
     # referenced by any one dynamic library:
     #

From 1a4b6a6d41623763d6fd92a8adc7fc841966edd1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 16:38:20 -0700
Subject: [PATCH 1572/2266] lua51Packages.luarocks: 2.4.3 -> 2.4.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 help` and found version 2.4.4
- found 2.4.4 with grep in /nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4
- directory tree listing: https://gist.github.com/cb3889fda28e8066faebd32a433c69d2
---
 pkgs/development/tools/misc/luarocks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 6d3dffa894c..afe026359e5 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.4.3";
+    version="2.4.4";
     name="${baseName}-${version}";
-    hash="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
-    url="http://luarocks.org/releases/luarocks-2.4.3.tar.gz";
-    sha256="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
+    hash="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
+    url="http://luarocks.org/releases/luarocks-2.4.4.tar.gz";
+    sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
   };
   buildInputs = [
     lua curl makeWrapper which unzip

From b08560fb0abcca6f2c704d1d0664e3cd17580172 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 21 Mar 2018 00:58:41 +0100
Subject: [PATCH 1573/2266] nixos/tests/atd : remove test of batch command

"batch" executes jobs based on system load.
test was not deterministic.
---
 nixos/tests/atd.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index c2c0a716e0d..5260c8ddfb8 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -17,20 +17,14 @@ import ./make-test.nix ({ pkgs, lib, ... }:
     startAll;
 
     $machine->fail("test -f ~root/at-1");
-    $machine->fail("test -f ~root/batch-1");
     $machine->fail("test -f ~alice/at-1");
-    $machine->fail("test -f ~alice/batch-1");
 
     $machine->succeed("echo 'touch ~root/at-1' | at now+1min");
-    $machine->succeed("echo 'touch ~root/batch-1' | batch");
     $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"");
-    $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\"");
 
     $machine->succeed("sleep 1.5m");
 
     $machine->succeed("test -f ~root/at-1");
-    $machine->succeed("test -f ~root/batch-1");
     $machine->succeed("test -f ~alice/at-1");
-    $machine->succeed("test -f ~alice/batch-1");
   '';
 })

From 35ad8dded9bf96072f33b14ccc336e9bad0812d2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 17:53:39 -0700
Subject: [PATCH 1574/2266] mir-qualia: 1.0.0 -> 2.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/.qualia-wrapped -h` got 0 exit code
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/.qualia-wrapped --help` got 0 exit code
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/qualia -h` got 0 exit code
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/qualia --help` got 0 exit code
- found 2.0.0 with grep in /nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0
- directory tree listing: https://gist.github.com/18601b1231672c52d2a59f11fff236f8
---
 pkgs/tools/text/mir-qualia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix
index b22d5893915..4e3be9e17e0 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/pkgs/tools/text/mir-qualia/default.nix
@@ -2,14 +2,14 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mir.qualia-${version}";
-  version = "1.0.0";
-  doCheck = false; # 1.0.0-released pytests are broken
+  version = "2.0.0";
+  doCheck = false; # 2.0.0-released pytests are broken
 
   buildInputs = with pythonPackages; [ pytest ];
 
   src = fetchurl {
     url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz";
-    sha256 = "1g0nwncwk4nq7b7zszqi1q4d2bdga1q50g9nkxigdaq647wqdf7x";
+    sha256 = "1ybq6jb5clh9hw0sp3idp4hjv2gkm9yiaph48gcc208affflc8m9";
   };
 
   meta = {

From cf981d3e2b3a7761ff6f050138fc301d19c12862 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Mar 2018 04:08:42 +0300
Subject: [PATCH 1575/2266] python.pkgs.nbxmpp: 0.6.3 -> 0.6.4

---
 .../python-modules/nbxmpp/default.nix         | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 295354003ba..b6f94536e2f 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,17 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchzip, pyopenssl }:
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "0.6.3";
+  version = "0.6.4";
+  name = "${pname}-${version}";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dd66e701a4856e3cace8f4865837ccc9bcfcdb286df01f01aa19531f5d834a83";
+  # Tests aren't included in PyPI tarball.
+  src = fetchzip {
+    name = "${name}.tar.bz2";
+    url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
+        + "ref=${name}";
+    sha256 = "0mikgksf01w82wnnm0phmzkijk2c93g24fzd59s71n3zy7f7dx3l";
   };
 
+  propagatedBuildInputs = [ pyopenssl ];
+
+  checkPhase = ''
+    # Disable tests requiring networking
+    echo "" > test/unit/test_xmpp_transports_nb2.py
+    python test/runtests.py
+  '';
+
   meta = with stdenv.lib; {
     homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
     description = "Non-blocking Jabber/XMPP module";
     license = licenses.gpl3;
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From eda6b9553b998b2ad4d36e22bd0f2b7a536fd517 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Mar 2018 04:08:59 +0300
Subject: [PATCH 1576/2266] gajim: 0.16.9 -> 1.0.0

Massive update.
---
 .../instant-messengers/gajim/default.nix      | 149 ++++--------------
 pkgs/top-level/all-packages.nix               |   5 +-
 2 files changed, 39 insertions(+), 115 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 2f5ea071568..a60df1ead53 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,139 +1,60 @@
-{ stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11
-, ldns, pythonPackages
-
-, enableJingle ? true, farstream ? null, gst-plugins-bad ? null
-,                      libnice ? null
-, enableE2E ? true
-, enableRST ? true
-, enableSpelling ? true, gtkspell2 ? null
-, enableNotifications ? false
-, enableOmemoPluginDependencies ? true
-, extraPythonPackages ? pkgs: []
+{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
+, python, gtk3, gobjectIntrospection
+, nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
+, enableE2E ? true, pycrypto, python-gnupg
+, enableSecrets ? true, libsecret
+, enableRST ? true, docutils
+, enableSpelling ? true, gspell
+, enableUPnP ? true, gupnp-igd
+, enableOmemoPluginDependencies ? true, python-axolotl, qrcode
+, extraPythonPackages ? pkgs: [], pythonPackages
 }:
 
-assert enableJingle -> farstream != null && gst-plugins-bad != null
-                    && libnice != null;
-assert enableE2E -> pythonPackages.pycrypto != null;
-assert enableRST -> pythonPackages.docutils != null;
-assert enableSpelling -> gtkspell2 != null;
-assert enableNotifications -> pythonPackages.notify != null;
+with lib;
 
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
+buildPythonApplication rec {
   name = "gajim-${version}";
-  majorVersion = "0.16";
-  version = "${majorVersion}.9";
+  majorVersion = "1.0";
+  version = "${majorVersion}.0";
 
   src = fetchurl {
-    name = "${name}.tar.bz2";
-    url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
-        + "ref=${name}";
-    sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3";
-  };
-
-  # Needed for Plugin Installer
-  release = fetchurl {
     url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
-    sha256 = "0v08zdvpqaig0wxpxn1l8rsj3wr3fqvnagn8cnvch17vfqv9gcr1";
+    sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
   };
 
-  postUnpack = ''
-    tar -xaf $release
-    cp -r ${name}/plugins/plugin_installer gajim-${name}-*/plugins
-    rm -rf ${name}
-  '';
-
-  patches = let
-    # An attribute set of revisions to apply from the upstream repository.
-    cherries = {
-      #example-fix = {
-      #  rev = "<replace-with-git-revsion>";
-      #  sha256 = "<replace-with-sha256>";
-      #};
-    };
-  in (mapAttrsToList (name: { rev, sha256 }: fetchurl {
-    name = "gajim-${name}.patch";
-    url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff";
-    inherit sha256;
-  }) cherries);
-
-  postPatch = ''
-    sed -i -e '0,/^[^#]/ {
-      /^[^#]/i export \\\
-        GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${""
-        }$GST_PLUGIN_PATH"'"
-    }' scripts/gajim.in
-
-    # requires network access
-    echo "" > test/integration/test_resolver.py
-
-    # We want to run tests in installCheckPhase rather than checkPhase to test
-    # whether the *installed* version of Gajim works rather than just whether it
-    # works in the unpacked source tree.
-    sed -i -e '/sys\.path\.insert.*gajim_root.*\/src/d' test/lib/__init__.py
-  '' + optionalString enableSpelling ''
-    sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|'   \
-      src/gtkspell.py
-  '';
-
   buildInputs = [
-    python libX11
-  ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ];
+    gobjectIntrospection gtk3
+  ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
+    ++ optional enableSecrets libsecret
+    ++ optional enableSpelling gspell
+    ++ optional enableUPnP gupnp-igd;
 
   nativeBuildInputs = [
-    autoreconfHook pythonPackages.wrapPython intltool pkgconfig
+    gettext wrapGAppsHook
   ];
 
-  autoreconfPhase = ''
-    sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
+  propagatedBuildInputs = [
+    nbxmpp pyasn1 pygobject3 dbus-python pillow
+  ] ++ optionals enableE2E [ pycrypto python-gnupg ]
+    ++ optional enableRST docutils
+    ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
+    ++ extraPythonPackages pythonPackages;
+
+  checkPhase = ''
+    ${python.interpreter} test/runtests.py
   '';
 
-  propagatedBuildInputs = with pythonPackages; [
-    libasyncns
-    pygobject2 pyGtkGlade
-    pyasn1
-    pyxdg
-    nbxmpp
-    pyopenssl dbus-python
-  ] ++ optional enableE2E pythonPackages.pycrypto
-    ++ optional enableRST pythonPackages.docutils
-    ++ optional enableNotifications pythonPackages.notify
-    ++ optionals enableOmemoPluginDependencies (with pythonPackages; [
-      cryptography python-axolotl python-axolotl-curve25519 qrcode
-    ]) ++ extraPythonPackages pythonPackages;
-
-  postFixup = ''
-    install -m 644 -t "$out/share/gajim/icons/hicolor" \
-                      "icons/hicolor/index.theme"
-
-    buildPythonPath "$out"
-
-    for i in $out/bin/*; do
-      name="$(basename "$i")"
-      if [ "$name" = "gajim-history-manager" ]; then
-        name="history_manager"
-      fi
-
-      patchPythonScript "$out/share/gajim/src/$name.py"
-    done
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \
-      make test_nogui
-  '';
-
-  enableParallelBuilding = true;
+  # Tests try to use GTK+ which fails.
+  doCheck = false;
 
   meta = {
     homepage = http://gajim.org/;
     description = "Jabber client written in PyGTK";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.raskin maintainers.aszlig ];
+    maintainers = with maintainers; [ raskin aszlig abbradar ];
     downloadPage = "http://gajim.org/downloads.php";
     updateWalker = true;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92ee23b4572..e6364d840ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20289,7 +20289,10 @@ with pkgs;
 
   foomatic-filters = callPackage ../misc/drivers/foomatic-filters {};
 
-  gajim = callPackage ../applications/networking/instant-messengers/gajim { };
+  gajim = python3.pkgs.callPackage ../applications/networking/instant-messengers/gajim {
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly;
+    inherit (gnome3) gspell;
+  };
 
   gammu = callPackage ../applications/misc/gammu { };
 

From 2b8406f873d6703b86ab416b83016795144ddff3 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Tue, 20 Mar 2018 21:15:15 -0400
Subject: [PATCH 1577/2266] rclone: 1.39 -> 1.40

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 71df7a0fb1e..aa2a971b15f 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.39";
+  version = "1.40";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "1x9qxhqkbyd7kd52ai9p996ppslh73xarn5w4ljaa97wwm5vwwsg";
+    sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9";
   };
 
   outputs = [ "bin" "out" "man" ];

From d9292429e73659fca200aeed73cfb0078adaf3e6 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 7 Mar 2018 08:57:40 +0900
Subject: [PATCH 1578/2266] alot: 0.5.1 to 0.7.0

- added gnupg to checkInputs
- generate manpage (optional)
- move alot.desktop file to $out/share/applications
- disabled tests as they need the network (dependency on twisted)

Thanks to Sarah Brofeldt, Ben Mcginnes for their help (and other) and
to FRidh for the repeated careful reviews.
---
 pkgs/development/libraries/gpgme/default.nix  | 23 ++++++++--
 .../python-modules/alot/default.nix           | 42 +++++++++++++------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 1e59e8f1d65..8958ce45741 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,10 +1,18 @@
 { stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
-, qtbase ? null }:
+, file, which
+, autoreconfHook
+# git can apparently be removed when setting some envvar
+, git
+, texinfo5
+, qtbase ? null
+, withPython ? false, swig2 ? null, python ? null
+}:
 
 let inherit (stdenv) lib system; in
 
 stdenv.mkDerivation rec {
-  name = "gpgme-1.10.0";
+  name = "gpgme-${version}";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
@@ -18,11 +26,17 @@ stdenv.mkDerivation rec {
     [ libgpgerror glib libassuan pth ]
     ++ lib.optional (qtbase != null) qtbase;
 
-  nativeBuildInputs = [ pkgconfig gnupg ];
+  nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ]
+  ++ lib.optionals withPython [ python swig2 which ];
+
+  postPatch =''
+    substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
+  '';
 
   configureFlags = [
     "--enable-fixed-path=${gnupg}/bin"
-  ];
+    "--with-libgpg-error-prefix=${libgpgerror.dev}"
+  ] ++ lib.optional withPython "--enable-languages=python";
 
   NIX_CFLAGS_COMPILE =
     # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
@@ -45,3 +59,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ fuuzetsu primeos ];
   };
 }
+
diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 67cd7eafd12..7c704c9dc55 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
-, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme}:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme
+, service-identity, gpg
+, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
+, withManpage ? false }:
+
 
 buildPythonPackage rec {
-  version = "0.5.1";
   pname = "alot";
+  version = "0.7";
+  outputs = [ "out" ] ++ lib.optional withManpage "man";
 
   disabled = isPy3k;
 
   src = fetchFromGitHub {
     owner = "pazz";
-    repo = pname;
-    rev = "version";
-    sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8";
+    repo = "alot";
+    rev = "${version}";
+    sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi";
   };
 
   postPatch = ''
@@ -20,6 +25,8 @@ buildPythonPackage rec {
                 "themes_dir = string(default='$out/share/themes')"
   '';
 
+  nativeBuildInputs = lib.optional withManpage sphinx;
+
   propagatedBuildInputs = [
     notmuch
     urwid
@@ -27,21 +34,32 @@ buildPythonPackage rec {
     twisted
     python_magic
     configobj
-    pygpgme
-    mock
+    service-identity
     file
+    gpg
   ];
 
-  postInstall = ''
-    mkdir -p $out/share
+  # some twisted tests need the network (test_env_set... )
+  doCheck = false;
+  postBuild = lib.optionalString withManpage "make -C docs man";
+
+  checkInputs =  [ awk future mock gnupg procps ];
+
+  postInstall = lib.optionalString withManpage ''
+    mkdir -p $out/man
+    cp -r docs/build/man $out/man
+  ''
+  + ''
+    mkdir -p $out/share/applications
     cp -r extra/themes $out/share
-    wrapProgram $out/bin/alot \
-      --prefix LD_LIBRARY_PATH : '${stdenv.lib.makeLibraryPath [ notmuch file gpgme ]}'
+
+    sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
   '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/pazz/alot;
     description = "Terminal MUA using notmuch mail";
+    license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ garbas ];
   };

From ee482f85bfb28626c4dc115ee062cc032d3aef4d Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 7 Mar 2018 08:56:48 +0900
Subject: [PATCH 1579/2266] service_identity: cosmetic changes

---
 pkgs/development/python-modules/service_identity/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix
index 779e974f15e..93e172a4f60 100644
--- a/pkgs/development/python-modules/service_identity/default.nix
+++ b/pkgs/development/python-modules/service_identity/default.nix
@@ -13,8 +13,6 @@
 buildPythonPackage rec {
   pname = "service_identity";
   version = "17.0.0";
-  name = "${pname}-${version}";
-
 
   src = fetchFromGitHub {
     owner = "pyca";
@@ -33,6 +31,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Service identity verification for pyOpenSSL";
     license = licenses.mit;
-    homepage = "https://service-identity.readthedocs.io";
+    homepage = https://service-identity.readthedocs.io;
   };
 }

From a8403b64f837e0e12fc329fd313bc56e8ea94b6c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 7 Mar 2018 08:52:01 +0900
Subject: [PATCH 1580/2266] gpgme: add withPython ? false to enable bindings

Useful for MUAs mostly, like alot
---
 pkgs/development/libraries/gpgme/default.nix | 2 --
 pkgs/top-level/python-packages.nix           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 8958ce45741..68762e344bd 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
 , file, which
 , autoreconfHook
-# git can apparently be removed when setting some envvar
 , git
 , texinfo5
 , qtbase ? null
@@ -59,4 +58,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ fuuzetsu primeos ];
   };
 }
-
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c49b6bc0c8..7ad86720bb6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8173,6 +8173,8 @@ in {
 
   google_gax = callPackage ../development/python-modules/google_gax { };
 
+  gpg = toPythonModule (pkgs.gpgme.override { withPython=true; });
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   greenlet = buildPythonPackage rec {

From b0f64deb0bff47aa71554c634add95974fb8d8d9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 19:09:33 -0700
Subject: [PATCH 1581/2266] netcdffortran: 4.4.3 -> 4.4.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/iab00yc7zgj1q5cdazbnfbx2gc9f6zi0-netcdf-fortran-4.4.4/bin/nf-config -h` got 0 exit code
- ran `/nix/store/iab00yc7zgj1q5cdazbnfbx2gc9f6zi0-netcdf-fortran-4.4.4/bin/nf-config --help` got 0 exit code
- ran `/nix/store/iab00yc7zgj1q5cdazbnfbx2gc9f6zi0-netcdf-fortran-4.4.4/bin/nf-config help` got 0 exit code
- ran `/nix/store/iab00yc7zgj1q5cdazbnfbx2gc9f6zi0-netcdf-fortran-4.4.4/bin/nf-config --version` and found version 4.4.4
- found 4.4.4 with grep in /nix/store/iab00yc7zgj1q5cdazbnfbx2gc9f6zi0-netcdf-fortran-4.4.4
- directory tree listing: https://gist.github.com/c28218d35636f05cac88796c8fe27ec1
---
 pkgs/development/libraries/netcdf-fortran/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 35f675a305a..d43519f4a2f 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
 stdenv.mkDerivation rec {
   name = "netcdf-fortran-${version}";
-  version = "4.4.3";
+  version = "4.4.4";
 
   src = fetchurl {
     url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz";
-    sha256 = "4170fc018c9ee8222e317215c6a273542623185f5f6ee00d37bbb4e024e4e998";
+    sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4";
   };
 
   buildInputs = [ netcdf hdf5 curl gfortran ];

From b46aea76e996d73def17a0c91b9bc3f26abe662a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Wed, 21 Mar 2018 02:44:02 +0000
Subject: [PATCH 1582/2266] epsxe: remove duplicated `with stdenv.lib;`

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

diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index e367d6a1498..2f11384d845 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "epsxe-${version}";
   version = "2.0.5";
 
-  src = with stdenv.lib; let
+  src = let
     version2 = concatStrings (splitString "." version);
     platform = "linux" + (optionalString stdenv.is64bit "_x64");
   in fetchurl {

From 1ce37ab8a9ab9ca8f450474d28f0655193fa8ad6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 14 Mar 2018 08:03:53 +0000
Subject: [PATCH 1583/2266] coqPackages.contribs.containers: make available for
 Coq 8.7

---
 .../coq-modules/contribs/default.nix            | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index 88ef8011aa8..82d1f7a4746 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -189,11 +189,18 @@ let mkContrib = repo: revs: param:
     sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
   };
 
-  containers = mkContrib "containers" [ "8.6" ] {
-    version = "8.6.0";
-    rev = "fa1fec7";
-    sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
-  };
+  containers = mkContrib "containers" [ "8.6" "8.7" ] {
+    "8.6" = {
+      version = "8.6.0";
+      rev = "fa1fec7";
+      sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
+    };
+    "8.7" = {
+      version = "20180313";
+      rev = "77ac16366529c9e558f70ba86f0168a76ca76b8f";
+      sha256 = "01gp8injb0knaxgqsdc4x9h8714k7qxg7j5w7y6i45dnpd81ndr4";
+    };
+  }."${coq.coq-version}";
 
   continuations = mkContrib "continuations" [ ] {
     version = "v8.5.0-13-g6885310";

From 3a7854032afc792e42e0a724919969ade3a5b694 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 20 Mar 2018 15:12:19 +0100
Subject: [PATCH 1584/2266] octave: 4.2.1 -> 4.2.2

See http://lists.gnu.org/archive/html/info-gnu/2018-03/msg00006.html
for release announcement
---
 pkgs/development/interpreters/octave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index c13d862267f..ce3ce584434 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "4.2.1";
+  version = "4.2.2";
   name = "octave-${version}";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.gz";
-    sha256 = "0frk0nk3aaic8hj3g45h11rnz3arp7pjsq0frbx50sspk1iqzhl0";
+    sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull

From 727c76765db60ce201c810bf282f3885b64e3644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 21 Mar 2018 10:14:52 +0100
Subject: [PATCH 1585/2266] simp_le: patch shebangs

---
 pkgs/tools/admin/simp_le/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 91656eb0c55..b618e71568d 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }:
  
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
@@ -9,6 +9,11 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i";
   };
 
+  postPatch = ''
+    substituteInPlace simp_le.py \
+      --replace "/bin/sh" "${bash}/bin/sh"
+  '';
+
   checkPhase = ''
     $out/bin/simp_le --test
   '';

From 07361daf04d30142e54fbd8bec3d76ffb61f395c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 12:52:28 +0100
Subject: [PATCH 1586/2266] androidStudioPackages.beta: 3.1.0.14 -> 3.1.0.15

---
 .../editors/android-studio/default.nix            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 382066d1dbd..d054e6481ec 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,5 @@
 { stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
+
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
     fontsConf = makeFontsConf {
@@ -10,12 +11,11 @@ in rec {
   # Old alias
   preview = beta;
 
-  # Attributes are named by the channels
+  # Attributes are named by the corresponding release channels
 
-  # linux-bundle
   stable = mkStudio {
     pname = "android-studio";
-    #pname = "android-studio-stable"; # TODO: Rename
+    #pname = "android-studio-stable"; # TODO: Rename and provide symlink
     version = "3.0.1.0"; # "Android Studio 3.0.1"
     build = "171.4443003";
     sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
@@ -33,13 +33,12 @@ in rec {
     };
   };
 
-  # linux-beta-bundle
   beta = mkStudio {
     pname = "android-studio-preview";
-    #pname = "android-studio-beta"; # TODO: Rename
-    version = "3.1.0.14"; # "Android Studio 3.1 RC 2"
-    build = "173.4640767";
-    sha256Hash = "00v8qbis4jm31v1g9989f9y15av6p3ywj8mmfxcsc3hjlpzdgid8";
+    #pname = "android-studio-beta"; # TODO: Rename and provide symlink
+    version = "3.1.0.15"; # "Android Studio 3.1 RC 3"
+    build = "173.4658569";
+    sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (beta channel)";

From 629d1219805b9344984c11c0cc9c626f9d2271cb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 13:06:37 +0100
Subject: [PATCH 1587/2266] androidStudioPackages.{dev,canary}: 3.2.0.5 ->
 3.2.0.6

---
 .../editors/android-studio/default.nix        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d054e6481ec..4583066842a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -7,6 +7,11 @@ let
     };
     inherit (gnome2) GConf gnome_vfs;
   };
+  latestVersion = {
+    version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
+    build = "173.4658582";
+    sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
+  };
 in rec {
   # Old alias
   preview = beta;
@@ -46,25 +51,19 @@ in rec {
     };
   };
 
-  dev = mkStudio {
+  dev = mkStudio (latestVersion // {
     pname = "android-studio-dev";
-    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
-    build = "173.4640885";
-    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
 
     meta = beta.meta // {
       description = "The Official IDE for Android (dev channel)";
     };
-  };
+  });
 
-  canary = mkStudio {
+  canary = mkStudio (latestVersion // {
     pname = "android-studio-canary";
-    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
-    build = "173.4640885";
-    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
 
     meta = beta.meta // {
       description = "The Official IDE for Android (canary channel)";
     };
-  };
+  });
 }

From 3583cf8f4b3e7d7691d3463797f5d98d505ba811 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 13:34:04 +0100
Subject: [PATCH 1588/2266] lf: 2018-01-11 -> 2018-03-19

---
 pkgs/tools/misc/lf/default.nix | 6 +++---
 pkgs/tools/misc/lf/deps.nix    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 7e5a464764a..bed07bc8448 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-unstable-${version}";
-  version = "2018-01-11";
+  version = "2018-03-19";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
-    rev = "58538c802044a3a2590ebe4979f3c85d807ea2d9"; # nightly
-    sha256 = "0xp5accliwz1d0nbsc6cnsv38czcfqn5nyxfndkpw8jkh8w2pm9p";
+    rev = "c76ad181f5753984e39608628ac4def4183b53a4"; # nightly
+    sha256 = "1wsmljina9n2zij7gzh7b4zbzi7sdsa6hnyaj75nsmqn9lshngap";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index 6c1e07667b3..ec9dc30e0cd 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "aa4a75b1c20a2b03751b1a9f7e41d58bd6f71c43"; # master
-      sha256 = "1xfd0mq6jkq55dx14nksyyfc66qla7cz0xxscpw07b25qmww9518";
+      rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; # master
+      sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s";
     };
   }
   {

From 8265979114071ebdc633f663a6bdb0deb0b0b8fc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 07:33:50 -0500
Subject: [PATCH 1589/2266] pan: 0.139 -> 0.144

---
 pkgs/applications/networking/newsreaders/pan/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index ad35c49c014..42788cfe1a5 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,22 +1,22 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
-, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify
+, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
 }:
 
 assert spellChecking -> gtkspell2 != null;
 
-let version = "0.139"; in
+let version = "0.144"; in
 
 stdenv.mkDerivation {
   name = "pan-${version}";
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
-    sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz";
+    sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ]
+  buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ]
     ++ stdenv.lib.optional spellChecking gtkspell2;
 
   enableParallelBuilding = true;

From 4beb695eceea1aa00201e7f0ee5165fc948e9eb3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 21 Mar 2018 14:57:57 +0100
Subject: [PATCH 1590/2266] titaniumenv: fix Android signing on darwin

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index a6bf05c2465..83bd941e5ff 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -58,7 +58,13 @@ stdenv.mkDerivation {
           export GRADLE_USER_HOME=$TMPDIR/gradle
 
           ${if release then
-            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out''
+            ''
+              ${stdenv.lib.optionalString stdenv.isDarwin ''
+                # Signing the app does not work with OpenJDK on macOS, use host SDK instead
+                export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
+              ''}
+              titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out
+            ''
           else
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''}
         ''

From 07be047a91d0dfeef49f026ecbb882e2211daa60 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Mar 2018 13:25:25 +0000
Subject: [PATCH 1591/2266] Merge pull request #37559 from dylex/release-18.03

julia: update rmath-julia hash for 0.1
(cherry picked from commit ea9f3fca6587494f25ef470397b32904e2325e23)
---
 pkgs/development/compilers/julia/0.5.nix     | 2 +-
 pkgs/development/compilers/julia/0.6.nix     | 2 +-
 pkgs/development/compilers/julia/default.nix | 2 +-
 pkgs/development/compilers/julia/git.nix     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 0cf933ee4d2..cff6c1c446f 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -42,7 +42,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
   
   virtualenvVersion = "15.0.0";
diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
index 6acb192933e..36bbb7d817f 100644
--- a/pkgs/development/compilers/julia/0.6.nix
+++ b/pkgs/development/compilers/julia/0.6.nix
@@ -42,7 +42,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
   
   virtualenvVersion = "15.0.0";
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 63252084b5d..a263703ffa5 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -42,7 +42,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
 in
 
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 19519823f37..4b9a369e8d2 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -40,7 +40,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
   
   virtualenvVersion = "15.0.0";

From 607d8cbfd718f96c3171d23a32d40d92755d4687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 21 Mar 2018 15:22:09 +0100
Subject: [PATCH 1592/2266] pythonPackages.pyhomematic: 0.1.39 -> 0.1.40

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

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index be6fb7c8bb6..90616c09269 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.39";
+  version = "0.1.40";
 
   disabled = !isPy3k;
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = version;
-    sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz";
+    sha256 = "0rflfak505cgc69594yc9chz5mblqvc2d7bbbfcddzhlhs5qcsq2";
   };
 
   # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126

From 88f06c5ce9800d661fa85c019838fe67635aa64f Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 21 Mar 2018 14:27:20 +0100
Subject: [PATCH 1593/2266] nixos/prosody: add a basic test

---
 nixos/tests/prosody.nix | 75 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 nixos/tests/prosody.nix

diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix
new file mode 100644
index 00000000000..fcebfaf74e1
--- /dev/null
+++ b/nixos/tests/prosody.nix
@@ -0,0 +1,75 @@
+import ./make-test.nix {
+  name = "prosody";
+
+  machine = { config, pkgs, ... }: {
+    services.prosody = {
+      enable = true;
+      # TODO: use a self-signed certificate
+      c2sRequireEncryption = false;
+    };
+    environment.systemPackages = let
+      sendMessage = pkgs.writeScriptBin "send-message" ''
+        #!/usr/bin/env python3
+        # Based on the sleekxmpp send_client example, look there for more details:
+        # https://github.com/fritzy/SleekXMPP/blob/develop/examples/send_client.py
+        import sleekxmpp
+
+        class SendMsgBot(sleekxmpp.ClientXMPP):
+            """
+            A basic SleekXMPP bot that will log in, send a message,
+            and then log out.
+            """
+            def __init__(self, jid, password, recipient, message):
+                sleekxmpp.ClientXMPP.__init__(self, jid, password)
+
+                self.recipient = recipient
+                self.msg = message
+
+                self.add_event_handler("session_start", self.start, threaded=True)
+
+            def start(self, event):
+                self.send_presence()
+                self.get_roster()
+
+                self.send_message(mto=self.recipient,
+                                  mbody=self.msg,
+                                  mtype='chat')
+
+                self.disconnect(wait=True)
+
+
+        if __name__ == '__main__':
+            xmpp = SendMsgBot("test1@localhost", "test1", "test2@localhost", "Hello World!")
+            xmpp.register_plugin('xep_0030') # Service Discovery
+            xmpp.register_plugin('xep_0199') # XMPP Ping
+
+            # TODO: verify certificate
+            # If you want to verify the SSL certificates offered by a server:
+            # xmpp.ca_certs = "path/to/ca/cert"
+
+            if xmpp.connect(('localhost', 5222)):
+                xmpp.process(block=True)
+            else:
+                print("Unable to connect.")
+                sys.exit(1)
+      '';
+    in [ (pkgs.python3.withPackages (ps: [ ps.sleekxmpp ])) sendMessage ];
+  };
+
+  testScript = ''
+    $machine->waitForUnit('prosody.service');
+    $machine->succeed('prosodyctl status') =~ /Prosody is running/;
+
+    # set password to 'test' (it's asked twice)
+    $machine->succeed('yes test1 | prosodyctl adduser test1@localhost');
+    # set password to 'y'
+    $machine->succeed('yes | prosodyctl adduser test2@localhost');
+    # correct password to 'test2'
+    $machine->succeed('yes test2 | prosodyctl passwd test2@localhost');
+
+    $machine->succeed("send-message");
+
+    $machine->succeed('prosodyctl deluser test1@localhost');
+    $machine->succeed('prosodyctl deluser test2@localhost');
+  '';
+}

From 9f6d1ac711cff435cca49cf19d3a4d654dbc4386 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 21 Mar 2018 14:52:53 +0100
Subject: [PATCH 1594/2266] node-webkit/nw9.nix: remove

Obsolete since #37380 and severly outdated (#37361)

/cc @Profpatsch
---
 pkgs/development/tools/node-webkit/nw9.nix | 57 ----------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 pkgs/development/tools/node-webkit/nw9.nix

diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix
deleted file mode 100644
index ba5d6c8e334..00000000000
--- a/pkgs/development/tools/node-webkit/nw9.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper
-, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }:
-let
-  bits = if stdenv.system == "x86_64-linux" then "x64"
-         else "ia32";
-
-  nwEnv = buildEnv {
-    name = "node-webkit-env";
-    paths = [
-      xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf
-      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
-      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc
-      xorg.libXtst xorg.libXi
-    ];
-    
-    extraOutputsToInstall = [ "lib" "out" ];
-  };
-
-in stdenv.mkDerivation rec {
-  name = "node-webkit-${version}";
-  version = "0.9.2";
-
-  src = fetchurl {
-    url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
-    sha256 = if bits == "x64" then
-      "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else
-      "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/node-webkit
-    cp -R * $out/share/node-webkit
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
-
-    ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0
-
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
-
-    mkdir -p $out/bin
-    ln -s $out/share/node-webkit/nw $out/bin
-    ln -s $out/share/node-webkit/nwsnapshot $out/bin
-  '';
-
-  buildInputs = [ makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "An app runtime based on Chromium and node.js";
-    homepage = https://github.com/rogerwang/node-webkit;
-    platforms = ["i686-linux" "x86_64-linux"];
-    maintainers = [ maintainers.offline ];
-    license = licenses.bsd3;
-  };
-}

From 96f0d4e98cd0be7c05b4b2d0a3a6d8db2c6726c5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 07:44:40 -0500
Subject: [PATCH 1595/2266] pan: wrap to provide gpg2, which it crashes without

Fixes #37556.
---
 pkgs/applications/networking/newsreaders/pan/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 42788cfe1a5..34e24823e46 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,6 +1,7 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
 , perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
+, makeWrapper, gnupg
 }:
 
 assert spellChecking -> gtkspell2 != null;
@@ -15,10 +16,14 @@ stdenv.mkDerivation {
     sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ]
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ]
     ++ stdenv.lib.optional spellChecking gtkspell2;
 
+  postInstall = ''
+    wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
+  '';
+
   enableParallelBuilding = true;
 
   meta = {

From 7d873b8fd245aff7ef8dc41863a6c86e3e8fb8d5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 08:45:47 -0500
Subject: [PATCH 1596/2266] pan: ensure features we provide deps for are used,
 move to gtk3

---
 .../networking/newsreaders/pan/default.nix    | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 34e24823e46..1d913118433 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,10 +1,11 @@
 { spellChecking ? true
-, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
-, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
+, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
+, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
 , makeWrapper, gnupg
+, gnomeSupport ? true, libgnome-keyring3
 }:
 
-assert spellChecking -> gtkspell2 != null;
+assert spellChecking -> gtkspell3 != null;
 
 let version = "0.144"; in
 
@@ -17,8 +18,17 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ]
-    ++ stdenv.lib.optional spellChecking gtkspell2;
+  buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
+    ++ stdenv.lib.optional spellChecking gtkspell3
+    ++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
+
+  configureFlags = [
+    "--with-dbus"
+    "--with-gtk3"
+    "--with-gnutls"
+    "--enable-libnotify"
+  ] ++ stdenv.lib.optional spellChecking "--with-gtkspell"
+    ++ stdenv.lib.optional gnomeSupport "--enable-gkr";
 
   postInstall = ''
     wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin

From 603556085bc8cca64202a1d930f4546789955b25 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 21 Mar 2018 15:50:44 +0100
Subject: [PATCH 1597/2266] titaniumenv: update example app

---
 .../mobile/titaniumenv/examples/kitchensink/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 42f80cbd9d0..469fad09bf7 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -7,9 +7,9 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning
 
 let
   src = fetchgit {
-    url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "ec9edebf35030f61368000a8a9071dd7a0773884";
-    sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8";
+    url = https://github.com/appcelerator/kitchensink-v2.git;
+    rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537";
+    sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf";
   };
 
   # Rename the bundle id to something else

From 479ec3d888849a0b9c3ad471231135c9704fc550 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 21 Mar 2018 16:08:56 +0100
Subject: [PATCH 1598/2266] titaniumenv: fix renaming strategy

---
 .../mobile/titaniumenv/examples/kitchensink/default.nix          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 469fad09bf7..70ab1b168c4 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -18,7 +18,6 @@ let
     inherit src;
     buildPhase = ''
       sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml
-      sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" manifest
     '';
     installPhase = ''
       mkdir -p $out

From 63ba3490de0ddeb9b2b64c0c316cc6d9756ef04a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 10:18:21 -0500
Subject: [PATCH 1599/2266] pan: enable spell-checking features by default

Seems to work, not sure why disabled.

Steps are something like:
* install dictionaries into profile
* attempt to compose a message
  * (navigate dialogs about server and posting profile)
* enable spell-checking from edit->checkbox
  (note this toggle is avail even when pan can't spellcheck)
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbd82e2a875..77e68001373 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17023,9 +17023,7 @@ with pkgs;
 
   ncpamixer = callPackage ../applications/audio/ncpamixer { };
 
-  pan = callPackage ../applications/networking/newsreaders/pan {
-    spellChecking = false;
-  };
+  pan = callPackage ../applications/networking/newsreaders/pan { };
 
   panotools = callPackage ../applications/graphics/panotools { };
 

From a7bc556ce994babb0616a4e49579ce928405085f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 09:52:05 -0500
Subject: [PATCH 1600/2266] gtkspell3: add missing isocodes dep

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

diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 5376482e58a..2e6ecd7b520 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, intltool}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool}:
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ aspell gtk3 enchant ];
+  buildInputs = [ aspell gtk3 enchant isocodes ];
   propagatedBuildInputs = [ enchant ];
 
   meta = with stdenv.lib; {

From f967d2340334416fce239af5f3d0aae1a94c6f1c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 11:10:10 -0500
Subject: [PATCH 1601/2266] erlang R18-20: updates

---
 pkgs/development/interpreters/erlang/R18.nix | 4 ++--
 pkgs/development/interpreters/erlang/R19.nix | 4 ++--
 pkgs/development/interpreters/erlang/R20.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 967940ca184..ee524feb4c6 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -12,8 +12,8 @@ let
   };
 
 in mkDerivation rec {
-  version = "18.3.4.7";
-  sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l";
+  version = "18.3.4.8";
+  sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
 
   patches = [
     rmAndPwdPatch
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index aa8c941eb93..d0ba1912e9a 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl, fetchpatch }:
 
 mkDerivation rec {
-  version = "19.3.6.4";
-  sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071";
+  version = "19.3.6.6";
+  sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg";
 
   patches = [
     # macOS 10.13 crypto fix from OTP-20.1.2
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 8e955349f2d..7757039a4a1 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl }:
 
 mkDerivation rec {
-  version = "20.2.2";
-  sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
+  version = "20.3.1";
+  sha256 = "13qh3an98qm477zr1dvcklbhar001cikp177295llcqpchamgzx3";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From 6fa9d9cdbde0e7a9ca418fb100aa2e8a350121de Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 21 Mar 2018 12:58:19 -0400
Subject: [PATCH 1602/2266] hologram-server module: add cache timeout option

The version of hologram we're using has supported this option for a
while, but we didn't expose it through the NixOS module
---
 nixos/modules/services/security/hologram-server.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index bb56e2df09b..bad02c7440b 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -23,8 +23,9 @@ let
       account     = cfg.awsAccount;
       defaultrole = cfg.awsDefaultRole;
     };
-    stats  = cfg.statsAddress;
-    listen = cfg.listenAddress;
+    stats        = cfg.statsAddress;
+    listen       = cfg.listenAddress;
+    cachetimeout = cfg.cacheTimeoutSeconds;
   });
 in {
   options = {
@@ -106,6 +107,12 @@ in {
         default     = "";
         description = "Address of statsd server";
       };
+
+      cacheTimeoutSeconds = mkOption {
+        type        = types.int;
+        default     = 3600;
+        description = "How often (in seconds) to refresh the LDAP cache";
+      };
     };
   };
 

From 654ebf823290b8374b68780497e7a563d0287ceb Mon Sep 17 00:00:00 2001
From: Fedor Logachev <not.fl3@gmail.com>
Date: Wed, 21 Mar 2018 20:07:30 +0300
Subject: [PATCH 1603/2266] tdesktop: fixed GLib-GIO-ERROR

---
 .../networking/instant-messengers/telegram/tdesktop/generic.nix  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index a165e90c3bd..f489179a099 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -125,6 +125,7 @@ mkDerivation rec {
     # This is necessary to run Telegram in a pure environment.
     wrapProgram $out/bin/telegram-desktop \
       --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
+      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
       --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
     sed -i $out/bin/telegram-desktop \
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","

From 4a3ad82bcd663360b42940655fe2f77a73e033ea Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 21 Mar 2018 17:16:20 +0000
Subject: [PATCH 1604/2266] dontCheck pure-zlib

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 935fec829dc..48fa8c0e303 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -344,6 +344,7 @@ self: super: {
   orgmode-parse = dontCheck super.orgmode-parse;
   os-release = dontCheck super.os-release;
   persistent-redis = dontCheck super.persistent-redis;
+  pure-zlib = dontCheck super.pure-zlib; # https://github.com/NixOS/nixpkgs/issues/37499
   pipes-extra = dontCheck super.pipes-extra;
   pipes-websockets = dontCheck super.pipes-websockets;
   postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server

From 6845b248d9c1f897609aa2e1a55302b0475351d4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Mar 2018 14:00:47 +0000
Subject: [PATCH 1605/2266] coq: init at 8.8+beta1

---
 pkgs/applications/science/logic/coq/default.nix      |  6 +++---
 pkgs/development/coq-modules/CoLoR/default.nix       |  2 +-
 pkgs/development/coq-modules/QuickChick/default.nix  | 12 ++++++++----
 pkgs/development/coq-modules/autosubst/default.nix   |  2 ++
 pkgs/development/coq-modules/bignums/default.nix     |  4 ++++
 pkgs/development/coq-modules/coq-ext-lib/default.nix |  8 ++++++--
 pkgs/development/coq-modules/coq-haskell/default.nix | 11 +++++++----
 pkgs/development/coq-modules/coquelicot/default.nix  |  3 +++
 pkgs/development/coq-modules/dpdgraph/default.nix    | 11 +++++++++--
 pkgs/development/coq-modules/heq/default.nix         |  3 +++
 pkgs/development/coq-modules/interval/default.nix    |  3 +++
 pkgs/development/coq-modules/mathcomp/generic.nix    |  4 ++++
 pkgs/development/coq-modules/paco/default.nix        |  4 ++++
 pkgs/development/coq-modules/ssreflect/generic.nix   |  4 ++++
 pkgs/top-level/all-packages.nix                      |  4 ++--
 pkgs/top-level/coq-packages.nix                      |  4 ++++
 16 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index fb75a9dc609..2c785472114 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -22,6 +22,7 @@ let
    "8.7.0"     = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
    "8.7.1"     = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
    "8.7.2"     = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
+   "8.8+beta1" = "19ipmx6bf8wjpk8y29hcginxk7hps4jh1bbihn5icx4qysm81165";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
@@ -37,7 +38,7 @@ self = stdenv.mkDerivation {
   inherit camlp5;
   inherit (ocamlPackages) ocaml;
   passthru = {
-    inherit (ocamlPackages) findlib;
+    inherit (ocamlPackages) findlib num;
     emacsBufferSetup = pkgs: ''
       ; Propagate coq paths to children
       (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
@@ -92,7 +93,7 @@ self = stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ]
+  buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ]
   ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
 
   postPatch = ''
@@ -116,7 +117,6 @@ self = stdenv.mkDerivation {
 
   preConfigure = ''
     configureFlagsArray=(
-      -opt
       ${ideFlags}
     )
   '';
diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index 3f5ec69235f..82c6e58a7b0 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
   };
 
   passthru = {
-    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
   };
 }
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 72603ad4485..35cf63af862 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, coq, ssreflect }:
 
-let param =
+let params =
   {
     "8.5" = {
       version = "20170512";
@@ -19,9 +19,9 @@ let param =
       rev = "195e550a1cf0810497734356437a1720ebb6d744";
       sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
     };
-
-  }."${coq.coq-version}"
-; in
+  };
+  param = params."${coq.coq-version}";
+in
 
 stdenv.mkDerivation rec {
 
@@ -49,4 +49,8 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
+
 }
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index a27a247c9d0..75e78d8ac44 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -24,4 +24,6 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = { inherit (mathcomp) compatibleCoqVersions; };
+
 }
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 9d035fec9f9..45786c5a955 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -10,6 +10,10 @@ let param =
       rev = "V8.7.0";
       sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
     };
+    "8.8" = {
+      rev = "V8.8+beta1";
+      sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
+    };
   }."${coq.coq-version}"
 ; in
 
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 374979f1d15..877331383a7 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchFromGitHub, coq }:
 
-let param =
+let params =
   {
     "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
     "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
     "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
-  }."${coq.coq-version}";
+  };
+  param = params."${coq.coq-version}";
 in
 
 stdenv.mkDerivation rec {
@@ -34,4 +35,7 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
 }
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index b27fbcc1587..a66e941a8c9 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, coq, ssreflect }:
 
-let param =
+let params =
   {
     "8.5" = {
       version = "20171215";
@@ -19,9 +19,9 @@ let param =
       rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
       sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
     };
-
-  }."${coq.coq-version}"
-; in
+  };
+  param = params."${coq.coq-version}";
+in
 
 stdenv.mkDerivation rec {
 
@@ -48,4 +48,7 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
 }
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index 7f5111462bd..2e6c95bfe3c 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -22,4 +22,7 @@ stdenv.mkDerivation {
     maintainers = [ stdenv.lib.maintainers.vbgl ];
     inherit (coq.meta) platforms;
   };
+
+  passthru = { inherit (ssreflect) compatibleCoqVersions; };
+
 }
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 425ab408c8c..390ced8fdad 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
 
-let param = {
+let params = {
   "8.7" = {
     version = "0.6.2";
     rev = "d76ddde37d918569945774733b7997e8b24daf51";
@@ -16,7 +16,9 @@ let param = {
     rev = "v0.6";
     sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
   };
-}."${coq.coq-version}"; in
+};
+param = params."${coq.coq-version}";
+in
 
 stdenv.mkDerivation {
   name = "coq${coq.coq-version}-dpdgraph-${param.version}";
@@ -46,4 +48,9 @@ stdenv.mkDerivation {
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
     platforms = coq.meta.platforms;
   };
+
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
+
 }
diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix
index 5f31fe6dc34..bf441562b14 100644
--- a/pkgs/development/coq-modules/heq/default.nix
+++ b/pkgs/development/coq-modules/heq/default.nix
@@ -24,4 +24,7 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: !stdenv.lib.versionAtLeast v "8.8";
+  };
 }
diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index 5faf8093b15..b1036e61f1b 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -24,4 +24,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ vbgl ];
     platforms = coq.meta.platforms;
   };
+
+  passthru = { inherit (mathcomp) compatibleCoqVersions; };
+
 }
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 564cb6f6571..5d39f9b3b0c 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -35,4 +35,8 @@ stdenv.mkDerivation {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+  };
+
 }
diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix
index 93ef7c14f1f..94a24eb7085 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/pkgs/development/coq-modules/paco/default.nix
@@ -28,4 +28,8 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+  };
+
 }
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index c598345403d..ca20e17dd50 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -42,4 +42,8 @@ stdenv.mkDerivation {
     platforms = coq.meta.platforms;
   };
 
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c4d2277d07..9cc7ccc8ac3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19727,8 +19727,8 @@ with pkgs;
 
   inherit (callPackage ./coq-packages.nix {})
     mkCoqPackages
-    coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7
-    coqPackages_8_5 coqPackages_8_6 coqPackages_8_7
+    coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8
+    coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
     coqPackages coq
   ;
 
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 419fc485dd0..43d6d8d2dd5 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -71,10 +71,14 @@ in rec {
   coq_8_7 = callPackage ../applications/science/logic/coq {
     version = "8.7.2";
   };
+  coq_8_8 = callPackage ../applications/science/logic/coq {
+    version = "8.8+beta1";
+  };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
   coqPackages_8_6 = mkCoqPackages coq_8_6;
   coqPackages_8_7 = mkCoqPackages coq_8_7;
+  coqPackages_8_8 = mkCoqPackages coq_8_8;
   coqPackages = coqPackages_8_7;
   coq = coqPackages.coq;
 

From 8f75a5808179bc5be12feaaaea02dc52dfa589a9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 04:34:27 -0700
Subject: [PATCH 1606/2266] verilator: 3.920 -> 3.922

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin_dbg -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin_dbg --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage_bin_dbg -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage_bin_dbg --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_profcfunc help` got 0 exit code
- found 3.922 with grep in /nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922
- directory tree listing: https://gist.github.com/04b5044a54bb4ff549696cbcd57cd88e
---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index dade8296e99..75e99dcf659 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.920";
+  version = "3.922";
 
   src = fetchurl {
     url    = "http://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "1zs3d6h5sbz455fwpgg89h81hkfn92ary8bmhjinc1rd8fm3hp1b";
+    sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg";
   };
 
   enableParallelBuilding = true;

From 2f7878ac568b9241782e9a69d82cd7ddf23e0a89 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 23:11:49 -0700
Subject: [PATCH 1607/2266] criu: 3.7 -> 3.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/compel -h` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/compel --help` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu -h` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu --help` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu -V` and found version 3.8
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu --version` and found version 3.8
- found 3.8 with grep in /nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8
- directory tree listing: https://gist.github.com/6bc3ef9b1f4c69a6862043a1158fba16
---
 pkgs/os-specific/linux/criu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 4ef162e56c7..42ab0092f7d 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "3.7";
+  version = "3.8";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq";
+    sha256 = "0gmvbnb5wa3f4nzam7gssclfai8g5363dhp8qc7q32dcx4wxbgam";
   };
 
   enableParallelBuilding = true;

From 501b6d0e13aeabddabc66886b2c71385ac5c8d06 Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Tue, 13 Mar 2018 16:17:30 +0100
Subject: [PATCH 1608/2266] profanity: refactor build to build from source

* fix osx build
* fix undefined macros in configure.ac
* activate the check phase to run the test suite
---
 .../instant-messengers/profanity/default.nix  | 35 ++++++++++++----
 .../profanity/patches/packages-osx.patch      | 11 +++++
 .../profanity/patches/undefined-macros.patch  | 40 +++++++++++++++++++
 3 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 74dc36bc7ac..327b02b2352 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
-, ncurses, libotr, curl, readline, libuuid
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
+, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
+, cmocka, libmicrohttpd, stabber, expat, libmesode
 
 , autoAwaySupport ? false,       libXScrnSaver ? null, libX11 ? null
 , notifySupport ? false,         libnotify ? null, gdk_pixbuf ? null
@@ -20,18 +21,22 @@ stdenv.mkDerivation rec {
   name = "profanity-${version}";
   version = "0.5.1";
 
-  src = fetchurl {
-    url = "http://www.profanity.im/profanity-${version}.tar.gz";
-    sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "profanity";
+    rev = "${version}";
+    sha256 = "1ppr02wivhlrqr62r901clnycna8zpn6kr7n5rw8y3zfw21ny17z";
   };
 
+  patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
+
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ];
 
   buildInputs = [
-    readline libuuid libmesode
-    glib openssl expat ncurses libotr curl
+    expect readline libuuid glib openssl expat ncurses libotr
+    curl libmesode cmocka libmicrohttpd stabber
   ] ++ optionals autoAwaySupport     [ libXScrnSaver libX11 ]
     ++ optionals notifySupport       [ libnotify gdk_pixbuf ]
     ++ optionals traySupport         [ gnome2.gtk ]
@@ -45,6 +50,20 @@ stdenv.mkDerivation rec {
     ++ optionals pgpSupport          [ "--enable-pgp" ]
     ++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
 
+  preAutoreconf = ''
+    mkdir m4
+  '';
+
+  doCheck = true;
+
+  LC_ALL = "en_US.utf8";
+
+  NIX_CFLAGS_COMPILE = [ ]
+    ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ];
+
+  LDFLAGS = [ ]
+    ++ optionals pythonPluginSupport [ "-L${python}/lib" "-lpython${python.majorVersion}m" ];
+
   meta = {
     description = "A console based XMPP client";
     longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
new file mode 100644
index 00000000000..77bfc5e78bd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
@@ -0,0 +1,11 @@
+diff --git a/configure.ac b/configure.ac
+index 1e55b1cc..0832a387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,6 @@ AC_CANONICAL_HOST
+ PLATFORM="unknown"
+ AS_CASE([$host_os],
+     [freebsd*], [PLATFORM="freebsd"],
+-    [darwin*], [PLATFORM="osx"],
+     [cygwin], [PLATFORM="cygwin"],
+     [PLATFORM="nix"])
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
new file mode 100644
index 00000000000..9ef4e7bebe5
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
@@ -0,0 +1,40 @@
+diff --git a/configure.ac b/configure.ac
+index 1e55b1cc..0832a387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then
+         AM_CONDITIONAL([BUILD_PYTHON_API], [true])
+         AC_DEFINE([HAVE_PYTHON], [1], [Python support])
+     else
+-        if test "x$enable_python_plugins" = xyes; then
+-            AC_MSG_ERROR([Python not found, cannot enable Python plugins.])
+-        else
+-            AM_CONDITIONAL([BUILD_PYTHON_API], [false])
+-            AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])
+-        fi
++        AS_IF(
++            [test "x$enable_python_plugins" = xyes],
++            [],
++            [AM_CONDITIONAL([BUILD_PYTHON_API], [false])
++            AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])]
++        )
+     fi
+     AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework])
+ else
+@@ -107,7 +105,7 @@ else
+             [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
+             [AS_IF(
+                 [test "x$enable_c_plugins" = xyes],
+-                    [AC_MSG_ERROR([dl library needed to run C plugins])],
++                [],
+                 [AM_CONDITIONAL([BUILD_C_API], [false])])
+             ])
+     else
+@@ -116,7 +114,6 @@ else
+ fi
+ 
+ # threading
+-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])])
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ])

From 319866ae11eddac6fa872429a739e9aec304bb0e Mon Sep 17 00:00:00 2001
From: giraffito <37449399+giraffito@users.noreply.github.com>
Date: Wed, 21 Mar 2018 19:57:52 +0000
Subject: [PATCH 1609/2266] python.md: fix grammar around bdist_wheel FAQ

---
 doc/languages-frameworks/python.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 039ca8545e9..0f871395854 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -871,8 +871,10 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
 ```
 ValueError: ZIP does not support timestamps before 1980
 ```
-This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that.
-The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels.
+
+This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980.
+
+The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels.
 
 Use 1980 as timestamp:
 ```shell
@@ -882,7 +884,7 @@ or the current time:
 ```shell
 nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
 ```
-or unset:
+or unset `SOURCE_DATE_EPOCH`:
 ```shell
 nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
 ```

From 0fdc4cb94bca8a186c622dfae256dfd45b5ee4f5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 15:15:50 -0500
Subject: [PATCH 1610/2266] ngx_brotli: update for fixes, zero copy.

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

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 32d1523547e..95e156f9627 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -5,8 +5,8 @@
     src = let gitsrc = pkgs.fetchFromGitHub {
       owner = "eustas";
       repo = "ngx_brotli";
-      rev = "8cd9dd5fc232d3a01644584921e52dae99034779";
-      sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6";
+      rev = "6a1174446f5a866d3d13615dd2824177570f0a69";
+      sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6";
     }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
       cp -a ${gitsrc} $out
       substituteInPlace $out/config \

From 5566bf97e56e483e3bb3678c419c2fd37fae3361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 21 Mar 2018 21:12:39 +0100
Subject: [PATCH 1611/2266] libheimdal: 7.4.0 -> 7.5.0

In Heimdal 7.1 through 7.4, remote unauthenticated attackers are able to
crash the KDC by sending a crafted UDP packet containing empty data
fields for client name or realm.

Security: CVE-2017-17439
---
 .../kerberos/heimdal-make-missing-headers.patch        | 10 ++++++++++
 pkgs/development/libraries/kerberos/heimdal.nix        | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch

diff --git a/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch b/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
new file mode 100644
index 00000000000..a0fa625538b
--- /dev/null
+++ b/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
@@ -0,0 +1,10 @@
+--- a/lib/hx509/Makefile.am 2018-03-21 15:41:38.622968809 +0100
++++ b/lib/hx509/Makefile.am 2018-03-21 15:41:32.655162197 +0100
+@@ -9,6 +9,8 @@
+	sel-gram.h			\
+	$(gen_files_ocsp:.x=.c)		\
+	$(gen_files_pkcs10:.x=.c)	\
++	ocsp_asn1.h			\
++	pkcs10_asn1.h			\
+	hx509_err.c			\
+	hx509_err.h
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 81f878daaaa..b72a00d242e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -12,15 +12,17 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}heimdal-${version}";
-  version = "7.4.0";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "heimdal";
     repo = "heimdal";
     rev = "heimdal-${version}";
-    sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp";
+    sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
   };
 
+  patches = [ ./heimdal-make-missing-headers.patch ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
@@ -44,6 +46,10 @@ stdenv.mkDerivation rec {
     "--with-capng"
   ];
 
+  postUnpack = ''
+    sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common
+  '';
+
   buildPhase = optionalString libOnly ''
     (cd include; make -j $NIX_BUILD_CORES)
     (cd lib; make -j $NIX_BUILD_CORES)

From 3918182cb540cf0e6455653b05a7b3338a5d8a31 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 21 Mar 2018 21:02:15 +0200
Subject: [PATCH 1612/2266] nixos/manual: Don't depend on non-bin outputs of
 libxml2 and libxslt

Might fix https://hydra.nixos.org/build/71580290.
---
 nixos/doc/manual/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 3b01f4fed35..c51c30065a3 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -139,7 +139,7 @@ let
 
   manual-combined = runCommand "nixos-manual-combined"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       meta.description = "The NixOS manual as plain docbook XML";
     }
     ''
@@ -194,7 +194,7 @@ let
 
   olinkDB = runCommand "manual-olinkdb"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
     }
     ''
       xsltproc \
@@ -244,7 +244,7 @@ in rec {
   # Generate the NixOS manual.
   manual = runCommand "nixos-manual"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       meta.description = "The NixOS manual in HTML format";
       allowedReferences = ["out"];
     }
@@ -272,7 +272,7 @@ in rec {
 
   manualEpub = runCommand "nixos-manual-epub"
     { inherit sources;
-      buildInputs = [ libxml2 libxslt zip ];
+      buildInputs = [ libxml2.bin libxslt.bin zip ];
     }
     ''
       # Generate the epub manual.
@@ -302,7 +302,7 @@ in rec {
   # Generate the NixOS manpages.
   manpages = runCommand "nixos-manpages"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       allowedReferences = ["out"];
     }
     ''

From 1874678d12df675fb1dff7d84876d030b8822d57 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 21 Mar 2018 22:12:41 +0200
Subject: [PATCH 1613/2266] make-dbus-conf: Don't depend on unnecessary libxslt
 outputs

Might fix https://hydra.nixos.org/build/71580290.
---
 pkgs/development/libraries/dbus/make-dbus-conf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index c3c41b74f09..b5bf2b23000 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -24,7 +24,7 @@ runCommand "dbus-1"
           rewritePrefix="file://${dbus}/share/xml/dbus/"/>
       </catalog>
     '';
-    nativeBuildInputs = [ libxslt ];
+    nativeBuildInputs = [ libxslt.bin ];
   }
   ''
     mkdir -p $out

From ccbaacaec59e3917219439113cab2dc6228f7db6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 19:25:06 -0700
Subject: [PATCH 1614/2266] netsurf.buildsystem: 1.5 -> 1.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/8d2bc8fda08696882cec0fd25ff22ac3
---
 pkgs/applications/misc/netsurf/buildsystem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index 74e7c694ea4..f25180505e8 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "netsurf-buildsystem-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
-    sha256 = "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv";
+    sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x";
   };
 
   makeFlags = [

From 9a054d7cd65716b99c0e5ab037e7032db7a9582e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 20:40:39 +0100
Subject: [PATCH 1615/2266] libnfs: fix clang build

/cc ZHF #36454
---
 pkgs/development/libraries/libnfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index d9149a1fbac..2955aaebc01 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare";
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From c2ca5c057de6a5576cecd2b05381328a63629375 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 20:46:21 +0100
Subject: [PATCH 1616/2266] libqglviewer: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/libqglviewer/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                     | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index eef9e05ca03..e68c5052beb 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchurl, qt4, qmake4Hook, AGL }:
 
 stdenv.mkDerivation rec {
   name = "libqglviewer-2.6.3";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
-  buildInputs = [ qt4 qmake4Hook ];
+  buildInputs = [ qt4 qmake4Hook ]
+    ++ stdenv.lib.optional stdenv.isDarwin AGL;
 
   postPatch =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c41ee08582d..9b04ff0f368 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9928,7 +9928,9 @@ with pkgs;
 
   libplist = callPackage ../development/libraries/libplist { };
 
-  libqglviewer = callPackage ../development/libraries/libqglviewer { };
+  libqglviewer = callPackage ../development/libraries/libqglviewer {
+    inherit (darwin.apple_sdk.frameworks) AGL;
+  };
 
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};

From fe37684525d39a3342a25f7123e632f5058bccf3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 21:13:33 +0100
Subject: [PATCH 1617/2266] luaffi: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/luaffi/darwin.patch | 17 +++++++++++++++++
 pkgs/development/libraries/luaffi/default.nix  |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/luaffi/darwin.patch

diff --git a/pkgs/development/libraries/luaffi/darwin.patch b/pkgs/development/libraries/luaffi/darwin.patch
new file mode 100644
index 00000000000..50db81b776d
--- /dev/null
+++ b/pkgs/development/libraries/luaffi/darwin.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index b2b5f2c..b690a5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,10 @@ test:
+ 	if [ `uname` = "Darwin" ]; then $(MAKE) test_macosx; else $(MAKE) test_posix; fi
+ 
+ macosx:
+-	$(MAKE) posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)"
++	$(MAKE) posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)"
+ 
+ test_macosx:
+-	$(MAKE) test_posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)"
++	$(MAKE) test_posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)"
+ 
+ posix: $(MODSO) test_cdecl.so
+ 
diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix
index 1e4cf11d1fa..065562ac82e 100644
--- a/pkgs/development/libraries/luaffi/default.nix
+++ b/pkgs/development/libraries/luaffi/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ lua ];
 
-  patches = [
-    ./makefile-errors.patch
-  ];
+  patches = [ ./darwin.patch ./makefile-errors.patch ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
 
   installPhase = ''
     mkdir -p $out/lib

From 9b5669b5a6947e8f5230df521d859a66346a9b90 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 21:25:54 +0100
Subject: [PATCH 1618/2266] lxtask: fix darwin build

/cc ZHF #36454
---
 pkgs/desktops/lxde/core/lxtask/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index ef95f6035b2..dbed065190e 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  
+
   buildInputs = [ gtk3 ];
 
   configureFlags = [ "--enable-gtk3" ];
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = {
     description = "Lightweight and desktop independent task manager";
     longDescription = ''
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
       Desktop Environment, it's totally desktop independent and only
       requires pure gtk+.
     '';
-    homepage = https://wiki.lxde.org/en/LXTask; 
+    homepage = https://wiki.lxde.org/en/LXTask;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From b1b4c6c4eb92e59dcd664645f74b1c57b08204d0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Mar 2018 23:07:05 +0300
Subject: [PATCH 1619/2266] pyqt5: propagate Qt dependencies

This is so that Qt user environment packages are also propagated. Fixes
Electrum environment installations when no other Qt applications are installed.

Added `dev` output so that closure size won't explode.
---
 pkgs/development/python-modules/pyqt/5.x.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 225da204e21..50cb8ceba91 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -9,6 +9,7 @@ let
   version = "5.10";
 
   inherit (pythonPackages) buildPythonPackage python dbus-python sip;
+
 in buildPythonPackage {
   pname = pname;
   version = version;
@@ -27,14 +28,16 @@ in buildPythonPackage {
     sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  outputs = [ "out" "dev" ];
 
-  buildInputs = [
-    lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
+  nativeBuildInputs = [ pkgconfig qmake lndir ];
+
+  buildInputs = [ dbus_libs ];
+
+  propagatedBuildInputs = [
+    sip qtbase qtsvg qtwebkit qtwebengine
   ] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
 
-  propagatedBuildInputs = [ sip ];
-
   configurePhase = ''
     runHook preConfigure
 

From 38323015e2011ee2ed9af0a516b5f2c804627d5f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 21:42:06 +0100
Subject: [PATCH 1620/2266] masscan: fix build

---
 pkgs/tools/security/masscan/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index 22a452ccabd..26497659d23 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ];
+  makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
 
   postInstall = ''
     mkdir -p $out/share/man/man8
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b04ff0f368..0bdff7935bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1298,7 +1298,9 @@ with pkgs;
 
   mathics = pythonPackages.mathics;
 
-  masscan = callPackage ../tools/security/masscan { };
+  masscan = callPackage ../tools/security/masscan {
+    stdenv = gccStdenv;
+  };
 
   massren = callPackage ../tools/misc/massren { };
 

From a9a7580c3fe85c8497c3aa3dbe8b7a27ebdda7a5 Mon Sep 17 00:00:00 2001
From: Daniel Kuehn <daniel@kuehn.se>
Date: Wed, 21 Mar 2018 21:53:02 +0100
Subject: [PATCH 1621/2266] ceph: Add makeWrapper to dependencies and
 nativeBuildInputs

The ceph-mgr daemon needs to know the location of cephs own-made python modules for some of the modules
that you can enable for it.
With wrapProgram, a wrapper is added that sets the proper pythonpath environment variable for the ceph-mgr
daemon so its modules can find the ceph python modules
---
 pkgs/tools/filesystems/ceph/generic.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 32b85eaa681..a637d3891ec 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -5,7 +5,7 @@
 , openldap, lttngUst
 , babeltrace, gperf
 , cunit, snappy
-, rocksdb
+, rocksdb, makeWrapper
 
 # Optional Dependencies
 , yasm ? null, fcgi ? null, expat ? null
@@ -97,6 +97,7 @@ let
     ps.pecan
     ps.prettytable
     ps.webob
+    ps.cherrypy
 	]);
 
 in
@@ -114,7 +115,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig which git python2Packages.wrapPython
+    pkgconfig which git python2Packages.wrapPython makeWrapper
     (ensureNewerSourcesHook { year = "1980"; })
   ];
   
@@ -159,6 +160,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapPythonPrograms
+    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages
   '';
 
   enableParallelBuilding = true;

From df861685cb1f0612ccce339c91f13823316fd4bb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 Mar 2018 16:00:47 -0500
Subject: [PATCH 1622/2266] icestorm: 2018.03.07 -> 2018.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index b277957efa9..3c87abbdce9 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2018.03.07";
+  version = "2018.03.21";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "535fde63613eccfeb7e5aad8ff97fbfb652a33b6";
-    sha256 = "1j2p961k1fsq1xq8fnrv0hpwrb948q12jkb479zmrfk61w6la0df";
+    rev    = "4476d83f76fa0222be0b691fe27c1e0228266f82";
+    sha256 = "1r43vwwz61rvdpc3kylg8yzv0flz9p4j3yc1cc4h904zsdwjx39a";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7a00f136e980a5afa2fc12ecbabbff89535be770 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 Mar 2018 16:00:55 -0500
Subject: [PATCH 1623/2266] yosys: 2018.03.07 -> 2018.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index b087eca30c0..568c94718e7 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -6,14 +6,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.03.07";
+  version = "2018.03.21";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "8b604004dae31f7f3120685dd05d16a4bace904a";
-      sha256 = "18i4l5rka3l9lg8cdpigprw80im293j3bmv0zab1gxf3rhbjpcb7";
+      rev    = "3f0070247590458c5ed28c5a7abfc3b9d1ec138b";
+      sha256 = "0rsnjk25asg7dkxcmim464rmxgvm7x7njmcp5nyl8y4iwn8i9p8v";
       name   = "yosys";
     })
 

From 011e70155b2b1b41655966bc8a9e0aae41e3432b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 Mar 2018 16:01:02 -0500
Subject: [PATCH 1624/2266] symbiyosys: 2018.03.07 -> 2018.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 682f9282e6b..b6312bfe466 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2018.03.07";
+  version = "2018.03.21";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "symbiyosys";
-    rev    = "2c13fbefe67adb3a4adb8a6f283b198abb8a43a0";
-    sha256 = "0v60530w5y4yj66zcp7lwa82158iw26mil1gj41lzyi2p651kc1k";
+    rev    = "76a624a363bc44df102359595d34f29370c6668b";
+    sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm";
   };
 
   buildInputs = [ python3 yosys ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
                 "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
   '';
   meta = {
-    description = "Yosys verification tools for Hardware Definition Languages";
+    description = "Tooling for Yosys-based verification flows";
     homepage    = https://symbiyosys.readthedocs.io/;
     license     = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];

From 044d4b0875e65d334c6c9df105459d93d5de4dc6 Mon Sep 17 00:00:00 2001
From: Vasyl Solovei <svsdep@gmail.com>
Date: Wed, 7 Mar 2018 22:06:34 +0200
Subject: [PATCH 1625/2266] skypeforlinux: 8.16.0.4 -> 8.17.0.2

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

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 87b2ee22381..8cd9eb84b83 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -6,7 +6,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.16.0.4";
+  version = "8.17.0.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -57,7 +57,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "1qc5qd07r768q9wkr2fq1q731hslh21i8rs41jb6pbn3ai65mxf5";
+        sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";

From 1d854b479c74f0eb5e47a4241384a0146d268300 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 15:47:09 +0200
Subject: [PATCH 1626/2266] edk2: Reformat a bit for readability

- Have only one sed expression per line
- Put the important stuff closer to the command and not hidden in some
continuation line. That is, don't do:

sed \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <IMPORTANT STUFF>

but:

sed <IMPORTANT STUFF> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff>
---
 pkgs/development/compilers/edk2/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 4b87beb0879..5cc4846d3ae 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -58,13 +58,20 @@ edk2 = stdenv.mkDerivation {
 
       configurePhase = ''
         mkdir -v Conf
-        sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
-          's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
-          < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
-        sed -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
+
+        cp ${edk2}/BaseTools/Conf/target.template Conf/target.txt
+        sed -i Conf/target.txt \
+          -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' \
+          -e 's|MYTOOLS|GCC49|' \
+          -e 's|IA32|${targetArch}|' \
+          -e 's|DEBUG|RELEASE|'\
+
+        cp ${edk2}/BaseTools/Conf/tools_def.template Conf/tools_def.txt
+        sed -i Conf/tools_def.txt \
+          -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
           -e 's|DEFINE GCC48_X64_PREFIX        = /usr/bin/|DEFINE GCC48_X64_PREFIX        = ""|' \
-          -e 's|DEFINE UNIX_IASL_BIN           = /usr/bin/iasl|DEFINE UNIX_IASL_BIN           = ${iasl}/bin/iasl|' \
-          < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt
+          -e 's|DEFINE UNIX_IASL_BIN           = /usr/bin/iasl|DEFINE UNIX_IASL_BIN           = ${iasl}/bin/iasl|'
+
         export WORKSPACE="$PWD"
         export EFI_SOURCE="$PWD/EdkCompatibilityPkg"
         ln -sv ${edk2}/BaseTools BaseTools

From 164501198375091b89e38ce3adba21f0466d61d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 15:52:32 +0200
Subject: [PATCH 1627/2266] OVMF: Reformat a bit for readability

- Use 'somePkg == null' instead of 'somePkg == false' which is more
  conventional in rest of Nixpkgs
- Use lib.optionalString where applicable
---
 .../virtualization/OVMF/default.nix           | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  6 ++--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index fcf569a762a..dca29e28cbb 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
+{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
 
 let
 
@@ -36,25 +36,24 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
       ln -sv "$file" .
     done
 
-    ${if (seabios == false) then ''
-        ln -sv ${src}/OvmfPkg .
-      '' else ''
+    ${if seabios != null then ''
         cp -r ${src}/OvmfPkg .
         chmod +w OvmfPkg/Csm/Csm16
         cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
-      ''}
-
-    ${if (secureBoot == true) then ''
-        ln -sv ${src}/SecurityPkg .
-        ln -sv ${src}/CryptoPkg .
-      '' else ''
-      ''}
-    '';
-
-  buildPhase = if (seabios == false) then ''
-      build ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""}
     '' else ''
-      build -D CSM_ENABLE -D FD_SIZE_2MB ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""}
+        ln -sv ${src}/OvmfPkg .
+    ''}
+
+    ${lib.optionalString secureBoot ''
+      ln -sv ${src}/SecurityPkg .
+      ln -sv ${src}/CryptoPkg .
+    ''}
+  '';
+
+  buildPhase = if seabios == null then ''
+      build ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+    '' else ''
+      build -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
     '';
 
   postFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bdff7935bc..40824ac4efc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12589,9 +12589,9 @@ with pkgs;
 
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
-  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
-  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
-  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
+  OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
+  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; };
+  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; };
 
   seabios = callPackage ../applications/virtualization/seabios { };
 

From f59eab75d2bb20e44aff84ccadf65e4024db6eb4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 17:37:49 +0200
Subject: [PATCH 1628/2266] edk2, OVMF: Build on aarch64

And also build in parallel.

I don't understand why we manually tediously link every single directory
from the source, but I don't want to investigate too much.
---
 .../virtualization/OVMF/default.nix           | 40 ++++++++++++++-----
 pkgs/development/compilers/edk2/default.nix   |  4 +-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index dca29e28cbb..ee4ea4346e4 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -2,10 +2,12 @@
 
 let
 
-  targetArch = if stdenv.isi686 then
-    "Ia32"
+  projectDscPath = if stdenv.isi686 then
+    "OvmfPkg/OvmfPkgIa32.dsc"
   else if stdenv.isx86_64 then
-    "X64"
+    "OvmfPkg/OvmfPkgX64.dsc"
+  else if stdenv.isAarch64 then
+    "ArmVirtPkg/ArmVirtQemu.dsc"
   else
     throw "Unsupported architecture";
 
@@ -14,7 +16,7 @@ let
   src = edk2.src;
 in
 
-stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
+stdenv.mkDerivation (edk2.setup projectDscPath {
   name = "OVMF-${version}";
 
   inherit src;
@@ -36,7 +38,13 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
       ln -sv "$file" .
     done
 
-    ${if seabios != null then ''
+    ${if stdenv.isAarch64 then ''
+      ln -sv ${src}/ArmPkg .
+      ln -sv ${src}/ArmPlatformPkg .
+      ln -sv ${src}/ArmVirtPkg .
+      ln -sv ${src}/EmbeddedPkg .
+      ln -sv ${src}/OvmfPkg .
+    '' else if seabios != null then ''
         cp -r ${src}/OvmfPkg .
         chmod +w OvmfPkg/Csm/Csm16
         cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
@@ -50,13 +58,25 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     ''}
   '';
 
-  buildPhase = if seabios == null then ''
-      build ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+  buildPhase = if stdenv.isAarch64 then ''
+      build -n $NIX_BUILD_CORES
+    '' else if seabios == null then ''
+      build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
     '' else ''
-      build -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+      build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
     '';
 
-  postFixup = ''
+  postFixup = if stdenv.isAarch64 then ''
+    mkdir -vp $fd/FV
+    mkdir -vp $fd/AAVMF
+    mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
+
+    # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
+    # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules
+    dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=/dev/zero bs=1M    count=64
+    dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=$fd/FV/QEMU_EFI.fd conv=notrunc
+    dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M    count=64
+  '' else ''
     mkdir -vp $OUTPUT_FD/FV
     mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
   '';
@@ -67,6 +87,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     description = "Sample UEFI firmware for QEMU and KVM";
     homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
     license = stdenv.lib.licenses.bsd2;
-    platforms = ["x86_64-linux" "i686-linux"];
+    platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
   };
 })
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 5cc4846d3ae..1dc4430dc6a 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -7,6 +7,8 @@ targetArch = if stdenv.isi686 then
   "IA32"
 else if stdenv.isx86_64 then
   "X64"
+else if stdenv.isAarch64 then
+  "AARCH64"
 else
   throw "Unsupported architecture";
 
@@ -48,7 +50,7 @@ edk2 = stdenv.mkDerivation {
     homepage = https://sourceforge.net/projects/edk2/;
     license = stdenv.lib.licenses.bsd2;
     branch = "UDK2017";
-    platforms = ["x86_64-linux" "i686-linux"];
+    platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
   };
 
   passthru = {

From e58624a877342d1fea39b02a5d6528cd53eefefe Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 20:36:35 +0200
Subject: [PATCH 1629/2266] nixos/tests: Make simpleUefiGrub test work on
 AArch64

Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...
---
 nixos/tests/installer.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index c12919540a3..f67011b4412 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -69,11 +69,17 @@ let
     let
       iface = if grubVersion == 1 then "ide" else "virtio";
       isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
+
+      # FIXME don't duplicate the -enable-kvm etc. flags here yet again!
       qemuFlags =
         (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
-        (optionalString (system == "x86_64-linux") "-cpu kvm64 ");
+        (optionalString (system == "x86_64-linux") "-cpu kvm64 ") +
+        (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host ");
+
       hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
-        + optionalString isEfi ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '';
+        + optionalString isEfi (if pkgs.stdenv.isAarch64
+            then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
+            else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
     in
     ''
       $machine->start;

From fa50e903cfec03c325766f032833f92b700199a3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 21 Mar 2018 11:02:37 +0100
Subject: [PATCH 1630/2266] libhttpseverywhere: fix build

run tests in correct directory
---
 pkgs/development/libraries/libhttpseverywhere/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index f39cc2574c9..c674b155fd1 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  checkPhase = "./httpseverywhere_test";
+  checkPhase = "(cd test && ./httpseverywhere_test)";
 
   outputs = [ "out" "devdoc" ];
 

From 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 22:41:26 +0100
Subject: [PATCH 1631/2266] monero: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/altcoins/monero/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 4b1e9cd4ea3..57a058bada6 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchpatch, fetchFromGitHub, cmake
 , boost, miniupnpc, openssl, pkgconfig, unbound
+, IOKit
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ boost miniupnpc openssl unbound ];
+  buildInputs = [ boost miniupnpc openssl unbound ]
+    ++ stdenv.lib.optional stdenv.isDarwin IOKit;
 
   patches = [
     ./build-wallet-rpc.patch # fixed in next release
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40824ac4efc..1e3095ee7fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16614,7 +16614,9 @@ with pkgs;
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  monero = callPackage ../applications/altcoins/monero { };
+  monero = callPackage ../applications/altcoins/monero {
+    inherit (darwin.apple_sdk.frameworks) IOKit;
+  };
 
   monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };
 

From 4f0d0cc6ad4b0d850a6c33efb9e92e24f0c3c509 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 08:54:50 -0700
Subject: [PATCH 1632/2266] xorg.xkill: 1.0.4 -> 1.0.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/gjg9nnbybyy2mig9hkd8kfsv7msdi733-xkill-1.0.5/bin/xkill -v` and found version 1.0.5
- found 1.0.5 with grep in /nix/store/gjg9nnbybyy2mig9hkd8kfsv7msdi733-xkill-1.0.5
- directory tree listing: https://gist.github.com/220fd7765fdc12432a2b23fd0f68c24b
---
 pkgs/servers/x11/xorg/default.nix | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d22565ae8db..6fae0bc0a1f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -32,10 +32,10 @@ let
   }) // {inherit ;};
 
   appres = (mkDerivation "appres" {
-    name = "appres-1.0.4";
+    name = "appres-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2;
+      url = mirror://xorg/individual/app/appres-1.0.5.tar.bz2;
       sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -140,10 +140,10 @@ let
   }) // {inherit ;};
 
   encodings = (mkDerivation "encodings" {
-    name = "encodings-1.0.4";
+    name = "encodings-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.5.tar.bz2;
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -188,10 +188,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
-    name = "font-adobe-utopia-100dpi-1.0.4";
+    name = "font-adobe-utopia-100dpi-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.5.tar.bz2;
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -200,10 +200,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
-    name = "font-adobe-utopia-75dpi-1.0.4";
+    name = "font-adobe-utopia-75dpi-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.5.tar.bz2;
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -212,10 +212,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
-    name = "font-adobe-utopia-type1-1.0.4";
+    name = "font-adobe-utopia-type1-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.5.tar.bz2;
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -524,10 +524,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
-    name = "font-screen-cyrillic-1.0.4";
+    name = "font-screen-cyrillic-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.5.tar.bz2;
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -596,10 +596,10 @@ let
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontxfree86type1 = (mkDerivation "fontxfree86type1" {
-    name = "font-xfree86-type1-1.0.4";
+    name = "font-xfree86-type1-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.5.tar.bz2;
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -1388,10 +1388,10 @@ let
   }) // {inherit ;};
 
   windowswmproto = (mkDerivation "windowswmproto" {
-    name = "windowswmproto-1.0.4";
+    name = "windowswmproto-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.5.tar.bz2;
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -1604,10 +1604,10 @@ let
   }) // {inherit libpng libX11 libXcursor ;};
 
   xcursorthemes = (mkDerivation "xcursorthemes" {
-    name = "xcursor-themes-1.0.4";
+    name = "xcursor-themes-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2;
+      url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2;
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2444,10 +2444,10 @@ let
   }) // {inherit libX11 libxkbfile ;};
 
   xkbprint = (mkDerivation "xkbprint" {
-    name = "xkbprint-1.0.4";
+    name = "xkbprint-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2;
+      url = mirror://xorg/individual/app/xkbprint-1.0.5.tar.bz2;
       sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2456,10 +2456,10 @@ let
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbutils = (mkDerivation "xkbutils" {
-    name = "xkbutils-1.0.4";
+    name = "xkbutils-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2;
+      url = mirror://xorg/individual/app/xkbutils-1.0.5.tar.bz2;
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2480,11 +2480,11 @@ let
   }) // {inherit libX11 xproto ;};
 
   xkill = (mkDerivation "xkill" {
-    name = "xkill-1.0.4";
+    name = "xkill-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2;
-      sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
+      url = mirror://xorg/individual/app/xkill-1.0.5.tar.bz2;
+      sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 libXmu xproto ];
@@ -2540,10 +2540,10 @@ let
   }) // {inherit libX11 libXaw libXmu libXt ;};
 
   xmessage = (mkDerivation "xmessage" {
-    name = "xmessage-1.0.4";
+    name = "xmessage-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2;
+      url = mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2;
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2612,10 +2612,10 @@ let
   }) // {inherit ;};
 
   xpr = (mkDerivation "xpr" {
-    name = "xpr-1.0.4";
+    name = "xpr-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.5.tar.bz2;
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2756,10 +2756,10 @@ let
   }) // {inherit libX11 libxcb xproto ;};
 
   xwud = (mkDerivation "xwud" {
-    name = "xwud-1.0.4";
+    name = "xwud-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.5.tar.bz2;
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     nativeBuildInputs = [ pkgconfig ];

From e05a926713441a4ec632c7b793448654f7c2056d Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Wed, 21 Mar 2018 22:09:18 +0000
Subject: [PATCH 1633/2266] Revert "xorg.xkill: 1.0.4 -> 1.0.5"

This reverts commit 4f0d0cc6ad4b0d850a6c33efb9e92e24f0c3c509.
---
 pkgs/servers/x11/xorg/default.nix | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6fae0bc0a1f..d22565ae8db 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -32,10 +32,10 @@ let
   }) // {inherit ;};
 
   appres = (mkDerivation "appres" {
-    name = "appres-1.0.5";
+    name = "appres-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/appres-1.0.5.tar.bz2;
+      url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2;
       sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -140,10 +140,10 @@ let
   }) // {inherit ;};
 
   encodings = (mkDerivation "encodings" {
-    name = "encodings-1.0.5";
+    name = "encodings-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2;
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -188,10 +188,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
-    name = "font-adobe-utopia-100dpi-1.0.5";
+    name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -200,10 +200,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
-    name = "font-adobe-utopia-75dpi-1.0.5";
+    name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -212,10 +212,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
-    name = "font-adobe-utopia-type1-1.0.5";
+    name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -524,10 +524,10 @@ let
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
-    name = "font-screen-cyrillic-1.0.5";
+    name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -596,10 +596,10 @@ let
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontxfree86type1 = (mkDerivation "fontxfree86type1" {
-    name = "font-xfree86-type1-1.0.5";
+    name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -1388,10 +1388,10 @@ let
   }) // {inherit ;};
 
   windowswmproto = (mkDerivation "windowswmproto" {
-    name = "windowswmproto-1.0.5";
+    name = "windowswmproto-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2;
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -1604,10 +1604,10 @@ let
   }) // {inherit libpng libX11 libXcursor ;};
 
   xcursorthemes = (mkDerivation "xcursorthemes" {
-    name = "xcursor-themes-1.0.5";
+    name = "xcursor-themes-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2;
+      url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2;
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2444,10 +2444,10 @@ let
   }) // {inherit libX11 libxkbfile ;};
 
   xkbprint = (mkDerivation "xkbprint" {
-    name = "xkbprint-1.0.5";
+    name = "xkbprint-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbprint-1.0.5.tar.bz2;
+      url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2;
       sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2456,10 +2456,10 @@ let
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbutils = (mkDerivation "xkbutils" {
-    name = "xkbutils-1.0.5";
+    name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbutils-1.0.5.tar.bz2;
+      url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2;
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2480,11 +2480,11 @@ let
   }) // {inherit libX11 xproto ;};
 
   xkill = (mkDerivation "xkill" {
-    name = "xkill-1.0.5";
+    name = "xkill-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkill-1.0.5.tar.bz2;
-      sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65";
+      url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2;
+      sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 libXmu xproto ];
@@ -2540,10 +2540,10 @@ let
   }) // {inherit libX11 libXaw libXmu libXt ;};
 
   xmessage = (mkDerivation "xmessage" {
-    name = "xmessage-1.0.5";
+    name = "xmessage-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2;
+      url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2;
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2612,10 +2612,10 @@ let
   }) // {inherit ;};
 
   xpr = (mkDerivation "xpr" {
-    name = "xpr-1.0.5";
+    name = "xpr-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2;
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     nativeBuildInputs = [ pkgconfig ];
@@ -2756,10 +2756,10 @@ let
   }) // {inherit libX11 libxcb xproto ;};
 
   xwud = (mkDerivation "xwud" {
-    name = "xwud-1.0.5";
+    name = "xwud-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.5.tar.bz2;
+      url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2;
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     nativeBuildInputs = [ pkgconfig ];

From 4ddb7a76f286b5e4da012a10f5913eacea51888b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 21 Mar 2018 20:37:49 +0000
Subject: [PATCH 1634/2266] xfce.xfce4-panel: 4.12.1 -> 4.12.2

---
 pkgs/desktops/xfce/core/xfce4-panel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 009416dea6c..17fd08faf69 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -7,14 +7,14 @@ let
   inherit (stdenv.lib) optional;
   p_name  = "xfce4-panel";
   ver_maj = "4.12";
-  ver_min = "1";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck";
+    sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
   };
 
   patches = [ ./xfce4-panel-datadir.patch ];

From a54709202e770be3cea4785d8448fe8cc30953bc Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 21 Mar 2018 20:38:04 +0000
Subject: [PATCH 1635/2266] xfce.xfwm4: 4.12.3 -> 4.12.4

---
 pkgs/desktops/xfce/core/xfwm4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
index d861e5f2d55..313a2662f03 100644
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ b/pkgs/desktops/xfce/core/xfwm4.nix
@@ -3,14 +3,14 @@
 let
   p_name  = "xfwm4";
   ver_maj = "4.12";
-  ver_min = "3";
+  ver_min = "4";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";
+    sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
   };
 
   buildInputs =

From c26864122d7c6304fc2ce372075e7a91e0f10714 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 21 Mar 2018 14:44:41 +0100
Subject: [PATCH 1636/2266] pythonPackages.face_recognition: init at 1.2.1

Adds the python package `face_recognition` and its dependency
`face_recognition_models`.

This package is a wrapper for `dlib` which is able to detect faces in a
given image. I checked the package with the following expression:

```
with import ./. { };

stdenv.mkDerivation {
  name = "facetest";
  src = null;
  buildInputs = with pythonPackages; [ face_recognition ];
}
```

The package works perfectly fine in a `nix-shell`:

```
$ nix-shell
[nix-shell:~]$ python
Python 2.7.14 (default, Sep 16 2017, 17:49:51)
[GCC 7.3.0] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import face_recognition
>>> img = face_recognition.load_image_file("/home/ma27/me.jpg")
>>> print(face_recognition.face_locations(img))
```
---
 .../face_recognition/default.nix              | 33 +++++++++++++++++++
 .../face_recognition_models/default.nix       | 21 ++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/face_recognition/default.nix
 create mode 100644 pkgs/development/python-modules/face_recognition_models/default.nix

diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix
new file mode 100644
index 00000000000..3b9a2c15b6e
--- /dev/null
+++ b/pkgs/development/python-modules/face_recognition/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy
+, face_recognition_models, scipy, stdenv, flake8, tox, pytest, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname = "face_recognition";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "ageitgey";
+    rev = "fe421d4acd76e8a19098e942b7bd9c3bbef6ebc4"; # no tags available in Git, pure revs are pushed to pypi
+    sha256 = "0wv5qxkg7xv1cr43zhhbixaqgj08xw2l7yvwl8g3fb2kdxyndw1c";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "flake8==2.6.0" "flake8"
+  '';
+
+  propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models scipy ];
+
+  checkInputs = [ flake8 tox pytest glibcLocales ];
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" py.test
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    homepage = https://github.com/ageitgey/face_recognition;
+    maintainers = with maintainers; [ ma27 ];
+    description = "The world's simplest facial recognition api for Python and the command line";
+  };
+}
diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix
new file mode 100644
index 00000000000..960bffb903d
--- /dev/null
+++ b/pkgs/development/python-modules/face_recognition_models/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, stdenv, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "face_recognition_models";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp";
+  };
+
+  # no module named `tests` as no tests are available
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ageitgey/face_recognition_models;
+    license = licenses.cc0;
+    maintainers = with maintainers; [ ma27 ];
+    description = "Trained models for the face_recognition python library";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c49b6bc0c8..43082c4f16e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4209,6 +4209,10 @@ in {
     };
   };
 
+  face_recognition = callPackage ../development/python-modules/face_recognition { };
+
+  face_recognition_models = callPackage ../development/python-modules/face_recognition_models { };
+
   faker = callPackage ../development/python-modules/faker { };
 
   fake_factory = buildPythonPackage rec {

From e3fe9f0b1554e7b147279ada212aefc75c3fbb6e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 06:54:54 -0700
Subject: [PATCH 1637/2266] xorg.xf86videoati: 7.9.0 -> 18.0.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.0.1 with grep in /nix/store/00hw6alrivxhdl0x9alclhidmnq358mb-xf86-video-ati-18.0.1
- directory tree listing: https://gist.github.com/094fbc79ea86324a9b95f4784be3e1cd
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d22565ae8db..7058d9a83fc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1868,11 +1868,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (mkDerivation "xf86videoati" {
-    name = "xf86-video-ati-7.9.0";
+    name = "xf86-video-ati-18.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2;
-      sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w";
+      url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2;
+      sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];

From 3a3b34dbcce8fc4650a529e5d6494aa4ef98e813 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 07:10:17 -0700
Subject: [PATCH 1638/2266] xorg.xf86videovesa: 2.3.4 -> 2.4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.0 with grep in /nix/store/61y7ka641q9l5ykkfdilk1507xqv8gnl-xf86-video-vesa-2.4.0
- directory tree listing: https://gist.github.com/148425747ac738aa905b76186c75afc4
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7058d9a83fc..c180edefa53 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2264,11 +2264,11 @@ let
   }) // {inherit randrproto videoproto xorgserver xproto ;};
 
   xf86videovesa = (mkDerivation "xf86videovesa" {
-    name = "xf86-video-vesa-2.3.4";
+    name = "xf86-video-vesa-2.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2;
-      sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv";
+      url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2;
+      sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];

From ba144aa630913fbc69981c99efdd159861ed4f87 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 08:20:58 -0700
Subject: [PATCH 1639/2266] xorg.xinit: 1.3.4 -> 1.4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.0 with grep in /nix/store/bxyqz9d31nzmjxahn97f60706ck895sw-xinit-1.4.0
- directory tree listing: https://gist.github.com/6f82742b7f83f4fcd6fddb1da6311b84
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c180edefa53..0d09d523b52 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2396,11 +2396,11 @@ let
   }) // {inherit ;};
 
   xinit = (mkDerivation "xinit" {
-    name = "xinit-1.3.4";
+    name = "xinit-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2;
-      sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m";
+      url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2;
+      sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];

From 510907a598741d40bd74c3da550ba17b7ec8ab77 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 06:11:24 -0700
Subject: [PATCH 1640/2266] xercesc: 3.1.4 -> 3.2.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/hlkw8kda3fc03mr4j8pcz11cj19rlls2-xerces-c-3.2.1/bin/MemParse -h` got 0 exit code
- ran `/nix/store/hlkw8kda3fc03mr4j8pcz11cj19rlls2-xerces-c-3.2.1/bin/MemParse --help` got 0 exit code
- ran `/nix/store/hlkw8kda3fc03mr4j8pcz11cj19rlls2-xerces-c-3.2.1/bin/PSVIWriter help` got 0 exit code
- ran `/nix/store/hlkw8kda3fc03mr4j8pcz11cj19rlls2-xerces-c-3.2.1/bin/SCMPrint help` got 0 exit code
- ran `/nix/store/hlkw8kda3fc03mr4j8pcz11cj19rlls2-xerces-c-3.2.1/bin/SEnumVal help` got 0 exit code
- found 3.2.1 with grep in /nix/store/hlkw8kda3fc03mr4j8pcz11cj19rlls2-xerces-c-3.2.1
- directory tree listing: https://gist.github.com/b0e7f99274b68686c5e81ab68cf510ba
---
 pkgs/development/libraries/xercesc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index b6bb4e63df3..9fa1768f4dc 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "xerces-c-${version}";
-  version = "3.1.4";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
-    sha256 = "1xpccqzykpd3806kd788lgkl01pk7v5lklva6q4kp9zq9jnfv3n9";
+    sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d";
   };
 
   meta = {

From f823d5025926169c89aeeb179eab4b19f1354f9b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 21 Mar 2018 13:05:34 +0000
Subject: [PATCH 1641/2266] libguestfs: fix path to appliance

---
 .../libraries/libguestfs/appliance.nix        |  7 ++++
 .../libraries/libguestfs/default.nix          | 34 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/libguestfs/appliance.nix

diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix
new file mode 100644
index 00000000000..d47b0902818
--- /dev/null
+++ b/pkgs/development/libraries/libguestfs/appliance.nix
@@ -0,0 +1,7 @@
+{ fetchzip }:
+
+fetchzip {
+  name = "libguestfs-appliance-1.38.0";
+  url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
+  sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76";
+}
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index d7d0fbe8094..258157c1178 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -3,19 +3,16 @@
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
 , gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
 , getopt, perlPackages, ocamlPackages
+, appliance ? null
 , javaSupport ? false, jdk ? null }:
 
+assert appliance == null || stdenv.lib.isDerivation appliance;
 assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
   version = "1.38.0";
 
-  appliance = fetchurl {
-    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
-    sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy";
-  };
-
   src = fetchurl {
     url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
     sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3";
@@ -54,14 +51,31 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for bin in $out/bin/*; do
       wrapProgram "$bin" \
-        --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \
-        --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl"
+        --prefix PATH     : "$out/bin:${hivex}/bin:${qemu}/bin" \
+        --prefix PERL5LIB : "$out/lib/perl5/site_perl"
     done
   '';
 
-  postFixup = ''
-    mkdir -p "$out/lib/guestfs"
-    tar -Jxvf "$appliance" --strip 1 -C "$out/lib/guestfs"
+  postFixup = stdenv.lib.optionalString (appliance != null) ''
+    mkdir -p $out/{lib,lib64}
+    ln -s ${appliance} $out/lib64/guestfs
+    ln -s ${appliance} $out/lib/guestfs
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
+
+    ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G
+
+    $out/bin/guestfish <<'EOF'
+    add-drive disk1.img
+    run
+    list-filesystems
+    part-disk /dev/sda mbr
+    mkfs ext2 /dev/sda1
+    list-filesystems
+    EOF
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e3095ee7fc..90aa19d5a32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9836,8 +9836,10 @@ with pkgs;
 
   libgudev = callPackage ../development/libraries/libgudev { };
 
+  libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
   libguestfs = callPackage ../development/libraries/libguestfs {
     inherit (perlPackages) libintlperl GetoptLong SysVirt;
+    appliance = libguestfs-appliance;
   };
 
   libhangul = callPackage ../development/libraries/libhangul { };

From 897913cf0e38368a90ae021e5c766449d8d65581 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 05:39:12 -0700
Subject: [PATCH 1642/2266] xdg-user-dirs: 0.16 -> 0.17

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/2isrxm5fr9kgxkh0pbzb5d77jpip1vvd-xdg-user-dirs-0.17/bin/xdg-user-dirs-update --help` got 0 exit code
- ran `/nix/store/2isrxm5fr9kgxkh0pbzb5d77jpip1vvd-xdg-user-dirs-0.17/bin/.xdg-user-dirs-update-wrapped --help` got 0 exit code
- ran `/nix/store/2isrxm5fr9kgxkh0pbzb5d77jpip1vvd-xdg-user-dirs-0.17/bin/xdg-user-dir -h` got 0 exit code
- ran `/nix/store/2isrxm5fr9kgxkh0pbzb5d77jpip1vvd-xdg-user-dirs-0.17/bin/xdg-user-dir --help` got 0 exit code
- ran `/nix/store/2isrxm5fr9kgxkh0pbzb5d77jpip1vvd-xdg-user-dirs-0.17/bin/xdg-user-dir help` got 0 exit code
- found 0.17 with grep in /nix/store/2isrxm5fr9kgxkh0pbzb5d77jpip1vvd-xdg-user-dirs-0.17
- directory tree listing: https://gist.github.com/e8c151156e7a65f9f958a9a64e1e5a86
---
 pkgs/tools/X11/xdg-user-dirs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 0af94531753..3e0680cac44 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-user-dirs-0.16";
+  name = "xdg-user-dirs-0.17";
 
   src = fetchurl {
     url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp";
+    sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
   };
 
   buildInputs = [ libxslt docbook_xsl makeWrapper ];

From e188ca3a84306b7c4f1a0bf1077e3235870c4d1c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 04:44:16 -0700
Subject: [PATCH 1643/2266] virtuoso7: 7.0.0 -> 7.2.4.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/xlf49a3742xgl9zhl6v5s31fc6gv2k9h-virtuoso-opensource-7.2.4.2/bin/virtuoso-t help` got 0 exit code
- ran `/nix/store/xlf49a3742xgl9zhl6v5s31fc6gv2k9h-virtuoso-opensource-7.2.4.2/bin/isql --help` got 0 exit code
- ran `/nix/store/xlf49a3742xgl9zhl6v5s31fc6gv2k9h-virtuoso-opensource-7.2.4.2/bin/isqlw --help` got 0 exit code
- ran `/nix/store/xlf49a3742xgl9zhl6v5s31fc6gv2k9h-virtuoso-opensource-7.2.4.2/bin/inifile help` got 0 exit code
- found 7.2.4.2 with grep in /nix/store/xlf49a3742xgl9zhl6v5s31fc6gv2k9h-virtuoso-opensource-7.2.4.2
- directory tree listing: https://gist.github.com/dcd661201732277a82f8e3f4e4263587
---
 pkgs/servers/sql/virtuoso/7.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix
index a24daa70812..bf2a51f6596 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/pkgs/servers/sql/virtuoso/7.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-7.0.0";
+  name = "virtuoso-opensource-7.2.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "1z0jdzayv45y57jj8kii6csqfjhswcs8s2krqqfhab54xy6gynbl";
+    sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];

From 7185d93c62f6b87325e3304199e74f7c57cfa220 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 04:13:23 -0700
Subject: [PATCH 1644/2266] unixODBC: 2.3.5 -> 2.3.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/isql --help` got 0 exit code
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/isql --version` and found version 2.3.6
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/isql --help` and found version 2.3.6
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/odbcinst --help` got 0 exit code
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/odbcinst --version` and found version 2.3.6
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/odbcinst --help` and found version 2.3.6
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/iusql --help` got 0 exit code
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/iusql --version` and found version 2.3.6
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/iusql --help` and found version 2.3.6
- ran `/nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6/bin/odbc_config --version` and found version 2.3.6
- found 2.3.6 with grep in /nix/store/mmcxnlq2km3jcd0iwfnfrqr1v3g1k0ax-unixODBC-2.3.6
- directory tree listing: https://gist.github.com/09c59bac7a63f422b01e46272e81915b
---
 pkgs/development/libraries/unixODBC/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 7d59866d043..ccd243e1f73 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unixODBC-${version}";
-  version = "2.3.5";
+  version = "2.3.6";
 
   src = fetchurl {
     url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
-    sha256 = "0ns93daph4wmk92d7m2w48x0yki4m1yznxnn97p1ldn6bkh742bn";
+    sha256 = "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8";
   };
 
   configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ];

From c0aa3bf53d717a73bacfb3b9c7d906d63ce1e0ff Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 22:46:20 -0700
Subject: [PATCH 1645/2266] openisns: 0.97 -> 0.98

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98/bin/isnsadm -h` got 0 exit code
- ran `/nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98/bin/isnsadm --help` got 0 exit code
- ran `/nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98/bin/isnsd -h` got 0 exit code
- ran `/nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98/bin/isnsd --help` got 0 exit code
- ran `/nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98/bin/isnsdd -h` got 0 exit code
- ran `/nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98/bin/isnsdd --help` got 0 exit code
- found 0.98 with grep in /nix/store/fabx95vlf0nyw2dvsq2zjsv8j2vdqs12-open-isns-0.98
- directory tree listing: https://gist.github.com/1ad3d6e680af4f1462bda181b2cdc43e
---
 pkgs/os-specific/linux/open-isns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 36cbd1581a6..c8b404c6be7 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "open-isns-${version}";
-  version = "0.97";
+  version = "0.98";
 
   src = fetchFromGitHub {
     owner = "gonzoleeman";
     repo = "open-isns";
     rev = "v${version}";
-    sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3";
+    sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg";
   };
 
   propagatedBuildInputs = [ openssl ];

From f56f7a35aba980c72aeb8a54f59ea9a276161229 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 23:02:57 -0700
Subject: [PATCH 1646/2266] exrdisplay: 2.2.0 -> 2.2.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.1 with grep in /nix/store/kpbzkj0s48h5mvvsvprqfqpah2kispil-openexr_viewers-2.2.1
- directory tree listing: https://gist.github.com/946b2664eb02e90d8d73194ffd04ac5f
---
 pkgs/applications/graphics/exrdisplay/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index aee65803e53..e698fb8f234 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -3,11 +3,11 @@
 assert fltk.glSupport;
 
 stdenv.mkDerivation {
-  name ="openexr_viewers-2.2.0";
+  name ="openexr_viewers-2.2.1";
 
   src = fetchurl {
-    url =  "mirror://savannah/openexr/openexr_viewers-2.2.0.tar.gz";
-    sha256 = "1s84vnas12ybx8zz0jcmpfbk9m4ab5bg2d3cglqwk3wys7jf4gzp";
+    url =  "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz";
+    sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
   };
 
   configurePhase = ''

From edbe6cb6366a1cf840fd42e727ef7d85e23e1b52 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 23:21:12 -0700
Subject: [PATCH 1647/2266] openrct2: 0.1.1 -> 0.1.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2 -h` got 0 exit code
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2 --help` got 0 exit code
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2 -v` and found version 0.1.2
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2 --version` and found version 0.1.2
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2-cli -h` got 0 exit code
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2-cli --help` got 0 exit code
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2-cli help` got 0 exit code
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2-cli -v` and found version 0.1.2
- ran `/nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2/bin/openrct2-cli --version` and found version 0.1.2
- found 0.1.2 with grep in /nix/store/qza712wxad8v4scd06gb2jisl0cl9vf6-openrct2-0.1.2
- directory tree listing: https://gist.github.com/dfc357796fabf91024a21e322be78e5f
---
 pkgs/games/openrct2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 03d296d3005..e34f29300ab 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
 
 let
   name = "openrct2-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   openrct2-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${version}";
-    sha256 = "1xxwqx2gzvsdrsy76rz3sys9m4pyn9q25nbnkba3cw1z4l2b73lg";
+    sha256 = "1zqrdxr79c9yx4bdxz1r5866hhwq0lcs9qpv3vhisr56ar5n5wk3";
   };
 
   title-sequences-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "title-sequences";
-    rev = "v0.1.0";
-    sha256 = "17c926lhby90ilvyyl6jsiy0df8dw5jws97xigp3x8hddhvv7c16";
+    rev = "v0.1.2";
+    sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm";
   };
 in
 stdenv.mkDerivation rec {

From 3783316b6af12df39562345fb59a6c88210a2732 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 09:37:05 -0700
Subject: [PATCH 1648/2266] lastpass-cli: 1.2.2 -> 1.3.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass -V` and found version 1.3.0
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass -v` and found version 1.3.0
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass --version` and found version 1.3.0
- found 1.3.0 with grep in /nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0
- directory tree listing: https://gist.github.com/67aab5e731ed5d963e433d03c1a27870
---
 pkgs/tools/security/lastpass-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index 9395d4acb8b..e9dffa5dbfa 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1";
+    sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5";
   };
 
   nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];

From 18474c1842d80a5049fbec63befd6bb44ef076b2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 23:54:35 +0100
Subject: [PATCH 1649/2266] mysocketw: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/mysocketw/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
index 379848b0cb0..6ec288f985b 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl}:
+{ stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
   name = "mysocketw-031026";
@@ -9,11 +9,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gcc.patch ];
 
-  configurePhase = ''
-    sed -i s,/usr/local,$out, Makefile.conf
+  buildInputs = [ openssl ];
+
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/Makefile \
+        --replace -Wl,-soname, -Wl,-install_name,$out/lib/
   '';
 
-  buildInputs = [ openssl ];
+  makeFlags = [ "PREFIX=$(out)" "CXX=c++" ];
 
   meta = {
     description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";

From 7aef8750a6a2cde98005d85921990802862fdcac Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 18:58:18 -0700
Subject: [PATCH 1650/2266] netcdf: 4.6.0 -> 4.6.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zchkzwsgsnl8aqbxzvi7hh93bdfl4759-netcdf-4.6.1/bin/nc-config --help` got 0 exit code
- ran `/nix/store/zchkzwsgsnl8aqbxzvi7hh93bdfl4759-netcdf-4.6.1/bin/nc-config --version` and found version 4.6.1
- found 4.6.1 with grep in /nix/store/zchkzwsgsnl8aqbxzvi7hh93bdfl4759-netcdf-4.6.1
- directory tree listing: https://gist.github.com/74ab9782611602d870caba813c09697e
---
 pkgs/development/libraries/netcdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 696df48bfbc..8446a91ccec 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -9,11 +9,11 @@ let
   mpiSupport = hdf5.mpiSupport;
   mpi = hdf5.mpi;
 in stdenv.mkDerivation rec {
-  name = "netcdf-4.6.0";
+  name = "netcdf-4.6.1";
 
   src = fetchurl {
     url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
-    sha256 = "099qmdjj059wkj5za13zqnz0lcziqkcvyfdf894j4n6qq4c5iw2b";
+    sha256 = "0hi61cdihwwvz5jz1l7yq712j7ca1cj4bhr8x0x7c2vlb1s9biw9";
   };
 
   nativeBuildInputs = [ m4 ];

From eeb290ba863ba988fb91114a1829830a386f1e29 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 03:43:26 -0700
Subject: [PATCH 1651/2266] gparted: 0.30.0 -> 0.31.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.31.0 with grep in /nix/store/fvg6pam343ci69qdjrcw1yqjznmhnwq5-gparted-0.31.0
- directory tree listing: https://gist.github.com/4cc11c6b07976ff42e854ec92cc48f35
---
 pkgs/tools/misc/gparted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 99c54b6d396..451bcae1efd 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.30.0";
+  name = "gparted-0.31.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
-    sha256 = "0jngbsbvg8k8vbpsphqbk8br2cbmxhabbm2c5bmxm2q5zvpr64fk";
+    sha256 = "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv";
   };
 
   configureFlags = [ "--disable-doc" ];

From 22cd5b94d9de427510b02fde2817c52a96e64b6b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 04:02:38 -0700
Subject: [PATCH 1652/2266] gqrx: 2.10 -> 2.11.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.11.1 with grep in /nix/store/f5yrc3hjc7rzc3zg57vss2av1djk6496-gqrx-2.11.1
- directory tree listing: https://gist.github.com/3716484adfc25ea5af04b853ac010788
---
 pkgs/applications/misc/gqrx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index f6d9f4edb62..b376e8283a2 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   name = "gqrx-${version}";
-  version = "2.10";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gqrx";
     rev = "v${version}";
-    sha256 = "1qc944sn1kjdnhdhcsdc39764vqcryk86808xxl49vy8sznqr0mf";
+    sha256 = "06l90m3lx05290lvgghrgqrcg6732p69dvv3bsyw7cyxy3fvdhm6";
   };
 
   nativeBuildInputs = [ cmake ];

From b88c079c3a074567aa19d8eb378b03986beea1e5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 03:27:07 -0700
Subject: [PATCH 1653/2266] goxel: 0.7.2 -> 0.7.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3/bin/goxel --help` got 0 exit code
- ran `/nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3/bin/goxel -V` and found version 0.7.3
- ran `/nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3/bin/goxel --version` and found version 0.7.3
- ran `/nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3/bin/.goxel-wrapped --help` got 0 exit code
- ran `/nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3/bin/.goxel-wrapped -V` and found version 0.7.3
- ran `/nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3/bin/.goxel-wrapped --version` and found version 0.7.3
- found 0.7.3 with grep in /nix/store/zinzc9bkhn7n97jlp7mian6bzw1dzz8d-goxel-0.7.3
- directory tree listing: https://gist.github.com/86658b436ae3d2085eba59f7c23e0825
---
 pkgs/applications/graphics/goxel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 6fb7182035b..8df630d582c 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "goxel-${version}";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "guillaumechereau";
     repo = "goxel";
     rev = "v${version}";
-    sha256 = "1d6waj8zz9iq3ddbi9wbpcnh200ajjy9x53xrj5bij01pb8jwskv";
+    sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9";
   };
 
   nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];

From 77e995d4b58dae28363d33503349dd4e3c880318 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 01:37:48 -0700
Subject: [PATCH 1654/2266] eventstore: 4.0.3 -> 4.1.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0/bin/clusternode -h` got 0 exit code
- ran `/nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0/bin/clusternode --help` got 0 exit code
- ran `/nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0/bin/clusternode help` got 0 exit code
- ran `/nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0/bin/clusternode --version` and found version 4.1.0
- ran `/nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0/bin/clusternode version` and found version 4.1.0
- ran `/nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0/bin/clusternode help` and found version 4.1.0
- found 4.1.0 with grep in /nix/store/8z6xvzan192jya1l1cqfrzfzqrqnfw33-EventStore-4.1.0
- directory tree listing: https://gist.github.com/aeb82087f0c9c92394ee5d61f1f4bf3b
---
 pkgs/servers/nosql/eventstore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index e6bf634b554..3ec00dfa16e 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation rec {
   name = "EventStore-${version}";
-  version = "4.0.3";
+  version = "4.1.0";
   src = fetchFromGitHub {
     owner  = "EventStore";
     repo   = "EventStore";
     rev    = "oss-v${version}";
-    sha256 = "1905bnqyyiqprva67cp49rgib324iipw2l71jzj0ynzi7kxr4mgg";
+    sha256 = "0mvjz327kfg157fwvy8xkkf5h0g3v373pfwr70cslsy96n45jp10";
   };
 
   buildPhase = ''

From e58e076209d75921e71a19b7fbb54d40d5d49d1d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 01:05:43 -0700
Subject: [PATCH 1655/2266] electron-cash: 3.1.2 -> 3.1.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/.electron-cash-wrapped -h` got 0 exit code
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/.electron-cash-wrapped --help` got 0 exit code
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/.electron-cash-wrapped help` got 0 exit code
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/.electron-cash-wrapped version` and found version 3.1.6
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/electron-cash -h` got 0 exit code
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/electron-cash --help` got 0 exit code
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/electron-cash help` got 0 exit code
- ran `/nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6/bin/electron-cash version` and found version 3.1.6
- found 3.1.6 with grep in /nix/store/9f6kwyk2zhwhgxkvk2ms8v6g3qz3g154-electron-cash-3.1.6
- directory tree listing: https://gist.github.com/76db342c6da1ceac5b3b7dced43798f9
---
 pkgs/applications/misc/electron-cash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 21af05133bf..76b61de5608 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -7,14 +7,14 @@ let
 in
 
 python3Packages.buildPythonApplication rec {
-  version = "3.1.2";
+  version = "3.1.6";
   name = "electron-cash-${version}";
 
   src = fetchurl {
     url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
     # Verified using official SHA-1 and signature from
     # https://github.com/fyookball/keys-n-hashes
-    sha256 = "18h44jfbc2ksj34hdzgszvvq82xi28schl3wp3lkq9fjp7ny0mf3";
+    sha256 = "062k5iw0jcp10zxrffvgiyfg51c5xzs7gmm638icx01yy67d58dm";
   };
 
   propagatedBuildInputs = with python3Packages; [

From ed3f18ce7fda0b7e831ba7220e8e961d0e4361e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 02:58:34 -0700
Subject: [PATCH 1656/2266] google-authenticator: 1.03 -> 1.05

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/f3718pm1ndwa2bj7q3pdbx01qiday4sj-google-authenticator-libpam-1.05/bin/google-authenticator -h` got 0 exit code
- ran `/nix/store/f3718pm1ndwa2bj7q3pdbx01qiday4sj-google-authenticator-libpam-1.05/bin/google-authenticator --help` got 0 exit code
- ran `/nix/store/f3718pm1ndwa2bj7q3pdbx01qiday4sj-google-authenticator-libpam-1.05/bin/google-authenticator help` got 0 exit code
- directory tree listing: https://gist.github.com/a10c019e5dc879bc33b83175a42ed947
---
 pkgs/os-specific/linux/google-authenticator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 1494d9f06a8..41bdd5d12ac 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "google-authenticator-libpam-${version}";
-  version = "1.03";
+  version = "1.05";
 
   src = fetchurl {
     url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
-    sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
+    sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From f682df2758aa271d2df19c3c29de3253f71b76a4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 22:59:22 -0700
Subject: [PATCH 1657/2266] copyq: 3.1.2 -> 3.3.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq -h` got 0 exit code
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq --help` got 0 exit code
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq help` got 0 exit code
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq -v` and found version 3.3.0
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq --version` and found version 3.3.0
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq version` and found version 3.3.0
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq -h` and found version 3.3.0
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq --help` and found version 3.3.0
- ran `/nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0/bin/copyq help` and found version 3.3.0
- found 3.3.0 with grep in /nix/store/9iss35v7mnmaa30c8lgwahh3vdi7zfgi-CopyQ-3.3.0
- directory tree listing: https://gist.github.com/d350765fb7038f7a4d3810c0ab3825d0
---
 pkgs/applications/misc/copyq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 37afea2bb6f..45bd417abb4 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.1.2";
+  version = "3.3.0";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
+    sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3";
   };
 
   nativeBuildInputs = [ cmake ];

From 0477af8a09da7eeca751542f4293b5b6f95366cb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 22 Mar 2018 00:09:26 +0100
Subject: [PATCH 1658/2266] nullmailer: fix darwin build

/cc ZHF #36454
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90aa19d5a32..b7f11de15d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14325,7 +14325,9 @@ with pkgs;
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji;
 
-  nullmailer = callPackage ../servers/mail/nullmailer { };
+  nullmailer = callPackage ../servers/mail/nullmailer {
+    stdenv = gccStdenv;
+  };
 
   numix-icon-theme = callPackage ../data/icons/numix-icon-theme { };
 

From f60d7e2add2906a50615045599c83087b90ff130 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 22:08:22 +0100
Subject: [PATCH 1659/2266] tdesktop: Clean up the patching

---
 .../telegram/tdesktop/default.nix             |  6 +++
 .../telegram/tdesktop/generic.nix             | 52 ++++++++-----------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 134066cd352..adf718a70ea 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -6,10 +6,16 @@ in {
     stable = true;
     version = "1.2.6";
     sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
+    # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
+    archPatchesRevision = "283641";
+    archPatchesHash = "0v4213vrabfa2dmwnqgb8n6hl54938mw9glaim3amyslxphmdrfb";
   };
   preview = mkTelegram {
     stable = false;
     version = "1.2.12";
     sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m";
+    # svn ls -v --depth empty svn://svn.archlinux.org/community/telegram-desktop/trunk
+    archPatchesRevision = "308775";
+    archPatchesHash = "0ggx64kdadrbd4bw5z0wi0fdg6hni7n9nxz9dp56p8hlw1wgpsls";
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index a165e90c3bd..89bc3da56b8 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,6 +1,6 @@
-{ stable, version, sha256Hash }:
+{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
 
-{ mkDerivation, lib, fetchgit, fetchpatch
+{ mkDerivation, lib, fetchgit, fetchsvn
 , pkgconfig, pythonPackages, cmake, makeWrapper
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -12,7 +12,7 @@ mkDerivation rec {
   name = "telegram-desktop-${version}";
   inherit version;
 
-  # Submodules
+  # Telegram-Desktop with submodules
   src = fetchgit {
     url = "git://github.com/telegramdesktop/tdesktop";
     rev = "v${version}";
@@ -20,29 +20,21 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  # TODO: Not active anymore.
-  tgaur = fetchgit {
-    url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
-    rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
-    sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
+  # Arch patches (svn export telegram-desktop/trunk)
+  archPatches = fetchsvn {
+    url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
+    rev = archPatchesRevision;
+    sha256 = archPatchesHash;
   };
 
-  patches = [ (if stable
-    then (fetchpatch {
-      name = "tdesktop.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
-      sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
-    })
-    else (fetchpatch {
-      name = "tdesktop.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=59ca8bd4428cf2fb3f02d7f1e1a5558545a4c075";
-      sha256 = "0jj2kifzx83f9nhk30csy2373avpyx0ci70a8bc7j2dm3wxym50l";
-    }))
-  ];
+  # TODO: libtgvoip.patch no-gtk2.patch
+  patches = [ "${archPatches}/tdesktop.patch" ];
 
   postPatch = ''
-    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
-    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
+    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
+      --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
+      --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
   '';
 
   nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
@@ -61,8 +53,8 @@ mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE = [
-    "-DTDESKTOP_DISABLE_AUTOUPDATE"
     "-DTDESKTOP_DISABLE_CRASH_REPORTS"
+    "-DTDESKTOP_DISABLE_AUTOUPDATE"
     "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
     "-I${minizip}/include/minizip"
     # See Telegram/gyp/qt.gypi
@@ -74,13 +66,12 @@ mkDerivation rec {
     "-I${getDev libopus}/include/opus"
     "-I${getDev alsaLib}/include/alsa"
     "-I${getDev libpulseaudio}/include/pulse"
-  ]) [ "QtCore" "QtGui" "QtDBus" ];
+    ]) [ "QtCore" "QtGui" "QtDBus" ];
   CPPFLAGS = NIX_CFLAGS_COMPILE;
 
   preConfigure = ''
-
     pushd "Telegram/ThirdParty/libtgvoip"
-    patch -Np1 -i "${tgaur}/libtgvoip.patch"
+    patch -Np1 -i "${archPatches}/libtgvoip.patch"
     popd
 
     sed -i Telegram/gyp/telegram_linux.gypi \
@@ -102,22 +93,23 @@ mkDerivation rec {
       --depth=Telegram/gyp \
       --generator-output=../.. \
       -Goutput_dir=out \
-       --format=cmake \
+      --format=cmake \
       Telegram/gyp/Telegram.gyp
 
     cd out/Release
 
     NUM=$((`wc -l < CMakeLists.txt` - 2))
-    sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
+    sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt
 
     export ASM=$(type -p gcc)
   '';
 
   installPhase = ''
     install -Dm755 Telegram $out/bin/telegram-desktop
+
     mkdir -p $out/share/applications $out/share/kde4/services
-    sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
-    sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
+    install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
+    sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol
     for icon_size in 16 32 48 64 128 256 512; do
       install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done

From a88ec5e8a5c04be6b6214a77aa4bb94ac9da5bb2 Mon Sep 17 00:00:00 2001
From: Geoffrey Huntley <ghuntley@ghuntley.com>
Date: Wed, 21 Mar 2018 16:46:35 -0700
Subject: [PATCH 1660/2266] duosec: use root uid as sshd uid has been retired
 (#33597)

* fix: use root uid as sshd uid has been retired

fixes https://github.com/NixOS/nixpkgs/issues/10088
related PR (abandoned) at https://github.com/NixOS/nixpkgs/pull/15391

* must use "sshd" user otherwise duosec does not work in multi user mode

see https://github.com/duosecurity/duo_unix/issues/89#issuecomment-272062632
---
 nixos/modules/security/duosec.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 9ca818e86ff..df6108dede7 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -25,14 +25,14 @@ let
   loginCfgFile = optional cfg.ssh.enable
     { source = pkgs.writeText "login_duo.conf" configFile;
       mode   = "0600";
-      uid    = config.ids.uids.sshd;
+      user   = "sshd";
       target = "duo/login_duo.conf";
     };
 
   pamCfgFile = optional cfg.pam.enable
     { source = pkgs.writeText "pam_duo.conf" configFile;
       mode   = "0600";
-      uid    = config.ids.uids.sshd;
+      user   = "sshd";
       target = "duo/pam_duo.conf";
     };
 in

From 1497815543b7689645d433866f4d60ebbab4e918 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Mar 2018 19:50:20 +0100
Subject: [PATCH 1661/2266] prometheus-blackbox-exporter: 0.11.0 -> 0.12.0

---
 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 047585e2fc0..798f31c3458 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
-  version = "0.11.0";
+  version = "0.12.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "1zwhyvjkf222bwvgim28yizk2vq0777dviqfkkc3vdhiwl9amr8v";
+    sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf";
   };
 
   meta = with stdenv.lib; {

From 5050d056566e5a8fdf94b9262ff37c66d123c3f3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Mar 2018 19:55:22 +0100
Subject: [PATCH 1662/2266] clamav: 0.99.3 -> 0.99.4 for multiple CVEs

Fixes CVE-2012-6706, CVE-2017-6419, CVE-2017-11423, CVE-2018-0202,
CVE-2018-1000085.
---
 pkgs/tools/security/clamav/default.nix   |  6 +--
 pkgs/tools/security/clamav/fd-leak.patch | 49 ------------------------
 2 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/tools/security/clamav/fd-leak.patch

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 976c58eb1e3..8c12e4e30c3 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.99.3";
+  version = "0.99.4";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
-    sha256 = "114f7qk3h0klgm0zzn2394n5spcn91vjc9mq6m03l2p0ls955yh0";
+    sha256 = "0q94iwi729id9pyc72w6zlllbaz37qvpi6gc51g2x3fy7ckw6anp";
   };
 
   # don't install sample config files into the absolute sysconfdir folder
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
   ];
 
-  patches = [ ./fd-leak.patch ];
-
   configureFlags = [
     "--sysconfdir=/etc/clamav"
     "--disable-llvm" # enabling breaks the build at the moment
diff --git a/pkgs/tools/security/clamav/fd-leak.patch b/pkgs/tools/security/clamav/fd-leak.patch
deleted file mode 100644
index 2c147901e44..00000000000
--- a/pkgs/tools/security/clamav/fd-leak.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/libclamav/scanners.c	2018-01-26 16:59:00.820231425 +0100
-+++ b/libclamav/scanners.c	2018-01-26 17:39:07.523633805 +0100
-@@ -1366,12 +1366,14 @@
- 
- 	if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
- 		free(tmpname);
-+		free(normalized);
- 		return ret;
- 	}
- 
- 	if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
- 		cli_ac_freedata(&tmdata);
- 		free(tmpname);
-+		free(normalized);
- 		return ret;
- 	}
- 
-@@ -1390,6 +1392,7 @@
- 				cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
- 				close(ofd);
- 				free(tmpname);
-+				free(normalized);
- 				return CL_EWRITE;
- 			}
- 			text_normalize_reset(&state);
-@@ -1424,6 +1427,8 @@
- 			if (ret) {
- 				cli_ac_freedata(&tmdata);
- 				free(tmpname);
-+				free(normalized);
-+				close(ofd);
- 				return ret;
- 			}
- 		}
-@@ -1466,11 +1471,9 @@
- 
- 	}
- 
--	if(ctx->engine->keeptmp) {
--		free(tmpname);
--		if (ofd >= 0)
--			close(ofd);
--	}
-+	if (ofd >= 0)
-+		close(ofd);
-+	free(tmpname);
- 	free(normalized);
- 
- 	if(ret != CL_VIRUS || SCAN_ALL)  {

From 9152ef910bfdbc3aa15e17c6761c1f76fe212e6f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Mar 2018 20:28:15 +0100
Subject: [PATCH 1663/2266] prometheus-node-exporter: 0.15.0 -> 0.15.2

---
 pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 8b70ad423e9..497f20ac55e 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
-  version = "0.15.0";
+  version = "0.15.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "0v1m6m9fmlw66s9v50y2rfr5kbpb9mxbwpcab4cmgcjs1y7wcn49";
+    sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv";
   };
 
   # FIXME: megacli test fails

From 7dee8ab568a48fa912d32d64353488e2968e05d9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Mar 2018 05:30:49 +0100
Subject: [PATCH 1664/2266] matterircd: 0.12.0 -> 0.16.5

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

diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 02a4e3bd66f..d489deb5944 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "matterircd-${version}";
-  version = "0.12.0";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${version}";
-    sha256 = "1fgpfyb78l1kl0kja2fjqc4ik1q869cmhx6xdmp9ff2qcqk22cj0";
+    sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2";
   };
 
-  goPackagePath = "github.com/42vim/matterircd";
+  goPackagePath = "github.com/42wim/matterircd";
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From 1e15d08cac3068f9396f737dc531989b5339f405 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Mar 2018 05:31:15 +0100
Subject: [PATCH 1665/2266] squid4: 4.0.23 -> 4.0.24

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

diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index 777e910038a..4c76173a280 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-4.0.23";
+  name = "squid-4.0.24";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
-    sha256 = "0a8g0zs3xayfkxl8maq823b14lckvh9d5lf7ryh9rx303xh1mdqq";
+    sha256 = "01vayx86sakfy9zz2q5cvzv97865l1zb0jkqbh7wqz9hcgbs0789";
   };
 
   buildInputs = [

From f2fea9042e3777adfd42dc98c8d27cba53c38713 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Mar 2018 17:04:46 +0100
Subject: [PATCH 1666/2266] nmap: 7.60 -> 7.70

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

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 3d31596a43f..a81fffa2035 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -19,11 +19,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.60";
+  version = "7.70";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8";
+    sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4";
   };
 
   patches = ./zenmap.patch;

From ab5f98a77e14c1245033cd7df36b78318f8c7702 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Mar 2018 17:05:40 +0100
Subject: [PATCH 1667/2266] altcoins.masari: init at 0.1.4.0

---
 pkgs/applications/altcoins/default.nix |  2 ++
 pkgs/applications/altcoins/masari.nix  | 27 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/altcoins/masari.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index daf2a0e53ef..d7cce586b9b 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -46,6 +46,8 @@ rec {
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
   litecoind = callPackage ./litecoin.nix { withGui = false; };
 
+  masari = callPackage ./masari.nix { };
+
   memorycoin  = callPackage ./memorycoin.nix { boost = boost165; withGui = true; };
   memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; };
 
diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix
new file mode 100644
index 00000000000..02a6d25df51
--- /dev/null
+++ b/pkgs/applications/altcoins/masari.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
+, lmdb, miniupnpc, readline }:
+
+stdenv.mkDerivation rec {
+  name = "masari-${version}";
+  version = "0.1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "masari-project";
+    repo = "masari";
+    rev = "v${version}";
+    sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
+    homepage = "https://www.getmasari.org/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
+  };
+}

From f744f83072b28a7db8d94f83a60b46d4ae16ebb4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Mar 2018 18:56:24 +0100
Subject: [PATCH 1668/2266] zfs, spl: 0.7.6 -> 0.7.7

Remove spl patch that was introduced for grsecurity which we don't support
anymore. ZFS now needs perl for some scripts that are call in the configure
script.
---
 pkgs/os-specific/linux/spl/const.patch | 13 -------------
 pkgs/os-specific/linux/spl/default.nix |  6 +++---
 pkgs/os-specific/linux/zfs/default.nix | 13 +++++++++----
 3 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/spl/const.patch

diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch
deleted file mode 100644
index 932e8a9eb1c..00000000000
--- a/pkgs/os-specific/linux/spl/const.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index eb00505..6f38cef 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -36,7 +36,7 @@
- #include <linux/uaccess.h>
- #include <linux/version.h>
- 
--#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+#if defined(CONSTIFY_PLUGIN)
- typedef struct ctl_table __no_const spl_ctl_table;
- #else
- typedef struct ctl_table spl_ctl_table;
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 57698b5ad45..9460ee46c0f 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -20,7 +20,7 @@ let
         inherit rev sha256;
       };
 
-      patches = [ ./const.patch ./install_prefix.patch ];
+      patches = [ ./install_prefix.patch ];
 
       nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
 
@@ -61,8 +61,8 @@ in
   assert kernel != null;
 {
     splStable = common {
-      version = "0.7.6";
-      sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb";
+      version = "0.7.7";
+      sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x";
     };
 
     splUnstable = common {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 868e354c7b5..aac1576261d 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
+, perl, fetchpatch
 , configFile ? "all"
 
 # Userspace dependencies
@@ -39,8 +40,12 @@ let
 
       patches = extraPatches;
 
+      postPatch = optionalString buildKernel ''
+        patchShebangs scripts
+      '';
+
       nativeBuildInputs = [ autoreconfHook nukeReferences ]
-         ++ optional buildKernel kernel.moduleBuildDependencies;
+         ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
       buildInputs =
            optionals buildKernel [ spl ]
         ++ optionals buildUser [ zlib libuuid python attr ]
@@ -142,9 +147,9 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
-    version = "0.7.6";
+    version = "0.7.7";
 
-    sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h";
+    sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r";
 
     extraPatches = [
       (fetchpatch {

From deb9ff164f1bf451377a3222f03000ea58bbace2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 21 Mar 2018 20:42:33 -0400
Subject: [PATCH 1669/2266] linux: 4.14.28 -> 4.14.29

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index adf9dbd818c..4e086259036 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.28";
+  version = "4.14.29";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0byx2824ml2ck97p66gfipnasbn9zz6rhjps61n6gprg3ac5fd07";
+    sha256 = "06a6q69jwvggns5rf473nfgfwlkfyj8zs6vrjppwf8lrrrq7pxhq";
   };
 } // (args.argsOverride or {}))

From 55b96a4a3c26b1a8dd19b661f2790619bb7bc772 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 21 Mar 2018 20:44:01 -0400
Subject: [PATCH 1670/2266] linux: 4.15.11 -> 4.15.12

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 5c4a452dd12..979e8fe05e1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.11";
+  version = "4.15.12";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0rjzlkp24ch58vx0xljrf6l33i8xv2mal0x821kwfqp551npdxfc";
+    sha256 = "0j7l907m51y05cd1sqf3sn7vx4n6c07kn7q0ndnyg6wqb7h667h3";
   };
 } // (args.argsOverride or {}))

From 0d6fdac8e2f9ad0327bbf4203ebdc2e0c929253f Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 21 Mar 2018 13:42:37 -0400
Subject: [PATCH 1671/2266] perlPackages.GSSAPI: depend on krb5Full, fix
 misspelling

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 688af3e28e7..85a3d4b8b1a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6350,19 +6350,19 @@ let self = _self // overrides; _self = with self; {
   };
 
   GSSAPI = buildPerlPackage rec {
-    name = "GSSAPPI-0.28";
+    name = "GSSAPI-0.28";
     src = fetchurl {
-      url = "http://search.cpan.org/CPAN/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz";
+      url = "mirror://cpan/authors/id/A/AG/AGROLMS/${name}.tar.gz";
       sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx";
     };
     buildInputs = [ TestPod ];
-    propagatedBuildInputs = [ pkgs.heimdalFull ];
+    propagatedBuildInputs = [ pkgs.krb5Full.dev ];
     meta = {
       maintainers = [ maintainers.limeytexan ];
       description = "Perl extension providing access to the GSSAPIv2 library";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    makeMakerFlags = "--gssapiimpl ${pkgs.heimdalFull.out}";
+    makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}";
   };
 
   Gtk2 = buildPerlPackage rec {

From fa347164b607df52768fd952d56bd42a90fc9a6a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 19 Mar 2018 21:55:52 +0100
Subject: [PATCH 1672/2266] graylog: use jre_headless

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

diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index a0dc0d6d089..95f31829882 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -141,7 +141,7 @@ in
         JAVA_HOME = jre;
         GRAYLOG_CONF = "${confFile}";
       };
-      path = [ pkgs.openjdk8 pkgs.which pkgs.procps ];
+      path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
       preStart = ''
         mkdir -p /var/lib/graylog -m 755
 

From 31d77fd4f3d009631e0dc4361bfc0648fadcce4a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 19 Mar 2018 21:52:36 +0100
Subject: [PATCH 1673/2266] gitlab-shell: fix config path finding

and remove TimeoutSec for gitlab
---
 nixos/modules/services/misc/gitlab.nix        |  3 ++-
 .../gitlab-shell/default.nix                  | 26 +++----------------
 .../remove-hardcoded-locations.patch          |  2 +-
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 9ed5875a019..76d892b1681 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -500,7 +500,7 @@ in {
         Type = "simple";
         User = cfg.user;
         Group = cfg.group;
-        TimeoutSec = "300";
+        TimeoutSec = "infinity";
         Restart = "on-failure";
         WorkingDirectory = gitlabEnv.HOME;
         ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
@@ -580,6 +580,7 @@ in {
         ln -sf ${cfg.statePath}/log /run/gitlab/log
         ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
         ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+        ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
         chown -R ${cfg.user}:${cfg.group} /run/gitlab
 
         # Prepare home directory
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index ab0ff74f03f..2d013ff7094 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -30,29 +30,9 @@ stdenv.mkDerivation rec {
   # code by default which doesn't work in nixos because it's a
   # read-only filesystem
   postPatch = ''
-    substituteInPlace lib/gitlab_config.rb --replace\
-       "File.join(ROOT_PATH, 'config.yml')"\
-       "ENV['GITLAB_SHELL_CONFIG_PATH']"
-
-    # Note that we're running gitlab-shell from current-system/sw
-    # because otherwise updating gitlab-shell won't be reflected in
-    # the hardcoded path of the authorized-keys file:
-    substituteInPlace lib/gitlab_keys.rb --replace\
-        "\"#{ROOT_PATH}/bin/gitlab-shell"\
-        "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell"
-
-    # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key
-    # environment because we need it in gitlab_configrb
-    # . unsetenv_others will remove that so we're not doing it for
-    # now.
-    #
-    # TODO: Are there any security implications? The commit adding
-    # unsetenv_others didn't mention anything...
-    #
-    # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true)
-    substituteInPlace lib/gitlab_shell.rb --replace\
-        " *args, unsetenv_others: true)"\
-        " *args)"
+    substituteInPlace lib/gitlab_config.rb --replace \
+       "File.join(ROOT_PATH, 'config.yml')" \
+       "'/run/gitlab/shell-config.yml'"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index f28e74b88c5..d0e555b33df 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -34,7 +34,7 @@ index c57b4de..88cfc95 100644
  	cfg.RootDir = dir
  
 -	configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))
-+	configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH"))
++	configBytes, err := ioutil.ReadFile("/run/gitlab/shell-config.yml")
  	if err != nil {
  		return nil, err
  	}

From 08bf87420f0a680f6a3765bcb99a97e5edc57bfb Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 14 Mar 2018 14:04:39 +0100
Subject: [PATCH 1674/2266] gitlab-shell: 5.10.2 -> 6.0.3

---
 .../gitlab-shell/default.nix                  |  4 +-
 .../gitlab-shell/fixes.patch                  |  7 ++--
 .../remove-hardcoded-locations.patch          | 41 +++++++------------
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 2d013ff7094..ca5b8a84fbf 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab, go }:
 
 stdenv.mkDerivation rec {
-  version = "5.10.2";
+  version = "6.0.3";
   name = "gitlab-shell-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf";
+    sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk";
   };
 
   buildInputs = [ ruby bundler go ];
diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch
index 1c694266e47..b0ee31cf39d 100644
--- a/pkgs/applications/version-management/gitlab-shell/fixes.patch
+++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch
@@ -1,12 +1,11 @@
 diff --git a/support/go_build.rb b/support/go_build.rb
-index 82f94d2..40ba35e 100644
+index 30a6b71..46b4dfa 100644
 --- a/support/go_build.rb
 +++ b/support/go_build.rb
-@@ -25,9 +25,8 @@ module GoBuild
-   def run!(env, cmd)
+@@ -26,8 +26,8 @@ module GoBuild
      raise "env must be a hash" unless env.is_a?(Hash)
      raise "cmd must be an array" unless cmd.is_a?(Array)
--  
+   
 -    if !system(env, *cmd)
 -      abort "command failed: #{env.inspect} #{cmd.join(' ')}"
 -    end
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index d0e555b33df..bc1aa858386 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,30 +1,3 @@
-diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
-index 0b11ce3..ffc3faf 100644
---- a/lib/gitlab_projects.rb
-+++ b/lib/gitlab_projects.rb
-@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
- require_relative 'gitlab_metrics'
- 
- class GitlabProjects
--  GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
-+  GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks')
- 
-   # Project name is a directory name for repository with .git at the end
-   # It may be namespaced or not. Like repo.git or gitlab/repo.git
-diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
-index e7d0254..181ec8a 100644
---- a/lib/gitlab_shell.rb
-+++ b/lib/gitlab_shell.rb
-@@ -188,7 +188,8 @@ class GitlabShell
-     end
- 
-     # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
--    Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
-+    # Except we don't, because we're already in the right directory on nixos !
-+    Kernel::exec(env, *args, unsetenv_others: true)
-   end
- 
-   def api
 diff --git a/go/internal/config/config.go b/go/internal/config/config.go
 index c57b4de..88cfc95 100644
 --- a/go/internal/config/config.go
@@ -38,3 +11,17 @@ index c57b4de..88cfc95 100644
  	if err != nil {
  		return nil, err
  	}
+diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
+index 1452f95..2b40327 100644
+--- a/lib/gitlab_shell.rb
++++ b/lib/gitlab_shell.rb
+@@ -180,7 +180,8 @@ class GitlabShell
+     end
+ 
+     # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
+-    Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
++    # Except we don't, because we're already in the right directory on nixos!
++    Kernel::exec(env, *args, unsetenv_others: true)
+   end
+ 
+   def api

From 9ccd01021766348ec1811ff60236cc3e72fa48cb Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 14 Mar 2018 14:13:43 +0100
Subject: [PATCH 1675/2266] gitlab-workhorse: 3.3.1 -> 3.6.0

---
 .../version-management/gitlab-workhorse/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index c43b5ab2a1b..6bb696406c9 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.1";
+  version = "3.6.0";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "19x9ryp99xygj39kq2r756rahh9mxp6j83hxvv09y33vgz64y8xh";
+    sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz";
   };
 
   buildInputs = [ git go ];

From 73a7f984d64f1c3f3ad8bd4677cb64d4f3d70055 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 19 Mar 2018 13:35:58 +0100
Subject: [PATCH 1676/2266] gitaly: 0.59.2 -> 0.81.0

---
 .../version-management/gitaly/Gemfile         |  11 +-
 .../version-management/gitaly/Gemfile.lock    |  59 ++++++---
 .../version-management/gitaly/default.nix     |   4 +-
 .../version-management/gitaly/gemset.nix      | 115 ++++++++++++++----
 4 files changed, 144 insertions(+), 45 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 2aaf872d109..2b95446161b 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,11 +1,18 @@
 source 'https://rubygems.org'
 
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
-gem 'activesupport'
+gem 'gitlab-markup', '~> 1.6.2'
+gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly'
+gem 'activesupport', '~> 5.0.2'
+gem 'rdoc', '~> 4.2'
 gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'grpc', '~> 1.8.0'
+
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
 
 group :development, :test do
   gem 'gitlab-styles', '~> 2.0.0', require: false
+  gem 'rspec', require: false
 end
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index f4e4ab10883..cb53bb10122 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -1,23 +1,23 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0.1)
+    activesupport (5.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     charlock_holmes (0.7.5)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     escape_utils (1.1.1)
-    faraday (0.12.2)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.59.0)
+    gitaly-proto (0.83.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -31,6 +31,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
+    gitlab-markup (1.6.3)
     gitlab-styles (2.0.0)
       rubocop (~> 0.49)
       rubocop-gitlab-security (~> 0.1.0)
@@ -48,21 +49,24 @@ GEM
     gollum-rugged_adapter (0.4.4)
       mime-types (>= 1.15)
       rugged (~> 0.25)
-    google-protobuf (3.4.0.2)
-    googleauth (0.5.3)
+    google-protobuf (3.5.1)
+    googleapis-common-protos-types (1.0.1)
+      google-protobuf (~> 3.0)
+    googleauth (0.6.2)
       faraday (~> 0.12)
-      jwt (~> 1.4)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.6.0)
+    grpc (1.8.7)
       google-protobuf (~> 3.1)
-      googleauth (~> 0.5.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
     i18n (0.8.1)
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -73,7 +77,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     minitest (5.9.1)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
@@ -83,11 +87,25 @@ GEM
       ast (~> 2.2)
     posix-spawn (0.3.13)
     powerpack (0.1.1)
-    public_suffix (2.0.5)
+    public_suffix (3.0.1)
     rainbow (2.2.2)
       rake
     rake (12.1.0)
+    rdoc (4.3.0)
     rouge (2.2.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rubocop (0.50.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -103,10 +121,10 @@ GEM
     rugged (0.26.0)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    signet (0.7.3)
+    signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
-      jwt (~> 1.5)
+      jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     stringex (2.7.1)
     thread_safe (0.3.6)
@@ -118,12 +136,17 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  gitaly-proto (~> 0.59.0)
+  activesupport (~> 5.0.2)
+  gitaly-proto (~> 0.83.0)
   github-linguist (~> 4.7.0)
+  gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)
+  google-protobuf (= 3.5.1)
+  grpc (~> 1.8.0)
+  rdoc (~> 4.2)
+  rspec
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 43ac470dcd4..7a8ba0fda74 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.59.2";
+  version = "0.81.0";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "08f109rw3qxdr93l0kl8wxmrvn846a6vdkssvrp2zr40yn9wif7m";
+    sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 81bb334085a..efe78621662 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -3,19 +3,19 @@
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vgjr48yiynwf9rh2nsxa8w134na0805l40chf9g9scii9k70rj9";
+      sha256 = "0g85lqq0smj71g8a2dxb54ajjzw59c9snana4p61knryc83q3yg6";
       type = "gem";
     };
-    version = "5.0.0.1";
+    version = "5.0.6";
   };
   addressable = {
     dependencies = ["public_suffix"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
       type = "gem";
     };
-    version = "2.5.1";
+    version = "2.5.2";
   };
   ast = {
     source = {
@@ -61,10 +61,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
+      sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
       type = "gem";
     };
-    version = "0.12.2";
+    version = "0.14.0";
   };
   gemojione = {
     dependencies = ["json"];
@@ -79,10 +79,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82";
+      sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv";
       type = "gem";
     };
-    version = "0.59.0";
+    version = "0.83.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -110,6 +110,14 @@
     };
     version = "2.8.2";
   };
+  gitlab-markup = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
+      type = "gem";
+    };
+    version = "1.6.3";
+  };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
     source = {
@@ -149,28 +157,37 @@
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
+      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
       type = "gem";
     };
-    version = "3.4.0.2";
+    version = "3.5.1";
+  };
+  googleapis-common-protos-types = {
+    dependencies = ["google-protobuf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      type = "gem";
+    };
+    version = "1.0.1";
   };
   googleauth = {
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
+      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
       type = "gem";
     };
-    version = "0.5.3";
+    version = "0.6.2";
   };
   grpc = {
-    dependencies = ["google-protobuf" "googleauth"];
+    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
+      sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.8.7";
   };
   i18n = {
     source = {
@@ -191,10 +208,10 @@
   jwt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
+      sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
       type = "gem";
     };
-    version = "1.5.6";
+    version = "2.1.0";
   };
   little-plugger = {
     source = {
@@ -257,10 +274,10 @@
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
       type = "gem";
     };
-    version = "1.12.1";
+    version = "1.13.1";
   };
   multipart-post = {
     source = {
@@ -323,10 +340,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
       type = "gem";
     };
-    version = "2.0.5";
+    version = "3.0.1";
   };
   rainbow = {
     dependencies = ["rake"];
@@ -345,6 +362,14 @@
     };
     version = "12.1.0";
   };
+  rdoc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -353,6 +378,50 @@
     };
     version = "2.2.1";
   };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-support = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
   rubocop = {
     dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
@@ -409,10 +478,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6";
+      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.8.1";
   };
   stringex = {
     source = {

From 1b559058064992e5d8cd951f42232793aa99d960 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 14 Mar 2018 14:14:03 +0100
Subject: [PATCH 1677/2266] gitlab: 10.3.4 -> 10.5.4

---
 nixos/modules/services/misc/gitlab.nix        |   3 +
 .../version-management/gitlab/Gemfile         |  54 +++--
 .../version-management/gitlab/Gemfile.lock    | 131 +++++++-----
 .../version-management/gitlab/default.nix     |   6 +-
 .../version-management/gitlab/gemset.nix      | 195 +++++++++++-------
 .../gitlab/remove-hardcoded-locations.patch   |  62 +++---
 6 files changed, 269 insertions(+), 182 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 76d892b1681..20d7ec90dcc 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -143,6 +143,7 @@ let
     GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
     GITLAB_STATE_PATH = "${cfg.statePath}";
     GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
+    SCHEMA = "${cfg.statePath}/db/schema.rb";
     GITLAB_LOG_PATH = "${cfg.statePath}/log";
     GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}";
     GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
@@ -566,6 +567,7 @@ in {
         mkdir -p ${cfg.statePath}/tmp/pids
         mkdir -p ${cfg.statePath}/tmp/sockets
         mkdir -p ${cfg.statePath}/shell
+        mkdir -p ${cfg.statePath}/db
 
         rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
         mkdir -p ${cfg.statePath}/config
@@ -588,6 +590,7 @@ in {
         touch ${gitlabEnv.HOME}/.ssh/authorized_keys
         chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
 
+        cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
         cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
         ${optionalString cfg.smtp.enable ''
           ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 916314f42f9..880ed483c34 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
 gem 'default_value_for', '~> 3.0.0'
 
 # Supported DBs
-gem 'mysql2', '~> 0.4.5', group: :mysql
+gem 'mysql2', '~> 0.4.10', group: :mysql
 gem 'pg', '~> 0.18.2', group: :postgres
 
 gem 'rugged', '~> 0.26.0'
@@ -69,7 +69,15 @@ gem 'net-ldap'
 
 # Git Wiki
 # Required manually in config/initializers/gollum.rb to control load order
+# Before updating this gem, check if
+# https://github.com/gollum/gollum-lib/pull/292 has been merged.
+# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer
+# in config/initializers/gollum.rb
 gem 'gollum-lib', '~> 4.2', require: false
+
+# Before updating this gem, check if
+# https://github.com/gollum/rugged_adapter/pull/28 has been merged.
+# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
 
 # Language detection
@@ -78,7 +86,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 # API
 gem 'grape', '~> 1.0'
 gem 'grape-entity', '~> 0.6.0'
-gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
 # Disable strong_params so that Mash does not respond to :permitted?
 gem 'hashie-forbidden_attributes'
@@ -111,7 +119,7 @@ gem 'google-api-client', '~> 0.13.6'
 gem 'unf', '~> 0.1.4'
 
 # Seed data
-gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved
+gem 'seed-fu', '~> 2.3.7'
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'
@@ -128,7 +136,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.1'
+gem 'nokogiri', '~> 1.8.2'
 
 # Diffs
 gem 'diffy', '~> 3.1.0'
@@ -229,6 +237,9 @@ gem 'charlock_holmes', '~> 0.7.5'
 # Faster JSON
 gem 'oj', '~> 2.17.4'
 
+# Faster blank
+gem 'fast_blank'
+
 # Parse time & duration
 gem 'chronic', '~> 0.10.2'
 gem 'chronic_duration', '~> 0.10.6'
@@ -263,7 +274,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.2.0'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
 
-gem 'batch-loader'
+gem 'batch-loader', '~> 1.2.1'
 
 # Perf bar
 gem 'peek', '~> 1.0.1'
@@ -283,7 +294,7 @@ group :metrics do
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
+  gem 'prometheus-client-mmap', '~> 0.9.1'
   gem 'raindrops', '~> 0.18'
 end
 
@@ -311,14 +322,14 @@ group :development, :test do
   gem 'fuubar', '~> 2.2.0'
 
   gem 'database_cleaner', '~> 1.5.0'
-  gem 'factory_girl_rails', '~> 4.7.0'
+  gem 'factory_bot_rails', '~> 4.8.2'
   gem 'rspec-rails', '~> 3.6.0'
   gem 'rspec-retry', '~> 0.4.5'
   gem 'spinach-rails', '~> 0.2.1'
   gem 'spinach-rerun-reporter', '~> 0.0.2'
   gem 'rspec_profiling', '~> 0.0.5'
   gem 'rspec-set', '~> 0.1.3'
-  gem 'rspec-parameterized'
+  gem 'rspec-parameterized', require: false
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.7.0'
@@ -334,13 +345,15 @@ group :development, :test do
   gem 'spring-commands-rspec', '~> 1.0.4'
   gem 'spring-commands-spinach', '~> 1.1.0'
 
-  gem 'rubocop', '~> 0.49.1', require: false
-  gem 'rubocop-rspec', '~> 1.15.1', require: false
-  gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
-  gem 'scss_lint', '~> 0.54.0', require: false
+  gem 'gitlab-styles', '~> 2.3', require: false
+  # Pin these dependencies, otherwise a new rule could break the CI pipelines
+  gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop-rspec', '~> 1.22.1'
+
+  gem 'scss_lint', '~> 0.56.0', require: false
   gem 'haml_lint', '~> 0.26.0', require: false
   gem 'simplecov', '~> 0.14.0', require: false
-  gem 'flay', '~> 2.8.0', require: false
+  gem 'flay', '~> 2.10.0', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -379,9 +392,6 @@ gem 'ruby-prof', '~> 0.16.2'
 # OAuth
 gem 'oauth2', '~> 1.4'
 
-# Soft deletion
-gem 'paranoia', '~> 2.3.1'
-
 # Health check
 gem 'health_check', '~> 2.6.0'
 
@@ -400,16 +410,20 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
 
 gem 'toml-rb', '~> 0.3.15', require: false
 
 # Feature toggles
-gem 'flipper', '~> 0.10.2'
-gem 'flipper-active_record', '~> 0.10.2'
+gem 'flipper', '~> 0.11.0'
+gem 'flipper-active_record', '~> 0.11.0'
+gem 'flipper-active_support_cache_store', '~> 0.11.0'
 
 # Structured logging
 gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
 
-gem 'activerecord-nulldb-adapter'
+# Asset synchronization
+gem 'asset_sync', '~> 2.2.0'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index c8915e9172c..22c4fc0ef28 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -33,8 +33,6 @@ GEM
       activemodel (= 4.2.10)
       activesupport (= 4.2.10)
       arel (~> 6.0)
-    activerecord-nulldb-adapter (0.3.7)
-      activerecord (>= 2.0.0)
     activerecord_sane_schema_dumper (0.2)
       rails (>= 4, < 5)
     activesupport (4.2.10)
@@ -60,6 +58,11 @@ GEM
     asciidoctor (1.5.3)
     asciidoctor-plantuml (0.0.7)
       asciidoctor (~> 1.5)
+    asset_sync (2.2.0)
+      activemodel (>= 4.1.0)
+      fog-core
+      mime-types (>= 2.99)
+      unf
     ast (2.3.0)
     atomic (1.1.99)
     attr_encrypted (3.0.3)
@@ -75,7 +78,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
     base32 (0.3.2)
-    batch-loader (1.1.1)
+    batch-loader (1.2.1)
     bcrypt (3.1.11)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
@@ -192,10 +195,10 @@ GEM
     excon (0.57.1)
     execjs (2.6.0)
     expression_parser (0.9.0)
-    factory_girl (4.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
@@ -204,18 +207,22 @@ GEM
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
+    fast_blank (1.0.0)
     fast_gettext (1.4.0)
     ffaker (2.4.0)
     ffi (1.9.18)
-    flay (2.8.1)
+    flay (2.10.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flipper (0.10.2)
-    flipper-active_record (0.10.2)
+    flipper (0.11.0)
+    flipper-active_record (0.11.0)
       activerecord (>= 3.2, < 6)
-      flipper (~> 0.10.2)
+      flipper (~> 0.11.0)
+    flipper-active_support_cache_store (0.11.0)
+      activesupport (>= 3.2, < 6)
+      flipper (~> 0.11.0)
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
@@ -278,7 +285,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.59.0)
+    gitaly-proto (0.84.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -297,6 +304,10 @@ GEM
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
     gitlab-markup (1.6.3)
+    gitlab-styles (2.3.2)
+      rubocop (~> 0.51)
+      rubocop-gitlab-security (~> 0.1.0)
+      rubocop-rspec (~> 1.19)
     gitlab_omniauth-ldap (2.0.4)
       net-ldap (~> 0.16)
       omniauth (~> 1.3)
@@ -329,7 +340,9 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.4.1.1)
+    google-protobuf (3.5.1)
+    googleapis-common-protos-types (1.0.1)
+      google-protobuf (~> 3.0)
     googleauth (0.5.3)
       faraday (~> 0.12)
       jwt (~> 1.4)
@@ -356,9 +369,10 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
-    grpc (1.4.5)
+    grpc (1.8.3)
       google-protobuf (~> 3.1)
-      googleauth (~> 0.5.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
     haml (4.0.7)
       tilt
     haml_lint (0.26.0)
@@ -495,11 +509,11 @@ GEM
     mustermann (1.0.0)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    mysql2 (0.4.5)
+    mysql2 (0.4.10)
     net-ldap (0.16.0)
     net-ssh (4.1.0)
     netrc (0.11.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     numerizer (0.1.1)
     oauth (0.5.1)
@@ -569,14 +583,12 @@ GEM
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
     os (0.9.6)
-    parallel (1.12.0)
-    paranoia (2.3.1)
-      activerecord (>= 4.0, < 5.2)
+    parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    path_expander (1.0.1)
+    path_expander (1.0.2)
     peek (1.0.1)
       concurrent-ruby (>= 0.9.0)
       concurrent-ruby-ext (>= 0.9.0)
@@ -624,7 +636,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.7.0.beta43)
+    prometheus-client-mmap (0.9.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -641,7 +653,7 @@ GEM
       rack (>= 0.4)
     rack-attack (4.4.1)
       rack
-    rack-cors (0.4.0)
+    rack-cors (1.0.2)
     rack-oauth2 (1.2.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
@@ -685,6 +697,9 @@ GEM
       rake
     raindrops (0.18.0)
     rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
     rbnacl (4.0.2)
@@ -698,7 +713,7 @@ GEM
       json
     recursive-open-struct (1.0.0)
     redcarpet (3.4.0)
-    redis (3.3.3)
+    redis (3.3.5)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
       redis-rack (>= 1, < 3)
@@ -771,21 +786,21 @@ GEM
       pg
       rails
       sqlite3
-    rubocop (0.49.1)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-gitlab-security (0.1.0)
-      rubocop (>= 0.47.1)
-    rubocop-rspec (1.15.1)
-      rubocop (>= 0.42.0)
+    rubocop-gitlab-security (0.1.1)
+      rubocop (>= 0.51)
+    rubocop-rspec (1.22.1)
+      rubocop (>= 0.52.1)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
     ruby-prof (0.16.2)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby-saml (1.4.1)
       nokogiri (>= 1.5.10)
     ruby_parser (3.9.0)
@@ -799,7 +814,11 @@ GEM
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.4.22)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
@@ -809,11 +828,11 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    scss_lint (0.54.0)
+    scss_lint (0.56.0)
       rake (>= 0.9, < 13)
-      sass (~> 3.4.20)
+      sass (~> 3.5.3)
     securecompare (1.0.0)
-    seed-fu (2.3.6)
+    seed-fu (2.3.7)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
     select2-rails (3.5.9.3)
@@ -829,11 +848,11 @@ GEM
       rack
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.0.4)
+    sidekiq (5.0.5)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
+      redis (>= 3.3.4, < 5)
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
@@ -969,7 +988,6 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.3.2)
   ace-rails-ap (~> 4.1.0)
-  activerecord-nulldb-adapter
   activerecord_sane_schema_dumper (= 0.2)
   acts-as-taggable-on (~> 4.0)
   addressable (~> 2.5.2)
@@ -978,11 +996,12 @@ DEPENDENCIES
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.2)
   asciidoctor-plantuml (= 0.0.7)
+  asset_sync (~> 2.2.0)
   attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
-  batch-loader
+  batch-loader (~> 1.2.1)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
@@ -1014,12 +1033,14 @@ DEPENDENCIES
   dropzonejs-rails (~> 0.7.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
-  factory_girl_rails (~> 4.7.0)
+  factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
+  fast_blank
   ffaker (~> 2.4)
-  flay (~> 2.8.0)
-  flipper (~> 0.10.2)
-  flipper-active_record (~> 0.10.2)
+  flay (~> 2.10.0)
+  flipper (~> 0.11.0)
+  flipper-active_record (~> 0.11.0)
+  flipper-active_support_cache_store (~> 0.11.0)
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 1.4)
   fog-core (~> 1.44)
@@ -1035,15 +1056,17 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.59.0)
+  gitaly-proto (~> 0.84.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.6.2)
+  gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)
   gon (~> 6.1.0)
   google-api-client (~> 0.13.6)
+  google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
   grape-entity (~> 0.6.0)
@@ -1075,10 +1098,10 @@ DEPENDENCIES
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
-  mysql2 (~> 0.4.5)
+  mysql2 (~> 0.4.10)
   net-ldap
   net-ssh (~> 4.1.0)
-  nokogiri (~> 1.8.1)
+  nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)
   octokit (~> 4.6.2)
   oj (~> 2.17.4)
@@ -1098,7 +1121,6 @@ DEPENDENCIES
   omniauth-twitter (~> 1.2.0)
   omniauth_crowd (~> 2.2.0)
   org-ruby (~> 0.9.12)
-  paranoia (~> 2.3.1)
   peek (~> 1.0.1)
   peek-gc (~> 0.0.2)
   peek-host (~> 1.0.0)
@@ -1110,11 +1132,11 @@ DEPENDENCIES
   peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.7.0.beta43)
+  prometheus-client-mmap (~> 0.9.1)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
   rack-attack (~> 4.4.1)
-  rack-cors (~> 0.4.0)
+  rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
   rack-proxy (~> 0.6.0)
   rails (= 4.2.10)
@@ -1141,9 +1163,8 @@ DEPENDENCIES
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
   rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.49.1)
-  rubocop-gitlab-security (~> 0.1.0)
-  rubocop-rspec (~> 1.15.1)
+  rubocop (~> 0.52.1)
+  rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 0.16.2)
   ruby_parser (~> 3.8)
@@ -1151,8 +1172,8 @@ DEPENDENCIES
   rugged (~> 0.26.0)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.6)
-  scss_lint (~> 0.54.0)
-  seed-fu (= 2.3.6)
+  scss_lint (~> 0.56.0)
+  seed-fu (~> 2.3.7)
   select2-rails (~> 3.5.9)
   selenium-webdriver (~> 3.5)
   sentry-raven (~> 2.5.3)
@@ -1194,4 +1215,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index d13e6139582..0d736188f08 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
     };
   };
 
-  version = "10.3.4";
+  version = "10.5.4";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica";
+    sha256 = "1fsz2rdfcb1a2a2jwl8009r8ldi1rg8rj07751lgwy52jdp1ihka";
   };
 
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1";
+    sha256 = "1glvqzbspaw88nwmgpxvkz52a4pz3wp3h5xs1f9kc32k2vh384nz";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index fe861e14304..68d6e7304df 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -69,15 +69,6 @@
     };
     version = "4.2.10";
   };
-  activerecord-nulldb-adapter = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dxk26drn3s0mpyk8ir30k1pg5fqndrnsdjkkncn0acylq4ja27z";
-      type = "gem";
-    };
-    version = "0.3.7";
-  };
   activerecord_sane_schema_dumper = {
     dependencies = ["rails"];
     source = {
@@ -173,6 +164,15 @@
     };
     version = "0.0.7";
   };
+  asset_sync = {
+    dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "044nqqnbib1bpld33j5jxcql06d6fr6zmhq8hlm69zqd0xd509p0";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -251,10 +251,10 @@
   batch-loader = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w4ysjfh74612wsgdnnaq3xqw25hzsr6ajb5syiv1ix7fi15y8bv";
+      sha256 = "1nvmwzn8q6dkp2n8wz47z7gldj3yrj7h6syy0cwrkzi19bfvxba2";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.2.1";
   };
   bcrypt = {
     source = {
@@ -803,23 +803,23 @@
     };
     version = "0.9.0";
   };
-  factory_girl = {
+  factory_bot = {
     dependencies = ["activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i";
+      sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx";
       type = "gem";
     };
-    version = "4.7.0";
+    version = "4.8.2";
   };
-  factory_girl_rails = {
-    dependencies = ["factory_girl" "railties"];
+  factory_bot_rails = {
+    dependencies = ["factory_bot" "railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r";
+      sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2";
       type = "gem";
     };
-    version = "4.7.0";
+    version = "4.8.2";
   };
   faraday = {
     dependencies = ["multipart-post"];
@@ -848,6 +848,14 @@
     };
     version = "0.0.6";
   };
+  fast_blank = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   fast_gettext = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -876,27 +884,36 @@
     dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x563gyx292ka3awps6h6hmswqf71zdxnzw0pfv6p2mhd2zwxaba";
+      sha256 = "0rzggr9w6z2jvs3mv0bp7d64yjivpp93ww9g4j9azzcfjqnh9hn3";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "2.10.0";
   };
   flipper = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gbvd4j0rkr7qc3mnjdw4r9p6lffnwv7rvm1cyr8a0avjky34n8p";
+      sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87";
       type = "gem";
     };
-    version = "0.10.2";
+    version = "0.11.0";
   };
   flipper-active_record = {
     dependencies = ["activerecord" "flipper"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "053lq791z8bf3xv6kb14nq3yrzjpmlyhzq3kvys978dc8yw78ld7";
+      sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91";
       type = "gem";
     };
-    version = "0.10.2";
+    version = "0.11.0";
+  };
+  flipper-active_support_cache_store = {
+    dependencies = ["activesupport" "flipper"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb";
+      type = "gem";
+    };
+    version = "0.11.0";
   };
   flowdock = {
     dependencies = ["httparty" "multi_json"];
@@ -1088,10 +1105,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82";
+      sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8";
       type = "gem";
     };
-    version = "0.59.0";
+    version = "0.84.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1136,6 +1153,15 @@
     };
     version = "1.6.3";
   };
+  gitlab-styles = {
+    dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m0ihbp7kjis03pcdx5310j7nzsxh22hfailnz0j467zab9jiap0";
+      type = "gem";
+    };
+    version = "2.3.2";
+  };
   gitlab_omniauth-ldap = {
     dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
     source = {
@@ -1202,10 +1228,19 @@
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l9b2f4msp1gkay2mqjbjs7kfhchf916zh1y365singiysrwn2i6";
+      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
       type = "gem";
     };
-    version = "3.4.1.1";
+    version = "3.5.1";
+  };
+  googleapis-common-protos-types = {
+    dependencies = ["google-protobuf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      type = "gem";
+    };
+    version = "1.0.1";
   };
   googleauth = {
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
@@ -1262,13 +1297,13 @@
     version = "1.7.0";
   };
   grpc = {
-    dependencies = ["google-protobuf" "googleauth"];
+    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
+      sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j";
       type = "gem";
     };
-    version = "1.4.5";
+    version = "1.8.3";
   };
   haml = {
     dependencies = ["tilt"];
@@ -1803,10 +1838,10 @@
   mysql2 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kh96xp396swyaddz5l2zqjxi3cvyqv62scak9b3f98j14ynfscl";
+      sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq";
       type = "gem";
     };
-    version = "0.4.5";
+    version = "0.4.10";
   };
   net-ldap = {
     source = {
@@ -1836,10 +1871,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.8.2";
   };
   numerizer = {
     source = {
@@ -2073,19 +2108,10 @@
   parallel = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
       type = "gem";
     };
-    version = "1.12.0";
-  };
-  paranoia = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ibdga0a0px8rf82qnmgm59z3z4s27r11i2i24087f0yh8z8bd7z";
-      type = "gem";
-    };
-    version = "2.3.1";
+    version = "1.12.1";
   };
   parser = {
     dependencies = ["ast"];
@@ -2108,10 +2134,10 @@
   path_expander = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hklnfb0br6mx6l25zknz2zj6r152i0jiy6fn6ki220x0l5m2h59";
+      sha256 = "0wsymhprfjazdkmfv02kski3iwjjkciwxqjg9brh56sbymcgk34a";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   peek = {
     dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"];
@@ -2265,10 +2291,10 @@
   prometheus-client-mmap = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wpk9zfbr7c1asvnq1v6jmc3ydbl8y17v24cj4vyhy3nkpds0cij";
+      sha256 = "1p3xkk9zal95di5v999mk7sq02fk0fimg633ixvhvv70ph6c8dhn";
       type = "gem";
     };
-    version = "0.7.0.beta43";
+    version = "0.9.1";
   };
   pry = {
     dependencies = ["coderay" "method_source" "slop"];
@@ -2342,10 +2368,10 @@
   rack-cors = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw";
+      sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "1.0.2";
   };
   rack-oauth2 = {
     dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
@@ -2462,6 +2488,23 @@
     };
     version = "12.3.0";
   };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
   rblineprof = {
     dependencies = ["debugger-ruby_core_source"];
     source = {
@@ -2542,10 +2585,10 @@
   redis = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kdj7511l6kqvqmaiw7kw604c83pk6f4b540gdsq1bf7yxm6qx6g";
+      sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv";
       type = "gem";
     };
-    version = "3.3.3";
+    version = "3.3.5";
   };
   redis-actionpack = {
     dependencies = ["actionpack" "redis-rack" "redis-store"];
@@ -2778,28 +2821,28 @@
     dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw";
+      sha256 = "0d22rr1jnjfkw10rbnqb8plyd7kzf553nm3sbv14xil65s4mkijf";
       type = "gem";
     };
-    version = "0.49.1";
+    version = "0.52.1";
   };
   rubocop-gitlab-security = {
     dependencies = ["rubocop"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
+      sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln";
       type = "gem";
     };
-    version = "0.1.0";
+    version = "0.1.1";
   };
   rubocop-rspec = {
     dependencies = ["rubocop"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16qgakivl2vqbx82fm78999cximbb10jbz3ix1ga4a2rns5xxlf3";
+      sha256 = "18rd3w2q07vkfdk9nl8apkpyjfw1478qg82zgfnd4hn3r40jkbcx";
       type = "gem";
     };
-    version = "1.15.1";
+    version = "1.22.1";
   };
   ruby-fogbugz = {
     dependencies = ["crack"];
@@ -2821,10 +2864,10 @@
   ruby-progressbar = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
+      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.9.0";
   };
   ruby-saml = {
     dependencies = ["nokogiri"];
@@ -2903,12 +2946,22 @@
     version = "2.1.0";
   };
   sass = {
+    dependencies = ["sass-listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
+      sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
       type = "gem";
     };
-    version = "3.4.22";
+    version = "3.5.5";
+  };
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      type = "gem";
+    };
+    version = "4.0.0";
   };
   sass-rails = {
     dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
@@ -2932,10 +2985,10 @@
     dependencies = ["rake" "sass"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01lwbrz7637j79jkm6yaq4wsd4cqgzn0r74whn85v7j9dir73l98";
+      sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
       type = "gem";
     };
-    version = "0.54.0";
+    version = "0.56.0";
   };
   securecompare = {
     source = {
@@ -2949,10 +3002,10 @@
     dependencies = ["activerecord" "activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nkp1pvkdydclbl2v4qf9cixmiycvlqnrgxd61sv9r85spb01z3p";
+      sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi";
       type = "gem";
     };
-    version = "2.3.6";
+    version = "2.3.7";
   };
   select2-rails = {
     dependencies = ["thor"];
@@ -3019,10 +3072,10 @@
     dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nazi3a9aq7c7cxk749qz9ilp7dv39r9n3zsbjg4frc96bb85s9w";
+      sha256 = "0mmmv6k4l5rd74zw4xmwsadi0pbbcyzk1cm73zd8fzwra6nfz7sh";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "5.0.5";
   };
   sidekiq-cron = {
     dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3537,4 +3590,4 @@
     };
     version = "2.1.0";
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index acc615c63ca..7a2bfea0c10 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,8 +1,8 @@
 diff --git a/config/environments/production.rb b/config/environments/production.rb
-index c5cbfcf64c..e40f10e25f 100644
+index c5cbfcf64c..4d01f6fab8 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
-@@ -70,14 +70,16 @@ Rails.application.configure do
+@@ -70,10 +70,10 @@ Rails.application.configure do
  
    config.action_mailer.delivery_method = :sendmail
    # Defaults to:
@@ -11,23 +11,17 @@ index c5cbfcf64c..e40f10e25f 100644
 -  # #   arguments: '-i -t'
 -  # # }
 +  config.action_mailer.sendmail_settings = {
-+    location: '/run/wrappers/bin/sendmail',
++    location: '/usr/sbin/sendmail',
 +    arguments: '-i -t'
 +  }
    config.action_mailer.perform_deliveries = true
    config.action_mailer.raise_delivery_errors = true
  
-   config.eager_load = true
- 
-   config.allow_concurrency = false
-+
-+  config.active_record.dump_schema_after_migration = false
- end
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 0b33783869..cd4e41d9bd 100644
+index bd696a7f2c..44e3863736 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -574,7 +574,7 @@ production: &base
+@@ -590,7 +590,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
@@ -37,10 +31,10 @@ index 0b33783869..cd4e41d9bd 100644
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 8ddf8e4d2e..559cf9adf7 100644
+index 0bea8a4f4b..290248547b 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -252,7 +252,7 @@ Settings.gitlab['user']       ||= 'git'
+@@ -255,7 +255,7 @@ Settings.gitlab['user']       ||= 'git'
  Settings.gitlab['user_home']  ||= begin
    Etc.getpwnam(Settings.gitlab['user']).dir
  rescue ArgumentError # no user configured
@@ -49,7 +43,7 @@ index 8ddf8e4d2e..559cf9adf7 100644
  end
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil
  # Git
  #
  Settings['git'] ||= Settingslogic.new({})
@@ -58,29 +52,42 @@ index 8ddf8e4d2e..559cf9adf7 100644
  
  # Important: keep the satellites.path setting until GitLab 9.0 at
  # least. This setting is fed to 'rm -rf' in
+diff --git a/lib/api/api.rb b/lib/api/api.rb
+index e953f3d2ec..3a8d9f076b 100644
+--- a/lib/api/api.rb
++++ b/lib/api/api.rb
+@@ -2,7 +2,7 @@ module API
+   class API < Grape::API
+     include APIGuard
+ 
+-    LOG_FILENAME = Rails.root.join("log", "api_json.log")
++    LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
+ 
+     NO_SLASH_URL_PART_REGEX = %r{[^/]+}
+     PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
 diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
-index 59b21149a9..4f4a39a06c 100644
+index a42e312b5d..ccaab9229e 100644
 --- a/lib/gitlab/logger.rb
 +++ b/lib/gitlab/logger.rb
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ module Gitlab
      end
  
      def self.full_log_path
 -      Rails.root.join("log", file_name)
-+      File.join(ENV["GITLAB_LOG_PATH"], file_name)
++        File.join(ENV["GITLAB_LOG_PATH"], file_name)
      end
  
      def self.cache_key
 diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
-index b5f4124052..f72c556983 100644
+index 7d7400bdab..cb25211d44 100644
 --- a/lib/gitlab/uploads_transfer.rb
 +++ b/lib/gitlab/uploads_transfer.rb
 @@ -1,7 +1,7 @@
  module Gitlab
    class UploadsTransfer < ProjectTransfer
      def root_dir
--      File.join(CarrierWave.root, FileUploader.base_dir)
-+      ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir)
+-      FileUploader.root
++      ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root
      end
    end
  end
@@ -98,7 +105,7 @@ index 3e0c436d6e..28cefc5514 100644
      end
    end
 diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb
-index 7026d0ba07..6d88b8b9fb 100644
+index 7026d0ba07..c56e1f7ed9 100644
 --- a/lib/system_check/app/uploads_directory_exists_check.rb
 +++ b/lib/system_check/app/uploads_directory_exists_check.rb
 @@ -4,12 +4,13 @@ module SystemCheck
@@ -113,7 +120,7 @@ index 7026d0ba07..6d88b8b9fb 100644
 +        uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
          try_fixing_it(
 -          "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
-+          "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
++            "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
          )
          for_more_information(
            see_installation_guide_section 'GitLab'
@@ -143,14 +150,3 @@ index b276a81eac..070e3ebd81 100644
        end
      end
    end
---- a/lib/api/api.rb	1970-01-01 01:00:01.000000000 +0100
-+++ b/lib/api/api.rb	2017-09-28 19:37:24.953605705 +0200
-@@ -2,7 +2,7 @@
-   class API < Grape::API
-     include APIGuard
- 
--    LOG_FILENAME = Rails.root.join("log", "api_json.log")
-+    LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
- 
-     use GrapeLogging::Middleware::RequestLogger,
-         logger: Logger.new(LOG_FILENAME),

From 08946efdc80b3c1670d3093b06d60fab7b73011a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 22 Mar 2018 02:08:49 +0100
Subject: [PATCH 1678/2266] gitlab: 10.5.4 -> 10.5.6

---
 .../version-management/gitlab/Gemfile         |  2 +-
 .../version-management/gitlab/Gemfile.lock    |  6 ++--
 .../version-management/gitlab/default.nix     |  9 ++---
 .../version-management/gitlab/gemset.nix      |  4 +--
 .../gitlab/nulladapter.patch                  | 33 -------------------
 5 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab/nulladapter.patch

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 880ed483c34..97d40857e11 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -25,7 +25,7 @@ gem 'devise', '~> 4.2'
 gem 'doorkeeper', '~> 4.2.0'
 gem 'doorkeeper-openid_connect', '~> 1.2.0'
 gem 'omniauth', '~> 1.4.2'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 22c4fc0ef28..4022e289611 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -529,8 +529,8 @@ GEM
     omniauth (1.4.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
-    omniauth-auth0 (1.4.1)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-auth0 (2.0.0)
+      omniauth-oauth2 (~> 1.4)
     omniauth-authentiq (0.3.1)
       omniauth-oauth2 (~> 1.3, >= 1.3.1)
     omniauth-azure-oauth2 (0.0.9)
@@ -1106,7 +1106,7 @@ DEPENDENCIES
   octokit (~> 4.6.2)
   oj (~> 2.17.4)
   omniauth (~> 1.4.2)
-  omniauth-auth0 (~> 1.4.1)
+  omniauth-auth0 (~> 2.0.0)
   omniauth-authentiq (~> 0.3.1)
   omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 0d736188f08..1c3d1928a8b 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
     };
   };
 
-  version = "10.5.4";
+  version = "10.5.6";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "1fsz2rdfcb1a2a2jwl8009r8ldi1rg8rj07751lgwy52jdp1ihka";
+    sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0";
   };
 
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1glvqzbspaw88nwmgpxvkz52a4pz3wp3h5xs1f9kc32k2vh384nz";
+    sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0";
   };
 
   buildInputs = [
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./remove-hardcoded-locations.patch
-    ./nulladapter.patch
     ./fix-36783.patch
   ];
 
@@ -59,6 +58,8 @@ stdenv.mkDerivation rec {
     substituteInPlace app/controllers/admin/background_jobs_controller.rb \
         --replace "ps -U" "${procps}/bin/ps -U"
 
+    sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
+
     # required for some gems:
     cat > config/database.yml <<EOF
       production:
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 68d6e7304df..4a021f5f2d9 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -1931,10 +1931,10 @@
     dependencies = ["omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dhfl01519q1cp4w0ml481j1cg05g7qvam0x4ia9jhdz8yx6npfs";
+      sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "2.0.0";
   };
   omniauth-authentiq = {
     dependencies = ["omniauth-oauth2"];
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
deleted file mode 100644
index a495ce63cc5..00000000000
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index 4861171ef5..f6e701c548 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -1,5 +1,7 @@
- source 'https://rubygems.org'
- 
-+gem 'activerecord-nulldb-adapter'
-+
- gem 'rails', '4.2.10'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- 
-diff --git a/Gemfile.lock b/Gemfile.lock
-index 38944248f9..08ce4486ba 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -33,6 +33,8 @@ GEM
-       activemodel (= 4.2.8)
-       activesupport (= 4.2.8)
-       arel (~> 6.0)
-+    activerecord-nulldb-adapter (0.3.7)
-+      activerecord (>= 2.0.0)
-     activerecord_sane_schema_dumper (0.2)
-       rails (>= 4, < 5)
-     activesupport (4.2.8)
-@@ -963,6 +965,7 @@ PLATFORMS
- DEPENDENCIES
-   RedCloth (~> 4.3.2)
-   ace-rails-ap (~> 4.1.0)
-+  activerecord-nulldb-adapter
-   activerecord_sane_schema_dumper (= 0.2)
-   acts-as-taggable-on (~> 4.0)
-   addressable (~> 2.5.2)

From e5a854e740ba2963af85a242229a8a8f3c250136 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Sep 2017 21:20:41 +0200
Subject: [PATCH 1679/2266] gitlab service: use recommended unicorn config

---
 .../services/misc/defaultUnicornConfig.rb     | 244 ++++--------------
 1 file changed, 54 insertions(+), 190 deletions(-)

diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb
index 84622622db7..0b58c59c7a5 100644
--- a/nixos/modules/services/misc/defaultUnicornConfig.rb
+++ b/nixos/modules/services/misc/defaultUnicornConfig.rb
@@ -1,205 +1,69 @@
-# The following was taken from github.com/crohr/syslogger and is BSD
-# licensed.
-require 'syslog'
-require 'logger'
-require 'thread'
-
-class Syslogger
-
-  VERSION = "1.6.0"
-
-  attr_reader :level, :ident, :options, :facility, :max_octets
-  attr_accessor :formatter
-
-  MAPPING = {
-    Logger::DEBUG => Syslog::LOG_DEBUG,
-    Logger::INFO => Syslog::LOG_INFO,
-    Logger::WARN => Syslog::LOG_WARNING,
-    Logger::ERROR => Syslog::LOG_ERR,
-    Logger::FATAL => Syslog::LOG_CRIT,
-    Logger::UNKNOWN => Syslog::LOG_ALERT
-  }
-
-  #
-  # Initializes default options for the logger
-  # <tt>ident</tt>:: the name of your program [default=$0].
-  # <tt>options</tt>::  syslog options [default=<tt>Syslog::LOG_PID | Syslog::LOG_CONS</tt>].
-  #                     Correct values are:
-  #                       LOG_CONS    : writes the message on the console if an error occurs when sending the message;
-  #                       LOG_NDELAY  : no delay before sending the message;
-  #                       LOG_PERROR  : messages will also be written on STDERR;
-  #                       LOG_PID     : adds the process number to the message (just after the program name)
-  # <tt>facility</tt>:: the syslog facility [default=nil] Correct values include:
-  #                       Syslog::LOG_DAEMON
-  #                       Syslog::LOG_USER
-  #                       Syslog::LOG_SYSLOG
-  #                       Syslog::LOG_LOCAL2
-  #                       Syslog::LOG_NEWS
-  #                       etc.
-  #
-  # Usage:
-  #   logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0)
-  #   logger.level = Logger::INFO # use Logger levels
-  #   logger.warn "warning message"
-  #   logger.debug "debug message"
-  #
-  def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil)
-    @ident = ident
-    @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS)
-    @facility = facility
-    @level = Logger::INFO
-    @mutex = Mutex.new
-    @formatter = Logger::Formatter.new
-  end
-
-  %w{debug info warn error fatal unknown}.each do |logger_method|
-    # Accepting *args as message could be nil.
-    #  Default params not supported in ruby 1.8.7
-    define_method logger_method.to_sym do |*args, &block|
-      return true if @level > Logger.const_get(logger_method.upcase)
-      message = args.first || block && block.call
-      add(Logger.const_get(logger_method.upcase), message)
-    end
-
-    unless logger_method == 'unknown'
-      define_method "#{logger_method}?".to_sym do
-        @level <= Logger.const_get(logger_method.upcase)
-      end
-    end
-  end
-
-  # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger
-  def write(msg)
-    add(Logger::INFO, msg)
-  end
-
-  # Logs a message at the Logger::INFO level.
-  def <<(msg)
-    add(Logger::INFO, msg)
-  end
-
-  # Low level method to add a message.
-  # +severity+::  the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN
-  # +message+:: the message string.
-  #             If nil, the method will call the block and use the result as the message string.
-  #             If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger.
-  # +progname+:: optionally, overwrite the program name that appears in the log message.
-  def add(severity, message = nil, progname = nil, &block)
-    if message.nil? && block.nil? && !progname.nil?
-      message, progname = progname, nil
-    end
-    progname ||= @ident
-
-    @mutex.synchronize do
-      Syslog.open(progname, @options, @facility) do |s|
-        s.mask = Syslog::LOG_UPTO(MAPPING[@level])
-        communication = clean(message || block && block.call)
-        if self.max_octets
-          buffer = "#{tags_text}"
-          communication.bytes do |byte|
-            buffer.concat(byte)
-            # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte
-            if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte)
-              s.log(MAPPING[severity],buffer)
-              buffer = ""
-            end
-          end
-          s.log(MAPPING[severity],buffer) unless buffer.empty?
-        else
-          s.log(MAPPING[severity],"#{tags_text}#{communication}")
-        end
-      end
-    end
-  end
-
-  # Set the max octets of the messages written to the log
-  def max_octets=(max_octets)
-    @max_octets = max_octets
-  end
-
-  # Sets the minimum level for messages to be written in the log.
-  # +level+:: one of <tt>Logger::DEBUG</tt>, <tt>Logger::INFO</tt>, <tt>Logger::WARN</tt>, <tt>Logger::ERROR</tt>, <tt>Logger::FATAL</tt>, <tt>Logger::UNKNOWN</tt>
-  def level=(level)
-    level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol)
-
-    unless level.is_a?(Fixnum)
-      raise ArgumentError.new("Invalid logger level `#{level.inspect}`")
-    end
-
-    @level = level
-  end
-
-  # Sets the ident string passed along to Syslog
-  def ident=(ident)
-    @ident = ident
-  end
-
-  # Tagging code borrowed from ActiveSupport gem
-  def tagged(*tags)
-    new_tags = push_tags(*tags)
-    yield self
-  ensure
-    pop_tags(new_tags.size)
-  end
-
-  def push_tags(*tags)
-    tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags|
-      current_tags.concat new_tags
-    end
-  end
-
-  def pop_tags(size = 1)
-    current_tags.pop size
-  end
-
-  def clear_tags!
-    current_tags.clear
-  end
-
-  protected
-
-  # Borrowed from SyslogLogger.
-  def clean(message)
-    message = message.to_s.dup
-    message.strip! # remove whitespace
-    message.gsub!(/\n/, '\\n') # escape newlines
-    message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
-    message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
-    message
-  end
-
-  private
-
-  def tags_text
-    tags = current_tags
-    if tags.any?
-      tags.collect { |tag| "[#{tag}] " }.join
-    end
-  end
-
-  def current_tags
-    Thread.current[:syslogger_tagged_logging_tags] ||= []
-  end
-end
-
-worker_processes 2
-working_directory ENV["GITLAB_PATH"]
-pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
+worker_processes 3
 
 listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
+listen "/run/gitlab/gitlab.socket", :backlog => 1024
+
+working_directory ENV["GITLAB_PATH"]
+
+pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
 
 timeout 60
 
-logger Syslogger.new
-
+# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
 preload_app true
-
 GC.respond_to?(:copy_on_write_friendly=) and
   GC.copy_on_write_friendly = true
 
 check_client_connection false
 
+before_fork do |server, worker|
+  # the following is highly recommended for Rails + "preload_app true"
+  # as there's no need for the master process to hold a connection
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+
+  # The following is only recommended for memory/DB-constrained
+  # installations.  It is not needed if your system can house
+  # twice as many worker_processes as you have configured.
+  #
+  # This allows a new master process to incrementally
+  # phase out the old master process with SIGTTOU to avoid a
+  # thundering herd (especially in the "preload_app false" case)
+  # when doing a transparent upgrade.  The last worker spawned
+  # will then kill off the old master process with a SIGQUIT.
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if old_pid != server.pid
+    begin
+      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+      Process.kill(sig, File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+    end
+  end
+
+  # Throttle the master from forking too quickly by sleeping.  Due
+  # to the implementation of standard Unix signal handlers, this
+  # helps (but does not completely) prevent identical, repeated signals
+  # from being lost when the receiving process is busy.
+  # sleep 1
+end
+
 after_fork do |server, worker|
+  # per-process listener ports for debugging/admin/migrations
+  # addr = "127.0.0.1:#{9293 + worker.nr}"
+  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
+
+  # the following is *required* for Rails + "preload_app true",
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.establish_connection
+
+  # reset prometheus client, this will cause any opened metrics files to be closed
+  defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
+    Prometheus::Client.reinitialize_on_pid_change
+
+  # if preload_app is true, then you may also want to check and
+  # restart any other shared sockets/descriptors such as Memcached,
+  # and Redis.  TokyoCabinet file handles are safe to reuse
+  # between any number of forked children (assuming your kernel
+  # correctly implements pread()/pwrite() system calls)
 end

From f83cbf20292cfde64e2df49bf0bd84338749c49e Mon Sep 17 00:00:00 2001
From: rardiol <ricardo.ardissone@gmail.com>
Date: Wed, 21 Mar 2018 23:26:29 -0300
Subject: [PATCH 1680/2266] Renpy and pygame_sdl2 update - 6.99.14 (#33943)

* pygame_sdl2: 6.99.10.1227 -> 2.1.0-6.99.14

* renpy: 6.99.12.4 -> 6.99.14
---
 .../interpreters/renpy/default.nix            | 34 ++++++++++++-------
 .../interpreters/renpy/launcherenv.patch      | 14 ++++++++
 .../python-modules/pygame_sdl2/default.nix    | 28 ++++++++++-----
 3 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/interpreters/renpy/launcherenv.patch

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 658c5aebe5c..da271db2ff0 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -5,31 +5,37 @@
 
 with pythonPackages;
 
-stdenv.mkDerivation {
-  name = "renpy-6.99.12.4";
+stdenv.mkDerivation rec {
+  name = "renpy-${version}";
+  version = "6.99.14";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Ren'Py Visual Novel Engine";
     homepage = http://renpy.org/;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-    # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to
-    # build with the most recent pygame version, and fails to run with 1.9.1.
-    broken = true;
+    license = licenses.mit;
+    platforms = platforms.linux;
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2";
-    sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35";
+    url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
+    sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h";
   };
 
+  patches = [
+    ./launcherenv.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter}
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    python cython wrapPython
+    python cython wrapPython tkinter
     SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
   ];
 
-  pythonPath = [ pygame_sdl2 ];
+  pythonPath = [ pygame_sdl2 tkinter ];
 
   RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
     SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
@@ -41,7 +47,9 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/share/renpy
-    cp -r renpy renpy.py $out/share/renpy
+    cp -vr * $out/share/renpy
+    rm -rf $out/share/renpy/module
+
     python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
 
     makeWrapper ${python}/bin/python $out/bin/renpy \
diff --git a/pkgs/development/interpreters/renpy/launcherenv.patch b/pkgs/development/interpreters/renpy/launcherenv.patch
new file mode 100644
index 00000000000..85a6c6439b9
--- /dev/null
+++ b/pkgs/development/interpreters/renpy/launcherenv.patch
@@ -0,0 +1,14 @@
+# The launcher game starts projects in a separate python process
+# with the -E flag, which prevents the nix set PYTHONPATH envvar
+# from taking effect, preventing the loading of pygame_sdl2
+--- a/launcher/game/project.rpy
++++ b/launcher/game/project.rpy
+@@ -239,7 +239,7 @@
+                 raise Exception("Python interpreter not found: %r", executables)
+ 
+             # Put together the basic command line.
+-            cmd = [ executable, "-EO", sys.argv[0] ]
++            cmd = [ executable, "-O", sys.argv[0] ]
+ 
+             cmd.append(self.path)
+             cmd.extend(args)
diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
index eab56f9f7ac..08c266da696 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch
 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
 
 buildPythonPackage rec {
   pname = "pygame_sdl2";
-  version = "6.99.10.1227";
-  name = "${pname}-${version}";
+  version = "2.1.0";
+  renpy_version = "6.99.14";
+  name = "${pname}-${version}-${renpy_version}";
 
-  src = fetchFromGitHub {
-    owner = "renpy";
-    repo = "${pname}";
-    rev = "renpy-${version}";
-    sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
+  src = fetchurl {
+    url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
+    sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9";
   };
 
+  # force rebuild of headers needed for install
+  prePatch = ''
+    rm -rf gen gen3
+  '';
+
+  patches = [
+    # fix for recent sdl2
+    (fetchpatch {
+      url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch";
+      sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr";
+    })
+  ];
+
   buildInputs = [
     SDL2 SDL2_image SDL2_ttf SDL2_mixer
     cython libjpeg libpng

From 0a80f2c0f4284428235b0f54e228f6e76f1673a7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 22 Mar 2018 03:40:46 +0100
Subject: [PATCH 1681/2266] prosody: improve module handling

---
 nixos/doc/manual/release-notes/rl-1803.xml    |  5 +++++
 nixos/modules/services/networking/prosody.nix | 14 +++++++++++---
 pkgs/servers/xmpp/prosody/default.nix         | 10 +++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 20f23261b60..e67f1448466 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -347,6 +347,11 @@ following incompatible changes:</para>
     <para>
       The better-performing <literal>libevent</literal> backend is now enabled by default.
     </para>
+
+    <para>
+      <literal>withCommunityModules</literal> now passes through the modules to <option>services.prosody.extraModules</option>.
+      Use <literal>withOnlyInstalledCommunityModules</literal> for modules that should not be enabled directly, e.g <literal>lib_ldap</literal>.
+    </para>
   </listitem>
 
 </itemizedlist>
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index a7b43fb78a9..d57ebb61f63 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -362,6 +362,12 @@ in
         description = "Enable custom modules";
       };
 
+      extraPluginPaths = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = "Addtional path in which to look find plugins/modules";
+      };
+
       virtualHosts = mkOption {
 
         description = "Define the virtual hosts";
@@ -411,16 +417,18 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.prosody ];
+    environment.systemPackages = [ cfg.package ];
 
     environment.etc."prosody/prosody.cfg.lua".text = ''
 
       pidfile = "/var/lib/prosody/prosody.pid"
 
-
       log = "*syslog"
 
       data_path = "/var/lib/prosody"
+      plugin_paths = {
+        ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) }
+      }
 
       ${ optionalString  (cfg.ssl != null) (createSSLOptsStr cfg.ssl) }
 
@@ -434,7 +442,7 @@ in
         ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
           (name: val: optionalString val "${toLua name};")
         cfg.modules) }
-
+        ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
         ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)}
       };
 
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 1567a4a6b30..2d0e1a529da 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -4,6 +4,7 @@
 , withDBI ? true, luadbi ? null
 # use withExtraLibs to add additional dependencies of community modules
 , withExtraLibs ? [ ]
+, withOnlyInstalledCommunityModules ? [ ]
 , withCommunityModules ? [ ] }:
 
 assert withLibevent -> luaevent != null;
@@ -38,7 +39,8 @@ stdenv.mkDerivation rec {
     sha256 = "0nfx3lngcy88nd81gb7v4kh3nz1bzsm67bxgpd2lprk54diqcrz1";
   };
 
-  buildInputs = [ lua5 makeWrapper libidn openssl ];
+  buildInputs = [ lua5 makeWrapper libidn openssl ]
+    ++ optional withDBI luadbi;
 
   configureFlags = [
     "--ostype=linux"
@@ -49,7 +51,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
       ${concatMapStringsSep "\n" (module: ''
         cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
-      '') withCommunityModules}
+      '') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
       wrapProgram $out/bin/prosody \
         --set LUA_PATH '${luaPath};' \
         --set LUA_CPATH '${luaCPath};'
@@ -59,11 +61,13 @@ stdenv.mkDerivation rec {
         --set LUA_CPATH '${luaCPath};'
     '';
 
+  passthru.communityModules = withCommunityModules;
+
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
     homepage = https://prosody.im;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ fpletz globin ];
   };
 }

From faaf32a0ee3ed3693e87def1fabd6b8a89e29a41 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 22 Mar 2018 03:46:02 +0100
Subject: [PATCH 1682/2266] prosody: add test to release.nix

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

diff --git a/nixos/release.nix b/nixos/release.nix
index a1310a409a1..e3fdf749f27 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -344,6 +344,7 @@ in rec {
   tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.prometheus = callTest tests/prometheus.nix {};
+  tests.prosody = callTest tests/prosody.nix {};
   tests.proxy = callTest tests/proxy.nix {};
   # tests.quagga = callTest tests/quagga.nix {};
   tests.quake3 = callTest tests/quake3.nix {};

From 765211451deaea1c09e24fa2f6fd2ab6dbbc04d6 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Thu, 22 Mar 2018 11:40:54 +0800
Subject: [PATCH 1683/2266] pythonPackages.notebook: 5.4.0 -> 5.4.1

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index d4e7de2872d..443cfa7ccb9 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dd431fad9bdd25aa9ff8265da096ef770475e21bf1d327982611a7de5cd904ca";
+    sha256 = "01l6yp78sp27vns4cxh8ybr7x0pixxn97cp0i3w6s0lv1v8l6qbx";
   };
 
   LC_ALL = "en_US.utf8";

From 0cf4d768975607afaa560bfbd95c870af9abf7fd Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:24 +0100
Subject: [PATCH 1684/2266] jetbrains.webstorm: 2017.3.4 -> 2017.3.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a02773f715c..91f541f0689 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -364,12 +364,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2017.3.4"; /* updated by script */
+    version = "2017.3.5"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */
+      sha256 = "123v4m8p7acndj8p8frn1bjvycijlx904pa84ka9pv18c90qiym9"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WS_Release";

From 10909f0916bca877e49130a4aaf46e728973dcca Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:24 +0100
Subject: [PATCH 1685/2266] jetbrains.ruby-mine: 2017.3.2 -> 2017.3.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 91f541f0689..b6ea8c0f68f 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -351,12 +351,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2017.3.2"; /* updated by script */
+    version = "2017.3.3"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "1dc14k7i0nfhkzi0j53hysqzxcls29j487jr9kv1aqp81k544bdy"; /* updated by script */
+      sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "rm2017.3";

From 4360ab458fae9867e1c021de69ed275ba5244905 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:25 +0100
Subject: [PATCH 1686/2266] jetbrains.pycharm-professional: 2017.3.3 ->
 2017.3.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index b6ea8c0f68f..ba6cdb71369 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -325,12 +325,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2017.3.3"; /* updated by script */
+    version = "2017.3.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "180cwva49air4j7g409algrm4svvmcbapspf9als3djhazqmczgr"; /* updated by script */
+      sha256 = "0040ryx7kj64vwc10gvns43f1c97dvrgnwlmdm1m1506ldvaw0si"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";

From a144405dd91c1856ba7731e42038044e05371fa5 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:25 +0100
Subject: [PATCH 1687/2266] jetbrains.pycharm-community: 2017.3.3 -> 2017.3.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ba6cdb71369..9eb2cc216e7 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -312,12 +312,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2017.3.3"; /* updated by script */
+    version = "2017.3.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1j9pp8lfy62d9l3953d5mpij60s6sqyv3bcjimgy85hsrw570x3r"; /* updated by script */
+      sha256 = "027w73qrrj7aml2kdj3sx890q7jyj2jfnsg0pivi7i4kh8i11204"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";

From 9438b024112c8a138d7f08db51ee4bdd82888ebf Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:26 +0100
Subject: [PATCH 1688/2266] jetbrains.phpstorm: 2017.3.4 -> 2017.3.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9eb2cc216e7..de0577b925a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -299,12 +299,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2017.3.4"; /* updated by script */
+    version = "2017.3.5"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */
+      sha256 = "1mcq8n7rd074aghmiyqf1yg3qvs28w97kk4dygj2a46y3s1ha4cd"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PS2017.3";

From 413f63c512c8e95c7748191ba796571e98646062 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:26 +0100
Subject: [PATCH 1689/2266] jetbrains.idea-ultimate: 2017.3.4 -> 2017.3.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index de0577b925a..8bb95734d45 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -286,12 +286,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.3.4"; /* updated by script */
+    version = "2017.3.5"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */
+      sha256 = "10r3z37mhr8daxi14k011bhx3pxpx3lsj7jvikwll4wjlv1znhiw"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 09b05ede821b38810d26793ce6b62e087c20b5ba Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:26 +0100
Subject: [PATCH 1690/2266] jetbrains.idea-community: 2017.3.4 -> 2017.3.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 8bb95734d45..61acafc68a1 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -273,12 +273,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.3.4"; /* updated by script */
+    version = "2017.3.5"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */
+      sha256 = "124rzc46f4bqyhllwyb26lkavh7zwbj62axrwhif34rayl2rcmpm"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From be827e70c3696bc690caf0fd913456476820f0dc Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:27 +0100
Subject: [PATCH 1691/2266] jetbrains.goland: 2017.3.2 -> 2017.3.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 61acafc68a1..99a2ed7f66d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -260,12 +260,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2017.3.2"; /* updated by script */
+    version = "2017.3.3"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0bhvj1xqlpy58yq2s5nrhhaw53i913zpr135b1f6r5s22nvkigvm"; /* updated by script */
+      sha256 = "073wwhg58hkd8w4jazvwngl78gbhnmilm63jhpirr98jk7i7a4mq"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "goland_release";

From 89cd01dabdc6146bbbdff21d2dee97583dc3abaf Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:27 +0100
Subject: [PATCH 1692/2266] jetbrains.datagrip: 2017.3.5 -> 2017.3.7

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 99a2ed7f66d..64db4ab7952 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -247,12 +247,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2017.3.5"; /* updated by script */
+    version = "2017.3.7"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "1hfy0mxdsvydjjklh8fwdz6f6qxajhngmcmyyzw0gdfhw6ldrv9c"; /* updated by script */
+      sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "datagrip_2017_3";

From 33e6ef179028ab9881d6feb465848c7ecc5c61a8 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell@rxd4.com>
Date: Wed, 14 Mar 2018 08:32:28 +0100
Subject: [PATCH 1693/2266] jetbrains.clion: 2017.3.3 -> 2017.3.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 64db4ab7952..a4a71c12820 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -234,12 +234,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2017.3.3"; /* updated by script */
+    version = "2017.3.4"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */
+      sha256 = "1yxjvsp89mkk7gghbz5lqh7bbqi6l1ihg876c60bhqg0f5m98zcg"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From de910a040b64a2e0c808a89e62717bb80c9f0043 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Feb 2018 01:42:35 +0100
Subject: [PATCH 1694/2266] meson: fix rpath fixup

In common distributions, RPATH is only needed for internal libraries so
meson removes everything else. With Nix, the locations of libraries
are not as predictable, therefore we need to keep them in the RPATH. [1]

Previously we have just kept the RPATH produced by the linker, patching
meson not to remove it. This deprived us of potentially replacing it
with install_rpath provided by project so we had to re-add it manually,
and also introduced a vulnerability of keeping build paths in RPATH.

This commit restores the clean-up but modifies it so the items starting
with /nix/store are retained.

This should be relatively safe since the store is immutable, however,
there might be some unwanted retainment of build_rpath [2] if it contains
paths from Nix store.

[1]: https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
[2]: http://mesonbuild.com/Release-notes-for-0-42-0.html#added-build_rpath-keyword-argument
---
 .../tools/build-managers/meson/default.nix    | 16 +++++++---
 .../build-managers/meson/fix-rpath.patch      | 32 +++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/meson/fix-rpath.patch

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 27aa38cfa7e..23b6f7226a1 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, m4 }: let
+{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
   targetPrefix = lib.optionalString stdenv.isCross
                    (targetPlatform.config + "-");
 in python3Packages.buildPythonApplication rec {
@@ -27,11 +27,17 @@ in python3Packages.buildPythonApplication rec {
     # We patch Meson to add a --fallback-library-path argument with
     # library install_dir to g-ir-scanner.
     ./gir-fallback-path.patch
-  ];
 
-  postPatch = ''
-    sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py
-  '';
+    # In common distributions, RPATH is only needed for internal libraries so
+    # meson removes everything else. With Nix, the locations of libraries
+    # are not as predictable, therefore we need to keep them in the RPATH.
+    # At the moment we are keeping the paths starting with /nix/store.
+    # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
+    (substituteAll {
+      src = ./fix-rpath.patch;
+      inherit (builtins) storeDir;
+    })
+  ];
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
new file mode 100644
index 00000000000..e52428a7db2
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
@@ -0,0 +1,32 @@
+--- a/mesonbuild/compilers/compilers.py
++++ b/mesonbuild/compilers/compilers.py
+@@ -846,8 +848,10 @@
+             if paths != '':
+                 paths += ':'
+             paths += build_rpath
+-        if len(paths) < len(install_rpath):
+-            padding = 'X' * (len(install_rpath) - len(paths))
++        store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), paths.split(':')))
++        extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
++        if extra_space_needed > 0:
++            padding = 'X' * extra_space_needed
+             if not paths:
+                 paths = padding
+             else:
+--- a/mesonbuild/scripts/depfixer.py
++++ b/mesonbuild/scripts/depfixer.py
+@@ -300,6 +300,14 @@
+             return
+         self.bf.seek(rp_off)
+         old_rpath = self.read_str()
++
++        if new_rpath:
++            new_rpath += b':'
++        else:
++            new_rpath = b''
++
++        new_rpath += b':'.join(filter(lambda path: path.startswith(b'@storeDir@'), old_rpath.split(b':')))
++
+         if len(old_rpath) < len(new_rpath):
+             sys.exit("New rpath must not be longer than the old one.")
+         # The linker does read-only string deduplication. If there is a

From 9e2639e84675a3dc99c19eac4d675f2cba15ade6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Feb 2018 01:41:16 +0100
Subject: [PATCH 1695/2266] deja-dup: remove unneeded rpath fixup

---
 pkgs/applications/backup/deja-dup/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index e46ffec3979..b0d8ae8d3cf 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -47,11 +47,6 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Unwrap accidentally wrapped library
     mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
-
-    # Patched meson does not add internal libraries to rpath
-    for elf in "$out/bin/.deja-dup-wrapped" "$out/libexec/deja-dup/.deja-dup-monitor-wrapped" "$out/libexec/deja-dup/tools/libduplicity.so"; do
-      patchelf --set-rpath "$(patchelf --print-rpath "$elf"):$out/lib/deja-dup" "$elf"
-    done
   '';
 
   meta = with stdenv.lib; {

From 45d0d907929571df0c1758d9d710d400f36adcb7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Feb 2018 01:43:53 +0100
Subject: [PATCH 1696/2266] epiphany: remove unneeded rpath fixup

---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index a275040e1f4..3e6d666fdf3 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
     patchShebangs post_install.py
   '';
 
-  postFixup = ''
-    # Patched meson does not add internal libraries to rpath
-    for f in $out/bin/.*-wrapped $out/libexec/.*-wrapped $out/libexec/epiphany/.*-wrapped $out/lib/epiphany/*.so $out/lib/epiphany/web-extensions/*.so; do
-      patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $f)" "$f"
-    done
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Epiphany;
     description = "WebKit based web browser for GNOME";

From 1c6f15083bee48bccfab16f8ad5860936e8810cc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Feb 2018 01:46:25 +0100
Subject: [PATCH 1697/2266] systemd: remove unneeded rpath fixup

---
 pkgs/os-specific/linux/systemd/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 1e4df0d3f0e..a792283e70e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -201,18 +201,6 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # The rpath to the shared systemd library is not added by meson. The
-  # functionality was removed by a nixpkgs patch because it would overwrite
-  # the existing rpath.
-  postFixup = ''
-    sharedLib=libsystemd-shared-${version}.so
-    for prog in `find $out -type f -executable`; do
-      (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
-        patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
-      ) || true
-    done
-  '';
-
   # The interface version prevents NixOS from switching to an
   # incompatible systemd at runtime.  (Switching across reboots is
   # fine, of course.)  It should be increased whenever systemd changes

From de7594095362b653650cb3f096e6e3ec745e0f9e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 25 Feb 2018 01:50:26 +0100
Subject: [PATCH 1698/2266] gnome3.gnome-shell: remove unneeded rpath fixup

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 026f5436237..686256d20aa 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -67,11 +67,6 @@ in stdenv.mkDerivation rec {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  postFixup = ''
-    # Patched meson does not add internal libraries to rpath
-    patchelf --set-rpath "$out/lib/gnome-shell:$(patchelf --print-rpath $out/bin/.gnome-shell-wrapped)" $out/bin/.gnome-shell-wrapped
-  '';
-
   enableParallelBuilding = true;
 
   passthru = {

From fe73013e7d4ad81ccbf9fb30829e227664453fdc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 5 Mar 2018 06:57:38 +0100
Subject: [PATCH 1699/2266] meson: allow dirs outside of prefix

Upstream insists on not allowing bindir and other dir options
outside of prefix for some reason:

https://github.com/mesonbuild/meson/issues/2561

We remove the check so multiple outputs can work sanely.
---
 .../meson/allow-dirs-outside-of-prefix.patch  | 25 +++++++++++++++++++
 .../tools/build-managers/meson/default.nix    |  6 +++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch

diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
new file mode 100644
index 00000000000..b44289d74f5
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
@@ -0,0 +1,25 @@
+--- a/mesonbuild/coredata.py
++++ b/mesonbuild/coredata.py
+@@ -266,18 +266,13 @@
+         '''
+         if option.endswith('dir') and os.path.isabs(value) and \
+            option not in builtin_dir_noprefix_options:
+-            # Value must be a subdir of the prefix
+             # commonpath will always return a path in the native format, so we
+             # must use pathlib.PurePath to do the same conversion before
+             # comparing.
+-            if commonpath([value, prefix]) != str(PurePath(prefix)):
+-                m = 'The value of the {!r} option is {!r} which must be a ' \
+-                    'subdir of the prefix {!r}.\nNote that if you pass a ' \
+-                    'relative path, it is assumed to be a subdir of prefix.'
+-                raise MesonException(m.format(option, value, prefix))
+-            # Convert path to be relative to prefix
+-            skip = len(prefix) + 1
+-            value = value[skip:]
++            if commonpath([value, prefix]) == str(PurePath(prefix)):
++                # Convert path to be relative to prefix
++                skip = len(prefix) + 1
++                value = value[skip:]
+         return value
+ 
+     def init_builtins(self, options):
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 23b6f7226a1..47e57423632 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -21,6 +21,12 @@ in python3Packages.buildPythonApplication rec {
   '';
 
   patches = [
+    # Upstream insists on not allowing bindir and other dir options
+    # outside of prefix for some reason:
+    # https://github.com/mesonbuild/meson/issues/2561
+    # We remove the check so multiple outputs can work sanely.
+    ./allow-dirs-outside-of-prefix.patch
+
     # Unlike libtool, vanilla Meson does not pass any information
     # about the path library will be installed to to g-ir-scanner,
     # breaking the GIR when path other than ${!outputLib}/lib is used.

From bfa24c12a5b71b5652d7427817c8f3f8b787fd4f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 5 Mar 2018 07:08:18 +0100
Subject: [PATCH 1700/2266] meson: set multiple output dirs in setup hook

Closes: #32636
---
 .../development/tools/build-managers/meson/setup-hook.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 341b1ff9e6e..36a7fe23ef5 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -10,6 +10,15 @@ mesonConfigurePhase() {
       crossMesonFlags="--cross-file=@crossFile@/cross-file.conf"
     fi
 
+    # See multiple-outputs.sh and meson’s coredata.py
+    mesonFlags="\
+        --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
+        --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
+        --includedir=${!outputInclude}/include \
+        --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
+        --localedir=${!outputLib}/share/locale \
+        $mesonFlags"
+
     mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
 
     echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"

From 3abd1ec53d4d373f2fd1b697bc9ea191137e5d19 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 4 Mar 2018 22:06:08 +0100
Subject: [PATCH 1701/2266] =?UTF-8?q?gdk=5Fpixbuf:=202.36.7=20=E2=86=92=20?=
 =?UTF-8?q?2.36.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gdk-pixbuf/default.nix          | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index a1a9b10fca6..ace1d687a91 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,40 +1,46 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, shared-mime-info, libintlOrEmpty, gobjectIntrospection, doCheck ? false, makeWrapper }:
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.7";
-  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-  # which apparently requires access to shared-mime-info files during runtime.
+  version = "2.36.11";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
+    sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf";
   };
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [ "out" "dev" "man" "devdoc" ];
 
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty;
+  buildInputs = [ libX11 ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info ++ libintlOrEmpty;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+    gtk-doc gobjectIntrospection makeWrapper
+  ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  mesonFlags = [
+    # with_ & enable_will be removed in the future
+    "-Dwith_docs=true"
+    "-Denable_jasper=true"
+    "-Dx11=true" # will be added in the future (default atm)
+    "-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}"
+  ];
 
-  # on darwin, tests don't link
-  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
-    substituteInPlace Makefile --replace "docs tests" "docs"
+  postPatch = ''
+    chmod +x build-aux/* # patchShebangs only applies to executables
+    patchShebangs build-aux
   '';
 
   postInstall =
@@ -42,6 +48,17 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+
+      # We require runtime access to shared-mime-info
+      ${stdenv.lib.optionalString (!stdenv.isDarwin) ''
+      for f in $dev/bin/*; do
+        wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+      done
+      wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+      ''}
+
+      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).

From e468c04383061590d949f2fcb360926cc88085c7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Mar 2018 17:28:06 +0100
Subject: [PATCH 1702/2266] gobjectIntrospection: fix incorrect GIR shared
 library paths

When a library path contained the library name it was eagerly matched

    libfwupd.so.2 => /build/fwupd-1.0.5/build/libfwupd/libfwupd.so.2 (0x00007ffff7bbd000)
                                              ^^^^^^^^^^^^^^^^^^^^^^
    libgweather-3.so.15 => /build/libgweather-3.28.0/build/libgweather/libgweather-3.so.15 (0x00007ffff7bae000)
                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

which lead to a broken shared library path in the generated GIR file.

This patch allows the soname on the left-hand side of the arrow to
be matched to avoid the trap of the right-hand side. A negative
lookahead had to be added to select the store path, since only
the first match is taken into account.

    libglib-2.0.so.0 => /nix/store/dqlc8y4phlg1hmdbwkhqfwhnxcac88d1-glib-2.56.0/lib/libglib-2.0.so.0 (0x00007ffff6400000)

This will not fix non-GNU platforms, where the soname is not printed
first, but we cannot do much without structured ldd output.

Closes: https://github.com/NixOS/nixpkgs/issues/34988
---
 .../absolute_shlib_path.patch                 | 73 ++++++++-----------
 1 file changed, 32 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 75d9281dfb0..6a112aedcc0 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,8 +1,6 @@
-diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 89ec193..54f1d2e 100755
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
-@@ -94,6 +94,39 @@ def get_windows_option_group(parser):
+@@ -100,6 +100,39 @@
      return group
  
  
@@ -42,7 +40,7 @@ index 89ec193..54f1d2e 100755
  def _get_option_parser():
      parser = optparse.OptionParser('%prog [options] sources')
      parser.add_option('', "--quiet",
-@@ -200,6 +233,10 @@ match the namespace prefix.""")
+@@ -209,6 +242,10 @@
      parser.add_option("", "--filelist",
                        action="store", dest="filelist", default=[],
                        help="file containing headers and sources to be scanned")
@@ -53,57 +51,50 @@ index 89ec193..54f1d2e 100755
  
      group = get_preprocessor_option_group(parser)
      parser.add_option_group(group)
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 838d343..ca7fc0d 100644
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
-@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries):
- # Match absolute paths on OS X to conform to how libraries are usually
- # referenced on OS X systems.
- def _ldd_library_pattern(library_name):
-+    nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
-     pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
-     if platform.system() == 'Darwin':
+@@ -63,6 +63,11 @@
          pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
--    return re.compile(pattern % re.escape(library_name))
-+        return re.compile(pattern % re.escape(library_name))
-+    pattern = r'''
-+        (
-+          (?:
-+            # First match Nix store paths because they need to be absolute.
-+            (?:%s(?:/[^/]*)+)
-+            # Everything else not a store path remains relative, because we
-+            # would end up with temporary paths that are only valid during
-+            # build time in the resulting GIR file.
-+            | (?<=/)
-+          )
-+          # And finally the library itself:
-+          (?:lib%s[^A-Za-z0-9_-][^\s\(\)]*)
-+        )
-+    '''
-+    return re.compile(pattern % (nix_store_dir, re.escape(library_name)),
-+                      re.VERBOSE)
+     return re.compile(pattern % re.escape(library_name))
  
++def _ldd_library_nix_pattern(library_name):
++    nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
++    pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
++    return re.compile(pattern % (nix_store_dir, re.escape(library_name)))
++
  
  # This is a what we do for non-la files. We assume that we are on an
-@@ -115,7 +132,11 @@ def _resolve_non_libtool(options, binary, libraries):
-                 m = pattern.search(line)
+ # ELF-like system where ldd exists and the soname extracted with ldd is
+@@ -112,7 +117,7 @@
+         proc = subprocess.Popen(args, stdout=subprocess.PIPE)
+         patterns = {}
+         for library in libraries:
+-            patterns[library] = _ldd_library_pattern(library)
++            patterns[library] = (_ldd_library_pattern(library), _ldd_library_nix_pattern(library))
+ 
+         shlibs = []
+         for line in proc.stdout:
+@@ -122,11 +127,14 @@
+             # possible for the name of the binary to match _ldd_library_pattern.
+             if line == binary.args[0] + ':\n':
+                 continue
+-            for library, pattern in patterns.items():
+-                m = pattern.search(line)
++            for library, (pattern, nix_pattern) in patterns.items():
++                if line.find('@nixStoreDir@') != -1:
++                    m = nix_pattern.search(line)
++                else:
++                    m = pattern.search(line)
                  if m:
                      del patterns[library]
 -                    shlibs.append(m.group(1))
-+                    match = m.group(1)
-+                    if not match.startswith('/') \
-+                       and len(options.fallback_libpath) > 0:
-+                        match = os.path.join(options.fallback_libpath, match)
-+                    shlibs.append(match)
++                    shlibs.append(os.path.join(options.fallback_libpath, m.group(1)))
                      break
  
          if len(patterns) > 0:
-diff --git a/giscanner/utils.py b/giscanner/utils.py
-index 660081e..c9c767a 100644
 --- a/giscanner/utils.py
 +++ b/giscanner/utils.py
-@@ -109,17 +109,11 @@ def extract_libtool_shlib(la_file):
+@@ -113,17 +113,11 @@
      if dlname is None:
          return None
  

From 0973618e4ec61578de2eaf5531d4be661e4fa20a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 02:03:18 +0100
Subject: [PATCH 1703/2266] gnome3: automated update

---
 pkgs/applications/graphics/shotwell/default.nix             | 4 ++--
 pkgs/applications/misc/orca/default.nix                     | 4 ++--
 pkgs/desktops/gnome-3/apps/cheese/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/apps/evolution/default.nix            | 4 ++--
 pkgs/desktops/gnome-3/apps/file-roller/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/apps/gedit/default.nix                | 4 ++--
 pkgs/desktops/gnome-3/apps/glade/default.nix                | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix       | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix      | 4 ++--
 .../gnome-3/apps/gnome-getting-started-docs/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/apps/polari/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix   | 4 ++--
 pkgs/desktops/gnome-3/core/baobab/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/core/dconf-editor/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/core/dconf/default.nix                | 4 ++--
 pkgs/desktops/gnome-3/core/empathy/default.nix              | 4 ++--
 pkgs/desktops/gnome-3/core/eog/default.nix                  | 4 ++--
 pkgs/desktops/gnome-3/core/epiphany/default.nix             | 4 ++--
 .../desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/gcr/default.nix                  | 4 ++--
 pkgs/desktops/gnome-3/core/gdm/default.nix                  | 4 ++--
 pkgs/desktops/gnome-3/core/geocode-glib/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/core/gjs/default.nix                  | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix    | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix      | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix  | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix       | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix        | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix   | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix    | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix        | 4 ++--
 .../desktops/gnome-3/core/gnome-online-accounts/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-session/default.nix        | 4 ++--
 .../desktops/gnome-3/core/gnome-settings-daemon/default.nix | 4 ++--
 .../gnome-3/core/gnome-shell-extensions/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-software/default.nix       | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix       | 4 ++--
 .../desktops/gnome-3/core/gnome-themes-standard/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix      | 4 ++--
 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix     | 4 ++--
 .../gnome-3/core/gsettings-desktop-schemas/default.nix      | 4 ++--
 pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix      | 4 ++--
 pkgs/desktops/gnome-3/core/gucharmap/default.nix            | 4 ++--
 pkgs/desktops/gnome-3/core/libgepub/default.nix             | 4 ++--
 pkgs/desktops/gnome-3/core/libgweather/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/core/mutter/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/core/nautilus/default.nix             | 4 ++--
 pkgs/desktops/gnome-3/core/simple-scan/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/core/vte/default.nix                  | 4 ++--
 pkgs/desktops/gnome-3/core/yelp-tools/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix             | 4 ++--
 pkgs/desktops/gnome-3/core/yelp/default.nix                 | 4 ++--
 pkgs/desktops/gnome-3/core/zenity/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/devtools/anjuta/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/devtools/devhelp/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/devtools/gdl/default.nix              | 4 ++--
 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 4 ++--
 pkgs/desktops/gnome-3/games/aisleriot/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/games/five-or-more/default.nix        | 4 ++--
 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix       | 4 ++--
 pkgs/desktops/gnome-3/games/gnome-chess/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix       | 4 ++--
 pkgs/desktops/gnome-3/games/gnome-mines/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/games/gnome-robots/default.nix        | 4 ++--
 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix        | 4 ++--
 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix        | 4 ++--
 pkgs/desktops/gnome-3/games/iagno/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/games/lightsoff/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/games/swell-foop/default.nix          | 4 ++--
 pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/misc/gspell/default.nix               | 4 ++--
 pkgs/desktops/gnome-3/misc/libgames-support/default.nix     | 4 ++--
 pkgs/development/libraries/glib-networking/default.nix      | 4 ++--
 pkgs/development/libraries/glib/default.nix                 | 4 ++--
 .../development/libraries/gobject-introspection/default.nix | 4 ++--
 pkgs/development/libraries/gtk+/3.x.nix                     | 6 ++++--
 pkgs/development/libraries/gvfs/default.nix                 | 4 ++--
 pkgs/development/libraries/libhttpseverywhere/default.nix   | 4 ++--
 pkgs/development/libraries/libsoup/default.nix              | 4 ++--
 pkgs/tools/networking/network-manager/default.nix           | 4 ++--
 pkgs/tools/networking/network-manager/fortisslvpn.nix       | 4 ++--
 93 files changed, 188 insertions(+), 186 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index bba6a189b8f..53acbf12173 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "shotwell";
-  version = "0.27.4";
+  version = "0.28.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0g2vphhpxrljpy9sryfsgaayix807i1i9plj9bay72dk0zphqab2";
+    sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index c9f00d48aec..9bc9218305c 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -10,7 +10,7 @@
 with lib;
 let
   pname = "orca";
-  version = "3.26.0";
+  version = "3.27.91";
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
@@ -18,7 +18,7 @@ in buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7";
+    sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 77ee086a950..9da265e75d6 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "cheese-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605";
+    sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 82cf6447cc7..92addb466ca 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.26.6";
+  version = "3.28.0";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1adqh5f5aijkj5cnj1qprig8cd594m0qb0mzxn0zx44k0b6z5m1p";
+    sha256 = "0b6yw664jdfc8ppd78akmrl36iximh7ipknf5mlzgga6lr6pl2nf";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 89f20ed6f15..4e55bc80f38 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5";
+    sha256 = "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index d8f272931d9..864535794f8 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gedit-${version}";
-  version = "3.22.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b";
+    sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 3a294df3ffe..577382a4986 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "glade-${version}";
-  version = "3.20.4";
+  version = "3.22.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1n9m4s81jd9fi60mrxsvlk4fi2vqrqmp95azsxp9jnqn6pkdz0jb";
+    sha256 = "1j7kpy4jisz4nkd3yb5af4vd4bapyqchvp2gvq6ypfw3b0x88rkc";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 674aa84dbc2..b53da1c9427 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
-  version = "3.26.2";
+  version = "3.27.92";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210";
+    sha256 = "1v1br4zh2w3w70np5imi31md6lnqamabiin521f806rdrxsnyggq";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 4da7db42ab9..f1f12f9c8f2 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-calendar-${version}";
-  version = "3.26.3";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1clnfvvsaqw9vpxrs6qrxzmgpaw9x2nkjik2x2vwvm07pdvhddxn";
+    sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 5b36ea83ee1..4beed67ee34 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b";
+    sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 47fd071bf83..0758c09ff54 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-clocks-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7";
+    sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 8e90c0c516a..899c1334fc8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0q7bp0mvmhqmsvm5sjavm46y7sz43na62d1hrl62vg19hdqr9ir4";
+    sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 8531fc1c7c0..3fc444dbdd4 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-getting-started-docs-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775";
+    sha256 = "09khgzrbvcqvgjkqh8rp609bx818v5c8gzq61nxy5582s8habg8g";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 9f6c3153afb..c8dc97c7a73 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${version}";
-  version = "3.26.3";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0cbzl38haz1m6y7gcbvvab0jcrva781izhp8xv2dzmma4xlzdw0k";
+    sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index c03397a40d8..1c18b6c5c82 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-maps-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050";
+    sha256 = "1imcgw67cw1qkfz8m2my0f4qmss11fbqqqi4w7afcfq9p0rplgy0";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 4053d287cc8..1d606c35dcb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-music-${version}";
-  version = "3.26.2";
+  version = "3.28.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0mam7d0lzl7ljd9lym9gkvqwvddic122sdmcgpjir58pmmg9bx8b";
+    sha256 = "0yyysmxwmk167n8wghcbmxz73kgl1y1j9js3mgkjjqsmkd9brk65";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 2837e1d093f..ad445c09df4 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-photos-${version}";
-  version = "3.26.3";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab";
+    sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index f1d6dba21b0..810f3e18805 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "polari-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190";
+    sha256 = "08zgdqrnxl752nv0gac1k7wvjd4j7h5n4c0flrq7q337p40k3dd5";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 2178004a43a..049b586f16d 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "adwaita-icon-theme-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d";
+    sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 1ff67e35f0f..ee2cb3720e8 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "baobab-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e";
+    sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 47ddf6b6486..91350323f50 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "dconf-editor-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1";
+    sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index a1722876121..4c5d0c9637d 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -6,11 +6,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "0.26.1";
+  version = "0.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym";
+    sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
   };
 
   outputs = [ "out" "lib" "dev" ];
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index bf83c7aa8a1..4da4c480266 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   name = "empathy-${version}";
-  version = "3.12.14";
+  version = "3.25.90";
 
   src = fetchurl {
     url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3";
+    sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 1acd6eb6942..ba25a24f587 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "eog-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad";
+    sha256 = "0d8fi5ydsh8n7d85dps8svl1bhid1p8jbnlwiqywj2gd2wpxpyjv";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 3e6d666fdf3..3bc32f99f3e 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.26.6";
+  version = "3.28.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1a1hyv326w4in4pl26gi2n3p9b38ih6zjdiigpqy0aiibnjnmc81";
+    sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index ae97fbc0e4d..479326f40cd 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.26.6";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4";
+    sha256 = "1ybyyy6nls11az8lbri1y9527snz5h7qbhyfqvk0vc6vzvald5gv";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index aa26c660768..61c17a210b4 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gcr-${version}";
-  version = "3.20.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379";
+    sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index ef9439a3029..999c3f05748 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gdm-${version}";
-  version = "3.26.2.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
+    sha256 = "0i5rzr6fdvlm88gl85gvql1wf1yflkmg90x81dqjf39as3ixs81s";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index e97e557e87a..40071970eec 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "geocode-glib-${version}";
-  version = "3.24.0";
+  version = "3.25.4.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
+    sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 6e9f6c464df..888eb073a46 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gjs-${version}";
-  version = "1.50.4";
+  version = "1.52.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a";
+    sha256 = "1jm40imin4sxzfcxcbmf4v71apk8y9icccq1a4m4mlz1wm2s092m";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 0aea3c4eac4..d30e7409b2f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-backgrounds-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f";
+    sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 11816f68ff4..d570a541409 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-bluetooth-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f";
+    sha256 = "0q7yzklrlayj99risj096mr5x35anx94wvr6nbf6pwbvvzv7453p";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 8376bea1a03..f4f00020a4d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-calculator-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7";
+    sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index b5052281b2f..2f6e7a65bff 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "gnome-color-manager";
-  version = "3.26.0";
+  version = "3.28.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1kbi46vk0qf0gxiwm4yhsx8931r7c9cg0c4244j8ncr0hph008b5";
+    sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 6c485bcbd3f..c8e17791ad8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,13 +5,13 @@
 , vala, meson, ninja }:
 
 let
-  version = "3.26.1";
+  version = "3.28.0";
 in stdenv.mkDerivation rec {
   name = "gnome-contacts-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1jszv4b8rc5q8r460wb7qppvm1ssj4733b4z2vyavc95g00ik286";
+    sha256 = "1qqj6k5rvmvg6v6vg4cak98w6rqknpqfsm0vfrwva6l6wbql2v8i";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index b49b13aae80..680defc42bc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -8,13 +8,13 @@
 , fontconfig, sound-theme-freedesktop, grilo }:
 
 let
-  version = "3.26.2";
+  version = "3.28.0";
 in stdenv.mkDerivation rec {
   name = "gnome-control-center-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5";
+    sha256 = "0nyx5nl2rky0249rdcy0hsccnxf3angpya0q859rrbrwaixqnxh3";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 7e85e27d6be..dad8d8177de 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-desktop-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a";
+    sha256 = "17fm5z3kfm1m3420kjpvk1y0pc34p42rqfpmb1npy51jkv1p3pzi";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 0937f5c3082..4dde871ec70 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-disk-utility-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2";
+    sha256 = "0ad98mxyygyzq0y280m6z73anyv3xxr6irpkp6vc803lhdr5b7fc";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 3774ff32db0..7e76b8991fd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-font-viewer-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0";
+    sha256 = "16mp22f255b8zqnnlqh25n6v79b9bd0gmli9ywqyapa0cfai09x3";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index f7f06e35d3a..5d644e2b9db 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-${version}";
-  version = "3.20.1";
+  version = "3.28.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp";
+    sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 2abe8b28c03..dfa0d0731dd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-online-accounts-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1";
+    sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index c8bc6146221..c5e56b0796f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-session-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708";
+    sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index e3c84dfa9fd..fdbf8c5277f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-settings-daemon-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4";
+    sha256 = "1p3ccf4a4qbz73hqyx9i55hkp6l7c7la5kazqawcndl7bksywgny";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index a76dd35711a..d3d87078d84 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6";
+    sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 686256d20aa..68bac54d653 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,11 +13,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gnome-shell-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c";
+    sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7";
   };
 
   # Needed to find /etc/NetworkManager/VPN
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 8996a4cc3e9..4fc825096e7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-software-${version}";
-  version = "3.26.7";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00lfzvlicqd8gk5ijnjdi36ikmhdzvfjj993rpf7mm04ncw4k0za";
+    sha256 = "0zwbgxzl805c4l8kwy5bn3p91s2qxlcn4syzzg4vd4kilc6nnjwk";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 0e64bc4362c..28568a35136 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-system-monitor-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3";
+    sha256 = "1wvgx5p0a29d8yzp7rinpln90pg8vsjagqlvm4cxyhnl5hsdvrvn";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 703bb6fe110..9e99e84cfd5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-terminal-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0";
+    sha256 = "1i5wlcjb0aigm1lbmn16nmh9rkjqfdpzzgf6qw7mcrhgw7pdald5";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
index 720120b392d..c56a768db68 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-themes-standard-${version}";
-  version = "3.22.3";
+  version = "3.27.90";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a";
+    sha256 = "1p1ibm0f2py0lrxrw8wv1jvs630mmz9q97f404jyzr4a8nswrizz";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 8854e7a2d0c..d4ba838bef3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
-  version = "3.26.2.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5";
+    sha256 = "0sx46j61kjn8kaf75303vym5sigki239pqzf5q4n72k1hwp7albp";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 642ee0badf1..36748566880 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-user-share-${version}";
-  version = "3.18.3";
+  version = "3.27.90";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1";
+    sha256 = "1wd183cjr1gmzpsq7bqwkwhmcdng0m105f6ymc89r17fz85f4jhy";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index 89614a327a6..e5ca314c69a 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gsettings-desktop-schemas-${version}";
-  version = "3.24.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7";
+    sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index ae4f75bf76a..0a37144d8f7 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtksourceviewmm-${version}";
-  version = "3.21.2";
+  version = "3.21.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6";
+    sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index ff9b232cb7a..e30676e3c7c 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "gucharmap-${version}";
-  version = "10.0.3";
+  version = "10.0.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4";
+    sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index cb771fc1989..f43b1de46e5 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "libgepub";
-  version = "0.5.3";
+  version = "0.6.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0gn14k1qnkfj0677i2wc42ig4m8biqib9apk23dnl92m3h1f2lmb";
+    sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index ad14abb1000..1d38b75bcda 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "libgweather-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8";
+    sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index dc89c8c674a..0e49d076123 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
-  version = "3.26.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab";
+    sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 8ed7bb2f01a..e16da055123 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "nautilus-${version}";
-  version = "3.26.2";
+  version = "3.28.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4";
+    sha256 = "1i3li3nd434vncd6j6has73xihbzjx1ab0xyw8wif11mym15ixrh";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index a40a8fe8f81..3528a9a93d9 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.26.3";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0galkcc76j0p016fvwn16llh0kh4ykvjy4v7kc6qqnlp38g174n3";
+    sha256 = "0ki95d0v9l0pb5jvk1v8k49vb7snp9j7bnxw3m8q63m00yl33qhz";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 4abeb2ba961..73fd244c548 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vte-${version}";
-  version = "0.50.2";
+  version = "0.52.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf";
+    sha256 = "0rq5gkg7bfrxlsm8mgdh4605hki81wljmjhhz8x4kbspvpfp5bnm";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 28e89cad9fb..5a0a5bd43b5 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yelp-tools-${version}";
-  version = "3.18.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932";
+    sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 341a7d7582c..f904a90454f 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "yelp-xsl-${version}";
-  version = "3.20.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0";
+    sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 661ddc1f12f..60b91aaa04a 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "yelp-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b";
+    sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index fd55fd9f87a..05637e200e3 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "zenity-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830";
+    sha256 = "1y3dha9faqgy5l8wqh3qp354gzdh36fx70q2kc9k1nw7p498yn2y";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 419588f8684..0e50953b3de 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "anjuta-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70";
+    sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 321e887cba6..1d04aaa45ab 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "devhelp-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e";
+    sha256 = "1b4l71775p3mps1jsv7pz26v0lhd0qczsp6qr1dwv7hyslmpb5qn";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
index 07fc15f0d55..75f9bc48db6 100644
--- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gdl-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079";
+    sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 3949e29089c..57070f7ce38 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-devel-docs-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3";
+    sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index b194ac42bf2..77220124fcc 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "aisleriot-${version}";
-  version = "3.22.4";
+  version = "3.22.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb";
+    sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 8806344f3b3..4115fda9f8d 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "five-or-more-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772";
+    sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 22032f16f47..5eb7aa60ce6 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "four-in-a-row-${version}";
-  version = "3.22.2";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420";
+    sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index f50542770c4..0ea34447b92 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-chess-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12";
+    sha256 = "1vxgb36njv4v3bgdpwxd89rvr6s6pkbh9d3xislxqry2yp4f03w0";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index c1f91092bb0..5177eeceebf 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-klotski-${version}";
-  version = "3.22.2";
+  version = "3.22.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-klotski/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h";
+    sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index ce5dc8bc14c..920828a20e6 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9";
+    sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index aa5e00606c7..e07e3c14152 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-robots-${version}";
-  version = "3.22.2";
+  version = "3.22.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f";
+    sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index b3380e6bb96..1d467e542da 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-sudoku-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0";
+    sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 4f87fb50d61..855e496dfaf 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-taquin-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd";
+    sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index d31457f868c..55dac4659d0 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "iagno-${version}";
-  version = "3.26.1";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121";
+    sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 1a163352cfc..869e348adb5 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "lightsoff-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976";
+    sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 92da14fb559..90357c9d80c 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "swell-foop-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22";
+    sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index ecc0711482f..e3ff784b16f 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-packagekit-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417";
+    sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
index 35c3a678e84..a01ff6b5e33 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-tweak-tool-${version}";
-  version = "3.26.4";
+  version = "3.27.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df";
+    sha256 = "1z8l1ym6qmhqirsny4hcqv989ilv5mm764y8q7920zprdcjprds3";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix
index 5d2dc08e7e3..cc2a319d589 100644
--- a/pkgs/desktops/gnome-3/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gspell-${version}";
-  version = "1.6.1";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gspell/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de";
+    sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
index 29fdd317656..b19cb0775f1 100644
--- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "libgnome-games-support";
-  version = "1.2.3";
+  version = "1.4.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1";
+    sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 12a8469868b..1767e0f7bf4 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -3,14 +3,14 @@
 
 let
   pname = "glib-networking";
-  version = "2.54.1";
+  version = "2.56.0";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za";
+    sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
   };
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index e5163e933e1..2c070ff3fa8 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -42,7 +42,7 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  version = "2.54.3";
+  version = "2.56.0";
 in
 
 stdenv.mkDerivation rec {
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8";
+    sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 825d6669907..3c884bb1224 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "gobject-introspection";
-  version = "1.54.1";
+  version = "1.56.0";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq";
+    sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 189af86708e..3c7f8f150e5 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -11,13 +11,15 @@ assert cupsSupport -> cups != null;
 
 with stdenv.lib;
 
+let
+  version = "3.22.29";
+in
 stdenv.mkDerivation rec {
   name = "gtk+3-${version}";
-  version = "3.22.28";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
-    sha256 = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f";
+    sha256 = "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 964344d6892..e2e961cd1bc 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -6,14 +6,14 @@
 
 let
   pname = "gvfs";
-  version = "1.34.2.1";
+  version = "1.36.0";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1smmzix8wqrmj10pqy3xhrlv7xza6rpmg2v052gwk9ysxdric9fm";
+    sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index c674b155fd1..97ac52732b5 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "libhttpseverywhere";
-  version = "0.8.0";
+  version = "0.8.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0igq7g84kfczips3ywhyprxc8v67yrg3kj8lbgny4yyll67kksj3";
+    sha256 = "0vcnimlfcscyvjbh845xbnjb9qc8x0mliaqz2gczxxpakxrbl3gh";
   };
 
   nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 46b9273094a..853219ba539 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -5,14 +5,14 @@
 , intltool, python }:
 let
   pname = "libsoup";
-  version = "2.60.2";
+  version = "2.62.0";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01";
+    sha256 = "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index fc7d352757d..ebe40c6192c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname   = "NetworkManager";
-  version = "1.10.2";
+  version = "1.10.6";
 in stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
+    sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index b924a02438f..73aaea06c91 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -3,13 +3,13 @@ networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
 
 let
   pname   = "NetworkManager-fortisslvpn";
-  version = "1.2.4";
+  version = "1.2.8";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
+    sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
   };
 
   buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]

From a0d9284ad609431b7be9d486d25a8f190bd0e6ca Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 02:53:21 +0100
Subject: [PATCH 1704/2266] gnome3.gnome-backgrounds: fix build

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index d30e7409b2f..c52fe5c6049 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }:
 
 stdenv.mkDerivation rec {
   name = "gnome-backgrounds-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; };
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext ];
 
   meta = with stdenv.lib; {
     platforms = platforms.unix;

From 8db273f33085329a32f76118db2945e0a9d887ff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 03:14:37 +0100
Subject: [PATCH 1705/2266] gnome3.geocode-glib: fix build

---
 .../gnome-3/core/geocode-glib/default.nix     | 30 ++++++++++++++-----
 .../geocode-glib/installed-tests-path.patch   |  8 +++++
 2 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch

diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index 40071970eec..910ef01fcb9 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -1,24 +1,38 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }:
+{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobjectIntrospection, gnome3, libsoup, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "geocode-glib-${version}";
   version = "3.25.4.1";
 
+  outputs = [ "out" "dev" "installedTests" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; };
-  };
+  nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ];
+  buildInputs = with gnome3; [ glib libsoup json-glib ];
 
-  buildInputs = with gnome3;
-    [ intltool pkgconfig glib libsoup json-glib ];
+  patches = [
+    ./installed-tests-path.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests"
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "geocode-glib";
+      attrPath = "gnome3.geocode-glib";
+    };
+  };
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    description = "A convenience library for the geocoding and reverse geocoding using Nominatim service";
+    license = licenses.lgpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
-
 }
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch
new file mode 100644
index 00000000000..499c6800808
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch
@@ -0,0 +1,8 @@
+--- a/geocode-glib/tests/meson.build
++++ b/geocode-glib/tests/meson.build
+@@ -1,4 +1,4 @@
+-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib'
++install_dir = '@installedTests@/libexec/installed-tests/geocode-glib'
+ 
+ e = executable('geo-uri',
+                'geo-uri.c',

From 65e147c2fbe85f8a773599783c1e1a7170952e96 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 03:25:13 +0100
Subject: [PATCH 1706/2266] gnome3.dconf: fix build

---
 pkgs/desktops/gnome-3/core/dconf/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 4c5d0c9637d..9b1adeb953d 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
+, libxml2, docbook_xsl, makeWrapper }:
 
 let
   pname = "dconf";
@@ -13,16 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
   };
 
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   outputs = [ "out" "lib" "dev" ];
 
-  nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ];
   buildInputs = [ glib dbus-glib ];
 
-  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace client/Makefile \
-      --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1"
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 94836664a65b66340291bff0a5e6a44fb592dc9c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 03:30:15 +0100
Subject: [PATCH 1707/2266] vala_0_40: init at 0.40.0

---
 pkgs/development/compilers/vala/default.nix | 7 +++++++
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 34d4932b7f2..83444b53f19 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -73,5 +73,12 @@ in rec {
     extraBuildInputs = [ graphviz ];
   };
 
+  vala_0_40 = generic {
+    major   = "0.40";
+    minor   = "0";
+    sha256  = "0wcfljl55a9qvslfcc4sf76wdpwgn83n96b7fgb7r49ib35qz20m";
+    extraBuildInputs = [ graphviz ];
+  };
+
   vala = vala_0_38;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7f11de15d9..a8ea973db07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6814,6 +6814,7 @@ with pkgs;
     vala_0_34
     vala_0_36
     vala_0_38
+    vala_0_40
     vala;
 
   valadoc = callPackage ../development/tools/valadoc { };

From 41db0371d418b43f8775a8938ab3ff1b5f0bfd52 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 18:50:04 +0100
Subject: [PATCH 1708/2266] gnome3.libhttpseverywhere: fix build

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 97ac52732b5..6af3f5225d4 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, valadoc
+{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf
 , gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }:
 
 let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0vcnimlfcscyvjbh845xbnjb9qc8x0mliaqz2gczxxpakxrbl3gh";
   };
 
-  nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ];
+  nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ];
   buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
 
   mesonFlags = [ "-Denable_valadoc=true" ];
@@ -21,6 +21,8 @@ in stdenv.mkDerivation rec {
 
   checkPhase = "(cd test && ./httpseverywhere_test)";
 
+  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
+
   outputs = [ "out" "devdoc" ];
 
   passthru = {

From 6ab58d728d2dcf860eb24cd0b28ec7978a796d99 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 20:01:23 +0100
Subject: [PATCH 1709/2266] gnome3.baobab: fix build

---
 pkgs/desktops/gnome-3/core/baobab/default.nix | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index ee2cb3720e8..693e284e270 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,34 +1,34 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib
-, bash, wrapGAppsHook, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
+{ stdenv, gettext, fetchurl, vala, desktop-file-utils
+, meson, ninja, pkgconfig, gtk3, glib, libxml2
+, wrapGAppsHook, itstool, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name = "baobab-${version}";
+let
+  pname = "baobab";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "baobab"; };
-  };
+  nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
+  buildInputs = [ gtk3 glib gnome3.defaultIconTheme ];
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2
-                  wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Baobab;
-    description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = gnome3.maintainers;
+    description = "Graphical application to analyse disk usage in any GNOME environment";
+    homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer;
     license = licenses.gpl2;
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 }

From b6af56babe513a9bec264bd018ebf020921c910d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 20:10:44 +0100
Subject: [PATCH 1710/2266] gnome3.dconf-editor: fix build

---
 .../gnome-3/core/dconf-editor/default.nix     | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 91350323f50..57c102d89cc 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -1,24 +1,33 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3
+, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }:
 
-stdenv.mkDerivation rec {
-  name = "dconf-editor-${version}";
+let
+  pname = "dconf-editor";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
   };
 
+  nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection ];
+
+  buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; };
+    updateScript = gnome3.updateScript {
+      packageName = "${pname}";
+      attrPath = "gnome3.${pname}";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme
-                  intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;

From 04a7df366cd7b2fdaa9bda0f070bbd3ac643ca77 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 22:37:13 +0100
Subject: [PATCH 1711/2266] =?UTF-8?q?modemmanager:=201.6.8=20=E2=86=92=201?=
 =?UTF-8?q?.7.990?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/modemmanager/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index f4631d39b01..064364e37ac 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, intltool, pkgconfig
+{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig
 , libmbim, libqmi, systemd }:
 
 stdenv.mkDerivation rec {
   name = "ModemManager-${version}";
-  version = "1.6.8";
+  version = "1.7.990";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
-    sha256 = "0xj3ng7qcqxkib5qkprwghcivaz0mn449fw08l67h1zbpz23bh7z";
+    sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
   };
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ gettext pkgconfig ];
 
   buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];
 
@@ -44,9 +44,11 @@ stdenv.mkDerivation rec {
       $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
+    homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
+    license = licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From af766c764ed598e1761008a1f075e2cb1b09f617 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 22:46:46 +0100
Subject: [PATCH 1712/2266] libsoup: fix build & clean up

---
 .../development/libraries/libsoup/default.nix | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 853219ba539..dad245d0791 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig, gnome3
-, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection
-, valaSupport ? true, vala_0_38
+{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3
+, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection
+, valaSupport ? true, vala_0_40
 , libintlOrEmpty
-, intltool, python }:
+, intltool, python3 }:
 let
   pname = "libsoup";
   version = "2.62.0";
@@ -22,27 +22,19 @@ stdenv.mkDerivation rec {
      substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
   '';
 
-  patches = [
-    # remove for >= 2.60.3
-    (fetchpatch {
-      name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037
-      url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba";
-      sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3";
-    })
-  ];
-
   outputs = [ "out" "dev" ];
 
-  buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
-    ++ stdenv.lib.optionals valaSupport [ vala_0_38 ];
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ];
+  buildInputs = libintlOrEmpty ++ [ python3 sqlite ];
+  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]
+    ++ stdenv.lib.optionals valaSupport [ vala_0_40 ];
+  propagatedBuildInputs = [ glib libxml2 ];
 
   # glib-networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check"
-    + " --enable-vala=${if valaSupport then "yes" else "no"}"
-    + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
+  configureFlags = [
+    "--disable-tls-check"
+    "--enable-vala=${if valaSupport then "yes" else "no"}"
+    "--with-gnome=${if gnomeSupport then "yes" else "no"}"
+  ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 

From 039b2923ebcc0591b8f7cb353325ac359377686a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 23:10:00 +0100
Subject: [PATCH 1713/2266] gnome3.eog: update dependencies

---
 pkgs/desktops/gnome-3/core/eog/default.nix | 40 ++++++++++++++--------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index ba25a24f587..50248586261 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -1,30 +1,42 @@
-{ fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3
+{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
+, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi
 , shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:
 
-stdenv.mkDerivation rec {
-  name = "eog-${version}";
+let
+  pname = "eog";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0d8fi5ydsh8n7d85dps8svl1bhid1p8jbnlwiqywj2gd2wpxpyjv";
   };
 
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];
+
+  buildInputs = [
+    libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
+    gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; };
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ];
-
-  buildInputs = with gnome3;
-    [ libxml2 libjpeg gtk glib libpeas librsvg
-      gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
-      gnome-desktop libexif dconf ];
-
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
-    platforms = platforms.linux;
     description = "GNOME image viewer";
+    homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.unix;
   };
 }

From 32b59d0961a4fdb770727480b8d34f4c976295d6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Mar 2018 23:46:11 +0100
Subject: [PATCH 1714/2266] gnome3.gnome-shell-extensions: fix build

---
 .../core/gnome-shell-extensions/default.nix       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index d3d87078d84..0d856e494c3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, gnome3, file }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${version}";
@@ -11,16 +10,18 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-shell-extensions";
+      attrPath = "gnome3.gnome-shell-extensions";
+    };
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib libgtop intltool itstool
-                  makeWrapper file ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
+  buildInputs = [ spidermonkey_52 ];
 
-  configureFlags = [ "--enable-extensions=all" ];
+  mesonFlags = [ "-Dextension_set=all" ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;

From a6cc7cc01c11d023e5d3bfa0075f365c9ed22684 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 00:48:27 +0100
Subject: [PATCH 1715/2266] gnome3.libgweather: fix build

---
 .../gnome-3/core/libgweather/default.nix      | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 1d38b75bcda..7c513e9398a 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -1,30 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup
+, gtk-doc, docbook_xsl, gobjectIntrospection, tzdata, geocode-glib, vala, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name = "libgweather-${version}";
+let
+  pname = "libgweather";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "libgweather"; attrPath = "gnome3.libgweather"; };
-  };
+  nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];
+  buildInputs = [ glib gtk libsoup libxml2 geocode-glib ];
 
-  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ];
-  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ];
-  nativeBuildInputs = [ pkgconfig intltool gnome3.vala ];
-
-  # Prevent building vapi into ${vala} derivation directory
-  prePatch = ''
-    substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
+  postPatch = ''
+    chmod +x meson/meson_post_install.py
+    patchShebangs meson/meson_post_install.py
   '';
 
+  mesonFlags = [
+    "-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
+    "-Denable_vala=true"
+    "-Dgtk_doc=true"
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    description = "A library to access weather information from online services for numerous locations";
+    homepage = https://wiki.gnome.org/Projects/LibGWeather;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }

From 74c5f0df9c8b5c0fe0c1f33dd628f24a02b77a62 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 00:51:54 +0100
Subject: [PATCH 1716/2266] gnome3.totem-pl-parser: fix build

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

diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index ef6bc97b1c6..457cee3b3f2 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "totem-pl-parser-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
   buildInputs = [ gmime libxml2 libsoup ];
 
   meta = with stdenv.lib; {

From 2df1eee63af33bfd0ee0daccca612c78ab37218c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 01:39:32 +0100
Subject: [PATCH 1717/2266] gnome3.file-roller: fix build

---
 .../gnome-3/apps/file-roller/default.nix      | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 4e55bc80f38..a9148fa52db 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }:
+{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
+, file, json-glib, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
@@ -10,21 +10,30 @@ stdenv.mkDerivation rec {
     sha256 = "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1";
   };
 
+  LANG = "en_US.UTF-8"; # postinstall.py
+
+  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook glibcLocales desktop-file-utils ];
+
+  buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
+
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+
+  postPatch = ''
+    chmod +x postinstall.py # patchShebangs requires executable file
+    patchShebangs postinstall.py
+  '';
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "file-roller"; attrPath = "gnome3.file-roller"; };
+    updateScript = gnome3.updateScript {
+      packageName = "file-roller";
+      attrPath = "gnome3.file-roller";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
-                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
-                  gnome3.dconf libnotify nautilus ];
-
-  installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/FileRoller;
     description = "Archive manager for the GNOME desktop environment";
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
   };

From cc8403ffdc0e54629f743b0f18f02acc24c7e6ad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 01:39:46 +0100
Subject: [PATCH 1718/2266] gnome3.gnome-boxes: fix build

---
 .../gnome-3/apps/gnome-boxes/default.nix      | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index b53da1c9427..054d42b45bb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -1,51 +1,48 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib
+{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, libvirt-glib
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk
 , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
 , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
 , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
-, libcap_ng, numactl, xen, libapparmor
+, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk
 }:
 
 # TODO: ovirt (optional)
 
-stdenv.mkDerivation rec {
-  name = "gnome-boxes-${version}";
+let
   version = "3.27.92";
+in stdenv.mkDerivation rec {
+  name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1v1br4zh2w3w70np5imi31md6lnqamabiin521f806rdrxsnyggq";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-boxes"; attrPath = "gnome3.gnome-boxes"; };
-  };
-
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   nativeBuildInputs = [
-    makeWrapper pkgconfig gettext
+    meson ninja vala pkgconfig gettext wrapGAppsHook gobjectIntrospection desktop-file-utils
   ];
 
   buildInputs = [
-    itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
-    libvirt spice-gtk spice-protocol libsoup libosinfo systemd
-    tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive
-    gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret
+    libvirt-glib glib gtk3 gtkvnc libxml2
+    libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
+    tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
+    gnome3.defaultIconTheme librsvg acl libgudev libsecret
     libcap_ng numactl xen libapparmor
   ];
 
   preFixup = ''
-    for prog in "$out/bin/"*; do
-        wrapProgram "$prog" \
-            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-            --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"
-    done
+    gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}")
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-boxes";
+      attrPath = "gnome3.gnome-boxes";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Simple GNOME 3 application to access remote or virtual systems";
     homepage = https://wiki.gnome.org/action/show/Apps/Boxes;

From e9d597e0dfcc9f2cfa9dffc654902cf89770de30 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 01:41:23 +0100
Subject: [PATCH 1719/2266] gnome3.four-in-a-row: fix build

---
 .../gnome-3/games/four-in-a-row/default.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 5eb7aa60ce6..bf21f734680 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }:
+, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "four-in-a-row-${version}";
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "four-in-a-row"; attrPath = "gnome3.four-in-a-row"; };
-  };
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
+  buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg
-    libxml2 gnome3.defaultIconTheme
-  ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "four-in-a-row";
+      attrPath = "gnome3.four-in-a-row";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Four-in-a-row;

From 820891f6b074c99caaff273abbb45f7fc9c2eca9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 01:47:20 +0100
Subject: [PATCH 1720/2266] gnome3.gnome-characters: fix build

---
 .../gnome-3/apps/gnome-characters/default.nix         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 4beed67ee34..8a5da33bd36 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, gtk3, wrapGAppsHook
+, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
@@ -11,10 +11,13 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-characters"; attrPath = "gnome3.gnome-characters"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-characters";
+      attrPath = "gnome3.gnome-characters";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
   buildInputs = [
     gtk3 gjs gdk_pixbuf gobjectIntrospection
     librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme

From 3359dc7f9cd32d7e6b864d2f619165fbf96a64d8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 02:02:59 +0100
Subject: [PATCH 1721/2266] gnome3.gnome-chess: fix build

---
 .../gnome-3/games/gnome-chess/default.nix     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 0ea34447b92..063b97801b4 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2 }:
+{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection
+, gettext, itstool, libxml2, gnome3, glib, gtk3, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "gnome-chess-${version}";
@@ -10,15 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "1vxgb36njv4v3bgdpwxd89rvr6s6pkbh9d3xislxqry2yp4f03w0";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-chess"; attrPath = "gnome3.gnome-chess"; };
-  };
+  nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ];
+  buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    gnome3.defaultIconTheme
-  ];
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-chess";
+      attrPath = "gnome3.gnome-chess";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Chess;

From 443a6c21a3de692b5e55fdad13d8003a9169f0d6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 03:46:24 +0100
Subject: [PATCH 1722/2266] glib-networking: fix build

---
 .../libraries/glib-networking/default.nix     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 1767e0f7bf4..2e0e8cbb910 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy, gnome3
+{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3
 , gsettings-desktop-schemas }:
 
 let
@@ -15,19 +15,23 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
 
-  configureFlags = if stdenv.isDarwin then "--without-ca-certificates"
-    else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
+  patches = [
+    # Use GNUTLS system trust for certificates
+    (fetchpatch {
+      url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df;
+      sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
+    })
+  ];
 
-  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
 
-  preBuild = ''
-    sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
   '';
 
-  nativeBuildInputs = [ pkgconfig intltool ];
-  propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ];
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+  nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+  propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
 
   doCheck = false; # tests need to access the certificates (among other things)
 

From 960d599f530794737b689f7406a66f6bce84700e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 04:22:19 +0100
Subject: [PATCH 1723/2266] gnome3.gnome-color-manager: fix build

---
 .../desktops/gnome-3/core/gnome-color-manager/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index 2f6e7a65bff..9fcbbe814dc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -14,14 +14,6 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
   buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ];
 
-  patches = [
-    # https://bugzilla.gnome.org/show_bug.cgi?id=791158
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=364865;
-      sha256 = "1zh1aql6rwzfhy2xbdw0jqgzrl9l6wf0jcbdkjd67ykbmynh2cmv";
-    })
-  ];
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 08113f7ce7ea660c5cac1a0d09947faa5977acf4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 04:38:58 +0100
Subject: [PATCH 1724/2266] gtksourceview: move out of gnome3

---
 pkgs/desktops/gnome-3/default.nix                   |  4 +---
 .../gtksourceview/3.x-nix_share_path.patch}         |  0
 .../libraries/gtksourceview/3.x.nix}                | 13 ++++++++-----
 pkgs/top-level/all-packages.nix                     |  4 ++++
 4 files changed, 13 insertions(+), 8 deletions(-)
 rename pkgs/{desktops/gnome-3/core/gtksourceview/nix_share_path.patch => development/libraries/gtksourceview/3.x-nix_share_path.patch} (100%)
 rename pkgs/{desktops/gnome-3/core/gtksourceview/default.nix => development/libraries/gtksourceview/3.x.nix} (89%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 047d07aaae2..03a2f91c1fa 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -53,7 +53,7 @@ let
   ];
 
   inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
-    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf
+    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview
     easytag meld orca rhythmbox shotwell
     clutter clutter-gst clutter-gtk cogl gtkvnc;
 
@@ -174,8 +174,6 @@ let
 
   gsound = callPackage ./core/gsound { };
 
-  gtksourceview = callPackage ./core/gtksourceview { };
-
   gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
 
   gucharmap = callPackage ./core/gucharmap { };
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch b/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch
rename to pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
similarity index 89%
rename from pkgs/desktops/gnome-3/core/gtksourceview/default.nix
rename to pkgs/development/libraries/gtksourceview/3.x.nix
index a870b16f925..fd774039070 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -12,10 +12,6 @@ in stdenv.mkDerivation rec {
     sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; };
-  };
-
   propagatedBuildInputs = [
     # Required by gtksourceview-3.0.pc
     gtk3
@@ -34,7 +30,7 @@ in stdenv.mkDerivation rec {
     substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
   '';
 
-  patches = [ ./nix_share_path.patch ];
+  patches = [ ./3.x-nix_share_path.patch ];
 
   enableParallelBuilding = true;
 
@@ -46,6 +42,13 @@ in stdenv.mkDerivation rec {
       make check
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gtksourceview";
+      attrPath = "gnome3.gtksourceview";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GtkSourceView;
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8ea973db07..1ed1b750c91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9230,6 +9230,10 @@ with pkgs;
 
   gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
 
+  gtksourceview = gtksourceview3;
+
+  gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { };
+
   gtkspell2 = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };

From 1f1393129a4f4b5f3262a8d66ff3dbd1416e96a6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 04:47:27 +0100
Subject: [PATCH 1725/2266] gtksourceview3: add vala dependency

Needed by gnome-calculator.
---
 pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index fd774039070..608c6e7eacd 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
 , libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
 
 let
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ]
+  nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ]
     ++ stdenv.lib.optionals doCheck checkInputs;
 
   buildInputs = [ atk cairo glib pango libxml2 ];

From a9dbcdb6269a68fdce7b229f9ce98f8b241cd60b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 04:48:34 +0100
Subject: [PATCH 1726/2266] gtksourceview4: init at 4.0.0

---
 pkgs/desktops/gnome-3/default.nix             |  2 +-
 .../gtksourceview/4.x-nix_share_path.patch    | 11 ++++
 .../libraries/gtksourceview/4.x.nix           | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
 create mode 100644 pkgs/development/libraries/gtksourceview/4.x.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 03a2f91c1fa..5fe7f25b61e 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -53,7 +53,7 @@ let
   ];
 
   inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
-    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview
+    libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell
     clutter clutter-gst clutter-gtk cogl gtkvnc;
 
diff --git a/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
new file mode 100644
index 00000000000..a35d9a88d0d
--- /dev/null
+++ b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
@@ -0,0 +1,11 @@
+--- a/gtksourceview/gtksourceutils.c
++++ b/gtksourceview/gtksourceutils.c
+@@ -232,6 +232,8 @@
+ 							 NULL));
+ 	}
+ 
++	g_ptr_array_add (dirs, g_build_filename (DATADIR, GSV_DATA_SUBDIR, basename, NULL));
++
+ 	g_ptr_array_add (dirs, NULL);
+ 
+ 	return (gchar **) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
new file mode 100644
index 00000000000..2501e0253b3
--- /dev/null
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
+, libxml2, perl, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
+
+let
+  checkInputs = [ xvfb_run dbus ];
+in stdenv.mkDerivation rec {
+  name = "gtksourceview-${version}";
+  version = "4.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
+  };
+
+  propagatedBuildInputs = [
+    # Required by gtksourceview-4.0.pc
+    gtk3
+    # Used by gtk_source_language_manager_guess_language
+    shared-mime-info
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ pkgconfig gettext perl gobjectIntrospection vala_0_40 ]
+    ++ stdenv.lib.optionals doCheck checkInputs;
+
+  buildInputs = [ atk cairo glib pango libxml2 ];
+
+  patches = [ ./4.x-nix_share_path.patch ];
+
+  enableParallelBuilding = true;
+
+  doCheck = stdenv.isLinux;
+  checkPhase = ''
+    export NO_AT_BRIDGE=1
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      make check
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gtksourceview";
+      attrPath = "gnome3.gtksourceview";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GtkSourceView;
+    platforms = with platforms; linux ++ darwin;
+    license = licenses.lgpl21;
+    maintainers = gnome3.maintainers;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ed1b750c91..850b09631f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9234,6 +9234,8 @@ with pkgs;
 
   gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { };
 
+  gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { };
+
   gtkspell2 = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };

From d345dd963ebf6b273eb7e03a7cee121fb18a1217 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 05:53:49 +0100
Subject: [PATCH 1727/2266] gnome3.gnome-settings-daemon: fix build

---
 .../core/gnome-settings-daemon/default.nix    | 53 +++++++++++++------
 .../gnome-settings-daemon/fix-paths.patch     | 15 ++++++
 2 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index fdbf8c5277f..99b66fc1fe7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
-, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }:
+{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
+, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
+, docbook_xsl, wrapGAppsHook, ibus, xkeyboard_config, tzdata, nss }:
 
 stdenv.mkDerivation rec {
   name = "gnome-settings-daemon-${version}";
@@ -12,27 +12,46 @@ stdenv.mkDerivation rec {
     sha256 = "1p3ccf4a4qbz73hqyx9i55hkp6l7c7la5kazqawcndl7bksywgny";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-settings-daemon"; attrPath = "gnome3.gnome-settings-daemon"; };
-  };
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit tzdata;
+    })
+  ];
 
   # fatal error: gio/gunixfdlist.h: No such file or directory
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
-  buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager
-      libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio
-      libcanberra-gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
-      libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ];
+  nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook ];
+
+  buildInputs = with gnome3; [
+    ibus gtk glib gsettings-desktop-schemas networkmanager
+    libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
+    libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
+    polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
+  ];
+
+  mesonFlags = [
+    "-Dudev_dir=${placeholder "out"}/lib/udev"
+  ];
 
   postPatch = ''
-    substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab
+    for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do
+      chmod +x $f
+      patchShebangs $f
+    done
   '';
 
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-settings-daemon";
+      attrPath = "gnome3.gnome-settings-daemon";
+    };
   };
 
+  meta = with stdenv.lib; {
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
new file mode 100644
index 00000000000..2229302cab7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
@@ -0,0 +1,15 @@
+--- a/plugins/datetime/tz.h
++++ b/plugins/datetime/tz.h
+@@ -27,11 +27,7 @@
+ 
+ #include <glib.h>
+ 
+-#ifndef __sun
+-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
+-#else
+-#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+-#endif
++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
+ 
+ typedef struct _TzDB TzDB;
+ typedef struct _TzLocation TzLocation;

From de8d21a1721acd25c1c94a3df5bdae4a55b862c9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 01:40:07 +0100
Subject: [PATCH 1728/2266] gnome3.gnome-calculator: fix build

---
 .../gnome-3/apps/gnome-calendar/default.nix   | 19 +++++----
 .../gnome-3/core/gnome-calculator/default.nix | 42 ++++++++++++-------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index f1f12f9c8f2..35888b21c2e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,25 +1,28 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib
 , gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
 , glib, gnome-online-accounts, gsettings-desktop-schemas }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-calendar-${version}";
+let
+  pname = "gnome-calendar";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs";
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; };
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
   };
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
   nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
   buildInputs = [
-    gtk evolution-data-server libsoup glib gnome-online-accounts
+    gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
     gsettings-desktop-schemas gnome3.defaultIconTheme
   ];
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index f4f00020a4d..f30243003cb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
+{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
+, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection
+, gnome3, mpfr, gmp, libsoup, libmpc }:
 
 stdenv.mkDerivation rec {
   name = "gnome-calculator-${version}";
@@ -11,23 +11,33 @@ stdenv.mkDerivation rec {
     sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn";
   };
 
+  nativeBuildInputs = [
+    meson ninja pkgconfig vala gettext itstool wrapGAppsHook
+    gobjectIntrospection # for finding vapi files
+  ];
+
+  buildInputs = [
+    gtk3 glib libxml2 gtksourceview3 mpfr gmp
+    gnome3.defaultIconTheme
+    gnome3.gsettings-desktop-schemas libsoup libmpc
+  ];
+
+  doCheck = true;
+
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-calculator";
+      attrPath = "gnome3.gnome-calculator";
+    };
   };
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ bash gtk3 glib intltool itstool
-                  libxml2 gnome3.gtksourceview mpfr gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ];
-
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
+    homepage = https://wiki.gnome.org/Apps/Calculator;
     description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
     maintainers = gnome3.maintainers;
     license = licenses.gpl3;

From a0d41635ee4c46031c857f6b61f4b3f80261a8fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:11:34 +0100
Subject: [PATCH 1729/2266] gnome3.gnome-mines: fix build

---
 .../gnome-3/games/gnome-mines/default.nix     | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 920828a20e6..55dad369c10 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, libgames-support, libgee }:
+{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, gettext, itstool, libxml2, libgames-support, libgee }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${version}";
@@ -10,15 +10,21 @@ stdenv.mkDerivation rec {
     sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-mines"; attrPath = "gnome3.gnome-mines"; };
-  };
+  # gobjectIntrospection for finding vapi files
+  nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ];
+  buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme libgames-support libgee
-  ];
+  postPatch = ''
+    chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
+    patchShebangs data/meson_compile_gschema.py
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-mines";
+      attrPath = "gnome3.gnome-mines";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Mines;

From 31293136fa963e78d0f05cf6dc1ff6cfa4df276f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:15:34 +0100
Subject: [PATCH 1730/2266] gnome3.gnome-clocks: fix build

---
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 0758c09ff54..09c00677199 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
-, vala,  gtk3, glib, gsound
+, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound
 , gnome3, gdk_pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
@@ -13,21 +13,23 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-clocks"; attrPath = "gnome3.gnome-clocks"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-clocks";
+      attrPath = "gnome3.gnome-clocks";
+    };
   };
 
   doCheck = true;
 
   nativeBuildInputs = [
-    vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils
+    vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2
+    gobjectIntrospection # for finding vapi files
   ];
   buildInputs = [
     gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
     gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
   ];
 
-  prePatch = "patchShebangs build-aux/";
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Clocks;
     description = "Clock application designed for GNOME 3";

From f1b19d3a20c5273f3f1b862dae21557b32c71034 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:21:32 +0100
Subject: [PATCH 1731/2266] gnome3.webkitgtk: fix build

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

diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix
index 9dec5a4c953..f1cefa451f0 100644
--- a/pkgs/development/libraries/webkitgtk/2.18.nix
+++ b/pkgs/development/libraries/webkitgtk/2.18.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
+, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
 , gtk3, wayland, libwebp, enchant, xorg, libxkbcommon, epoxy, at-spi2-core
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
 , libidn, libedit, readline, libGLU_combined, libintlOrEmpty
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = libintlOrEmpty ++ [
-    libwebp enchant libnotify gnutls pcre nettle libidn
+    libwebp enchant libnotify gnutls pcre nettle libidn libgcrypt
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
     sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
   ] ++ optional enableGeoLocation geoclue2

From fabaf3b007eb178afd87a386f4dbb84e37ccd535 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:26:39 +0100
Subject: [PATCH 1732/2266] gnome3.gnome-documents: fix build

---
 .../gnome-3/apps/gnome-documents/default.nix  | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 899c1334fc8..3bd3222dc0c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, gettext, fetchurl, evince, gjs
+{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
 , pkgconfig, gtk3, glib, tracker, tracker-miners
-, itstool, libxslt, webkitgtk
+, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts
+, gnome-desktop, libzapojit, libgepub
 , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
 , gobjectIntrospection, json-glib, inkscape, poppler_utils
 , gmp, desktop-file-utils, wrapGAppsHook }:
@@ -14,30 +15,38 @@ stdenv.mkDerivation rec {
     sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-documents"; attrPath = "gnome3.gnome-documents"; };
-  };
-
   doCheck = true;
 
-  configureFlags = [ "--enable-getting-started" ];
+  mesonFlags = [ "-Dgetting-started=true" ];
 
-  nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ];
-  buildInputs = [ gtk3 glib inkscape poppler_utils
-                  gnome3.gsettings-desktop-schemas gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg evince
-                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-                  tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts
-                  gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook
+    inkscape poppler_utils # building getting started
+  ];
+  buildInputs = [
+    gtk3 glib gnome3.gsettings-desktop-schemas
+    gdk_pixbuf gnome3.defaultIconTheme evince
+    libsoup webkitgtk gjs gobjectIntrospection
+    tracker tracker-miners libgdata
+    gnome-desktop libzapojit libgepub
+  ];
 
-  enableParallelBuilding = true;
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
 
   preFixup = ''
     substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
-
-    gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-documents";
+      attrPath = "gnome3.gnome-documents";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Documents;
     description = "Document manager application designed to work with GNOME 3";

From 6f69e3c987105f0d685abd44abd1e9da145a4f2f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:51:55 +0100
Subject: [PATCH 1733/2266] gnome3.gnome-keyring: fix build

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 5d644e2b9db..20ff00ff218 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook
+, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook
 , docbook_xsl, docbook_xml_dtd_42, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   buildInputs = with gnome3; [
-    dbus libgcrypt pam gtk3 libgnome-keyring
+    dbus libgcrypt pam gtk3 libgnome-keyring openssh
     pango gcr gdk_pixbuf atk p11-kit
   ];
 
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
     patchShebangs build
   '';
 
-  # Tests are not deterministic https://bugzilla.gnome.org/show_bug.cgi?id=791932
-  doCheck = false;
+  doCheck = true;
   checkPhase = ''
     export HOME=$(mktemp -d)
     dbus-run-session \

From a5bc51fa2a382acbd8fb873530d84ff6e62ce024 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:57:12 +0100
Subject: [PATCH 1734/2266] atk: port to meson

---
 pkgs/development/libraries/atk/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 9b1865d77f5..6f10c9c2f5a 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }:
 
 let
   pname = "atk";
@@ -12,19 +12,27 @@ stdenv.mkDerivation rec {
     sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
   };
 
-  enableParallelBuilding = true;
+  patches = [
+    # darwin linker arguments https://bugzilla.gnome.org/show_bug.cgi?id=794326
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=369680;
+      sha256 = "11v8fhpsbapa04ifb2268cga398vfk1nq8i628441632zjz1diwg";
+    })
+  ];
 
   outputs = [ "out" "dev" ];
 
   buildInputs = libintlOrEmpty;
 
-  nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
 
   propagatedBuildInputs = [
     # Required by atk.pc
     glib
   ];
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   doCheck = true;
 
   passthru = {

From e4597b3af0a4038ccf0349894a5f525786ae2cb0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 06:59:13 +0100
Subject: [PATCH 1735/2266] gnome3: switch to Vala 0.40

---
 pkgs/desktops/gnome-3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5fe7f25b61e..9d4b9726bd2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -64,7 +64,7 @@ let
   gnome3 = self // { recurseForDerivations = false; };
   gtk = gtk3;
   gtkmm = gtkmm3;
-  vala = pkgs.vala_0_38;
+  vala = pkgs.vala_0_40;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
 
 # Simplify the nixos module and gnome packages

From 288ce670b1ed316e9d87424212bf203ab72d65ca Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 07:07:42 +0100
Subject: [PATCH 1736/2266] gnome3.mutter: fix build

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 0e49d076123..623d2b1251e 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -29,15 +29,6 @@ stdenv.mkDerivation rec {
     "--with-xwayland-path=${xwayland}/bin/Xwayland"
   ];
 
-  patches = [
-    # Pipewire 0.1.8 compatibility
-    (fetchurl {
-      name = "mutter-pipewire-0.1.8-compat.patch";
-      url = https://bugzilla.gnome.org/attachment.cgi?id=367356;
-      sha256 = "10bx5zf11wwhhy686w11ggikk56pbxydpbk9fbd947ir385x92cz";
-    })
-  ];
-
   propagatedBuildInputs = [
     # required for pkgconfig to detect mutter-clutter
     libXtst

From 9e5fa0abedb7616dbaf954671eb1cb5242ec36fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 13:51:29 +0100
Subject: [PATCH 1737/2266] valadoc: fix build

---
 pkgs/development/tools/valadoc/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 3fd92dfeba4..2e2fc1ad927 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,12 +1,11 @@
-{stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}:
+{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}:
 stdenv.mkDerivation rec {
-  version = "2016-11-11";
-  name = "valadoc-unstable-${version}";
+  version = "0.36.1";
+  name = "valadoc-${version}";
 
-  src = fetchgit {
-    url = "git://git.gnome.org/valadoc";
-    rev = "8080b626db9c16ac9a0a9802677b4f6ab0d36d4e";
-    sha256 = "1y00yls4wgxggzfagm3hcmzkpskfbs3m52pjgl71lg4p85kv6msv";
+  src = fetchurl {
+    url = "mirror://gnome/sources/valadoc/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv";
   };
 
   nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ];
@@ -14,6 +13,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "valadoc";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "valadoc is a documentation generator for generating API documentation from Vala source code";
     homepage = http://valadoc.org;

From d0bf496f7f61c79b042476800076d8c2146a54b2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 14:08:21 +0100
Subject: [PATCH 1738/2266] gnome3.vala: fix darwin build

---
 pkgs/development/compilers/vala/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 83444b53f19..6a020e11a4b 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -77,6 +77,7 @@ in rec {
     major   = "0.40";
     minor   = "0";
     sha256  = "0wcfljl55a9qvslfcc4sf76wdpwgn83n96b7fgb7r49ib35qz20m";
+    extraNativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ expat ];
     extraBuildInputs = [ graphviz ];
   };
 

From f5bfbb377cbd2dda1452cece813e3027e321ef3e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 14:14:11 +0100
Subject: [PATCH 1739/2266] gnome3.gnome-characters: fix build

---
 .../gnome-3/apps/gnome-characters/default.nix         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 8a5da33bd36..8e1b0f33f75 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, gtk3, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
 , gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
-  buildInputs = [
-    gtk3 gjs gdk_pixbuf gobjectIntrospection
-    librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
+  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ];
+  buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+
+  mesonFlags = [
+    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
   ];
 
   meta = with stdenv.lib; {

From fead86590d330d822b01c37dec7a5a11ed6b0b4d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 14:39:43 +0100
Subject: [PATCH 1740/2266] gnome3.gnome-system-monitor: fix build

---
 .../core/gnome-system-monitor/default.nix     | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 28568a35136..5f707152aed 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
+{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
 , bash, gtk3, glib, wrapGAppsHook
 , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
 
@@ -11,33 +11,31 @@ stdenv.mkDerivation rec {
     sha256 = "1wvgx5p0a29d8yzp7rinpln90pg8vsjagqlvm4cxyhnl5hsdvrvn";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-system-monitor"; attrPath = "gnome3.gnome-system-monitor"; };
-  };
-
   doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bash gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop wrapGAppsHook
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings-desktop-schemas systemd ];
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share"
-    )
-  '';
+  nativeBuildInputs = [
+    pkgconfig gettext itstool wrapGAppsHook
+    polkit # for ITS file
+  ];
+  buildInputs = [
+    bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg
+    gnome3.gsettings-desktop-schemas systemd
+  ];
 
   # fails to build without --enable-static
   configureFlags = ["--enable-systemd" "--enable-static"];
 
   enableParallelBuilding = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-system-monitor";
+      attrPath = "gnome3.gnome-system-monitor";
+    };
+  };
+
   meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
+    homepage = https://wiki.gnome.org/Apps/SystemMonitor;
     description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;

From 4f338f0eee21d5ea6317220f3337cbc8634dec71 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 14:56:19 +0100
Subject: [PATCH 1741/2266] enchant2: init at 2.2.3

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

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
new file mode 100644
index 00000000000..458b23c33e9
--- /dev/null
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
+
+let
+  version = "2.2.3";
+  pname = "enchant";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" ];
+
+  src = fetchurl {
+    url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib hunspell ];
+  propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
+
+  meta = with stdenv.lib; {
+    description = "Generic spell checking library";
+    homepage = https://abiword.github.io/enchant/;
+    license = licenses.lgpl21Plus; # with extra provision for non-free checkers
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 850b09631f1..21c9ccc6ad3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8670,6 +8670,8 @@ with pkgs;
 
   enchant = callPackage ../development/libraries/enchant { };
 
+  enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
+
   enet = callPackage ../development/libraries/enet { };
 
   epoxy = callPackage ../development/libraries/epoxy {};

From 3d2db221f71194c37e04e88aa07f6da570f12f25 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 14:58:39 +0100
Subject: [PATCH 1742/2266] gnome3.gspell: fix build

---
 pkgs/desktops/gnome-3/misc/gspell/default.nix | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix
index cc2a319d589..ca1fc3724fc 100644
--- a/pkgs/desktops/gnome-3/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name = "gspell-${version}";
+let
+  pname = "gspell";
   version = "1.8.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" ];
+  outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gspell/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gspell"; attrPath = "gnome3.gspell"; };
-  };
+  propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
 
-  propagatedBuildInputs = [ enchant ]; # required for pkgconfig
-
-  nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ];
   buildInputs = [ glib gtk3 isocodes ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "A spell-checking library for GTK+ applications";
     homepage = https://wiki.gnome.org/Projects/gspell;

From 6e2443f2822bc6d363f42b83ea420d69fee59a30 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 15:12:08 +0100
Subject: [PATCH 1743/2266] gnome-themes-extra: rename from
 gnome-themes-standard

---
 .../core/gnome-themes-extra/default.nix       | 28 +++++++++++++++++++
 .../core/gnome-themes-standard/default.nix    | 25 -----------------
 pkgs/desktops/gnome-3/default.nix             |  5 ++--
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
new file mode 100644
index 00000000000..2388825d6cf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
+, gdk_pixbuf }:
+
+let
+  pname = "gnome-themes-extra";
+  version = "3.27.90";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "1p1ibm0f2py0lrxrw8wv1jvs630mmz9q97f404jyzr4a8nswrizz";
+  };
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
deleted file mode 100644
index c56a768db68..00000000000
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-themes-standard-${version}";
-  version = "3.27.90";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1p1ibm0f2py0lrxrw8wv1jvs630mmz9q97f404jyzr4a8nswrizz";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; };
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf
-                  gnome3.defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 9d4b9726bd2..c2495d40df1 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -29,7 +29,7 @@ let
     gtk3.out # for gtk-update-icon-cache
     glib-networking gvfs dconf gnome-backgrounds gnome-control-center
     gnome-menus gnome-settings-daemon gnome-shell
-    gnome-themes-standard defaultIconTheme gnome-shell-extensions
+    gnome-themes-extra defaultIconTheme gnome-shell-extensions
     pkgs.hicolor-icon-theme
   ];
 
@@ -160,7 +160,7 @@ let
 
   gnome-terminal = callPackage ./core/gnome-terminal { };
 
-  gnome-themes-standard = callPackage ./core/gnome-themes-standard { };
+  gnome-themes-extra = callPackage ./core/gnome-themes-extra { };
 
   gnome-user-docs = callPackage ./core/gnome-user-docs { };
 
@@ -424,6 +424,7 @@ let
   gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25
   gnome_shell = gnome-shell; # added 2018-02-25
   gnome_terminal = gnome-terminal; # added 2018-02-25
+  gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 07627daad5c..4e91dee6a40 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -76,6 +76,7 @@ mapAliases (rec {
   go-pup = pup; # added 2017-12-19
   googleAuthenticator = google-authenticator; # added 2016-10-16
   gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
+  gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21c9ccc6ad3..35697cda921 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19476,7 +19476,7 @@ with pkgs;
 
   gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
 
-  gnome-themes-standard = gnome3.gnome-themes-standard;
+  gnome-themes-extra = gnome3.gnome-themes-extra;
 
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 

From e3e86ebe808606f94491f53209e56015a5ee01d3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 15:13:28 +0100
Subject: [PATCH 1744/2266] =?UTF-8?q?gnome-themes-extra:=203.27.90=20?=
 =?UTF-8?q?=E2=86=92=203.27.92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index 2388825d6cf..dd11da3b11e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "gnome-themes-extra";
-  version = "3.27.90";
+  version = "3.27.92";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1p1ibm0f2py0lrxrw8wv1jvs630mmz9q97f404jyzr4a8nswrizz";
+    sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm";
   };
 
   passthru = {

From e65863953fed83cb6c0cdad480055994f3b5cc5f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 15:58:29 +0100
Subject: [PATCH 1745/2266] gnome3.libgnome-games-support: rename from
 gnome3.libgames-support

---
 pkgs/desktops/gnome-3/default.nix                              | 3 ++-
 .../{libgames-support => libgnome-games-support}/default.nix   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/desktops/gnome-3/misc/{libgames-support => libgnome-games-support}/default.nix (95%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index c2495d40df1..5108b23be2d 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -384,7 +384,7 @@ let
 
   gspell = callPackage ./misc/gspell { };
 
-  libgames-support = callPackage ./misc/libgames-support { };
+  libgnome-games-support = callPackage ./misc/libgnome-games-support { };
 
   libgda = callPackage ./misc/libgda { };
 
@@ -428,6 +428,7 @@ let
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
+  libgames-support = libgnome-games-support; # added 2018-03-14
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
   networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
similarity index 95%
rename from pkgs/desktops/gnome-3/misc/libgames-support/default.nix
rename to pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index b19cb0775f1..dacdbda2cff 100644
--- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "gnome3.libgames-support";
+      attrPath = "gnome3.${pname}";
     };
   };
 

From 5f587481167641d689cdf4c6633c2421a342a96e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 16:01:18 +0100
Subject: [PATCH 1746/2266] gnome3.libgnome-games-support: fix darwin build

---
 .../gnome-3/misc/libgnome-games-support/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index dacdbda2cff..5712d612e9a 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }:
 
 let
   pname = "libgnome-games-support";
@@ -11,9 +11,11 @@ in stdenv.mkDerivation rec {
     sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;
   buildInputs = [ glib gtk3 libgee ];
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 08c023ce6198c71a7b631faf90bd323200c462af Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 21:15:31 +0100
Subject: [PATCH 1747/2266] =?UTF-8?q?appstream-glib:=200.7.6=20=E2=86=92?=
 =?UTF-8?q?=200.7.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update & fix build – installed tests in $out output mentioned binaries
from $dev output.
---
 pkgs/development/libraries/appstream-glib/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 1ccfa85591f..2499a424c85 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,16 +4,16 @@
 , libuuid, json-glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.6";
+  name = "appstream-glib-0.7.7";
 
-  outputs = [ "out" "dev" "man" ];
+  outputs = [ "out" "dev" "man" "installedTests" ];
   outputBin = "dev";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "1nzm6w9n7fb2m06w88gwszaqf74bnip87ay0ca59wajq6y4mpfgv";
+    sha256 = "127m5ds355i1vfvmn9nd4zqqnqm16jpqcn4p2p2pvn7i4wqxra40";
   };
 
   nativeBuildInputs = [
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     "-Ddep11=false"
   ];
 
+  postInstall = ''
+    moveToOutput "share/installed-tests" "$installedTests"
+  '';
+
   meta = with stdenv.lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
     homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;

From 6c66e9dd3c8517f168b51b6edda95debf9fb6221 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 14 Mar 2018 21:53:34 +0100
Subject: [PATCH 1748/2266] gnome3.gnome-weather: fix build

---
 .../gnome-3/apps/gnome-weather/default.nix    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 9e43a3c52b4..ad759bf5506 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool, geoclue2 }:
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobjectIntrospection
+, libgweather, intltool, itstool, geoclue2, gnome-desktop }:
 
 stdenv.mkDerivation rec {
   name = "gnome-weather-${version}";
@@ -10,13 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-weather"; attrPath = "gnome3.gnome-weather"; };
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
   buildInputs = [
-    gtk3 wrapGAppsHook gjs intltool itstool
+    gtk3 gjs gobjectIntrospection gnome-desktop
     libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
   ];
 
@@ -30,6 +26,13 @@ stdenv.mkDerivation rec {
                   "Exec=$out/bin/gnome-weather"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-weather";
+      attrPath = "gnome3.gnome-weather";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Weather;
     description = "Access current weather conditions and forecasts";

From 174a82141cdc9c41117e5f74c1783314326cc02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 14 Mar 2018 21:48:56 +0100
Subject: [PATCH 1749/2266] gvfs: fix build

---
 pkgs/development/libraries/gvfs/default.nix | 38 +++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index e2e961cd1bc..e6f1ba8df56 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libtool, gnome3
-, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit
-, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma
+{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3
+, glib, libgudev, udisks2, libgcrypt, libcap, polkit
+, libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
-, gnomeSupport ? false, gnome, makeWrapper }:
+, gnomeSupport ? false, gnome, makeWrapper
+, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
+}:
 
 let
   pname = "gvfs";
@@ -16,22 +18,38 @@ stdenv.mkDerivation rec {
     sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy";
   };
 
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
   nativeBuildInputs = [
-    pkgconfig intltool libtool file makeWrapper
+    meson ninja
+    pkgconfig gettext makeWrapper
     libxml2 libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
   buildInputs =
-    [ glib dbus udev libgudev udisks2 libgcrypt
-      libgphoto2 avahi libarchive fuse libcdio lzma bzip2
-      samba libmtp libcap polkit
+    [ glib libgudev udisks2 libgcrypt
+      libgphoto2 avahi libarchive fuse libcdio
+      samba libmtp libcap polkit libimobiledevice libbluray
+      libcdio-paranoia libnfs openssh
       # ToDo: a ligther version of libsoup to have FTP/HTTP support?
     ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
-      libsoup libgnome-keyring gconf gcr
+      libsoup gcr
+      gnome-online-accounts
       # ToDo: not working and probably useless until gnome3 from x-updates
     ]);
 
-  configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
+  mesonFlags = [
+    "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
+    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+    "-Dtmpfilesdir=no"
+  ] ++ stdenv.lib.optionals (!gnomeSupport) [
+    "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+    "-Dgoogle=false"
+  ];
 
   enableParallelBuilding = true;
 

From 2c894fb1475e56f4cad50a0292f5e4c712762200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 14 Mar 2018 19:37:33 +0100
Subject: [PATCH 1750/2266] gnome3.gnome-characters: fix build

---
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 8e1b0f33f75..7ca25848374 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
-, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:
+, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }:
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0";
   };
 
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gnome-characters";
@@ -18,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ];
-  buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+  buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
 
   mesonFlags = [
     "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"

From 389837b139c3bc5948256a2d3d5bec23796f35f4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 00:42:01 +0100
Subject: [PATCH 1751/2266] gnome3.gucharmap: clean up

---
 pkgs/desktops/gnome-3/core/gucharmap/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index e30676e3c7c..45a4a97205b 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme
 , glib, desktop-file-utils, bash, appdata-tools
 , wrapGAppsHook, gnome3, itstool, libxml2
 , callPackage, unzip, gobjectIntrospection }:
 
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme
-
 stdenv.mkDerivation rec {
   name = "gucharmap-${version}";
   version = "10.0.4";
@@ -21,8 +18,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";
 
   nativeBuildInputs = [
@@ -30,7 +25,7 @@ stdenv.mkDerivation rec {
     gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection
   ];
 
-  buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ];
+  buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ];
 
   unicode-data = callPackage ./unicode-data.nix {};
 

From 0c2ede96a07c0bcef90c772558f922efc035437c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 00:50:05 +0100
Subject: [PATCH 1752/2266] librsvg: always build introspection

We have multiple outputs nowadays.
---
 .../applications/networking/syncthing-gtk/default.nix |  2 +-
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix    |  3 +--
 pkgs/development/libraries/librsvg/default.nix        | 11 ++++-------
 pkgs/top-level/all-packages.nix                       |  1 -
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 5e48f85852d..ae715aa4321 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gtk3 (librsvg.override { enableIntrospection = true; })
+    gtk3 librsvg
     libnotify
     # Schemas with proxy configuration
     gnome3.gsettings-desktop-schemas
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 68bac54d653..4ead2112349 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -28,8 +28,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
   buildInputs = with gnome3;
     [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice
-      libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf
-      (librsvg.override { enableIntrospection = true; })
+      libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf librsvg
       clutter networkmanager libstartup_notification telepathy-glib
       libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server
       libical nss gtk gstreamer gdm
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 31e9e06dacb..4bb4db10438 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,9 +1,7 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3
 , withGTK ? false, gtk3 ? null
-, gobjectIntrospection ? null, enableIntrospection ? false }:
-
-# no introspection by default, it's too big
+, vala, gobjectIntrospection }:
 
 let
   pname = "librsvg";
@@ -21,17 +19,16 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
-    ++ stdenv.lib.optional enableIntrospection gobjectIntrospection;
+  buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ];
 
   propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
-  nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ]
+  nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobjectIntrospection ]
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       ApplicationServices
     ]);
 
-  configureFlags = [ "--enable-introspection=auto" ]
+  configureFlags = [ "--enable-introspection" "--enable-vala" ]
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
   NIX_CFLAGS_COMPILE
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35697cda921..aa0fbae9ab1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20629,7 +20629,6 @@ with pkgs;
 
   sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
     inherit libusb1; # Shadow python.pkgs.libusb1.
-    librsvg = librsvg.override { enableIntrospection = true; };
   };
 
   sct = callPackage ../tools/X11/sct {};

From 21a27267d33b7ef1aa1eefd5d78aca5c8a65cbdb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 01:06:04 +0100
Subject: [PATCH 1753/2266] gnome3.gnome-klotski: add missing dependencies

---
 .../gnome-3/games/gnome-klotski/default.nix   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 5177eeceebf..fc75cd081f9 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool, libgee, libgames-support }:
+{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils
+, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-klotski-${version}";
+let
+  pname = "gnome-klotski";
   version = "3.22.3";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-klotski/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-klotski"; attrPath = "gnome3.gnome-klotski"; };
-  };
+  nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
+  buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
-    gnome3.defaultIconTheme
-  ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "${pname}";
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Klotski;

From d1dcc9efc7abd3d9e5b16e795349b3deeced299a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 01:14:52 +0100
Subject: [PATCH 1754/2266] gnome3.gnome-logs: fix build

---
 .../gnome-3/apps/gnome-logs/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index c8dc97c7a73..c184bcbb42d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd }:
+, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }:
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${version}";
@@ -10,17 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-logs"; attrPath = "gnome3.gnome-logs"; };
-  };
-
   configureFlags = [ "--disable-tests" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
-  ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ];
+  buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-logs";
+      attrPath = "gnome3.gnome-logs";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Logs;

From dd791a42815761a68071b366ecc2cef2cae56c45 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 01:42:20 +0100
Subject: [PATCH 1755/2266] gnome3.swell-foop: fix build

---
 .../gnome-3/games/swell-foop/default.nix      | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 90357c9d80c..13b6f57d0fd 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
-, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils
+, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
-  name = "swell-foop-${version}";
+let
+  pname = "swell-foop";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64";
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "swell-foop"; attrPath = "gnome3.swell-foop"; };
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ];
+  buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
 
-  enableParallelBuilding = true;
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Swell%20Foop;

From f46cfa4968a5d0f42891d491a14ccdb9914a204f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 02:08:49 +0100
Subject: [PATCH 1756/2266] gnome3.lightsoff: clean up

---
 .../gnome-3/games/lightsoff/default.nix       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 869e348adb5..73b7c092a66 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, clutter, clutter-gtk, libxml2, dconf }:
+{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib }:
 
 stdenv.mkDerivation rec {
   name = "lightsoff-${version}";
@@ -10,16 +10,18 @@ stdenv.mkDerivation rec {
     sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "lightsoff"; attrPath = "gnome3.lightsoff"; };
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
-                  libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ];
+  nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
 
   enableParallelBuilding = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "lightsoff";
+      attrPath = "gnome3.lightsoff";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Lightsoff;
     description = "Puzzle game, where the objective is to turn off all of the tiles on the board";

From ee3f179fb69c74166c9e7e7a119d599bde8ef667 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 02:47:54 +0100
Subject: [PATCH 1757/2266] gnome3.gnome-usage: init at 3.28.0

---
 .../applications/misc/gnome-usage/default.nix | 37 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  4 +-
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/gnome-usage/default.nix

diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
new file mode 100644
index 00000000000..f99344b83d6
--- /dev/null
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext
+, libxml2, desktop-file-utils, wrapGAppsHook
+, glib, gtk3, libgtop, gnome3 }:
+
+let
+  pname = "gnome-usage";
+  version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
+
+  buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ];
+
+  postPatch = ''
+    chmod +x build-aux/meson/postinstall.sh
+    patchShebangs build-aux/meson/postinstall.sh
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5108b23be2d..8181a151d5e 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -42,7 +42,7 @@ let
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
     gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
     gnome-getting-started-docs gnome-packagekit gnome-software
-    gnome-power-manager
+    gnome-power-manager gnome-usage
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -54,7 +54,7 @@ let
 
   inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
-    easytag meld orca rhythmbox shotwell
+    easytag meld orca rhythmbox shotwell gnome-usage
     clutter clutter-gst clutter-gtk cogl gtkvnc;
 
   inherit (pkgs.gnome2) ORBit2;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa0fbae9ab1..ad95e3ab372 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7796,6 +7796,8 @@ with pkgs;
 
   gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};
 
+  gnome-usage = callPackage ../applications/misc/gnome-usage {};
+
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
 
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };

From 73244d10bb6ca277cf1d75f944a1fc6b4637f332 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 31 Dec 2017 15:47:05 +0100
Subject: [PATCH 1758/2266] libdazzle: init at 3.28.0

---
 pkgs/desktops/gnome-3/default.nix             |  2 +-
 .../libraries/libdazzle/default.nix           | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libdazzle/default.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 8181a151d5e..42079c22f30 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -55,7 +55,7 @@ let
   inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
-    clutter clutter-gst clutter-gtk cogl gtkvnc;
+    clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
 
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
new file mode 100644
index 00000000000..50f03f3ac7a
--- /dev/null
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
+, gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
+
+let
+  version = "3.28.0";
+  pname = "libdazzle";
+in
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" "devdoc" ];
+  outputBin = "dev";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0zq37i7gnmnc7qfngzhj71nqhf2wxl4m247s2ym9ykakxbi6zajp";
+  };
+
+  nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];
+  buildInputs = [ glib gtk3 ];
+
+  mesonFlags = [
+    "-Denable_gtk_doc=true"
+  ];
+
+  doCheck = true;
+
+  checkPhase = ''
+    export NO_AT_BRIDGE=1
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      meson test --print-errorlogs
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "A library to delight your users with fancy features";
+    longDescription = ''
+      The libdazzle library is a companion library to GObject and Gtk+. It
+      provides various features that we wish were in the underlying library but
+      cannot for various reasons. In most cases, they are wildly out of scope
+      for those libraries. In other cases, our design isn't quite generic
+      enough to work for everyone.
+    '';
+    homepage = https://wiki.gnome.org/Apps/Builder;
+    license = licenses.gpl3Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad95e3ab372..78b59235fb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9636,6 +9636,8 @@ with pkgs;
 
   libdap = callPackage ../development/libraries/libdap { };
 
+  libdazzle = callPackage ../development/libraries/libdazzle { };
+
   libdbi = callPackage ../development/libraries/libdbi { };
 
   libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {

From e34d2ac4c7adc1f541f9e3a5e99fa962d427bed9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 04:05:11 +0100
Subject: [PATCH 1759/2266] =?UTF-8?q?networkmanager-openvpn:=201.8.0=20?=
 =?UTF-8?q?=E2=86=92=201.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network-manager/fix-paths.patch           | 34 +++++++++++++++++++
 .../networking/network-manager/openvpn.nix    | 25 ++++++--------
 2 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/tools/networking/network-manager/fix-paths.patch

diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch
new file mode 100644
index 00000000000..b735da28dca
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/fix-paths.patch
@@ -0,0 +1,34 @@
+--- a/properties/nm-openvpn-editor.c
++++ b/properties/nm-openvpn-editor.c
+@@ -775,8 +775,7 @@
+ nm_find_openvpn (void)
+ {
+ 	static const char *openvpn_binary_paths[] = {
+-		"/usr/sbin/openvpn",
+-		"/sbin/openvpn",
++		"@openvpn@/bin/openvpn",
+ 		NULL
+ 	};
+ 	const char  **openvpn_binary = openvpn_binary_paths;
+--- a/src/nm-openvpn-service.c
++++ b/src/nm-openvpn-service.c
+@@ -522,9 +522,7 @@
+ openvpn_binary_find_exepath (void)
+ {
+ 	static const char *paths[] = {
+-		"/usr/sbin/openvpn",
+-		"/sbin/openvpn",
+-		"/usr/local/sbin/openvpn",
++		"@openvpn@/bin/openvpn",
+ 	};
+ 	int i;
+ 
+@@ -2326,7 +2324,7 @@
+ 	_LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
+ 
+ 	if (   !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
+-	    && (system ("/sbin/modprobe tun") == -1))
++	    && (system ("@kmod@/bin/modprobe tun") == -1))
+ 		return EXIT_FAILURE;
+ 
+ 	plugin = nm_openvpn_plugin_new (bus_name);
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index edda84ab43e..b1ee3da1b05 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
+{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
 
 let
   pname   = "NetworkManager-openvpn";
-  version = "1.8.0";
+  version = "1.8.2";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn";
+    sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit kmod openvpn;
+    })
+  ];
+
   buildInputs = [ openvpn networkmanager libsecret ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
                                         gnome3.networkmanagerapplet ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig libxml2 ];
 
   configureFlags = [
     "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
@@ -24,16 +31,6 @@ in stdenv.mkDerivation rec {
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
   ];
 
-  preConfigure = ''
-     substituteInPlace "configure" \
-       --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
-     substituteInPlace "src/nm-openvpn-service.c" \
-       --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" \
-       --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
-     substituteInPlace "properties/auth-helpers.c" \
-       --replace "/sbin/openvpn" "${openvpn}/bin/openvpn"
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 03e83a08933b76dbe742c91750ee5b1f759ecda0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 05:27:44 +0100
Subject: [PATCH 1760/2266] gnome3.gnome-software: fix build

---
 pkgs/desktops/gnome-3/core/gnome-software/default.nix    | 9 +++------
 .../desktops/gnome-3/core/gnome-software/fix-paths.patch | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 4fc825096e7..2c4663b54ec 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
-, glib, appstream-glib, libsoup, polkit, isocodes, gtkspell3, libxslt
+, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection
 , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -20,19 +20,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42
-    valgrind-light docbook_xsl gtk-doc desktop-file-utils
+    valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection
   ];
 
   buildInputs = [
     gnome3.gtk glib packagekit appstream-glib libsoup
     gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
-    gtkspell3 json-glib libsecret ostree
+    gspell json-glib libsecret ostree
     polkit
   ];
 
-  # https://gitlab.gnome.org/GNOME/gnome-software/issues/320
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   mesonFlags = [
     "-Denable-flatpak=false"
     "-Denable-rpm=false"
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
index 239e1781bb1..6f443a8a43e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
@@ -5,7 +5,7 @@
  
  	/* find filename */
 -	filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL);
-+	filename = g_build_filename ("@isoCodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL);
++	filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL);
  	if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
  		g_free (filename);
  		filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL);

From 2f5fc51479e51e28818a365e128e3e611138980f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 05:28:31 +0100
Subject: [PATCH 1761/2266] =?UTF-8?q?packagekit:=201.1.8=20=E2=86=92=201.1?=
 =?UTF-8?q?.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/package-management/packagekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index cdc035072da..b40c8ea26aa 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   name = "packagekit-${version}";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit";
     rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "0bn9flsjbzlwmlbv2gphqwgzy9sx8ahch28z6dzgak4csbz5wcws";
+    sha256 = "1zs7xkk3b2izdnis7ir5h93p8f2i9513663h2xhxb0sh6i2h18y4";
   };
 
   buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]

From a2e460be4dfa10a0c0949d6693cfd3236a92de4c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 05:33:51 +0100
Subject: [PATCH 1762/2266] gnome3.polari: fix build

---
 pkgs/desktops/gnome-3/apps/polari/default.nix | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 810f3e18805..4ae67f9b41d 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -3,34 +3,35 @@
 , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
 , gnome3, wrapGAppsHook, telepathy-logger, gspell }:
 
-stdenv.mkDerivation rec {
-  name = "polari-${version}";
+let
+  pname = "polari";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "08zgdqrnxl752nv0gac1k7wvjd4j7h5n4c0flrq7q337p40k3dd5";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "polari"; attrPath = "gnome3.polari"; };
-  };
-
   propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2
-                        desktop-file-utils gobjectIntrospection appstream-glib ];
-  buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas
-                  telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ];
-
-  patches = [
-    (fetchpatch {
-      url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff;
-      sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9";
-    })
+  nativeBuildInputs = [
+    meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2
+    desktop-file-utils gobjectIntrospection appstream-glib
   ];
 
-  enableParallelBuilding = true;
+  buildInputs = [
+    gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas
+    telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Polari;

From e227c2c46c4aad25f1fbdb015abee3d535b39f43 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 05:39:43 +0100
Subject: [PATCH 1763/2266] gnome3.gnome-power-manager: clean up

---
 .../apps/gnome-power-manager/default.nix      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index a295ef456df..70ed4403f10 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, intltool
+, gettext
 , fetchurl
 , pkgconfig
 , gtk3
@@ -11,27 +11,30 @@
 , wrapGAppsHook
 , gnome3 }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-power-manager-${version}";
+let
+  pname = "gnome-power-manager";
   version = "3.26.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-power-manager/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-power-manager"; attrPath = "gnome3.gnome-power-manager"; };
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   nativeBuildInputs = [
     meson
     ninja
     pkgconfig
     wrapGAppsHook
-    intltool
+    gettext
 
     # needed by meson_post_install.sh
     glib.dev
@@ -45,10 +48,8 @@ stdenv.mkDerivation rec {
     gnome3.defaultIconTheme
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
-    homepage = https://projects.gnome.org/gnome-power-manager/;
+    homepage = https://projects-old.gnome.org/gnome-power-manager/;
     description = "View battery and power statistics provided by UPower";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2Plus;

From 562ae5605665f91973fa102782b0cb3b9c99b643 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:38:07 +0100
Subject: [PATCH 1764/2266] webkitgtk: 2.18 -> 2.20

---
 .../webkitgtk/{2.18.nix => 2.20.nix}          | 16 ++---
 .../libraries/webkitgtk/PR-152650-2.patch     | 62 -------------------
 .../libraries/webkitgtk/PR-153138.patch       | 26 --------
 .../libraries/webkitgtk/PR-157554.patch       | 33 ----------
 .../libraries/webkitgtk/PR-157574.patch       | 62 -------------------
 .../webkitgtk/finding-harfbuzz-icu.patch      | 52 ----------------
 .../webkitgtk/gstreamergl-2.17.patch          | 13 ----
 pkgs/top-level/all-packages.nix               |  4 +-
 8 files changed, 8 insertions(+), 260 deletions(-)
 rename pkgs/development/libraries/webkitgtk/{2.18.nix => 2.20.nix} (91%)
 delete mode 100644 pkgs/development/libraries/webkitgtk/PR-152650-2.patch
 delete mode 100644 pkgs/development/libraries/webkitgtk/PR-153138.patch
 delete mode 100644 pkgs/development/libraries/webkitgtk/PR-157554.patch
 delete mode 100644 pkgs/development/libraries/webkitgtk/PR-157574.patch
 delete mode 100644 pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch
 delete mode 100644 pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch

diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
similarity index 91%
rename from pkgs/development/libraries/webkitgtk/2.18.nix
rename to pkgs/development/libraries/webkitgtk/2.20.nix
index f1cefa451f0..926ed3aa619 100644
--- a/pkgs/development/libraries/webkitgtk/2.18.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -5,7 +5,7 @@
 , libidn, libedit, readline, libGLU_combined, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
 , enableGtk2Plugins ? false, gtk2 ? null
-, gst-plugins-base, gst-plugins-bad
+, gst-plugins-base, gst-plugins-bad, woff2
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.18.6";
+  version = "2.20.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -45,17 +45,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck";
+    sha256 = "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp";
   };
 
   # see if we can clean this up....
 
-  patches = [ ./finding-harfbuzz-icu.patch ]
-     ++ optionals stdenv.isDarwin [
-    ./PR-152650-2.patch
-    ./PR-153138.patch
-    ./PR-157554.patch
-    ./PR-157574.patch
+  patches = optionals stdenv.isDarwin [
+    ## TODO add necessary patches for Darwin
   ];
 
   cmakeFlags = [
@@ -87,7 +83,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = libintlOrEmpty ++ [
-    libwebp enchant libnotify gnutls pcre nettle libidn libgcrypt
+    libwebp enchant libnotify gnutls pcre nettle libidn libgcrypt woff2
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
     sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
   ] ++ optional enableGeoLocation geoclue2
diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
deleted file mode 100644
index f87b8ee73e2..00000000000
--- a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 8 Mar 2016 17:26:23 -0800
-Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
-
-https://bugs.webkit.org/show_bug.cgi?id=152650
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- ChangeLog                     | 10 ++++++++++
- Source/PlatformGTK.cmake      |  2 +-
- Source/cmake/OptionsGTK.cmake |  5 -----
- 3 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
-index af4d2e3..0b11b56 100644
---- a/Source/PlatformGTK.cmake
-+++ b/Source/PlatformGTK.cmake
-@@ -34,7 +34,7 @@ endmacro()
- add_gtkdoc_generator("docs-build.stamp" "")
- if (ENABLE_GTKDOC)
-     add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
--elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
-+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
-     add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
- 
-     # Add a default build step which check that documentation does not have any warnings
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 6b01f1a..b443d10 100644
---- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
-     set(ENABLE_INTROSPECTION OFF)
- endif ()
- 
--# Override the cached variable, gtk-doc does not really work when building on Mac.
--if (APPLE)
--    set(ENABLE_GTKDOC OFF)
--endif ()
--
- set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
- set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
- set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
-diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
-index 4c8237b..a628ae0 100644
---- a/Tools/gtk/gtkdoc.py
-+++ b/Tools/gtk/gtkdoc.py
-@@ -322,6 +322,11 @@ class GTKDoc(object):
-                 env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
-             else:
-                 env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
-+            current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
-+            if current_ld_library_path:
-+                env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
-+            else:
-+                env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
- 
-         if ldflags:
-             env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
--- 
-2.7.2
-
diff --git a/pkgs/development/libraries/webkitgtk/PR-153138.patch b/pkgs/development/libraries/webkitgtk/PR-153138.patch
deleted file mode 100644
index 833921f6806..00000000000
--- a/pkgs/development/libraries/webkitgtk/PR-153138.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Fri, 15 Jan 2016 11:53:07 -0800
-Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
-index 1e4b4f5..9b27aed 100644
---- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
-+++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
-@@ -26,6 +26,8 @@
- #include "config.h"
- #include "StructureStubInfo.h"
- 
-+#include "JSCellInlines.h"
-+
- #include "JSObject.h"
- #include "PolymorphicAccess.h"
- #include "Repatch.h"
--- 
-2.7.0
-
diff --git a/pkgs/development/libraries/webkitgtk/PR-157554.patch b/pkgs/development/libraries/webkitgtk/PR-157554.patch
deleted file mode 100644
index 615e805c92c..00000000000
--- a/pkgs/development/libraries/webkitgtk/PR-157554.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=157554
-
---- a/Source/WTF/wtf/OSRandomSource.cpp
-+++ b/Source/WTF/wtf/OSRandomSource.cpp
-@@ -29,7 +29,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- 
--#if !OS(DARWIN) && OS(UNIX)
-+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
- #include <errno.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -46,7 +46,7 @@
- 
- namespace WTF {
- 
--#if !OS(DARWIN) && OS(UNIX)
-+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
- NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
- {
-     CRASH();
-@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
-     
- void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
- {
--#if OS(DARWIN)
--    RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
-+#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-+    return arc4random_buf(buffer, length);
- #elif OS(UNIX)
-     int fd = open("/dev/urandom", O_RDONLY, 0);
-     if (fd < 0)
diff --git a/pkgs/development/libraries/webkitgtk/PR-157574.patch b/pkgs/development/libraries/webkitgtk/PR-157574.patch
deleted file mode 100644
index d9b0795afa5..00000000000
--- a/pkgs/development/libraries/webkitgtk/PR-157574.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
-index ab53183..1310dec 100644
---- a/Source/JavaScriptCore/API/WebKitAvailability.h
-+++ b/Source/JavaScriptCore/API/WebKitAvailability.h
-@@ -27,57 +27,12 @@
- #define __WebKitAvailability__
- 
- #if defined(__APPLE__)
--
--#include <AvailabilityMacros.h>
- #include <CoreFoundation/CoreFoundation.h>
--
--#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
--/* To support availability macros that mention newer OS X versions when building on older OS X versions,
--   we provide our own definitions of the underlying macros that the availability macros expand to. We're
--   free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
--   an application rather than as part of the system.
--*/
--
--#ifndef __NSi_10_10 // Building from trunk rather than SDK.
--#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
--#endif
--
--#ifndef __NSi_10_11 // Building from trunk rather than SDK.
--#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
--#endif
--
--#ifndef __NSi_10_12 // Building from trunk rather than SDK.
--#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
--#endif
--
--#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
--#define __AVAILABILITY_INTERNAL__MAC_10_9
--#endif
--
--#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
--#define __AVAILABILITY_INTERNAL__MAC_10_10
- #endif
- 
--#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
--#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
--#endif
--
--#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
--#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
--#endif
--
--#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
--
--#if defined(BUILDING_GTK__)
- #undef CF_AVAILABLE
- #define CF_AVAILABLE(_mac, _ios)
- #undef CF_ENUM_AVAILABLE
- #define CF_ENUM_AVAILABLE(_mac, _ios)
--#endif
--
--#else
--#define CF_AVAILABLE(_mac, _ios)
--#define CF_ENUM_AVAILABLE(_mac, _ios)
--#endif
- 
- #endif /* __WebKitAvailability__ */
diff --git a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch b/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch
deleted file mode 100644
index 14d58ef04f6..00000000000
--- a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake	2014-10-09 01:54:38.000000000 +0800
-+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake	2014-10-15 13:41:29.832290412 +0800
-@@ -34,21 +34,39 @@
- 
- pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
- 
--find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
--    HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
--)
--
--find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
--    HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
--)
--
- # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.
- if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")
-     pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED)
--    find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
-+
-+    find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h
-+        HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-+    )
-+
-+    find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu
-         HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
-     )
--    list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")
-+
-+    find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
-+        HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
-+    )
-+
-+    set(HARFBUZZ_INCLUDE_DIRS
-+        ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR}
-+        CACHE INTERNAL ""
-+    )
-+
-+    set(HARFBUZZ_LIBRARIES
-+        ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY}
-+        CACHE INTERNAL ""
-+    )
-+else ()
-+    find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
-+        HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-+    )
-+
-+    find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
-+        HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
-+    )
- endif ()
- 
- include(FindPackageHandleStandardArgs)
diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
deleted file mode 100644
index 7c47db52aba..00000000000
--- a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake
-index d3577a8..9620dc0 100644
---- i/Source/cmake/OptionsGTK.cmake
-+++ w/Source/cmake/OptionsGTK.cmake
-@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential
- 
- # Private options specific to the GTK+ port. Changing these options is
- # completely unsupported. They are intended for use only by WebKit developers.
--WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON)
-+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78b59235fb3..c352ed0f6e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11733,7 +11733,7 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk218x;
+  webkitgtk = webkitgtk220x;
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu-58;
@@ -11741,7 +11741,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix {
+  webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix {
     harfbuzz = harfbuzz-icu;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
     stdenv = overrideCC stdenv gcc6;

From 3a3ea1a69d2b43472cbbfe533e5528d4ec969d60 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 03:16:52 +0100
Subject: [PATCH 1765/2266] webkitgtk: patch shebangs in postPatch

this eliminates a build error due to /bin/bash in build scripts
---
 pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 926ed3aa619..8adef46356d 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
     ## TODO add necessary patches for Darwin
   ];
 
+  postPatch = ''
+    patchShebangs .
+  '';
+
   cmakeFlags = [
   "-DPORT=GTK"
   "-DUSE_LIBHYPHEN=0"

From 63ccf133c76f9892bd23ec04f36a3428d34b3107 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:20:44 +0100
Subject: [PATCH 1766/2266] gnome3.shotwell: fix build

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 53acbf12173..5a24a364587 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
 , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
 , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
-, itstool, libgdata }:
+, gobjectIntrospection, itstool, libgdata }:
 
 # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook
+    meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook gobjectIntrospection
   ];
 
   buildInputs = [

From 7bfd055dce12f0498d5084696075a55164319cd0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:22:17 +0100
Subject: [PATCH 1767/2266] gnome3.gnome-maps: fix build

---
 .../gnome-3/apps/gnome-maps/default.nix       | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 1c18b6c5c82..1c9d243c0c5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,31 +1,31 @@
 { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
 , gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
-, webkitgtk }:
+, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-maps-${version}";
+let
+  pname = "gnome-maps";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1imcgw67cw1qkfz8m2my0f4qmss11fbqqqi4w7afcfq9p0rplgy0";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-maps"; attrPath = "gnome3.gnome-maps"; };
-  };
-
   doCheck = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gobjectIntrospection wrapGAppsHook
-                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
-                  gnome3.geocode-glib libchamplain file libsoup
-                  gdk_pixbuf librsvg libgweather autoreconfHook
-                  gnome3.gsettings-desktop-schemas gnome3.evolution-data-server
-                  gnome3.gnome-online-accounts gnome3.defaultIconTheme
-                  webkitgtk ];
+  nativeBuildInputs = [ intltool wrapGAppsHook file autoreconfHook pkgconfig ];
+  buildInputs = [
+    gobjectIntrospection
+    gtk3 geoclue2 gjs libgee folks gfbgraph
+    geocode-glib libchamplain libsoup
+    gdk_pixbuf librsvg libgweather
+    gnome3.gsettings-desktop-schemas evolution-data-server
+    gnome-online-accounts gnome3.defaultIconTheme
+    webkitgtk
+  ];
 
   # The .service file isn't wrapped with the correct environment
   # so misses GIR files when started. By re-pointing from the gjs
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
                   "Exec=$out/bin/gnome-maps"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Maps;
     description = "A map application for GNOME 3";

From 4ad9df103d2f697db7a15171115dff82982fc409 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:22:33 +0100
Subject: [PATCH 1768/2266] gnome3.gnome-music: fix build

---
 .../gnome-3/apps/gnome-music/default.nix      | 57 +++++++++++--------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 1d606c35dcb..47ea6768a04 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,36 +1,47 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners
-, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+{ stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
+, libxml2, python3, libnotify, wrapGAppsHook, libmediaart
+, gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins
+, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib
+, itstool, gnome3, gst_all_1 }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-music-${version}";
+python3.pkgs.buildPythonApplication rec {
+  pname = "gnome-music";
   version = "3.28.0.1";
 
+  format = "other";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
     sha256 = "0yyysmxwmk167n8wghcbmxz73kgl1y1j9js3mgkjjqsmkd9brk65";
   };
 
+  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
+  buildInputs = with gst_all_1; [
+    gtk3 glib libmediaart gnome-online-accounts
+    gdk_pixbuf gnome3.defaultIconTheme python3
+    grilo grilo-plugins libnotify
+    gnome3.gsettings-desktop-schemas tracker
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+  ];
+  propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ];
+
+
+  postPatch = ''
+    for f in meson_post_conf.py meson_post_install.py; do
+      chmod +x $f
+      patchShebangs $f
+    done
+  '';
+
+  doCheck = false;
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-music"; attrPath = "gnome3.gnome-music"; };
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
-                  gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
-                  python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
-                  python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
-                  gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Music;
     description = "Music player and management application for the GNOME desktop environment";

From f658959fa7376086ba1c25a39c726af8170fced3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:22:47 +0100
Subject: [PATCH 1769/2266] gnome3.gnome-photos: fix build

---
 .../gnome-3/apps/gnome-photos/default.nix     | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index ad445c09df4..2163e6e875e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -1,43 +1,48 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
+{ stdenv, gettext, fetchurl, libxml2, libgdata
 , pkgconfig, gtk3, glib, tracker, tracker-miners
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop-file-utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib
+, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins
+, grilo, gnome-online-accounts
+, desktop-file-utils, wrapGAppsHook
+, gnome3, gdk_pixbuf, gexiv2, geocode-glib
 , dleyna-renderer }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-photos-${version}";
+let
+  pname = "gnome-photos";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-photos"; attrPath = "gnome3.gnome-photos"; };
-  };
-
   # doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+  nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
+  buildInputs = [
+    gtk3 glib gegl babl libgdata libdazzle
+    gnome3.gsettings-desktop-schemas
+    gdk_pixbuf gnome3.defaultIconTheme
+    gfbgraph grilo-plugins grilo
+    gnome-online-accounts tracker
+    gexiv2 geocode-glib dleyna-renderer
+    tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata
-                  gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
-                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
-                  gnome3.gnome-online-accounts gnome3.gnome-desktop
-                  lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils
-                  wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ];
 
-  enableParallelBuilding = true;
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Photos;
-    description = "Photos is an application to access, organize and share your photos with GNOME 3";
+    description = "Access, organize and share your photos";
     maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }

From a610006a095018f06809eb6f87c98606b32bb77c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:23:06 +0100
Subject: [PATCH 1770/2266] gnome3.nautilus-sendto: clean up

---
 .../gnome-3/apps/nautilus-sendto/default.nix    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
index 2812e7673b4..7ac8b4dfe11 100644
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
@@ -1,18 +1,27 @@
 { stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
 
-stdenv.mkDerivation rec {
-  name = "nautilus-sendto-${version}";
-
+let
+  pname = "nautilus-sendto";
   version = "3.8.6";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz";
     sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
   buildInputs = [ glib ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Integrates Evolution and Pidgin into the Nautilus file manager";
     maintainers = gnome3.maintainers;

From 3a551ca7b01b97d4c9cf18cbf0412d22097b2987 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:23:37 +0100
Subject: [PATCH 1771/2266] gnome3.evolution-data-server: fix build

---
 .../core/evolution-data-server/default.nix    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 479326f40cd..350c29fa907 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,24 +1,22 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf
+{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true
+, p11-kit, db, nspr, nss, libical, gperf, makeWrapper
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
   version = "3.28.0";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1ybyyy6nls11az8lbri1y9527snz5h7qbhyfqvk0vc6vzvald5gv";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "evolution-data-server"; };
-  };
-
   nativeBuildInputs = [
-    cmake ninja pkgconfig intltool python3 gperf makeWrapper
-  ] ++ stdenv.lib.optional valaSupport vala;
+    cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala
+  ];
   buildInputs = with gnome3; [
     glib libsoup libxml2 gtk gnome-online-accounts
     gcr p11-kit libgweather libgdata libaccounts-glib json-glib
@@ -27,16 +25,14 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
 
-  # uoa irrelevant for now
   cmakeFlags = [
     "-DENABLE_UOA=OFF"
-  ] ++ stdenv.lib.optionals valaSupport [
     "-DENABLE_VALA_BINDINGS=ON"
     "-DENABLE_INTROSPECTION=ON"
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
+    "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
   ];
 
-  enableParallelBuilding = true;
 
   preFixup = ''
     for f in $(find $out/libexec/ -type f -executable); do
@@ -46,7 +42,15 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "evolution-data-server";
+    };
+  };
+
   meta = with stdenv.lib; {
+    description = "Unified backend for programs that work with contacts, tasks, and calendar information";
+    homepage = https://wiki.gnome.org/Apps/Evolution;
     license = licenses.lgpl2;
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;

From bf8b2afcca0979408f4ca621951c6ddf38bcfd30 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:23:56 +0100
Subject: [PATCH 1772/2266] gnome3.gnome-control-center: fix build

---
 .../core/gnome-control-center/default.nix     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 680defc42bc..8966893bde7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,24 +1,25 @@
-{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook
+{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
 , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
 , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk
+, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
 , fontconfig, sound-theme-freedesktop, grilo }:
 
 let
+  pname = "gnome-control-center";
   version = "3.28.0";
 in stdenv.mkDerivation rec {
-  name = "gnome-control-center-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0nyx5nl2rky0249rdcy0hsccnxf3angpya0q859rrbrwaixqnxh3";
   };
 
   nativeBuildInputs = [
-    pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns
+    meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl
     shared-mime-info
   ];
 
@@ -28,7 +29,7 @@ in stdenv.mkDerivation rec {
     gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
     accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
     grilo libpwquality cracklib vino libcanberra-gtk3 libgudev
-    gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk
+    gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
     networkmanager modemmanager gnome-bluetooth tracker
   ];
 
@@ -40,6 +41,11 @@ in stdenv.mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share"
@@ -48,14 +54,14 @@ in stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
     )
     for i in $out/share/applications/*; do
-      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+      substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center"
     done
   '';
 
   passthru = {
     updateScript = gnome3.updateScript {
-      packageName = "gnome-control-center";
-      attrPath = "gnome3.gnome-control-center";
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
     };
   };
 

From df37e9cf0e16577238f6ecb0db3f6048c9d888d0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:24:33 +0100
Subject: [PATCH 1773/2266] gnome3.gnome-online-accounts: fix build

---
 .../core/gnome-online-accounts/default.nix    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index dfa0d0731dd..d3d14f555cf 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,24 +1,20 @@
 { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
-, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc
-, telepathy-glib, intltool, dbus_libs, icu, glib-networking
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos
+, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc
+, telepathy-glib, gettext, dbus_libs, icu, glib-networking
+, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos
 }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-online-accounts-${version}";
+let
+  pname = "gnome-online-accounts";
   version = "3.28.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; };
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
   outputs = [ "out" "man" "dev" "devdoc" ];
 
   configureFlags = [
@@ -32,14 +28,21 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    pkgconfig vala gnome-common intltool wrapGAppsHook
-    libxslt docbook_xsl_ns docbook_xsl gtk-doc
+    pkgconfig vala gettext wrapGAppsHook
+    libxslt docbook_xsl docbook_xsl_ns gtk-doc
   ];
   buildInputs = [
     glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup
     gcr kerberos
   ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;

From c5c34f37f97d9bd70eb250c027bf825d22f77012 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:24:46 +0100
Subject: [PATCH 1774/2266] gnome3.gnome-session: fix build

---
 .../gnome-3/core/gnome-session/default.nix    | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index c5e56b0796f..d36e7ce7432 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,5 +1,6 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
+{ fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
+, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }:
 
 stdenv.mkDerivation rec {
   name = "gnome-session-${version}";
@@ -10,18 +11,23 @@ stdenv.mkDerivation rec {
     sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; };
-  };
+  mesonFlags = [ "-Dsystemd=true" ];
 
-  configureFlags = "--enable-systemd";
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext makeWrapper
+    xmlto libxslt docbook_xsl docbook_xml_dtd_412
+    dbus # for DTD
+  ];
 
-  buildInputs = with gnome3;
-    [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt
-      gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings-desktop-schemas upower intltool gconf makeWrapper systemd
-      epoxy
-    ];
+  buildInputs = [
+    glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
+    gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
 
   # FIXME: glib binaries shouldn't be in .dev!
   preFixup = ''
@@ -34,13 +40,22 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${glib.dev}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \
+      --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\
       --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"
   '';
 
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-session";
+      attrPath = "gnome3.gnome-session";
+    };
   };
 
+  meta = with stdenv.lib; {
+    description = "GNOME session manager";
+    homepage = https://wiki.gnome.org/Projects/SessionManagement;
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
 }

From 2871acd8c372cba99175c81633b1ea202a0214b5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:25:07 +0100
Subject: [PATCH 1775/2266] gnome3.gnome-shell: fix build

---
 .../gnome-3/core/gnome-shell/default.nix      | 64 ++++++++++++-------
 .../gnome-3/core/gnome-shell/fix-paths.patch  | 29 ++++-----
 2 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 4ead2112349..7803bfb638d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,10 +1,10 @@
-{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
+{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
-, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales
-, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
+, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
+, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
-, gst_all_1 }:
+, sassc, systemd, gst_all_1 }:
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
@@ -25,20 +25,24 @@ in stdenv.mkDerivation rec {
 
   LANG = "en_US.UTF-8";
 
-  nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
-  buildInputs = with gnome3;
-    [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice
-      libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf librsvg
-      clutter networkmanager libstartup_notification telepathy-glib
-      libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server
-      libical nss gtk gstreamer gdm
-      libcanberra-gtk3 gnome-control-center geoclue2
-      defaultIconTheme sqlite gnome3.gnome-bluetooth
-      libgweather # not declared at build time, but typelib is needed at runtime
-      gnome3.gnome-clocks # schemas needed
-      at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
-      gst_all_1.gst-plugins-good # recording
-      gobjectIntrospection (stdenv.lib.getLib dconf) ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
+    sassc
+  ];
+  buildInputs = with gnome3; [
+    systemd caribou
+    gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
+    libcroco libsecret libsoup polkit gdk_pixbuf librsvg
+    clutter networkmanager libstartup_notification telepathy-glib
+    libXtst gjs mutter libpulseaudio evolution-data-server
+    libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
+    defaultIconTheme gnome3.gnome-bluetooth
+    libgweather # not declared at build time, but typelib is needed at runtime
+    gnome3.gnome-clocks # schemas needed
+    at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
+    gst_all_1.gst-plugins-good # recording
+    gobjectIntrospection
+  ];
   propagatedUserEnvPkgs = [
     # Needed to support on-screen keyboard used with touch screen devices
     # see https://github.com/NixOS/nixpkgs/issues/25968
@@ -51,7 +55,10 @@ in stdenv.mkDerivation rec {
       url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016;
       sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm";
     })
-    ./fix-paths.patch
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit unzip;
+    })
   ];
 
   postPatch = ''
@@ -59,23 +66,34 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
     substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
-    substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip"
   '';
 
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  enableParallelBuilding = true;
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Until glib’s xdgmime is patched
+      # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+    )
+  '';
 
   passthru = {
     mozillaPlugin = "/lib/mozilla/plugins";
-    updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-shell";
+      attrPath = "gnome3.gnome-shell";
+    };
   };
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    description = "Core user interface for the GNOME 3 desktop";
+    homepage = https://wiki.gnome.org/Projects/GnomeShell;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index b24049f9b9f..7b7ff85a7c8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -1,18 +1,11 @@
-diff --git a/meson.build b/meson.build
-index 4c1f5c63b..a9edb8795 100644
---- a/meson.build
-+++ b/meson.build
-@@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services')
- 
- plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir)
- 
--keybindings_dep = dependency('gnome-keybindings', required: false)
--if keybindings_dep.found()
--  keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
--else
--  keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
--endif
-+keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
- 
- atk_bridge_dep = dependency('atk-bridge-2.0')
- canberra_dep = dependency('libcanberra')
+--- a/js/ui/extensionDownloader.js
++++ b/js/ui/extensionDownloader.js
+@@ -86,7 +86,7 @@
+     stream.output_stream.write_bytes(contents, null);
+     stream.close(null);
+     let [success, pid] = GLib.spawn_async(null,
+-                                          ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
++                                          ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()],
+                                           null,
+                                           GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                           null);

From 53b2df9211c5dd79748159687eb9041282363e95 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:25:25 +0100
Subject: [PATCH 1776/2266] gnome3.libzapojit: build gir

---
 pkgs/desktops/gnome-3/core/libzapojit/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 11761bd3412..10c6185fa82 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobjectIntrospection }:
 let
   pname = "libzapojit";
   version = "0.0.3";
@@ -6,13 +6,15 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ glib json-glib rest libsoup gtk gnome-online-accounts ];
+  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+  propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
 
   passthru = {
     updateScript = gnome3.updateScript {

From a67577f77614ec3bb947b6370c74f434f2ca3f9b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:25:39 +0100
Subject: [PATCH 1777/2266] gnome3.nautilus: fix build

---
 .../gnome-3/core/nautilus/default.nix         | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index e16da055123..a52ec342675 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,31 +1,28 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook
 , gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif
-, exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }:
+, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
 
-stdenv.mkDerivation rec {
-  name = "nautilus-${version}";
+let
+  pname = "nautilus";
   version = "3.28.0.1";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1i3li3nd434vncd6j6has73xihbzjx1ab0xyw8wif11mym15ixrh";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "nautilus"; attrPath = "gnome3.nautilus"; };
-  };
-
   nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ];
 
-  buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux
-                  tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme
-                  gnome3.gsettings-desktop-schemas ];
+  buildInputs = [
+    dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux
+    tracker tracker-miners gnome-desktop gexiv2
+    gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
+  ];
 
   propagatedBuildInputs = [ gnome-autoar ];
 
-  # fatal error: gio/gunixinputstream.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   preFixup = ''
     gappsWrapperArgs+=(
       # Thumbnailers
@@ -35,16 +32,23 @@ stdenv.mkDerivation rec {
     )
   '';
 
-#  hardeningDisable = [ "format" ];
-  enableParallelBuilding = true;
-
   postPatch = ''
     patchShebangs build-aux/meson/postinstall.py
   '';
 
   patches = [ ./extension_dir.patch ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
+    description = "The file manager for GNOME";
+    homepage = https://wiki.gnome.org/Apps/Files;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
   };

From 91f7501f7a5ae3d816aec9b94f9fc86ed8e65e5d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:25:55 +0100
Subject: [PATCH 1778/2266] gnome3.tracker: build gir

---
 .../desktops/gnome-3/core/tracker/default.nix | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 61ae06ec066..cbf16c6807f 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, intltool, pkgconfig
+{ stdenv, fetchurl, intltool, pkgconfig, gobjectIntrospection
 , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt
 , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
 
-stdenv.mkDerivation rec {
-  name = "tracker-${version}";
+let
+  pname = "tracker";
   version = "2.0.3";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "tracker"; attrPath = "gnome3.tracker"; };
-  };
-
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ];
+  nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection ];
   # TODO: add libstemmer
   buildInputs = [
     glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
     patchShebangs utils/g-ir-merge/g-ir-merge
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Tracker;
     description = "Desktop-neutral user information store, search tool and indexer";

From ac38e53c7ac82aca3451b5041f3cbcdf2f2ac28b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:26:13 +0100
Subject: [PATCH 1779/2266] gnome3.devhelp: fix build

---
 .../gnome-3/devtools/devhelp/default.nix      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 1d04aaa45ab..786eece7194 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool, gsettings-desktop-schemas }:
+, glib, appstream-glib, gobjectIntrospection
+, webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   name = "devhelp-${version}";
@@ -10,21 +11,24 @@ stdenv.mkDerivation rec {
     sha256 = "1b4l71775p3mps1jsv7pz26v0lhd0qczsp6qr1dwv7hyslmpb5qn";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "devhelp"; attrPath = "gnome3.devhelp"; };
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
   buildInputs = [
-    gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
-    gsettings-desktop-schemas
+    glib gtk3 webkitgtk
+    gnome3.defaultIconTheme gsettings-desktop-schemas
   ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "devhelp";
+      attrPath = "gnome3.devhelp";
+    };
+  };
+
   meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/devhelp;
     description = "API documentation browser for GNOME";
-    maintainers = gnome3.maintainers;
+    homepage = https://wiki.gnome.org/Apps/Devhelp;
     license = licenses.gpl2;
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 }

From a8bbecd004984c5bc7b9da4fbe6fa2e85b24566a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:26:29 +0100
Subject: [PATCH 1780/2266] gnome3.geary: fix build

---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 24 ++++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index f8c29625261..5a95802b81a 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant
-, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils
-, libnotify, libcanberra-gtk3, libsecret, gmime
-, libpthreadstubs, sqlite
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
+, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
+, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
+, gobjectIntrospection, libpthreadstubs, sqlite
 , gnome3, librsvg, gnome-doc-utils, webkitgtk }:
 
 let
@@ -17,10 +17,16 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
 
-  nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ];
-  buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr
-                  gdk_pixbuf librsvg gnome3.defaultIconTheme ];
+  nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
+  buildInputs = [
+    gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
+    libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes
+    gdk_pixbuf librsvg gnome3.defaultIconTheme
+  ];
+
+  cmakeFlags = [
+    "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
+  ];
 
   preConfigure = ''
     substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0'
@@ -31,8 +37,6 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix PATH : "$out/bin")
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Geary;
     description = "Mail client for GNOME 3";

From f2edcad2d3451aebe4e472ae493da08ee26260e3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:26:50 +0100
Subject: [PATCH 1781/2266] gnome3.gnome-tweak-tool: clean up

---
 .../gnome-3/misc/gnome-tweak-tool/default.nix | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
index a01ff6b5e33..92220e23145 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
@@ -3,27 +3,23 @@
 , bash, itstool, libxml2, python3Packages
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-${version}";
+let
+  pname = "gnome-tweak-tool";
   version = "3.27.3";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1z8l1ym6qmhqirsny4hcqv989ilv5mm764y8q7920zprdcjprds3";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-tweak-tool"; attrPath = "gnome3.gnome-tweak-tool"; };
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook
+    meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook
   ];
   buildInputs = [
     gtk3 glib gnome3.gsettings-desktop-schemas
-    gdk_pixbuf gnome3.defaultIconTheme librsvg
+    gdk_pixbuf gnome3.defaultIconTheme
     libnotify gnome3.gnome-shell python3Packages.pygobject3
     libsoup gnome3.gnome-settings-daemon gnome3.nautilus
     gnome3.mutter gnome3.gnome-desktop gobjectIntrospection
@@ -56,6 +52,13 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
     description = "A tool to customize advanced GNOME 3 options";

From 90a2e8d4f23008454328e0ff9edc1d93328955a6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 13:27:02 +0100
Subject: [PATCH 1782/2266] farstream: build gir

---
 pkgs/development/libraries/farstream/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index ebb581bdbcc..020d0454286 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base
-, gst-python, gupnp-igd
+, gst-python, gupnp-igd, gobjectIntrospection
 , gst-plugins-good, gst-plugins-bad, gst-libav
 }:
 
@@ -7,21 +7,25 @@ let
   inherit (pythonPackages) python pygobject2;
 in stdenv.mkDerivation rec {
   name = "farstream-0.2.8";
+
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
+    url = "https://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
     sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
   };
 
   buildInputs = [ libnice python pygobject2 gupnp-igd libnice ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
 
-  propagatedBuildInputs = [ gstreamer gst-plugins-base gst-python
+  propagatedBuildInputs = [
+    gstreamer gst-plugins-base gst-python
     gst-plugins-good gst-plugins-bad gst-libav
-    ];
+  ];
 
   meta = {
-    homepage = http://www.freedesktop.org/wiki/Software/Farstream;
+    homepage = https://www.freedesktop.org/wiki/Software/Farstream;
     description = "Audio/Video Communications Framework formely known as farsight";
     maintainers = [ ];
     platforms = stdenv.lib.platforms.linux;

From d7bf83e2b5bbf23ecb81098da288ab93a26618f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 15 Mar 2018 02:01:18 +0100
Subject: [PATCH 1783/2266] gnome3.gpaste: 3.26.0 -> 3.28.0

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

diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index aaedd6ef632..b24b51a0c33 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.26.0";
+  version = "3.28.0";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "0xlcbm9qnw61h6xwa1c0lz5mp1ca3vjjn5wpk0ahhhl6k94mzjs7";
+    sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];

From d9253589a7f7952ee5924feb32c3d7bb88a656e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 15 Mar 2018 12:44:34 +0100
Subject: [PATCH 1784/2266] gnome3.gvfs: fix build

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

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index e6f1ba8df56..b0b2d21e2bd 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -4,6 +4,7 @@
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
 , gnomeSupport ? false, gnome, makeWrapper
 , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
+, libsecret, libgdata
 }:
 
 let
@@ -37,8 +38,7 @@ stdenv.mkDerivation rec {
       # ToDo: a ligther version of libsoup to have FTP/HTTP support?
     ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
       libsoup gcr
-      gnome-online-accounts
-      # ToDo: not working and probably useless until gnome3 from x-updates
+      gnome-online-accounts libsecret libgdata
     ]);
 
   mesonFlags = [
@@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals (!gnomeSupport) [
     "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
     "-Dgoogle=false"
+  ] ++ stdenv.lib.optionals (samba == null) [
+    # Xfce don't want samba
+    "-Dsmb=false"
   ];
 
   enableParallelBuilding = true;

From d6479e0681ed7cdd52bd988674476819ca7b3cc1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 18:29:49 +0100
Subject: [PATCH 1785/2266] gnome3.california: fix build

---
 ...d-with-evolution-data-server-3.13.90.patch | 39 ----------------
 .../gnome-3/misc/california/default.nix       | 44 ++++++++++---------
 2 files changed, 23 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch

diff --git a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
deleted file mode 100644
index c229cc96094..00000000000
--- a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8a94642..1ca6426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
- GLIB_REQUIRED=2.38.0
- GTK_REQUIRED=3.12.2
- GEE_REQUIRED=0.10.5
--ECAL_REQUIRED=3.8.5
-+ECAL_REQUIRED=3.13.90
- LIBSOUP_REQUIRED=2.44
- GDATA_REQUIRED=0.14.0
- GOA_REQUIRED=3.8.3
-diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
-index ee6a572..5009b5d 100644
---- a/src/backing/eds/backing-eds-calendar-source.vala
-+++ b/src/backing/eds/backing-eds-calendar-source.vala
-@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
-
-     // Invoked by EdsStore prior to making it available outside of unit
-     internal async void open_async(Cancellable? cancellable) throws Error {
--        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
-+        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
-             cancellable);
-
-         client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
-diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
-index 6ead3ec..46fd711 100644
---- a/vapi/libecal-1.2.vapi
-+++ b/vapi/libecal-1.2.vapi
-@@ -23,7 +23,7 @@ namespace E {
-		public bool check_save_schedules ();
-		public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_connect_finish")]
--		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-+		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
-		public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_create_object_finish")]
-		public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
index 73d3b555ba9..c81238d2498 100644
--- a/pkgs/desktops/gnome-3/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/misc/california/default.nix
@@ -1,34 +1,36 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper
-, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection
+, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }:
 
 let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "california-${majorVersion}.0";
+  pname = "california";
+  version = "0.4.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee
-    libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server
-    sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/california" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share"
-  '';
+  nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ];
+  buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ];
 
   enableParallelBuilding = true;
 
-  # Apply fedoras patch to build with evolution-data-server >3.13
-  patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
+  patches = [
+    # Apply Fedora patch to build with evolution-data-server > 3.13
+    (fetchurl {
+      url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch;
+      sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm";
+    })
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/California;

From d6817e4232ecad2af59212384991fb398451a77b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 18:50:03 +0100
Subject: [PATCH 1786/2266] gnome3.gnome-contacts: fix build

---
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index c8e17791ad8..9c9b26360aa 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -32,6 +32,12 @@ in stdenv.mkDerivation rec {
     patchShebangs meson_post_install.py
   '';
 
+  # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0:
+  # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory
+  #  #include <clutter-gtk/clutter-gtk.h>
+  #           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+  NIX_CFLAGS_COMPILE = "-I${clutter-gtk}/include/clutter-gtk-1.0";
+
   doCheck = true;
 
   passthru = {

From 55c4927fe778f7b22f319f230d76ff7d0c4f0089 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 19:09:30 +0100
Subject: [PATCH 1787/2266] libvirt-glib: add vapi

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

diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 83b2983d9c4..0dbe30251bd 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
 , nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
-, xen, libapparmor
+, xen, libapparmor, vala
 }:
 
 let
@@ -8,12 +8,14 @@ let
 in stdenv.mkDerivation rec {
   name = "libvirt-glib-1.0.0";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "http://libvirt.org/sources/glib/${name}.tar.gz";
     sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig vala ];
   buildInputs = [
     libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
     python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor

From 2bd48805886f420c86580d002ad4c6473e68dfc7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 19:21:31 +0100
Subject: [PATCH 1788/2266] spice-gtk: add vapi

---
 pkgs/development/libraries/spice-gtk/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 05ddde9ddef..a626abc6577 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -11,6 +11,8 @@ let
 in stdenv.mkDerivation rec {
   name = "spice-gtk-0.34";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
     sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
@@ -34,6 +36,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gtk3"
+    "--enable-vala"
   ];
 
   # usb redirection needs spice-client-glib-usb-acl-helper to run setuid root

From 49d85d42b7e1f0ff22e4f000194ab3430d28efb8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 19:21:51 +0100
Subject: [PATCH 1789/2266] gnome3.gnome-boxes: fix build

---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 054d42b45bb..52fa45812fa 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, libvirt-glib
+{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk
 , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
 , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   doCheck = true;
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig gettext wrapGAppsHook gobjectIntrospection desktop-file-utils
+    meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils
   ];
 
   buildInputs = [
@@ -36,6 +36,15 @@ in stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}")
   '';
 
+  mesonFlags = [
+    "-Dovirt=false"
+  ];
+
+  postPatch = ''
+    chmod +x build-aux/post_install.py # patchShebangs requires executable file
+    patchShebangs build-aux/post_install.py
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gnome-boxes";

From 72b3c4a9598a68579b5c65c64284b9fa91e1842b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 15 Mar 2018 20:08:15 +0100
Subject: [PATCH 1790/2266] geoclue2: build gir

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

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 66aa3b4a218..b70163789de 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip
-, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook
+, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
 }:
 
 with stdenv.lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool wrapGAppsHook
+    pkgconfig intltool wrapGAppsHook gobjectIntrospection
   ];
 
   buildInputs = libintlOrEmpty ++
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
      substituteInPlace configure --replace "-Werror" ""
   '';
 
-  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++
                    optionals stdenv.isDarwin [
                        "--disable-silent-rules"
                        "--disable-3g-source"
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";
+    homepage = https://freedesktop.org/wiki/Software/GeoClue/;
     maintainers = with maintainers; [ raskin garbas ];
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl2;

From 19f80a70be09b8ae88b873c08496d65f1aaf543e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 20 Mar 2018 14:32:13 +0100
Subject: [PATCH 1791/2266] gnome3.gnome-shell: add NetworkManagerApplet

Try to fix `imports.gi.NMA`
---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 7803bfb638d..70177d0a516 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -37,11 +37,13 @@ in stdenv.mkDerivation rec {
     libXtst gjs mutter libpulseaudio evolution-data-server
     libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
     defaultIconTheme gnome3.gnome-bluetooth
-    libgweather # not declared at build time, but typelib is needed at runtime
     gnome3.gnome-clocks # schemas needed
     at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
     gst_all_1.gst-plugins-good # recording
     gobjectIntrospection
+
+    # not declared at build time, but typelib is needed at runtime
+    libgweather networkmanagerapplet
   ];
   propagatedUserEnvPkgs = [
     # Needed to support on-screen keyboard used with touch screen devices

From fac57c25f0bfae35e114952e8d5b0aeca5e145e5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 19:36:20 +0100
Subject: [PATCH 1792/2266] gtk3: fix gtk-encode-symbolic-svg

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

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 3c7f8f150e5..c96139ddb57 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info
 , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection
 , xorg, epoxy, json-glib, libxkbcommon, gmp
 , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
   outputBin = "dev";
 
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl makeWrapper ];
 
   patches = [
     ./3.0-immodules.cache.patch
@@ -72,6 +72,11 @@ stdenv.mkDerivation rec {
     moveToOutput bin/gtk-update-icon-cache "$out"
     # Launcher
     moveToOutput bin/gtk-launch "$out"
+
+    # TODO: patch glib directly
+    for f in $dev/bin/gtk-encode-symbolic-svg; do
+      wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+    done
   '';
 
   passthru = {

From 9fa2844784c7f76ba1c74896975e0260a95eefa9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 19:36:40 +0100
Subject: [PATCH 1793/2266] webkitgtk220x: cleanup

---
 pkgs/development/libraries/webkitgtk/2.20.nix | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 8adef46356d..8b44f11ee93 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
 , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
-, gtk3, wayland, libwebp, enchant, xorg, libxkbcommon, epoxy, at-spi2-core
+, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
 , libidn, libedit, readline, libGLU_combined, libintlOrEmpty
 , enableGeoLocation ? true, geoclue2, sqlite
@@ -26,30 +26,11 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ ];
   };
 
-  postConfigure = optionalString stdenv.isDarwin ''
-    substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
-        --replace "../../lib/libWTFGTK.a" ""
-    substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
-        --replace "../../lib/libbmalloc.a" ""
-    sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
-        Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
-        Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
-        Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
-        Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
-        Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
-        Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
-        Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
-    substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
-        --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
-  '';
-
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
     sha256 = "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp";
   };
 
-  # see if we can clean this up....
-
   patches = optionals stdenv.isDarwin [
     ## TODO add necessary patches for Darwin
   ];
@@ -61,13 +42,13 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
   "-DPORT=GTK"
   "-DUSE_LIBHYPHEN=0"
+  "-DENABLE_INTROSPECTION=ON"
   ]
   ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
   ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
   ++ optionals stdenv.isDarwin [
   "-DUSE_SYSTEM_MALLOC=ON"
   "-DUSE_ACCELERATE=0"
-  "-DENABLE_INTROSPECTION=ON"
   "-DENABLE_MINIBROWSER=OFF"
   "-DENABLE_VIDEO=ON"
   "-DENABLE_QUARTZ_TARGET=ON"
@@ -82,12 +63,12 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
 
   nativeBuildInputs = [
-    cmake perl python2 ruby bison gperf
+    cmake ninja perl python2 ruby bison gperf
     pkgconfig gettext gobjectIntrospection
   ];
 
   buildInputs = libintlOrEmpty ++ [
-    libwebp enchant libnotify gnutls pcre nettle libidn libgcrypt woff2
+    libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
     libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
     sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
   ] ++ optional enableGeoLocation geoclue2
@@ -100,7 +81,5 @@ stdenv.mkDerivation rec {
     libsoup gtk3
   ];
 
-  enableParallelBuilding = true;
-
   outputs = [ "out" "dev" ];
 }

From 8dc518c2dfb58e986d5ea2ddc5a630862725276f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 20:10:07 +0100
Subject: [PATCH 1794/2266] networkmanagerapplet: clean up

---
 .../network-manager-applet/default.nix        | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 578505f1e24..dd32cebea11 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,45 +1,46 @@
-{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
-, libnotify, libsecret, polkit, isocodes, modemmanager
+{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
+, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
-, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk
+, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection
 , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:
 
 let
-  pname   = "network-manager-applet";
+  pname = "network-manager-applet";
   version = "1.8.10";
 in stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a";
   };
 
-  configureFlags = [
-    "--sysconfdir=/etc"
-    "--without-selinux"
-    "--with-appindicator"
+  mesonFlags = [
+    "-Dselinux=false"
+    "-Dappindicator=true"
+    "-Dgcr=${if withGnome then "true" else "false"}"
   ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   buildInputs = [
-    gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas
-    polkit isocodes udev libgudev gnome3.libgnome-keyring
+    gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
+    polkit isocodes libgudev
     modemmanager jansson glib-networking
     libindicator-gtk3 libappindicator-gtk3
-  ] ++ stdenv.lib.optional withGnome webkitgtk;
+  ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ];
 
-  nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ];
+  propagatedUserEnvPkgs = [ hicolor-icon-theme ];
 
-  makeFlags = [
-    ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
+  NIX_CFLAGS = [
+    ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
-  preInstall = ''
-    installFlagsArray=( "sysconfdir=$out/etc" )
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
   '';
 
   passthru = {
@@ -50,10 +51,10 @@ in stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage    = http://projects.gnome.org/NetworkManager/;
+    homepage = https://wiki.gnome.org/Projects/NetworkManager;
     description = "NetworkManager control applet for GNOME";
-    license     = licenses.gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ phreedom rickynils ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 4f72ca7a0e9154a7e91e7a23038d4d8d05d8b082 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 20:33:36 +0100
Subject: [PATCH 1795/2266] gnome3.evince: clean up

---
 pkgs/desktops/gnome-3/core/evince/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index f2459d7885c..c60087cf47b 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib gtk3 pango atk gdk_pixbuf libxml2
-    gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas
+    gnome3.gsettings-desktop-schemas
     poppler ghostscriptX djvulibre libspectre
     libsecret librsvg gnome3.adwaita-icon-theme
   ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;

From 6c5848a008ce125e540bba8dc3fe8cdbdb223c71 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 20:39:20 +0100
Subject: [PATCH 1796/2266] gnome3.evolution: clean up

---
 pkgs/desktops/gnome-3/apps/evolution/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 92addb466ca..f41262d85b4 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
     gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
     nss nspr libnotify procps highlight gnome3.libgweather
     gnome3.gsettings-desktop-schemas
-    gnome3.libgnome-keyring gnome3.glib-networking openldap
+    gnome3.glib-networking openldap
   ];
 
   nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];

From 04325dfe7946c3af29aa34f913071ec953d54ec4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Mar 2018 20:47:49 +0100
Subject: [PATCH 1797/2266] gnome3.vino: clean up

---
 pkgs/desktops/gnome-3/core/vino/default.nix | 38 +++++++++------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 4365451636a..65c6ace8eec 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, lib, wrapGAppsHook
 , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
 , telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null
-, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
-, zlib ? null, libjpeg ? null
-, libXdamage ? null, libXfixes ? null, libXext ? null
-, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
-, networkmanager ? null }:
+, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext
+, networkmanager }:
 
 with lib;
 
@@ -18,28 +15,25 @@ stdenv.mkDerivation rec {
     sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; };
-  };
-
   doCheck = true;
 
-  buildInputs = [
-    wrapGAppsHook
-    pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
-  ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]
-    ++ optional gnomeKeyringSupport libgnome-keyring3
-    ++ filter (p: p != null) [
-      libsecret gnutls libgcrypt avahi zlib libjpeg
-      libXdamage libXfixes libXext networkmanager
-    ];
+  nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
 
-  preFixup = ''
-    export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH"
-  '';
+  buildInputs = [
+    gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup
+    libsecret gnutls libgcrypt avahi zlib libjpeg
+    libXdamage libXfixes libXext networkmanager
+  ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "vino";
+      attrPath = "gnome3.vino";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+    homepage = https://wiki.gnome.org/Projects/Vino;
     description = "GNOME desktop sharing server";
     maintainers = with maintainers; [ lethalman domenkozar ];
     license = licenses.gpl2;

From 819d766f777494e07ce9aeb30160b0d3426bfbec Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 07:45:31 +0100
Subject: [PATCH 1798/2266] gnome3.tracker-miners: fix build

---
 .../gnome-3/core/tracker-miners/default.nix   | 21 ++++++++++++-------
 .../core/tracker-miners/fix-paths.patch       |  9 ++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 56292330e01..b612db9ce38 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -9,25 +9,23 @@
 , libsoup, json-glib, libseccomp
 , libiptcdata }:
 
-stdenv.mkDerivation rec {
-  name = "tracker-miners-${version}";
+let
+  pname = "tracker-miners";
   version = "2.0.4";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tracker-miners/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "tracker-miners"; attrPath = "gnome3.tracker-miners"; };
-  };
-
   NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];
-  # TODO: add libgrss, libenca
+  # TODO: add libgrss, libenca, libosinfo
   buildInputs = [
     bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser
     gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu
@@ -46,6 +44,13 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Tracker;
     description = "Desktop-neutral user information store, search tool and indexer";
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
index 9ed93fbcca9..847e3bf204d 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
@@ -1,5 +1,14 @@
 --- a/src/libtracker-miners-common/tracker-domain-ontology.c
 +++ b/src/libtracker-miners-common/tracker-domain-ontology.c
+@@ -313,7 +313,7 @@
+ 			goto end;
+ 		}
+ 	} else {
+-		path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
++		path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies",
+ 		                         DEFAULT_RULE, NULL);
+ 
+ 		if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
 @@ -372,7 +372,7 @@
  	if (!priv->ontology_location) {
  		gchar *ontology_path;

From bf916629674cd536786fa2854ba1fe90e440b93e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 08:35:54 +0100
Subject: [PATCH 1799/2266] libwnck3: build gir

---
 pkgs/development/libraries/libwnck/3.x.nix    | 38 ++++++++++++-------
 .../install_introspection_to_prefix.patch     | 12 ------
 2 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch

diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 6a835157d96..f2d05d14d69 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,28 +1,38 @@
-{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}:
+{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}:
 
-stdenv.mkDerivation rec{
-  name = "libwnck-${version}";
-  version = "${majorVer}.${minorVer}.${patchVer}";
-
-  majorVer = "3";
-  minorVer = "24";
-  patchVer = "1";
+let
+  pname = "libwnck";
+  version = "3.24.1";
+in stdenv.mkDerivation rec{
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libwnck/${majorVer}.${minorVer}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-  patches = [ ./install_introspection_to_prefix.patch ];
+  configureFlags = [ "--enable-introspection" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool ];
+  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
   propagatedBuildInputs = [ libX11 gtk3 ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [];
   };
 }
diff --git a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
deleted file mode 100644
index 1bcf4a12ea3..00000000000
--- a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libwnck-3.4.7/configure	2013-08-20 14:46:14.000000000 +0000
-+++ libwnck-3.4.7-fix/configure	2014-01-05 17:18:56.665427787 +0000
-@@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; }
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
--       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection

From 4803e6ebbf04bb906ac95220c823889d40a86b5c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 08:41:02 +0100
Subject: [PATCH 1800/2266] gnome3.gfbgraph: build gir

---
 pkgs/desktops/gnome-3/misc/gfbgraph/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 94a29546fb9..8194e3f1699 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json-glib }:
+, gnome3, libsoup, json-glib, gobjectIntrospection }:
 
 let
   pname = "gfbgraph";
@@ -7,15 +7,19 @@ let
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "devdoc" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
   buildInputs = [ glib gnome3.gnome-online-accounts ];
   propagatedBuildInputs = [ libsoup json-glib gnome3.rest ];
 
+  configureFlags = [ "--enable-introspection" ];
+
   enableParallelBuilding = true;
 
   passthru = {

From a6456766dbff7fe211a9e99cbfd0e53dcc16bd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 21 Mar 2018 10:22:38 +0100
Subject: [PATCH 1801/2266] gnome3.gnome-tweaks: init at 3.28.0

Rename `gnome-tweak-tool` to `gnome-tweaks`.
---
 pkgs/desktops/gnome-3/default.nix             |  5 ++--
 .../default.nix                               | 25 +++----------------
 2 files changed, 7 insertions(+), 23 deletions(-)
 rename pkgs/desktops/gnome-3/misc/{gnome-tweak-tool => gnome-tweaks}/default.nix (63%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 42079c22f30..c28695ed8e2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,7 +38,7 @@ let
     gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
     gnome-system-log gnome-system-monitor simple-scan
     gnome-terminal gnome-user-docs evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+    gnome-clocks gnome-music gnome-tweaks gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
     gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
     gnome-getting-started-docs gnome-packagekit gnome-software
@@ -394,7 +394,7 @@ let
 
   gexiv2 = callPackage ./misc/gexiv2 { };
 
-  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+  gnome-tweaks = callPackage ./misc/gnome-tweaks { };
 
   gpaste = callPackage ./misc/gpaste { };
 
@@ -426,6 +426,7 @@ let
   gnome_terminal = gnome-terminal; # added 2018-02-25
   gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
+  gnome-tweak-tool = gnome-tweaks; # added 2018-03-21
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
   libgames-support = libgnome-games-support; # added 2018-03-14
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
similarity index 63%
rename from pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
rename to pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 92220e23145..75b5060d7b3 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -4,14 +4,14 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
 let
-  pname = "gnome-tweak-tool";
-  version = "3.27.3";
+  pname = "gnome-tweaks";
+  version = "3.28.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1z8l1ym6qmhqirsny4hcqv989ilv5mm764y8q7920zprdcjprds3";
+    sha256 = "0d8zxfa8r4n4l6jzyzy6q58padxjlrad3c71mwqidm2ww8nm6i19";
   };
 
   nativeBuildInputs = [
@@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
     libnotify gnome3.gnome-shell python3Packages.pygobject3
     libsoup gnome3.gnome-settings-daemon gnome3.nautilus
     gnome3.mutter gnome3.gnome-desktop gobjectIntrospection
+    gnome3.nautilus
   ];
 
   postPatch = ''
@@ -34,24 +35,6 @@ in stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH")
   '';
 
-  patches = [
-    (fetchurl {
-      name = "find_gsettings.patch";
-      url = https://bugzilla.gnome.org/attachment.cgi?id=365642;
-      sha256 = "14ik1kad0w99xa2wn3d4ynrkhnwchjlqfbaij7p11y5zpiwhaha4";
-    })
-    (fetchurl {
-      name = "0001-Search-for-themes-and-icons-in-system-data-dirs.patch";
-      url = https://bugzilla.gnome.org/attachment.cgi?id=365643;
-      sha256 = "1phq3c7hc9lryih6rp3m5wmp88rfbl6iv42ng4g6bzm1jphgl89f";
-    })
-    (fetchurl {
-      name = "0001-appearance-Don-t-duplicate-the-cursor-theme-name.patch";
-      url = https://bugzilla.gnome.org/attachment.cgi?id=365648;
-      sha256 = "1n9vwsfz4sx72qsi1gd1y7460zmagwirvmi9qrfhc3ahanpyn4fr";
-    })
-  ];
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 046a5784ca6e8aa7a2b490258f0e2b73c79876fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 10:57:15 +0100
Subject: [PATCH 1802/2266] gnome3.accerciser: fix runtime

---
 pkgs/desktops/gnome-3/apps/accerciser/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index a96d4f7a8ea..513948d3b51 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobjectIntrospection
 , itstool, libxml2, python3Packages, at-spi2-core
 , dbus, intltool, libwnck3 }:
 
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ];
+  nativeBuildInputs = [
+    pkgconfig wrapGAppsHook itstool intltool
+    gobjectIntrospection # For setup hook
+  ];
   buildInputs = [
     gtk3 libxml2 python3Packages.python python3Packages.pyatspi
     python3Packages.pygobject3 python3Packages.ipython

From bdfbe578da8d061f46c6a548502f5bc2fe743ff2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 11:38:38 +0100
Subject: [PATCH 1803/2266] corebird: fix build

---
 .../networking/corebird/default.nix           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 6a71afcaf60..216569cc821 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_32
-, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook
+{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
+, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection
 , glib-networking }:
 
 stdenv.mkDerivation rec {
@@ -13,20 +13,24 @@ stdenv.mkDerivation rec {
     sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
   };
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [
+    meson ninja vala_0_40 pkgconfig wrapGAppsHook
+    gobjectIntrospection # for setup hook
+  ];
 
   buildInputs = [
-    gtk3 json-glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib-networking
+    glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
 
+  postPatch = ''
+    chmod +x data/meson_post_install.py # patchShebangs requires executable file
+    patchShebangs data/meson_post_install.py
+  '';
+
   meta = {
     description = "Native Gtk+ Twitter client for the Linux desktop";
     longDescription = "Corebird is a modern, easy and fun Twitter client.";
-    homepage = http://corebird.baedert.org;
+    homepage = https://corebird.baedert.org/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.jonafato ];

From 79092439ca6a243e609319a0cf3514b5c4551c9d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 22:52:47 +0100
Subject: [PATCH 1804/2266] gtkspell3: add gir

---
 pkgs/development/libraries/gtkspell/3.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 2e6ecd7b520..90bc4fc7f82 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,18 +1,22 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection}:
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
   version = "3.0.9";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz";
     sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
   buildInputs = [ aspell gtk3 enchant isocodes ];
   propagatedBuildInputs = [ enchant ];
 
+  configureFlags = [ "--enable-introspection" ];
+
   meta = with stdenv.lib; {
     homepage = http://gtkspell.sourceforge.net/;
     description = "Word-processor-style highlighting GtkTextView widget";

From fefbcbc55018e01a4a167dc465941930bb5c55fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 22:58:31 +0100
Subject: [PATCH 1805/2266] eolie: fix build

---
 ...all-script-handle-in-nix-config-inst.patch | 23 -------------------
 .../networking/browsers/eolie/default.nix     | 17 +++++++-------
 2 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch

diff --git a/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch
deleted file mode 100644
index 770cd8afa9e..00000000000
--- a/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001
-From: Sam Parkinson <sam@sam.today>
-Date: Mon, 27 Nov 2017 11:17:35 +1100
-Subject: [PATCH] Remove post install script - handle in nix config instead
-
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fc45296..2227f1f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,5 +53,3 @@ configure_file(
-   configuration: conf,
-   install_dir: bindir
- )
--
--meson.add_install_script('meson_post_install.py')
--- 
-2.15.0
-
-
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index d1741774d34..9d4c858298d 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
-, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3
+, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection
 , gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
 
 stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.9.16";
 
   src = fetchgit {
-    url = "https://gitlab.gnome.org/gnumdk/eolie";
+    url = https://gitlab.gnome.org/gnumdk/eolie;
     rev = version;
     sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
   };
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
     ninja
     pkgconfig
     wrapGAppsHook
+    gobjectIntrospection
   ];
 
   buildInputs = [
-    git # required to download ad blocking DB
+    glib
     glib-networking
     gsettings-desktop-schemas
     gst_all_1.gstreamer
@@ -47,20 +48,18 @@ stdenv.mkDerivation rec {
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
   '';
 
   patches = [
-    ./0001-Remove-post-install-script-handle-in-nix-config-inst.patch
     ./0001-Extend-the-python-path-rather-than-replacing-it.patch
   ];
 
   meta = with stdenv.lib; {
     description = "A new GNOME web browser";
-    homepage = https://gitlab.gnome.org/gnumdk/eolie;
+    homepage = https://wiki.gnome.org/Apps/Eolie;
     license = licenses.gpl3;
     maintainers = [ maintainers.samdroid-apps ];
     platforms = platforms.linux;

From f7397f21ab841955eb277919f19035cbc336e88b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 21 Mar 2018 23:32:32 +0100
Subject: [PATCH 1806/2266] libcloudproviders: fix build

---
 .../libraries/libcloudproviders/default.nix           |  4 ++++
 .../libraries/libcloudproviders/fix-include.patch     | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/libcloudproviders/fix-include.patch

diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix
index 6f7a79f9eea..fc857bf1ad4 100644
--- a/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/pkgs/development/libraries/libcloudproviders/default.nix
@@ -13,6 +13,10 @@ in stdenv.mkDerivation rec {
     sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g";
   };
 
+  patches = [
+    ./fix-include.patch
+  ];
+
   outputs = [ "out" "dev" "devdoc" ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/libcloudproviders/fix-include.patch b/pkgs/development/libraries/libcloudproviders/fix-include.patch
new file mode 100644
index 00000000000..d6f626436a6
--- /dev/null
+++ b/pkgs/development/libraries/libcloudproviders/fix-include.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -46,7 +46,7 @@
+ bindir = get_option ('bindir')
+ datadir = get_option ('datadir')
+ servicedir = join_paths (datadir, 'dbus-1', 'services')
+-incdir = join_paths (prefix, 'include', 'cloudproviders')
++incdir = join_paths (prefix, get_option('includedir'), 'cloudproviders')
+ 
+ gnome = import('gnome')
+ 

From d0893dc1548302a6dc37ccc75836b09cbc54ab5b Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 22 Mar 2018 07:19:12 +0000
Subject: [PATCH 1807/2266] libguestfs: doInstallCheck only with appliance

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

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 258157c1178..106de68d367 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     ln -s ${appliance} $out/lib/guestfs
   '';
 
-  doInstallCheck = true;
+  doInstallCheck = appliance != null;
   installCheckPhase = ''
     export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
 

From dd556b02baf86e80f1c0a18fbd41366814d82ec3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 08:46:06 +0100
Subject: [PATCH 1808/2266] deja-dup: clean up

---
 pkgs/applications/backup/deja-dup/default.nix | 22 ++++++++-----------
 .../backup/deja-dup/fix-paths.patch           | 21 +++++++++---------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index b0d8ae8d3cf..1ea4b4d2750 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
-, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
+{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
+, gnome3, libnotify, itstool, glib, gtk3, libxml2
 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
 , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
 , appstream-glib, desktop-file-utils, duplicity
@@ -15,20 +15,14 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    ./fix-paths.patch
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit coreutils;
+    })
   ];
 
-  postPatch = ''
-    substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \
-      "/bin/rm" \
-      "${coreutils}/bin/rm"
-  '';
-
-  # couldn't find gio/gdesktopappinfo.h
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   nativeBuildInputs = [
-    meson ninja pkgconfig vala_0_38 gettext intltool itstool
+    meson ninja pkgconfig vala_0_40 gettext itstool
     appstream-glib desktop-file-utils libxml2 wrapGAppsHook
   ];
 
@@ -40,6 +34,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ duplicity ];
 
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch
index 1cc57e6a54a..26126fdc9d5 100644
--- a/pkgs/applications/backup/deja-dup/fix-paths.patch
+++ b/pkgs/applications/backup/deja-dup/fix-paths.patch
@@ -1,12 +1,11 @@
-diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build
-index 04b136f3..ed8f7cba 100644
---- a/deja-dup/nautilus/meson.build
-+++ b/deja-dup/nautilus/meson.build
-@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'],
-     link_with: [dirhandling],
-     dependencies: [nautilus_dep],
-     install: true,
--    install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir'))
-+    install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0'))
+--- a/libdeja/tools/duplicity/DuplicityInstance.vala
++++ b/libdeja/tools/duplicity/DuplicityInstance.vala
+@@ -159,7 +159,7 @@
+     // We already are pretty sure we don't have other duplicities in our
+     // archive directories, because we use our own and we ensure we only have
+     // one deja-dup running at a time via DBus.
+-    Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock");
++    Posix.system("@coreutils@/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock");
  
- endif
+     Process.spawn_async_with_pipes(null, real_argv, real_envp,
+                         SpawnFlags.SEARCH_PATH |

From d04ab628c515910c709c5bac03a7b53506bf0325 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 08:47:40 +0100
Subject: [PATCH 1809/2266] dbus-broker: clean up

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

diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index c97f1b54622..5d0728b7e24 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -17,13 +17,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dbus glib linuxHeaders systemd ];
 
-  enableParallelBuilding = true;
-
-  prePatch = ''
-    substituteInPlace meson.build \
-      --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \
-      --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')"   "'$out/lib/systemd/user'"
-  '';
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
 
   postInstall = ''
     install -Dm644 ../README $out/share/doc/dbus-broker/README
@@ -32,8 +27,6 @@ stdenv.mkDerivation rec {
       -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,'
   '';
 
-  checkPhase = "ninja test";
-
   doCheck = true;
 
   meta = with stdenv.lib; {

From 0bf6fb76f5ec8e218b5d93bbb3ef50ee22cb0827 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 08:49:58 +0100
Subject: [PATCH 1810/2266] pipewire: clean up

---
 pkgs/development/libraries/pipewire/default.nix     | 6 ++----
 pkgs/development/libraries/pipewire/fix-paths.patch | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/pipewire/fix-paths.patch

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 90174bf749a..57580de2401 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -29,15 +29,13 @@ in stdenv.mkDerivation rec {
     alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2
   ];
 
-  patches = [
-    ./fix-paths.patch
-  ];
-
   mesonFlags = [
     "-Denable_docs=true"
     "-Denable_gstreamer=true"
   ];
 
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+
   FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
 
   doCheck = true;
diff --git a/pkgs/development/libraries/pipewire/fix-paths.patch b/pkgs/development/libraries/pipewire/fix-paths.patch
deleted file mode 100644
index 5a07c6271e1..00000000000
--- a/pkgs/development/libraries/pipewire/fix-paths.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/daemon/systemd/user/meson.build
-+++ b/src/daemon/systemd/user/meson.build
-@@ -1,4 +1,4 @@
--systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
-+systemd_user_services_dir = join_paths(get_option('prefix'), 'etc', 'systemd', 'user')
- 
- install_data(sources : 'pipewire.socket', install_dir : systemd_user_services_dir)
- 

From 2abac54c033778104533a269aaa08a1e75f677ad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 09:37:24 +0100
Subject: [PATCH 1811/2266] =?UTF-8?q?colord:=201.4.1=20=E2=86=92=201.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/misc/colord/default.nix           | 23 +++---
 pkgs/tools/misc/colord/fix-build-paths.patch | 74 --------------------
 2 files changed, 11 insertions(+), 86 deletions(-)
 delete mode 100644 pkgs/tools/misc/colord/fix-build-paths.patch

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 9af7de8b35e..043ea44bb8c 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
-, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38
+, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40
 , libgudev, sane-backends, udev, gnome3, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "colord-1.4.1";
+  name = "colord-1.4.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
-    sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib";
+    sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c";
   };
 
-  enableParallelBuilding = true;
-
   mesonFlags = [
     "-Denable-sane=true"
     "-Denable-vala=true"
@@ -23,19 +21,20 @@ stdenv.mkDerivation rec {
     "-Denable-docs=false"
   ];
 
-  patches = [
-    ./fix-build-paths.patch
-  ];
+  nativeBuildInputs = [ meson pkgconfig vala_0_40 ninja gettext libxml2 gobjectIntrospection makeWrapper ];
 
-  nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ];
-
-  buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus
-                  bash-completion argyllcms libgudev sane-backends ];
+  buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ];
 
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
+  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
+  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+
   postFixup = ''
     wrapProgram "$out/libexec/colord-session" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \
diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch
deleted file mode 100644
index d4bf0f36ad7..00000000000
--- a/pkgs/tools/misc/colord/fix-build-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/contrib/session-helper/meson.build
-+++ b/contrib/session-helper/meson.build
-@@ -21,7 +21,7 @@
-     output : 'colord-session.service',
-     configuration : con2,
-     install: true,
--    install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'),
-+    install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'),
-   )
- endif
- 
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -8,13 +8,13 @@
- 
- if get_option('enable-systemd')
-   install_data('colord.conf',
--    install_dir: systemd.get_pkgconfig_variable('tmpfilesdir')
-+    install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d')
-   )
- endif
- 
- if get_option('enable-bash-completion')
-   install_data('colormgr',
--    install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
-+    install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d')
-   )
- endif
- 
-@@ -31,7 +31,7 @@
-     output : 'colord.service',
-     configuration : con2,
-     install: true,
--    install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'),
-+    install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'),
-   )
- endif
- 
-@@ -50,5 +50,5 @@
-   output : 'org.freedesktop.ColorManager.conf',
-   configuration : con2,
-   install: true,
--  install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') ,
-+  install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') ,
- )
---- a/meson.build
-+++ b/meson.build
-@@ -258,6 +258,3 @@
- subdir('policy')
- subdir('rules')
- subdir('src')
--
--meson.add_install_script('meson_post_install.sh',
--                         localstatedir, get_option('with-daemon-user'))
---- a/rules/meson.build
-+++ b/rules/meson.build
-@@ -9,5 +9,5 @@
-     sensor_rules_in,
-     '95-cd-devices.rules',
-   ],
--  install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
-+  install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d')
- )
---- a/src/plugins/meson.build
-+++ b/src/plugins/meson.build
-@@ -66,7 +66,7 @@
-     install_dir: join_paths(get_option('libdir'), 'colord-plugins'),
-     c_args : [
-       cargs,
--      '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'),
-+      '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'),
-     ],
-     dependencies : [
-       gio,

From 319495164ca24744feb18b66e3b4e251d2c29077 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 09:43:51 +0100
Subject: [PATCH 1812/2266] gnome3.libgee: clean up

---
 pkgs/desktops/gnome-3/core/libgee/default.nix       |  7 +++++--
 .../core/libgee/fix_introspection_paths.patch       | 13 -------------
 2 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch

diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index a5ce9ee5e10..a65d0f401f0 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -6,6 +6,8 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
@@ -13,11 +15,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  patches = [ ./fix_introspection_paths.patch ];
-
   nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
   buildInputs = [ glib ];
 
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
deleted file mode 100644
index 67003f45164..00000000000
--- a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection

From 80ce3389405a0876edd1543eb44b30c402723a92 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 09:54:22 +0100
Subject: [PATCH 1813/2266] spice-gtk: clean up

---
 pkgs/development/libraries/spice-gtk/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index a626abc6577..f9b3de36b2c 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -19,23 +19,18 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection
+    spice-protocol celt_0_5_1 openssl libpulseaudio pixman
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
     polkit acl usbutils
   ];
 
-  nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala ];
+  nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
 
-  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
-
-  # put polkit action in the $out/share/polkit-1/actions
-  preAutoreconf = ''
-    substituteInPlace configure.ac \
-      --replace 'POLICYDIR=`''${PKG_CONFIG} polkit-gobject-1 --variable=policydir`' "POLICYDIR=$out/share/polkit-1/actions"
-  '';
+  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
   configureFlags = [
     "--with-gtk3"
+    "--enable-introspection"
     "--enable-vala"
   ];
 

From 01f29bb0c077a9efa3c09e80d6f9dadea3fa364e Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Thu, 22 Mar 2018 17:41:10 +0800
Subject: [PATCH 1814/2266] pythonPackages.notebook: cleanup

As discussed in https://github.com/NixOS/nixpkgs/pull/37607#issuecomment-375226186.
---
 pkgs/development/python-modules/notebook/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 443cfa7ccb9..12e2d15dcc6 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.utf8";
 
-  buildInputs = [ nose glibcLocales ]
+  checkInputs = [ nose glibcLocales ]
     ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
 
   propagatedBuildInputs = [
@@ -43,9 +43,9 @@ buildPythonPackage rec {
 
   # disable warning_filters
   preCheck = lib.optionalString (!isPy3k) ''
-    echo "" > setup.cfg
-    cat setup.cfg
+    touch setup.cfg
   '';
+
   checkPhase = ''
     runHook preCheck
     mkdir tmp

From 31914502cb4b6657f1509abd7dfdfd503f4645d3 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Tue, 20 Mar 2018 22:08:16 +0100
Subject: [PATCH 1815/2266] st: add dmenu dependency

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

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 825a37faf1e..c7512a8ac27 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
-, fontconfig, conf ? null, patches ? [], extraLibs ? []}:
+{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext
+, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}:
 
 with stdenv.lib;
 
@@ -17,11 +17,12 @@ in stdenv.mkDerivation rec {
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
 
   installPhase = ''
     TERMINFO=$out/share/terminfo make install PREFIX=$out
+    wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin"
   '';
 
   meta = {

From f68871764daf282c537297adf296aa204b023e25 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 22 Mar 2018 10:13:21 +0000
Subject: [PATCH 1816/2266] treewide: replace depecated alias s/mssys/ms-sys/g

---
 nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +-
 nixos/modules/profiles/base.nix                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index ba84cd51098..6d4ba96dba0 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -54,7 +54,7 @@ in
   environment.systemPackages =
     [ pkgs.w3m # needed for the manual anyway
       pkgs.testdisk # useful for repairing boot problems
-      pkgs.mssys # for writing Microsoft boot sectors / MBRs
+      pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
       pkgs.parted
       pkgs.ddrescue
       pkgs.ccrypt
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 39b8553976e..3bf06a95119 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -9,7 +9,7 @@
   environment.systemPackages = [
     pkgs.w3m-nox # needed for the manual anyway
     pkgs.testdisk # useful for repairing boot problems
-    pkgs.mssys # for writing Microsoft boot sectors / MBRs
+    pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
     pkgs.efibootmgr
     pkgs.efivar
     pkgs.parted

From dfba22e28a4a5f886a9eb6e5d7e9716170efbe0e Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 22 Mar 2018 11:25:23 +0000
Subject: [PATCH 1817/2266] mucommander: init at 0.9.2 (#37610)

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

diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix
new file mode 100644
index 00000000000..fdb236194f9
--- /dev/null
+++ b/pkgs/applications/misc/mucommander/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }:
+
+let
+  version = "0.9.2";
+  name = "mucommander-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mucommander";
+    repo = "mucommander";
+    rev = version;
+    sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8";
+  };
+  
+  postPatch = ''
+    # there is no .git anyway
+    substituteInPlace build.gradle \
+      --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))"  "" \
+      --replace "revision = git.head().id"                          "revision = 'abcdefgh'"
+
+    # disable gradle plugins with native code and their targets
+    perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
+    perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar)/ ... /^}/" build.gradle
+
+    # fix source encoding
+    find . -type f -name build.gradle \
+      -exec perl -i.bak3 -pe "s#(repositories\.jcenter\(\))#
+                                \1
+                                compileJava.options.encoding = 'UTF-8'
+                                compileTestJava.options.encoding = 'UTF-8'
+                               #" {} \;
+  '';
+
+  # fake build to pre-download deps into fixed-output derivation
+  deps = stdenv.mkDerivation {
+    name = "${name}-deps";
+    inherit src postPatch;
+    nativeBuildInputs = [ gradle_3_5 perl ];
+    buildPhase = ''
+      export GRADLE_USER_HOME=$(mktemp -d)
+      gradle --no-daemon build
+    '';
+    # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+    installPhase = ''
+      find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | sh
+    '';
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7";
+  };
+
+in stdenv.mkDerivation {
+  inherit name src postPatch;
+  nativeBuildInputs = [ gradle_3_5 perl makeWrapper ];
+
+  buildPhase = ''
+    export GRADLE_USER_HOME=$(mktemp -d)
+
+    # point to offline repo
+    find . -type f -name build.gradle \
+      -exec perl -i.bak3 -pe "s#repositories\.jcenter\(\)#
+                                repositories { mavenLocal(); maven { url '${deps}' } }
+                               #" {} \;
+
+    gradle --offline --no-daemon build
+  '';
+
+  installPhase = ''
+    mkdir $out
+    tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1
+    wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.mucommander.com/;
+    description = "Cross-platform file manager";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ volth ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c352ed0f6e7..ae0d11474b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16761,6 +16761,8 @@ with pkgs;
 
   mtpaint = callPackage ../applications/graphics/mtpaint { };
 
+  mucommander = callPackage ../applications/misc/mucommander { };
+
   multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
 
   multimon-ng = callPackage ../applications/misc/multimon-ng { };

From b9b08f8a093e8981121697fbdf61bfd714acd6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 22 Mar 2018 11:27:02 +0000
Subject: [PATCH 1818/2266] webstorm: fix incorrect jre usuage

it tried to use its own jre, which is not patched

fixes #36943 #37328
---
 pkgs/applications/editors/jetbrains/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a4a71c12820..3c557438823 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -211,7 +211,7 @@ let
     });
 
   buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
-    (mkJetBrainsProduct {
+    lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "WebStorm";
       meta = with stdenv.lib; {
@@ -225,8 +225,13 @@ let
         maintainers = with maintainers; [ abaldeau ];
         platforms = platforms.linux;
       };
+    }) (attrs: {
+      patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
+        # Webstorm tries to use bundled jre if available.
+        # Lets prevent this for the moment
+        rm -r jre64
+      '';
     });
-
 in
 
 {

From 05eafd27b15ff3d5848226061b4f8bbd96de1137 Mon Sep 17 00:00:00 2001
From: gspia <iahogsp@gmail.com>
Date: Thu, 22 Mar 2018 14:12:27 +0200
Subject: [PATCH 1819/2266] kakoune: 2018-02-15 -> 2018-03-22 (#37617)

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

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 404160668b4..868dfaf3d12 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-unstable-${version}";
-  version = "2018-02-15";
+  version = "2018-03-22";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "f5e39972eb525166dc5b1d963067f79990991a75";
-    sha256 = "160a302xg6nfzx49dkis6ij20kyzr63kxvcv8ld3l07l8k69g80r";
+    rev = "f8e297acef1be0657b779fea5256f606a6c6a3a3";
+    sha256 = "14xmw3lkwzppm9bns55nmyb1lfihzhdyisf6xjqlszdj4mcf94jl";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];

From 43580b680048ca2882f28c806262f803341f5c94 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 13:27:31 +0100
Subject: [PATCH 1820/2266] libmypaint: fix build with automake 1.16

---
 pkgs/development/libraries/libmypaint/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 0583d94ef7f..8719f19acc1 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -1,4 +1,4 @@
-{stdenv, autoconf, automake, fetchFromGitHub, glib, intltool, json_c, libtool, pkgconfig}:
+{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}:
 
 let
   version = "1.3.0";
@@ -12,6 +12,14 @@ in stdenv.mkDerivation rec {
     sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc";
   };
 
+  patches = [
+    # build with automake 1.16
+    (fetchpatch {
+      url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch;
+      sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi";
+    })
+  ];
+
   nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
 
   buildInputs = [ glib ];

From cafd433e8c1108f2dd6f196a07218e5782661e4f Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Thu, 22 Mar 2018 20:48:09 +0800
Subject: [PATCH 1821/2266] python2Packages.notebook: fix tests

These were accidentally broken by #37615.
---
 pkgs/development/python-modules/notebook/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 12e2d15dcc6..37c5774bba2 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   # disable warning_filters
   preCheck = lib.optionalString (!isPy3k) ''
-    touch setup.cfg
+    echo "" > setup.cfg
   '';
 
   checkPhase = ''

From 7b539c06297f1ca84e475fb1018fe50114f2447e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 22 Mar 2018 13:57:41 +0100
Subject: [PATCH 1822/2266] Fix typo

---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8ab1fbc8873..49588a58993 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -941,8 +941,8 @@ rec {
     };
 
     ubuntu1710i386 = {
-      name = "ubuntu-17.10-xenial-i386";
-      fullName = "Ubuntu 17.10 Xenial (i386)";
+      name = "ubuntu-17.10-artful-i386";
+      fullName = "Ubuntu 17.10 Artful (i386)";
       packagesLists =
         [ (fetchurl {
             url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz;

From ac885e078ef305e05cc08e1c0028000f7a0c934d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 22 Mar 2018 09:16:01 -0400
Subject: [PATCH 1823/2266] linux-copperhead: 4.15.11.a -> 4.15.12.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index cb0b9b10be1..94885efef90 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.11";
+  version = "4.15.12";
   revision = "a";
-  sha256 = "09xyg3i2m5cv9cpl3pry579p40iphzsn1pif7046rvc7zfrjzl8d";
+  sha256 = "1n0sqhqvm9p6w1yh7si8rw84qxf9c5kch7pvjyrp51ir1xh7grfr";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 5b7f7a28d5fc1cba7cc8ce419ca0fcd51d230fe4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 22 Mar 2018 09:16:26 -0400
Subject: [PATCH 1824/2266] linux: 4.4.122 -> 4.4.123

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 5994a081600..58abf35e92b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.122";
+  version = "4.4.123";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hxph2bn2wdamk1p5sxl2szgsk4aybb0245x1rvf85a6skhjqc7g";
+    sha256 = "115mvgwcx2syjrn943k4qqyvqkysdm6rgq97dhf1gcxf671qb204";
   };
 } // (args.argsOverride or {}))

From dfdf9f77b0a9881c16d15b32e99d75a86e2cd822 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 22 Mar 2018 09:16:39 -0400
Subject: [PATCH 1825/2266] linux: 4.9.88 -> 4.9.89

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 3bcfa3912aa..0b18a624167 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.88";
+  version = "4.9.89";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "094cxc86ajnsai1vwy76mmg7l3b9lvhk6mw6746lsr3fnzv1fkq7";
+    sha256 = "0a9l2gkyr1nhaak6vyjwgjn01ywpxwa8zp5fhw8rjnfk44bf2hql";
   };
 } // (args.argsOverride or {}))

From f2bd9d4745041fe0c0a49803094dd625ebd27342 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 22 Mar 2018 14:33:15 +0100
Subject: [PATCH 1826/2266] xcodeenv: replace deprecated package application
 procedure by the new export archive operation

---
 .../development/mobile/xcodeenv/build-app.nix | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index d208f26ab67..436b55631b6 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -12,6 +12,7 @@
 , certificateFile ? null
 , certificatePassword ? null
 , provisioningProfile ? null
+, signMethod ? null
 , generateIPA ? false
 , generateXCArchive ? false
 , enableWirelessDistribution ? false
@@ -21,7 +22,7 @@
 , title ? null
 }:
 
-assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null;
+assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null;
 assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null;
 
 let
@@ -82,13 +83,34 @@ stdenv.mkDerivation {
     # Do the building
     export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works
 
-    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
 
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''
+        # Create export plist file
+        cat > "${name}.plist" <<EOF
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        <dict>
+            <key>provisioningProfiles</key>
+            <dict>
+                <key>${bundleId}</key>
+                <string>$PROVISIONING_PROFILE</string>
+            </dict>
+            <key>method</key>
+            <string>${signMethod}</string>
+            ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
+              <key>compileBitcode</key>
+              <false/>
+            ''}
+        </dict>
+        </plist>
+        EOF
+
         # Produce an IPA file
-        xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa"
-        
+        xcodebuild -exportArchive -archivePath "${name}.xcarchive" -exportOptionsPlist "${name}.plist" -exportPath $out
+
         # Add IPA to Hydra build products
         mkdir -p $out/nix-support
         echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products

From f4d03b5c9cf2b694792dec88e3ca805cf7b43e3c Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 9 Mar 2018 21:33:09 +0100
Subject: [PATCH 1827/2266] nixos/prometheus-exporters: rewrite and restructure

- prometheus exporters are now configured with
  `services.prometheus.exporters.<name>`
- the exporters are now defined by attribute sets
  from which the options for each exporter are generated
- most of the exporter definitions are used unchanged,
  except for some changes that should't have any impact
  on the functionality.
---
 nixos/modules/module-list.nix                 |  11 +-
 nixos/modules/rename.nix                      |   8 +-
 .../prometheus/blackbox-exporter.nix          |  68 -------
 .../prometheus/collectd-exporter.nix          | 128 -------------
 .../monitoring/prometheus/exporters.nix       | 169 ++++++++++++++++++
 .../prometheus/exporters/blackbox.nix         |  31 ++++
 .../prometheus/exporters/collectd.nix         |  78 ++++++++
 .../prometheus/exporters/fritzbox.nix         |  39 ++++
 .../monitoring/prometheus/exporters/json.nix  |  36 ++++
 .../monitoring/prometheus/exporters/minio.nix |  65 +++++++
 .../monitoring/prometheus/exporters/nginx.nix |  31 ++++
 .../monitoring/prometheus/exporters/node.nix  |  39 ++++
 .../monitoring/prometheus/exporters/snmp.nix  |  71 ++++++++
 .../monitoring/prometheus/exporters/unifi.nix |  67 +++++++
 .../prometheus/exporters/varnish.nix          |  21 +++
 .../prometheus/fritzbox-exporter.nix          |  76 --------
 .../monitoring/prometheus/json-exporter.nix   |  74 --------
 .../monitoring/prometheus/minio-exporter.nix  | 117 ------------
 .../monitoring/prometheus/nginx-exporter.nix  |  78 --------
 .../monitoring/prometheus/node-exporter.nix   |  87 ---------
 .../monitoring/prometheus/snmp-exporter.nix   | 127 -------------
 .../monitoring/prometheus/unifi-exporter.nix  | 105 -----------
 .../prometheus/varnish-exporter.nix           |  61 -------
 23 files changed, 655 insertions(+), 932 deletions(-)
 delete mode 100644 nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/json.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/minio.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/node.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/json-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/minio-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/node-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
 delete mode 100644 nixos/modules/services/monitoring/prometheus/varnish-exporter.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e0c0ec2711b..0e5409bc9de 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -398,16 +398,7 @@
   ./services/monitoring/osquery.nix
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/alertmanager.nix
-  ./services/monitoring/prometheus/blackbox-exporter.nix
-  ./services/monitoring/prometheus/collectd-exporter.nix
-  ./services/monitoring/prometheus/fritzbox-exporter.nix
-  ./services/monitoring/prometheus/json-exporter.nix
-  ./services/monitoring/prometheus/minio-exporter.nix
-  ./services/monitoring/prometheus/nginx-exporter.nix
-  ./services/monitoring/prometheus/node-exporter.nix
-  ./services/monitoring/prometheus/snmp-exporter.nix
-  ./services/monitoring/prometheus/unifi-exporter.nix
-  ./services/monitoring/prometheus/varnish-exporter.nix
+  ./services/monitoring/prometheus/exporters.nix
   ./services/monitoring/riemann.nix
   ./services/monitoring/riemann-dash.nix
   ./services/monitoring/riemann-tools.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 489d7d8b9b5..b0ca274b939 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -240,5 +240,11 @@ with lib;
 
     # Xen
     (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
-  ];
+  ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
+                   "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
+                   "snmpExporter" "unifiExporter" "varnishExporter" ]
+       (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''
+         The prometheus exporters are now configured using `services.prometheus.exporters'.
+         See the 18.03 release notes for more information.
+       '' ));
 }
diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
deleted file mode 100644
index ce2e1cf2d74..00000000000
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.blackboxExporter;
-in {
-  options = {
-    services.prometheus.blackboxExporter = {
-      enable = mkEnableOption "prometheus blackbox exporter";
-
-      configFile = mkOption {
-        type = types.path;
-        description = ''
-          Path to configuration file.
-        '';
-      };
-
-      port = mkOption {
-        type = types.int;
-        default = 9115;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the blackbox exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-blackbox-exporter = {
-      description = "Prometheus exporter for blackbox probes";
-      unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        User = "nobody";
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
-        ExecStart = ''
-          ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
-            --web.listen-address :${toString cfg.port} \
-            --config.file ${cfg.configFile} \
-            ${concatStringsSep " \\\n  " cfg.extraFlags}
-        '';
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
deleted file mode 100644
index f8a5b9576a1..00000000000
--- a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.collectdExporter;
-
-  collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
-    -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
-    -collectd.security-level ${cfg.collectdBinary.securityLevel} \
-  '' else "";
-
-in {
-  options = {
-    services.prometheus.collectdExporter = {
-      enable = mkEnableOption "prometheus collectd exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9103;
-        description = ''
-          Port to listen on.
-          This is used for scraping as well as the to receive collectd data via the write_http plugin.
-        '';
-      };
-
-      listenAddress = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "0.0.0.0";
-        description = ''
-          Address to listen on for web interface, telemetry and collectd JSON data.
-        '';
-      };
-
-      collectdBinary = {
-        enable = mkEnableOption "collectd binary protocol receiver";
-
-        authFile = mkOption {
-          default = null;
-          type = types.nullOr types.path;
-          description = "File mapping user names to pre-shared keys (passwords).";
-        };
-
-        port = mkOption {
-          type = types.int;
-          default = 25826;
-          description = ''Network address on which to accept collectd binary network packets.'';
-        };
-
-        listenAddress = mkOption {
-          type = types.nullOr types.str;
-          default = null;
-          example = "0.0.0.0";
-          description = ''
-            Address to listen on for binary network packets.
-            '';
-        };
-
-        securityLevel = mkOption {
-          type = types.enum ["None" "Sign" "Encrypt"];
-          default = "None";
-          description = ''
-            Minimum required security level for accepted packets.
-            '';
-        };
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the collectd exporter.
-        '';
-      };
-
-      logFormat = mkOption {
-        type = types.str;
-        default = "logger:stderr";
-        example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
-        description = ''
-          Set the log target and format.
-        '';
-      };
-
-      logLevel = mkOption {
-        type = types.enum ["debug" "info" "warn" "error" "fatal"];
-        default = "info";
-        description = ''
-          Only log messages with the given severity or above.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = (optional cfg.openFirewall cfg.port) ++
-      (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port);
-
-    systemd.services.prometheus-collectd-exporter = {
-      description = "Prometheus exporter for Collectd metrics";
-      unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        DynamicUser = true;
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecStart = ''
-          ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
-            -log.format ${cfg.logFormat} \
-            -log.level ${cfg.logLevel} \
-            -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
-            ${collectSettingsArgs} \
-            ${concatStringsSep " " cfg.extraFlags}
-        '';
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
new file mode 100644
index 00000000000..4315194ed32
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -0,0 +1,169 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters;
+
+  # each attribute in `exporterOpts` is expected to have specified:
+  #   - port        (types.int):   port on which the exporter listens
+  #   - serviceOpts (types.attrs): config that is merged with the
+  #                                default definition of the exporter's
+  #                                systemd service
+  #   - extraOpts   (types.attrs): extra configuration options to
+  #                                configure the exporter with, which
+  #                                are appended to the default options
+  #
+  #  Note that `extraOpts` is optional, but a script for the exporter's
+  #  systemd service must be provided by specifying either
+  #  `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart`
+  exporterOpts = {
+    blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; };
+    collectd = import ./exporters/collectd.nix { inherit config lib pkgs; };
+    fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; };
+    json     = import ./exporters/json.nix     { inherit config lib pkgs; };
+    minio    = import ./exporters/minio.nix    { inherit config lib pkgs; };
+    nginx    = import ./exporters/nginx.nix    { inherit config lib pkgs; };
+    node     = import ./exporters/node.nix     { inherit config lib pkgs; };
+    snmp     = import ./exporters/snmp.nix     { inherit config lib pkgs; };
+    unifi    = import ./exporters/unifi.nix    { inherit config lib pkgs; };
+    varnish  = import ./exporters/varnish.nix  { inherit config lib pkgs; };
+  };
+
+  mkExporterOpts = ({ name, port }: {
+    enable = mkEnableOption "the prometheus ${name} exporter";
+    port = mkOption {
+      type = types.int;
+      default = port;
+      description = ''
+        Port to listen on.
+      '';
+    };
+    listenAddress = mkOption {
+      type = types.str;
+      default = "0.0.0.0";
+      description = ''
+        Address to listen on.
+      '';
+    };
+    extraFlags = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra commandline options to pass to the ${name} exporter.
+      '';
+    };
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Open port in firewall for incoming connections.
+      '';
+    };
+    firewallFilter = mkOption {
+      type = types.str;
+      default = "-p tcp -m tcp --dport ${toString port}";
+      example = literalExample ''
+        "-i eth0 -p tcp -m tcp --dport ${toString port}"
+      '';
+      description = ''
+        Specify a filter for iptables to use when
+        <option>services.prometheus.exporters.${name}.openFirewall</option>
+        is true. It is used as `ip46tables -I INPUT <option>firewallFilter</option> -j ACCEPT`.
+      '';
+    };
+    user = mkOption {
+      type = types.str;
+      default = "nobody";
+      description = ''
+        User name under which the ${name} exporter shall be run.
+        Has no effect when <option>systemd.services.prometheus-${name}-exporter.serviceConfig.DynamicUser</option> is true.
+      '';
+    };
+    group = mkOption {
+      type = types.str;
+      default = "nobody";
+      description = ''
+        Group under which the ${name} exporter shall be run.
+        Has no effect when <option>systemd.services.prometheus-${name}-exporter.serviceConfig.DynamicUser</option> is true.
+      '';
+    };
+  });
+
+  mkSubModule = { name, port, extraOpts, serviceOpts }: {
+    ${name} = mkOption {
+      type = types.submodule {
+        options = (mkExporterOpts {
+          inherit name port;
+        } // extraOpts);
+      };
+      internal = true;
+      default = {};
+    };
+  };
+
+  mkSubModules = (foldl' (a: b: a//b) {}
+    (mapAttrsToList (name: opts: mkSubModule {
+      inherit name;
+      inherit (opts) port serviceOpts;
+      extraOpts = opts.extraOpts or {};
+    }) exporterOpts)
+  );
+
+  mkExporterConf = { name, conf, serviceOpts }:
+    mkIf conf.enable {
+      networking.firewall.extraCommands = mkIf conf.openFirewall ''
+        ip46tables -I INPUT ${conf.firewallFilter} -j ACCEPT
+      '';
+      systemd.services."prometheus-${name}-exporter" = mkMerge ([{
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        serviceConfig = {
+          Restart = mkDefault "always";
+          PrivateTmp = mkDefault true;
+          WorkingDirectory = mkDefault /tmp;
+        } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) {
+          User = conf.user;
+          Group = conf.group;
+        };
+      } serviceOpts ]);
+  };
+in
+{
+  options.services.prometheus.exporters = mkOption {
+    type = types.submodule {
+      options = (mkSubModules);
+    };
+    description = "Prometheus exporter configuration";
+    default = {};
+    example = literalExample ''
+      {
+        node = {
+          enable = true;
+          enabledCollectors = [ "systemd" ];
+        };
+        varnish.enable = true;
+      }
+    '';
+  };
+
+  config = mkMerge ([{
+    assertions = [{
+      assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null);
+      message = ''
+        Please ensure you have either `services.prometheus.exporters.snmp.configuration'
+          or `services.prometheus.exporters.snmp.configurationPath' set!
+      '';
+    }];
+  }] ++ [(mkIf config.services.minio.enable {
+    services.prometheus.exporters.minio.minioAddress  = mkDefault "http://localhost:9000";
+    services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
+    services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;
+  })] ++ (mapAttrsToList (name: conf:
+    mkExporterConf {
+      inherit name;
+      inherit (conf) serviceOpts;
+      conf = cfg.${name};
+    }) exporterOpts)
+  );
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
new file mode 100644
index 00000000000..d09d1c4f366
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.blackbox;
+in
+{
+  port = 9115;
+  extraOpts = {
+    configFile = mkOption {
+      type = types.path;
+      description = ''
+        Path to configuration file.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          --config.file ${cfg.configFile} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+      ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
new file mode 100644
index 00000000000..0eba3527162
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
@@ -0,0 +1,78 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.collectd;
+in
+{
+  port = 9103;
+  extraOpts = {
+    collectdBinary = {
+      enable = mkEnableOption "collectd binary protocol receiver";
+
+      authFile = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = "File mapping user names to pre-shared keys (passwords).";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 25826;
+        description = ''Network address on which to accept collectd binary network packets.'';
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          Address to listen on for binary network packets.
+          '';
+      };
+
+      securityLevel = mkOption {
+        type = types.enum ["None" "Sign" "Encrypt"];
+        default = "None";
+        description = ''
+          Minimum required security level for accepted packets.
+        '';
+      };
+    };
+
+    logFormat = mkOption {
+      type = types.str;
+      default = "logger:stderr";
+      example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
+      description = ''
+        Set the log target and format.
+      '';
+    };
+
+    logLevel = mkOption {
+      type = types.enum ["debug" "info" "warn" "error" "fatal"];
+      default = "info";
+      description = ''
+        Only log messages with the given severity or above.
+      '';
+    };
+  };
+  serviceOpts = let
+    collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
+      -collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
+      -collectd.security-level ${cfg.collectdBinary.securityLevel} \
+    '' else "";
+  in {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
+          -log.format ${cfg.logFormat} \
+          -log.level ${cfg.logLevel} \
+          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          ${collectSettingsArgs} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
new file mode 100644
index 00000000000..a3f1d9d3132
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.fritzbox;
+in
+{
+  port = 9133;
+  extraOpts = {
+    gatewayAddress = mkOption {
+      type = types.str;
+      default = "fritz.box";
+      description = ''
+        The hostname or IP of the FRITZ!Box.
+      '';
+    };
+
+    gatewayPort = mkOption {
+      type = types.int;
+      default = 49000;
+      description = ''
+        The port of the FRITZ!Box UPnP service.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \
+          -listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          -gateway-address ${cfg.gatewayAddress} \
+          -gateway-port ${toString cfg.gatewayPort} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
new file mode 100644
index 00000000000..a5494e85e01
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.json;
+in
+{
+  port = 7979;
+  extraOpts = {
+    url = mkOption {
+      type = types.str;
+      description = ''
+        URL to scrape JSON from.
+      '';
+    };
+    configFile = mkOption {
+      type = types.path;
+      description = ''
+        Path to configuration file.
+      '';
+    };
+    listenAddress = {}; # not used
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
+          --port ${toString cfg.port} \
+          ${cfg.url} ${cfg.configFile} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
new file mode 100644
index 00000000000..3cc4ffdbc8f
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
@@ -0,0 +1,65 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.minio;
+in
+{
+  port = 9290;
+  extraOpts = {
+    minioAddress = mkOption {
+      type = types.str;
+      example = "https://10.0.0.1:9000";
+      description = ''
+        The URL of the minio server.
+        Use HTTPS if Minio accepts secure connections only.
+        By default this connects to the local minio server if enabled.
+      '';
+    };
+
+    minioAccessKey = mkOption {
+      type = types.str;
+      example = "yourMinioAccessKey";
+      description = ''
+        The value of the Minio access key.
+        It is required in order to connect to the server.
+        By default this uses the one from the local minio server if enabled
+        and <literal>config.services.minio.accessKey</literal>.
+      '';
+    };
+
+    minioAccessSecret = mkOption {
+      type = types.str;
+      description = ''
+        The value of the Minio access secret.
+        It is required in order to connect to the server.
+        By default this uses the one from the local minio server if enabled
+        and <literal>config.services.minio.secretKey</literal>.
+      '';
+    };
+
+    minioBucketStats = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Collect statistics about the buckets and files in buckets.
+        It requires more computation, use it carefully in case of large buckets..
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
+          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          -minio.server ${cfg.minioAddress} \
+          -minio.access-key ${cfg.minioAccessKey} \
+          -minio.access-secret ${cfg.minioAccessSecret} \
+          ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
new file mode 100644
index 00000000000..6a3ba2d0457
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.nginx;
+in
+{
+  port = 9113;
+  extraOpts = {
+    scrapeUri = mkOption {
+      type = types.string;
+      default = "http://localhost/nginx_status";
+      description = ''
+        Address to access the nginx status page.
+        Can be enabled with services.nginx.statusPage = true.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
+          -nginx.scrape_uri '${cfg.scrapeUri}' \
+          -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
new file mode 100644
index 00000000000..c85f5f9cfb2
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.node;
+in
+{
+  port = 9100;
+  extraOpts = {
+    enabledCollectors = mkOption {
+      type = types.listOf types.string;
+      default = [];
+      example = ''[ "systemd" ]'';
+      description = ''
+        Collectors to enable. The collectors listed here are enabled in addition to the default ones.
+      '';
+    };
+    disabledCollectors = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = ''[ "timex" ]'';
+      description = ''
+        Collectors to disable which are enabled by default.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      ExecStart = ''
+        ${pkgs.prometheus-node-exporter}/bin/node_exporter \
+          ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
+          ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
new file mode 100644
index 00000000000..404cd0a1896
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -0,0 +1,71 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.snmp;
+in
+{
+  port = 9116;
+  extraOpts = {
+    configurationPath = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option.
+      '';
+      example = "./snmp.yml";
+    };
+
+    configuration = mkOption {
+      type = types.nullOr types.attrs;
+      default = {};
+      description = ''
+        Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
+      '';
+      example = ''
+        {
+          "default" = {
+            "version" = 2;
+            "auth" = {
+              "community" = "public";
+            };
+          };
+        };
+      '';
+    };
+
+    logFormat = mkOption {
+      type = types.str;
+      default = "logger:stderr";
+      description = ''
+        Set the log target and format.
+      '';
+    };
+
+    logLevel = mkOption {
+      type = types.enum ["debug" "info" "warn" "error" "fatal"];
+      default = "info";
+      description = ''
+        Only log messages with the given severity or above.
+      '';
+    };
+  };
+  serviceOpts = let
+    configFile = if cfg.configurationPath != null
+                 then cfg.configurationPath
+                 else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}";
+    in {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
+          -config.file ${configFile} \
+          -log.format ${cfg.logFormat} \
+          -log.level ${cfg.logLevel} \
+          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
new file mode 100644
index 00000000000..011dcbe208e
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.unifi;
+in
+{
+  port = 9130;
+  extraOpts = {
+    unifiAddress = mkOption {
+      type = types.str;
+      example = "https://10.0.0.1:8443";
+      description = ''
+        URL of the UniFi Controller API.
+      '';
+    };
+
+    unifiInsecure = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        If enabled skip the verification of the TLS certificate of the UniFi Controller API.
+        Use with caution.
+      '';
+    };
+
+    unifiUsername = mkOption {
+      type = types.str;
+      example = "ReadOnlyUser";
+      description = ''
+        username for authentication against UniFi Controller API.
+      '';
+    };
+
+    unifiPassword = mkOption {
+      type = types.str;
+      description = ''
+        Password for authentication against UniFi Controller API.
+      '';
+    };
+
+    unifiTimeout = mkOption {
+      type = types.str;
+      default = "5s";
+      example = "2m";
+      description = ''
+        Timeout including unit for UniFi Controller API requests.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
+          -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \
+          -unifi.addr ${cfg.unifiAddress} \
+          -unifi.username ${cfg.unifiUsername} \
+          -unifi.password ${cfg.unifiPassword} \
+          -unifi.timeout ${cfg.unifiTimeout} \
+          ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
new file mode 100644
index 00000000000..b439a83e7aa
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.varnish;
+in
+{
+  port = 9131;
+  serviceOpts = {
+    path = [ pkgs.varnish ];
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
+          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
deleted file mode 100644
index 6da39b6519c..00000000000
--- a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.fritzboxExporter;
-in {
-  options = {
-    services.prometheus.fritzboxExporter = {
-      enable = mkEnableOption "prometheus fritzbox exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9133;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      gatewayAddress = mkOption {
-        type = types.str;
-        default = "fritz.box";
-        description = ''
-          The hostname or IP of the FRITZ!Box.
-        '';
-      };
-
-      gatewayPort = mkOption {
-        type = types.int;
-        default = 49000;
-        description = ''
-          The port of the FRITZ!Box UPnP service.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the fritzbox exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-fritzbox-exporter = {
-      description = "Prometheus exporter for FRITZ!Box via UPnP";
-      unitConfig.Documentation = "https://github.com/ndecker/fritzbox_exporter";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        User = "nobody";
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecStart = ''
-          ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \
-            -listen-address :${toString cfg.port} \
-            -gateway-address ${cfg.gatewayAddress} \
-            -gateway-port ${toString cfg.gatewayPort} \
-            ${concatStringsSep " \\\n  " cfg.extraFlags}
-        '';
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix
deleted file mode 100644
index 6bc56df9834..00000000000
--- a/nixos/modules/services/monitoring/prometheus/json-exporter.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.jsonExporter;
-in {
-  options = {
-    services.prometheus.jsonExporter = {
-      enable = mkEnableOption "prometheus JSON exporter";
-
-      url = mkOption {
-        type = types.str;
-        description = ''
-          URL to scrape JSON from.
-        '';
-      };
-
-      configFile = mkOption {
-        type = types.path;
-        description = ''
-          Path to configuration file.
-        '';
-      };
-
-      port = mkOption {
-        type = types.int;
-        default = 7979;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the JSON exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-json-exporter = {
-      description = "Prometheus exporter for JSON over HTTP";
-      unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        User = "nobody";
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecStart = ''
-          ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
-            --port ${toString cfg.port} \
-            ${cfg.url} ${cfg.configFile} \
-            ${concatStringsSep " \\\n  " cfg.extraFlags}
-        '';
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
deleted file mode 100644
index 4314671523c..00000000000
--- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.minioExporter;
-in {
-  options = {
-    services.prometheus.minioExporter = {
-      enable = mkEnableOption "prometheus minio exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9290;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      listenAddress = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "0.0.0.0";
-        description = ''
-          Address to listen on for web interface and telemetry.
-        '';
-      };
-
-      minioAddress = mkOption {
-        type = types.str;
-        example = "https://10.0.0.1:9000";
-        default = if config.services.minio.enable then "http://localhost:9000" else null;
-        description = ''
-          The URL of the minio server.
-          Use HTTPS if Minio accepts secure connections only.
-          By default this connects to the local minio server if enabled.
-        '';
-      };
-
-      minioAccessKey = mkOption ({
-        type = types.str;
-        example = "BKIKJAA5BMMU2RHO6IBB";
-        description = ''
-          The value of the Minio access key.
-          It is required in order to connect to the server.
-          By default this uses the one from the local minio server if enabled
-          and <literal>config.services.minio.accessKey</literal>.
-        '';
-      } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") {
-        default = config.services.minio.accessKey;
-      });
-
-      minioAccessSecret = mkOption ({
-        type = types.str;
-        description = ''
-          The calue of the Minio access secret.
-          It is required in order to connect to the server.
-          By default this uses the one from the local minio server if enabled
-          and <literal>config.services.minio.secretKey</literal>.
-        '';
-      } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") {
-        default = config.services.minio.secretKey;
-      });
-
-      minioBucketStats = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Collect statistics about the buckets and files in buckets.
-          It requires more computation, use it carefully in case of large buckets..
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the minio exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-minio-exporter = {
-      description = "Prometheus exporter for Minio server metrics";
-      unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter";
-      wantedBy = [ "multi-user.target" ];
-      after = optional config.services.minio.enable "minio.service";
-      serviceConfig = {
-        DynamicUser = true;
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecStart = ''
-          ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
-            -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
-            -minio.server ${cfg.minioAddress} \
-            -minio.access-key ${cfg.minioAccessKey} \
-            -minio.access-secret ${cfg.minioAccessSecret} \
-            ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
-            ${concatStringsSep " \\\n  " cfg.extraFlags}
-        '';
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
deleted file mode 100644
index 1ccafee3b18..00000000000
--- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.nginxExporter;
-in {
-  options = {
-    services.prometheus.nginxExporter = {
-      enable = mkEnableOption "prometheus nginx exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9113;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      listenAddress = mkOption {
-        type = types.string;
-        default = "0.0.0.0";
-        description = ''
-          Address to listen on.
-        '';
-      };
-
-      scrapeUri = mkOption {
-        type = types.string;
-        default = "http://localhost/nginx_status";
-        description = ''
-          Address to access the nginx status page.
-          Can be enabled with services.nginx.statusPage = true.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the nginx exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-nginx-exporter = {
-      after = [ "network.target" "nginx.service" ];
-      description = "Prometheus exporter for nginx metrics";
-      unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        User = "nobody";
-        Restart  = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecStart = ''
-          ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
-            -nginx.scrape_uri '${cfg.scrapeUri}' \
-            -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
-            ${concatStringsSep " \\\n  " cfg.extraFlags}
-        '';
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
deleted file mode 100644
index bad4389ce79..00000000000
--- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.nodeExporter;
-in {
-  options = {
-    services.prometheus.nodeExporter = {
-      enable = mkEnableOption "prometheus node exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9100;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      listenAddress = mkOption {
-        type = types.string;
-        default = "0.0.0.0";
-        description = ''
-          Address to listen on.
-        '';
-      };
-
-      enabledCollectors = mkOption {
-        type = types.listOf types.string;
-        default = [];
-        example = ''[ "systemd" ]'';
-        description = ''
-          Collectors to enable. The collectors listed here are enabled in addition to the default ones.
-        '';
-      };
-
-      disabledCollectors = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        example = ''[ "timex" ]'';
-        description = ''
-          Collectors to disable which are enabled by default.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the node exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-node-exporter = {
-      description = "Prometheus exporter for machine metrics";
-      unitConfig.Documentation = "https://github.com/prometheus/node_exporter";
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \
-          ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
-          ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
-          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
-          ${concatStringsSep " \\\n  " cfg.extraFlags}
-      '';
-      serviceConfig = {
-        User = "nobody";
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
deleted file mode 100644
index fe33f8c1f04..00000000000
--- a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.snmpExporter;
-  mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath);
-in {
-  options = {
-    services.prometheus.snmpExporter = {
-      enable = mkEnableOption "Prometheus snmp exporter";
-
-      user = mkOption {
-        type = types.str;
-        default = "nobody";
-        description = ''
-          User name under which snmp exporter shall be run.
-        '';
-      };
-
-      group = mkOption {
-        type = types.str;
-        default = "nogroup";
-        description = ''
-          Group under which snmp exporter shall be run.
-        '';
-      };
-
-      port = mkOption {
-        type = types.int;
-        default = 9116;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      listenAddress = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          Address to listen on for web interface and telemetry.
-        '';
-      };
-
-      configurationPath = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        description = ''
-          Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option.
-        '';
-        example = "./snmp.yml";
-      };
-
-      configuration = mkOption {
-        type = types.nullOr types.attrs;
-        default = {};
-        description = ''
-          Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
-        '';
-        example = ''
-          {
-            "default" = {
-              "version" = 2;
-              "auth" = {
-                "community" = "public";
-              };
-            };
-          };
-        '';
-      };
-
-      logFormat = mkOption {
-        type = types.str;
-        default = "logger:stderr";
-        description = ''
-          Set the log target and format.
-        '';
-      };
-
-      logLevel = mkOption {
-        type = types.enum ["debug" "info" "warn" "error" "fatal"];
-        default = "info";
-        description = ''
-          Only log messages with the given severity or above.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    assertions = singleton
-      {
-        assertion = (cfg.configurationPath == null) != (cfg.configuration == null);
-        message = "Please ensure you have either 'configuration' or 'configurationPath' set!";
-      };
-
-    systemd.services.prometheus-snmp-exporter = {
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      script = ''
-        ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
-          -config.file ${mkConfigFile} \
-          -log.format ${cfg.logFormat} \
-          -log.level ${cfg.logLevel} \
-          -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port}
-      '';
-
-      serviceConfig = {
-        User = cfg.user;
-        Group = cfg.group;
-        Restart  = "always";
-        PrivateTmp = true;
-        WorkingDirectory = "/tmp";
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
deleted file mode 100644
index 0a56d6ae95a..00000000000
--- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.prometheus.unifiExporter;
-in {
-  options = {
-    services.prometheus.unifiExporter = {
-      enable = mkEnableOption "prometheus unifi exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9130;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      unifiAddress = mkOption {
-        type = types.str;
-        example = "https://10.0.0.1:8443";
-        description = ''
-          URL of the UniFi Controller API.
-        '';
-      };
-
-      unifiInsecure = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If enabled skip the verification of the TLS certificate of the UniFi Controller API.
-          Use with caution.
-        '';
-      };
-      
-      unifiUsername = mkOption {
-        type = types.str;
-        example = "ReadOnlyUser";
-        description = ''
-          username for authentication against UniFi Controller API.
-        '';
-      };
-      
-      unifiPassword = mkOption {
-        type = types.str;
-        description = ''
-          Password for authentication against UniFi Controller API.
-        '';
-      };
-      
-      unifiTimeout = mkOption {
-        type = types.str;
-        default = "5s";
-        example = "2m";
-        description = ''
-          Timeout including unit for UniFi Controller API requests.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the unifi exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-unifi-exporter = {
-      description = "Prometheus exporter for UniFi Controller metrics";
-      unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter";
-      wantedBy = [ "multi-user.target" ];
-      after = optional config.services.unifi.enable "unifi.service";
-      serviceConfig = {
-        User = "nobody";
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecStart = ''
-          ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
-            -telemetry.addr :${toString cfg.port} \
-            -unifi.addr ${cfg.unifiAddress} \
-            -unifi.username ${cfg.unifiUsername} \
-            -unifi.password ${cfg.unifiPassword} \
-            -unifi.timeout ${cfg.unifiTimeout} \
-            ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
-            ${concatStringsSep " \\\n  " cfg.extraFlags}
-        '';
-      };
-    };
-  };
-}
diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
deleted file mode 100644
index 143ebb62aea..00000000000
--- a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# Shamelessly cribbed from nginx-exporter.nix. ~ C.
-with lib;
-
-let
-  cfg = config.services.prometheus.varnishExporter;
-in {
-  options = {
-    services.prometheus.varnishExporter = {
-      enable = mkEnableOption "prometheus Varnish exporter";
-
-      port = mkOption {
-        type = types.int;
-        default = 9131;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra commandline options when launching the Varnish exporter.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open port in firewall for incoming connections.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
-
-    systemd.services.prometheus-varnish-exporter = {
-      description = "Prometheus exporter for Varnish metrics";
-      unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter";
-      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.varnish ];
-      script = ''
-        exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
-          -web.listen-address :${toString cfg.port} \
-          ${concatStringsSep " \\\n  " cfg.extraFlags}
-      '';
-      serviceConfig = {
-        User = "nobody";
-        Restart = "always";
-        PrivateTmp = true;
-        WorkingDirectory = /tmp;
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-      };
-    };
-  };
-}

From 8a1310122679b1d646a2c753e869f448f6b99796 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 12 Mar 2018 18:40:37 +0100
Subject: [PATCH 1828/2266] release notes: add information about prometheus
 exporters

---
 nixos/doc/manual/release-notes/rl-1803.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index e67f1448466..60c17c60413 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -353,7 +353,12 @@ following incompatible changes:</para>
       Use <literal>withOnlyInstalledCommunityModules</literal> for modules that should not be enabled directly, e.g <literal>lib_ldap</literal>.
     </para>
   </listitem>
-
+  <listitem>
+    <para>
+      All prometheus exporter modules are now defined as submodules.
+      The exporters are configured using <literal>services.prometheus.exporters</literal>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>

From c54aa1f2939afeb5d8e32a6f1bba387f6b79ffc2 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 14 Mar 2018 15:59:28 +0100
Subject: [PATCH 1829/2266] nixos/prometheus-exporters: add postfix exporter &
 documentation

---
 .../monitoring/prometheus/exporters.nix       |   3 +
 .../monitoring/prometheus/exporters.xml       | 135 ++++++++++++++++++
 .../prometheus/exporters/postfix.nix          |  46 ++++++
 3 files changed, 184 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters.xml
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/postfix.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 4315194ed32..8d6ca1e40a1 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -25,6 +25,7 @@ let
     minio    = import ./exporters/minio.nix    { inherit config lib pkgs; };
     nginx    = import ./exporters/nginx.nix    { inherit config lib pkgs; };
     node     = import ./exporters/node.nix     { inherit config lib pkgs; };
+    postfix  = import ./exporters/postfix.nix  { inherit config lib pkgs; };
     snmp     = import ./exporters/snmp.nix     { inherit config lib pkgs; };
     unifi    = import ./exporters/unifi.nix    { inherit config lib pkgs; };
     varnish  = import ./exporters/varnish.nix  { inherit config lib pkgs; };
@@ -166,4 +167,6 @@ in
       conf = cfg.${name};
     }) exporterOpts)
   );
+
+  meta.doc = ./exporters.xml;
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml
new file mode 100644
index 00000000000..4f0bcb29810
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters.xml
@@ -0,0 +1,135 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-services-prometheus-exporters">
+
+<title>Prometheus exporters</title>
+
+<para>Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.</para>
+
+<section><title>Configuration</title>
+  <para>One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
+<programlisting>
+  services.promtheus.exporters.node = {
+    enable = true;
+    enabledCollectors = [
+      "logind"
+      "systemd"
+    ];
+    disabledCollectors = [
+      "textfile"
+    ];
+    openFirewall = true;
+    firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
+  };
+</programlisting>
+It should now serve all metrics from the collectors
+that are explicitly enabled and the ones that are
+<link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled by default</link>, via http under <literal>/metrics</literal>. In this example the firewall should just
+allow incoming connections to the exporter's port on the bridge interface <literal>br0</literal>
+(this would have to be configured seperately of course).
+For more information about configuration see <literal>man configuration.nix</literal> or
+search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>.
+</para>
+</section>
+<section><title>Adding a new exporter</title>
+  <para>To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:</para>
+<itemizedlist>
+  <listitem>
+    <para>
+      Some default options for all exporters are provided by
+      <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
+    </para>
+  </listitem>
+  <listitem override='none'>
+    <itemizedlist>
+      <listitem><para><literal>enable</literal></para></listitem>
+      <listitem><para><literal>port</literal></para></listitem>
+      <listitem><para><literal>listenAddress</literal></para></listitem>
+      <listitem><para><literal>extraFlags</literal></para></listitem>
+      <listitem><para><literal>openFirewall</literal></para></listitem>
+      <listitem><para><literal>firewallFilter</literal></para></listitem>
+      <listitem><para><literal>user</literal></para></listitem>
+      <listitem><para><literal>group</literal></para></listitem>
+    </itemizedlist>
+  </listitem>
+  <listitem>
+    <para>As there is already a package available, the module can now be added.
+      This is accomplished by adding a new file to the
+      <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> directory,
+      which will be called postfix.nix and contains all exporter specific options
+      and configuration:
+      <programlisting>
+        # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
+        { config, lib, pkgs }:
+
+        with lib;
+
+        let
+          # for convenience we define cfg here
+          cfg = config.services.prometheus.exporters.postfix;
+        in
+        {
+          port = 9154; # The postfix exporter listens on this port by default
+
+          # `extraOpts` is an attribute set which contains additional options
+          # (and optional overrides for default options).
+          # Note that this attribute is optional.
+          extraOpts = {
+            telemetryPath = mkOption {
+              type = types.str;
+              default = "/metrics";
+              description = ''
+                Path under which to expose metrics.
+              '';
+            };
+            logfilePath = mkOption {
+              type = types.path;
+              default = /var/log/postfix_exporter_input.log;
+              example = /var/log/mail.log;
+              description = ''
+                Path where Postfix writes log entries.
+                This file will be truncated by this exporter!
+              '';
+            };
+            showqPath = mkOption {
+              type = types.path;
+              default = /var/spool/postfix/public/showq;
+              example = /var/lib/postfix/queue/public/showq;
+              description = ''
+                Path at which Postfix places its showq socket.
+              '';
+            };
+          };
+
+          # `serviceOpts` is an attribute set which contains configuration
+          # for the exporter's systemd service. One of
+          # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart`
+          # has to be specified here. This will be merged with the default
+          # service confiuration.
+          serviceOpts = {
+            serviceConfig = {
+              ExecStart = ''
+                ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \
+                  --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+                  --web.telemetry-path ${cfg.telemetryPath} \
+                  ${concatStringsSep " \\\n  " cfg.extraFlags}
+              '';
+            };
+          };
+        }
+      </programlisting>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      This should already be enough for the postfix exporter. Additionally one could
+      now add assertions and conditional default values. This can be done in the
+      'meta-module' that combines all exporter definitions and generates the submodules:
+      <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
+    </para>
+  </listitem>
+</itemizedlist>
+</section>
+</chapter>
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
new file mode 100644
index 00000000000..1e909aa27d8
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.postfix;
+in
+{
+  port = 9154;
+  extraOpts = {
+    telemetryPath = mkOption {
+      type = types.str;
+      default = "/metrics";
+      description = ''
+        Path under which to expose metrics.
+      '';
+    };
+    logfilePath = mkOption {
+      type = types.path;
+      default = "/var/log/postfix_exporter_input.log";
+      example = "/var/log/mail.log";
+      description = ''
+        Path where Postfix writes log entries.
+        This file will be truncated by this exporter!
+      '';
+    };
+    showqPath = mkOption {
+      type = types.path;
+      default = "/var/spool/postfix/public/showq";
+      example = "/var/lib/postfix/queue/public/showq";
+      description = ''
+        Path where Postfix places it's showq socket.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      ExecStart = ''
+        ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          --web.telemetry-path ${cfg.telemetryPath} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}

From 112ebed491c7f805cd10eb443dee85d2a02581c0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 22 Mar 2018 15:02:09 +0100
Subject: [PATCH 1830/2266] xcodeenv: publish xcarchive directory in the output
 store path if requested

---
 pkgs/development/mobile/xcodeenv/build-app.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index 436b55631b6..a94f2745894 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -121,6 +121,10 @@ stdenv.mkDerivation {
           echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
         ''}
       ''}
+      ${stdenv.lib.optionalString generateXCArchive ''
+        mkdir -p $out
+        mv "${name}.xcarchive" $out
+      ''}
       
       # Delete our temp keychain
       ${deleteKeychain}

From fda705527ddf608b4d84d3197615ad9081ba357d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 22 Mar 2018 16:16:27 +0100
Subject: [PATCH 1831/2266] nixbot: remove

obsoleted mostly by ofborg
---
 nixos/modules/module-list.nix              |   1 -
 nixos/modules/services/web-apps/nixbot.nix | 149 ---------------------
 pkgs/tools/misc/nixbot/default.nix         |  25 ----
 pkgs/top-level/all-packages.nix            |   2 -
 4 files changed, 177 deletions(-)
 delete mode 100644 nixos/modules/services/web-apps/nixbot.nix
 delete mode 100644 pkgs/tools/misc/nixbot/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0e5409bc9de..c7c99d0cd83 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -631,7 +631,6 @@
   ./services/web-apps/atlassian/jira.nix
   ./services/web-apps/frab.nix
   ./services/web-apps/mattermost.nix
-  ./services/web-apps/nixbot.nix
   ./services/web-apps/nexus.nix
   ./services/web-apps/pgpkeyserver-lite.nix
   ./services/web-apps/matomo.nix
diff --git a/nixos/modules/services/web-apps/nixbot.nix b/nixos/modules/services/web-apps/nixbot.nix
deleted file mode 100644
index 0592d01bf36..00000000000
--- a/nixos/modules/services/web-apps/nixbot.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.nixbot;
-  pyramidIni = ''
-    ###
-    # app configuration
-    # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/environment.html
-    ###
-
-    [app:main]
-    use = egg:nixbot
-
-    nixbot.github_token = ${cfg.githubToken}
-    nixbot.bot_name = ${cfg.botName}
-    nixbot.repo = ${cfg.repo}
-    nixbot.pr_repo = ${cfg.prRepo}
-    nixbot.hydra_jobsets_repo = ${cfg.hydraJobsetsRepo}
-    nixbot.github_secret = justnotsorandom
-    nixbot.public_url = ${cfg.publicUrl}
-    nixbot.repo_dir = ${cfg.repoDir}
-
-    pyramid.reload_templates = false
-    pyramid.debug_authorization = false
-    pyramid.debug_notfound = false
-    pyramid.debug_routematch = false
-    pyramid.default_locale_name = en
-
-    # By default, the toolbar only appears for clients from IP addresses
-    # '127.0.0.1' and '::1'.
-    # debugtoolbar.hosts = 127.0.0.1 ::1
-
-    ###
-    # wsgi server configuration
-    ###
-
-    [server:main]
-    use = egg:waitress#main
-    host = 0.0.0.0
-    port = 6543
-
-    ###
-    # logging configuration
-    # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/logging.html
-    ###
-
-    [loggers]
-    keys = root, nixbot
-
-    [handlers]
-    keys = console
-
-    [formatters]
-    keys = generic
-
-    [logger_root]
-    level = INFO
-    handlers = console
-
-    [logger_nixbot]
-    level = INFO
-    handlers =
-    qualname = nixbot
-
-    [handler_console]
-    class = StreamHandler
-    args = (sys.stderr,)
-    level = NOTSET
-    formatter = generic
-
-    [formatter_generic]
-    format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s
-  '';
-in {
-  options = {
-    services.nixbot = {
-      enable = mkEnableOption "nixbot";
-
-      botName = mkOption {
-        type = types.str;
-        description = "The bot's github user account name.";
-        default = "nixbot";
-      };
-
-      githubToken = mkOption {
-        type = types.str;
-        description = "The bot's github user account token.";
-        example = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-      };
-
-      repo = mkOption {
-        type = types.str;
-        description = "The github repository to check for PRs.";
-        example = "nixos/nixpkgs";
-      };
-
-      prRepo = mkOption {
-        type = types.str;
-        description = "The github repository to push the testing branches to.";
-        example = "nixos/nixpkgs-pr";
-      };
-
-      hydraJobsetsRepo = mkOption {
-        type = types.str;
-        description = "The github repository to push the hydra jobset definitions to.";
-        example = "nixos/hydra-jobsets";
-      };
-
-      publicUrl = mkOption {
-        type = types.str;
-        description = "The public URL the bot is reachable at (Github hook endpoint).";
-        example = "https://nixbot.nixos.org";
-      };
-
-      repoDir = mkOption {
-        type = types.path;
-        description = "The directory the repositories are stored in.";
-        default = "/var/lib/nixbot";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.extraUsers.nixbot = {
-      createHome = true;
-      home = cfg.repoDir;
-    };
-
-    systemd.services.nixbot = let
-      env = pkgs.python3.buildEnv.override {
-        extraLibs = [ pkgs.nixbot ];
-      };
-    in {
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${env}/bin/pserve ${pkgs.writeText "production.ini" pyramidIni}
-      '';
-
-      serviceConfig = {
-        User = "nixbot";
-        Group = "nogroup";
-        PermissionsStartOnly = true;
-      };
-    };
-  };
-}
diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix
deleted file mode 100644
index 554aa0bccee..00000000000
--- a/pkgs/tools/misc/nixbot/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, python3Packages, fetchFromGitHub }:
-
-python3Packages.buildPythonApplication rec {
-  name = "nixbot-unstable-2016-10-09";
-
-  src = fetchFromGitHub {
-    owner = "domenkozar";
-    repo = "nixbot";
-    rev = "dc490e4954cb08f0eff97f74ad39dedb54670aa9";
-    sha256 = "1l8rlhd2b7x5m79vb2vgszachygasv0pk8drnwgxyvsn0k88xcan";
-  };
-
-  propagatedBuildInputs = with python3Packages; [
-    pygit2 pyramid waitress github3_py
-  ];
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Github bot for reviewing/testing pull requests with the help of Hydra";
-    maintainers = with maintainers; [ domenkozar fpletz globin ];
-    license = licenses.asl20;
-    homepage = https://github.com/domenkozar/nixbot;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1936a57dded..7670add775f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3904,8 +3904,6 @@ with pkgs;
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
-  nixbot = callPackage ../tools/misc/nixbot {};
-
   notify-desktop = callPackage ../tools/misc/notify-desktop {};
 
   nkf = callPackage ../tools/text/nkf {};

From 214630f43c8fe155466d37d25540b58b6c5d2710 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 08:31:23 -0700
Subject: [PATCH 1832/2266] fflas-ffpack: 2.2.2 -> 2.3.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config -h` got 0 exit code
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config --help` got 0 exit code
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config help` got 0 exit code
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config -V` and found version 2.3.2
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config -v` and found version 2.3.2
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config --version` and found version 2.3.2
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config version` and found version 2.3.2
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config -h` and found version 2.3.2
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config --help` and found version 2.3.2
- ran `/nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2/bin/fflas-ffpack-config help` and found version 2.3.2
- found 2.3.2 with grep in /nix/store/10g4cklvbc5d7hkymlzbgnn7yw7mgdkp-fflas-ffpack-2.3.2
- directory tree listing: https://gist.github.com/e66f5e5926034e2f224c064aba1c3613
---
 pkgs/development/libraries/fflas-ffpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 0e4e897e27a..edea352ae2d 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -2,12 +2,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "fflas-ffpack";
-  version = "2.2.2";
+  version = "2.3.2";
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd";
+    sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
   };
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ givaro (liblapack.override {shared = true;}) openblas];

From 7ec4573f4c9e4ad5e05319b13adef1a804d52db0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 08:11:32 -0700
Subject: [PATCH 1833/2266] dlib: 19.9 -> 19.10

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 19.10 with grep in /nix/store/3h9m66pcyc428v616z3ls200aidd12wz-dlib-19.10
- directory tree listing: https://gist.github.com/7c3e568146e46ccdaed28be2916bd0a9
---
 pkgs/development/libraries/dlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 53ec9949f17..d3e2f6c9c98 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "19.9";
+  version = "19.10";
   name = "dlib-${version}";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     rev ="v${version}";
-    sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc";
+    sha256 = "0sgxblf4n33b8wgblyblmrkwydvy1yh7fzll1b6c4zgkz675w0m5";
   };
 
   postPatch = ''

From 27fcb342c44099d846a9e13d4435725ed0c66f91 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 22:25:05 -0700
Subject: [PATCH 1834/2266] fwup: 0.18.1 -> 1.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/1w5mk97wzbp6xdwj0phwmdr0z7rfc1nf-fwup-1.0.0/bin/fwup -h` got 0 exit code
- ran `/nix/store/1w5mk97wzbp6xdwj0phwmdr0z7rfc1nf-fwup-1.0.0/bin/fwup --help` got 0 exit code
- ran `/nix/store/1w5mk97wzbp6xdwj0phwmdr0z7rfc1nf-fwup-1.0.0/bin/fwup --version` and found version 1.0.0
- found 1.0.0 with grep in /nix/store/1w5mk97wzbp6xdwj0phwmdr0z7rfc1nf-fwup-1.0.0
- directory tree listing: https://gist.github.com/9b3eafd6e201b20c76f1f8f4d8ed13f8
---
 pkgs/tools/misc/fwup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 592707be20a..e7e40bc851e 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "0.18.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "0qdld8jy1rkpfzbfhnssr58q1gciln3pw9m6fj0jarfgja4gj31l";
+    sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs";
   };
 
   doCheck = true;

From a7046d5ecf08da2588ae3228173a8281b10b3099 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 01:09:23 -0700
Subject: [PATCH 1835/2266] nextcloud-news-updater: 10.0.0 -> 10.0.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped -h` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped --help` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped -v` and found version 10.0.1
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped --version` and found version 10.0.1
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater -h` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater --help` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater -v` and found version 10.0.1
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater --version` and found version 10.0.1
- found 10.0.1 with grep in /nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1
- directory tree listing: https://gist.github.com/ef3eb260a3fd46598a3b70c142c2ef2c
---
 pkgs/servers/nextcloud/news-updater.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index a78b3d59095..0fcb5047549 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "nextcloud-news-updater-${version}";
-  version = "10.0.0";
+  version = "10.0.1";
 
   src = fetchurl {
     url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz";
-    sha256 = "00pscz0p4s10y1ymb6sm0gx4a5wdbhimn30582x8i28n58nnl8j0";
+    sha256 = "14jj3w417wfsm1ki34d980b0s6vfn8i29g4c66qb2fizdq1d0z6q";
   };
 
   doCheck = false;

From 61381699334cea9a74060b09a2828e05a967fc1e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 22 Mar 2018 10:57:38 -0500
Subject: [PATCH 1836/2266] .gitattributes: merge=union for all-packages.nix

also module-list.nix
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index a636295ebd6..14bee08e381 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,3 +11,6 @@ doc/default.nix linguist-documentation=false
 
 nixos/doc/** linguist-documentation
 nixos/doc/default.nix linguist-documentation=false
+
+nixos/modules/module-list.nix merge=union
+pkgs/top-level/all-packages.nix merge=union

From a75fcce8e8356f4580716ff396f7c434ae710de7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 09:16:31 -0700
Subject: [PATCH 1837/2266] adapta-gtk-theme: 3.93.0.1 -> 3.93.0.174

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/06cdb7bbde8b5a7b86126b7c6f169357
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 7eee7ca3121..c38d9b03a6e 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.0.1";
+  version = "3.93.0.174";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "0l662l66ja8dsakcgwg6ab69lkl0va0r5h74dr6yjdsy0q4h2m7h";
+    sha256 = "0fkvcpx2vhyr3z74r5mcpjh293w3cfm07axj8dj84nl2hi6im8b6";
   };
 
   preferLocalBuild = true;

From 4270c5c7be22576b37b6a6411e0f294ebfdbcb82 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 22 Mar 2018 16:58:56 +0100
Subject: [PATCH 1838/2266] perlPackages.YAMLLibYAML: 0.59 -> 0.69, fix build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 85a3d4b8b1a..13554ff6ee6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16529,11 +16529,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   YAMLLibYAML = buildPerlPackage rec {
-    name = "YAML-LibYAML-0.59";
+    name = "YAML-LibYAML-0.69";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "0m4zr6gm5rzwvxwd2x7rklr659jl8gsa5bxc5h25904nbvpj9x4x";
+      url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz";
+      sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33";
     };
+    preBuild = ''
+      sed -i 's/FULLPERL *= "/FULLPERL = /' LibYAML/Makefile
+    '';
   };
 
   WebServiceLinode = buildPerlModule rec {

From 0a86a06b7eca63a60100ba75abdb46a22d6803cf Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 11:31:08 -0700
Subject: [PATCH 1839/2266] asio: 1.10.8 -> 1.12.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.12.0 with grep in /nix/store/1js10q8jgqmpk6ashz63am7f9xl37kvs-asio-1.12.0
- directory tree listing: https://gist.github.com/834ad2743ce2f56612f8ba9ff9a4e5b5
---
 pkgs/development/libraries/asio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
index dae8657388f..ad601359019 100644
--- a/pkgs/development/libraries/asio/default.nix
+++ b/pkgs/development/libraries/asio/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, boost, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "asio-1.10.8";
+  name = "asio-1.12.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/asio/${name}.tar.bz2";
-    sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6";
+    sha256 = "1bfk746kcs3cmvfvxjp3w9y6zpybjj8s002jjd3snrp2syd0nd9c";
   };
 
   propagatedBuildInputs = [ boost ];

From abb357c23e1cf7cc9733600f2b5c22e6392a6478 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 00:21:45 -0700
Subject: [PATCH 1840/2266] digikam: 5.8.0 -> 5.9.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.9.0 with grep in /nix/store/a0lvk4dyi87si7gdyblvh3zs16s0kp76-digikam-5.9.0
- found 5.9.0 in filename of file in /nix/store/a0lvk4dyi87si7gdyblvh3zs16s0kp76-digikam-5.9.0
- directory tree listing: https://gist.github.com/5e9b0273318688eb36b670f51aa482ec
---
 pkgs/applications/graphics/digikam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 9dd0722541f..633a1d9bd6e 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -50,13 +50,13 @@
 
 mkDerivation rec {
   name    = "digikam-${version}";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "digikam";
     rev    = "v${version}";
-    sha256 = "1bvidg0fn92xvw5brhb34lm7m4iy4jb5xpvnhbgh8vik2m4n41w1";
+    sha256 = "09diw273h9i7rss89ba82yrfy6jb2njv3k0dknrrg7bb998vrw2d";
   };
 
   nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];

From 2fdec94fbfddceceb9d3e95a39ff1ae9dbc5e937 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 22 Mar 2018 17:11:12 +0100
Subject: [PATCH 1841/2266] tdesktop: 1.2.6 -> 1.2.14

tdesktopPackages.preview: 1.2.12 -> 1.2.14
---
 .../telegram/tdesktop/default.nix             | 25 ++++++++-----------
 .../telegram/tdesktop/generic.nix             |  5 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index adf718a70ea..afba9ab022a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,21 +1,18 @@
 { qt5, stdenv }:
 
-let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
-in {
-  stable = mkTelegram {
+let
+  mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
+  stableVersion = {
     stable = true;
-    version = "1.2.6";
-    sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
+    version = "1.2.14";
+    sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "283641";
-    archPatchesHash = "0v4213vrabfa2dmwnqgb8n6hl54938mw9glaim3amyslxphmdrfb";
+    archPatchesRevision = "310557";
+    archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
   };
-  preview = mkTelegram {
+in {
+  stable = mkTelegram stableVersion;
+  preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.12";
-    sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m";
-    # svn ls -v --depth empty svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "308775";
-    archPatchesHash = "0ggx64kdadrbd4bw5z0wi0fdg6hni7n9nxz9dp56p8hlw1wgpsls";
-  };
+  });
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 89bc3da56b8..a49ef87f540 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -123,10 +123,11 @@ mkDerivation rec {
   '';
 
   meta = {
-    description = "Telegram Desktop messaging app";
+    description = "Telegram Desktop messaging app "
+      + (if stable then "(stable version)" else "(pre-release)");
     license = licenses.gpl3;
     platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://desktop.telegram.org/;
-    maintainers = with maintainers; [ abbradar garbas primeos ];
+    maintainers = with maintainers; [ primeos abbradar garbas ];
   };
 }

From 678211bb37821597a8c4426664cbe3bc821ac70e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 22 Mar 2018 17:14:34 +0100
Subject: [PATCH 1842/2266] openpts: remove

Broken, dead prject that only was a PoC implementation.
---
 pkgs/servers/openpts/bugs.patch  | 12 -------
 pkgs/servers/openpts/default.nix | 54 --------------------------------
 pkgs/servers/openpts/ptsc.patch  | 28 -----------------
 pkgs/servers/openpts/tboot.patch | 21 -------------
 pkgs/servers/openpts/zlib.patch  | 12 -------
 pkgs/top-level/all-packages.nix  |  1 -
 6 files changed, 128 deletions(-)
 delete mode 100644 pkgs/servers/openpts/bugs.patch
 delete mode 100644 pkgs/servers/openpts/default.nix
 delete mode 100644 pkgs/servers/openpts/ptsc.patch
 delete mode 100644 pkgs/servers/openpts/tboot.patch
 delete mode 100644 pkgs/servers/openpts/zlib.patch

diff --git a/pkgs/servers/openpts/bugs.patch b/pkgs/servers/openpts/bugs.patch
deleted file mode 100644
index d818bafbc9f..00000000000
--- a/pkgs/servers/openpts/bugs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp openpts-0.2.6-cvs-patched/src/fsm.c openpts-0.2.6-current/src/fsm.c
---- openpts-0.2.6-cvs-patched/src/fsm.c	2012-01-05 03:49:15.000000000 -0500
-+++ openpts-0.2.6-current/src/fsm.c	2012-01-09 12:11:17.338706205 -0500
-@@ -934,7 +934,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
-     /* event */
-     event = eventWrapper->event;
-     if (event != NULL) {
--        // len = snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
-+        snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
-     } else {
-         LOG(LOG_ERR, "NULL event\n");  // TODO(munetoh)
-         xfree(buf);
diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix
deleted file mode 100644
index 27731af3803..00000000000
--- a/pkgs/servers/openpts/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, trousers, openssl, libxml2, libuuid, gettext, perl }:
-
-stdenv.mkDerivation rec {
-  name = "openpts-${version}";
-  version = "0.2.6";
-
-  src = fetchurl {
-    url = "http://jaist.dl.osdn.jp/openpts/54410/openpts-${version}.tar.gz";
-    sha256 = "1b5phshl49fxr5y3g5zz75gm0n4cw8i7n29x5f1a95xkwrjpazi0";
-  };
-
-  # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/
-  patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ];
-
-  preConfigure = ''
-    substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl";
-    $SHELL bootstrap.sh
-    '';
-
-  configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ];
-
-  NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss -Wno-deprecated-declarations";
-
-  preInstall = ''
-    mkdir -p $out
-    mkdir -p $out/etc
-    cp -p dist/ptsc.conf.in $out/etc/ptsc.conf
-    cp -p dist/ptsv.conf.in $out/etc/ptsv.conf
-    mkdir -p $out/share/openpts/models
-    cp -p models/*.uml $out/share/openpts/models/
-
-    mkdir -p $out/share/openpts/tpm_emulator
-    cp dist/tpm_emulator/README.rhel $out/share/openpts/tpm_emulator/README
-    cp dist/tpm_emulator/binary_bios_measurements $out/share/openpts/tpm_emulator/
-    cp dist/tpm_emulator/tcsd $out/share/openpts/tpm_emulator/
-
-    mkdir -p $out/share/openpts/tboot
-    cp dist/tboot/README.fedora15 $out/share/openpts/tboot/README
-    cp dist/tboot/ptsc.conf.fedora15 $out/share/openpts/tboot/ptsc.conf
-    cp dist/tboot/tcsd.conf.fedora15 $out/share/openpts/tboot/tcsd.conf
-    cp dist/tboot/tcsd.fedora15 $out/share/openpts/tboot/tcsd
-    '';
-
-  meta = {
-    description = "TCG Platform Trust Service (PTS)";
-    homepage = http://sourceforge.jp/projects/openpts;
-    license = stdenv.lib.licenses.cpl10;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
-  };
-}
diff --git a/pkgs/servers/openpts/ptsc.patch b/pkgs/servers/openpts/ptsc.patch
deleted file mode 100644
index b6fcde74074..00000000000
--- a/pkgs/servers/openpts/ptsc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urNp openpts-0.2.6-patched/src/ptsc.c openpts-0.2.6-current/src/ptsc.c
---- openpts-0.2.6-patched/src/ptsc.c	2012-08-21 15:57:07.733841433 -0400
-+++ openpts-0.2.6-current/src/ptsc.c	2012-08-21 16:13:26.479732504 -0400
-@@ -457,7 +457,10 @@ void ptsc_lock(void) {
-             exit(1);
-         }
-         oldgrp = getegid();
--        setegid(grp.gr_gid);
-+        if(setegid(grp.gr_gid) != 0){
-+		LOG(LOG_ERR, "setegid fail");
-+		exit(1);
-+	}
-     }
- 
-     oldmask = umask(0);
-@@ -467,7 +470,10 @@ void ptsc_lock(void) {
-     }
-     if (grpent) {
-         chmod(LOCK_DIR, 02775);
--        setegid(oldgrp);
-+	if(setegid(oldgrp) != 0){
-+		LOG(LOG_ERR, "setegid fail");
-+		exit(1);
-+        }
-     }
-     fd = open(LOCK_FILE, O_RDWR | O_CREAT | O_TRUNC, 0660);
-     if (fd < 0) {
-
diff --git a/pkgs/servers/openpts/tboot.patch b/pkgs/servers/openpts/tboot.patch
deleted file mode 100644
index 6ecee583920..00000000000
--- a/pkgs/servers/openpts/tboot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNp openpts-0.2.6-patched/src/tboot2iml.c openpts-0.2.6-current/src/tboot2iml.c
---- openpts-0.2.6-patched/src/tboot2iml.c	2012-07-23 16:30:12.381361421 -0400
-+++ openpts-0.2.6-current/src/tboot2iml.c	2012-07-23 17:25:59.053945778 -0400
-@@ -531,7 +531,7 @@ int sinit_acm_hash(char *filename, int s
- 
- 
- int sha1sum_unzip(char *filename, int *filesize, BYTE *digest) {
--    FILE *fp;
-+    gzFile fp;
-     char buf[2048];
-     SHA_CTX sha_ctx;
-     int len;
-@@ -541,7 +541,7 @@ int sha1sum_unzip(char *filename, int *f
- 
-     /* open */
-     fp = gzopen(filename, "rb");
--    if (fp == NULL) {
-+    if (fp == Z_NULL) {
-         LOG(LOG_ERR, "File %s does not exist\n", filename);
-         return 0;
-     }
diff --git a/pkgs/servers/openpts/zlib.patch b/pkgs/servers/openpts/zlib.patch
deleted file mode 100644
index 7fa3fce10fe..00000000000
--- a/pkgs/servers/openpts/zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp openpts-0.2.6-cvs-patched/src/Makefile.am openpts-0.2.6-current/src/Makefile.am
---- openpts-0.2.6-cvs-patched/src/Makefile.am	2012-01-05 03:49:15.000000000 -0500
-+++ openpts-0.2.6-current/src/Makefile.am	2012-01-09 14:12:02.507361732 -0500
-@@ -30,7 +30,7 @@ localedir = $(datadir)/locale
- 
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBXML2_CFLAGS) $(TSS_CFLAGS) -I../include -DLOCALEDIR=\"$(localedir)\"
--AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lopenpts
-+AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lz -lopenpts
- # $(LIBINTL) -lopenpts
- 
- if HAVE_LIBUUID
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1542203c23d..c4d153bd8b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12438,7 +12438,6 @@ with pkgs;
   oauth2_proxy = callPackage ../servers/oauth2_proxy { };
 
   openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; };
-  openpts = callPackage ../servers/openpts { };
 
   openresty = callPackage ../servers/http/openresty { };
 

From 6ff61bb5f93277a4f3878497e63947c14c1187d5 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 22 Mar 2018 11:32:47 -0500
Subject: [PATCH 1843/2266] Revert "melpaStablePackages.caml: don't run
 configure"

---
 .../editors/emacs-modes/melpa-stable-packages.nix            | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 7104feaf25e..a2ba794933e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -48,11 +48,6 @@ self:
       # upstream issue: missing file header
       bufshow = markBroken super.bufshow;
 
-      # upstream issue: comes with a broken configure file
-      caml = super.caml.overrideAttrs (oldAttrs: rec {
-        configureScript = "true";
-      });
-
       # part of a larger package
       caml = dontConfigure super.caml;
 

From 01f37880f36e3f0b2f264375ad575062545d0b45 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 22 Mar 2018 11:42:25 -0500
Subject: [PATCH 1844/2266] wrapFirefox: update icon location

The icons for Firefox are in a new location in the unwrapped package; the
wrapper is updated to reflect that. This should have no effect on other browers
that provide their own icons in the default XDG location.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 8d08eceb169..cf5405a4a07 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -130,9 +130,11 @@ let
             mkdir -p "$out/share"
             ln -s "${browser}/share/icons" "$out/share/icons"
         else
-            mkdir -p "$out/share/icons/hicolor/128x128/apps"
-            ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \
-                "$out/share/icons/hicolor/128x128/apps/${browserName}.png"
+            for res in 16 32 48 64 128; do
+            mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
+            ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \
+                "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png"
+            done
         fi
 
         install -D -t $out/share/applications $desktopItem/share/applications/*

From 8c7883c027c7e4cecf3d2cf06283100ae6576c13 Mon Sep 17 00:00:00 2001
From: Alex Vorobiev <alexander.vorobiev@gmail.com>
Date: Thu, 22 Mar 2018 12:21:12 -0500
Subject: [PATCH 1845/2266] Update default.nix

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

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 3b05c9be451..3cb416a5f7c 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) ''
     wrapProgram $out/bin/xpdf \
       --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
   '';

From e77071289e339f4a8512aa87fb72f388531ca263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Thu, 22 Mar 2018 19:05:53 +0100
Subject: [PATCH 1846/2266] streamripper: Don't use included libmad

streamripper ships its own version of libmad, which does not compile on
clang, due to the usage of incompatible compiler flags. We can get the
build working by using the already packaged libmad, which includes
patches for clang.
---
 pkgs/applications/audio/streamripper/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix
index 0fb1b77e708..39d1c266a37 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/pkgs/applications/audio/streamripper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }:
+{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:
 
 stdenv.mkDerivation rec {
   name = "streamripper-${version}";
@@ -10,13 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libogg libvorbis ];
+  buildInputs = [ glib libogg libvorbis libmad ];
 
   meta = with stdenv.lib; {
     homepage = http://streamripper.sourceforge.net/;
     description = "Application that lets you record streaming mp3 to your hard drive";
     license = licenses.gpl2;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ the-kenny ];
   };
 }

From 2119041dbf4323ff3e92e605b70b75fc2c252741 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 21 Mar 2018 14:20:04 -0400
Subject: [PATCH 1847/2266] guile-1.8: Fix and clean up `libtool` propagation
 fixes

Fixes #37548
---
 pkgs/development/interpreters/guile/1.8.nix | 36 +++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 6a2fdbdea43..cf42c9a7b68 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -24,19 +24,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool ];
 
-  propagatedBuildInputs = [ gmp ];
+  propagatedBuildInputs = [
+    gmp
+
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
+    # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
+    # see below.
+    libtool
+  ];
+
 
   patches = [ ./cpp-4.5.patch ];
 
-
-  postInstall = ''
-    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-  '';
-
-  preBuild = ''
-    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
-  '';
-
   # Guile needs patching to preset results for the configure tests
   # about pthreads, which work only in native builds.
   preConfigure = ''
@@ -45,6 +45,22 @@ stdenv.mkDerivation rec {
     fi
   '';
 
+  preBuild = ''
+    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
+  '';
+
+
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+    # why `--with-libunistring-prefix' and similar options coming from
+    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"
+  '';
+
   # One test fails.
   # ERROR: file: "libtest-asmobs", message: "file not found"
   # This is fixed here:

From db0a0d3d3a457d3e533bd3777449cfd49ce5b61f Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Fri, 23 Mar 2018 02:43:08 +0700
Subject: [PATCH 1848/2266] xpointerbarrier: 17.10 -> 17.11

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

diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 93bbe1ce0bc..50d0ac4f2b9 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,13 +1,13 @@
 { stdenv, xorg, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "xpointerbarrier-${version}";
-  version = "17.10";
+  version = "17.11";
 
   src = fetchFromGitHub {
     owner = "vain";
     repo = "xpointerbarrier";
     rev = "v${version}";
-    sha256 = "0p4qc7ggndf74d2xdf38659prx3r3lfi5jc8nmqx52c9fqdshcrk";
+    sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm";
   };
 
   buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];

From 8742b55ab397cb0271de5191fc74feb20e6c07b8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 12:52:04 -0700
Subject: [PATCH 1849/2266] ibus-engines.anthy: 1.5.9 -> 1.5.10

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.2tbPvTstTb /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.5.10 with grep in /nix/store/3h4a30xh4ddij4i5nmyi8p478y804jv7-ibus-anthy-1.5.10
- directory tree listing: https://gist.github.com/2a6dbfad474173b76f5f0d7aa35964f6
---
 pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 53b2a3abf28..c7f7369ba88 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
-  version = "1.5.9";
+  version = "1.5.10";
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x";
+    sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc";
   };
 }

From 4a18b4222a1772018c8e85f64f496e391bcd5a53 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 05:16:32 -0700
Subject: [PATCH 1850/2266] hdparm: 9.54 -> 9.55

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9abla9hl91wvxvcbrif9xjhsb164lgxc-hdparm-9.55/bin/hdparm -h` got 0 exit code
- ran `/nix/store/9abla9hl91wvxvcbrif9xjhsb164lgxc-hdparm-9.55/bin/hdparm -V` and found version 9.55
- ran `/nix/store/9abla9hl91wvxvcbrif9xjhsb164lgxc-hdparm-9.55/bin/hdparm -h` and found version 9.55
- found 9.55 with grep in /nix/store/9abla9hl91wvxvcbrif9xjhsb164lgxc-hdparm-9.55
- directory tree listing: https://gist.github.com/ded98c9055722d9f66f8346ae792663c
---
 pkgs/os-specific/linux/hdparm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index 87cb17329e8..2c5fd70ac95 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hdparm-9.54";
+  name = "hdparm-9.55";
 
   src = fetchurl {
     url = "mirror://sourceforge/hdparm/${name}.tar.gz";
-    sha256 = "0ghnhdj7wfw6acfyhdawpfa5n9kvkvzgi1fw6i7sghgbjx5nhyjd";
+    sha256 = "1ivdvrzimaayiq03by8mcq0mhmdljndj06h012zkdpw34irnpixm";
 
   };
 

From d74bcbc8ad0d683a368fde8ec5ad5ae168989199 Mon Sep 17 00:00:00 2001
From: Daniel Kuehn <daniel@kuehn.se>
Date: Thu, 22 Mar 2018 21:08:28 +0100
Subject: [PATCH 1851/2266] ceph: Change hardcoded site-packages path to
 utilizing the python2Packages.python.sitePackages attribute instead

---
 pkgs/tools/filesystems/ceph/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index a637d3891ec..764f082aa89 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapPythonPrograms
-    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages
+    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
   '';
 
   enableParallelBuilding = true;

From d1d18b78fd2c6f3aebcdfb532b0f2955fe77b21f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:36:15 -0700
Subject: [PATCH 1852/2266] pcmciaUtils: 017 -> 018

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018/bin/pccardctl -h` got 0 exit code
- ran `/nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018/bin/pccardctl --help` got 0 exit code
- ran `/nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018/bin/pccardctl -V` and found version 018
- ran `/nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018/bin/pccardctl --version` and found version 018
- ran `/nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018/bin/pccardctl -h` and found version 018
- ran `/nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018/bin/pccardctl --help` and found version 018
- found 018 with grep in /nix/store/d7b3p8gcfc0qmfmi5rz3igycjbllkpgq-pcmciautils-018
- directory tree listing: https://gist.github.com/0340af0c6b28001bbca26c8b5ecf3638
---
 pkgs/os-specific/linux/pcmciautils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix
index 8a5171824d0..93e2c097ff7 100644
--- a/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/pkgs/os-specific/linux/pcmciautils/default.nix
@@ -8,11 +8,11 @@
 
 # FIXME: should add an option to choose between hotplug and udev.
 stdenv.mkDerivation rec {
-  name = "pcmciautils-017";
+  name = "pcmciautils-018";
 
   src = fetchurl {
     url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz";
-    sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3";
+    sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk";
   };
 
   buildInputs = [udev yacc sysfsutils kmod flex];

From 435e38878cb3ee1173d66ded9ace80d501a0512e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2018 16:18:15 +0100
Subject: [PATCH 1853/2266] hackage2nix: update list of failing Hydra builds

---
 .../configuration-hackage2nix.yaml            | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 901d49a4fae..00505f31b46 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2957,6 +2957,7 @@ dont-distribute-packages:
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asciidiagram:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2975,6 +2976,7 @@ dont-distribute-packages:
   atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atmos-dimensional-tf:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   atndapi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3023,6 +3025,7 @@ dont-distribute-packages:
   aws-configuration-tools:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-streams:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-easy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-ec2-knownhosts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-ec2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-elastic-transcoder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3073,6 +3076,7 @@ dont-distribute-packages:
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-noprelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-bytestring-type:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3081,6 +3085,7 @@ dont-distribute-packages:
   batchd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  battleplace-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3149,6 +3154,7 @@ dont-distribute-packages:
   bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-levmar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libg15:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3244,6 +3250,7 @@ dont-distribute-packages:
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bookkeeping-jp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3552,6 +3559,7 @@ dont-distribute-packages:
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   coalpit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codec-beam:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-rpm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3707,6 +3715,7 @@ dont-distribute-packages:
   CoreDump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreErlang:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  corenlp-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-object:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3775,6 +3784,7 @@ dont-distribute-packages:
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Frontend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Interpreter:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3803,6 +3813,7 @@ dont-distribute-packages:
   dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   damnpacket:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  danibot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3858,6 +3869,7 @@ dont-distribute-packages:
   data-rtuple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-stringmap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-structure-inferrer:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3899,6 +3911,7 @@ dont-distribute-packages:
   ddc-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-war:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dde:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4106,6 +4119,7 @@ dont-distribute-packages:
   dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtw:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dual:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dublincore-xml-conduit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   duckling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4507,9 +4521,11 @@ dont-distribute-packages:
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   frown:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-vty:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fsnotify-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswait:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4540,6 +4556,7 @@ dont-distribute-packages:
   futun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fuzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-javascript:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4635,6 +4652,7 @@ dont-distribute-packages:
   gf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-datasize:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-tree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4642,6 +4660,7 @@ dont-distribute-packages:
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-generic-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-heap-view:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-justdoit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-man-completion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4667,12 +4686,18 @@ dont-distribute-packages:
   ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-atk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-dbusmenu:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-dbusmenugtk3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdkpixbuf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdkx11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-ggit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-girepository:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-glib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gobject:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstbase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4750,6 +4775,7 @@ dont-distribute-packages:
   GlomeView:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-devil:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-sodium:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-common:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5188,10 +5214,12 @@ dont-distribute-packages:
   haskell-compression:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-conll:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-dap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-docs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-gi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-go-checkers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-holes-th:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5546,6 +5574,7 @@ dont-distribute-packages:
   HListPP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlrdb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hls:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlwm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5757,6 +5786,7 @@ dont-distribute-packages:
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHTSLib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsignal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5977,6 +6007,7 @@ dont-distribute-packages:
   imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5992,6 +6023,7 @@ dont-distribute-packages:
   inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  incremental-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   indents:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexed-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6478,6 +6510,7 @@ dont-distribute-packages:
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lock-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lockpool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6790,6 +6823,7 @@ dont-distribute-packages:
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-subclasses:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7104,6 +7138,7 @@ dont-distribute-packages:
   open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-signals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-symbology:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7130,6 +7165,7 @@ dont-distribute-packages:
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   openweathermap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opml-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optional:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7316,6 +7352,7 @@ dont-distribute-packages:
   pia-forward:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   picologic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pictikz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7377,6 +7414,7 @@ dont-distribute-packages:
   plot-gtk-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Plot-ho-matic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-light-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   plots:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7677,6 +7715,7 @@ dont-distribute-packages:
   rasa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasterific-svg:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7847,6 +7886,7 @@ dont-distribute-packages:
   rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc3339:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhine-gloss:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7911,6 +7951,7 @@ dont-distribute-packages:
   rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rss-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RtMidi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7973,6 +8014,7 @@ dont-distribute-packages:
   scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8348,6 +8390,7 @@ dont-distribute-packages:
   spake2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   spanout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparkle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparrow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsebit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8522,12 +8565,14 @@ dont-distribute-packages:
   superconstraints:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   superevent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  supermonad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   superrecord:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supplemented:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVD2HS:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svg-tree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVGFonts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8771,6 +8816,7 @@ dont-distribute-packages:
   timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timerep:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timers-tick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9042,6 +9088,7 @@ dont-distribute-packages:
   vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcsgui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9486,5 +9533,7 @@ dont-distribute-packages:
   zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zstd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ztail:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   zuramaru:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zxcvbn-c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]

From 3cdb5aa2f090e4a18525ba73df4403cd6811b4be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Mar 2018 02:31:28 +0100
Subject: [PATCH 1854/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/2b503b0b7caa627440cea1aa9cc8a29f43700a52.
---
 .../haskell-modules/hackage-packages.nix      | 1576 +++++++++++++++--
 1 file changed, 1381 insertions(+), 195 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index be3d3ae673f..ac04f2d7cea 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3393,8 +3393,8 @@ self: {
     ({ mkDerivation, base, parsec, pretty }:
      mkDerivation {
        pname = "CoreErlang";
-       version = "0.0.3";
-       sha256 = "111012wpnfa3bm9r5xnfhm5xjq8ppsnwx01a6njbvmqi9hcba3nc";
+       version = "0.0.4";
+       sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z";
        libraryHaskellDepends = [ base parsec pretty ];
        homepage = "http://github.com/amtal/CoreErlang";
        description = "Manipulating Core Erlang source code";
@@ -6643,8 +6643,8 @@ self: {
      }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "3.0.0.0";
-       sha256 = "1x7hbfjcly41sk3bins3z522651v1fqybb64dj1a6f6lvglx6ms8";
+       version = "3.0.0.1";
+       sha256 = "0c6wk6kngrpmjwxwixynxfvr92ycvxmivvcvbk171x4a47zcg4sq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -12735,6 +12735,8 @@ self: {
        pname = "MonadRandom";
        version = "0.5.1";
        sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy";
+       revision = "1";
+       editedCabalFile = "19242r11a7iqr8dnbxsac04c3ylh7xkan70pdv5k3jzcmfwn4shd";
        libraryHaskellDepends = [
          base fail mtl primitive random transformers transformers-compat
        ];
@@ -14008,6 +14010,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
+  "OpenGLRaw_3_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.3.0.0";
+       sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ libGL ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libGL;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -27188,14 +27208,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs_0_3_0_1" = callPackage
+  "apecs_0_3_0_2" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.3.0.1";
-       sha256 = "04vqhkikyxgyzm61jlw21ycg3iv5fsx24q31a7gy5cxh5fqmw76k";
+       version = "0.3.0.2";
+       sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
@@ -29012,6 +29032,7 @@ self: {
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asic" = callPackage
@@ -29541,6 +29562,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async-refresh_0_3_0_0" = callPackage
+    ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async
+     , microlens, microlens-th, monad-logger, safe-exceptions, stm
+     , test-framework, test-framework-hunit, text, unliftio
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "async-refresh";
+       version = "0.3.0.0";
+       sha256 = "1j9llc84f93srw80pyldcglzmssl0l961bzlwsrvbaa84ldhcs6s";
+       libraryHaskellDepends = [
+         base formatting lifted-async microlens microlens-th monad-logger
+         safe-exceptions stm text unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         base criterion HUnit monad-logger stm test-framework
+         test-framework-hunit text
+       ];
+       homepage = "https://github.com/mtesseract/async-refresh";
+       description = "Package implementing core logic for refreshing of expiring data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "async-refresh-tokens" = callPackage
     ({ mkDerivation, async-refresh, base, bytestring, criterion
      , formatting, HUnit, lifted-async, microlens, microlens-th
@@ -29564,6 +29609,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async-refresh-tokens_0_4_0_0" = callPackage
+    ({ mkDerivation, async-refresh, base, bytestring, criterion
+     , formatting, HUnit, microlens, microlens-th, monad-logger
+     , safe-exceptions, test-framework, test-framework-hunit, text
+     , unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "async-refresh-tokens";
+       version = "0.4.0.0";
+       sha256 = "1py7ips87gbwdhxdfv0xh4hkgw0my4nkkz4w1vwcb3s296a439v7";
+       libraryHaskellDepends = [
+         async-refresh base bytestring formatting microlens microlens-th
+         monad-logger safe-exceptions text unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         base criterion HUnit monad-logger test-framework
+         test-framework-hunit unliftio
+       ];
+       homepage = "https://github.com/mtesseract/async-refresh-tokens#readme";
+       description = "Package implementing core logic for refreshing of expiring access tokens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "async-timer" = callPackage
     ({ mkDerivation, base, containers, criterion, HUnit, lifted-async
      , lifted-base, monad-control, safe-exceptions, test-framework
@@ -29824,6 +29893,7 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -31318,6 +31388,7 @@ self: {
        homepage = "https://github.com/rcook/aws-easy#readme";
        description = "AWS Easy: Helper functions for working with amazonka";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-ec2" = callPackage
@@ -32538,6 +32609,7 @@ self: {
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -33004,6 +33076,7 @@ self: {
        ];
        description = "Public API definitions of BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battleship-combinatorics" = callPackage
@@ -34105,6 +34178,8 @@ self: {
        pname = "binary";
        version = "0.7.6.1";
        sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
+       revision = "1";
+       editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -35070,6 +35145,7 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "bindings-libcddb" = callPackage
@@ -35643,21 +35719,19 @@ self: {
      }) {};
 
   "biohazard" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base-prelude, binary
-     , bytestring, containers, directory, exceptions, filepath, hashable
-     , primitive, random, scientific, stm, text, transformers, unix
-     , unordered-containers, vector, vector-algorithms, vector-th-unbox
-     , zlib
+    ({ mkDerivation, async, attoparsec, base, base-prelude, bytestring
+     , containers, exceptions, hashable, primitive, stm, text
+     , transformers, unix, unordered-containers, vector
+     , vector-algorithms, vector-th-unbox, zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "1.0.0";
-       sha256 = "0cc855d3h1fh52ldvqzwf3f834g8singavvpk1ir157fgg8qjz3g";
+       version = "1.0.1";
+       sha256 = "0gzsrrapv3ih598qqacnipqgxxzxmci98rzvc54jxv3hajsnxkqb";
        libraryHaskellDepends = [
-         async attoparsec base base-prelude binary bytestring containers
-         directory exceptions filepath hashable primitive random scientific
-         stm text transformers unix unordered-containers vector
-         vector-algorithms vector-th-unbox zlib
+         async attoparsec base base-prelude bytestring containers exceptions
+         hashable primitive stm text transformers unix unordered-containers
+         vector vector-algorithms vector-th-unbox zlib
        ];
        homepage = "https://bitbucket.org/ustenzel/biohazard";
        description = "bioinformatics support library";
@@ -37864,6 +37938,7 @@ self: {
        homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme";
        description = "Helper functions for Japanese bookkeeping";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -39586,8 +39661,8 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.3.0.0";
-       sha256 = "03z27wx9g8pmx07r2cc5mzp3p7qpzq7gp590k9kd3kq1q9dx2096";
+       version = "0.3.1.0";
+       sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40187,6 +40262,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
 
+  "bzlib-conduit_0_3_0_1" = callPackage
+    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
+     , data-default-class, hspec, mtl, random, resourcet
+     }:
+     mkDerivation {
+       pname = "bzlib-conduit";
+       version = "0.3.0.1";
+       sha256 = "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring conduit data-default-class mtl
+         resourcet
+       ];
+       librarySystemDepends = [ bzip2 ];
+       testHaskellDepends = [
+         base bindings-DSL bytestring conduit data-default-class hspec mtl
+         random resourcet
+       ];
+       benchmarkHaskellDepends = [
+         base bindings-DSL bytestring conduit data-default-class mtl
+         resourcet
+       ];
+       homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
+       description = "Streaming compression/decompression via conduits";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) bzip2;};
+
   "c-dsl" = callPackage
     ({ mkDerivation, base, language-c }:
      mkDerivation {
@@ -43011,10 +43114,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-streams";
-       version = "0.3.0.1";
-       sha256 = "178d1sbfvscbmgwm5basbzciflrj6i6w55w1pmm6wyiibfbcwapf";
-       revision = "1";
-       editedCabalFile = "0wik7fy8qs1971bxziap6lkc8pxl83mz642gprh07qrx3kfx0qs1";
+       version = "0.3.0.2";
+       sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44918,10 +45019,11 @@ self: {
      }:
      mkDerivation {
        pname = "chronologique";
-       version = "0.3.0.0";
-       sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9";
+       version = "0.3.0.1";
+       sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14";
        libraryHaskellDepends = [ base hourglass time vector ];
        testHaskellDepends = [ base hourglass hspec QuickCheck vector ];
+       homepage = "https://github.com/afcowie/chronologique/";
        description = "Time to manipulate time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46287,14 +46389,12 @@ self: {
      }) {};
 
   "cld2" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
+    ({ mkDerivation, base, bytestring, hashable, text }:
      mkDerivation {
        pname = "cld2";
-       version = "0.1.0.1";
-       sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd";
-       revision = "1";
-       editedCabalFile = "1gfgnhy9ahyq7y74mpc6gsmir8v0c2d6z81klw1zhack6pmnql30";
-       libraryHaskellDepends = [ base bytestring text ];
+       version = "0.1.1.1";
+       sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd";
+       libraryHaskellDepends = [ base bytestring hashable text ];
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
@@ -47550,6 +47650,7 @@ self: {
        homepage = "https://github.com/hkgumbs/codec-beam#readme";
        description = "Erlang VM byte code assembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codec-libevent" = callPackage
@@ -47588,25 +47689,26 @@ self: {
 
   "codec-rpm" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
-     , conduit, conduit-combinators, conduit-extra, cpio-conduit, hspec
+     , conduit, conduit-extra, cpio-conduit, exceptions, hspec
      , hspec-attoparsec, HUnit, lzma-conduit, mtl, parsec, pretty
      , resourcet, text
      }:
      mkDerivation {
        pname = "codec-rpm";
-       version = "0.2.0";
-       sha256 = "1n977xndg2ii866a868rvbi581p0gbz5zpy1glrg6n9znm6y9l4h";
+       version = "0.2.1";
+       sha256 = "00ywr4frndvw3chlxpqdx2rimd7jjdyzmjlm1kvw23qbgfyd60is";
        libraryHaskellDepends = [
-         attoparsec attoparsec-binary base bytestring conduit
-         conduit-combinators conduit-extra cpio-conduit lzma-conduit mtl
-         parsec pretty resourcet text
+         attoparsec attoparsec-binary base bytestring conduit conduit-extra
+         cpio-conduit exceptions lzma-conduit mtl parsec pretty resourcet
+         text
        ];
        testHaskellDepends = [
-         attoparsec base bytestring hspec hspec-attoparsec HUnit text
+         attoparsec attoparsec-binary base bytestring hspec hspec-attoparsec
+         HUnit parsec pretty text
        ];
        homepage = "https://github.com/weldr/codec-rpm";
        description = "A library for manipulating RPM files";
-       license = "LGPL";
+       license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -48855,8 +48957,8 @@ self: {
      }:
      mkDerivation {
        pname = "compactable";
-       version = "0.1.1.1";
-       sha256 = "0dbjwsbn5wgwwzl90wvcqf2c6968j5bkg1nzdll03nxklqnv3m9b";
+       version = "0.1.2.0";
+       sha256 = "0kh36h1zfdlhvcz8xzf3c4af0rbypa7p421rl0xsig914r5z519j";
        libraryHaskellDepends = [
          base bifunctors containers transformers vector
        ];
@@ -50139,6 +50241,8 @@ self: {
        pname = "conduit-audio";
        version = "0.2.0.3";
        sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1";
+       revision = "1";
+       editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx";
        libraryHaskellDepends = [ base conduit vector ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
@@ -50153,6 +50257,8 @@ self: {
        pname = "conduit-audio-lame";
        version = "0.1.2.1";
        sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za";
+       revision = "1";
+       editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr";
        libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
@@ -50172,6 +50278,8 @@ self: {
        pname = "conduit-audio-samplerate";
        version = "0.1.0.3";
        sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi";
+       revision = "1";
+       editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw";
        libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
@@ -50191,6 +50299,8 @@ self: {
        pname = "conduit-audio-sndfile";
        version = "0.1.2.1";
        sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z";
+       revision = "1";
+       editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -51168,6 +51278,18 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "constrictor" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "constrictor";
+       version = "0.1.0.1";
+       sha256 = "05km6cxk5c9k2m22x6379jnlvcxr9j6m52y3xqvjjvxkps2ppc9c";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/chessai/constrictor.git";
+       description = "strict versions of many things in base";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -51392,8 +51514,8 @@ self: {
      }:
      mkDerivation {
        pname = "content-store";
-       version = "0.2.0";
-       sha256 = "1xdv572mq2nc7nckq79c5bw64ldqrqahd0y8wiffwywbcwi8gyi9";
+       version = "0.2.1";
+       sha256 = "1c3l2fmznx3f1853scnpf6c60bbm1z99lkpxx36ldxrxizj2lmaj";
        libraryHaskellDepends = [
          aeson base bytestring cond conduit conduit-combinators
          conduit-extra cryptonite directory filepath htoml lzma-conduit
@@ -51406,7 +51528,7 @@ self: {
        ];
        homepage = "https://github.com/weldr/content-store";
        description = "Store and retrieve data from an on-disk store";
-       license = "LGPL";
+       license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -52277,23 +52399,26 @@ self: {
      }) {};
 
   "corenlp-parser" = callPackage
-    ({ mkDerivation, aeson, base, cryptonite, data-default, directory
-     , process, raw-strings-qq, rocksdb-haskell, safe-exceptions, store
-     , string-class, temporary, text, unordered-containers
+    ({ mkDerivation, aeson, async, base, cryptonite, data-default
+     , directory, process, raw-strings-qq, rocksdb, rocksdb-haskell
+     , safe-exceptions, split, store, string-class, temporary, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "corenlp-parser";
-       version = "0.3.0.0";
-       sha256 = "1mcw9nw74lca0p5kdr4mva6mz165dyipfqgc7i46kjk6pxlpcp0n";
+       version = "0.3.0.1";
+       sha256 = "14xjfcnk58mwgxywdlzdl53xdzf91scx0hmx8arhxkn6vr04akwp";
        libraryHaskellDepends = [
-         aeson base cryptonite data-default directory process raw-strings-qq
-         rocksdb-haskell safe-exceptions store string-class temporary text
-         unordered-containers
+         aeson async base cryptonite data-default directory process
+         raw-strings-qq rocksdb-haskell safe-exceptions split store
+         string-class temporary text unordered-containers
        ];
+       librarySystemDepends = [ rocksdb ];
        homepage = "https://github.com/k-bx/corenlp-parser#readme";
        description = "Launches CoreNLP and parses the JSON output";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) rocksdb;};
 
   "coroutine-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, monad-coroutine }:
@@ -54566,6 +54691,7 @@ self: {
        homepage = "https://github.com/dzhus/csg#readme";
        description = "Analytical CSG (Constructive Solid Geometry) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-catalog" = callPackage
@@ -55532,6 +55658,18 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "cve" = callPackage
+    ({ mkDerivation, aeson, base, text }:
+     mkDerivation {
+       pname = "cve";
+       version = "0.1.0.0";
+       sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm";
+       libraryHaskellDepends = [ aeson base text ];
+       homepage = "github.com/chessai/cve.git";
+       description = "simple and efficient cve datatype";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cyclotomic" = callPackage
     ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -55748,6 +55886,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dao" = callPackage
@@ -56465,6 +56604,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-clist_0_1_2_1" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "data-clist";
+       version = "0.1.2.1";
+       sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s";
+       libraryHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/sw17ch/data-clist";
+       description = "Simple functional ring type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-concurrent-queue" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -57757,6 +57909,7 @@ self: {
        ];
        description = "An efficient implementation of maps from strings to arbitrary values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-structure-inferrer" = callPackage
@@ -58922,19 +59075,31 @@ self: {
      }) {};
 
   "dde" = callPackage
-    ({ mkDerivation, base, vector }:
+    ({ mkDerivation, base, criterion, free-vector-spaces, lens, linear
+     , vector
+     }:
      mkDerivation {
        pname = "dde";
-       version = "0.0.1";
-       sha256 = "1mv3i56l3al386g6jr1dpkjx0mwpq25maqkw7zv8qdnshkg1x33f";
+       version = "0.1.0";
+       sha256 = "0kqcs758rdv186mqk17i66lmzzb34a4fd125669sh9gx255lbwya";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base vector ];
-       executableHaskellDepends = [ base vector ];
-       testHaskellDepends = [ base vector ];
+       libraryHaskellDepends = [
+         base free-vector-spaces lens linear vector
+       ];
+       executableHaskellDepends = [
+         base free-vector-spaces lens linear vector
+       ];
+       testHaskellDepends = [
+         base free-vector-spaces lens linear vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion free-vector-spaces lens linear vector
+       ];
        homepage = "https://github.com/masterdezign/dde#readme";
        description = "Delay differential equations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dead-code-detection" = callPackage
@@ -60148,6 +60313,8 @@ self: {
        pname = "derive-storable";
        version = "0.1.1.1";
        sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2";
+       revision = "1";
+       editedCabalFile = "1rf8k42k35lq7rq4g506s06cn3fn94m39934gn0mcbznbqhmvd8v";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://www.github.com/mkloczko/derive-storable/";
@@ -60161,8 +60328,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive-storable-plugin";
-       version = "0.2.0.0";
-       sha256 = "1s0pm6crwbp3j4dfv5mf3lr75l0cvzy019968gbi4hml8v9wd6iw";
+       version = "0.2.1.0";
+       sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi";
        libraryHaskellDepends = [ base derive-storable ghc ghci ];
        testHaskellDepends = [
          base derive-storable ghc ghc-paths ghci hspec QuickCheck
@@ -61629,8 +61796,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.23";
-       sha256 = "14mzv2bc7ndqqkx1nqb3km78h1ysjmry9d6s40nic8r2qgf9y2an";
+       version = "1.1.24";
+       sha256 = "01zizzhq9abyka21600234wj8yy9crx4n8qywiry4gjmq7l8gzm5";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -63983,6 +64150,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doctest-driver-gen_0_2_0_1" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "doctest-driver-gen";
+       version = "0.2.0.1";
+       sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base doctest ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/Hexirp/doctest-driver-gen#readme";
+       description = "Generate driver file for doctest's cabal integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-prop" = callPackage
     ({ mkDerivation, base, doctest, HUnit, QuickCheck }:
      mkDerivation {
@@ -64098,6 +64282,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dom-parser_3_1_0" = callPackage
+    ({ mkDerivation, base, case-insensitive, containers, data-default
+     , hspec, lens, mtl, scientific, semigroups, shakespeare, text
+     , transformers, xml-conduit, xml-lens
+     }:
+     mkDerivation {
+       pname = "dom-parser";
+       version = "3.1.0";
+       sha256 = "1hra4sh34dr1gv4z55dg3f8s2g9l2qb7nlb0j4w0imr71fp5rqfp";
+       libraryHaskellDepends = [
+         base case-insensitive containers lens mtl scientific semigroups
+         text transformers xml-conduit xml-lens
+       ];
+       testHaskellDepends = [
+         base data-default hspec lens semigroups shakespeare text
+         xml-conduit
+       ];
+       homepage = "https://github.com/typeable/dom-parser";
+       description = "Simple monadic DOM parser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dom-selector" = callPackage
     ({ mkDerivation, base, blaze-html, containers, html-conduit, parsec
      , QuickCheck, template-haskell, text, th-lift, xml-conduit
@@ -64793,8 +65000,8 @@ self: {
      }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.2";
-       sha256 = "0bfdd916ab27fqhsly2z2dmjhfvyz9q5w78qpdryi69d0gimfb8g";
+       version = "0.2.2";
+       sha256 = "1cw8jq1j2yirrk80rk2n1m17avxf3xqln96gnih8xzip248q9bjj";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        benchmarkHaskellDepends = [
          base conduit conduit-combinators exceptions gauge list-t ListT
@@ -65170,6 +65377,7 @@ self: {
        homepage = "https://github.com/k0ral/dublincore-xml-conduit";
        description = "XML streaming parser/renderer for the Dublin Core standard elements";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "duckling" = callPackage
@@ -66761,8 +66969,8 @@ self: {
        pname = "ekg";
        version = "0.4.0.14";
        sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd";
-       revision = "1";
-       editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp";
+       revision = "3";
+       editedCabalFile = "1llpsbki0v9p0c820qwv6m4433wfrxfhv8yxrg2xyrrxr8g0p42a";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -66773,6 +66981,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg_0_4_0_15" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+     , filepath, network, snap-core, snap-server, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg";
+       version = "0.4.0.15";
+       sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
+       revision = "1";
+       editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core ekg-json filepath network snap-core
+         snap-server text time transformers unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg";
+       description = "Remote monitoring of processes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-bosun" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, http-client, lens, network
      , network-uri, old-locale, text, time, unordered-containers, vector
@@ -66780,8 +67010,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.11";
-       sha256 = "0663m2riq23dwhsvgqi0mcy6h7hb24fgk315h7mi656bj5lzllx6";
+       version = "1.0.12";
+       sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -66907,6 +67137,8 @@ self: {
        pname = "ekg-json";
        version = "0.1.0.6";
        sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy";
+       revision = "2";
+       editedCabalFile = "02lx17l8dch793n83dgalv2r77nrlcj6k4xgpxaxzwr3nyprk2vj";
        libraryHaskellDepends = [
          aeson base ekg-core text unordered-containers
        ];
@@ -67001,6 +67233,8 @@ self: {
        pname = "ekg-statsd";
        version = "0.2.2.0";
        sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862";
+       revision = "1";
+       editedCabalFile = "1fnazaqdp0d7w5mfx038yv8isyw00dahis66dkyrigd57vrj3f8f";
        libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
@@ -68009,8 +68243,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.19";
-       sha256 = "1z3gnd3cfgp3mlbxlbaqv5m21fv0qqjyzzqi3qkrrggy0y71yq0b";
+       version = "1.2.20";
+       sha256 = "1kx16zpfbish8mcpr6j5s7c63w277kyhcykvcfq2xgh1npg4p0z7";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring errors
          free monad-loops mwc-random stm stm-delay text transformers
@@ -68049,8 +68283,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.5";
-       sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa";
+       version = "1.0.6";
+       sha256 = "1lv9gzz61fcba2y0mqmcml1shk8qjxlw8c1fis4w7xs2xgrwbjbm";
        libraryHaskellDepends = [
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
@@ -70121,6 +70355,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "except-exceptions" = callPackage
+    ({ mkDerivation, base, exceptions, transformers }:
+     mkDerivation {
+       pname = "except-exceptions";
+       version = "0.1";
+       sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs";
+       libraryHaskellDepends = [ base exceptions transformers ];
+       homepage = "https://github.com/thumphries/except-exceptions";
+       description = "Safely deal with exceptions in ExceptT";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exception-hierarchy" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -75804,6 +76050,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "formatting_6_3_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+     , integer-gmp, old-locale, scientific, semigroups, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.3.2";
+       sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf";
+       libraryHaskellDepends = [
+         array base bytestring clock ghc-prim integer-gmp old-locale
+         scientific semigroups text time transformers
+       ];
+       testHaskellDepends = [ base hspec semigroups ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "forml" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal
      , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger
@@ -77096,6 +77361,7 @@ self: {
        homepage = "https://github.com/noughtmare/frpnow-vty";
        description = "Program terminal applications with vty and frpnow!";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frquotes" = callPackage
@@ -77204,6 +77470,7 @@ self: {
        homepage = "https://github.com/fpco/fsnotify-conduit#readme";
        description = "Get filesystem notifications as a stream of events";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fst" = callPackage
@@ -77946,6 +78213,7 @@ self: {
        homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -80392,6 +80660,7 @@ self: {
        homepage = "http://felsin9.de/nnis/ghc-datasize";
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-dump-core" = callPackage
@@ -80603,6 +80872,7 @@ self: {
        testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-imported-from" = callPackage
@@ -81710,6 +81980,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
@@ -81735,6 +82006,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
@@ -81756,6 +82028,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dbusmenu-glib = null;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -81779,6 +82052,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dbusmenu-gtk3 = null;};
 
   "gi-gdk" = callPackage
@@ -81934,6 +82208,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
@@ -81955,6 +82230,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
@@ -84120,10 +84396,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.25";
-       sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb";
-       revision = "2";
-       editedCabalFile = "10n3vhnb77ai3qw2xdkwlhjr3wa6146djk6780l2nc8yfg4axi9j";
+       version = "2.26";
+       sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -84402,6 +84676,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-game" = callPackage
@@ -91251,8 +91526,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.5.0";
-       sha256 = "05xhiwrq6v8v0hy08mhxbslj3ncvyi1jm8m5lv8xqngwcn3yax44";
+       version = "1.6.0";
+       sha256 = "1ajwzyh3x185lvn22vi3wnfprf9fq0k1kxjxz575h87xwnq46y4v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92285,6 +92560,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hamilton_0_1_0_3" = callPackage
+    ({ mkDerivation, ad, ansi-wl-pprint, base, containers
+     , finite-typelits, ghc-typelits-knownnat, hmatrix, hmatrix-gsl
+     , hmatrix-vector-sized, optparse-applicative, typelits-witnesses
+     , vector, vector-sized, vty
+     }:
+     mkDerivation {
+       pname = "hamilton";
+       version = "0.1.0.3";
+       sha256 = "06yvmm9641v74kd265csycwp6ywyc19mx0r0csycljcfghhj6xiw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ad base hmatrix hmatrix-gsl hmatrix-vector-sized typelits-witnesses
+         vector-sized
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base containers finite-typelits
+         ghc-typelits-knownnat hmatrix optparse-applicative vector
+         vector-sized vty
+       ];
+       homepage = "https://github.com/mstksg/hamilton#readme";
+       description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hamlet" = callPackage
     ({ mkDerivation, base, shakespeare }:
      mkDerivation {
@@ -94716,6 +95018,7 @@ self: {
        homepage = "https://github.com/phoityne/haskell-dap";
        description = "haskell-dap is a GHCi having DAP interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-disque" = callPackage
@@ -94921,6 +95224,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; 
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
@@ -100373,6 +100677,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "herms_1_8_2_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
+     , microlens-th, optparse-applicative, semigroups, split, vty
+     }:
+     mkDerivation {
+       pname = "herms";
+       version = "1.8.2.1";
+       sha256 = "0njp1jsz4clb6qyz00xrpw7av4109gx5wd4h180q794vi8xw6v4j";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         ansi-terminal base brick directory microlens microlens-th
+         optparse-applicative semigroups split vty
+       ];
+       homepage = "https://github.com/JackKiefer/herms";
+       description = "A command-line manager for delicious kitchen recipes";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hero-club-five-tenets" = callPackage
     ({ mkDerivation, base, random, text }:
      mkDerivation {
@@ -102017,6 +102342,8 @@ self: {
        pname = "hills";
        version = "0.1.2.6";
        sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
+       revision = "1";
+       editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102920,6 +103247,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hjsonschema_1_8_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , directory, file-embed, filepath, hashable, hjsonpointer, hspec
+     , http-client, http-client-tls, http-types, pcre-heavy, profunctors
+     , protolude, QuickCheck, safe-exceptions, scientific, semigroups
+     , text, unordered-containers, vector, wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "hjsonschema";
+       version = "1.8.0";
+       sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl";
+       revision = "1";
+       editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i";
+       libraryHaskellDepends = [
+         aeson base bytestring containers file-embed filepath hashable
+         hjsonpointer http-client http-client-tls http-types pcre-heavy
+         profunctors protolude QuickCheck safe-exceptions scientific
+         semigroups text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring directory filepath hjsonpointer hspec
+         profunctors protolude QuickCheck semigroups text
+         unordered-containers vector wai-app-static warp
+       ];
+       homepage = "https://github.com/seagreen/hjsonschema";
+       description = "JSON Schema library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjugement" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, text, transformers
@@ -103501,6 +103858,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hlrdb" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite
+     , hashable, hedis, hlrdb-core, memory, random, store, time-exts
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hlrdb";
+       version = "0.1.0.0";
+       sha256 = "1kqm14kd5app34438b3w9h1nxr6fp1dvrf58xrbv2xn2y65jb5jc";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptonite hashable hedis
+         hlrdb-core memory random store time-exts unordered-containers
+       ];
+       homepage = "https://github.com/identicalsnowflake/hlrdb";
+       description = "High-level Redis Database";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hlrdb-core" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl
+     , profunctors, random, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hlrdb-core";
+       version = "0.1.0.0";
+       sha256 = "1gy5sycr4han0i0lk8m3rl99pagd9slfry0b94c05cj6kai6c9ss";
+       libraryHaskellDepends = [
+         base bytestring hashable hedis lens mtl profunctors random
+         unordered-containers
+       ];
+       homepage = "https://github.com/identicalsnowflake/hlrdb-core";
+       description = "High-level Redis Database Core API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hls" = callPackage
     ({ mkDerivation, base, containers, hcg-minus, hps }:
      mkDerivation {
@@ -108716,6 +109109,7 @@ self: {
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -111004,6 +111398,8 @@ self: {
        pname = "htaglib";
        version = "1.1.1";
        sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3";
+       revision = "1";
+       editedCabalFile = "0znih19z9ly4m1nadwkalq28xz0vy6pc0yyamyz2fz5s5nv69lr0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring text transformers ];
        librarySystemDepends = [ taglib ];
@@ -111013,6 +111409,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
 
+  "htaglib_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , hspec-discover, taglib, text, transformers
+     }:
+     mkDerivation {
+       pname = "htaglib";
+       version = "1.2.0";
+       sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base bytestring text transformers ];
+       librarySystemDepends = [ taglib ];
+       testHaskellDepends = [ base directory filepath hspec ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mrkkrp/htaglib";
+       description = "Bindings to TagLib, audio meta-data library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) taglib;};
+
   "htags" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src, mtl }:
      mkDerivation {
@@ -113380,6 +113795,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-fingertree_0_1_0_1" = callPackage
+    ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
+     , hw-hspec-hedgehog, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "hw-fingertree";
+       version = "0.1.0.1";
+       sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/haskell-works/hw-fingertree#readme";
+       description = "Generic finger-tree structure, with example instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-fingertree-strict" = callPackage
     ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
      , QuickCheck, test-framework, test-framework-hunit
@@ -113399,6 +113834,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-fingertree-strict_0_1_0_2" = callPackage
+    ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "hw-fingertree-strict";
+       version = "0.1.0.2";
+       sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme";
+       description = "Generic strict finger-tree structure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, vector }:
      mkDerivation {
@@ -116448,6 +116903,7 @@ self: {
        homepage = "https://github.com/k0ral/imm";
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -116887,6 +117343,7 @@ self: {
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -118843,6 +119300,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip_1_2_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , doctest, hashable, hspec, HUnit, primitive, QuickCheck
+     , quickcheck-classes, semigroups, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, vector
+     }:
+     mkDerivation {
+       pname = "ip";
+       version = "1.2.0";
+       sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hashable primitive semigroups text
+         vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring doctest hspec HUnit QuickCheck
+         quickcheck-classes test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion text
+       ];
+       homepage = "https://github.com/andrewthad/haskell-ip#readme";
+       description = "Library for IP and MAC addresses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ip-quoter" = callPackage
     ({ mkDerivation, base, cpu, network, tasty, tasty-hunit
      , template-haskell
@@ -121392,8 +121877,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-assertions";
-       version = "1.0.10";
-       sha256 = "1rhg6hrk0pzy9xx6hhy39xmnpz931a6wq93sjgpvlzlm3hyfwq0x";
+       version = "1.0.11";
+       sha256 = "000a528gmkb25zcl7am6qh8fjrq2v2l71c27fxzm6wpf0ml0vv7z";
        libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
@@ -122862,16 +123347,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "kanji_3_2_1" = callPackage
+  "kanji_3_3_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
-     , microlens-platform, optparse-applicative, protolude, tasty
-     , tasty-hunit, text
+     , optparse-applicative, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "kanji";
-       version = "3.2.1";
-       sha256 = "1x9mrjsj73kwk0y7m1j9n9d4pbcrjg066njpasb1vi69w6h2flbs";
+       version = "3.3.0";
+       sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122879,7 +123363,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base containers microlens microlens-aeson
-         microlens-platform optparse-applicative protolude text
+         optparse-applicative text transformers
        ];
        testHaskellDepends = [
          aeson base containers HUnit-approx tasty tasty-hunit text
@@ -123927,8 +124411,8 @@ self: {
        pname = "keys";
        version = "3.12";
        sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl";
-       revision = "1";
-       editedCabalFile = "1lbl62y3alhpgkf2knh4q5pcby54kblb68cbx2i77fbdwz8jbka7";
+       revision = "2";
+       editedCabalFile = "0cy2fdxxqg0bgkb8xhnw6zws00d78bpk48xv7zzmvnj549l819ib";
        libraryHaskellDepends = [
          array base comonad containers free hashable semigroupoids
          semigroups tagged transformers transformers-compat
@@ -125557,8 +126041,8 @@ self: {
        pname = "lame";
        version = "0.1.1";
        sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k";
-       revision = "1";
-       editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl";
+       revision = "3";
+       editedCabalFile = "041hv4z4xxqidnlr5jgkwp13vj4lr9dvqlrgavl3dmsd07vfj0bc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class directory exceptions filepath
@@ -130794,8 +131278,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-tries";
-       version = "0.6.4";
-       sha256 = "0l1qm1n3sh6shzcl4g00w705gx0xy8qwnj68dlm18hsa9y0z572h";
+       version = "0.6.5";
+       sha256 = "1bdqja3favvxxlqxyh4r07xhkgsxan7lg8vb0nrahkfbifa4m6by";
        libraryHaskellDepends = [ base binary containers dlist ];
        testHaskellDepends = [
          base binary ChasingBottoms HUnit QuickCheck template-haskell
@@ -131611,6 +132095,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "load-font" = callPackage
+    ({ mkDerivation, base, c2hs, fltkhs, text }:
+     mkDerivation {
+       pname = "load-font";
+       version = "0.1.0.0";
+       sha256 = "1xva9cxwscjyqpx5yvbicyizk4y439wdv8gzxir2jwkangpvrby5";
+       revision = "2";
+       editedCabalFile = "0qmz9kmb1cc3cvidxvspa186nkby4m060f6y9v23s3dqp3wd93mm";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base fltkhs text ];
+       homepage = "https://github.com/deech/load-font#load-font";
+       description = "A cross platform library for loading bundled fonts into your application";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "loadavg" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -131751,8 +132254,8 @@ self: {
      }:
      mkDerivation {
        pname = "locators";
-       version = "0.2.4.2";
-       sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4";
+       version = "0.2.4.3";
+       sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4";
        libraryHaskellDepends = [
          base bytestring cereal containers cryptohash
        ];
@@ -131860,6 +132363,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lockpool" = callPackage
+    ({ mkDerivation, base, clock, stm }:
+     mkDerivation {
+       pname = "lockpool";
+       version = "0.1.0.0";
+       sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi";
+       libraryHaskellDepends = [ base clock stm ];
+       homepage = "https://github.com/chessai/lockpool.git";
+       description = "set a maximum on the number of concurrent actions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log" = callPackage
     ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg
      , exceptions, hpqtypes, http-client, http-types, log-base
@@ -132180,6 +132696,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_2_5" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.2.5";
+       sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, wl-pprint-text
@@ -132238,6 +132778,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "logging-effect-extra-handler_1_1_4" = callPackage
+    ({ mkDerivation, base, exceptions, logging-effect, time
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect-extra-handler";
+       version = "1.1.4";
+       sha256 = "0932i0qrwrr2j7w40bf3q5dlazz4800drc0chvr1kpbpk6b4njim";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base exceptions logging-effect time wl-pprint-text
+       ];
+       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
+       homepage = "https://github.com/jship/logging-effect-extra#readme";
+       description = "Handy logging handler combinators";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade" = callPackage
     ({ mkDerivation, base, call-stack, hspec, transformers }:
      mkDerivation {
@@ -135564,14 +136124,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_1_3_0" = callPackage
+  "massiv_0_1_4_0" = callPackage
     ({ mkDerivation, base, data-default, data-default-class, deepseq
      , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.1.3.0";
-       sha256 = "0bpy370004rvsz7qq41x7cdim8l4rj79zlz7jzpw7casm6ly0473";
+       version = "0.1.4.0";
+       sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -141063,6 +141623,8 @@ self: {
        pname = "mongoDB";
        version = "2.3.0.5";
        sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9";
+       revision = "2";
+       editedCabalFile = "0bx2vdwp53c9dgil09qg22hd1j1dilwqcg6ighp28ajmnxkyl8j0";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring binary bson
          bytestring conduit conduit-extra containers cryptohash
@@ -141316,6 +141878,7 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -141640,7 +142203,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "morte_1_6_17" = callPackage
+  "morte_1_6_18" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
      , http-client-tls, microlens, microlens-mtl, mtl
@@ -141650,8 +142213,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.17";
-       sha256 = "1sw986mprhlbgzz3zgjlr3mynj4caj3dyl7b6ln7y6y8jb567h3n";
+       version = "1.6.18";
+       sha256 = "1cnwk2rihbywwkpxw7bd22zh33hkffpaza7d4crr5x2p7rdvhmjp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -142311,8 +142874,8 @@ self: {
        pname = "mtl-compat";
        version = "0.2.1.3";
        sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
-       revision = "3";
-       editedCabalFile = "0igfsrc7q326ggvw47xwq1xffa4r225akla0nwgmqhd7y1n5753c";
+       revision = "4";
+       editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5";
        libraryHaskellDepends = [ base mtl ];
        doHaddock = false;
        homepage = "https://github.com/haskell-compat/mtl-compat";
@@ -143956,6 +144519,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mysql;};
 
+  "mysql_0_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+     }:
+     mkDerivation {
+       pname = "mysql";
+       version = "0.1.5";
+       sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ mysql ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/paul-rouse/mysql";
+       description = "A low-level MySQL client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mysql;};
+
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
      , mysql-simple
@@ -144056,6 +144636,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mysql-simple_0_4_5" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , blaze-textual, bytestring, containers, hspec, mysql, old-locale
+     , pcre-light, text, time
+     }:
+     mkDerivation {
+       pname = "mysql-simple";
+       version = "0.4.5";
+       sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder blaze-textual
+         bytestring containers mysql old-locale pcre-light text time
+       ];
+       testHaskellDepends = [ base blaze-builder hspec text ];
+       homepage = "https://github.com/paul-rouse/mysql-simple";
+       description = "A mid-level MySQL client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mysql-simple-quasi" = callPackage
     ({ mkDerivation, base, haskell-src-meta, mysql-simple
      , template-haskell
@@ -145520,8 +146120,8 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
-       revision = "3";
-       editedCabalFile = "1j0s7r9hzisi8zacs505rxh9pk05m5hrrcxn8jnh7w8yphyqbv4j";
+       revision = "4";
+       editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -150016,6 +150616,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_6_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, dotenv, hspec
+     , hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, semigroups, text
+     , time, time-locale-compat, transformers, uuid, void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.6.1.0";
+       sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors semigroups text time time-locale-compat transformers
+         uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -150160,6 +150788,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base conduit mtl text ];
        homepage = "https://github.com/alphaHeavy/open-symbology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-typerep" = callPackage
@@ -151006,6 +151635,7 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -152281,8 +152911,8 @@ self: {
        pname = "pagination";
        version = "0.2.1";
        sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48";
-       revision = "1";
-       editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5";
+       revision = "2";
+       editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2";
        libraryHaskellDepends = [ base deepseq exceptions ];
        testHaskellDepends = [ base exceptions hspec QuickCheck ];
        homepage = "https://github.com/mrkkrp/pagination";
@@ -152519,34 +153149,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_14_2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, 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
+  "pandoc-citeproc_0_14_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
+     , bytestring, Cabal, 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.14.2";
-       sha256 = "1dz3ybvi7bydpjfwpk72whmy9agz6g1xa60nazs1r9im97apfgw5";
+       version = "0.14.3";
+       sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        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
+         aeson base base-compat 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
+         aeson aeson-pretty attoparsec base base-compat bytestring filepath
+         pandoc pandoc-types syb text yaml
        ];
        testHaskellDepends = [
-         aeson base bytestring containers directory filepath mtl pandoc
-         pandoc-types process temporary text yaml
+         aeson base base-compat bytestring containers directory filepath mtl
+         pandoc pandoc-types process temporary text yaml
        ];
        doCheck = false;
        homepage = "https://github.com/jgm/pandoc-citeproc";
@@ -153450,6 +154080,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "papillon_0_1_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "papillon";
+       version = "0.1.0.6";
+       sha256 = "1j0sxac7pgwfbgb545ysjsw7haz6m41m6gz5z8v3xawjhx662nib";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring monads-tf template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         base directory filepath monads-tf template-haskell transformers
+       ];
+       homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
+       description = "packrat parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pappy" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -157388,6 +158040,7 @@ self: {
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picosat" = callPackage
@@ -158517,6 +159170,8 @@ self: {
        pname = "pipes-random";
        version = "1.0.0.4";
        sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl";
+       revision = "1";
+       editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h";
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        homepage = "https://github.com/fosskers/pipes-random";
        description = "Producers for handling randomness";
@@ -159098,8 +159753,8 @@ self: {
      }:
      mkDerivation {
        pname = "playlists-http";
-       version = "0.2.0.0";
-       sha256 = "0hx55vqcqfkfjds7hh4l1i60al9d65q55wg9jfns3qml5z8pqik1";
+       version = "0.2.1.0";
+       sha256 = "1kzc1awfqk979h2hmpqh2pjiy33v140pibbp703hqbq0fkrynj2k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159325,6 +159980,7 @@ self: {
        homepage = "https://github.com/ocramz/plot-light-examples";
        description = "Example binaries for plot-light";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotfont" = callPackage
@@ -159724,10 +160380,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointful";
-       version = "1.0.9";
-       sha256 = "1mmc7kjspak2597d9jzkqgga4gh9v5dljkifbgminx8rchiq263a";
-       revision = "1";
-       editedCabalFile = "13lwn5zy44cbmax8ic1j8dhrzn7hxws5mcjrjyjwqcn2abmwc2js";
+       version = "1.0.11.0";
+       sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161245,6 +161899,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-simple-url_0_2_1_0" = callPackage
+    ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-url";
+       version = "0.2.1.0";
+       sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk";
+       libraryHaskellDepends = [
+         base network-uri postgresql-simple split
+       ];
+       testHaskellDepends = [
+         base postgresql-simple tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/futurice/postgresql-simple-url";
+       description = "Parse postgres:// url into ConnectInfo";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-syntax" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase
      , text
@@ -162743,6 +163417,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prim-array_0_2_2" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive, semigroups }:
+     mkDerivation {
+       pname = "prim-array";
+       version = "0.2.2";
+       sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3";
+       libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
+       homepage = "https://github.com/andrewthad/prim-array#readme";
+       description = "Primitive byte array with type variable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prim-spoon" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
      , spoon
@@ -164071,8 +164758,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.3.3";
-       sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61";
+       version = "5.3.4";
+       sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165269,8 +165956,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6";
-       sha256 = "1igbg3d5l8sf53kpx0451dha5lr099hpqgwy7jfjkyjvxzxi8y5b";
+       version = "0.6.1";
+       sha256 = "0dqc35ca1668j2xfwmz8bqgbyld9gw3b0bld8s5gy6id7qfn7d26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165393,6 +166080,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "purescript-bridge_0_12_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
+     , mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "purescript-bridge";
+       version = "0.12.0.0";
+       sha256 = "1kh3ydqn7vs3ybda9ic8gbmzzjigiiibls9w1nh5ffgwf42dij7j";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving lens mtl text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-expectations-pretty-diff text
+       ];
+       description = "Generate PureScript data types from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , optparse-applicative, text, vector
@@ -166723,6 +167431,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-classes_0_4_2" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, containers, primitive
+     , QuickCheck, semigroupoids, semigroups, tagged, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "quickcheck-classes";
+       version = "0.4.2";
+       sha256 = "1whin052j39gdvqy1kvfrqiyfa76amclp6pschqd6xmmw2vly491";
+       libraryHaskellDepends = [
+         aeson base bifunctors containers primitive QuickCheck semigroupoids
+         semigroups tagged transformers
+       ];
+       testHaskellDepends = [
+         aeson base primitive QuickCheck tagged transformers vector
+       ];
+       homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
+       description = "QuickCheck common typeclasses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-combinators" = callPackage
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
@@ -168669,6 +169399,7 @@ self: {
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rate-limit" = callPackage
@@ -171000,8 +171731,8 @@ self: {
        pname = "regex-applicative-text";
        version = "0.1.0.1";
        sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh";
-       revision = "1";
-       editedCabalFile = "1w8aqqq6j1lhwpi2d0qj9h32cia3nr9l43a0mspqawb1nsmpjyic";
+       revision = "2";
+       editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi";
        libraryHaskellDepends = [ base regex-applicative text ];
        homepage = "https://github.com/phadej/regex-applicative-text#readme";
        description = "regex-applicative on text";
@@ -171986,6 +172717,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "relevant-time" = callPackage
+    ({ mkDerivation, aeson, base, chronos, text, torsor }:
+     mkDerivation {
+       pname = "relevant-time";
+       version = "0.1.0.0";
+       sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk";
+       libraryHaskellDepends = [ aeson base chronos text torsor ];
+       homepage = "https://github.com/chessai/relevant-time.git";
+       description = "humanised relevant time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "relit" = callPackage
     ({ mkDerivation, base, regex-base, template-haskell }:
      mkDerivation {
@@ -173831,31 +174574,33 @@ self: {
      }) {};
 
   "rfc" = callPackage
-    ({ mkDerivation, aeson, aeson-diff, base, bifunctors, binary
-     , blaze-html, classy-prelude, containers, data-default
-     , freer-simple, hedis, http-api-data, http-client, http-client-tls
-     , http-types, lens, lifted-async, markdown, monad-control
-     , natural-transformation, network-uri, postgresql-simple
-     , resource-pool, servant, servant-blaze, servant-client
-     , servant-docs, servant-server, servant-swagger, simple-logger
-     , string-conversions, swagger2, temporary, text, time-units
-     , unliftio, unliftio-core, unordered-containers, url, uuid-types
-     , vector, wai, wai-cors, wai-extra, wreq
+    ({ mkDerivation, aeson, aeson-diff, attoparsec, base, binary
+     , blaze-html, bytestring, classy-prelude, containers, data-default
+     , envy, hedis, http-api-data, http-client, http-client-tls
+     , http-types, lens, lifted-async, markdown, miso, monad-control
+     , mono-traversable, mtl, natural-transformation, network
+     , network-uri, postgresql-typed, resource-pool, servant
+     , servant-blaze, servant-client, servant-docs, servant-server
+     , servant-swagger, simple-logger, swagger2, temporary, text
+     , text-conversions, time, time-units, unliftio, unliftio-core
+     , unordered-containers, url, uuid-types, wai, wai-cli, wai-cors
+     , wai-extra, warp, wreq
      }:
      mkDerivation {
        pname = "rfc";
-       version = "0.0.0.24";
-       sha256 = "05spf71r2zyc9pyx5kr2jsamyzga1y46831n6fmhad98bjswgr6q";
+       version = "0.0.0.25";
+       sha256 = "1yzi8cb90iy54wi463cpk9h961k53cilgdjcf252yw4qsvxcqh5i";
        libraryHaskellDepends = [
-         aeson aeson-diff base bifunctors binary blaze-html classy-prelude
-         containers data-default freer-simple hedis http-api-data
+         aeson aeson-diff attoparsec base binary blaze-html bytestring
+         classy-prelude containers data-default envy hedis http-api-data
          http-client http-client-tls http-types lens lifted-async markdown
-         monad-control natural-transformation network-uri postgresql-simple
-         resource-pool servant servant-blaze servant-client servant-docs
-         servant-server servant-swagger simple-logger string-conversions
-         swagger2 temporary text time-units unliftio unliftio-core
-         unordered-containers url uuid-types vector wai wai-cors wai-extra
-         wreq
+         miso monad-control mono-traversable mtl natural-transformation
+         network network-uri postgresql-typed resource-pool servant
+         servant-blaze servant-client servant-docs servant-server
+         servant-swagger simple-logger swagger2 temporary text
+         text-conversions time time-units unliftio unliftio-core
+         unordered-containers url uuid-types wai wai-cli wai-cors wai-extra
+         warp wreq
        ];
        homepage = "https://github.com/RobertFischer/rfc#README.md";
        description = "Robert Fischer's Common library";
@@ -173897,6 +174642,7 @@ self: {
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc5051" = callPackage
@@ -175284,16 +176030,17 @@ self: {
      }) {};
 
   "row-types" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hashable, text
-     , unordered-containers
+    ({ mkDerivation, base, constraints, criterion, deepseq, hashable
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "row-types";
-       version = "0.2.0.0";
-       sha256 = "158k4q6b1ca7d8fkznl09mdd29z7w5clxh48i3b3m1bcmhjmcfmh";
+       version = "0.2.2.0";
+       sha256 = "1xv42yzv0xrb1bwqlmpmk7wwmq2mcf6d73g91aycq99hjq18bmcq";
        libraryHaskellDepends = [
-         base deepseq hashable text unordered-containers
+         base constraints deepseq hashable text unordered-containers
        ];
+       testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Open Records and Variants";
        license = stdenv.lib.licenses.mit;
@@ -175508,6 +176255,7 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -177016,6 +177764,34 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "sbp_2_3_13" = callPackage
+    ({ mkDerivation, aeson, array, base, base64-bytestring
+     , basic-prelude, binary, binary-conduit, bytestring, conduit
+     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
+     , resourcet, tasty, tasty-hunit, template-haskell, text, yaml
+     }:
+     mkDerivation {
+       pname = "sbp";
+       version = "2.3.13";
+       sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring basic-prelude binary bytestring
+         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+         text
+       ];
+       executableHaskellDepends = [
+         aeson base basic-prelude binary-conduit bytestring conduit
+         conduit-extra resourcet yaml
+       ];
+       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       homepage = "https://github.com/swift-nav/libsbp";
+       description = "SwiftNav's SBP Library";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbp2udp" = callPackage
     ({ mkDerivation, base, basic-prelude, binary, binary-conduit
      , bytestring, conduit, conduit-extra, network, optparse-generic
@@ -177385,6 +178161,7 @@ self: {
        homepage = "http://trac.haskell.org/SCC/";
        description = "Streaming component combinators";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scenegraph" = callPackage
@@ -179400,8 +180177,8 @@ self: {
      }:
      mkDerivation {
        pname = "sentiwordnet-parser";
-       version = "0.1.1.0";
-       sha256 = "0mb5c0n2i0gyyk94j4lnfpxzh8v2vxlq7dbp1v5gmz5ws7s9pfll";
+       version = "0.2.0.0";
+       sha256 = "0gbzzrd5wivxrcha8w0ncgqz7qr29f4aclz4i7z607lz2lywrifm";
        libraryHaskellDepends = [
          base Decimal hashable parsers safe string-class text trifecta
          unordered-containers vector
@@ -179896,6 +180673,8 @@ self: {
        pname = "servant";
        version = "0.13";
        sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230";
+       revision = "1";
+       editedCabalFile = "1l1a52xard2ax9avh1ic893gykhlvrvgw0cncjsaqvi9rvkd047y";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
@@ -180354,6 +181133,8 @@ self: {
        pname = "servant-client";
        version = "0.13";
        sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93";
+       revision = "1";
+       editedCabalFile = "0kdymqs9k90ig840bbj58znmfzlgr81jk7pfj1ygdvikjz1k1lpk";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          http-client http-client-tls http-media http-types monad-control mtl
@@ -180382,6 +181163,8 @@ self: {
        pname = "servant-client-core";
        version = "0.13";
        sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp";
+       revision = "1";
+       editedCabalFile = "0zxkc0p436clpmh1y30d3ybqw12q2pk2gzfyjjgh17yvhzxzddnb";
        libraryHaskellDepends = [
          base base-compat base64-bytestring bytestring containers exceptions
          generics-sop http-api-data http-media http-types mtl network-uri
@@ -180465,6 +181248,8 @@ self: {
        pname = "servant-docs";
        version = "0.11.2";
        sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
+       revision = "1";
+       editedCabalFile = "0pm5gclgwna9bw3avjfp1pghzbk0a32sbd9v3fh321gmsax1h4zi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -180631,6 +181416,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-foreign_0_11_1" = callPackage
+    ({ mkDerivation, base, base-compat, hspec, hspec-discover
+     , http-types, lens, servant, text
+     }:
+     mkDerivation {
+       pname = "servant-foreign";
+       version = "0.11.1";
+       sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
+       libraryHaskellDepends = [
+         base base-compat http-types lens servant text
+       ];
+       testHaskellDepends = [ base hspec servant ];
+       testToolDepends = [ hspec-discover ];
+       description = "Helpers for generating clients for servant APIs in any programming language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-generate" = callPackage
+    ({ mkDerivation, base, servant, servant-server }:
+     mkDerivation {
+       pname = "servant-generate";
+       version = "0.1";
+       sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw";
+       revision = "1";
+       editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4";
+       libraryHaskellDepends = [ base servant servant-server ];
+       homepage = "https://github.com/alpmestan/servant-generate";
+       description = "Utilities for generating mock server implementations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-generic" = callPackage
     ({ mkDerivation, base, network-uri, servant, servant-server, text
      , warp
@@ -180771,6 +181588,8 @@ self: {
        pname = "servant-js";
        version = "0.9.3.2";
        sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
+       revision = "1";
+       editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181254,6 +182073,8 @@ self: {
        pname = "servant-server";
        version = "0.13";
        sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy";
+       revision = "1";
+       editedCabalFile = "0kf88s2wkijfznp0sk3mrfyhr9rnq3kqpsl26di953ynxgd6z4yd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -184103,8 +184924,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.10.0.0";
-       sha256 = "00hspcdh7si0bykfdyxclklv622izl8jm6nwic4z5j15rmqa62b7";
+       version = "0.10.0.1";
+       sha256 = "1fixv7gymd03bnn8aysyyr7jwp1j943xyd69659xcjmljknd1h5m";
        libraryHaskellDepends = [
          array async base bytestring exceptions list-t monad-control
          MonadRandom mtl text transformers transformers-base
@@ -184925,6 +185746,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-bool_0_1_4" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "singleton-bool";
+       version = "0.1.4";
+       sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/phadej/singleton-bool#readme";
+       description = "Type level booleans";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singleton-dict" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
@@ -185657,8 +186491,8 @@ self: {
      }:
      mkDerivation {
        pname = "slate";
-       version = "0.8.1.0";
-       sha256 = "1dzk9xcif3g14qqksj7h343ka3b19fcgijbnhmivpgjdgychkyk2";
+       version = "0.9.0.0";
+       sha256 = "19619ladqp1faqdn4z2yrxvffpcr9k0s942s6rjg73i229hccv8f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186547,6 +187381,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-core_1_0_3_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , case-insensitive, containers, deepseq, directory, filepath
+     , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
+     , network, network-uri, old-locale, parallel, QuickCheck, random
+     , readable, regex-posix, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector
+     , zlib
+     }:
+     mkDerivation {
+       pname = "snap-core";
+       version = "1.0.3.2";
+       sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder case-insensitive
+         containers directory filepath hashable HUnit io-streams lifted-base
+         monad-control mtl network network-uri old-locale random readable
+         regex-posix text time transformers transformers-base unix-compat
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder case-insensitive
+         containers deepseq directory filepath hashable HUnit io-streams
+         lifted-base monad-control mtl network network-uri old-locale
+         parallel QuickCheck random readable regex-posix test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers transformers-base unix-compat unordered-containers
+         vector zlib
+       ];
+       homepage = "http://snapframework.com/";
+       description = "Snap: A Haskell Web Framework (core interfaces and types)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-cors" = callPackage
     ({ mkDerivation, snap-core }:
      mkDerivation {
@@ -186763,6 +187633,48 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-server_1_1_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, clock
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
+     }:
+     mkDerivation {
+       pname = "snap-server";
+       version = "1.1.0.0";
+       sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
+       configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers filepath HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time unix unix-compat vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder bytestring
+         bytestring-builder case-insensitive clock containers deepseq
+         directory filepath HsOpenSSL http-common http-streams HUnit
+         io-streams io-streams-haproxy lifted-base monad-control mtl network
+         old-locale openssl-streams parallel QuickCheck random snap-core
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         threads time transformers unix unix-compat vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core vector
+       ];
+       homepage = "http://snapframework.com/";
+       description = "A web server for the Snap Framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-templates" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , directory-tree, filepath, hashable, old-time, template-haskell
@@ -188112,8 +189024,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.8";
-       sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q";
+       version = "1.3.9";
+       sha256 = "1bn0x8l288rgq1x04a6xlaky8zwzqzs5zpbv80fvnnzqb4810035";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -188811,8 +189723,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.0";
-       sha256 = "1qjrzfwcscdaz828l1rm0nyr7965kj5bbk777n8l2ylk287xnyjb";
+       version = "0.0.1.1";
+       sha256 = "14apx9pxbl9s9i5d8i7x3y9wyzdyx3gspz4l4h4vaddg996pq0il";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -188833,6 +189745,7 @@ self: {
        ];
        description = "Unified streaming dependency management for web apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse" = callPackage
@@ -194935,6 +195848,7 @@ self: {
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supero" = callPackage
@@ -195132,6 +196046,7 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -195356,6 +196271,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "swagger2_2_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
+     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
+     , hashable, hspec, hspec-discover, http-media, HUnit
+     , insert-ordered-containers, lens, mtl, network, QuickCheck
+     , quickcheck-instances, scientific, template-haskell, text, time
+     , transformers, transformers-compat, unordered-containers
+     , uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "2.2.1";
+       sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring containers generics-sop hashable
+         http-media insert-ordered-containers lens mtl network scientific
+         template-haskell text time transformers transformers-compat
+         unordered-containers uuid-types vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring containers doctest Glob
+         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+         quickcheck-instances text time unordered-containers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "swapper" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data
      , happstack-state, parallel, tokyocabinet
@@ -195452,6 +196399,33 @@ self: {
        license = "LGPL";
      }) {};
 
+  "swish_0_9_2_1" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hashable
+     , HUnit, intern, mtl, network-uri, old-locale, polyparse
+     , semigroups, test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "swish";
+       version = "0.9.2.1";
+       sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hashable intern mtl network-uri
+         old-locale polyparse semigroups text time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hashable HUnit network-uri old-locale semigroups
+         test-framework test-framework-hunit text time
+       ];
+       homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
+       description = "A semantic web toolkit";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sws" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, directory, filepath
      , hourglass, http-types, network, resourcet, transformers, wai
@@ -198455,8 +199429,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
        pname = "tasty-travis";
-       version = "0.2.0";
-       sha256 = "1k0cgjbj2dgf5d8j13ns2nk9kw74ixa62bwk7wmj1gr1yfwv1klx";
+       version = "0.2.0.1";
+       sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17";
        libraryHaskellDepends = [ base tasty ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/merijn/tasty-travis";
@@ -201575,6 +202549,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "th-format" = callPackage
+    ({ mkDerivation, base, Earley, haskell-src-meta, tasty, tasty-hunit
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "th-format";
+       version = "0.1.0.0";
+       sha256 = "0vyvw9m28xb2playrzc533173p26jnlr8w1sbjc9w81y17676z3x";
+       libraryHaskellDepends = [
+         base Earley haskell-src-meta template-haskell text
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
+       homepage = "https://github.com/mtesseract/th-format#readme";
+       description = "Template Haskell based support for format strings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-inline-io-action" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -201931,20 +202922,19 @@ self: {
      }) {};
 
   "themoviedb" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, either
-     , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit
-     , text, text-binary, time, time-locale-compat, transformers
+    ({ mkDerivation, aeson, base, binary, bytestring, http-client
+     , http-client-tls, http-types, mtl, tasty, tasty-hunit, text
+     , text-binary, time, time-locale-compat, transformers
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.1.3.0";
-       sha256 = "0bw3y1vlh36dnsc8npx3nf00n86qbz61xfkjvlp1knidda3q0d1c";
+       version = "1.1.4.0";
+       sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring either http-client http-client-tls
-         http-types mtl text text-binary time time-locale-compat
-         transformers
+         aeson base binary bytestring http-client http-client-tls http-types
+         mtl text text-binary time time-locale-compat transformers
        ];
        executableHaskellDepends = [
          base text time time-locale-compat transformers
@@ -202340,6 +203330,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threepenny-gui_0_8_2_3" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, deepseq, exceptions, file-embed, filepath, hashable
+     , network-uri, safe, snap-core, snap-server, stm, template-haskell
+     , text, transformers, unordered-containers, vault, vector
+     , websockets, websockets-snap
+     }:
+     mkDerivation {
+       pname = "threepenny-gui";
+       version = "0.8.2.3";
+       sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default deepseq
+         exceptions file-embed filepath hashable network-uri safe snap-core
+         snap-server stm template-haskell text transformers
+         unordered-containers vault vector websockets websockets-snap
+       ];
+       homepage = "http://wiki.haskell.org/Threepenny-gui";
+       description = "GUI framework that uses the web browser as a display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threepenny-gui-contextmenu" = callPackage
     ({ mkDerivation, base, threepenny-gui }:
      mkDerivation {
@@ -203497,6 +204513,7 @@ self: {
        homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -205177,6 +206194,8 @@ self: {
        pname = "transformers-compat";
        version = "0.6.0.6";
        sha256 = "0fdnc8qnm42llp3nyfmg7ij6wscrigb43x3f2w1d38dvjkycyags";
+       revision = "1";
+       editedCabalFile = "0spzhq7c53vrgxlnakavq2fag3zjss76fbmz1hkzgk5bcmk7mlq7";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        testHaskellDepends = [
          base deriving-compat hspec QuickCheck tagged transformers
@@ -205238,8 +206257,8 @@ self: {
      }:
      mkDerivation {
        pname = "transformers-eff";
-       version = "0.2.0.0";
-       sha256 = "1na8gvbhbsdfkxvhy57f3qi91rksjin10lr8nsar4nimrd7nmghn";
+       version = "0.2.1.0";
+       sha256 = "0miam7n85ch39v7pym8m53nxyymwwnc5v52lip4x4h0vffpnq8lx";
        libraryHaskellDepends = [
          base free list-transformer mmorph transformers
        ];
@@ -205264,6 +206283,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-either_0_1_0" = callPackage
+    ({ mkDerivation, base, exceptions, text, transformers }:
+     mkDerivation {
+       pname = "transformers-either";
+       version = "0.1.0";
+       sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm";
+       libraryHaskellDepends = [ base exceptions text transformers ];
+       homepage = "http://github.com/tmcgilchrist/transformers-either/";
+       description = "An Either monad transformer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transformers-fix" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -206677,6 +207709,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_7" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , semigroups, stm, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.7";
+       sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm system-fileio
+         system-filepath temporary text time transformers unix unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -208434,6 +209490,35 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tz_0_1_3_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, thyme, time, timezone-olson, timezone-series
+     , tzdata, vector
+     }:
+     mkDerivation {
+       pname = "tz";
+       version = "0.1.3.1";
+       sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default deepseq
+         template-haskell time tzdata vector
+       ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th time tzdata
+       ];
+       benchmarkHaskellDepends = [
+         base criterion lens thyme time timezone-olson timezone-series
+       ];
+       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
+       homepage = "https://github.com/nilcons/haskell-tz";
+       description = "Efficient time zone handling";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tzdata" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
@@ -212392,6 +213477,7 @@ self: {
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcs-revision" = callPackage
@@ -212850,6 +213936,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vector-shuffling" = callPackage
+    ({ mkDerivation, base, random, vector }:
+     mkDerivation {
+       pname = "vector-shuffling";
+       version = "1";
+       sha256 = "19brlcbxha2mpmciabjw1npdi2xcpvfhd8wjn2ssfcdl0pd2n2ln";
+       libraryHaskellDepends = [ base random vector ];
+       homepage = "https://github.com/metrix-ai/vector-shuffling";
+       description = "Algorithms for vector shuffling";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vector-sized" = callPackage
     ({ mkDerivation, base, deepseq, finite-typelits, vector }:
      mkDerivation {
@@ -212862,6 +213960,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-sized_1_0_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, finite-typelits
+     , indexed-list-literals, primitive, vector
+     }:
+     mkDerivation {
+       pname = "vector-sized";
+       version = "1.0.0.0";
+       sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls";
+       libraryHaskellDepends = [
+         base deepseq finite-typelits indexed-list-literals primitive vector
+       ];
+       homepage = "http://github.com/expipiplus1/vector-sized#readme";
+       description = "Size tagged vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-space" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
@@ -212981,8 +214096,8 @@ self: {
        pname = "vectortiles";
        version = "1.3.0";
        sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0";
-       revision = "1";
-       editedCabalFile = "04h85s069i8sgh382h0j4vx6zlx15yi3q7xmb7pnq8vhfamszsaq";
+       revision = "2";
+       editedCabalFile = "0c3xkk3xks9c4kn1l6d58v0qsg7q3pdjwdwgpwd93npcjl3isc19";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable protocol-buffers
          protocol-buffers-descriptor text transformers unordered-containers
@@ -213121,6 +214236,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "versions_3_3_2" = callPackage
+    ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec
+     , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "versions";
+       version = "3.3.2";
+       sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg";
+       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
+       testHaskellDepends = [
+         base checkers microlens QuickCheck tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "Types and parsers for software version numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vgrep" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th
      , containers, directory, doctest, fingertree, generic-deriving
@@ -213211,8 +214344,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.14";
-       sha256 = "19x112bpc7fw3dqfpgp0bi6cw01vr8csfyqixi68128ij3b6csm0";
+       version = "0.0.0.15";
+       sha256 = "10ihmdba4rbji13lihmxf2yw77nii63k4mz6a0d03lzcw2bppr1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -213287,8 +214420,8 @@ self: {
      }:
      mkDerivation {
        pname = "vimeta";
-       version = "0.2.3.0";
-       sha256 = "0023jrn5my1wgyspf4nq4m3xr7i4w277p4328j6l8hq7fda04ig4";
+       version = "0.2.4.0";
+       sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -215732,6 +216865,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-transformers_0_1_0" = callPackage
+    ({ mkDerivation, base, exceptions, extractable-singleton
+     , monad-control-aligned, transformers, wai, wai-websockets
+     , websockets
+     }:
+     mkDerivation {
+       pname = "wai-transformers";
+       version = "0.1.0";
+       sha256 = "14l5ihyvg2n0kmmkxy0r5mx1jk3p5jhv1vynsnnrb2md1g4318qp";
+       libraryHaskellDepends = [
+         base exceptions extractable-singleton monad-control-aligned
+         transformers wai wai-websockets websockets
+       ];
+       homepage = "https://github.com/athanclark/wai-transformers#readme";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-util" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , http-accept, http-types, network-uri, text, transformers, wai
@@ -217733,6 +218884,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wilton-ffi" = callPackage
+    ({ mkDerivation, aeson, base, bytestring }:
+     mkDerivation {
+       pname = "wilton-ffi";
+       version = "0.1.0.0";
+       sha256 = "0l7smpizp4r59nfk73vyl1vrpgdnf8cfgny9r981bpn6bnv1iv7f";
+       revision = "1";
+       editedCabalFile = "0fkfffxfph1nip54j9f5hd05339mmg19hn7jwggsi4qmdpf2jd0y";
+       libraryHaskellDepends = [ aeson base bytestring ];
+       homepage = "https://github.com/wilton-iot/wilton-ffi#readme";
+       description = "Haskell modules support for Wilton JavaScript runtime";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "win-hp-path" = callPackage
     ({ mkDerivation, base, process, split }:
      mkDerivation {
@@ -218019,6 +219184,8 @@ self: {
        pname = "wl-pprint";
        version = "1.2";
        sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r";
+       revision = "1";
+       editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
@@ -226035,10 +227202,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip-stream";
-       version = "0.1.0.1";
-       sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq";
-       revision = "1";
-       editedCabalFile = "1g3yr6ggcxgzzdpaj7zn48k7mqfdnnz697f3midw2br1dnhv7zdf";
+       version = "0.1.1";
+       sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226540,8 +227705,8 @@ self: {
        pname = "ztail";
        version = "1.2";
        sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk";
-       revision = "3";
-       editedCabalFile = "0j22pyi86qw5y4fgxygg9fndlwk8j9c2671bbbk3nws5xzkda1sm";
+       revision = "4";
+       editedCabalFile = "1x8vaflxrmkwqig8wvbbkc761l52y5h45sclnidm5zmwxrv1j3zd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -226550,6 +227715,26 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ztail_1_2_0_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, filepath, hinotify
+     , process, regex-posix, time, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ztail";
+       version = "1.2.0.1";
+       sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring filepath hinotify process regex-posix time
+         unix unordered-containers
+       ];
+       description = "Multi-file, colored, filtered log tailer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zuramaru" = callPackage
@@ -226600,6 +227785,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Password strength estimation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
 }

From d1ba7ed4dff1bf4d40bb9112b72319f4fbe519e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2018 08:46:40 +0100
Subject: [PATCH 1855/2266] haskell-pure-zlib: enable test suite again

https://github.com/NixOS/nixpkgs/issues/37499 has been fixed. Now we just need to
jailbreak the package to avoid https://github.com/GaloisInc/pure-zlib/issues/6.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 48fa8c0e303..4d85a26227e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -344,7 +344,6 @@ self: super: {
   orgmode-parse = dontCheck super.orgmode-parse;
   os-release = dontCheck super.os-release;
   persistent-redis = dontCheck super.persistent-redis;
-  pure-zlib = dontCheck super.pure-zlib; # https://github.com/NixOS/nixpkgs/issues/37499
   pipes-extra = dontCheck super.pipes-extra;
   pipes-websockets = dontCheck super.pipes-websockets;
   postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server
@@ -1006,4 +1005,7 @@ self: super: {
   # https://github.com/fpco/inline-c/issues/72
   inline-c = dontCheck super.inline-c;
 
+  # https://github.com/GaloisInc/pure-zlib/issues/6
+  pure-zlib = doJailbreak super.pure-zlib;
+
 }

From 71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2018 14:42:09 +0100
Subject: [PATCH 1856/2266] Use latest versions of HaTeX and pandoc when
 building with GHC 8.4.1.

---
 .../configuration-ghc-8.4.x.nix               | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b39efcbde77..116d89354a1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -659,20 +659,6 @@ self: super: {
       sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
     });
 
-  # https://github.com/jgm/pandoc-types/issues/37
-  pandoc-types = self.pandoc-types_1_17_4_2;
-
-  ## Need latest git version to support current haddock-library versions.
-  pandoc = overrideSrc super.pandoc {
-    version = "2.1.2-git";
-    src = pkgs.fetchFromGitHub {
-      owner  = "jgm";
-      repo   = "pandoc";
-      rev    = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec";
-      sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a";
-    };
-  };
-
   # Fix missing semigroup instance.
   json = appendPatch super.json (pkgs.fetchpatch
     { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch;
@@ -681,9 +667,12 @@ self: super: {
 
   # Older versions don't compile.
   brick = self.brick_0_35;
-  timezone-olson = self.timezone-olson_0_1_9;
-  matrix = self.matrix_0_3_6_1;
   getopt-generics = self.getopt-generics_0_13_0_2;
+  HaTeX = self.HaTeX_3_19_0_0;
+  matrix = self.matrix_0_3_6_1;
+  pandoc = self.pandoc_2_1_3;
+  pandoc-types = self.pandoc-types_1_17_4_2;
+  timezone-olson = self.timezone-olson_0_1_9;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From 1e8663ab9b37b172e00d17dec643d5fda5ba38fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2018 14:46:05 +0100
Subject: [PATCH 1857/2266] haskell-json: use latest versions when building
 with GHC 8.4.1

---
 .../haskell-modules/configuration-ghc-8.4.x.nix            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 116d89354a1..369f25a5232 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -659,16 +659,11 @@ self: super: {
       sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
     });
 
-  # Fix missing semigroup instance.
-  json = appendPatch super.json (pkgs.fetchpatch
-    { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch;
-      sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z";
-    });
-
   # Older versions don't compile.
   brick = self.brick_0_35;
   getopt-generics = self.getopt-generics_0_13_0_2;
   HaTeX = self.HaTeX_3_19_0_0;
+  json = self.json_0_9_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_1_3;
   pandoc-types = self.pandoc-types_1_17_4_2;

From eb5470913fd66a62f3f0afbab86fe1c07a1dc850 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2018 19:31:18 +0100
Subject: [PATCH 1858/2266] haskell-timezone-olson: drop obsolete override for
 GHC 8.4.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 369f25a5232..b9fd2d9371a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -667,7 +667,6 @@ self: super: {
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_1_3;
   pandoc-types = self.pandoc-types_1_17_4_2;
-  timezone-olson = self.timezone-olson_0_1_9;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From e718df678de341a37ef503ae10fb34c62bedfe0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Mar 2018 21:09:12 +0100
Subject: [PATCH 1859/2266] haskell-xmonad-contrib: patch to fix build with ghc
 8.4.x

---
 .../configuration-ghc-8.4.x.nix               |   3 +
 .../xmonad-contrib-ghc-8.4.1-fix.patch        | 107 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b9fd2d9371a..d953236784e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -674,4 +674,7 @@ self: super: {
       sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
     })) self.semigroups;
 
+  # https://github.com/xmonad/xmonad-contrib/issues/235
+  xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
+
 }
diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch
new file mode 100644
index 00000000000..3917c2f0afd
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch
@@ -0,0 +1,107 @@
+From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001
+From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
+Date: Tue, 20 Mar 2018 22:06:18 +0100
+Subject: [PATCH] update to work with GHC 8.4.1
+
+---
+ XMonad/Hooks/FadeWindows.hs     |  6 +++++-
+ XMonad/Hooks/WallpaperSetter.hs |  6 +++++-
+ XMonad/Layout/Mosaic.hs         |  6 +++++-
+ xmonad-contrib.cabal            |  5 +++--
+ 5 files changed, 33 insertions(+), 5 deletions(-)
+
+diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs
+index 4b8e62b6..01d06792 100644
+--- a/XMonad/Hooks/FadeWindows.hs
++++ b/XMonad/Hooks/FadeWindows.hs
+@@ -61,7 +61,8 @@ import           Control.Monad.Reader                    (ask
+                                                          ,asks)
+ import           Control.Monad.State                     (gets)
+ import qualified Data.Map                    as M
+-import           Data.Monoid
++import           Data.Monoid                      hiding ((<>))
++import           Data.Semigroup
+ 
+ import           Graphics.X11.Xlib.Extras                (Event(..))
+ 
+@@ -134,6 +135,9 @@ instance Monoid Opacity where
+   r      `mappend` OEmpty = r
+   _      `mappend` r      = r
+ 
++instance Semigroup Opacity where
++  (<>) = mappend
++
+ -- | A FadeHook is similar to a ManageHook, but records window opacity.
+ type FadeHook = Query Opacity
+ 
+diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs
+index 00a3b1c3..d4f5ccb2 100644
+--- a/XMonad/Hooks/WallpaperSetter.hs
++++ b/XMonad/Hooks/WallpaperSetter.hs
+@@ -41,7 +41,8 @@ import Data.Ord (comparing)
+ import Control.Monad
+ import Control.Applicative
+ import Data.Maybe
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
++import Data.Semigroup
+ 
+ -- $usage
+ -- This module requires imagemagick and feh to be installed, as these are utilized
+@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
+   mappend (WallpaperList w1) (WallpaperList w2) =
+     WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
+ 
++instance Semigroup WallpaperList where
++  (<>) = mappend
++
+ -- | Complete wallpaper configuration passed to the hook
+ data WallpaperConf = WallpaperConf {
+     wallpaperBaseDir :: FilePath  -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
+diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
+index 05655d4c..da44fc50 100644
+--- a/XMonad/Layout/Mosaic.hs
++++ b/XMonad/Layout/Mosaic.hs
+@@ -38,7 +38,8 @@ import Control.Monad(mplus)
+ import Data.Foldable(Foldable,foldMap, sum)
+ import Data.Function(on)
+ import Data.List(sortBy)
+-import Data.Monoid(Monoid,mempty, mappend)
++import Data.Monoid(Monoid,mempty, mappend, (<>))
++import Data.Semigroup
+ 
+ 
+ -- $usage
+@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
+     mappend x Empty = x
+     mappend x y = Branch x y
+ 
++instance Semigroup (Tree a) where
++    (<>) = mappend
++
+ makeTree ::  (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
+ makeTree _ [] = Empty
+ makeTree _ [x] = Leaf x
+diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
+index dde3ccda..c401c6e6 100644
+--- a/xmonad-contrib.cabal
++++ b/xmonad-contrib.cabal
+@@ -36,7 +36,7 @@ cabal-version:      >= 1.6
+ build-type:         Simple
+ bug-reports:        https://github.com/xmonad/xmonad-contrib/issues
+ 
+-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
+ 
+ source-repository head
+   type:     git
+@@ -66,7 +66,8 @@ library
+                    unix,
+                    X11>=1.6.1 && < 1.9,
+                    xmonad>=0.13   && < 0.14,
+-                   utf8-string
++                   utf8-string,
++                   semigroups
+ 
+     if flag(use_xft)
+         build-depends: X11-xft >= 0.2

From df141c291b5ad061d61105199b756bfbf2392511 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 14:39:19 -0700
Subject: [PATCH 1860/2266] libdvdread: 5.0.3 -> 6.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.VPeJUrg2fP /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.0.0 with grep in /nix/store/dr0ps08716fhniggawzg9f9s7d74r8v7-libdvdread-6.0.0
- directory tree listing: https://gist.github.com/63bc02c878936a5428bbd234fd6c26c8
---
 pkgs/development/libraries/libdvdread/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index be7e20f00eb..95815f4abcd 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdread-${version}";
-  version = "5.0.3";
+  version = "6.0.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
-    sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j";
+    sha256 = "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk";
   };
 
   buildInputs = [libdvdcss];

From 366bf3a309b5c5896f9ce7de787009c1d29dc9a8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 22 Mar 2018 23:16:19 +0100
Subject: [PATCH 1861/2266] ntbtls: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/ntbtls/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
index 59c12e53ed2..dac65e1c2f9 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }:
+{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
 
 with stdenv.lib;
 
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  buildInputs = [ libgcrypt libgpgerror libksba zlib ];
+  buildInputs = [ libgcrypt libgpgerror libksba zlib ]
+    ++ stdenv.lib.optional stdenv.isDarwin gettext;
 
   postInstall = ''
     moveToOutput "bin/ntbtls-config" $dev

From 47e2bce865bddadea32db1649f6e54ec8f19a0c8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 15:20:14 -0700
Subject: [PATCH 1862/2266] libmediainfo: 17.12 -> 18.03

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.XuzpDKKIWd /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.03 with grep in /nix/store/zs2mqa4yzrcy89x12hpz445b5lf8v618-libmediainfo-18.03
- directory tree listing: https://gist.github.com/647416634a701d34570d8a26d64689e7
---
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 7999cc1dff4..36343faa0f9 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "17.12";
+  version = "18.03";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0lm4454ynp0msgqm3s0mnxqxql6i1ank35jvff5swnaxvwsbp0ml";
+    sha256 = "1d4zqik9sm8fsr26w5jsp0rgczlh5vh3gwknxy4g3gd6pqri4igv";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 7b6cdb5556bd02a7747beb68621e7d6e22415803 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 15:29:19 -0700
Subject: [PATCH 1863/2266] librsync: 2.0.1 -> 2.0.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.c5vXLPpHST /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/w6nqi0pjm3bm0v1kcxk9v1ndj0qnjg6z-librsync-2.0.2/bin/rdiff -h` got 0 exit code
- ran `/nix/store/w6nqi0pjm3bm0v1kcxk9v1ndj0qnjg6z-librsync-2.0.2/bin/rdiff --help` got 0 exit code
- ran `/nix/store/w6nqi0pjm3bm0v1kcxk9v1ndj0qnjg6z-librsync-2.0.2/bin/rdiff -V` and found version 2.0.2
- ran `/nix/store/w6nqi0pjm3bm0v1kcxk9v1ndj0qnjg6z-librsync-2.0.2/bin/rdiff --version` and found version 2.0.2
- found 2.0.2 with grep in /nix/store/w6nqi0pjm3bm0v1kcxk9v1ndj0qnjg6z-librsync-2.0.2
- found 2.0.2 in filename of file in /nix/store/w6nqi0pjm3bm0v1kcxk9v1ndj0qnjg6z-librsync-2.0.2
- directory tree listing: https://gist.github.com/aef3b835949789ba889040112d401160
---
 pkgs/development/libraries/librsync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 0f2ca371297..80acaf57d62 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librsync-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "librsync";
     repo = "librsync";
     rev = "v${version}";
-    sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x";
+    sha256 = "1qnr4rk93mhggqjh2025clmlhhgnjhq983p1vbh8i1g8aiqdnapi";
   };
 
   nativeBuildInputs = [ cmake ];

From e746cbd904c255f81a73a4c1dcff2560fee137fd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 22 Mar 2018 17:34:43 -0500
Subject: [PATCH 1864/2266] shellcheck: dont statically compile

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a386cf8a1c3..87dee5df027 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8143,7 +8143,7 @@ with pkgs;
 
   shards = callPackage ../development/tools/build-managers/shards { };
 
-  shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
+  shellcheck = haskellPackages.ShellCheck;
 
   schemaspy = callPackage ../development/tools/database/schemaspy { };
 

From 60604acab0617ab5d5a45ff7373f992bbd6d6900 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 22 Mar 2018 23:57:38 +0100
Subject: [PATCH 1865/2266] poppler: fix clang build

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 9a3d24fc0b2..1f360f07588 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja pkgconfig ];
 
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   cmakeFlags = [
     (mkFlag true "XPDF_HEADERS")
     (mkFlag (!minimal) "GLIB")

From d85259178e4a3e2ef545de5bd9e4a32fa0cdde45 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 16:37:28 -0700
Subject: [PATCH 1866/2266] mdds: 1.2.2 -> 1.3.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.1 with grep in /nix/store/1jh7ran6gm77rksnm74kix37b44b1ni9-mdds-1.3.1
- directory tree listing: https://gist.github.com/bd00a4a5fa8495574a863ebf42d43a9a
---
 pkgs/development/libraries/mdds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 7b7c77659bd..592b6d7a677 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.2";
+  version = "1.3.1";
   name = "mdds-${version}";
 
   src = fetchurl {
     url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
-    sha256 = "17fcjhsq3bzqm7ba9sgp6my3y4226jnwai6q5jq3810i745p67hl";
+    sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w";
   };
 
   postInstall = ''

From a6942651024e61ae0f636a532c70328fce7f6519 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 16:38:10 -0700
Subject: [PATCH 1867/2266] mediainfo: 17.12 -> 18.03

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/dykj39kcyb4rj6pm347q0djry1q5gh2y-mediainfo-18.03/bin/mediainfo -h` got 0 exit code
- ran `/nix/store/dykj39kcyb4rj6pm347q0djry1q5gh2y-mediainfo-18.03/bin/mediainfo --help` got 0 exit code
- directory tree listing: https://gist.github.com/f5a53e7a582604e5913226a02b977dc6
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 7b4b8f0d780..18eb1800a7b 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "17.12";
+  version = "18.03";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
+    sha256 = "171xv1qn6lbzybhx471j5a3rdqdj3xn0xc7gs181624r1kslxyn1";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 33fa93f4cac2573fc9b73f514aec03c6ec985655 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 17:03:25 -0700
Subject: [PATCH 1868/2266] mopidy-iris: 3.14.0 -> 3.14.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.14.2 with grep in /nix/store/anzim7y47xa3m530qzq91n9wl8ys1kk2-Mopidy-Iris-3.14.2
- directory tree listing: https://gist.github.com/96a0fc1d9812e5c4e6659fd37c7b21c6
---
 pkgs/applications/audio/mopidy-iris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index cb99f9b5dbe..4ba0088dd04 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.14.0";
+  version = "3.14.2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb";
+    sha256 = "19affzk45wby50gwxwzqgwa7h7618lcs48ngdsa06sd66s8x2fza";
   };
 
   propagatedBuildInputs = [

From d0df0078438347866bbe5e96b82ce5f104a8071b Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 23 Mar 2018 01:05:48 +0900
Subject: [PATCH 1869/2266] libftdi1: add darwin platform

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

diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index 8b75f85852e..d54b05b1c82 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "A library to talk to FTDI chips using libusb";
     homepage = https://www.intra2net.com/en/developer/libftdi/;
     license = with licenses; [ lgpl2 gpl2 ];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = [ maintainers.bjornfor ];
   };
 }

From b4888489e344f7ad77d9f6d14e6aa4084160f982 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 23 Mar 2018 00:59:06 +0900
Subject: [PATCH 1870/2266] avrdude: add darwin platform

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

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index e7d5aaceb2b..66b0467657a 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.nongnu.org/avrdude/;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = [ maintainers.bjornfor ];
   };
 }

From 6c3855038a8f7c3dfd59a6d1eb698fc8e7ffb722 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 17:45:10 -0700
Subject: [PATCH 1871/2266] nlohmann_json: 3.1.1 -> 3.1.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.1.2 with grep in /nix/store/ak7p93w4pkmjvx5fi82fg40rra5z6g44-nlohmann_json-3.1.2
- directory tree listing: https://gist.github.com/cebf8a5968a9c2ae65ec58227044fcad
---
 pkgs/development/libraries/nlohmann_json/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index d4699b1c506..59cc9438a9f 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "nlohmann_json-${version}";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "nlohmann";
     repo = "json";
     rev = "v${version}";
-    sha256 = "0s5xiyvnvxc2k0zkyb12mm5cwn61lavyxlfpknlx5f243g1xi6f6";
+    sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi";
   };
 
   nativeBuildInputs = [ cmake ];

From 4f2d047c483d7dde5dd50a661c7d520e4f5ee8fe Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 20:49:27 -0700
Subject: [PATCH 1872/2266] rawtherapee: 5.3 -> 5.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.4 with grep in /nix/store/p24xccx2wm6dls7g36pzdl1m1r3p1x5l-rawtherapee-5.4
- directory tree listing: https://gist.github.com/ea61efad6dd7afad2c60614dd433534d
---
 pkgs/applications/graphics/rawtherapee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 9964bec6781..eb97a2b9b3b 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.3";
+  version = "5.4";
   name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
     rev = version;
-    sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
+    sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];

From b7046ab2aab28a562d150d6eaac7a8db5d0658ef Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 21:24:30 -0700
Subject: [PATCH 1873/2266] signal-desktop: 1.5.2 -> 1.6.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/signal-desktop/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.6.1 with grep in /nix/store/pvdn1xmg25m71qciqgin0flihwbvf7p3-signal-desktop-1.6.1
- directory tree listing: https://gist.github.com/5e549f57e17894ca01ff108753e073e6
---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 8dbf0e774e4..74f784a1ba1 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.5.2";
+    version = "1.6.1";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "1h4qa5i7axkmsai854yvlyh5r038mmjl4pj2rd27mz11if7yf067";
+          sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";

From 5ddcb996ca12bfbc194d08ba6a9075497a526a85 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 21:33:00 -0700
Subject: [PATCH 1874/2266] smplayer: 18.2.2 -> 18.3.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/smplayer/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.3.0 with grep in /nix/store/39n4zv5ynkjwhjcfs479fz6jj0pqfwvp-smplayer-18.3.0
- directory tree listing: https://gist.github.com/72db17f9f10b4ea51b5b470cfef842cf
---
 pkgs/applications/video/smplayer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 9e547a791a4..ef614d41d00 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-18.2.2";
+  name = "smplayer-18.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis";
+    sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46";
   };
 
   buildInputs = [ qtscript ];

From 7681bf4e914588e741ddeaea42b6ac9a934e670e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 21:41:26 -0700
Subject: [PATCH 1875/2266] snd: 18.1 -> 18.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/snd/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2/bin/snd --help` got 0 exit code
- ran `/nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2/bin/snd --version` and found version 18.2
- ran `/nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2/bin/snd --help` and found version 18.2
- found 18.2 with grep in /nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2
- directory tree listing: https://gist.github.com/549e1eef8a929e09d72499dc97a47aa2
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 3fe8ecfe546..660f342dc9d 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.1";
+  name = "snd-18.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh";
+    sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a252f83fdbc548fe2dfe67e258ea2ea0cb58af07 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 22:36:20 -0700
Subject: [PATCH 1876/2266] swiften: 3.0beta2 -> 4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/swiften/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config -h` got 0 exit code
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config --help` got 0 exit code
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config help` got 0 exit code
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config --version` and found version 4.0
- found 4.0 with grep in /nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0
- directory tree listing: https://gist.github.com/bf18dc85d27b684315737f90db4a6b64
---
 pkgs/development/libraries/swiften/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index e6fb5a2b685..272967fcb99 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python, fetchurl, openssl, boost }:
 stdenv.mkDerivation rec {
   name    = "swiften-${version}";
-  version = "3.0beta2";
+  version = "4.0";
 
   buildInputs           = [ python ];
   propagatedBuildInputs = [ openssl boost ];
 
   src = fetchurl {
     url    = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
-    sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0";
+    sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh";
   };
   
   buildPhase = ''

From c1714f5788033c9ea17be5f6f475b785dab742f9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 23 Mar 2018 14:16:47 +0800
Subject: [PATCH 1877/2266] ksystemlog: init at 17.12.2

---
 pkgs/applications/kde/default.nix    |  1 +
 pkgs/applications/kde/ksystemlog.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/ksystemlog.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8fd65770afd..2555fe409f2 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -130,6 +130,7 @@ let
       krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
       kruler = callPackage ./kruler.nix {};
+      ksystemlog = callPackage ./ksystemlog.nix {};
       ktnef = callPackage ./ktnef.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
       libgravatar = callPackage ./libgravatar.nix {};
diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix
new file mode 100644
index 00000000000..bec92d55966
--- /dev/null
+++ b/pkgs/applications/kde/ksystemlog.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules, gettext, kdoctools,
+  karchive, kconfig, kio
+}:
+
+mkDerivation {
+  name = "ksystemlog";
+
+  nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
+  propagatedBuildInputs = [ karchive kconfig kio ];
+
+  meta = with lib; {
+    license = with licenses; [ gpl2 ];
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87dee5df027..91b8a065583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16301,7 +16301,7 @@ with pkgs;
     akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
     kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
-    kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle;
+    kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From 0203a6281cbaff4ea8ab29578f626c48e3e3cf70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 23 Mar 2018 07:58:34 +0000
Subject: [PATCH 1878/2266] vis: patch shebang to use system bash

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

diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 0db93f78781..2af6e93bcfc 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     libselinux
   ];
 
+  postPatch = ''
+    patchShebangs ./configure
+  '';
+
   LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
   LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";
 

From 69e6845b60c4da9913dd258fe7013c7654421c6b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 23 Mar 2018 16:17:14 +0800
Subject: [PATCH 1879/2266] modemmanager: Add glib to buildInputs

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

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 064364e37ac..922ad50553c 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig
-, libmbim, libqmi, systemd }:
+, libmbim, libqmi, systemd, glib }:
 
 stdenv.mkDerivation rec {
   name = "ModemManager-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext pkgconfig ];
 
-  buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];
+  buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd glib ];
 
   configureFlags = [
     "--with-polkit"

From 2e73e2ae79ea17c39d095c7a529f4a1047802ca0 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 23 Mar 2018 17:04:24 +0800
Subject: [PATCH 1880/2266] modemmanager: Patch glib header dependency, fixes
 modemmanager-qt build

---
 pkgs/tools/networking/modemmanager/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 922ad50553c..c1bde0fa1cf 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig
-, libmbim, libqmi, systemd, glib }:
+, libmbim, libqmi, systemd, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "ModemManager-${version}";
@@ -12,7 +12,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext pkgconfig ];
 
-  buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd glib ];
+  buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];
+
+  patches = [
+    # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt)
+    (fetchpatch {
+      url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609";
+      sha256 = "00m7ly1fgspapzkbvjsp25w58wcdax8rrwgvq3axrz4lagwfwnp6";
+    })
+  ];
 
   configureFlags = [
     "--with-polkit"

From 988bcca05cdad2f26282cf037a192a8816ea12c9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2018 10:21:28 +0100
Subject: [PATCH 1881/2266] poppler: 0.62 -> 0.63

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 1f360f07588..b55c39bf815 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.62.0";
+  version = "0.63.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv";
+    sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17";
   };
 
   outputs = [ "out" "dev" ];

From e9817b2a76a42c2bf05bda551e3b84c879fbd70d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2018 10:22:27 +0100
Subject: [PATCH 1882/2266] poppler_0_61: init at 0.61 (needed for LibreOffice
 Still)

---
 pkgs/development/libraries/poppler/0.61.nix | 56 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/poppler/0.61.nix

diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
new file mode 100644
index 00000000000..072de0f9fa0
--- /dev/null
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -0,0 +1,56 @@
+{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
+, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
+, withData ? true, poppler_data
+, qt5Support ? false, qtbase ? null
+, introspectionSupport ? false, gobjectIntrospection ? null
+, utils ? false
+, minimal ? false, suffix ? "glib"
+}:
+
+let
+  version = "0.61.0";
+  mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
+in
+stdenv.mkDerivation rec {
+  name = "poppler-${suffix}-${version}";
+
+  src = fetchurl {
+    url = "${meta.homepage}/poppler-${version}.tar.xz";
+    sha256 = "0zrbb1b77k6bm2qdnra08jnbyllv6vj29790igmp6fzs59xf3kak";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data;
+
+  # TODO: reduce propagation to necessary libs
+  propagatedBuildInputs = with lib;
+    [ zlib freetype fontconfig libjpeg openjpeg ]
+    ++ optionals (!minimal) [ cairo lcms curl ]
+    ++ optional qt5Support qtbase
+    ++ optional introspectionSupport gobjectIntrospection;
+
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
+
+  cmakeFlags = [
+    (mkFlag true "XPDF_HEADERS")
+    (mkFlag (!minimal) "GLIB")
+    (mkFlag (!minimal) "CPP")
+    (mkFlag (!minimal) "LIBCURL")
+    (mkFlag utils "UTILS")
+    (mkFlag qt5Support "QT5")
+  ];
+
+  meta = with lib; {
+    homepage = https://poppler.freedesktop.org/;
+    description = "A PDF rendering library";
+
+    longDescription = ''
+      Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+    '';
+
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91b8a065583..ea45e3f5369 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10917,6 +10917,7 @@ with pkgs;
   polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
+  poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; };
 
   poppler_gi = lowPrio (poppler.override {
     introspectionSupport = true;

From ca4d81d2c7862a14592bcf59ae8f11b9abfe1f23 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2018 10:22:53 +0100
Subject: [PATCH 1883/2266] libreoffice-still: 5.4.5.1 -> 5.4.6.2; use
 poppler_0_61

---
 pkgs/applications/office/libreoffice/still-primary-src.nix | 6 +++---
 pkgs/applications/office/libreoffice/still.nix             | 4 ++--
 pkgs/top-level/all-packages.nix                            | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 32abab8abf8..b1aa10800d6 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "5";
   minor = "4";
-  patch = "5";
-  tweak = "1";
+  patch = "6";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb";
+    sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 8726d5130d7..866b8e92337 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54";
+      sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl";
+      sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc";
     };
 
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea45e3f5369..b0c112b14b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16451,6 +16451,7 @@ with pkgs;
     inherit (gnome3) defaultIconTheme;
     zip = zip.override { enableNLS = false; };
     bluez5 = bluez5_28;
+    poppler = poppler_0_61;
     fontsConf = makeFontsConf {
       fontDirectories = [
         freefont_ttf xorg.fontmiscmisc

From 3e61f3b911c4bf38b47b8f76415b987ab1964b6a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 22 Mar 2018 17:41:59 +0100
Subject: [PATCH 1884/2266] erlang: Change order of commands in `postPach` and
 `postInstall`.

Erlang's generic-builder isn't using the right /bin/sh in some
situations, causing build errors either in the erlang build itself or
in derivations depending on it.

This patch runs `patchShebangs make/` before running the rest of the
`postPatch` phase, hopefully using the right shell early enough.

This might be a solution for #36853, #36823 and #37638.
---
 pkgs/development/interpreters/erlang/generic-builder.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 1d2b79074fb..6ea3ac73a4b 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -65,9 +65,9 @@ in stdenv.mkDerivation ({
   '';
 
   postPatch = ''
-    ${postPatch}
-
     patchShebangs make
+
+    ${postPatch}
   '';
 
   preConfigure = ''
@@ -88,9 +88,9 @@ in stdenv.mkDerivation ({
   # (PDFs are generated only when fop is available).
 
   postInstall = ''
-    ${postInstall}
-
     ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+
+    ${postInstall}
   '';
 
   # Some erlang bin/ scripts run sed and awk

From 5c1427764d4d7554c19e2ede8e7f55e9166f2901 Mon Sep 17 00:00:00 2001
From: Tim Williams <info@timphilipwilliams.com>
Date: Thu, 22 Mar 2018 20:08:39 +0000
Subject: [PATCH 1885/2266] displaycal: 3.2.4.0 -> 3.5.0.0

---
 pkgs/applications/graphics/displaycal/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
index a845bc63a38..9984c0222a0 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -1,15 +1,15 @@
 {buildPythonPackage, stdenv, fetchurl, pkgconfig
- , libXext, libXxf86vm, libX11, libXrandr, libXinerama
+ , libXext, libXxf86vm, libX11, libXrandr, libXinerama, libXScrnSaver
  , argyllcms, wxPython, numpy
  }:
 buildPythonPackage {
-  name = "displaycal-3.2.4.0";
+  name = "displaycal-3.5.0.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = mirror://sourceforge/project/dispcalgui/release/3.2.4.0/DisplayCAL-3.2.4.0.tar.gz;
-    sha256 = "0swkhv338d1kmfxyf30zzdjs5xpbha40pg2zysiipcbasc0xhlb8";
+    url = mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz;
+    sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q";
   };
 
   propagatedBuildInputs = [
@@ -18,6 +18,7 @@ buildPythonPackage {
     libX11
     libXrandr
     libXinerama
+    libXScrnSaver
     argyllcms
     wxPython
     numpy

From 18aa4e08ff5036cae8910f95e8617b4eee77ac31 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2018 11:24:18 +0100
Subject: [PATCH 1886/2266] Revert "poppler: 0.62 -> 0.63"

This reverts commit 988bcca05cdad2f26282cf037a192a8816ea12c9.

A larger rebuild than planned
---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index b55c39bf815..1f360f07588 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.63.0";
+  version = "0.62.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17";
+    sha256 = "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv";
   };
 
   outputs = [ "out" "dev" ];

From a7d1a86bb3a8041c8ee145f8cac58ddf8315c436 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2018 12:22:49 +0100
Subject: [PATCH 1887/2266] modemmanager: fix patch sha256

I looked at the patch as it is now, it seems OK

I tested the build, it suceeds

I have no idea where the previous hash comes from
---
 pkgs/tools/networking/modemmanager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index c1bde0fa1cf..999a269d0b7 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt)
     (fetchpatch {
       url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609";
-      sha256 = "00m7ly1fgspapzkbvjsp25w58wcdax8rrwgvq3axrz4lagwfwnp6";
+      sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j";
     })
   ];
 

From e539a439889d96bdc41a3bfda75e266ad6486d24 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 15 Oct 2017 22:02:29 +0200
Subject: [PATCH 1888/2266] sonata: remove gnome-themes-extra usage

---
 pkgs/applications/audio/sonata/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 1afb36571bd..55c3dfa92e3 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -19,7 +19,7 @@ in buildPythonApplication rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     intltool wrapGAppsHook
-    gnome3.gnome-themes-standard gnome3.defaultIconTheme
+    gnome3.defaultIconTheme
     gnome3.gsettings-desktop-schemas
   ];
 
@@ -28,8 +28,6 @@ in buildPythonApplication rec {
     sed -i '/localmpd/d' sonata/consts.py
   '';
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   propagatedBuildInputs = [
     gobjectIntrospection gtk3 pygobject3
   ];

From 9de4363fb4869b8aff28e2b1c0a2c9d9fd00877d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 15:21:05 +0100
Subject: [PATCH 1889/2266] spice-up: clean up

---
 pkgs/applications/office/spice-up/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index e26471de576..520510698e3 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -6,6 +6,7 @@
 , gtk3
 , granite
 , gnome3
+, gobjectIntrospection
 , json-glib
 , cmake
 , ninja
@@ -26,11 +27,6 @@ stdenv.mkDerivation rec {
   };
   USER = "nix-build-user";
 
-  XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
-    "${granite}/share"
-    "${gnome3.libgee}/share"
-  ];
-
   nativeBuildInputs = [
     pkgconfig
     wrapGAppsHook
@@ -39,6 +35,7 @@ stdenv.mkDerivation rec {
     ninja
     gettext
     libxml2
+    gobjectIntrospection # For setup hook
   ];
   buildInputs = [
     gtk3
@@ -47,7 +44,6 @@ stdenv.mkDerivation rec {
     json-glib
     libgudev
     libevdev
-    gnome3.gnome-themes-standard
   ];
 
   meta = with stdenv.lib; {

From a41294cc6e35bb922473be0780ab193138049681 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 15:30:20 +0100
Subject: [PATCH 1890/2266] sound-juicer: clean up

---
 .../audio/sound-juicer/default.nix            | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index c68f2cd4a35..e38f38dad78 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -1,41 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero
 , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
-, makeWrapper }:
+, wrapGAppsHook }:
 
 let
-  major = "3.16";
-  minor = "1";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "sound-juicer-${version}";
+  pname = "sound-juicer";
+  version = "3.16.1";
+in stdenv.mkDerivation rec{
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3
-                  gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
-                  makeWrapper (stdenv.lib.getLib gnome3.dconf)
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gst_all_1.gst-libav
-                ];
+  nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
+  buildInputs = [
+    glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme
+    gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+    gst_all_1.gst-libav
+  ];
 
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
-    done
-  '';
-
-  postInstall = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     description = "A Gnome CD Ripper";

From b4b00016a26dabe0a6f6a9a8012288eff4a61d49 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 15:40:21 +0100
Subject: [PATCH 1891/2266] epiphany: clean up

---
 .../gnome-3/core/epiphany/default.nix         | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 3bc32f99f3e..6877b20df44 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,8 +1,8 @@
 { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
 , wrapGAppsHook, gnome3, libxml2, libxslt, itstool
 , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
-, sqlite, gcr, isocodes, desktop-file-utils, file
-, gdk_pixbuf, gnome-common, gst_all_1, json-glib }:
+, sqlite, gcr, isocodes, desktop-file-utils
+, gdk_pixbuf, gst_all_1, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
@@ -13,31 +13,33 @@ stdenv.mkDerivation rec {
     sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "epiphany"; };
-  };
-
   # Tests need an X display
   mesonFlags = [ "-Dunit_tests=false" ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
+  nativeBuildInputs = [
+    meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils
+  ];
 
-  nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ];
-
-  buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
-                  sqlite isocodes p11-kit icu gnome3.yelp-tools
-                  gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr
-                  glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-                  gst_all_1.gst-libav json-glib ];
-
-  enableParallelBuilding = true;
+  buildInputs = [
+    gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
+    sqlite isocodes p11-kit icu
+    gdk_pixbuf gnome3.defaultIconTheme gcr
+    glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-libav json-glib
+  ];
 
   postPatch = ''
     chmod +x post_install.py # patchShebangs requires executable file
     patchShebangs post_install.py
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "epiphany";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Epiphany;
     description = "WebKit based web browser for GNOME";

From cb23f4dbeef25b5205511772984a3e74fffe053e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 19:47:02 +0100
Subject: [PATCH 1892/2266] gnome3.gedit: clean up

---
 pkgs/desktops/gnome-3/apps/gedit/default.nix | 33 ++++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 864535794f8..7c90b16d86a 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
+{ stdenv, intltool, fetchurl
 , pkgconfig, gtk3, glib
-, bash, wrapGAppsHook, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, gspell }:
+, wrapGAppsHook, itstool, libsoup, libxml2
+, gnome3, gspell }:
 
 stdenv.mkDerivation rec {
   name = "gedit-${version}";
@@ -12,24 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; };
-  };
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ];
+  buildInputs = [
+    gtk3 glib
+    gnome3.defaultIconTheme libsoup
+    gnome3.libpeas gnome3.gtksourceview
+    gnome3.gsettings-desktop-schemas gspell
+  ];
 
   enableParallelBuilding = true;
 
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}")
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gedit";
+      attrPath = "gnome3.gedit";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Gedit;

From 556474aad99c16417accf014fe6caeb7af96c439 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 19:52:39 +0100
Subject: [PATCH 1893/2266] gnome3.seahorse: clean up

---
 .../gnome-3/apps/seahorse/default.nix         | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 1a8c2f55b1b..60e8822135c 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -4,37 +4,36 @@
 , gnome3, librsvg, gdk_pixbuf, gpgme
 , libsecret, avahi, p11-kit, openssh }:
 
-stdenv.mkDerivation rec {
-  name = "seahorse-${version}";
+let
+  pname = "seahorse";
   version = "3.20.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; };
-  };
-
   doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11-kit vala
-                  openssh ];
+  nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ];
+  buildInputs = [
+    gtk3 glib gnome3.gcr
+    gnome3.gsettings-desktop-schemas gnupg
+    gnome3.defaultIconTheme gpgme
+    libsecret avahi libsoup p11-kit
+    openssh
+  ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share"
-    )
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Seahorse;

From d01c5156d999a9300925552737276081334b20e2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 19:53:48 +0100
Subject: [PATCH 1894/2266] gnome3.gnome-control-center: remove unnecessary
 gnome-themes-extra dependency

---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 8966893bde7..5f6ed213e3e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share"
+      --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
       # Thumbnailers (for setting user profile pictures)
       --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"

From 25707008c0d5ffbb2e78f2aed75fc24d9909ebe6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 19:55:12 +0100
Subject: [PATCH 1895/2266] gnome3.gnome-dictionary: clean up

---
 .../gnome-3/core/gnome-dictionary/default.nix | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 95fcfac1d75..ee1feb6ddae 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -11,18 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; };
-  };
-
   doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-  propagatedBuildInputs = [ gnome3.defaultIconTheme ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
+    desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
-                        desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];
-  buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-dictionary";
+      attrPath = "gnome3.gnome-dictionary";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Dictionary;

From fe747012dbb8a01846b9e9e782508001c3583498 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:01:49 +0100
Subject: [PATCH 1896/2266] gnome3.gnome-disk-utility: clean up

---
 .../core/gnome-disk-utility/default.nix        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 4dde871ec70..0478877acb4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -1,6 +1,6 @@
 { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
 , meson, ninja, gtk, glib, wrapGAppsHook, libnotify
-, itstool, gnome3, gdk_pixbuf, libxml2
+, itstool, gnome3, libxml2
 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
 
 stdenv.mkDerivation rec {
@@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; };
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl
-                        wrapGAppsHook libxml2 ];
-  buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
-                  gdk_pixbuf udisks2 gnome3.defaultIconTheme
-                  gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext itstool libxslt docbook_xsl
+    wrapGAppsHook libxml2
+  ];
+  buildInputs = [
+    gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
+    udisks2 gnome3.defaultIconTheme
+    gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas
+  ];
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file

From e059d2288807812f56745052db6878669467ce58 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:04:59 +0100
Subject: [PATCH 1897/2266] gnome3.gnome-screenshot: clean up

---
 .../gnome-3/core/gnome-screenshot/default.nix | 36 +++++++++----------
 .../prevent-cache-updates.patch               | 21 -----------
 2 files changed, 18 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch

diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 1f7aa4d874a..f5b33c88f57 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -1,20 +1,18 @@
 { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
-, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib
-, gnome3, librsvg, gdk_pixbuf }:
+, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils
+, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-screenshot-${version}";
+let
+  pname = "gnome-screenshot";
   version = "3.26.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; };
-  };
-
   doCheck = true;
 
   postPatch = ''
@@ -22,17 +20,19 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux/postinstall.py
   '';
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ];
-  buildInputs = [ bash gtk3 glib libcanberra-gtk3
-                  gnome3.gsettings-desktop-schemas ];
-
-  patches = [
-    ./prevent-cache-updates.patch
+  nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ];
+  buildInputs = [
+    gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
+    gnome3.gsettings-desktop-schemas
   ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "${pname}";
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;
     description = "Utility used in the GNOME desktop environment for taking screenshots";
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch b/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch
deleted file mode 100644
index 370d09cd2f0..00000000000
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build-aux/postinstall.py
-+++ b/build-aux/postinstall.py
-@@ -8,18 +8,6 @@
- 
- # Packaging tools define DESTDIR and this isn't needed for them
- if 'DESTDIR' not in os.environ:
--    print('Updating icon cache...')
--    icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
--    if not os.path.exists(icon_cache_dir):
--        os.makedirs(icon_cache_dir)
--    subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
--
--    print('Updating desktop database...')
--    desktop_database_dir = os.path.join(datadir, 'applications')
--    if not os.path.exists(desktop_database_dir):
--        os.makedirs(desktop_database_dir)
--    subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
--
-     print('Compiling GSettings schemas...')
-     schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas')
-     if not os.path.exists(schemas_dir):

From 3b3e059dac6a3fa98ba518fba1852f9cad80b530 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:07:09 +0100
Subject: [PATCH 1898/2266] gnome3.gnome-system-log: clean up

---
 .../gnome-3/core/gnome-system-log/default.nix | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
index 673140c3e1b..23a41b6d6ae 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
@@ -1,34 +1,31 @@
 { stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+, gtk3, glib, wrapGAppsHook
+, itstool, gnome3, libxml2 }:
 
-stdenv.mkDerivation rec {
-  name = "gnome-system-log-3.9.90";
+let
+  pname = "gnome-system-log";
+  version = "3.9.90";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
   };
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+  nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 ];
+  buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bash gtk3 glib intltool itstool
-                  gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ];
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share"
-    )
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
     description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;

From 060e6aab523b70d1a12d0675ad06fb4a487ab3d0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:10:49 +0100
Subject: [PATCH 1899/2266] gnome3.totem: clean up

---
 pkgs/desktops/gnome-3/core/totem/default.nix | 34 +++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index a9d8b2ad11c..49bd43e6195 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter
 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info
 , pkgconfig, gtk3, glib, gobjectIntrospection
-, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg
-, gdk_pixbuf, file, tracker, nautilus }:
+, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg
+, gdk_pixbuf, tracker, nautilus }:
 
 stdenv.mkDerivation rec {
   name = "totem-${version}";
@@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
     sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; };
-  };
-
   doCheck = true;
 
   # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
@@ -26,14 +22,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ];
-  buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib
-                  gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
-                  gnome3.gsettings-desktop-schemas tracker nautilus ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ];
+  buildInputs = [
+    gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
+    gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
+    gnome3.gsettings-desktop-schemas tracker nautilus
+  ];
 
   propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
 
@@ -50,11 +46,17 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
+  mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ];
 
-  GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "totem";
+      attrPath = "gnome3.totem";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
     description = "Movie player for the GNOME desktop based on GStreamer";

From 087ca0ca24b633851ebf4fa6b6aa520fc2381d77 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:17:10 +0100
Subject: [PATCH 1900/2266] yelp: clean up

---
 pkgs/desktops/gnome-3/core/yelp/default.nix | 27 ++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 60b91aaa04a..691ec2fdb94 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
+, gnome3, sqlite
+, itstool, libxml2, libxslt, gst_all_1
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -12,21 +12,20 @@ stdenv.mkDerivation rec {
     sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v";
   };
 
+  nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
+  buildInputs = [
+    gtk3 glib webkitgtk sqlite
+    libxml2 libxslt gnome3.yelp-xsl
+    gnome3.defaultIconTheme
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+  ];
+
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "yelp"; };
+    updateScript = gnome3.updateScript {
+      packageName = "yelp";
+    };
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite
-                  libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl
-                  librsvg gdk_pixbuf gnome3.defaultIconTheme groff
-                  gnome3.gsettings-desktop-schemas wrapGAppsHook
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;
     description = "The help viewer in Gnome";

From efd53598f8d203271179ee1dfda836e48868426b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:36:09 +0100
Subject: [PATCH 1901/2266] gnome3.geary: clean up

---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 5a95802b81a..1994b587fbd 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -5,18 +5,17 @@
 , gnome3, librsvg, gnome-doc-utils, webkitgtk }:
 
 let
-  majorVersion = "0.12";
+  pname = "geary";
+  version = "0.12.1";
 in
 stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.1";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
   buildInputs = [
     gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
@@ -28,15 +27,21 @@ stdenv.mkDerivation rec {
     "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
   ];
 
-  preConfigure = ''
-    substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0'
-  '';
+  # TODO: This is bad, upstream should fix their code.
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0";
 
   preFixup = ''
     # Add geary to path for geary-attach
     gappsWrapperArgs+=(--prefix PATH : "$out/bin")
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Geary;
     description = "Mail client for GNOME 3";

From 359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 20:58:36 +0100
Subject: [PATCH 1902/2266] gitg: clean up

---
 pkgs/desktops/gnome-3/misc/gitg/default.nix | 40 +++++++++++++--------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 314539b7f9e..32da3a9a4b8 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -3,37 +3,49 @@
 , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret
 , libsoup }:
 
-stdenv.mkDerivation rec {
-  name = "gitg-${version}";
+let
+  pname = "gitg";
   version = "3.26.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gitg"; };
-  };
-
   preCheck = ''
     substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
   '';
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
-  propagatedUserEnvPkgs = [ shared-mime-info
-                            gnome3.gnome-themes-standard ];
-
-  buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup
-                  libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
-                  librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ];
+  buildInputs = [
+    gtk3 glib json-glib libgee libpeas gnome3.libsoup
+    libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
+    libsecret gobjectIntrospection gnome3.adwaita-icon-theme
+  ];
 
   nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Thumbnailers
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+    )
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+    homepage = https://wiki.gnome.org/Apps/Gitg;
     description = "GNOME GUI client to view git repositories";
     maintainers = with maintainers; [ domenkozar ];
     license = licenses.gpl2;

From 1e225cc1b305635e2a70431e3f643f4ffb143d70 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Mar 2018 00:35:25 +0100
Subject: [PATCH 1903/2266] gtkpod: clean up

---
 pkgs/applications/audio/gtkpod/default.nix | 23 ++++++++--------------
 pkgs/top-level/all-packages.nix            |  5 +----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 39cd1a444fa..e0e620bd05f 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
-  gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
+{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
+  gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag,
   libvorbis, hicolor-icon-theme, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
@@ -11,24 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
   };
 
-  propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
-    flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
-    gnome.gdl gnome.defaultIconTheme
-    hicolor-icon-theme ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
+  buildInputs = [
+    curl gettext perl perlXMLParser
+    flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
+    gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta
+  ];
 
   patchPhase = ''
     sed -i 's/which/type -P/' scripts/*.sh
   '';
 
-  preFixup = ''
-    wrapProgram "$out/bin/gtkpod" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0c112b14b2..85fbb8894ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15924,10 +15924,7 @@ with pkgs;
 
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
 
-  gtkpod = callPackage ../applications/audio/gtkpod {
-    gnome = gnome3;
-    inherit (gnome2) libglade;
-  };
+  gtkpod = callPackage ../applications/audio/gtkpod { };
 
   jbidwatcher = callPackage ../applications/misc/jbidwatcher {
     java = if stdenv.isLinux then jre else jdk;

From faa31ee3ae6a01d9de53b4391e4bec6f6d2b5e50 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Mar 2018 00:40:54 +0100
Subject: [PATCH 1904/2266] gupnp-tools: clean up

---
 pkgs/tools/networking/gupnp-tools/default.nix | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index e008c9183c9..1b306bc5e36 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,26 +1,30 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}:
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}:
+
+let
+  pname = "gupnp-tools";
+  version = "0.8.13";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
-stdenv.mkDerivation rec {
-  name = "gupnp-tools-${version}";
-  majorVersion = "0.8";
-  version = "${majorVersion}.13";
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av
-                 gnome2.gnome_icon_theme makeWrapper];
+  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+  buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ];
 
-  postInstall = ''
-    for program in gupnp-av-cp gupnp-universal-cp; do
-      wrapProgram "$out/bin/$program" \
-        --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share"
-    done
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Set of utilities and demos to work with UPnP";
+    homepage = https://wiki.gnome.org/Projects/GUPnP;
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }

From cb6f88ce5ea98998701e1d49690e294ab2613daa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2018 14:02:06 +0100
Subject: [PATCH 1905/2266] =?UTF-8?q?Revert=20"gdk=5Fpixbuf:=202.36.7=20?=
 =?UTF-8?q?=E2=86=92=202.36.11"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3abd1ec53d4d373f2fd1b697bc9ea191137e5d19 because the change
breaks many packages, like Emacs, pavucontrol, xmobar, etc. Further details can
be found at https://github.com/NixOS/nixpkgs/issues/37696.
---
 .../libraries/gdk-pixbuf/default.nix          | 47 ++++++-------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index ace1d687a91..a1a9b10fca6 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,46 +1,40 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
-, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, shared-mime-info, libintlOrEmpty, gobjectIntrospection, doCheck ? false, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.11";
+  version = "2.36.7";
+  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+  # which apparently requires access to shared-mime-info files during runtime.
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf";
+    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
   };
 
-  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info ++ libintlOrEmpty;
+  buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty;
 
-  nativeBuildInputs = [
-    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
-    gtk-doc gobjectIntrospection makeWrapper
-  ];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  mesonFlags = [
-    # with_ & enable_will be removed in the future
-    "-Dwith_docs=true"
-    "-Denable_jasper=true"
-    "-Dx11=true" # will be added in the future (default atm)
-    "-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}"
-  ];
+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
 
-  postPatch = ''
-    chmod +x build-aux/* # patchShebangs only applies to executables
-    patchShebangs build-aux
+  # on darwin, tests don't link
+  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
+    substituteInPlace Makefile --replace "docs tests" "docs"
   '';
 
   postInstall =
@@ -48,17 +42,6 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
-
-      # We require runtime access to shared-mime-info
-      ${stdenv.lib.optionalString (!stdenv.isDarwin) ''
-      for f in $dev/bin/*; do
-        wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
-      done
-      wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
-      ''}
-
-      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
-      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).

From e26810069eb093b991d8d4f4c9caab321efba7b0 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 16 Mar 2018 18:09:50 +0100
Subject: [PATCH 1906/2266] spice-gtk: fix symlink errors, add withPolkit
 option

---
 .../libraries/spice-gtk/default.nix           | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f9b3de36b2c..d03e39ac943 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,8 +1,29 @@
 { stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
-, polkit, acl, usbutils, vala
-, gtk3, epoxy }:
+, withPolkit ? true, polkit, acl, usbutils
+, vala, gtk3, epoxy }:
+
+# If this package is built with polkit support (withPolkit=true),
+# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
+# The helper confirms via polkit that the user has an active session,
+# then adds a device acl entry for that user.
+# Example NixOS config to create a setuid wrapper for the helper:
+# security.wrappers.spice-client-glib-usb-acl-helper.source =
+#   "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper";
+# On non-NixOS installations, make a setuid copy of the helper
+# outside the store and adjust PATH to find the setuid version.
+
+# If this package is built without polkit support (withPolkit=false),
+# usb redirection requires read-write access to usb devices.
+# This can be granted by adding users to a custom group like "usb"
+# and using a udev rule to put all usb devices in that group.
+# Example NixOS config:
+#  users.groups.usb = {};
+#  users.users.dummy.extraGroups = [ "usb" ];
+#  services.udev.extraRules = ''
+#    KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb"
+#  '';
 
 with stdenv.lib;
 
@@ -18,11 +39,16 @@ in stdenv.mkDerivation rec {
     sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
   };
 
+  postPatch = ''
+    # get rid of absolute path to helper in store so we can use a setuid wrapper
+    substituteInPlace src/usb-acl-helper.c \
+      --replace 'ACL_HELPER_PATH"/' '"'
+  '';
+
   buildInputs = [
     spice-protocol celt_0_5_1 openssl libpulseaudio pixman
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
-    polkit acl usbutils
-  ];
+  ] ++ optionals withPolkit [ polkit acl usbutils ] ;
 
   nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
 
@@ -34,16 +60,6 @@ in stdenv.mkDerivation rec {
     "--enable-vala"
   ];
 
-  # usb redirection needs spice-client-glib-usb-acl-helper to run setuid root
-  # the helper then uses polkit to check access
-  # in nixos, enable this with
-  # security.wrappers.spice-client-glib-usb-acl-helper.source =
-  #   "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper.real";
-  postFixup = ''
-    mv $out/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper.real
-    ln -sf /run/wrappers/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper
-  '';
-
   dontDisableStatic = true; # Needed by the coroutine test
 
   enableParallelBuilding = true;

From 880d8c16b5b8a2281a8f26b5f0bd76a3aad8dd46 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 11:55:31 +0100
Subject: [PATCH 1907/2266] libsepol: 2.4 -> 2.7

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

diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index f7f393afb39..59962e911d4 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsepol-${version}";
-  version = "2.4";
-  se_release = "20150202";
+  version = "2.7";
+  se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
-    sha256 = "0ncnwhpc1gx4hrrb822fqkwy5h75zzngsrfkd5mlqh1jk7aib419";
+    sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn";
   };
 
   nativeBuildInputs = [ flex ];
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
   '';
 
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ];
 
   passthru = { inherit se_release se_url; };
 

From ea7507b9dc990814ca6d69997add7fe7c9e36f7b Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 13:25:41 +0100
Subject: [PATCH 1908/2266] libselinux: 2.4 -> 2.7

---
 pkgs/os-specific/linux/libselinux/default.nix | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 541ead7258f..0175f79483f 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre
+{ stdenv, fetchurl, pcre, pkgconfig, libsepol
 , enablePython ? true, swig ? null, python ? null
 }:
 
@@ -8,48 +8,34 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libselinux-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
-    sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126";
+    sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libsepol pcre ]
              ++ optionals enablePython [ swig python ];
 
-  # Avoid this false warning:
-  # avc_internal.c: In function 'avc_netlink_receive':
-  # avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align]
-  #  struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
-  #                         ^
-
-  NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align";
-
-  # Unreleased upstream patch that fixes Python package issue arising
-  # from recent SWIG changes.
-  patches = optional enablePython (fetchpatch {
-    name = "fix-python-swig.patch";
-    url = "https://github.com/SELinuxProject/selinux/commit/a9604c30a5e2f71007d31aa6ba41cf7b95d94822.patch";
-    sha256 = "0mjrclh0sd8m7vq0wvl6pg29ss415j3kn0266v8ixy4fprafagfp";
-    stripLen = 1;
-  });
+  # drop fortify here since package uses it by default, leading to compile error:
+  # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
+  hardeningDisable = [ "fortify" ];
 
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
-  ''
-  + ''
-    sed '1i#include <sys/uio.h>' -i src/setrans_client.c
   '';
 
+  # fix install locations
   preBuild = ''
-    # Build fails without this precreated
-    mkdir -p $out/include
-
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
+    makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optional enablePython "install-pywrap";

From 232c39e7abdb86c3533c258dc0bcacd380c34369 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 13:43:48 +0100
Subject: [PATCH 1909/2266] libsemanage: 2.4 -> 2.7

---
 .../os-specific/linux/libsemanage/default.nix | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 587349e4067..303853c9ee2 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,31 +1,33 @@
-{ stdenv, fetchurl, bison, flex, libsepol, libselinux, ustr, bzip2, libaudit }:
+{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit
+, enablePython ? true, swig ? null, python ? null
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libsemanage-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
-    sha256 = "1134ka4mi4387ac5yv68bpp2y7ln5xxhwp07xhqnay0nxzjaqk0s";
+    sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87";
   };
 
-  nativeBuildInputs = [ bison flex ];
-  buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-fstack-protector-all"
-    "-std=gnu89"
-    # these were added to fix build with gcc7. review on update
-    "-Wno-error=format-truncation"
-    "-Wno-error=implicit-fallthrough"
-  ];
+  nativeBuildInputs = [ bison flex pkgconfig ];
+  buildInputs = [ libsepol libselinux bzip2 libaudit ]
+    ++ optionals enablePython [ swig python ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
   '';
 
+  installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
+
   meta = libsepol.meta // {
     description = "Policy management tools for SELinux";
     license = stdenv.lib.licenses.lgpl21;

From 70044c899ebda11f24ccacfe397084c4ea12a2c3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 20:06:58 +0100
Subject: [PATCH 1910/2266] policycoreutils: 2.4 -> 2.7

---
 .../linux/policycoreutils/default.nix         | 53 ++++---------------
 .../policycoreutils/fix-printf-type.patch     | 12 -----
 2 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 536c69ff557..d2f6371225f 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,64 +1,33 @@
-{ stdenv, fetchurl, pythonPackages, gettext
-, setools, libsepol, libselinux, libcap_ng, libsemanage, sepolgen
-}:
+{ stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
 
 stdenv.mkDerivation rec {
   name = "policycoreutils-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
-    sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq";
+    sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa";
   };
 
-  patches = [ ./fix-printf-type.patch ];
-
   postPatch = ''
-    # Fix references to libsepol.a
-    find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \;
-
     # Fix install references
-    substituteInPlace po/Makefile --replace /usr/bin/install install
-
-    # Fix references to /usr/share
-    grep -r '/usr/share' | awk -F: '{print $1}' | xargs sed -i "s,\(\$(DESTDIR)\)*/usr/share,$out/share,g"
-
-    # Fix sepolicy install
-    sed -i "s,\(setup.py install\).*,\1 --prefix=$out,g" sepolicy/Makefile
-
-    # Fix setuid install
-    sed -i 's|-m 4755|-m 755|' sandbox/Makefile
+    substituteInPlace po/Makefile \
+       --replace /usr/bin/install install --replace /usr/share /share
+    substituteInPlace newrole/Makefile --replace /usr/share /share
   '';
 
-  nativeBuildInputs = [ pythonPackages.python gettext ];
-  buildInputs = [ setools libsepol libselinux libcap_ng libsemanage ];
-  pythonPath = [ libselinux sepolgen ];
+  nativeBuildInputs = [ gettext ];
+  buildInputs = [ libsepol libselinux libsemanage ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
+    makeFlagsArray+=("LOCALEDIR=$out/share/locale")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
   '';
 
-  # Creation of the system-config-selinux directory is broken
-  preInstall = ''
-    mkdir -p $out/share/system-config-selinux
-  '';
-
-  # Fix the python scripts to include paths to libraries
-  # NOTE: We are not using wrapPythonPrograms or makeWrapper as these scripts
-  # purge the environment as a security measure
-  postInstall = ''
-    grep -r '#!.*python' $out/bin | awk -F: '{print $1}' | xargs sed -i "1a \
-    import sys; \
-    sys.path.append('$(toPythonPath "$out")'); \
-    ${stdenv.lib.flip stdenv.lib.concatMapStrings pythonPath (lib: ''
-      sys.path.append('$(toPythonPath "${lib}")'); \
-    '')}"
-  '';
-
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-
   meta = with stdenv.lib; {
     description = "SELinux policy core utilities";
     license = licenses.gpl2;
diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
deleted file mode 100644
index 6ab2d6dccc7..00000000000
--- a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c
---- policycoreutils-2.4/setfiles/restore.c	2015-02-02 09:38:10.000000000 -0500
-+++ policycoreutils-2.4.new/setfiles/restore.c	2015-08-29 20:44:13.693023222 -0400
-@@ -118,7 +118,7 @@
- 		r_opts->count++;
- 		if (r_opts->count % STAR_COUNT == 0) {
- 			if (r_opts->progress == 1) {
--				fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT );
-+				fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT );
- 			} else {
- 				if (r_opts->nfile > 0) {
- 					progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100;

From ac90dffdc70408ef14f99171c8a99f323db655f0 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 20:17:04 +0100
Subject: [PATCH 1911/2266] checkpolicy: 2.4 -> 2.7

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

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 8e01bb2a5c8..6ea73c9ac6c 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -2,27 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "checkpolicy-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
-    sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv";
+    sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl";
   };
 
-  # Don't build tests
-  postPatch = ''
-    sed '/-C test/d' -i Makefile
-    sed '1i#include <ctype.h>' -i checkpolicy.c
-  '';
-
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-
   preBuild = ''
-    makeFlagsArray+=("LEX=flex")
     makeFlagsArray+=("LIBDIR=${libsepol}/lib")
     makeFlagsArray+=("PREFIX=$out")
   '';

From 07fe29741b0c9fa4d8f6554bfac2b0160fee1016 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 13:11:07 +0100
Subject: [PATCH 1912/2266] setools: 2015-02-12 -> 2017-11-10

---
 pkgs/os-specific/linux/setools/default.nix | 49 ++++++++++++----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 8262c03e1e5..9cb5785ca98 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,35 +1,42 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bison, flex
-, python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }:
+{ stdenv, fetchFromGitHub, bison, flex, python3 , swig
+, libsepol, libselinux, checkpolicy
+, withGraphics ? false
+}:
 
-stdenv.mkDerivation rec {
-  name = "setools-2015-02-12";
+with stdenv.lib;
+with python3.pkgs;
+
+buildPythonApplication rec {
+  pname = "setools";
+  version = "2017-11-10";
 
   src = fetchFromGitHub {
     owner = "TresysTechnology";
-    repo = "setools3";
-    rev = "f1e5b208d507171968ca4d2eeefd7980f1004a3c";
-    sha256 = "02gzy2kpszhr13f0d9qfiwh2hj4201g2x366j53v5n5qz481aykd";
+    repo = pname;
+    rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7";
+    sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn";
   };
 
-  configureFlags = [
-    "--disable-gui"
-    "--with-sepol-devel=${libsepol}"
-    "--with-selinux-devel=${libselinux}"
-    "--with-tcl=${tcl}/lib"
-  ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libsepol swig ];
+  propagatedBuildInputs = [ enum34 libselinux networkx ]
+    ++ optionals withGraphics [ pyqt5 ];
 
-  hardeningDisable = [ "format" ];
+  checkInputs = [ tox checkpolicy ];
+  preCheck = ''
+    export CHECKPOLICY=${checkpolicy}/bin/checkpolicy
+  '';
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-  NIX_LDFLAGS = "-L${libsepol}/lib -L${libselinux}/lib";
+  setupPyBuildFlags = [ "-i" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python swig2 bison flex ];
-  buildInputs = [ tcl libxml2 sqlite bzip2 ];
+  preBuild = ''
+    export SEPOL="${libsepol}/lib/libsepol.a"
+  '';
 
   meta = {
     description = "SELinux Tools";
-    homepage = http://oss.tresys.com/projects/setools/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/TresysTechnology/setools/wiki;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 7ff15900f8a570232c01fba9b33f7c00939c1461 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 14:52:05 +0100
Subject: [PATCH 1913/2266] libsemanage: fix python lib path

---
 pkgs/os-specific/linux/libsemanage/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 303853c9ee2..45222bee6b0 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=("DESTDIR=$out")
     makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
     makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
-    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];

From cc8bf58427a39c765f3c039951ab3cf7e9533e24 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 14:52:37 +0100
Subject: [PATCH 1914/2266] libselinux: fix python lib path

---
 pkgs/os-specific/linux/libselinux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 0175f79483f..4ddc3010221 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
     makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
     makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
-    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optional enablePython "install-pywrap";

From 905f4725562b8cf07d1a75fd6e5d6573d5cb5520 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 14:56:08 +0100
Subject: [PATCH 1915/2266] selinux-python: init at 2.7

tools written in python that upstream moved from policycoreutils
into a separate package
---
 .../linux/selinux-python/default.nix          | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/os-specific/linux/selinux-python/default.nix

diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
new file mode 100644
index 00000000000..8ac207d6421
--- /dev/null
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python3
+, libselinux, libsemanage, libsepol, setools }:
+
+# this is python3 only because setools only supports python3
+
+with stdenv.lib;
+with python3.pkgs;
+
+stdenv.mkDerivation rec {
+  name = "selinux-python-${version}";
+  version = "2.7";
+  se_release = "20170804";
+  se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+
+  src = fetchurl {
+    url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
+    sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+  buildInputs = [ libsepol python3 ];
+  propagatedBuildInputs = [ libselinux libsemanage setools ipy ];
+
+  postPatch = ''
+    substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix"
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("LOCALEDIR=$out/share/locale")
+    makeFlagsArray+=("LIBSEPOLA=${libsepol}/lib/libsepol.a")
+    makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
+    makeFlagsArray+=("PYTHON=${python3}/bin/python")
+    makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages")
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "SELinux policy core utilities written in Python";
+    license = licenses.gpl2;
+    homepage = https://selinuxproject.org;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85fbb8894ec..28ef4f64be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20660,6 +20660,11 @@ with pkgs;
   seafile-shared = callPackage ../misc/seafile-shared { };
 
   serviio = callPackage ../servers/serviio {};
+  selinux-python = callPackage ../os-specific/linux/selinux-python {
+    # needs python3 bindings
+    libselinux = libselinux.override { python = python3; };
+    libsemanage = libsemanage.override { python = python3; };
+  };
 
   slock = callPackage ../misc/screensavers/slock {
     conf = config.slock.conf or null;

From f7fe3f51840d6d978cb644ce209ce3466de480eb Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 15 Mar 2018 23:57:19 +0100
Subject: [PATCH 1916/2266] selinux-sandbox: init at 2.7

---
 .../linux/selinux-sandbox/default.nix         | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/os-specific/linux/selinux-sandbox/default.nix

diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
new file mode 100644
index 00000000000..71d2ee6e80a
--- /dev/null
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, bash, coreutils, python3
+, libcap_ng, policycoreutils, selinux-python, dbus
+, xorgserver, openbox, xmodmap }:
+
+# this is python3 only as it depends on selinux-python
+
+with stdenv.lib; 
+with python3.pkgs;
+
+stdenv.mkDerivation rec {
+  name = "selinux-sandbox-${version}";
+  version = "2.7";
+  se_release = "20170804";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz";
+    sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+  buildInputs = [ bash coreutils libcap_ng policycoreutils python3 xorgserver openbox xmodmap dbus ];
+  propagatedBuildInputs = [ pygobject3 selinux-python ];
+
+  postPatch = ''
+    # Fix setuid install
+    substituteInPlace Makefile --replace "-m 4755" "-m 755"
+    substituteInPlace sandboxX.sh \
+      --replace "#!/bin/sh" "#!${bash}/bin/sh" \
+      --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
+      --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
+      --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
+      --replace "secon" "${policycoreutils}/bin/secon"
+    substituteInPlace sandbox \
+      --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \
+      --replace "/usr/share/sandbox" "$out/share/sandbox" \
+      --replace "/usr/share/locale" "${policycoreutils}/share/locale" \
+      --replace "/usr/bin/openbox" "${openbox}/bin/openbox" \
+      --replace "#!/bin/sh" "#!${bash}/bin/sh" \
+      --replace "dbus-" "${dbus}/bin/dbus-" \
+      --replace "/usr/bin/xmodmap" "${xmodmap}/bin/xmodmap" \
+      --replace "/usr/bin/shred" "${coreutils}/bin/shred" \
+      --replace "/usr/bin/test" "${coreutils}/bin/test" \
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "SELinux sandbox utility";
+    license = licenses.gpl2;
+    homepage = https://selinuxproject.org;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28ef4f64be7..d0f3121bbac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11357,6 +11357,8 @@ with pkgs;
 
   sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};
 
+  selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { };
+
   serd = callPackage ../development/libraries/serd {};
 
   serf = callPackage ../development/libraries/serf {};

From ead2ba88097c58f60cdd0ae5475c64192c7c21d3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 23 Mar 2018 10:06:58 -0400
Subject: [PATCH 1917/2266] Remove HIE package set until automation can be put
 in place.

---
 .../haskell-modules/hie-packages.nix          | 502 ------------------
 .../haskell-modules/initial-packages.nix      |   2 +-
 2 files changed, 1 insertion(+), 503 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/hie-packages.nix

diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix
deleted file mode 100644
index 3f08f64b1e1..00000000000
--- a/pkgs/development/haskell-modules/hie-packages.nix
+++ /dev/null
@@ -1,502 +0,0 @@
-{ pkgs, stdenv, callPackage }: self:
-let src = pkgs.fetchFromGitHub
-      { owner = "haskell";
-        repo = "haskell-ide-engine";
-        rev = "3ec8e93e9ca751cf282556998851ffa65f32e06b";
-        sha256 = "1wzqzvsa39c1cngmmjryqrq4vqdg6d4wp5wdf17vp96ljvz1cczw";
-      };
-    cabal-helper-src = pkgs.fetchgit
-      { url = "https://gitlab.com/dxld/cabal-helper.git";
-        rev = "4bfc6b916fcc696a5d82e7cd35713d6eabcb0533";
-        sha256 = "1a8231as0wdvi0q73ha9lc0qrx23kmcwf910qaicvmdar5p2b15m";
-      };
-    ghc-dump-tree-src = pkgs.fetchgit
-      { url = "https://gitlab.com/alanz/ghc-dump-tree.git";
-        rev = "50f8b28fda675cca4df53909667c740120060c49";
-        sha256 = "0v3r81apdqp91sv7avy7f0s3im9icrakkggw8q5b7h0h4js6irqj";
-      };
-    ghc-mod-src = pkgs.fetchFromGitHub
-      { owner = "wz1000";
-        repo = "ghc-mod";
-        rev = "03c91ea53b6389e7a1fcf4e471171aa3d6c8de41";
-        sha256 = "11iic93klsh5izp8v4mhl7vnnlib821cfhdymlpg4drx7zbm9il6";
-      };
-    HaRe-src = pkgs.fetchgit
-      { url = "https://gitlab.com/alanz/HaRe.git";
-        rev = "e325975450ce89d790ed3f92de3ef675967d9538";
-        sha256 = "0z7r3l4j5a1brz7zb2rgd985m58rs0ki2p59y1l9i46fcy8r9y4g";
-      };
-    cabal-helper = self.cabal-helper_hie;
-    haddock-library = self.haddock-library_1_4_4;
-    hoogle = self.hoogle_5_0_14;
-    ghc-dump-tree = self.ghc-dump-tree_hie;
-    ghc-mod = self.ghc-mod_hie;
-    HaRe = self.HaRe_hie;
-in
-  { ### Overrides required by hie
-    cabal-helper_hie = callPackage
-      ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers
-       , directory, exceptions, filepath, ghc-prim, mtl, process
-       , semigroupoids, template-haskell, temporary, transformers
-       , unix, unix-compat, utf8-string
-       }:
-       mkDerivation {
-         pname = "cabal-helper";
-         version = "0.8.0.0";
-         src = cabal-helper-src;
-         isLibrary = true;
-         isExecutable = true;
-         jailbreak = true;
-         setupHaskellDepends = [ base Cabal directory filepath ];
-         libraryHaskellDepends = [
-           base Cabal directory filepath ghc-prim mtl process semigroupoids
-           transformers unix unix-compat
-         ];
-         executableHaskellDepends = [
-           base bytestring Cabal containers directory exceptions filepath
-           ghc-prim mtl process template-haskell temporary transformers unix
-           unix-compat utf8-string
-         ];
-         testHaskellDepends = [
-           base bytestring Cabal directory exceptions filepath ghc-prim mtl
-           process template-haskell temporary transformers unix unix-compat
-           utf8-string
-         ];
-         testToolDepends = [ cabal-install ];
-         postInstall =
-           ''
-             libexec="$out/libexec/$(basename $out/lib/ghc*/*ghc*)/$name"
-             mkdir -p "$libexec"
-             ln -sv $out/bin/cabal-helper-wrapper "$libexec"
-           '';
-         doCheck = false;
-         description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
-         license = stdenv.lib.licenses.agpl3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) {};
-    ghc-dump-tree_hie = callPackage
-      ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative
-       , pretty, pretty-show, process, unordered-containers
-       , vector
-       }:
-       mkDerivation {
-         pname = "ghc-dump-tree";
-         version = "0.2.0.1";
-         src = ghc-dump-tree-src;
-         isLibrary = true;
-         isExecutable = true;
-         libraryHaskellDepends = [
-           aeson base bytestring ghc pretty pretty-show process
-           unordered-containers vector
-         ];
-         executableHaskellDepends = [
-           aeson base bytestring ghc optparse-applicative pretty pretty-show
-           process unordered-containers vector
-         ];
-         homepage = "https://github.com/edsko/ghc-dump-tree";
-         description = "Dump GHC's parsed, renamed, and type checked ASTs";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) {};
-    ghc-mod-core = callPackage
-      ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
-       , containers, deepseq, directory, djinn-ghc, extra, fclabels
-       , filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-syb-utils
-       , haskell-src-exts, hlint, monad-control, monad-journal, mtl
-       , old-time, optparse-applicative, pipes, process, safe, semigroups
-       , split, syb, template-haskell, temporary, text, time
-       , transformers, transformers-base
-       }:
-       mkDerivation {
-         pname = "ghc-mod-core";
-         version = "5.9.0.0";
-         src = "${ghc-mod-src}/core";
-         setupHaskellDepends = [
-           base Cabal containers directory filepath process template-haskell
-           transformers
-         ];
-         libraryHaskellDepends = [
-           base binary bytestring cabal-helper containers deepseq directory
-           djinn-ghc extra fclabels filepath fingertree ghc ghc-boot ghc-paths
-           ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
-           mtl old-time optparse-applicative pipes process safe semigroups
-           split syb template-haskell temporary text time transformers
-           transformers-base
-         ];
-         homepage = "https://github.com/DanielG/ghc-mod";
-         description = "Happy Haskell Hacking";
-         license = stdenv.lib.licenses.agpl3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit cabal-helper; };
-    ghc-mod_hie = callPackage
-      ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
-       , cabal-helper, containers, criterion, deepseq, directory
-       , djinn-ghc, doctest, extra, fclabels, filepath, ghc, ghc-boot
-       , ghc-mod-core, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint
-       , hspec, monad-control, monad-journal, mtl, old-time
-       , optparse-applicative, pipes, process, safe, semigroups, shelltest
-       , split, syb, template-haskell, temporary, text, time
-       , transformers, transformers-base
-       }:
-       mkDerivation {
-         pname = "ghc-mod";
-         version = "5.9.0.0";
-         src = ghc-mod-src;
-         isLibrary = true;
-         isExecutable = true;
-         enableSeparateDataOutput = true;
-         setupHaskellDepends = [
-           base Cabal cabal-doctest containers directory filepath process
-           template-haskell transformers
-         ];
-         libraryHaskellDepends = [
-           base binary bytestring cabal-helper containers deepseq directory
-           djinn-ghc extra fclabels filepath ghc ghc-boot ghc-mod-core
-           ghc-paths ghc-syb-utils haskell-src-exts hlint monad-control
-           monad-journal mtl old-time optparse-applicative pipes process safe
-           semigroups split syb template-haskell temporary text time
-           transformers transformers-base
-         ];
-         executableHaskellDepends = [
-           base binary deepseq directory fclabels filepath ghc ghc-mod-core
-           monad-control mtl old-time optparse-applicative process semigroups
-           split time
-         ];
-         testHaskellDepends = [
-           base cabal-helper containers directory doctest fclabels filepath
-           ghc ghc-boot ghc-mod-core hspec monad-journal mtl process split
-           temporary transformers
-         ];
-         testToolDepends = [ shelltest ];
-         # Doesn't work with our doctest
-         doCheck = false;
-         benchmarkHaskellDepends = [
-           base criterion directory filepath ghc-mod-core temporary
-         ];
-         homepage = "https://github.com/DanielG/ghc-mod";
-         description = "Happy Haskell Hacking";
-         license = stdenv.lib.licenses.agpl3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { shelltest = null; inherit cabal-helper; };
-    HaRe_hie = callPackage
-      ({ mkDerivation, attoparsec, base, base-prelude, Cabal, cabal-helper
-       , case-insensitive, containers, conversion
-       , conversion-case-insensitive, conversion-text, Diff, directory
-       , filepath, foldl, ghc, ghc-exactprint, ghc-mod-core, ghc-syb-utils
-       , gitrev, hslogger, hspec, HUnit, monad-control, mtl
-       , optparse-applicative, optparse-simple, parsec, stdenv
-       , Strafunski-StrategyLib, syb, syz, turtle
-       }:
-       mkDerivation {
-         pname = "HaRe";
-         version = "0.8.4.1";
-         src = HaRe-src;
-         isLibrary = true;
-         isExecutable = true;
-         enableSeparateDataOutput = true;
-         libraryHaskellDepends = [
-           base cabal-helper containers directory filepath ghc ghc-exactprint
-           ghc-mod-core ghc-syb-utils hslogger monad-control mtl
-           Strafunski-StrategyLib syb syz
-         ];
-         executableHaskellDepends = [
-           base Cabal ghc-mod-core gitrev mtl optparse-applicative
-           optparse-simple
-         ];
-         testHaskellDepends = [
-           attoparsec base base-prelude cabal-helper case-insensitive
-           containers conversion conversion-case-insensitive conversion-text
-           Diff directory filepath foldl ghc ghc-exactprint ghc-mod-core
-           ghc-syb-utils hslogger hspec HUnit monad-control mtl parsec
-           Strafunski-StrategyLib syb syz turtle
-         ];
-         # Test directory doesn't exist
-         doCheck = false;
-         homepage = "https://github.com/RefactoringTools/HaRe/wiki";
-         description = "the Haskell Refactorer";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit cabal-helper; };
-    ### hie packages
-    haskell-ide-engine = callPackage
-      ({ mkDerivation, aeson, async, base, bytestring, Cabal, cabal-install
-       , containers, data-default, Diff, directory, either, ekg, filepath, ghc
-       , ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base
-       , hie-brittany, hie-build-plugin, hie-eg-plugin-async
-       , hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock
-       , hie-hare, hie-hoogle, hie-plugin-api, hoogle, hoogleLocal, hslogger, hspec
-       , lens, mtl, optparse-simple, QuickCheck, quickcheck-instances
-       , sorted-list, stm, text, time, transformers
-       , unordered-containers, vector, vinyl, yaml, yi-rope
-       }:
-       mkDerivation {
-         pname = "haskell-ide-engine";
-         version = "0.1.0.0";
-         inherit src;
-         isLibrary = true;
-         isExecutable = true;
-         libraryHaskellDepends = [
-           aeson async base bytestring Cabal containers data-default directory
-           either filepath ghc ghc-mod-core gitrev haskell-lsp
-           hie-apply-refact hie-base hie-brittany hie-ghc-mod hie-haddock
-           hie-hare hie-hoogle hie-plugin-api hslogger lens mtl
-           optparse-simple sorted-list stm text transformers
-           unordered-containers vector yi-rope
-         ];
-         executableHaskellDepends = [
-           base Cabal containers directory ekg ghc-mod-core gitrev haskell-lsp
-           hie-apply-refact hie-build-plugin hie-eg-plugin-async
-           hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle
-           hie-plugin-api hslogger optparse-simple stm text time transformers
-           unordered-containers vinyl
-         ];
-         testHaskellDepends = [
-           aeson base containers Diff directory filepath ghc-mod-core
-           haskell-lsp hie-apply-refact hie-base hie-eg-plugin-async
-           hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle
-           hie-plugin-api hoogle hslogger hspec QuickCheck
-           quickcheck-instances stm text transformers unordered-containers
-           vector vinyl yaml
-         ];
-
-         preCheck =
-           ''
-             export HOME=$NIX_BUILD_TOP/home
-             mkdir -p $HOME/.hoogle
-             ln -sv ${hoogleLocal}/share/doc/hoogle/default.hoo $HOME/.hoogle/default-haskell-${hoogle.version}.hoo
-           '';
-         # https://github.com/haskell/haskell-ide-engine/issues/425
-         # The disabled tests do work in a local nix-shell with cabal available.
-         patches = [ ./patches/hie-testsuite.patch ];
-         homepage = "http://github.com/githubuser/haskell-ide-engine#readme";
-         description = "Provide a common engine to power any Haskell IDE";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-      }) { inherit hoogle; hoogleLocal = (self.hoogleLocal {}).override { inherit hoogle; }; };
-    hie-apply-refact = callPackage
-      ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod
-       , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint
-       , text, transformers
-       }:
-       mkDerivation {
-         pname = "hie-apply-refact";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-apply-refact";
-         libraryHaskellDepends = [
-           aeson apply-refact base either extra ghc-mod ghc-mod-core
-           haskell-src-exts hie-base hie-plugin-api hlint text transformers
-         ];
-         description = "Haskell IDE Apply Refact plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit ghc-mod; };
-    hie-base = callPackage
-      ({ mkDerivation, aeson, base, haskell-lsp, text }:
-       mkDerivation {
-         pname = "hie-base";
-         version = "0.1.0.0";
-         inherit src;
-         preUnpack = "sourceRoot=source/hie-base";
-         libraryHaskellDepends = [ aeson base haskell-lsp text ];
-         description = "Haskell IDE API base types";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) {};
-    hie-brittany = callPackage
-      ({ mkDerivation, aeson, base, brittany, ghc-mod, ghc-mod-core
-       , haskell-lsp, hie-plugin-api, lens, text
-       }:
-       mkDerivation {
-         pname = "hie-brittany";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-brittany";
-         libraryHaskellDepends = [
-           aeson base brittany ghc-mod ghc-mod-core haskell-lsp hie-plugin-api
-           lens text
-         ];
-         description = "Haskell IDE Hoogle plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit ghc-mod; };
-    hie-build-plugin = callPackage
-      ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-helper
-       , containers, directory, filepath, haskell-lsp, hie-plugin-api
-       , process, stm, text, transformers, yaml
-       }:
-       mkDerivation {
-         pname = "hie-build-plugin";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-build-plugin";
-         libraryHaskellDepends = [
-           aeson base bytestring Cabal cabal-helper containers directory
-           filepath haskell-lsp hie-plugin-api process stm text transformers
-           yaml
-         ];
-         description = "Haskell IDE build plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit cabal-helper; };
-    hie-eg-plugin-async = callPackage
-      ({ mkDerivation, base, ghc-mod-core, hie-plugin-api, stm
-       , text
-       }:
-       mkDerivation {
-         pname = "hie-eg-plugin-async";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-eg-plugin-async";
-         libraryHaskellDepends = [
-           base ghc-mod-core hie-plugin-api stm text
-         ];
-         description = "Haskell IDE example plugin, using async processes";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) {};
-    hie-example-plugin2 = callPackage
-      ({ mkDerivation, base, hie-plugin-api, text }:
-       mkDerivation {
-         pname = "hie-example-plugin2";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-example-plugin2";
-         libraryHaskellDepends = [ base hie-plugin-api text ];
-         description = "Haskell IDE example plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) {};
-    hie-ghc-mod = callPackage
-      ({ mkDerivation, aeson, base, containers, ghc, ghc-mod, ghc-mod-core
-       , hie-base, hie-plugin-api, text, transformers
-       }:
-       mkDerivation {
-         pname = "hie-ghc-mod";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-ghc-mod";
-         libraryHaskellDepends = [
-           aeson base containers ghc ghc-mod ghc-mod-core hie-base
-           hie-plugin-api text transformers
-         ];
-         description = "Haskell IDE ghc-mod plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit ghc-mod; };
-    hie-ghc-tree = callPackage
-      ({ mkDerivation, aeson, base, ghc-dump-tree, ghc-mod, ghc-mod-core
-       , hie-base, hie-plugin-api, text
-       }:
-       mkDerivation {
-         pname = "hie-ghc-tree";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-ghc-tree";
-         libraryHaskellDepends = [
-           aeson base ghc-dump-tree ghc-mod ghc-mod-core hie-base
-           hie-plugin-api text
-         ];
-         description = "Haskell IDE GHC Tree plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit ghc-dump-tree ghc-mod; };
-    hie-haddock = callPackage
-      ({ mkDerivation, aeson, base, containers, directory, either
-       , filepath, ghc, ghc-exactprint, ghc-mod, ghc-mod-core, haddock-api
-       , haddock-library, HaRe, haskell-lsp, hie-base, hie-ghc-mod
-       , hie-hare, hie-plugin-api, lens, monad-control, mtl, text
-       , transformers
-       }:
-       mkDerivation {
-         pname = "hie-haddock";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-haddock";
-         libraryHaskellDepends = [
-           aeson base containers directory either filepath ghc ghc-exactprint
-           ghc-mod ghc-mod-core haddock-api haddock-library HaRe haskell-lsp
-           hie-base hie-ghc-mod hie-hare hie-plugin-api lens monad-control mtl
-           text transformers
-         ];
-         description = "Haskell IDE Haddock plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit haddock-library HaRe ghc-mod; };
-    hie-hare = callPackage
-      ({ mkDerivation, aeson, base, containers, Diff, either, ghc
-       , ghc-exactprint, ghc-mod, ghc-mod-core, HaRe, haskell-lsp
-       , hie-base, hie-ghc-mod, hie-plugin-api, lens, monad-control, mtl
-       , text, transformers
-       }:
-       mkDerivation {
-         pname = "hie-hare";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-hare";
-         libraryHaskellDepends = [
-           aeson base containers Diff either ghc ghc-exactprint ghc-mod
-           ghc-mod-core HaRe haskell-lsp hie-base hie-ghc-mod hie-plugin-api
-           lens monad-control mtl text transformers
-         ];
-         description = "Haskell IDE HaRe plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit ghc-mod HaRe; };
-    hie-hoogle = callPackage
-      ({ mkDerivation, aeson, base, directory, filepath, ghc-mod
-       , ghc-mod-core, hie-plugin-api, hoogle, tagsoup, text
-       }:
-       mkDerivation {
-         pname = "hie-hoogle";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-hoogle";
-         libraryHaskellDepends = [
-           aeson base directory filepath ghc-mod ghc-mod-core hie-plugin-api
-           hoogle tagsoup text
-         ];
-         description = "Haskell IDE Hoogle plugin";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) { inherit ghc-mod hoogle; };
-    hie-plugin-api = callPackage
-      ({ mkDerivation, aeson, base, containers, Diff, directory, either
-       , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base
-       , hslogger, lifted-base, monad-control, mtl, stdenv, stm, syb, text
-       , time, transformers, unordered-containers
-       }:
-       mkDerivation {
-         pname = "hie-plugin-api";
-         version = "0.1.0.0";
-         inherit src;
-         postUnpack = "sourceRoot=source/hie-plugin-api";
-         libraryHaskellDepends = [
-           aeson base containers Diff directory either filepath fingertree ghc
-           ghc-mod-core haskell-lsp hie-base hslogger lifted-base
-           monad-control mtl stm syb text time transformers
-           unordered-containers
-         ];
-         description = "Haskell IDE API for plugin communication";
-         license = stdenv.lib.licenses.bsd3;
-         hydraPlatforms = stdenv.lib.platforms.none;
-         broken = true;
-       }) {};
-  }
diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix
index 8e8712d9096..6ab7da96911 100644
--- a/pkgs/development/haskell-modules/initial-packages.nix
+++ b/pkgs/development/haskell-modules/initial-packages.nix
@@ -1,2 +1,2 @@
 args@{ pkgs, stdenv, callPackage }: self:
-   (import ./hie-packages.nix args self) // (import ./hackage-packages.nix args self)
+   (import ./hackage-packages.nix args self)

From ebe1cc211e9269a98ab09bbde3800fa8438e1684 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Thu, 4 Jan 2018 17:04:22 +0100
Subject: [PATCH 1918/2266] neopg: Init at 0.0.4

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

diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
new file mode 100644
index 00000000000..10efe0e7f21
--- /dev/null
+++ b/pkgs/tools/security/neopg/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetchgit
+, cmake
+, sqlite
+, botan2
+, boost164
+, curl
+, gettext
+, pkgconfig
+, libusb
+, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "neopg";
+  version = "0.0.4";
+
+  # no fetchFromGitHub, as repo contains submodules
+  src = fetchgit {
+    url = "https://github.com/das-labor/neopg.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; 
+
+  doCheck = true;
+  checkTarget = "test";
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp src/neopg $out/bin/neopg
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://neopg.io/;
+    description = "Modern replacement for GnuPG 2";
+    license = licenses.gpl3;
+    longDescription = ''
+      NeoPG starts as an opiniated fork of GnuPG 2 to clean up the code and make it easier to develop.
+      It is written in C++11.
+    '';
+    maintainers = with maintainers; [ erictapen ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85fbb8894ec..82a07443f79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3812,6 +3812,8 @@ with pkgs;
 
   ndisc6 = callPackage ../tools/networking/ndisc6 { };
 
+  neopg = callPackage ../tools/security/neopg { };
+
   netboot = callPackage ../tools/networking/netboot {};
 
   netcat = netcat-openbsd;

From abc0bf28bed3902fca9447586a86353fad19c7d3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 23 Mar 2018 16:30:53 +0100
Subject: [PATCH 1919/2266] telepathy-gabble: fix source URL

upstream changed it
---
 .../networking/instant-messengers/telepathy/gabble/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 1b9ccb98d0f..40de405e0d2 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.18.3";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
+    url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
     sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
   };
 

From d7af68589692d59ea6e0dab25faeb0e6180c42d3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 23 Mar 2018 15:26:45 +0100
Subject: [PATCH 1920/2266] lf: 2018-03-19 -> 1

The first non-nightly release (r1).
---
 pkgs/tools/misc/lf/default.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index bed07bc8448..0a7073f4d48 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -1,19 +1,33 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "lf-unstable-${version}";
-  version = "2018-03-19";
+  name = "lf-${version}";
+  version = "1";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
-    rev = "c76ad181f5753984e39608628ac4def4183b53a4"; # nightly
-    sha256 = "1wsmljina9n2zij7gzh7b4zbzi7sdsa6hnyaj75nsmqn9lshngap";
+    rev = "r${version}";
+    sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
   goDeps = ./deps.nix;
 
+  # TODO: Setting buildFlags probably isn't working properly. I've tried a few
+  # variants, e.g.:
+  # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\"";
+  # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\"";
+
+  # Override the build phase (to set buildFlags):
+  buildPhase = ''
+    runHook preBuild
+    runHook renameImports
+    cd go/src/${goPackagePath}
+    go install -ldflags="-s -w -X main.gVersion=${version}"
+    runHook postBuild
+  '';
+
   meta = with stdenv.lib; {
     description = "A terminal file manager written in Go and heavily inspired by ranger";
     longDescription = ''

From 36fd2baa6fac5e695b91ad6680002da401fb7c03 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 23 Mar 2018 09:04:12 -0700
Subject: [PATCH 1921/2266] yate: 5.4.2 -> 6.0.0

- built on NixOS
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate -h` got 0 exit code
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate --help` got 0 exit code
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate -V` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate --version` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate -h` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate --help` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-qt4 -h` got 0 exit code
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-qt4 --help` got 0 exit code
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-qt4 -V` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-qt4 --version` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-qt4 -h` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-qt4 --help` and found version 6.0.0
- ran `/nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1/bin/yate-config --version` and found version 6.0.0
- found 6.0.0 with grep in /nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1
- found 6.0.0 in filename of file in /nix/store/prjhgn0ps0ywpjfpb64dy0j332dci2xd-yate-6.0.0-1
- directory tree listing: https://gist.github.com/b8b0469c23ed9c02dd5173ba822bdf57
---
 pkgs/applications/misc/yate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 61c7b11f208..53d427e61c2 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yate-${version}";
-  version = "5.4.2-1";
+  version = "6.0.0-1";
 
   src = fetchurl {
-    url = "http://voip.null.ro/tarballs/yate5/${name}.tar.gz";
-    sha256 = "08gwz0gipc5v75jv46p2yg8hg31xjp6x7jssd0rrgsa3szi5697n";
+    url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz";
+    sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa";
   };
 
   # TODO zaptel ? postgres ?

From ba960ac38370aab6297a5a07ba3784f7311db7dc Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Fri, 24 Nov 2017 05:38:13 +0700
Subject: [PATCH 1922/2266] wine: disable bindnow hardening

---
 pkgs/misc/emulators/wine/base.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 6eb1841d1c7..9af5c889c42 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -103,6 +103,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   
   enableParallelBuilding = true;
 
+  # https://bugs.winehq.org/show_bug.cgi?id=43530
+  # https://github.com/NixOS/nixpkgs/issues/31989
+  hardeningDisable = [ "bindnow" ];
+
   passthru = { inherit pkgArches; };
   meta = {
     inherit version platforms;

From 9846fbf06b5224685285d75c7264243ddcf7ad18 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Fri, 23 Mar 2018 17:41:19 +0100
Subject: [PATCH 1923/2266] libdvdnav: 5.0.3 -> 6.0.0

Semi-automatic update generated by ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.5t3QSH6Esb /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.0.0 with grep in /nix/store/9hclm5126babak424wlc0bflzp5w8wxg-libdvdnav-6.0.0
- directory tree listing: gist.github.com/ac1677320d622ed0b03422144cbbc5e4
---
 pkgs/development/libraries/libdvdnav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index a26b927a883..42321b2f866 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdnav-${version}";
-  version = "5.0.3";
+  version = "6.0.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
-    sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
+    sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 107eaa8780d651bebfe922d15c3519765dc5a5c9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Mar 2018 19:03:04 +0200
Subject: [PATCH 1924/2266] armTrustedFirmwareQemu: 1.4 -> 1.5, fixes build
 with GCC7

---
 pkgs/misc/arm-trusted-firmware/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index b4fa3662675..f1f076fb2d7 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -10,13 +10,13 @@ let
            stdenv.mkDerivation (rec {
 
     name = "arm-trusted-firmware-${platform}-${version}";
-    version = "1.4";
+    version = "1.5";
 
     src = fetchFromGitHub {
       owner = "ARM-software";
       repo = "arm-trusted-firmware";
-      rev = "b762fc7481c66b64eb98b6ff694d569e66253973";
-      sha256 = "15m10dfgqkgw6rmzgfg1xzp1si9d5jwzyrcb7cp3y9ckj6mvp3i3";
+      rev = "refs/tags/v${version}";
+      sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8";
     };
 
     depsBuildBuild = [ buildPackages.stdenv.cc ];

From bab5a0664cfc982bf4915ccb214f4a11a5310cea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Mar 2018 19:03:26 +0200
Subject: [PATCH 1925/2266] armTrustedFirmware: Disable parallel build

I think https://hydra.nixos.org/build/71541345 is parallel build
related.
---
 pkgs/misc/arm-trusted-firmware/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index f1f076fb2d7..868d60d6d32 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -38,7 +38,8 @@ let
     hardeningDisable = [ "all" ];
     dontStrip = true;
 
-    enableParallelBuilding = true;
+    # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory
+    enableParallelBuilding = false;
 
     meta = with stdenv.lib; {
       homepage = https://github.com/ARM-software/arm-trusted-firmware;

From 7b44560aa1843b921c8270185bd2fb81a420ee15 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 23 Mar 2018 12:59:15 -0500
Subject: [PATCH 1926/2266] musl: provide debug info, separately, don't disable
 unwind tables

Also by setting --enable-debug, asm is preprocessed with CFI directives.

Keep unwind tables does not increase size by much,
and helps debuggers and similar make sense of things.
---
 pkgs/os-specific/linux/musl/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 0f8f088945a..005a12f5b94 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
   # so musl can selectively disable as needed
   hardeningDisable = [ "stackprotector" ];
 
+  # Leave these, be friendlier to debuggers/perf tools
+  # Don't force them on, but don't force off either
+  postPatch = ''
+    substituteInPlace configure \
+      --replace -fno-unwind-tables "" \
+      --replace -fno-asynchronous-unwind-tables ""
+  '';
+
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
   '';
@@ -40,6 +48,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-shared"
     "--enable-static"
+    "--enable-debug"
     "CFLAGS=-fstack-protector-strong"
     # Fix cycle between outputs
     "--disable-wrapper"
@@ -48,15 +57,17 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   dontDisableStatic = true;
-  dontStrip = true;
+  separateDebugInfo = true;
 
   postInstall =
   ''
     # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
     # Apparently glibc provides scsi itself?
     (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
-  '' +
-  ''
+  '' + ''
+    # Strip debug out of the static library
+    $STRIP -S $out/lib/libc.a
+  '' + ''
     mkdir -p $out/bin
     # Create 'ldd' symlink, builtin
     ln -s $out/lib/libc.so $out/bin/ldd

From 8cd005b6fbf09fe03dc60d45a6f823a283de4499 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 22 Mar 2018 22:04:22 +0100
Subject: [PATCH 1927/2266] t: 2.9.0 -> 3.1.0

2.9.0 didn't build anymore
---
 pkgs/tools/misc/t/Gemfile.lock |  59 ++++----
 pkgs/tools/misc/t/default.nix  |   2 +-
 pkgs/tools/misc/t/gemset.nix   | 246 ++++++++++++++++++---------------
 3 files changed, 168 insertions(+), 139 deletions(-)

diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock
index d85f5a1a752..6506d32b0ce 100644
--- a/pkgs/tools/misc/t/Gemfile.lock
+++ b/pkgs/tools/misc/t/Gemfile.lock
@@ -1,52 +1,63 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     buftok (0.2.0)
-    equalizer (0.0.9)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    geokit (1.9.0)
-      multi_json (>= 1.3.2)
-    htmlentities (4.3.3)
-    http (0.6.3)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
+    geokit (1.11.0)
+    htmlentities (4.3.4)
+    http (3.0.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (>= 2.0.0.pre.pre2, < 3)
       http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.1.0)
     http_parser.rb (0.6.0)
-    json (1.8.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    multi_json (1.11.0)
     multipart-post (2.0.0)
-    naught (1.0.0)
-    oauth (0.4.7)
-    retryable (2.0.1)
+    naught (1.1.0)
+    oauth (0.5.4)
+    public_suffix (3.0.2)
+    retryable (2.0.4)
     simple_oauth (0.3.1)
-    t (2.9.0)
-      geokit (>= 1.8.3, < 2)
+    t (3.1.0)
+      geokit (~> 1.9)
       htmlentities (~> 4.3)
       launchy (~> 2.4)
-      oauth (~> 0.4.7)
+      oauth (~> 0.5.1)
       retryable (~> 2.0)
       thor (>= 0.19.1, < 2)
-      twitter (~> 5.13)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    twitter (5.14.0)
+      twitter (~> 6.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    twitter (6.2.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
-      equalizer (~> 0.0.9)
-      faraday (~> 0.9.0)
-      http (~> 0.6.0)
+      equalizer (~> 0.0.11)
+      http (~> 3.0)
+      http-form_data (~> 2.0)
       http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
       memoizable (~> 0.4.0)
+      multipart-post (~> 2.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   t
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix
index ad9e0949ce8..b9c93c63954 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/pkgs/tools/misc/t/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, ruby }:
 
 bundlerEnv {
-  name = "t-2.9.0";
+  name = "t-3.1.0";
 
   inherit ruby;
   gemfile = ./Gemfile;
diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix
index 6c721111c67..268cbae5e80 100644
--- a/pkgs/tools/misc/t/gemset.nix
+++ b/pkgs/tools/misc/t/gemset.nix
@@ -1,185 +1,203 @@
 {
-  "addressable" = {
-    version = "2.3.7";
+  addressable = {
+    dependencies = ["public_suffix"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
       type = "gem";
-      sha256 = "1x1401m59snw59c2bxr10jj10z1n4r4jvz8c55d0c3sh2smbl8kh";
     };
+    version = "2.5.2";
   };
-  "buftok" = {
-    version = "0.2.0";
+  buftok = {
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs";
-    };
-  };
-  "equalizer" = {
-    version = "0.0.9";
-    source = {
       type = "gem";
-      sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr";
     };
+    version = "0.2.0";
   };
-  "faraday" = {
-    version = "0.9.1";
+  domain_name = {
+    dependencies = ["unf"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
       type = "gem";
-      sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
     };
-    dependencies = [
-      "multipart-post"
-    ];
+    version = "0.5.20170404";
   };
-  "geokit" = {
-    version = "1.9.0";
+  equalizer = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
       type = "gem";
-      sha256 = "1bpkjz2q8hm7i4mrrp1if51zq6fz3qkqj55qwlb7jh9jlgyvjmqy";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "0.0.11";
   };
-  "htmlentities" = {
-    version = "4.3.3";
+  geokit = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iryy9gcrayd4c2xfxnb0acnmqcz5bv7pp6ilaifwlwl6jnc40dm";
       type = "gem";
-      sha256 = "0v4m2pn6q2h7iqdkxk9z3j4828harcjgk1h77v9i4x87avv5130p";
     };
+    version = "1.11.0";
   };
-  "http" = {
-    version = "0.6.3";
+  htmlentities = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
       type = "gem";
-      sha256 = "0wmj5i1l0f6ajhs8wi1h3sdwhrl00llrpsmh6xs9dwjm2amvdvxv";
     };
-    dependencies = [
-      "http_parser.rb"
-    ];
+    version = "4.3.4";
+  };
+  http = {
+    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mqjjqgdq83rz3nvq69bn0n5x45hnwd4794fmfbi0wrd1n47syfs";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  http-form_data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j90dydw36h9s09n760aid8asabigqcgi7agsyqh53iz5s3qv9v0";
+      type = "gem";
+    };
+    version = "2.1.0";
   };
   "http_parser.rb" = {
-    version = "0.6.0";
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
-    };
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
       type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
+    version = "0.6.0";
   };
-  "launchy" = {
-    version = "2.4.3";
+  launchy = {
+    dependencies = ["addressable"];
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
-    };
-    dependencies = [
-      "addressable"
-    ];
-  };
-  "memoizable" = {
-    version = "0.4.2";
-    source = {
       type = "gem";
+    };
+    version = "2.4.3";
+  };
+  memoizable = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "multi_json" = {
-    version = "1.11.0";
-    source = {
       type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
     };
+    version = "0.4.2";
   };
-  "multipart-post" = {
-    version = "2.0.0";
+  multipart-post = {
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-    };
-  };
-  "naught" = {
-    version = "1.0.0";
-    source = {
       type = "gem";
-      sha256 = "04m6hh63c96kcnzwy5mpl826yn6sm465zz1z87mmsig86gqi1izd";
     };
+    version = "2.0.0";
   };
-  "oauth" = {
-    version = "0.4.7";
+  naught = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg";
       type = "gem";
-      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
     };
+    version = "1.1.0";
   };
-  "retryable" = {
-    version = "2.0.1";
+  oauth = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
       type = "gem";
-      sha256 = "0wg4vh76cmhwzwrgd0k6kbx4dlp4r98l8yizr72lmzph187dg48f";
     };
+    version = "0.5.4";
   };
-  "simple_oauth" = {
-    version = "0.3.1";
+  public_suffix = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
       type = "gem";
+    };
+    version = "3.0.2";
+  };
+  retryable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  simple_oauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l";
-    };
-  };
-  "t" = {
-    version = "2.9.0";
-    source = {
       type = "gem";
-      sha256 = "0qdsyblnnan2wcvql2mzg10jaj3gfv5pbfac54b1y7qkr56dc4dv";
     };
-    dependencies = [
-      "geokit"
-      "htmlentities"
-      "launchy"
-      "oauth"
-      "retryable"
-      "thor"
-      "twitter"
-    ];
+    version = "0.3.1";
   };
-  "thor" = {
-    version = "0.19.1";
+  t = {
+    dependencies = ["geokit" "htmlentities" "launchy" "oauth" "retryable" "thor" "twitter"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qj5zqc819yiscqbyb93alxillyli5ajvrr4gzq52clgkvyap7bd";
       type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
     };
+    version = "3.1.0";
   };
-  "thread_safe" = {
-    version = "0.3.5";
+  thor = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
       type = "gem";
-      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
     };
+    version = "0.20.0";
   };
-  "twitter" = {
-    version = "5.14.0";
+  thread_safe = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
       type = "gem";
-      sha256 = "0vx7x3fmwgk3axqyw9hyf6yh99kx3ssdy14w2686hz7c4v3qwlc5";
     };
-    dependencies = [
-      "addressable"
-      "buftok"
-      "equalizer"
-      "faraday"
-      "http"
-      "http_parser.rb"
-      "json"
-      "memoizable"
-      "naught"
-      "simple_oauth"
-    ];
+    version = "0.3.6";
+  };
+  twitter = {
+    dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjyz3viabz3xs5d9aad18zgdbhfwm51jsnzigc8kxk77p1x58n5";
+      type = "gem";
+    };
+    version = "6.2.0";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
+      type = "gem";
+    };
+    version = "0.0.7.5";
   };
 }
\ No newline at end of file

From a2c37c0700cdc014c95cdd588e672e9944c8d163 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Mar 2018 20:05:00 +0200
Subject: [PATCH 1928/2266] riscv-pk: Set correct platforms

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

diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix
index b605b9715d4..d4705dd9dd7 100644
--- a/pkgs/misc/riscv-pk/default.nix
+++ b/pkgs/misc/riscv-pk/default.nix
@@ -36,6 +36,7 @@ in stdenv.mkDerivation {
     description = "RISC-V Proxy Kernel and Bootloader.";
     homepage = https://github.com/riscv/riscv-pk;
     license = stdenv.lib.licenses.bsd3;
+    platforms = [ "riscv-linux" ];
     maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }

From ba70ba828f656a1a48f02f5dfd620a67cbe32454 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 24 Mar 2018 03:12:42 +0900
Subject: [PATCH 1929/2266] thunderbird-bin: 52.6.0 -> 52.7.0

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 0ae1777a839..24b16744ff6 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.6.0";
+  version = "52.7.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ar/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "fa4cc97701d7a44e2256149497a72a7057f3b677163b85029a9721fa03b4b518fa8c3564ad727824faf3c81242bc7dfe673f7fbbe1bb2b92aea16b779df8d6f5";
+      sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ast/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f40ae6c5f72ad797b42c6ada1302eebf63b649bfa2d5838cea7371ad92de8e1eaaa79cd115993d96dd873bca996b12fb20c8f4f40ee4db144cc2bbd5a27ef182";
+      sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/be/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "768453738bda8b0040d3b4cb21b1695dacaa54cacac5ec3130d5e4ebeea4e0ad8303ff2860fe5cfe5915df951aabe2f8a069b979abdc8ab8eb161811d93a8558";
+      sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bg/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "dbe67671831f90f739a7af794578270f1177ce7e54727c78e6b74d6bc400ca3cff2ed4174b5b38b73ad1ebab0d9d0df34fd6e3ee769cf96e99f4fd84ff69d018";
+      sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bn-BD/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "4d7aa1a03c1ec122150611270502fc209406703f0081e4e6ed212d07b327adc67c49db2891b1b62799c48218935200c5f671615a159a900f4d838250ab578798";
+      sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/br/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "9e229670bb1a4263a1922b5c4d6329209d95aed8f92264977c8c9d1de81c89440666602fad19b686fe214e8847e305d531046fc00a77347393d3d38be31f7f1e";
+      sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ca/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "0a905562d18452535a6cc05b945467e40c4ab8dd80d13ea07de293e02477cf5ac1c49546213e236f8266aaccc923ed261f1702b38289f2e165d818bb7e55b218";
+      sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cs/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3a2417f8b8396e0bd9c1b900f1547ea631683d35cf1e089698641dfd62672824a5594c8bae1ceed6d9fa4adb646da1b027a3c0378687b86ecd2351e4db227d22";
+      sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cy/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "6f705e71057c5f4016ffc60ffd0dc114f462785eb139da474412fd6164c761d89f7faf08ffdc93cc746b0d3df1b57024d69c20303d867bb3ffdd2739869bc075";
+      sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/da/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4f981281b63ed48e58bee4b7702389dca2bf5497cc74e8603945b25c7ce18e73b7b0ec006df8e48ea5ca8d57c6b874e7cbdeb2f43e214cbb0b99cc7983556790";
+      sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/de/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "4553f9b771e4ee907e2e379eb87ac62143df34cd3777e8dadd74b46839c6cb79f8fec87b4bd48fefdd21a4837611637897232895278ef3bb0337f816c37ce685";
+      sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/dsb/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "cfb64b6eddcbe54a701c5bca339225bec63e96dc2b1d3d2e358b32820239a970913415e8248ed8852be77d1e64741ab4746476e51a1fb9e9d6510cd6eabcfcb4";
+      sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/el/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4761f016a202abfafd3d249ccca8d05b8697645eb820cb45b1567476cd806c49e9a13d9c5ff28df5c226e1f787abd698cbc610df28e03b5f0d70ad43b90a0ae4";
+      sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-GB/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "a310e79e4da7a79a0c9d48db19b68e197fa71e4ff3d3b1c1178206ff0bbe883623d97ded1268a8512f370dbb232b8534e503d42bb6fc70583b78e78deb27fcd5";
+      sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-US/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "10c1147b8509876d3b278df8d362cfb3279086d51ad40de1ffc8814878ba28b051940b347b4ca1a67bad8090ba488426403b219b2add070b704fac200ad4c283";
+      sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-AR/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "77753858bcba266c6ea44f12eefc5a8fd1b6a7ef39b2e778e01490ff290046415e6a75a56a104dae12b1a6cfc69b179d13f6cf5b80ef20e8120864b7e9447d1f";
+      sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-ES/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "f9228ef15899197a8defc67cfa8f51e17aa3f2e5b1e8b79cef8b221a012e47b74d5a91dc82ba1a53e97f1518b4d60f08220f870427751c9ee1c477600cfb3a38";
+      sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/et/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "37cdd026fe48f84b19adf63c6bb642fd2efa72a95125fbf5e2761623c920549c045589dc53892a828bc759630e8cfd1afad5825af7d51d6c7c5fc495e450f401";
+      sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/eu/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4827d5f30c5a9bda1aaf5836250d43b41d38d2f882cae61a097c5ae753a7d429a7486d8a47991173ebea15bb70cfdd6b1d4ee4c1e7696b41e9e047786f320b0f";
+      sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fi/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9e40fdfa10cfb24e4983834d72c831b5e94d8a05e51e45e989564c558af6d5c91710da1a63f5a21042da2cca9a4b310a52c1c212db02bcbe77d5579ba600d9fc";
+      sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "362d689566ac6ad74adcbccb188ca958af5d308090cc13f268be8608f4b20917ed0b1ccc33fd344b6b4434ed2a8a62c212cc25dc85f52f7ab20e0355df06a370";
+      sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fy-NL/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "90b553cf697bc488e7f91eca2b9fceda94da72d49ff561af9a2f59dbe830a1ea29a49c9be8c544e1c83503a1902076a2badd7b35656372a18899f579d9455de6";
+      sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ga-IE/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "8fa91ed0e71961e0850f6acd69ffec0876e4b8f72d19b170429c10bd00681095bf816f7c028afa2f01eb5c32f27b6f8272b1a1e3340bdc87ccc9477bb100fbf1";
+      sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gd/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "8653c7664694898222e1dc292bdc244a6a2bc900b240a7fed30ea5cce47e7fc5524afe7b67795d15f0eafb250a5218ae5f8fa8236b7c6e91e15c3c74808a798c";
+      sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "22e5454c0af357e030dda5a84347eb154524d0337fae6389102ffb0073ff33997dacac9b40dede462f55ea30c1bb4da65cc8e272271611f42ddd80b5ab9dae05";
+      sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/he/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "51bddbb2a254849b6dcbfaf1f2faae13454bbb71472c7c95d279b5f83a6b29b1b063d904f02f13295fa32e6b33867856341994db9a2201d8f358b006c0c7752b";
+      sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "a08e2a71ac92e317944f09b2f03bbcfc32122493ebc0800534b6f3c714d4af0c431caf97be1818bc284826b88f08db3e4392f0c2b89ac7adba587f2f450cf804";
+      sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hsb/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "9539a6c48e60c4c773b735afa6ee544ceceffdca76ceeedd90973145f7deb23f2e449901cdc75190b5bd510537e70fd948775dc66caef8a7b95fc31843cbdb66";
+      sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hu/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d4d0fca22d430ec037bdf5cf8ccbce99df3cab22e4e6a2c3fb040cd1db960903e503ff2c8f633aa1f037a590b0a48134d949c1c4899de429a0533175fbb4a61b";
+      sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hy-AM/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "362ddd92ceec22ac93d95d721c1806ff0270fccf33f0cc4452ee147b3388f071b6d5aa27a0e7548a35a50453d55be2532d7fde19be611b9f0ecd741b5de59e1f";
+      sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/id/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "29ba391bbd9b8984850f056d856bcf90c0ac816fb8b831416e5a96f36e9b2dd0517cb5f1caf37998f75f024f3fbdd3b989ca6d4973ded22cbd15568a7b249531";
+      sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/is/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2303d0d74e112bc4f86e6d73fb63fabe8f10aa3486a9d2f61fe16b0b0525bc7b6091c94e27f0ccb548b47bf808c937b83a4609c5c0cd0bd0fc6556c18dc08661";
+      sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/it/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d3d9e95728063bd4e4742619c8ec27d4a0cdc34941ef8e6e3af71f19d59b4db6661366a81f1df7fd1de3a2ce995a1232f39744a825493a0c456d5257d02f7cf0";
+      sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ja/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "1d64a298e5b0ec9eaac8f8972ae975a98a5bcbc4823abd59a6cbab251ddcb5ba76263bdae0b55dac15455d8b7d9c8bda71cc54ea0fe67aea5efa5552973be94b";
+      sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/kab/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "1b351b01ea540b809cad198912853b3f74bc9cb52c33b7fe4ab586f921ea4a2486f28e855d2be95398af6abad2911c5fd3f0ab16938edea85596689799b452b1";
+      sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ko/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d9895da7e3099c5d9389308ae6982a77387cd7d61c07ec16e4511c00fc3b18bd025b95c6f05a94cd5e990eb9472816bd4af0a1bbe3605561f2bfe2b9f9b207e8";
+      sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/lt/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8791ae3c0ee4745449b1690f69de0665f7854288188f1570e4c876b1f936e790d651bb1f9ecfcfe99f01f49026d534e667f262c72290894368579313b8a59615";
+      sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nb-NO/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "be2e537c4dabfc6070f180205787712317ea3bf1befebb5d99d0be562aac60f728635ab665b6813776d985ff5c5d10e72658dbe20c6441722113ca8f9cf00553";
+      sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "20bc3bd3105880541b2dae20b703191cdb499dc7778fe874da5ae9b0b1626d72075631e256bc0c2fee1c4d1d27424cc6168c419afa8bec8a00d5904ae0678f12";
+      sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nn-NO/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "2437751b998ee2898bbb8f8187adcbd102d29fc54054fb04efef2e0f7f308c864215bb8468ac42975bbd18c6e4a0c8903e5784a4d203df3643029cff696c2540";
+      sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pa-IN/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "925ffbbd7d9e301c52b60963bced66af8b97a7b24275d73ca923f0d757164faf4ba7c69003286d74a69f1ed328e94347ba63c6ca7e13f47f42b7529af9de5ee6";
+      sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "27dfc79cfcfaea36ee50b2249e8e2a5195e9dd2f755b0f9d3274af2e4cb3d0d5214a4065e08678bbfcae4b51f0a0c2c4b4385c2a199a5b65035ac895de08bd63";
+      sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-BR/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "b600e2e3dc931ba2db5e4bf36187f971c7c1c710f8535d59c999a9685f551454a6e39f80cf70374aeac41ddace2f80fbe68bcda1675b80c5cc39dd8fccf7625f";
+      sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-PT/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "3ca5ed7c487ca11ef2fc743e8a66eeaa05d2585d2fab0ca40b0d965e10e43d1216de358eb61921578fcdc72b69766f8fe24beb3c548ed47c705ab84a30941c34";
+      sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/rm/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "2d9e51a01175549c712c5bd1e95e08012ed9494a0f6fa5ffec8ee1c311279a6826cee99488a72d86f2cd98d9d9d6d20ef886bd4f69d100a2b589ef8dfc887335";
+      sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ro/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "8cfd1503ef3f4a9b4765d6c3fcc3a44aaa2fa557fc2a698452d10b037fdfcca09c462b455c4088b69aa89c153f14b1621d3c87c942a7bbb4627f95bbf0a37738";
+      sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ru/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "74d611abaa10d04be342139e19b7f724516a91de07a5f4ae4c4cd3ad927accb5e6668830040defa20878ec1fc884bc983d084729ebcd1fd453c7082a627329ec";
+      sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/si/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "292b5da1ea566ebeae2756b659b1f2ad40a4dc57517da926b3f8263a219e734d197d9aa55ce91582bd8818e0434d2a6b3bc40892d0cbd4715fcac50e3aebf7f3";
+      sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sk/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "a5f6466d7ff0ceed4fa25c446925e398cd91c29d705ea1e28166bec09834b1f3ac61722823828d97d17b1ce7ac2e67aa98c3d5d94806b7a470d29c5722f37d9b";
+      sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9167d416f7552b55f8551146a3073757bea4106fea2004ad4303809f0532b85d37fea449ed09f0d162cbda2f429d869b90b5ef14f29784f418c63085a7c9b5b1";
+      sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sq/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "aceb16a89f40243f56611d726a47b15bc6b0e5c1177a4beda6b147749299640742dd9d5f64384e88f4fc065c5f5ab80a7456a81ed63331a99a60e1e2e8b76a08";
+      sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c0cefc58703c51d169686bb6c25477ea3116fc9691e0bf971d2a141ee8e93e4e1853911189c2b49d331d8b04c70e3c154083a05179c93a22b043a70918808ba3";
+      sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sv-SE/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "179429292f73320f33d3cfbdd4b55b65117c8b8f60abadbf8c28537ab1e6e7664f7e2fa1b20ecdb201d7d535a9974638a7c22c2f5ba0fabea580509bd35d2a3e";
+      sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ta-LK/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "ccc1e3b1ca1e2a762c840c5e52b33cb3c05b75195576e95f7d28abe53aa6438d83eb185664797be9a0726f51416b4cc70877a4d6e01282d426459820eac59b01";
+      sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/tr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "55b14f94b1824df5e05d8c8f8c1a86a3d9667123dfb7b86723888ffeab93b8b0ed8dde082c3db0ee33446052e81b6f282e4ac3ae9a2a51ef25e01c6ffc93ad1d";
+      sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/uk/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "94047ef1efc45fcd228012a8833ca1d6d5540ba0549a5f598ca420564e85dd0bfe4995968ba241d57b588db542f6c33445459c77b40eb3b568f66d3ef8e4e91b";
+      sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/vi/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "f30ab0cc3b6d4322d9d65150da1b247db12305f8a39acef383048118f30a757ca380134f0f12c238432a23f5d70d173e53e24f46af158ccdcf5eac516267840c";
+      sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-CN/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "4dd0923c8258dec6de71aad216dffb2945852f2d6ad20e104599a43a13e7c48bdaaa70a7afb35e3699bbaffc9a69623d6d24e299f1a0e75f604ba9bad96647ea";
+      sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-TW/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "39264550d88ad4fbc247b9bb61015b2c0a9e75ffc19ec34e1d7053995e2fcfd65721140f2f4486fe959e67484c6ca6305e997c77b59b98e60e9e979c60e320f7";
+      sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ar/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "b801148b9eccf4425710ff3c5430795d873448ee068dec8e8343ec9094d8c04e317dd0cf6e2d3b69029459d980b841470365441e26d8f71503d9c6f03a52d0fa";
+      sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ast/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "7368be5dab56f03635d3bc06f1d1871893dd8a694388baa90a44cef5f88717a705daeb2230dae8c2bfaf8b40e1f7987aeefc729b4e77ec1055726b0944276c79";
+      sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/be/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a39137149f5800b5ea612382b86840b095fd09e38d06ffaeb4a2f5e242b47cac828ffb87c9870a9ebc75b9bd26b0499c2899d5b778267dc6842d21afaab0e7bf";
+      sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bg/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "2314afbb259a561e98bffe3d30aaac571b8f7f54de2246af78a012fcbee19fda15c8a921221ebea738fb09be07a1139f5edc14f1f9f55945a63e08c625a6bf52";
+      sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bn-BD/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "e8cd137f04521293ea60c8f8557b4482baf1d7936c9fca1ea7426ea8a99cae48f3e441a81cf1a779034595eb755009db512f29d31c8ada11391cea0f3962d61d";
+      sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/br/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "0715d8eda4c144c35b5583bdce6eac058788b761949bcb79f156ba4931c380e33f7810fed55e283e02c5af2d555df471c48383d1ace21da7f88c3b0a8e97213b";
+      sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ca/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "21ec148ddfef69ead9f1b367dce4d6a93a7f1d31fb691035d40132cd4955a66f162a44f0e5b0caaae8cfdb76b0842cd78a630cb6a7949e839611d98d58776a47";
+      sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cs/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f2c7c86db91332b9f38ab4ae732ca44c7f7bfa32e3b8123f7ba9662fe9f74b9f01a58ca63a9954b45aad05272baca385797679103c29a95dcf248fe8cdac5a53";
+      sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cy/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "f0bdfa8373fc87faa567720c4c998f08ba836f8c26a59e38e92bd641e7efd42010530575bdfe1fa7bc78b7688380eafc274b8954f2a59e60912713afacd42789";
+      sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/da/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "80dc629b815c4ec98026f0ee5c2b7f754bc9bf0e5d026775866f502ca55b826ce071470a8713ae98089bf2208e5b0d0771a20307db5351b4af78169bd8efc1ee";
+      sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/de/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "bd66cf808f3d5ba73dfb0d314050c5d4ddc59966abc84e904cde2dd73c20086dcbd580c1a0bff4d1dee7ae940e38a53b9a37ed75e05758ff9da799f2ae1f7aab";
+      sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/dsb/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "58e50c2d6c2d42fcd34273ead868753373e054602ab1ea7e9ea9d5ed15b8ae15e6b654fe81b6a56942f1cd4eb3778d11897fc2b9e34e789aff7d83b47bd3c100";
+      sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/el/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "40888eca974a5e9dab7459c790b7e589906da72ca9ea64fa690225d876310239faeff8925366b5fc559a5793efcac01696f22886c9ecbd5dfad5661083b8e63d";
+      sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-GB/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5a418b8f6b857a4554cddb81b36b5f4885ba694ff08b3b5f3c342491637587719578738eac9abee2735e8d0fa1ab216ee9bb5cce67955c4b7c30c3a063b95477";
+      sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-US/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "628a5f50871bf44c59e1d8983f520d5ede9f22bff15eb4b03673dc6d4b0f72c84247a5e29ba67e871be449825dde8090a6e9a50501e434bbc17d86aeb846e1cf";
+      sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-AR/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "595419a4c26c8974ada3e9856dcabe863666133a98d5730a1a295f1edc414d1d0b3a159afc94bd927c934d44e9b4ed4282d4211948bcbe8b6d744948e7b48e02";
+      sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-ES/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "898a14402ab621fb81b563c039db3ae343173cb39872ca6a2985f6a279af7ffaca404af179cef3adb48285b05e24b372c1e8a1918557280ecd10a4368b540f27";
+      sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/et/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "b2ce107034b87b9e4459add9e1d6777e58f52465f81720d1a6276dbe0c341c92984fa9979ec8da0544f4699cf98a097098ed14759c38e47a0f9ea4aba6916907";
+      sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/eu/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "a401cb39dd18e83cbe64de9c527ce4d72a951f32c5150a88bb509487f3ed4364624354a6571d41ee18f1061841cfe9bb704bf355893fab6cc44d94f660a5e0b7";
+      sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fi/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d87a4ff14023c2a20241a920d2fac288d76124ba3734ffcae664cbf46ba3a3d54fe42979c243e6ae231f7b5aa54dfe9c82ad87f3839714aa8a21409a6e87221d";
+      sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "5bd14acb63b044b2aa6f2f75fc365b6d65012a504ac3735cd2d72097b65aa61662007e06857f7288329c39517af01e694d19be5498bf4b718fb9b2510c8ed313";
+      sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fy-NL/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "13baa3c5bf0c24474f6f31291b54ff9c846bc3a6056bf43a74f3e5ad4919879adeadfe583151f55cc721e8aaa0b9011cc8e9c3a402d2fc363b4b2ab97f5aef76";
+      sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ga-IE/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "632cc17bb0e9a5ee4e651cde51f71eb6efb6eac35297126ca3c7397e4bbd407f583b70a2aa5cdb4345276b493f3d8161cd376a443b37be3ba6b2782b7d6a534b";
+      sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gd/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "03b3f6ab1fa5edd9f4c37f1d2ed9ba7a34e4b3d714bdf238f7e4ed8e8c65c432fff5a2815a1993ac8f221a997dab2b0ee22dea46d5a8b566bad35ae1cc9a4f46";
+      sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "36398fa1d04ee096c1e2fa1420ca375dc7ff135ff63343e20c916b6ecb03b2adc6e30d26e66ee6ab38cd816d928e8c628a55bb3f6cf921bf7691b6092700200b";
+      sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/he/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f819c1bc97298445f3d3d5ef91470a7ff370a5db5e4884e8c2590e06bbfbf9a33c7d1cb9919379a6aa654e47f49b6f9e127584eeb29cb14f2e73efc01d4f8ee7";
+      sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "bdebf02084d98a6279c27d914935e4e8486d86cb27475e99983ab0cd8166f78c82b6815528f7afc10e6aae8f0859c393f6f42b7d1a081925b1fe2053f309052f";
+      sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hsb/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "b0db8f59739e0ead2d0ec64bf00f6b62854b2b55b34db04e31c27db14b3b67e6af3bc9d857fb528e4e6115e3e1f2da75b685b17a33cf9ea976cca7ef5ebecb56";
+      sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hu/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "10ca02217736663a1fb44e20430bf2ac3a76fb5f87e57e539361ba12361c2f79aa3892fac02c4365890c6506eb86bde8fc955dd126eeddefb7b27813050d1861";
+      sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hy-AM/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "a0240daee40e6d8cd76d81bfbc4bd47052f9e20a00b8c687806633eb72e16d9393a6005c16f5391d2caa5a55fb7e0b7e12d1097fe140d6fd664e3ca40358b597";
+      sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/id/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "4450789df3c0176cde9adac0f8b075ca64690c0278b6da9de4040faefa35a9c915de1daec1e1b1ccae2d80c8d55f664c8535d9cc31ade68ef8081fc3f102e992";
+      sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/is/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9ad56f873a0138d55a34b6058681c9edb185734c3b358aa1ffd91161403cba5fa0a2d02d858fe45ebbb2e991c0a8da1bfcb6516c9836e26a3aec7e2160f292a4";
+      sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/it/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "242f2c9b2a7821bbd6601f4aeccbfe8f9c31556a061c0200b1139ce28c613c3781fa0ece4c9674c19a2283f647b2804820f29e26cba9ecfdc53a6b05964e2762";
+      sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ja/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "1686f8cfc156744f2e9c02afa19ca00ac29db0e6f9b07900aae9b068928ff30431350ddb75824918df5a64e076d88b312f1055b74db44ec7cb909d505d2c013d";
+      sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/kab/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cadfcf6a02732831411f180d0363d3c3cb08e31d7d108b5f55d14bb75b6c48a744b40ec2a964f659904fde4c5e82ea8b89651db55406e5327db41c6f15f74416";
+      sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ko/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "4b4e6bc229049210695536a0e12d685995bf439ab8b2b7879142c93cc749882ed79b98063fabd4df97503e771f585cbfc1590b2a3815a6121a7e43417addaaad";
+      sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/lt/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "5d73c90f57e50500debfccb555183cb616ac9d893a19ee29fe22f4823085bd62aea156fd5c0f0f6ff49291636c4d90af253096416aeb87982da5455bf548a40b";
+      sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nb-NO/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "0adf9e6b10010ea5cce216a510e53fc5dc9c2066eceacf3c3c6bda7526b3bfef1083b130c08432dc59f09e02e19f0c4a5b885cb43627771aec00d78828377eb6";
+      sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "372e39c33a78e70d628fc1bc1a9719b3d902d67eead4e47091b40913a4aa76dac63db003cae8113f7d194cc6fd24cad13c4e87aefd1d6bf425434835c983ca7a";
+      sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nn-NO/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "1c66f021fbdf85e1aaed26e5a6d3abcbc9d71e91126bca10a6f8b62b10abf3927a44ae559136478fd9628dfe3409c4edd83f3336302c84fb0b6be6d4031dbb3a";
+      sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pa-IN/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "aba5a6804f08eb303e71aba94b11116f253dd19dd31e10c05ad5469800378ffef678a90a8a33db2da516bb55ea2d1d1b5537c3c11ff9132ce9ce890fb4e8e413";
+      sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "19559239283420bac401dfefec812bbc18d33483380c44f217b70d9412b3d93f9ab3c2f5d9d518191fd891316e9ccb5b21f901676026f7ad2414a4541d584f98";
+      sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-BR/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "64ada0291a3da9713eb81cd05ddbcddd70379bf07a14e019580bbb7b5fea4976ad7aeae87a651da070139e975bb52f66271ed3124eeada4d6a90f4afed948d3f";
+      sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-PT/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ce57a764ee2a529d7e37b6d620cf7c3825f7af1cc04da0502d64d2a7fb577a27a171a4f5d589c3f5e738192241776be4119d45958b2d77fbe3ae4f82279ab380";
+      sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/rm/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "04bc57c8360be5917fe2e05b6b672fab614ea5a6ff150c83242ee20e89756f2f24afa096249fad5f2795c47e570815281bce70449385efc5e510c64204e5f7cb";
+      sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ro/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "86c790e5b3faeface66d001ea9e56006ac2955883337204e5f79764cdf74860df210688f8467c9f7b0051c9efd5cdbc5c98b615656155b99361bbba656254a47";
+      sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ru/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "cbf316a94b64d02ee83fdafddbb60daac5157ea11c57889703bde88e3c4baec720dde515e9864f021cbb39e6945a33ccf909623fda0abe542e07b11eab8154d4";
+      sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/si/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "cf0dddbe01bddd623ce5052f0a72dee9da4eb5de1932d0a0a656baba55c79eaec51387e37f74c1a1a754ee71def8c972af5dda5a5bf9e78c19a2c11c1cc42e57";
+      sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sk/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "5c70a7e8a47e44a47eac2d00526c4c8da340121c1fc8c136b3b40cbe0809548e9cde6d6dc76d1ad679d7bdedefdaf3fc373b2c124cca6b36a9cdb9f4e6da939a";
+      sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sl/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "9bbaf000fd2c1fe28f0f64c31c7736a2595399788498ae8be8fdac8dabc709efeacd8fb1f6ae8a095c130ff7620e1b7c6e909959b9c724b7bde736049664357c";
+      sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sq/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6f8d71fa87777b11f5ebf14c6811ce9a0c2c380db5b7f3fe774219cc60bea6d4f59de8a3dd193d855725c3a0e5470b36dc0538f94539d637be14de5d8e480c7b";
+      sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "0bbcd2a98f767a8836d054a97c797a0ea7eac5c08fed9177189474e47e8dc50d395735c0eaf8c6e839ac608084c6e533a3b20fda5e69ad74ada53636f1181359";
+      sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sv-SE/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "22cc597657e44124162a6b8693022bd4086e3b4e0f9e42342c997bd333e1182163f0ca0c67d91cbb5e18c45605c877eb69d00372c86a9378ed2e7846547f3964";
+      sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ta-LK/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "902832bf66b2efd39cf038e9361bf0ee8f9682e73a42895ccf6bb637eeabb8d4d5e8b3b3d28bfa52e537ad1babee6bbb8d033c538a61880920ace6a4a7cadf95";
+      sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/tr/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "70dbb015aa4acf35d5cba0e9d8916bed2603c7e44574c98e98e56edfb68db3ab572402fda5c809d838c51a2e3f135cd3b86f2dde44acd2e1ae2f12cecc276655";
+      sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/uk/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "9fd85a4f4366caea3409cca47df70d2f028c7d85c248ebbe5e7e92005d98d45947639fae2aac8a145e4cad12cc92e368b9f86de4623a7d1a35e0485fb35cff97";
+      sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/vi/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "205b22a39b795946f019cbb9e8c1813a0ca9f59551c9ea30c661fbe43bbf1d87069dd3992e71c83226b2559cdb4db2186b37120c847367b6a4e1b16aba24510f";
+      sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-CN/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d1a9247b1db70ddba4f0cf80af7b8606e6bf006b31d3e771a4047dd7ccd121114bab900c38c02f36c4b60636caae75047f153bafd06aacf1b546c3d8af01806a";
+      sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-TW/thunderbird-52.6.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a92b42e7e1869ad91d8343072d508df6bb8e67ddf7d929d4911457c5bba04fc1ec7d3218685954a4ded7ecf819bfbef975813fb2bbb9d1da60444b83f1f0fdb9";
+      sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730";
     }
     ];
 }

From d0489107c989528546e7d09adc6604d3a4e43104 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 24 Mar 2018 03:12:49 +0900
Subject: [PATCH 1930/2266] thunderbird: 52.6.0 -> 52.7.0

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index f59202920cc..1bf37edf1af 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.6.0";
+  version = "52.7.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0";
+    sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21";
   };
 
   # New sed no longer tolerates this mistake.

From d2d859d5c54db6c0008ab01d0e56d5300f592c10 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 21 Mar 2018 11:45:05 +0900
Subject: [PATCH 1931/2266] oraclejdk: add version 10

---
 .../compilers/oraclejdk/jdk10-linux.nix       | 158 ++++++++++++++++++
 .../compilers/oraclejdk/jdk9-linux.nix        |   2 +-
 pkgs/top-level/all-packages.nix               |  10 ++
 3 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/oraclejdk/jdk10-linux.nix

diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
new file mode 100644
index 00000000000..1d06f122b23
--- /dev/null
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -0,0 +1,158 @@
+{ swingSupport ? true
+, stdenv
+, requireFile
+, makeWrapper
+, unzip
+, file
+, xorg ? null
+, packageType ? "JDK" # JDK, JRE, or ServerJRE
+, pluginSupport ? true
+, glib
+, libxml2
+, ffmpeg_2
+, libxslt
+, libGL
+, freetype
+, fontconfig
+, gtk2
+, pango
+, cairo
+, alsaLib
+, atk
+, gdk_pixbuf
+, zlib
+, elfutils
+, setJavaClassPath
+}:
+
+assert stdenv.system == "x86_64-linux";
+assert swingSupport -> xorg != null;
+
+let
+  version = "10";
+
+  downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
+
+  rSubPaths = [
+    "lib/jli"
+    "lib/server"
+    "lib"
+  ];
+
+in
+
+let result = stdenv.mkDerivation rec {
+  name = if packageType == "JDK"       then "oraclejdk-${version}"
+    else if packageType == "JRE"       then "oraclejre-${version}"
+    else if packageType == "ServerJRE" then "oracleserverjre-${version}"
+    else abort "unknown package Type ${packageType}";
+
+  src =
+    if packageType == "JDK" then
+      requireFile {
+        name = "jdk-${version}_linux-x64_bin.tar.gz";
+        url =  "${downloadUrlBase}/jdk10-downloads-4416644.html";
+        sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c";
+      }
+    else if packageType == "JRE" then
+      requireFile {
+        name = "jre-${version}_linux-x64_bin.tar.gz";
+        url = "${downloadUrlBase}/jre10-downloads-4417026.html";
+        sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w";
+      }
+    else if packageType == "ServerJRE" then
+      requireFile {
+        name = "serverjre-${version}_linux-x64_bin.tar.gz";
+        url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
+        sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw";
+      }
+    else abort "unknown package Type ${packageType}";
+
+  nativeBuildInputs = [ file ];
+
+  buildInputs = [ makeWrapper ];
+
+  # See: https://github.com/NixOS/patchelf/issues/10
+  dontStrip = 1;
+
+  installPhase = ''
+    cd ..
+
+    # Set PaX markings
+    exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+    for file in $exes; do
+      paxmark m "$file"
+      # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
+    done
+
+    mv $sourceRoot $out
+
+    shopt -s extglob
+    for file in $out/*
+    do
+      if test -f $file ; then
+        rm $file
+      fi
+    done
+
+    if test -z "$pluginSupport"; then
+      rm -f $out/bin/javaws
+    fi
+
+    mkdir $out/lib/plugins
+    ln -s $out/lib/libnpjp2.so $out/lib/plugins
+
+    # for backward compatibility
+    ln -s $out $out/jre
+
+    mkdir -p $out/nix-support
+    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
+
+    # Set JAVA_HOME automatically.
+    cat <<EOF >> $out/nix-support/setup-hook
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    EOF
+  '';
+
+  postFixup = ''
+    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
+
+    # set all the dynamic linkers
+    find $out -type f -perm -0100 \
+        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+
+    # Oracle Java Mission Control needs to know where libgtk-x11 and related is
+    if test -x $out/bin/jmc; then
+      wrapProgram "$out/bin/jmc" \
+          --suffix-each LD_LIBRARY_PATH ':' "$rpath"
+    fi
+  '';
+
+  /**
+   * libXt is only needed on amd64
+   */
+  libraries =
+    [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
+    (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
+
+  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+
+  passthru.mozillaPlugin = "/lib/plugins";
+
+  passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
+
+  passthru.home = result;
+
+  # for backward compatibility
+  passthru.architecture = "";
+
+  meta = with stdenv.lib; {
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+  };
+
+}; in result
diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
index 87f2e49b443..df0e295c3ed 100644
--- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
@@ -155,4 +155,4 @@ let result = stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
   };
 
-}; in result
+}; in stdenv.lib.warn "Oracle JDK/JRE 9 is not updated anymore. Use 10." result
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85fbb8894ec..1c815c2be5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6426,6 +6426,8 @@ with pkgs;
 
   oraclejdk9 = pkgs.oraclejdk9distro "JDK" false;
 
+  oraclejdk10 = pkgs.oraclejdk10distro "JDK" false;
+
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
@@ -6434,8 +6436,12 @@ with pkgs;
 
   oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false);
 
+  oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false);
+
   oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false);
 
+  oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false);
+
   jrePlugin = jre8Plugin;
 
   jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -6454,6 +6460,10 @@ with pkgs;
     (if pluginSupport then appendToName "with-plugin" else x: x)
       (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; });
 
+  oraclejdk10distro = packageType: pluginSupport:
+    (if pluginSupport then appendToName "with-plugin" else x: x)
+      (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; });
+
   jikes = callPackage ../development/compilers/jikes { };
 
   julia_04 = callPackage ../development/compilers/julia {

From f330b48b64680fed4666911ad6f899534d19704b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 22 Mar 2018 21:44:24 -0500
Subject: [PATCH 1932/2266] jhiccup: init at 2.0.8

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/java/jhiccup/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/java/jhiccup/default.nix

diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
new file mode 100644
index 00000000000..03aa841dc7b
--- /dev/null
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "jhiccup-${version}";
+  version = "2.0.8";
+
+  src = fetchzip {
+    url    = "https://www.azul.com/files/jHiccup-${version}-dist.zip";
+    sha256 = "1q4wd5ywisgh0f4ic7iglxai0gc8mnl1pkjw1hm1xdij8j5i488g";
+  };
+
+  configurePhase = ":";
+  buildPhase     = ":";
+  installPhase = ''
+    mkdir -p $out/bin $out/share/java
+    cp *.jar $out/share/java
+
+    # Fix version number (out of date at time of import), and path to
+    # jHiccup.jar
+    for x in ./jHiccup ./jHiccupLogProcessor; do
+      substituteInPlace $x \
+        --replace 'JHICCUP_Version=2.0.5' 'JHICCUP_Version=${version}' \
+        --replace '$INSTALLED_PATH' $out/share/java
+    done
+
+    mv jHiccup jHiccupLogProcessor $out/bin/
+  '';
+
+  meta = {
+    description = "Measure JVM application stalls and GC pauses";
+    homepage    = https://www.azul.com/jhiccup/;
+    license     = stdenv.lib.licenses.cc0;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c815c2be5e..6232fe35e2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8253,6 +8253,8 @@ with pkgs;
     inherit (gnu) mig;
   };
 
+  jhiccup = callPackage ../development/tools/java/jhiccup { };
+
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (darwin) xnu bootstrap_cmds cctools;
     llvm = llvm_39;

From 1800e4ec0be11c3b9b55028703ecd04d69e5e7e2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 23 Mar 2018 03:15:30 -0500
Subject: [PATCH 1933/2266] wrk2: init at 4.0.0-e0109df5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/wrk2/default.nix | 42 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/networking/wrk2/default.nix

diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix
new file mode 100644
index 00000000000..5caad0874f7
--- /dev/null
+++ b/pkgs/tools/networking/wrk2/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, luajit, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "wrk2-${version}";
+  version = "4.0.0-${builtins.substring 0 7 src.rev}";
+
+  src = fetchFromGitHub {
+    owner  = "giltene";
+    repo   = "wrk2";
+    rev    = "e0109df5b9de09251adb5f5848f223fbee2aa9f5";
+    sha256 = "1aqdwmgdd74wq73f1zp28yqj91gd6p6nf9nbdfibl7mlklbzvak8";
+  };
+
+  buildInputs = [ luajit openssl zlib ];
+
+  patchPhase = ''
+    rm -rf deps/luajit && mkdir deps/luajit
+
+    substituteInPlace ./Makefile \
+      --replace '-lluajit' '-lluajit-5.1' \
+      --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' \
+      --replace 'cd $(LDIR) && ./luajit' '${luajit}/bin/luajit' \
+      --replace 'config.h Makefile $(LDIR)/libluajit.a' 'config.h Makefile'
+
+    substituteInPlace ./src/script.c \
+      --replace 'struct luaL_reg ' 'struct luaL_Reg '
+  '';
+
+  configurePhase = ":";
+  installPhase = ''
+    mkdir -p $out/bin
+    mv ./wrk $out/bin/wrk2
+  '';
+
+  meta = {
+    description = "Constant throughput, correct latency recording variant of wrk";
+    homepage    = https://github.com/giltene/wrk2;
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6232fe35e2e..818ac794b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5564,6 +5564,8 @@ with pkgs;
 
   wrk = callPackage ../tools/networking/wrk { };
 
+  wrk2 = callPackage ../tools/networking/wrk2 { };
+
   wuzz = callPackage ../tools/networking/wuzz { };
 
   wv = callPackage ../tools/misc/wv { };

From a8eb2c9ef9e6fcd1f8bbc2ca6dcab7b613ef615a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Mar 2018 21:03:59 +0200
Subject: [PATCH 1934/2266] glslviewer: 1.2 -> 2018-01-31, fixes build

---
 pkgs/development/tools/glslviewer/default.nix | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index 7a28f86562f..fbae0a76f25 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -1,36 +1,46 @@
 { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
 , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
-, libX11, libGLU, Cocoa
+, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook
+, Cocoa
 }:
 
 stdenv.mkDerivation rec {
   name = "glslviewer-${version}";
-  version = "1.2";
+  version = "2018-01-31";
 
   src = fetchFromGitHub {
     owner = "patriciogonzalezvivo";
     repo = "glslViewer";
-    rev = version;
-    sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw";
+    rev = "cac40f6984dbeb638950744c9508aa88591fea6c";
+    sha256 = "1bykpp68hdxjlxvi1xicyb6822mz69q0adz24faaac372pls4bk0";
   };
 
+  nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ];
+  buildInputs = [
+    glfw libGLU glfw libXrandr libXdamage
+    libXext libXrender libXinerama libXcursor libXxf86vm
+    libXi libX11
+  ] ++ (with python2Packages; [ python setuptools wrapPython ])
+    ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+  pythonPath = with python2Packages; [ requests.dev ];
+
   # Makefile has /usr/local/bin hard-coded for 'make install'
   preConfigure = ''
     substituteInPlace Makefile \
         --replace '/usr/local' "$out" \
         --replace '/usr/bin/clang++' 'clang++'
+    substituteInPlace Makefile \
+        --replace 'python setup.py install' "python setup.py install --prefix=$out"
   '';
 
   preInstall = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $(toPythonPath "$out")
+    export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out")
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    glfw libGLU glfw libXrandr libXdamage
-    libXext libXrender libXinerama libXcursor libXxf86vm
-    libXi libX11
-  ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+  postInstall = ''
+    wrapPythonPrograms
+  '';
 
   meta = with stdenv.lib; {
     description = "Live GLSL coding renderer";

From 3de1fb68091352fbfc211d64a7ed1158f1086727 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 23 Mar 2018 12:50:25 -0700
Subject: [PATCH 1935/2266] osrm-backend: 5.15.0 -> 5.16.3 (#37072)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-extract -h` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-extract --help` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-extract -v` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-extract --version` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-partition -h` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-partition --help` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-partition -v` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-partition --version` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-customize -h` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-customize --help` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-customize -v` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-customize --version` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-contract -h` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-contract --help` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-contract -v` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-contract --version` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-datastore -h` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-datastore --help` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-datastore -v` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-datastore --version` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-routed -h` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-routed --help` got 0 exit code
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-routed -v` and found version 5.16.3
- ran `/nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3/bin/osrm-routed --version` and found version 5.16.3
- found 5.16.3 with grep in /nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3
- found 5.16.3 in filename of file in /nix/store/wbblcwq4la8pc5gmmwbzjr4zsq30dq8j-osrm-backend-5.16.3
---
 pkgs/servers/osrm-backend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8815ca3e210..c2ec4b9ff17 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.16.0";
+  version = "5.16.3";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "14vf0av63zizz1knjzhj34hxadxwcza2zakhaj6si3kb8zhihmaf";
+    sha256 = "0dmcp5s5kjnvdd7sn53sbjawfhiwjs30fr7iwi9h6ssz6188x0jp";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 9ff07f94bdb3ece6b28b1104e7f4c3260508f1b5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 23 Mar 2018 12:50:50 -0700
Subject: [PATCH 1936/2266] padthv1: 0.8.6 -> 0.9.0 (#37074)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.0 with grep in /nix/store/hwmra92c366yp6nk74clkyan2bx7hxym-padthv1-0.9.0
- found 0.9.0 in filename of file in /nix/store/hwmra92c366yp6nk74clkyan2bx7hxym-padthv1-0.9.0
---
 pkgs/applications/audio/padthv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 779374aaa08..5cecdc8187d 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "padthv1-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/padthv1/${name}.tar.gz";
-    sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq";
+    sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

From e6a3b5392d1bf2254c4cc7453dac3abd867c6e99 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 23 Mar 2018 12:51:12 -0700
Subject: [PATCH 1937/2266] osinfo-db: 20170813 -> 20180311 (#37071)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180311 with grep in /nix/store/2a26a2ic31kvg85krsqn5j1jnndhm70l-osinfo-db-20180311
- found 20180311 in filename of file in /nix/store/2a26a2ic31kvg85krsqn5j1jnndhm70l-osinfo-db-20180311
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index c38097abde9..bbcc55f9bc5 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20170813";
+  name = "osinfo-db-20180311";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "0v9i325aaflzj2y5780mj9b0jv5ysb1bn90bm3s4f2ck5n124ffw";
+    sha256 = "0pzm9vsr2f5943nlp2ljm19czcys5pvq6hjxh0ja2vx74pwhylb6";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From a5d2b1b3bf8472464dac8bf1b99321801272a854 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 18:40:03 -0700
Subject: [PATCH 1938/2266] alembic: 1.7.5 -> 1.7.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin/bin/abcls -h` got 0 exit code
- ran `/nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin/bin/abcls --help` got 0 exit code
- ran `/nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin/bin/abcls help` got 0 exit code
- ran `/nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin/bin/abctree -h` got 0 exit code
- ran `/nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin/bin/abctree --help` got 0 exit code
- ran `/nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin/bin/abcconvert --help` got 0 exit code
- found 1.7.6 with grep in /nix/store/lq17m55g4javshd8v5qlw3mmcpcy6zc4-alembic-1.7.6-bin
---
 pkgs/development/libraries/alembic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index bcf819702da..3d90eb36f3d 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   name = "alembic-${version}";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
     rev = "${version}";
-    sha256 = "1p5zd9kdwnrwg604bq79ianc5bw6mx6i5d7yc4r11xrbphlc9m1g";
+    sha256 = "0vz7pda7n50d490vv9i044xpi8rhrvs6qxcapwd49wzwrvkg67dk";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];

From 5f8c8e76a3a8e067ef2de6fb65d5bd1c2bb9654b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 13:54:27 -0700
Subject: [PATCH 1939/2266] znc: 1.6.5 -> 1.6.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6/bin/znc -h` got 0 exit code
- ran `/nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6/bin/znc --help` got 0 exit code
- ran `/nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6/bin/znc -v` and found version 1.6.6
- ran `/nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6/bin/znc --version` and found version 1.6.6
- ran `/nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6/bin/znc -h` and found version 1.6.6
- ran `/nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6/bin/znc --help` and found version 1.6.6
- found 1.6.6 with grep in /nix/store/z51kkm0wj1wv4bxkib8lv7nqizdly9jw-znc-1.6.6
---
 pkgs/applications/networking/znc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 88d1ae7fae1..b1e2258271b 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchurl {
     url = "http://znc.in/releases/archive/${name}.tar.gz";
-    sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig";
+    sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 88d2722d5f8512ed0624b0fa57dd73595bf61324 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 12:42:27 -0700
Subject: [PATCH 1940/2266] waf: 2.0.4 -> 2.0.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.6 with grep in /nix/store/5rgayqfl64bn9pyrfsc9kcm2c4vdqybi-waf-2.0.6
- found 2.0.6 in filename of file in /nix/store/5rgayqfl64bn9pyrfsc9kcm2c4vdqybi-waf-2.0.6
---
 pkgs/development/tools/build-managers/waf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 65501b2b935..000943f117f 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "waf-${version}";
-  version = "2.0.4";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "https://waf.io/waf-${version}.tar.bz2";
-    sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain";
+    sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q";
   };
 
   buildInputs = [ python2 ];

From 26f450f5f6947587b83bd484b3dc9090c319317e Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Thu, 15 Mar 2018 19:47:21 +0100
Subject: [PATCH 1941/2266] resilio-sync: 2.5.2 -> 2.5.12

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

diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 5e94106a48f..46de1d532dd 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -9,13 +9,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "resilio-sync-${version}";
-  version = "2.5.2";
+  version = "2.5.12";
 
   src = fetchurl {
     url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192";
-      "i686-linux"   = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8";
+      "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7";
+      "i686-linux"   = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh";
     }.${stdenv.system};
   };
 

From 48294e94cd0d98e1f8d1ac624cedf4f42cf93c1c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 11:36:23 -0700
Subject: [PATCH 1942/2266] urh: 1.9.2 -> 2.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4wwg83liy1bdignjg1vdfkxbckpd43jb-urh-2.0.0/bin/.urh-wrapped --version` and found version 2.0.0
- ran `/nix/store/4wwg83liy1bdignjg1vdfkxbckpd43jb-urh-2.0.0/bin/urh --version` and found version 2.0.0
- found 2.0.0 with grep in /nix/store/4wwg83liy1bdignjg1vdfkxbckpd43jb-urh-2.0.0
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 6aba4e75150..5b5c5757989 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "1.9.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr";
+    sha256 = "0s8nbrkqcb4q3m8w17sqijbds5irk4xpzhjpwkkakzs0rm5g10sk";
   };
 
   buildInputs = [ hackrf rtl-sdr ];

From d538339bd0df15ec9a9a7e6654670bcf4703a49f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 10:59:09 -0700
Subject: [PATCH 1943/2266] trackballs: 1.2.4 -> 1.3.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0/bin/trackballs -h` got 0 exit code
- ran `/nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0/bin/trackballs --help` got 0 exit code
- ran `/nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0/bin/trackballs -v` and found version 1.3.0
- ran `/nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0/bin/trackballs --version` and found version 1.3.0
- ran `/nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0/bin/trackballs -h` and found version 1.3.0
- ran `/nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0/bin/trackballs --help` and found version 1.3.0
- found 1.3.0 with grep in /nix/store/csh6sqxivlzv49n5w7jrjjagfnnkaswa-trackballs-1.3.0
---
 pkgs/games/trackballs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 19be3f64045..29bf399087b 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "trackballs-${version}";
-  version = "1.2.4";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "trackballs";
     repo = "trackballs";
     rev = "v${version}";
-    sha256 = "0y5y8xzfsjd0rxl5wnxdq7m9n97s5xvcqyjsckz4qxrjcc3lk297";
+    sha256 = "1rahqsydpbh8nmh41fxggzj5f6s3ldf7p5krik5fnhpy0civfsxd";
   };
 
   buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ];

From 10601654e4d698843ac08275db552d1871b4f0eb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 09:25:23 -0700
Subject: [PATCH 1944/2266] tevent: 0.9.35 -> 0.9.36

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.36 with grep in /nix/store/6bqs8b2x2q1f8lxnkh11n1272agnaj5y-tevent-0.9.36
- found 0.9.36 in filename of file in /nix/store/6bqs8b2x2q1f8lxnkh11n1272agnaj5y-tevent-0.9.36
---
 pkgs/development/libraries/tevent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index c5c064142db..154db61894f 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tevent-0.9.35";
+  name = "tevent-0.9.36";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${name}.tar.gz";
-    sha256 = "1s8nbkmqz8dzdlsd6qynhvyl05pw93r151f3i2kgjfpbck9ak8r5";
+    sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 59d3d19f168917a07147dd6252cd2ae45102ce4f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 08:20:59 -0700
Subject: [PATCH 1945/2266] skrooge: 2.11.0 -> 2.12.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0/bin/skroogeconvert -h` got 0 exit code
- ran `/nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0/bin/skroogeconvert --help` got 0 exit code
- ran `/nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0/bin/skroogeconvert -v` and found version 2.12.0
- ran `/nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0/bin/skroogeconvert --version` and found version 2.12.0
- ran `/nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0/bin/skroogeconvert -h` and found version 2.12.0
- ran `/nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0/bin/skroogeconvert --help` and found version 2.12.0
- found 2.12.0 with grep in /nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0
- found 2.12.0 in filename of file in /nix/store/yjdafzss769kl6jg9asxyalgy7a5xxz7-skrooge-2.12.0
---
 pkgs/applications/office/skrooge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index de9bfe64e5c..ba136f415f2 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.11.0";
+  version = "2.12.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq";
+    sha256 = "0f7jwl05y4gjwasjcbsx2rrva81abyf0hgdbkh7h3dl7nxz9h6g1";
   };
 
   nativeBuildInputs = [

From 94b81ebed3a3fdc8d1f01ceb1bac23dc969e5215 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 06:05:20 -0700
Subject: [PATCH 1946/2266] samplv1: 0.8.6 -> 0.9.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.0 with grep in /nix/store/qykrhn0p2fv48gyckvdgw9r621cy2s3y-samplv1-0.9.0
- found 0.9.0 in filename of file in /nix/store/qykrhn0p2fv48gyckvdgw9r621cy2s3y-samplv1-0.9.0
---
 pkgs/applications/audio/samplv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index c2c24c29a13..4eeb893ee96 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij";
+    sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk";
   };
 
   buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

From 6ac74d60ad5c8f535ab535a13d8c365dddc6c401 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 23 Mar 2018 22:17:32 +0100
Subject: [PATCH 1947/2266] networkmanager-pptp: remove package

Currently broken on NixOS due to hardcoded modprobe binary path (see
bug #30756 from Oct 2017), no activity on a proposed fix for months.
As the protocol is terribly broken anyways, let's better remove it
completely, and not talk about anymore ;-)

Closes #30756.
---
 nixos/modules/config/no-x-libs.nix            |  1 -
 .../services/networking/networkmanager.nix    |  8 +---
 .../services/x11/desktop-managers/gnome3.nix  |  3 +-
 pkgs/desktops/gnome-3/default.nix             |  5 ---
 .../tools/networking/network-manager/pptp.nix | 43 -------------------
 pkgs/top-level/aliases.nix                    |  1 -
 pkgs/top-level/all-packages.nix               |  2 -
 7 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/tools/networking/network-manager/pptp.nix

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index b9d5b2b903e..a20910353f3 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -32,7 +32,6 @@ with lib;
       networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
       networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
       networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
-      networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
       networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
       networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
       pinentry = pkgs.pinentry_ncurses;
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index f83fb7a6d5d..10e96eb4036 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -135,8 +135,7 @@ in {
         default = { inherit networkmanager modemmanager wpa_supplicant
                             networkmanager-openvpn networkmanager-vpnc
                             networkmanager-openconnect networkmanager-fortisslvpn
-                            networkmanager-pptp networkmanager-l2tp
-                            networkmanager-iodine; };
+                            networkmanager-l2tp networkmanager-iodine; };
         internal = true;
       };
 
@@ -267,8 +266,6 @@ in {
       message = "You can not use networking.networkmanager with networking.wireless";
     }];
 
-    boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
-
     environment.etc = with cfg.basePackages; [
       { source = configFile;
         target = "NetworkManager/NetworkManager.conf";
@@ -285,9 +282,6 @@ in {
       { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
         target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
       }
-      { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
-        target = "NetworkManager/VPN/nm-pptp-service.name";
-      }
       { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
         target = "NetworkManager/VPN/nm-l2tp-service.name";
       }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 7256013d5d8..10e8ef0ed38 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -182,8 +182,7 @@ in {
       { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
         inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
                               networkmanager-openconnect networkmanager-fortisslvpn
-                              networkmanager-pptp networkmanager-iodine
-                              networkmanager-l2tp; };
+                              networkmanager-iodine networkmanager-l2tp; };
 
     # Needed for themes and backgrounds
     environment.pathsToLink = [ "/share" ];
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index c28695ed8e2..f3568888899 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -206,10 +206,6 @@ let
     inherit gnome3;
   };
 
-  networkmanager-pptp = pkgs.networkmanager-pptp.override {
-    inherit gnome3;
-  };
-
   networkmanager-vpnc = pkgs.networkmanager-vpnc.override {
     inherit gnome3;
   };
@@ -436,7 +432,6 @@ let
   networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
   networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
   networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
-  networkmanager_pptp = networkmanager-pptp; # added 2018-02-25
   networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
   yelp_xsl = yelp-xsl; # added 2018-02-25
   yelp_tools = yelp-tools; # added 2018-02-25
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
deleted file mode 100644
index 6844ca53456..00000000000
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
-, libsecret, withGnome ? true, gnome3 }:
-
-let
-  pname   = "NetworkManager-pptp";
-  version = "1.2.4";
-in stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
-
-  src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e";
-  };
-
-  buildInputs = [ networkmanager pptp ppp libsecret ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
-                                        gnome3.networkmanagerapplet ];
-
-  nativeBuildInputs = [ intltool pkgconfig ];
-
-  postPatch = ''
-    sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c
-
-    substituteInPlace ./src/nm-pptp-service.c \
-      --replace /sbin/pptp ${pptp}/bin/pptp \
-      --replace /sbin/pppd ${ppp}/bin/pppd
-  '';
-
-  configureFlags =
-    if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome";
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      attrPath = "networkmanager-pptp";
-    };
-  };
-
-  meta = {
-    description = "PPtP plugin for NetworkManager";
-    inherit (networkmanager.meta) maintainers platforms;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4e91dee6a40..9962c3c8fe6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -148,7 +148,6 @@ mapAliases (rec {
   networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
   networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
   networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
-  networkmanager_pptp = networkmanager-pptp; # added 2018-02-25
   networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
   nmap_graphical = nmap-graphical;  # added 2017-01-19
   nfsUtils = nfs-utils;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b35ca3eeae..3e34ceacd68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3841,8 +3841,6 @@ with pkgs;
 
   networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
 
-  networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
-
   networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };
 
   networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };

From b072dcffaeba82364aa8bff7c8db63d47876deec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 23 Mar 2018 17:37:30 -0400
Subject: [PATCH 1948/2266] docker: 18.02 -> 18.03

---
 .../virtualization/docker/default.nix         | 30 ++++++-------------
 pkgs/top-level/all-packages.nix               |  7 ++---
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index af15240dc12..1616e176424 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -195,28 +195,16 @@ rec {
   });
 
   # Get revisions from
-  # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
+  # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
 
-  docker_17_12 = dockerGen rec {
-    version = "17.12.1-ce";
-    rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
-    sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
-    runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
-    runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
-    containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
-    containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
-    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
-    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
-  };
-
-  docker_18_02 = dockerGen rec {
-    version = "18.02.0-ce";
-    rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit
-    sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m";
-    runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
-    runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
-    containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
-    containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
+  docker_18_03 = dockerGen rec {
+    version = "18.03.0-ce";
+    rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit
+    sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g";
+    runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
+    runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
+    containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c";
+    containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b35ca3eeae..a1197bdffc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15133,11 +15133,10 @@ with pkgs;
 
   # go 1.9 pin until https://github.com/moby/moby/pull/35739
   inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
-    docker_17_12
-    docker_18_02;
+    docker_18_03;
 
-  docker = docker_17_12;
-  docker-edge = docker_18_02;
+  docker = docker_18_03;
+  docker-edge = docker_18_03;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From 2700690f17c915ba960330e48ee1b53b344382b4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 23 Mar 2018 23:08:15 +0100
Subject: [PATCH 1949/2266] atk: fix darwin install_name

---
 pkgs/development/libraries/atk/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 6f10c9c2f5a..efbc94457bf 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
+, fixDarwinDylibNames, libintlOrEmpty, gobjectIntrospection, gnome3
+}:
 
 let
   pname = "atk";
   version = "2.28.1";
 in
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -22,7 +25,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = libintlOrEmpty;
+  buildInputs = libintlOrEmpty
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
 

From c6882b2cf9fa13579f64d5c33cbc071fa5d5e884 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 15 Oct 2017 23:08:03 +0200
Subject: [PATCH 1950/2266] modemmanager: rename ModemManager.service to
 modem-manager.service

This is in line with NetworkManager.service being renamed to
network-manager.service

fixes #30452
---
 .../{modemmanager => modem-manager}/default.nix        | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename pkgs/tools/networking/{modemmanager => modem-manager}/default.nix (85%)

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
similarity index 85%
rename from pkgs/tools/networking/modemmanager/default.nix
rename to pkgs/tools/networking/modem-manager/default.nix
index 999a269d0b7..e9af9dc980e 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -2,11 +2,12 @@
 , libmbim, libqmi, systemd, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "ModemManager-${version}";
+  name = "modem-manager-${version}";
+  pname = "ModemManager";
   version = "1.7.990";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
+    url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
   };
 
@@ -38,7 +39,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system
+    # rename to modem-manager to be in style
+    mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service
     rm -rf $out/$out/etc
     mv $out/$out/* $out
     DIR=$out/$out
@@ -48,7 +50,7 @@ stdenv.mkDerivation rec {
 
     # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
     # aliases ourselves.
-    ln -s $out/etc/systemd/system/ModemManager.service \
+    ln -s $out/etc/systemd/system/modem-manager.service \
       $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e34ceacd68..aecf96b5a95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3685,7 +3685,7 @@ with pkgs;
 
   mmake = callPackage ../tools/misc/mmake { };
 
-  modemmanager = callPackage ../tools/networking/modemmanager {};
+  modemmanager = callPackage ../tools/networking/modem-manager {};
 
   modsecurity_standalone = callPackage ../tools/security/modsecurity { };
 

From f16db1961013464eb93c43b66b12df5469bcf4f0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Mar 2018 00:06:46 +0100
Subject: [PATCH 1951/2266] openexrid-unstable: fix clang build

/cc ZHF #36454
---
 pkgs/development/libraries/openexrid-unstable/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index d8198357c64..099bd8d1e97 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec
 
   patches = [ ./openexrid.patch ];
 
+  postPatch = ''
+    substituteInPlace openexrid/makefile \
+        --replace g++ c++
+  '';
+
   NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR
                        -I${openexr.dev}/include/OpenEXR
                        -I${openfx.dev}/include/OpenFX
@@ -38,7 +43,7 @@ stdenv.mkDerivation rec
       find $out
       mv $out/include $dev/
       mv $out/lib $lib/
-      '';
+  '';
 
   meta = with stdenv.lib; {
     description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing";

From 23d0c1713064cfc7e9ba703e7515057c6c30d6dd Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Mar 2018 02:10:54 +0100
Subject: [PATCH 1952/2266] picosat: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/science/logic/picosat/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index db252f97916..638996e853b 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure.sh --shared --trace";
 
+  makeFlags = stdenv.lib.optional stdenv.isDarwin
+    "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so";
+
   installPhase = ''
    mkdir -p $out/bin $out/lib $out/share $out/include/picosat
    cp picomus picomcs picosat picogcnf "$out"/bin

From 3884d24466c275bdef2e7d87a3dbf05d00684037 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 23 Mar 2018 20:43:32 -0500
Subject: [PATCH 1953/2266] openjdk: get rid of warning

This warning breaks tarball creation:

https://hydra.nixos.org/build/71825197/nixlog/1
---
 pkgs/development/compilers/oraclejdk/jdk9-linux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
index df0e295c3ed..87f2e49b443 100644
--- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix
@@ -155,4 +155,4 @@ let result = stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
   };
 
-}; in stdenv.lib.warn "Oracle JDK/JRE 9 is not updated anymore. Use 10." result
+}; in result

From 18b153f47c56ad1a0c9cac807549944f0eb145f9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 05:04:18 -0700
Subject: [PATCH 1954/2266] backintime-common: 1.1.12 -> 1.1.24

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/8dj6mrs62z7z7d42v0jwcwz7k46i927i-backintime-common-1.1.24/bin/backintime -h` got 0 exit code
- ran `/nix/store/8dj6mrs62z7z7d42v0jwcwz7k46i927i-backintime-common-1.1.24/bin/backintime --help` got 0 exit code
- ran `/nix/store/8dj6mrs62z7z7d42v0jwcwz7k46i927i-backintime-common-1.1.24/bin/backintime -v` and found version 1.1.24
- ran `/nix/store/8dj6mrs62z7z7d42v0jwcwz7k46i927i-backintime-common-1.1.24/bin/backintime --version` and found version 1.1.24
- found 1.1.24 with grep in /nix/store/8dj6mrs62z7z7d42v0jwcwz7k46i927i-backintime-common-1.1.24
---
 pkgs/applications/networking/sync/backintime/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index ccd08e2844e..fae838a7d5f 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -3,7 +3,7 @@
 let
   inherit (python3Packages) python dbus-python keyring;
 in stdenv.mkDerivation rec {
-  version = "1.1.12";
+  version = "1.1.24";
 
   name = "backintime-common-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "bit-team";
     repo = "backintime";
     rev = "v${version}";
-    sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a";
+    sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18";
   };
 
   buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ];

From a0e1e340ee978caadd412cba134c634bf7ed7ac4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 03:41:06 -0700
Subject: [PATCH 1955/2266] radarr: 0.2.0.980 -> 0.2.0.995

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.2.0.995 with grep in /nix/store/nlny430ihz2ydmabj5a2zz457h76vg3z-radarr-0.2.0.995
- directory tree listing: https://gist.github.com/791e8a8789572292f81465181d3aa586
---
 pkgs/servers/radarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index dc3bc22af49..5fd23476d7d 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.980";
+  version = "0.2.0.995";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "1939mmlp9hsmw0hd4c8m8p5fk6igvml30gk9ffi9mfhankas6fnf";
+    sha256 = "04sgs292qz65fcg5vsps0fk2669xzvyfw1rbc5sbbk3hig5lhlns";
   };
 
   buildInputs = [ makeWrapper ];

From 9a6ba03cac01bb30b3d2291b5850749338f3f67b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 23:32:56 -0700
Subject: [PATCH 1956/2266] miniupnpd: 2.0.20180203 -> 2.0.20180222

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/207d415090e19d752f7ec321bb409364
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 1e020079430..a9e67701eb0 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.0.20180203";
+  name = "miniupnpd-2.0.20180222";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "1djb0w76yd5jyqm5mzmxlxikxzzwqzjgy75h8saxc3rlz3r1a346";
+    sha256 = "1hdpyvz1z6crpa7as3srmbl64fx0k4wjra57jw7qaysdsb1b2kqr";
     name = "${name}.tar.gz";
   };
 

From 7184de39452a55d3e11a6a99e771cb00df776a0f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 23:17:11 -0700
Subject: [PATCH 1957/2266] minissdpd: 1.5.20180203 -> 1.5.20180223

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/a596018c138a1d359fa81cc983730be2
---
 pkgs/tools/networking/minissdpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index a451750503a..9809b330fab 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "minissdpd-${version}";
-  version = "1.5.20180203";
+  version = "1.5.20180223";
 
   src = fetchurl {
-    sha256 = "1yiri887s8wxh4zrjc5dw19gyypqg63962aimcgd19blvpbwnfcv";
+    sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv";
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
     name = "${name}.tar.gz";
   };

From f9abda7a58dba7bee8bdbd728e4bc211b2f1f9aa Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 19:47:56 -0700
Subject: [PATCH 1958/2266] libbitcoin: 3.4.0 -> 3.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.5.0 with grep in /nix/store/ciln99fn6lhwnb1z1h6cyrk6vc4a0ngn-libbitcoin-3.5.0
- directory tree listing: https://gist.github.com/57d42e66f139b59578e1c681316c0ec6
---
 pkgs/tools/misc/libbitcoin/libbitcoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
index 623f34e8b61..f8910f83ec5 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libbitcoin";
-  version = "3.4.0";
+  version = "3.5.0";
 
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h6h7cxbwkdk8bzbkfvnrrdzajw1d4lr8wqs66is735bksh6gk1y";
+    sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 08e3950f30dfa8a9e37e8489ea9f9cde107c74e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 20:04:26 -0700
Subject: [PATCH 1959/2266] libbitcoin-client: 3.4.0 -> 3.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.5.0 with grep in /nix/store/gmwvkr4gj2n0ak2ppxwmhakqsr8ihxhc-libbitcoin-client-3.5.0
- directory tree listing: https://gist.github.com/afab2c737b7764c7fb6ea2f0bc8b9ee8
---
 pkgs/tools/misc/libbitcoin/libbitcoin-client.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
index d2f988396ca..8d55b2cdc00 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libbitcoin-client";
-  version = "3.4.0";
+  version = "3.5.0";
 
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "libbitcoin";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vdp6qgpxshh6nhdvr81z3nvh42wgmsm4prli4ajigwp970y8p56";
+    sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From b9870fed885cb617938f95ba0ce3b7a5adf87f94 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 20:39:31 -0700
Subject: [PATCH 1960/2266] libbitcoin-explorer: 3.4.0 -> 3.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/j07vd1p6h4c5fxyiskqqvfvi902vvsn2-libbitcoin-explorer-3.5.0/bin/bx help` got 0 exit code
- found 3.5.0 with grep in /nix/store/j07vd1p6h4c5fxyiskqqvfvi902vvsn2-libbitcoin-explorer-3.5.0
- directory tree listing: https://gist.github.com/672afbcda72ddef99aebfc49a81edc45
---
 pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
index e9f4c977779..e49614834ae 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libbitcoin-explorer";
-  version = "3.4.0";
+  version = "3.5.0";
 
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "libbitcoin";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rxiimklzqyp9vswznz9aia71dn6jxm2pxx5ljlhzs5rs583cj00";
+    sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 51350dd012faadb7f3d7a9f2c244b2bf3ccdc4c3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 16 Mar 2018 20:57:30 -0700
Subject: [PATCH 1961/2266] libbitcoin-protocol: 3.4.0 -> 3.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.5.0 with grep in /nix/store/6726g0ccxn9iklg3vmpllmbp9dxkckgg-libbitcoin-protocol-3.5.0
- directory tree listing: https://gist.github.com/31ff5b959604c484f3e037bf19fbb0d9
---
 pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
index 5fbc2f40308..fbfcfc10074 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libbitcoin-protocol";
-  version = "3.4.0";
+  version = "3.5.0";
 
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "libbitcoin";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wrlzani3wdjkmxqwjh30i8lg3clrzwcx2di7c9sdpnsbda985gb";
+    sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 83a1467cf09bbccbd918c4915359d0382aea2b63 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 00:14:53 -0700
Subject: [PATCH 1962/2266] mod_wsgi: 4.5.24 -> 4.6.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.6.2 with grep in /nix/store/c5q74ipv6p7mwri4p0ab0x32b76kfa2n-mod_wsgi-4.6.2
- directory tree listing: https://gist.github.com/2ddf866000f57f596c938b529d3f6fa9
---
 pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 4d45f70a9fd..007cfc96779 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mod_wsgi-${version}";
-  version = "4.5.24";
+  version = "4.6.2";
 
   src = fetchurl {
     url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
-    sha256 = "1anxml8i3q90x8n30xfydpmv41cxlwqrg3vr98ayzaak02maxr99";
+    sha256 = "0gviv9x4w4i8d26d8vyrr8zk4p5hdx63rxpzqw769cmhvvy8r3g2";
   };
 
   buildInputs = [ apacheHttpd python2 ];

From 0a20e8edf8389741198e0822e4569adbc3b74ab2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 00:49:24 -0700
Subject: [PATCH 1963/2266] mpc-qt: 17.11 -> 18.03

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.03 with grep in /nix/store/b23s2dr5x7zrhp4vgbh8nf2gajp8a44b-mpc-qt-18.03
- directory tree listing: https://gist.github.com/4792f038cb0905bcd3405765bb63b792
---
 pkgs/applications/video/mpc-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 80ca213c06c..559972d9e79 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mpc-qt-${version}";
-  version = "17.11";
+  version = "18.03";
 
   src = fetchFromGitHub {
     owner = "cmdrkotori";
     repo = "mpc-qt";
     rev = "v${version}";
-    sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm";
+    sha256 = "0mhzdgjgv08cvnscbfndpr0s8ndbcf91b61zfqspa1qv4wlqd716";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From 70abab8eaf8e5b9f80ccee2ba5e7ee8378bbee86 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 18 Mar 2018 18:38:07 -0400
Subject: [PATCH 1964/2266] mythtv: 0.27.4 -> 29.1

---
 pkgs/applications/video/mythtv/default.nix | 29 +++++++++++++---------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 6f7ebb8c20a..1be4fc252fd 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,27 +1,32 @@
-{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec
-, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig
-, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
-, yasm, libuuid, taglib, libtool, autoconf, automake, file
+{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
+, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
+, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
+, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
+, linuxHeaders
 }:
 
 stdenv.mkDerivation rec {
   name = "mythtv-${version}";
-  version = "0.27.4";
+  version = "29.1";
 
-  src = fetchurl {
-    url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz";
-    sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz";
+  src = fetchFromGitHub {
+    owner = "MythTV";
+    repo = "mythtv";
+    rev = "v${version}";
+    sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
   };
 
-  sourceRoot = "${name}/mythtv";
+  setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
 
   buildInputs = [
-    freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec
-    libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
-    libuuid taglib
+    freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined
+    perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
+    libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
   ];
   nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
 
+  configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];
+
   meta = with stdenv.lib; {
     homepage = https://www.mythtv.org/;
     description = "Open Source DVR";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aecf96b5a95..d84bcdddfc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16948,7 +16948,7 @@ with pkgs;
 
   mypaint = callPackage ../applications/graphics/mypaint { };
 
-  mythtv = callPackage ../applications/video/mythtv { };
+  mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
 
   micro = callPackage ../applications/editors/micro { };
 

From db68a3f47d9bc46bbe10d75da4d0d824847e60c4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 17 Mar 2018 17:52:43 -0700
Subject: [PATCH 1965/2266] fox: 1.6.49 -> 1.6.56

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/84izmk7vawbjy8jq443ym0wx7k2a89my-fox-1.6.56/bin/reswrap -h` got 0 exit code
- ran `/nix/store/84izmk7vawbjy8jq443ym0wx7k2a89my-fox-1.6.56/bin/reswrap --help` got 0 exit code
- ran `/nix/store/84izmk7vawbjy8jq443ym0wx7k2a89my-fox-1.6.56/bin/adie -h` got 0 exit code
- ran `/nix/store/84izmk7vawbjy8jq443ym0wx7k2a89my-fox-1.6.56/bin/adie --help` got 0 exit code
- ran `/nix/store/84izmk7vawbjy8jq443ym0wx7k2a89my-fox-1.6.56/bin/fox-config --version` and found version 1.6.56
- found 1.6.56 with grep in /nix/store/84izmk7vawbjy8jq443ym0wx7k2a89my-fox-1.6.56
- directory tree listing: https://gist.github.com/04085b0f58d3548a56ff6ed257520c45
---
 pkgs/development/libraries/fox/fox-1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 0d62656e6e7..a0ba9548012 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -3,7 +3,7 @@
 , CoreServices }:
 
 let
-  version = "1.6.49";
+  version = "1.6.56";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
-    sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";
+    sha256 = "1ckcb12gblz1ad1371ah1qirxn3r9zdngh9w0357hsqfmkyfa5y5";
   };
 
   buildInputs = [

From 507f095f06fc47442ed083ce0a6e0daf0bd964f5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 07:49:53 -0700
Subject: [PATCH 1966/2266] simplescreenrecorder: 0.3.9 -> 0.3.10

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/wvyzwhxb1c1l0ia3kc1idh2r8ydhfql9-simplescreenrecorder-0.3.10/bin/ssr-glinject --help` got 0 exit code
- ran `/nix/store/wvyzwhxb1c1l0ia3kc1idh2r8ydhfql9-simplescreenrecorder-0.3.10/bin/ssr-glinject help` got 0 exit code
- ran `/nix/store/wvyzwhxb1c1l0ia3kc1idh2r8ydhfql9-simplescreenrecorder-0.3.10/bin/ssr-glinject help` and found version 0.3.10
- found 0.3.10 with grep in /nix/store/wvyzwhxb1c1l0ia3kc1idh2r8ydhfql9-simplescreenrecorder-0.3.10
---
 pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 5b9ae011903..0ae9de04680 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simplescreenrecorder-${version}";
-  version = "0.3.9";
+  version = "0.3.10";
 
   src = fetchurl {
     url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk";
+    sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g";
   };
 
   patches = [ ./fix-paths.patch ];

From 814225cf2221f5a5192dc67a9170e799eae47e1c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 13 Mar 2018 21:43:37 +0000
Subject: [PATCH 1967/2266] aws-auth: remove

No longer works with current awscli versions, unmaintained upstream
---
 pkgs/tools/admin/aws-auth/default.nix | 31 ---------------------------
 pkgs/top-level/all-packages.nix       |  2 --
 2 files changed, 33 deletions(-)
 delete mode 100644 pkgs/tools/admin/aws-auth/default.nix

diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix
deleted file mode 100644
index 9f36a6403a1..00000000000
--- a/pkgs/tools/admin/aws-auth/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }:
-
-stdenv.mkDerivation rec {
-  version = "unstable-2017-07-24";
-  name = "aws-auth-${version}";
-
-  src = fetchFromGitHub {
-    owner = "alphagov";
-    repo = "aws-auth";
-    rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1";
-    sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontBuild = true;
-
-  # copy script and set $PATH
-  installPhase = ''
-    install -D $src/aws-auth.sh $out/bin/aws-auth
-    wrapProgram $out/bin/aws-auth \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]}
-  '';
-
-  meta = {
-    homepage = https://github.com/alphagov/aws-auth;
-    description = "AWS authentication wrapper to handle MFA and IAM roles";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ ris ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d84bcdddfc4..443c4df47ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -573,8 +573,6 @@ with pkgs;
 
   awless = callPackage ../tools/virtualization/awless { };
 
-  aws-auth = callPackage ../tools/admin/aws-auth { };
-
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };

From 50d41bb624941dd151a6bf0fd4cb17f0b8d8a5e6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 22 Mar 2018 20:33:06 -0500
Subject: [PATCH 1968/2266] openjdk9: 9.0.4+11 -> 9.0.4+12

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/openjdk/9.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix
index 0a9be04ebb2..7ac3931c93d 100644
--- a/pkgs/development/compilers/openjdk/9.nix
+++ b/pkgs/development/compilers/openjdk/9.nix
@@ -22,41 +22,41 @@ let
       throw "openjdk requires i686-linux or x86_64 linux";
 
   update = "9.0.4";
-  build = "11";
+  build = "12";
   baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u";
   repover = "jdk-${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk9 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1y8sq0fxvj5s5gx5qm2mbr710xqrgv3d200k6bv71bawjh57v3xx";
+             sha256 = "06hnrzkwxgrfq26il1mjyl6wgb7x3qym69pjbddhl9m29n2si3jh";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1n6aqmph6a9spxyfi40k8g5hy2bnfd499gr6jkmq49phdb2qg7wy";
+             sha256 = "16xqnqn773p6ywcdjx801vbng2skjal7svydn0s7wf3ldqzx64mi";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "1i34k3pc2slnjk469zskqq1z0jna1xg2zzjdk7zjrhrfgsrgvfsh";
+             sha256 = "0g5ddffl2qykrjf17ac9as60rd4sfyv7s2fpgjn86k4a69gkx93v";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "1k6r5yxf5h1m451vlwzk9zqkmdlln3ky3kir5qjgan4hz892f297";
+             sha256 = "14585dzs2mfzgzrnbvc062pigngs35hajwpr22m6fzbm7580vnqk";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "0gafc0jx8fx13y6iir9zxmqrsw1a3w71xgdvjx9rk64acc24piy2";
+             sha256 = "16595jdg3y9zy70q8i615a7d6w0zzbydfxylvaq42wrsc7jw733h";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "1bw3z346mna6pgz76phcmfm0ykydcwagqxhffj0mzbdll7ysw25p";
+             sha256 = "1m1aspc1hq74w0bkasrfvp8ygs6psbc1l61vfw9244j2vgfahjgn";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "063fhnmm2g83jrdv2bl968glr46vvgjpyk9rjmh2fwfplzclb51s";
+             sha256 = "06ns2giw366vjivb6d46gqwfvfzkaddrgd1x6y8w37ywygp50lxm";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "0wyx76nd4v6xy4vmp94anxwk9bfqyb0l4n3hqhfqyz6azi8pqk66";
+             sha256 = "0z6mlzvz1hh1yzli69qjlrcwqdjnivbjbqqrqi4hhpls6z0a2ch7";
           };
   openjdk9 = stdenv.mkDerivation {
     name = "openjdk-${update}-b${build}";

From 34087d0dec1d9d4bda83af10d165fbbd30d177f7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 24 Mar 2018 01:17:36 -0400
Subject: [PATCH 1969/2266] linux_riscv: 4.16-rc2 -> 4.16-rc6.

Also moves most of our patches upstream.
---
 pkgs/os-specific/linux/kernel/linux-riscv.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix
index 45795e24c54..60370311865 100644
--- a/pkgs/os-specific/linux/kernel/linux-riscv.nix
+++ b/pkgs/os-specific/linux/kernel/linux-riscv.nix
@@ -1,15 +1,15 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc2";
-  modDirVersion = "4.16.0-rc2";
+  version = "4.16-rc6";
+  modDirVersion = "4.16.0-rc6";
   extraMeta.branch = "4.16";
 
   src = fetchFromGitHub {
     owner = "shlevy";
     repo ="riscv-linux";
-    rev = "f0c42cff9292c0a8e6ca702a54aafa04b35758a6";
-    sha256 = "050mdciyz1595z81zsss0v9vqsaysppyzqaqpfs5figackifv3iv";
+    rev = "a54f259c2adce68e3bd7600be8989bf1ddf9ea3a";
+    sha256 = "140w6mj4hm1vf4zsmcr2w5cghcaalbvw5d4m9z57dmq1z5plsl4q";
   };
 
   # Should the testing kernels ever be built on Hydra?

From a712514bd503f008091b94e179fe7d8f007cd26d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 24 Mar 2018 06:23:09 +0100
Subject: [PATCH 1970/2266] yoshimi: 1.5.6 -> 1.5.7

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

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index cdf84cb7e46..678345a91dd 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0bjfhfslpa2hjrc9h38m7dlr62953w9n4cvkgvfy495cbym12dak";
+    sha256 = "1w916mmi6hh547a7icrgx6qr2kwxlxwlm6ampql427rshcz9r61k";
   };
 
   buildInputs = [

From 72e898706871e60076003b2070ec7626fc500432 Mon Sep 17 00:00:00 2001
From: Peter Romfeld <peter.romfeld.hk@gmail.com>
Date: Sat, 24 Mar 2018 15:35:52 +0800
Subject: [PATCH 1971/2266] nodePackages_8_x.swagger: init at 0.7.5

---
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        | 3956 ++++++++++++++++-
 2 files changed, 3799 insertions(+), 158 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 8abdc0e608c..59de12c29f7 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -11,5 +11,6 @@
 , "pnpm"
 , "semver"
 , "sloc"
+, "swagger"
 , "npm"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 3f6765bb008..bb1c7eba168 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -4,6 +4,15 @@
 
 let
   sources = {
+    "URIjs-1.16.1" = {
+      name = "URIjs";
+      packageName = "URIjs";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz";
+        sha1 = "edebc678b8b74b26b05d2b481e12383f5ae04b8b";
+      };
+    };
     "abbrev-1.1.1" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -31,13 +40,49 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ansi-diff-stream-1.2.0" = {
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "ansi-align-2.0.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+      };
+    };
+    "ansi-diff-stream-1.2.1" = {
       name = "ansi-diff-stream";
       packageName = "ansi-diff-stream";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz";
-        sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e";
+        url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz";
+        sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix";
+      };
+    };
+    "ansi-escapes-1.4.0" = {
+      name = "ansi-escapes";
+      packageName = "ansi-escapes";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
+        sha1 = "d3a8a83b319aa67793662b13e761c7911422306e";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -58,6 +103,15 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
     "ansi-styles-3.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
@@ -76,6 +130,15 @@ let
         sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
       };
     };
+    "anymatch-2.0.0" = {
+      name = "anymatch";
+      packageName = "anymatch";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
+        sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6";
+      };
+    };
     "ap-0.1.0" = {
       name = "ap";
       packageName = "ap";
@@ -85,6 +148,15 @@ let
         sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150";
       };
     };
+    "append-field-0.1.0" = {
+      name = "append-field";
+      packageName = "append-field";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz";
+        sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a";
+      };
+    };
     "append-tree-2.4.1" = {
       name = "append-tree";
       packageName = "append-tree";
@@ -112,6 +184,15 @@ let
         sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
       };
     };
+    "argparse-1.0.10" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+      };
+    };
     "arr-diff-2.0.0" = {
       name = "arr-diff";
       packageName = "arr-diff";
@@ -121,6 +202,15 @@ let
         sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf";
       };
     };
+    "arr-diff-4.0.0" = {
+      name = "arr-diff";
+      packageName = "arr-diff";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz";
+        sha1 = "d6461074febfec71e7e15235761a329a5dc7c520";
+      };
+    };
     "arr-flatten-1.1.0" = {
       name = "arr-flatten";
       packageName = "arr-flatten";
@@ -130,6 +220,15 @@ let
         sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
+    "arr-union-3.1.0" = {
+      name = "arr-union";
+      packageName = "arr-union";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz";
+        sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
+      };
+    };
     "array-lru-1.1.1" = {
       name = "array-lru";
       packageName = "array-lru";
@@ -148,6 +247,15 @@ let
         sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53";
       };
     };
+    "array-unique-0.3.2" = {
+      name = "array-unique";
+      packageName = "array-unique";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz";
+        sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
+      };
+    };
     "asn1-0.2.3" = {
       name = "asn1";
       packageName = "asn1";
@@ -166,6 +274,15 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
+    "assign-symbols-1.0.0" = {
+      name = "assign-symbols";
+      packageName = "assign-symbols";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz";
+        sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
+      };
+    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -184,6 +301,15 @@ let
         sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
       };
     };
+    "async-1.5.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+      };
+    };
     "async-2.1.5" = {
       name = "async";
       packageName = "async";
@@ -193,6 +319,15 @@ let
         sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
+    "async-each-1.0.1" = {
+      name = "async-each";
+      packageName = "async-each";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz";
+        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -202,6 +337,15 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
+    "atob-2.0.3" = {
+      name = "atob";
+      packageName = "atob";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz";
+        sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d";
+      };
+    };
     "atomic-batcher-1.0.2" = {
       name = "atomic-batcher";
       packageName = "atomic-batcher";
@@ -238,6 +382,15 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
+    "base-0.11.2" = {
+      name = "base";
+      packageName = "base";
+      version = "0.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
+        sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5";
+      };
+    };
     "bcrypt-pbkdf-1.0.1" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
@@ -265,6 +418,15 @@ let
         sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2";
       };
     };
+    "binary-extensions-1.11.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz";
+        sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
+      };
+    };
     "bitfield-rle-2.1.0" = {
       name = "bitfield-rle";
       packageName = "bitfield-rle";
@@ -319,6 +481,15 @@ let
         sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8";
       };
     };
+    "body-parser-1.12.4" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.12.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz";
+        sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
+      };
+    };
     "boom-4.3.1" = {
       name = "boom";
       packageName = "boom";
@@ -337,6 +508,15 @@ let
         sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
       };
     };
+    "boxen-1.3.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz";
+        sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc";
+      };
+    };
     "brace-expansion-1.1.11" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
@@ -355,6 +535,15 @@ let
         sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7";
       };
     };
+    "braces-2.3.1" = {
+      name = "braces";
+      packageName = "braces";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz";
+        sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8";
+      };
+    };
     "browser-stdout-1.3.1" = {
       name = "browser-stdout";
       packageName = "browser-stdout";
@@ -364,6 +553,33 @@ let
         sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
       };
     };
+    "buffer-alloc-1.1.0" = {
+      name = "buffer-alloc";
+      packageName = "buffer-alloc";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz";
+        sha1 = "05514d33bf1656d3540c684f65b1202e90eca303";
+      };
+    };
+    "buffer-alloc-unsafe-0.1.1" = {
+      name = "buffer-alloc-unsafe";
+      packageName = "buffer-alloc-unsafe";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz";
+        sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a";
+      };
+    };
+    "buffer-alloc-unsafe-1.0.0" = {
+      name = "buffer-alloc-unsafe";
+      packageName = "buffer-alloc-unsafe";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz";
+        sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe";
+      };
+    };
     "buffer-equals-1.0.4" = {
       name = "buffer-equals";
       packageName = "buffer-equals";
@@ -373,6 +589,24 @@ let
         sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5";
       };
     };
+    "buffer-fill-0.1.0" = {
+      name = "buffer-fill";
+      packageName = "buffer-fill";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.0.tgz";
+        sha1 = "ca9470e8d4d1b977fd7543f4e2ab6a7dc95101a8";
+      };
+    };
+    "buffer-from-1.0.0" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz";
+        sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk";
+      };
+    };
     "buffer-indexof-1.1.1" = {
       name = "buffer-indexof";
       packageName = "buffer-indexof";
@@ -382,13 +616,40 @@ let
         sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
       };
     };
-    "bulk-write-stream-1.1.3" = {
+    "bulk-write-stream-1.1.4" = {
       name = "bulk-write-stream";
       packageName = "bulk-write-stream";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz";
-        sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275";
+        url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz";
+        sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs";
+      };
+    };
+    "busboy-0.2.14" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";
+        sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453";
+      };
+    };
+    "bytes-1.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+      };
+    };
+    "bytes-2.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz";
+        sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
       };
     };
     "bytes-3.0.0" = {
@@ -400,6 +661,15 @@ let
         sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
+    "cache-base-1.0.1" = {
+      name = "cache-base";
+      packageName = "cache-base";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
+        sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0";
+      };
+    };
     "call-me-maybe-1.0.1" = {
       name = "call-me-maybe";
       packageName = "call-me-maybe";
@@ -409,6 +679,33 @@ let
         sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
       };
     };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "capture-stack-trace-1.0.0" = {
+      name = "capture-stack-trace";
+      packageName = "capture-stack-trace";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
+        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -418,6 +715,24 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
     "chalk-2.3.2" = {
       name = "chalk";
       packageName = "chalk";
@@ -427,6 +742,24 @@ let
         sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
       };
     };
+    "charenc-0.0.2" = {
+      name = "charenc";
+      packageName = "charenc";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz";
+        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+      };
+    };
+    "chokidar-2.0.3" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz";
+        sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd";
+      };
+    };
     "chownr-1.0.1" = {
       name = "chownr";
       packageName = "chownr";
@@ -436,6 +769,42 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
+    "circular-append-file-1.0.1" = {
+      name = "circular-append-file";
+      packageName = "circular-append-file";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz";
+        sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05";
+      };
+    };
+    "class-utils-0.3.6" = {
+      name = "class-utils";
+      packageName = "class-utils";
+      version = "0.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
+        sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
+      };
+    };
+    "cli-boxes-1.0.0" = {
+      name = "cli-boxes";
+      packageName = "cli-boxes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
+        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+      };
+    };
+    "cli-cursor-1.0.2" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz";
+        sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987";
+      };
+    };
     "cli-table-0.3.1" = {
       name = "cli-table";
       packageName = "cli-table";
@@ -454,6 +823,15 @@ let
         sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc";
       };
     };
+    "cli-width-1.1.1" = {
+      name = "cli-width";
+      packageName = "cli-width";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz";
+        sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d";
+      };
+    };
     "cliclopts-1.1.1" = {
       name = "cliclopts";
       packageName = "cliclopts";
@@ -463,6 +841,24 @@ let
         sha1 = "69431c7cb5af723774b0d3911b4c37512431910f";
       };
     };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "clone-2.0.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz";
+        sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e";
+      };
+    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -490,6 +886,15 @@ let
         sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8";
       };
     };
+    "collection-visit-1.0.0" = {
+      name = "collection-visit";
+      packageName = "collection-visit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz";
+        sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+      };
+    };
     "color-convert-1.9.1" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -535,6 +940,15 @@ let
         sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
       };
     };
+    "commander-0.6.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      };
+    };
     "commander-2.11.0" = {
       name = "commander";
       packageName = "commander";
@@ -544,6 +958,24 @@ let
         sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
+    "commander-2.15.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.15.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
+        sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn";
+      };
+    };
+    "commander-2.3.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+        sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+      };
+    };
     "commander-2.9.0" = {
       name = "commander";
       packageName = "commander";
@@ -553,6 +985,15 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
     "concat-map-0.0.1" = {
       name = "concat-map";
       packageName = "concat-map";
@@ -562,13 +1003,31 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "concat-stream-1.6.1" = {
+    "concat-stream-1.6.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz";
-        sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
+      };
+    };
+    "configstore-3.1.1" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
+      };
+    };
+    "connect-3.6.6" = {
+      name = "connect";
+      packageName = "connect";
+      version = "3.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz";
+        sha1 = "09eff6c55af7236e137135a72574858b6786f524";
       };
     };
     "connections-1.4.2" = {
@@ -589,6 +1048,15 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
+    "content-type-1.0.4" = {
+      name = "content-type";
+      packageName = "content-type";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
+        sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
+      };
+    };
     "content-types-0.1.0" = {
       name = "content-types";
       packageName = "content-types";
@@ -598,6 +1066,33 @@ let
         sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578";
       };
     };
+    "cookiejar-2.0.6" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz";
+        sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe";
+      };
+    };
+    "cookiejar-2.1.1" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
+        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+      };
+    };
+    "copy-descriptor-0.1.1" = {
+      name = "copy-descriptor";
+      packageName = "copy-descriptor";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+        sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -616,6 +1111,33 @@ let
         sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0";
       };
     };
+    "create-error-class-3.0.2" = {
+      name = "create-error-class";
+      packageName = "create-error-class";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
+        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
+      };
+    };
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    };
+    "crypt-0.0.2" = {
+      name = "crypt";
+      packageName = "crypt";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz";
+        sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
+      };
+    };
     "cryptiles-3.1.2" = {
       name = "cryptiles";
       packageName = "cryptiles";
@@ -625,6 +1147,15 @@ let
         sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
       };
     };
+    "crypto-random-string-1.0.0" = {
+      name = "crypto-random-string";
+      packageName = "crypto-random-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
+        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
+      };
+    };
     "cycle-1.0.3" = {
       name = "cycle";
       packageName = "cycle";
@@ -634,6 +1165,15 @@ let
         sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
       };
     };
+    "dag-map-1.0.2" = {
+      name = "dag-map";
+      packageName = "dag-map";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz";
+        sha1 = "e8379f041000ed561fc515475c1ed2c85eece8d7";
+      };
+    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -679,22 +1219,22 @@ let
         sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w";
       };
     };
-    "dat-ignore-2.0.0" = {
+    "dat-ignore-2.1.0" = {
       name = "dat-ignore";
       packageName = "dat-ignore";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz";
-        sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8";
+        url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.0.tgz";
+        sha512 = "2lngf74v9m0xibm5g6lj1aj988bpmx69bd7m8b1kpzlbz7kh0binbyadaj993isk679pljasygycilmwb976bhywq8b46fgl0lmagqs";
       };
     };
-    "dat-json-1.0.1" = {
+    "dat-json-1.0.2" = {
       name = "dat-json";
       packageName = "dat-json";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz";
-        sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq";
+        url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz";
+        sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi";
       };
     };
     "dat-link-resolve-2.1.0" = {
@@ -769,6 +1309,15 @@ let
         sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0";
       };
     };
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+      };
+    };
     "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
@@ -787,6 +1336,24 @@ let
         sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
       };
     };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "decode-uri-component-0.2.0" = {
+      name = "decode-uri-component";
+      packageName = "decode-uri-component";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    };
     "deep-equal-0.2.2" = {
       name = "deep-equal";
       packageName = "deep-equal";
@@ -805,6 +1372,33 @@ let
         sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
+    "define-property-0.2.5" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz";
+        sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116";
+      };
+    };
+    "define-property-1.0.0" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz";
+        sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6";
+      };
+    };
+    "define-property-2.0.2" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
+        sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg";
+      };
+    };
     "delayed-stream-1.0.0" = {
       name = "delayed-stream";
       packageName = "delayed-stream";
@@ -823,6 +1417,42 @@ let
         sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
       };
     };
+    "depd-1.0.1" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+        sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
+      };
+    };
+    "depd-1.1.1" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
+      };
+    };
+    "depd-1.1.2" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
+        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+      };
+    };
+    "destroy-1.0.4" = {
+      name = "destroy";
+      packageName = "destroy";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+        sha1 = "978857442c44749e4206613e37946205826abd80";
+      };
+    };
     "detect-libc-1.0.3" = {
       name = "detect-libc";
       packageName = "detect-libc";
@@ -832,6 +1462,24 @@ let
         sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
       };
     };
+    "dicer-0.2.5" = {
+      name = "dicer";
+      packageName = "dicer";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
     "diff-3.5.0" = {
       name = "diff";
       packageName = "diff";
@@ -850,13 +1498,13 @@ let
         sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338";
       };
     };
-    "discovery-channel-5.4.7" = {
+    "discovery-channel-5.5.1" = {
       name = "discovery-channel";
       packageName = "discovery-channel";
-      version = "5.4.7";
+      version = "5.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz";
-        sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78";
+        url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz";
+        sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h";
       };
     };
     "discovery-swarm-4.4.2" = {
@@ -877,6 +1525,15 @@ let
         sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg";
       };
     };
+    "dns-discovery-6.1.0" = {
+      name = "dns-discovery";
+      packageName = "dns-discovery";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz";
+        sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a";
+      };
+    };
     "dns-packet-1.3.1" = {
       name = "dns-packet";
       packageName = "dns-packet";
@@ -886,6 +1543,15 @@ let
         sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i";
       };
     };
+    "dns-packet-4.1.0" = {
+      name = "dns-packet";
+      packageName = "dns-packet";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.1.0.tgz";
+        sha512 = "1jkqjdbc3dchmbkg3nn7ymayqix9gh3ll3rgbqps2qc484zgkj6a2v1wgy4agybkh8719i36b6fi8mx1m4h00gvpdmhdnxx5x1r1m3h";
+      };
+    };
     "dns-socket-1.6.3" = {
       name = "dns-socket";
       packageName = "dns-socket";
@@ -895,6 +1561,15 @@ let
         sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy";
       };
     };
+    "dns-socket-3.0.0" = {
+      name = "dns-socket";
+      packageName = "dns-socket";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz";
+        sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k";
+      };
+    };
     "dns-txt-2.0.2" = {
       name = "dns-txt";
       packageName = "dns-txt";
@@ -913,6 +1588,33 @@ let
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
+    "dot-prop-4.2.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
+        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
+      };
+    };
+    "duplexer-0.1.1" = {
+      name = "duplexer";
+      packageName = "duplexer";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+      };
+    };
+    "duplexer3-0.1.4" = {
+      name = "duplexer3";
+      packageName = "duplexer3";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz";
+        sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+      };
+    };
     "duplexify-3.5.4" = {
       name = "duplexify";
       packageName = "duplexify";
@@ -931,6 +1633,33 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
+    "ee-first-1.1.0" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+        sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
+      };
+    };
+    "ee-first-1.1.1" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+      };
+    };
+    "encodeurl-1.0.2" = {
+      name = "encodeurl";
+      packageName = "encodeurl";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+      };
+    };
     "end-of-stream-1.4.1" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
@@ -940,6 +1669,24 @@ let
         sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl";
       };
     };
+    "escape-html-1.0.3" = {
+      name = "escape-html";
+      packageName = "escape-html";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+      };
+    };
+    "escape-string-regexp-1.0.2" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+        sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
+      };
+    };
     "escape-string-regexp-1.0.5" = {
       name = "escape-string-regexp";
       packageName = "escape-string-regexp";
@@ -949,6 +1696,51 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
+    "esprima-4.0.0" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
+        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
+      };
+    };
+    "etag-1.8.1" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
+        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+      };
+    };
+    "event-stream-3.3.4" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "3.3.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
+        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
+      };
+    };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
+    "exit-hook-1.1.1" = {
+      name = "exit-hook";
+      packageName = "exit-hook";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz";
+        sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8";
+      };
+    };
     "expand-brackets-0.1.5" = {
       name = "expand-brackets";
       packageName = "expand-brackets";
@@ -958,6 +1750,15 @@ let
         sha1 = "df07284e342a807cd733ac5af72411e581d1177b";
       };
     };
+    "expand-brackets-2.1.4" = {
+      name = "expand-brackets";
+      packageName = "expand-brackets";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz";
+        sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+      };
+    };
     "expand-range-1.8.2" = {
       name = "expand-range";
       packageName = "expand-range";
@@ -967,6 +1768,15 @@ let
         sha1 = "a299effd335fe2721ebae8e257ec79644fc85337";
       };
     };
+    "extend-3.0.0" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+      };
+    };
     "extend-3.0.1" = {
       name = "extend";
       packageName = "extend";
@@ -976,6 +1786,24 @@ let
         sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
       };
     };
+    "extend-shallow-2.0.1" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
+        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+      };
+    };
+    "extend-shallow-3.0.2" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz";
+        sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
+      };
+    };
     "extglob-0.3.2" = {
       name = "extglob";
       packageName = "extglob";
@@ -985,6 +1813,15 @@ let
         sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1";
       };
     };
+    "extglob-2.0.4" = {
+      name = "extglob";
+      packageName = "extglob";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
+        sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
+      };
+    };
     "extsprintf-1.3.0" = {
       name = "extsprintf";
       packageName = "extsprintf";
@@ -1030,6 +1867,15 @@ let
         sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1";
       };
     };
+    "figures-1.7.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz";
+        sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e";
+      };
+    };
     "filename-regex-2.0.1" = {
       name = "filename-regex";
       packageName = "filename-regex";
@@ -1048,6 +1894,24 @@ let
         sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723";
       };
     };
+    "fill-range-4.0.0" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz";
+        sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
+      };
+    };
+    "finalhandler-1.1.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz";
+        sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
+      };
+    };
     "findup-sync-0.3.0" = {
       name = "findup-sync";
       packageName = "findup-sync";
@@ -1102,6 +1966,15 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
+    "form-data-1.0.0-rc3" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "1.0.0-rc3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+        sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
+      };
+    };
     "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -1111,6 +1984,51 @@ let
         sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
       };
     };
+    "formidable-1.0.17" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
+        sha1 = "ef5491490f9433b705faa77249c99029ae348559";
+      };
+    };
+    "formidable-1.2.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
+        sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn";
+      };
+    };
+    "fragment-cache-0.2.1" = {
+      name = "fragment-cache";
+      packageName = "fragment-cache";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz";
+        sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
+      };
+    };
+    "fresh-0.5.2" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+      };
+    };
+    "from-0.1.7" = {
+      name = "from";
+      packageName = "from";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
+        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
+      };
+    };
     "from2-2.3.0" = {
       name = "from2";
       packageName = "from2";
@@ -1120,6 +2038,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fs-extra-0.24.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "0.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz";
+        sha1 = "d4e4342a96675cb7846633a6099249332b539952";
+      };
+    };
     "fs-minipass-1.2.5" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
@@ -1138,6 +2065,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "fsevents-1.1.3" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz";
+        sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq";
+      };
+    };
     "fstream-1.0.11" = {
       name = "fstream";
       packageName = "fstream";
@@ -1156,6 +2092,24 @@ let
         sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
       };
     };
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+      };
+    };
+    "get-value-2.0.6" = {
+      name = "get-value";
+      packageName = "get-value";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz";
+        sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+      };
+    };
     "getpass-0.1.7" = {
       name = "getpass";
       packageName = "getpass";
@@ -1165,6 +2119,15 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
+    "glob-3.2.11" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+      };
+    };
     "glob-5.0.15" = {
       name = "glob";
       packageName = "glob";
@@ -1201,6 +2164,15 @@ let
         sha1 = "81383d72db054fcccf5336daa902f182f6edbb28";
       };
     };
+    "glob-parent-3.1.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+      };
+    };
     "global-4.3.2" = {
       name = "global";
       packageName = "global";
@@ -1210,6 +2182,24 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
+    "global-dirs-0.1.1" = {
+      name = "global-dirs";
+      packageName = "global-dirs";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz";
+        sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445";
+      };
+    };
+    "got-6.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "6.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+      };
+    };
     "graceful-fs-4.1.11" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -1228,6 +2218,15 @@ let
         sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
       };
     };
+    "graphlib-2.1.5" = {
+      name = "graphlib";
+      packageName = "graphlib";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz";
+        sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy";
+      };
+    };
     "growl-1.10.3" = {
       name = "growl";
       packageName = "growl";
@@ -1237,6 +2236,15 @@ let
         sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
       };
     };
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+      };
+    };
     "grunt-known-options-1.1.0" = {
       name = "grunt-known-options";
       packageName = "grunt-known-options";
@@ -1246,6 +2254,15 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
+    "handlebars-4.0.11" = {
+      name = "handlebars";
+      packageName = "handlebars";
+      version = "4.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz";
+        sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc";
+      };
+    };
     "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
@@ -1264,6 +2281,15 @@ let
         sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
       };
     };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
     "has-flag-2.0.0" = {
       name = "has-flag";
       packageName = "has-flag";
@@ -1291,6 +2317,42 @@ let
         sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
       };
     };
+    "has-value-0.3.1" = {
+      name = "has-value";
+      packageName = "has-value";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz";
+        sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f";
+      };
+    };
+    "has-value-1.0.0" = {
+      name = "has-value";
+      packageName = "has-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz";
+        sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177";
+      };
+    };
+    "has-values-0.1.4" = {
+      name = "has-values";
+      packageName = "has-values";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz";
+        sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771";
+      };
+    };
+    "has-values-1.0.0" = {
+      name = "has-values";
+      packageName = "has-values";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz";
+        sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
+      };
+    };
     "hawk-6.0.2" = {
       name = "hawk";
       packageName = "hawk";
@@ -1318,6 +2380,15 @@ let
         sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
       };
     };
+    "http-errors-1.6.2" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    };
     "http-methods-0.1.0" = {
       name = "http-methods";
       packageName = "http-methods";
@@ -1336,22 +2407,22 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "hypercore-6.12.3" = {
+    "hypercore-6.12.5" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.12.3";
+      version = "6.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.3.tgz";
-        sha512 = "0gxq17xmp2926g01dram5fdny52r40lvvanf83d35vvrhsck95zx2ymrhn6hv81hp8wvlwlqs84zbz35xp6d0nf3396pa0kra44ma4k";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.5.tgz";
+        sha512 = "247lnm7sq3fx7ihflpp3pmrdd47hpl68y0ifmg2jmaw4kn745s3i9m9r6c1kmzq4i14zb3k251xhq1s0vldc1yxa9wkvial78cn27hz";
       };
     };
-    "hypercore-protocol-6.6.0" = {
+    "hypercore-protocol-6.6.2" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.6.0";
+      version = "6.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.0.tgz";
-        sha512 = "3kwmsg8vfza3i9nbx84v43sh4gi5bjpmj7mn15xyvxg30k0074yvgpng16g8310r88dsk055awlj9zf5zpsk1r0zy61890k9y7bpppg";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.2.tgz";
+        sha512 = "3d62qzd0spz8j902qgvjg4wqr2bcjhvrxhg12a44x3rv0dwn9n0l78bgz8cghbsiwk36bivz7wsyf0fdpgif9a41yyi81mslf8wkdmf";
       };
     };
     "hyperdrive-9.12.3" = {
@@ -1390,6 +2461,33 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
+    "iconv-lite-0.4.19" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
+      };
+    };
+    "iconv-lite-0.4.8" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+        sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
+      };
+    };
+    "ignore-by-default-1.0.1" = {
+      name = "ignore-by-default";
+      packageName = "ignore-by-default";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz";
+        sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
+      };
+    };
     "ignore-walk-3.0.1" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
@@ -1399,6 +2497,24 @@ let
         sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
       };
     };
+    "import-lazy-2.1.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+      };
+    };
+    "imurmurhash-0.1.4" = {
+      name = "imurmurhash";
+      packageName = "imurmurhash";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+      };
+    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -1426,6 +2542,15 @@ let
         sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
+    "inquirer-0.10.1" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz";
+        sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a";
+      };
+    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -1435,6 +2560,33 @@ let
         sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
       };
     };
+    "is-accessor-descriptor-0.1.6" = {
+      name = "is-accessor-descriptor";
+      packageName = "is-accessor-descriptor";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
+        sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6";
+      };
+    };
+    "is-accessor-descriptor-1.0.0" = {
+      name = "is-accessor-descriptor";
+      packageName = "is-accessor-descriptor";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
+        sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
+      };
+    };
+    "is-binary-path-1.0.1" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz";
+        sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+      };
+    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
@@ -1444,6 +2596,42 @@ let
         sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
       };
     };
+    "is-data-descriptor-0.1.4" = {
+      name = "is-data-descriptor";
+      packageName = "is-data-descriptor";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
+        sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56";
+      };
+    };
+    "is-data-descriptor-1.0.0" = {
+      name = "is-data-descriptor";
+      packageName = "is-data-descriptor";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
+        sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d";
+      };
+    };
+    "is-descriptor-0.1.6" = {
+      name = "is-descriptor";
+      packageName = "is-descriptor";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
+        sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a";
+      };
+    };
+    "is-descriptor-1.0.2" = {
+      name = "is-descriptor";
+      packageName = "is-descriptor";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
+        sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r";
+      };
+    };
     "is-dotfile-1.0.3" = {
       name = "is-dotfile";
       packageName = "is-dotfile";
@@ -1471,6 +2659,15 @@ let
         sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
       };
     };
+    "is-extendable-1.0.1" = {
+      name = "is-extendable";
+      packageName = "is-extendable";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
+        sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba";
+      };
+    };
     "is-extglob-1.0.0" = {
       name = "is-extglob";
       packageName = "is-extglob";
@@ -1480,6 +2677,15 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    };
     "is-fullwidth-code-point-1.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
@@ -1516,6 +2722,51 @@ let
         sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863";
       };
     };
+    "is-glob-3.1.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    };
+    "is-glob-4.0.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz";
+        sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
+      };
+    };
+    "is-installed-globally-0.1.0" = {
+      name = "is-installed-globally";
+      packageName = "is-installed-globally";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
+        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
+      };
+    };
+    "is-invalid-path-0.1.0" = {
+      name = "is-invalid-path";
+      packageName = "is-invalid-path";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz";
+        sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34";
+      };
+    };
+    "is-npm-1.0.0" = {
+      name = "is-npm";
+      packageName = "is-npm";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+      };
+    };
     "is-number-2.1.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -1534,6 +2785,51 @@ let
         sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
       };
     };
+    "is-number-4.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz";
+        sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd";
+      };
+    };
+    "is-obj-1.0.1" = {
+      name = "is-obj";
+      packageName = "is-obj";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+      };
+    };
+    "is-odd-2.0.0" = {
+      name = "is-odd";
+      packageName = "is-odd";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz";
+        sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r";
+      };
+    };
+    "is-path-inside-1.0.1" = {
+      name = "is-path-inside";
+      packageName = "is-path-inside";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz";
+        sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
+      };
+    };
+    "is-plain-object-2.0.4" = {
+      name = "is-plain-object";
+      packageName = "is-plain-object";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+      };
+    };
     "is-posix-bracket-0.1.1" = {
       name = "is-posix-bracket";
       packageName = "is-posix-bracket";
@@ -1552,6 +2848,33 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
+    "is-redirect-1.0.0" = {
+      name = "is-redirect";
+      packageName = "is-redirect";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
+        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+      };
+    };
+    "is-retry-allowed-1.1.0" = {
+      name = "is-retry-allowed";
+      packageName = "is-retry-allowed";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
+        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
     "is-string-1.0.4" = {
       name = "is-string";
       packageName = "is-string";
@@ -1570,6 +2893,33 @@ let
         sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     };
+    "is-valid-path-0.1.1" = {
+      name = "is-valid-path";
+      packageName = "is-valid-path";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz";
+        sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df";
+      };
+    };
+    "is-windows-1.0.2" = {
+      name = "is-windows";
+      packageName = "is-windows";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
+        sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr";
+      };
+    };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -1597,6 +2947,15 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
+    "isobject-3.0.1" = {
+      name = "isobject";
+      packageName = "isobject";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -1615,6 +2974,24 @@ let
         sha1 = "d03f666ca4e6130138565997cacea54164203156";
       };
     };
+    "jade-0.26.3" = {
+      name = "jade";
+      packageName = "jade";
+      version = "0.26.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+        sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+      };
+    };
+    "js-yaml-3.11.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
+        sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
+      };
+    };
     "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
@@ -1624,6 +3001,15 @@ let
         sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
+    "json-refs-2.1.7" = {
+      name = "json-refs";
+      packageName = "json-refs";
+      version = "2.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz";
+        sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89";
+      };
+    };
     "json-schema-0.2.3" = {
       name = "json-schema";
       packageName = "json-schema";
@@ -1633,6 +3019,15 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
+    "json-schema-deref-sync-0.3.4" = {
+      name = "json-schema-deref-sync";
+      packageName = "json-schema-deref-sync";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz";
+        sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1";
+      };
+    };
     "json-schema-traverse-0.3.1" = {
       name = "json-schema-traverse";
       packageName = "json-schema-traverse";
@@ -1651,6 +3046,15 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
+      };
+    };
     "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -1714,6 +3118,24 @@ let
         sha1 = "20813df3d712928b207378691a45066fae72dd57";
       };
     };
+    "kind-of-5.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
+        sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l";
+      };
+    };
+    "kind-of-6.0.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
+        sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk";
+      };
+    };
     "last-one-wins-1.0.4" = {
       name = "last-one-wins";
       packageName = "last-one-wins";
@@ -1723,6 +3145,24 @@ let
         sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a";
       };
     };
+    "latest-version-3.1.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
+        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
     "length-prefixed-message-3.0.3" = {
       name = "length-prefixed-message";
       packageName = "length-prefixed-message";
@@ -1732,6 +3172,15 @@ let
         sha1 = "245474d69abc0614dca368dc35aa8074982a23ac";
       };
     };
+    "lodash-3.10.1" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "3.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
+        sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
+      };
+    };
     "lodash-4.17.5" = {
       name = "lodash";
       packageName = "lodash";
@@ -1741,6 +3190,177 @@ let
         sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
       };
     };
+    "lodash-compat-3.10.2" = {
+      name = "lodash-compat";
+      packageName = "lodash-compat";
+      version = "3.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash-compat/-/lodash-compat-3.10.2.tgz";
+        sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183";
+      };
+    };
+    "lodash._arraypool-2.4.1" = {
+      name = "lodash._arraypool";
+      packageName = "lodash._arraypool";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz";
+        sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94";
+      };
+    };
+    "lodash._basebind-2.4.1" = {
+      name = "lodash._basebind";
+      packageName = "lodash._basebind";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz";
+        sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575";
+      };
+    };
+    "lodash._baseclone-2.4.1" = {
+      name = "lodash._baseclone";
+      packageName = "lodash._baseclone";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz";
+        sha1 = "30f823e57e17e3735d383bd62b60b387543b4186";
+      };
+    };
+    "lodash._basecreate-2.4.1" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz";
+        sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08";
+      };
+    };
+    "lodash._basecreatecallback-2.4.1" = {
+      name = "lodash._basecreatecallback";
+      packageName = "lodash._basecreatecallback";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz";
+        sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851";
+      };
+    };
+    "lodash._basecreatewrapper-2.4.1" = {
+      name = "lodash._basecreatewrapper";
+      packageName = "lodash._basecreatewrapper";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz";
+        sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f";
+      };
+    };
+    "lodash._createwrapper-2.4.1" = {
+      name = "lodash._createwrapper";
+      packageName = "lodash._createwrapper";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz";
+        sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607";
+      };
+    };
+    "lodash._getarray-2.4.1" = {
+      name = "lodash._getarray";
+      packageName = "lodash._getarray";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz";
+        sha1 = "faf1f7f810fa985a251c2187404481094839e5ee";
+      };
+    };
+    "lodash._isnative-2.4.1" = {
+      name = "lodash._isnative";
+      packageName = "lodash._isnative";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
+        sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
+      };
+    };
+    "lodash._maxpoolsize-2.4.1" = {
+      name = "lodash._maxpoolsize";
+      packageName = "lodash._maxpoolsize";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz";
+        sha1 = "9d482f463b8e66afbe59c2c14edb117060172334";
+      };
+    };
+    "lodash._objecttypes-2.4.1" = {
+      name = "lodash._objecttypes";
+      packageName = "lodash._objecttypes";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+      };
+    };
+    "lodash._releasearray-2.4.1" = {
+      name = "lodash._releasearray";
+      packageName = "lodash._releasearray";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz";
+        sha1 = "a6139630d76d1536b07ddc80962889b082f6a641";
+      };
+    };
+    "lodash._setbinddata-2.4.1" = {
+      name = "lodash._setbinddata";
+      packageName = "lodash._setbinddata";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz";
+        sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2";
+      };
+    };
+    "lodash._shimkeys-2.4.1" = {
+      name = "lodash._shimkeys";
+      packageName = "lodash._shimkeys";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
+        sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
+      };
+    };
+    "lodash._slice-2.4.1" = {
+      name = "lodash._slice";
+      packageName = "lodash._slice";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz";
+        sha1 = "745cf41a53597b18f688898544405efa2b06d90f";
+      };
+    };
+    "lodash.assign-2.4.1" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz";
+        sha1 = "84c39596dd71181a97b0652913a7c9675e49b1aa";
+      };
+    };
+    "lodash.bind-2.4.1" = {
+      name = "lodash.bind";
+      packageName = "lodash.bind";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz";
+        sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267";
+      };
+    };
+    "lodash.clonedeep-2.4.1" = {
+      name = "lodash.clonedeep";
+      packageName = "lodash.clonedeep";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-2.4.1.tgz";
+        sha1 = "f29203b40b12fee0a45d3631648259bebabc7868";
+      };
+    };
     "lodash.flattendeep-4.4.0" = {
       name = "lodash.flattendeep";
       packageName = "lodash.flattendeep";
@@ -1750,6 +3370,105 @@ let
         sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
       };
     };
+    "lodash.foreach-2.4.1" = {
+      name = "lodash.foreach";
+      packageName = "lodash.foreach";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz";
+        sha1 = "fe3fc3a34c86c94cab6f9522560282741e016309";
+      };
+    };
+    "lodash.forown-2.4.1" = {
+      name = "lodash.forown";
+      packageName = "lodash.forown";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz";
+        sha1 = "78b41eafe1405fa966459ea4193fd502d084524b";
+      };
+    };
+    "lodash.get-4.4.2" = {
+      name = "lodash.get";
+      packageName = "lodash.get";
+      version = "4.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    };
+    "lodash.identity-2.4.1" = {
+      name = "lodash.identity";
+      packageName = "lodash.identity";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz";
+        sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1";
+      };
+    };
+    "lodash.isarray-2.4.1" = {
+      name = "lodash.isarray";
+      packageName = "lodash.isarray";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz";
+        sha1 = "b52a326c1f62f6d7da73a31d5401df6ef44f0fa1";
+      };
+    };
+    "lodash.isequal-4.5.0" = {
+      name = "lodash.isequal";
+      packageName = "lodash.isequal";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+      };
+    };
+    "lodash.isfunction-2.4.1" = {
+      name = "lodash.isfunction";
+      packageName = "lodash.isfunction";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
+        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+      };
+    };
+    "lodash.isobject-2.4.1" = {
+      name = "lodash.isobject";
+      packageName = "lodash.isobject";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+      };
+    };
+    "lodash.keys-2.4.1" = {
+      name = "lodash.keys";
+      packageName = "lodash.keys";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
+        sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
+      };
+    };
+    "lodash.noop-2.4.1" = {
+      name = "lodash.noop";
+      packageName = "lodash.noop";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz";
+        sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a";
+      };
+    };
+    "lodash.support-2.4.1" = {
+      name = "lodash.support";
+      packageName = "lodash.support";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz";
+        sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515";
+      };
+    };
     "lodash.throttle-4.1.1" = {
       name = "lodash.throttle";
       packageName = "lodash.throttle";
@@ -1759,6 +3478,24 @@ let
         sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4";
       };
     };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "lowercase-keys-1.0.1" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+      };
+    };
     "lru-2.0.1" = {
       name = "lru";
       packageName = "lru";
@@ -1777,6 +3514,87 @@ let
         sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5";
       };
     };
+    "lru-cache-2.7.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+      };
+    };
+    "lru-cache-4.1.2" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz";
+        sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2";
+      };
+    };
+    "make-dir-1.2.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz";
+        sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8";
+      };
+    };
+    "map-cache-0.2.2" = {
+      name = "map-cache";
+      packageName = "map-cache";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz";
+        sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+      };
+    };
+    "map-stream-0.1.0" = {
+      name = "map-stream";
+      packageName = "map-stream";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+        sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+      };
+    };
+    "map-visit-1.0.0" = {
+      name = "map-visit";
+      packageName = "map-visit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz";
+        sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+      };
+    };
+    "md5-2.2.1" = {
+      name = "md5";
+      packageName = "md5";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz";
+        sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
+      };
+    };
+    "media-typer-0.3.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+      };
+    };
+    "memory-cache-0.1.6" = {
+      name = "memory-cache";
+      packageName = "memory-cache";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-cache/-/memory-cache-0.1.6.tgz";
+        sha1 = "2ed9933ed7a8c718249be7366f7ca8749acf8a24";
+      };
+    };
     "memory-pager-1.1.0" = {
       name = "memory-pager";
       packageName = "memory-pager";
@@ -1795,6 +3613,15 @@ let
         sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081";
       };
     };
+    "methods-1.1.2" = {
+      name = "methods";
+      packageName = "methods";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    };
     "micromatch-2.3.11" = {
       name = "micromatch";
       packageName = "micromatch";
@@ -1804,6 +3631,33 @@ let
         sha1 = "86677c97d1720b363431d04d0d15293bd38c1565";
       };
     };
+    "micromatch-3.1.10" = {
+      name = "micromatch";
+      packageName = "micromatch";
+      version = "3.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
+        sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i";
+      };
+    };
+    "mime-1.3.4" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+      };
+    };
+    "mime-1.4.1" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
+        sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398";
+      };
+    };
     "mime-1.6.0" = {
       name = "mime";
       packageName = "mime";
@@ -1840,6 +3694,15 @@ let
         sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
       };
     };
+    "minimatch-0.3.0" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+      };
+    };
     "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -1867,13 +3730,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.2.1" = {
+    "minipass-2.2.4" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.2.1";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz";
+        sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7";
       };
     };
     "minizlib-1.1.0" = {
@@ -1894,6 +3757,24 @@ let
         sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604";
       };
     };
+    "mixin-deep-1.3.1" = {
+      name = "mixin-deep";
+      packageName = "mixin-deep";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz";
+        sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi";
+      };
+    };
+    "mkdirp-0.3.0" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+      };
+    };
     "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -1903,6 +3784,33 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "mocha-2.5.3" = {
+      name = "mocha";
+      packageName = "mocha";
+      version = "2.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
+        sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58";
+      };
+    };
+    "mpath-0.2.1" = {
+      name = "mpath";
+      packageName = "mpath";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
+        sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e";
+      };
+    };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -1912,6 +3820,15 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
+    "multer-1.3.0" = {
+      name = "multer";
+      packageName = "multer";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz";
+        sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2";
+      };
+    };
     "multi-random-access-2.1.1" = {
       name = "multi-random-access";
       packageName = "multi-random-access";
@@ -1930,6 +3847,15 @@ let
         sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf";
       };
     };
+    "multicast-dns-7.0.0" = {
+      name = "multicast-dns";
+      packageName = "multicast-dns";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz";
+        sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806";
+      };
+    };
     "multicb-1.2.2" = {
       name = "multicb";
       packageName = "multicb";
@@ -1939,6 +3865,24 @@ let
         sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx";
       };
     };
+    "multistream-2.1.0" = {
+      name = "multistream";
+      packageName = "multistream";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz";
+        sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d";
+      };
+    };
+    "mute-stream-0.0.5" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+        sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
+      };
+    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -1957,13 +3901,13 @@ let
         sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2";
       };
     };
-    "nan-2.9.2" = {
+    "nan-2.10.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.9.2";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz";
-        sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn";
+        url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
+        sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc";
       };
     };
     "nanoassert-1.1.0" = {
@@ -1984,6 +3928,15 @@ let
         sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86";
       };
     };
+    "nanomatch-1.2.9" = {
+      name = "nanomatch";
+      packageName = "nanomatch";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz";
+        sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z";
+      };
+    };
     "nanotiming-1.0.1" = {
       name = "nanotiming";
       packageName = "nanotiming";
@@ -1993,6 +3946,15 @@ let
         sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3";
       };
     };
+    "native-promise-only-0.8.1" = {
+      name = "native-promise-only";
+      packageName = "native-promise-only";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz";
+        sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
+      };
+    };
     "ncp-1.0.1" = {
       name = "ncp";
       packageName = "ncp";
@@ -2011,6 +3973,15 @@ let
         sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d";
       };
     };
+    "needle-2.2.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz";
+        sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq";
+      };
+    };
     "nets-3.2.0" = {
       name = "nets";
       packageName = "nets";
@@ -2038,6 +4009,24 @@ let
         sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
       };
     };
+    "nodemon-1.17.2" = {
+      name = "nodemon";
+      packageName = "nodemon";
+      version = "1.17.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.2.tgz";
+        sha512 = "21s43bf7rf7cgnff0spwl9hnzvnqf5gwd11k4dg70pp5vh1kkkf03zzcbali25iazcifw8xbqh8mqnsggap6kpn7x3p0slr0rzdamxz";
+      };
+    };
+    "nopt-1.0.10" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      };
+    };
     "nopt-3.0.6" = {
       name = "nopt";
       packageName = "nopt";
@@ -2083,6 +4072,15 @@ let
         sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
       };
     };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
     "npmlog-4.1.2" = {
       name = "npmlog";
       packageName = "npmlog";
@@ -2110,6 +4108,15 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
+    "object-assign-3.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
+        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
+      };
+    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -2119,6 +4126,24 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
+    "object-copy-0.1.0" = {
+      name = "object-copy";
+      packageName = "object-copy";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz";
+        sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
+      };
+    };
+    "object-visit-1.0.1" = {
+      name = "object-visit";
+      packageName = "object-visit";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz";
+        sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
+      };
+    };
     "object.omit-2.0.1" = {
       name = "object.omit";
       packageName = "object.omit";
@@ -2128,6 +4153,33 @@ let
         sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa";
       };
     };
+    "object.pick-1.3.0" = {
+      name = "object.pick";
+      packageName = "object.pick";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
+      };
+    };
+    "on-finished-2.2.1" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
+        sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
+      };
+    };
+    "on-finished-2.3.0" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+      };
+    };
     "once-1.4.0" = {
       name = "once";
       packageName = "once";
@@ -2137,6 +4189,24 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "onetime-1.1.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz";
+        sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
+      };
+    };
+    "optimist-0.6.1" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -2173,6 +4243,24 @@ let
         sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
       };
     };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "package-json-4.0.1" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
+        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
+      };
+    };
     "parse-glob-3.0.4" = {
       name = "parse-glob";
       packageName = "parse-glob";
@@ -2191,6 +4279,33 @@ let
         sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536";
       };
     };
+    "parseurl-1.3.2" = {
+      name = "parseurl";
+      packageName = "parseurl";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
+        sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+      };
+    };
+    "pascalcase-0.1.1" = {
+      name = "pascalcase";
+      packageName = "pascalcase";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz";
+        sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14";
+      };
+    };
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -2200,6 +4315,51 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
+    "path-is-inside-1.0.2" = {
+      name = "path-is-inside";
+      packageName = "path-is-inside";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    };
+    "path-loader-1.0.4" = {
+      name = "path-loader";
+      packageName = "path-loader";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz";
+        sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk";
+      };
+    };
+    "path-to-regexp-1.7.0" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
+        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+      };
+    };
+    "pause-stream-0.0.11" = {
+      name = "pause-stream";
+      packageName = "pause-stream";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+        sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+      };
+    };
     "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
@@ -2209,6 +4369,15 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
+    "pify-3.0.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    };
     "pkginfo-0.3.1" = {
       name = "pkginfo";
       packageName = "pkginfo";
@@ -2227,6 +4396,24 @@ let
         sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff";
       };
     };
+    "posix-character-classes-0.1.1" = {
+      name = "posix-character-classes";
+      packageName = "posix-character-classes";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
+        sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
+      };
+    };
+    "prepend-http-1.0.4" = {
+      name = "prepend-http";
+      packageName = "prepend-http";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    };
     "preserve-0.2.0" = {
       name = "preserve";
       packageName = "preserve";
@@ -2308,6 +4495,33 @@ let
         sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a";
       };
     };
+    "ps-tree-1.1.0" = {
+      name = "ps-tree";
+      packageName = "ps-tree";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz";
+        sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014";
+      };
+    };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "pstree.remy-1.1.0" = {
+      name = "pstree.remy";
+      packageName = "pstree.remy";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz";
+        sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb";
+      };
+    };
     "pump-1.0.3" = {
       name = "pump";
       packageName = "pump";
@@ -2326,6 +4540,15 @@ let
         sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf";
       };
     };
+    "pump-3.0.0" = {
+      name = "pump";
+      packageName = "pump";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
+      };
+    };
     "punycode-1.4.1" = {
       name = "punycode";
       packageName = "punycode";
@@ -2335,6 +4558,42 @@ let
         sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     };
+    "punycode-2.1.0" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz";
+        sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d";
+      };
+    };
+    "qs-2.3.3" = {
+      name = "qs";
+      packageName = "qs";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+        sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+      };
+    };
+    "qs-2.4.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
+        sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
+      };
+    };
+    "qs-4.0.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+        sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
+      };
+    };
     "qs-6.5.1" = {
       name = "qs";
       packageName = "qs";
@@ -2398,13 +4657,22 @@ let
         sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
       };
     };
-    "rc-1.2.5" = {
+    "raw-body-2.0.2" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.0.2.tgz";
+        sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
+      };
+    };
+    "rc-1.2.6" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz";
-        sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz";
+        sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092";
       };
     };
     "read-1.0.7" = {
@@ -2416,6 +4684,24 @@ let
         sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
+    "readable-stream-1.0.27-1" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.0.27-1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+        sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
+      };
+    };
+    "readable-stream-1.1.14" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+      };
+    };
     "readable-stream-2.3.5" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -2434,6 +4720,15 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
+    "readline2-1.0.1" = {
+      name = "readline2";
+      packageName = "readline2";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
+        sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
+      };
+    };
     "recursive-watch-1.1.3" = {
       name = "recursive-watch";
       packageName = "recursive-watch";
@@ -2443,6 +4738,15 @@ let
         sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx";
       };
     };
+    "reduce-component-1.0.1" = {
+      name = "reduce-component";
+      packageName = "reduce-component";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+        sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
+      };
+    };
     "regex-cache-0.4.4" = {
       name = "regex-cache";
       packageName = "regex-cache";
@@ -2452,6 +4756,33 @@ let
         sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx";
       };
     };
+    "regex-not-1.0.2" = {
+      name = "regex-not";
+      packageName = "regex-not";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
+        sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917";
+      };
+    };
+    "registry-auth-token-3.3.2" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
+        sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94";
+      };
+    };
+    "registry-url-3.1.0" = {
+      name = "registry-url";
+      packageName = "registry-url";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+      };
+    };
     "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
@@ -2479,15 +4810,6 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "request-2.83.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.83.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
-        sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
-      };
-    };
     "request-2.85.0" = {
       name = "request";
       packageName = "request";
@@ -2506,6 +4828,33 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
+    "resolve-url-0.2.1" = {
+      name = "resolve-url";
+      packageName = "resolve-url";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
+        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+      };
+    };
+    "restore-cursor-1.0.1" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
+        sha1 = "34661f46886327fed2991479152252df92daa541";
+      };
+    };
+    "ret-0.1.15" = {
+      name = "ret";
+      packageName = "ret";
+      version = "0.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
+        sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad";
+      };
+    };
     "revalidator-0.1.8" = {
       name = "revalidator";
       packageName = "revalidator";
@@ -2515,6 +4864,15 @@ let
         sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
       };
     };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
     "rimraf-2.6.2" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -2524,6 +4882,15 @@ let
         sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
       };
     };
+    "run-async-0.1.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
+        sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
+      };
+    };
     "rusha-0.8.13" = {
       name = "rusha";
       packageName = "rusha";
@@ -2533,6 +4900,15 @@ let
         sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a";
       };
     };
+    "rx-lite-3.1.2" = {
+      name = "rx-lite";
+      packageName = "rx-lite";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
+        sha1 = "19ce502ca572665f3b647b10939f97fd1615f102";
+      };
+    };
     "safe-buffer-5.1.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -2542,6 +4918,33 @@ let
         sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
+    "safe-regex-1.1.0" = {
+      name = "safe-regex";
+      packageName = "safe-regex";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
+        sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+      };
+    };
+    "sanitize-filename-1.6.1" = {
+      name = "sanitize-filename";
+      packageName = "sanitize-filename";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz";
+        sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+      };
+    };
     "semver-5.3.0" = {
       name = "semver";
       packageName = "semver";
@@ -2560,6 +4963,33 @@ let
         sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
       };
     };
+    "semver-diff-2.1.0" = {
+      name = "semver-diff";
+      packageName = "semver-diff";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    };
+    "send-0.16.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.16.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
+        sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk";
+      };
+    };
+    "serve-static-1.13.2" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
+        sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7";
+      };
+    };
     "set-blocking-2.0.0" = {
       name = "set-blocking";
       packageName = "set-blocking";
@@ -2578,6 +5008,60 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
+    "set-value-0.4.3" = {
+      name = "set-value";
+      packageName = "set-value";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz";
+        sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1";
+      };
+    };
+    "set-value-2.0.0" = {
+      name = "set-value";
+      packageName = "set-value";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz";
+        sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7";
+      };
+    };
+    "setprototypeof-1.0.3" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+      };
+    };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
+    "sigmund-1.0.1" = {
+      name = "sigmund";
+      packageName = "sigmund";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+      };
+    };
     "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
@@ -2614,6 +5098,15 @@ let
         sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w";
       };
     };
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+      };
+    };
     "slasp-0.0.4" = {
       name = "slasp";
       packageName = "slasp";
@@ -2632,6 +5125,33 @@ let
         sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
+    "snapdragon-0.8.2" = {
+      name = "snapdragon";
+      packageName = "snapdragon";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
+        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
+      };
+    };
+    "snapdragon-node-2.1.1" = {
+      name = "snapdragon-node";
+      packageName = "snapdragon-node";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
+        sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv";
+      };
+    };
+    "snapdragon-util-3.0.1" = {
+      name = "snapdragon-util";
+      packageName = "snapdragon-util";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
+        sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr";
+      };
+    };
     "sntp-2.1.0" = {
       name = "sntp";
       packageName = "sntp";
@@ -2641,13 +5161,13 @@ let
         sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
-    "sodium-javascript-0.5.4" = {
+    "sodium-javascript-0.5.5" = {
       name = "sodium-javascript";
       packageName = "sodium-javascript";
-      version = "0.5.4";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz";
-        sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30";
+        url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz";
+        sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
       };
     };
     "sodium-native-2.1.4" = {
@@ -2686,6 +5206,51 @@ let
         sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899";
       };
     };
+    "source-map-0.4.4" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-resolve-0.5.1" = {
+      name = "source-map-resolve";
+      packageName = "source-map-resolve";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz";
+        sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh";
+      };
+    };
+    "source-map-url-0.4.0" = {
+      name = "source-map-url";
+      packageName = "source-map-url";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz";
+        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+      };
+    };
+    "spark-md5-1.0.1" = {
+      name = "spark-md5";
+      packageName = "spark-md5";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spark-md5/-/spark-md5-1.0.1.tgz";
+        sha1 = "c4b9a8d41cf7b0845423a821824f8dffa0f51b7c";
+      };
+    };
     "sparse-bitfield-3.0.3" = {
       name = "sparse-bitfield";
       packageName = "sparse-bitfield";
@@ -2704,13 +5269,40 @@ let
         sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2";
       };
     };
-    "sshpk-1.13.1" = {
+    "split-0.3.3" = {
+      name = "split";
+      packageName = "split";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz";
+        sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
+      };
+    };
+    "split-string-3.1.0" = {
+      name = "split-string";
+      packageName = "split-string";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
+        sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp";
+      };
+    };
+    "sprintf-js-1.0.3" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    };
+    "sshpk-1.14.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.13.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
-        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
       };
     };
     "stack-trace-0.0.10" = {
@@ -2722,6 +5314,15 @@ let
         sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
+    "static-extend-0.1.2" = {
+      name = "static-extend";
+      packageName = "static-extend";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz";
+        sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
+      };
+    };
     "status-logger-3.1.1" = {
       name = "status-logger";
       packageName = "status-logger";
@@ -2731,6 +5332,24 @@ let
         sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl";
       };
     };
+    "statuses-1.3.1" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
+      };
+    };
+    "statuses-1.4.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
+        sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f";
+      };
+    };
     "stream-collector-1.0.1" = {
       name = "stream-collector";
       packageName = "stream-collector";
@@ -2740,6 +5359,15 @@ let
         sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15";
       };
     };
+    "stream-combiner-0.0.4" = {
+      name = "stream-combiner";
+      packageName = "stream-combiner";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+        sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+      };
+    };
     "stream-each-1.2.2" = {
       name = "stream-each";
       packageName = "stream-each";
@@ -2767,6 +5395,24 @@ let
         sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
       };
     };
+    "streamsearch-0.1.2" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      };
+    };
+    "string-3.3.3" = {
+      name = "string";
+      packageName = "string";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string/-/string-3.3.3.tgz";
+        sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0";
+      };
+    };
     "string-width-1.0.2" = {
       name = "string-width";
       packageName = "string-width";
@@ -2785,6 +5431,15 @@ let
         sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
     "string_decoder-1.0.3" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -2821,6 +5476,15 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
     "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -2839,6 +5503,42 @@ let
         sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760";
       };
     };
+    "superagent-1.8.5" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "1.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz";
+        sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55";
+      };
+    };
+    "superagent-3.8.2" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz";
+        sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
+      };
+    };
+    "supports-color-1.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz";
+        sha1 = "ff1ed1e61169d06b3cf2d588e188b18d8847e17e";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
     "supports-color-4.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -2857,6 +5557,51 @@ let
         sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
       };
     };
+    "swagger-converter-0.1.7" = {
+      name = "swagger-converter";
+      packageName = "swagger-converter";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.1.7.tgz";
+        sha1 = "a097519c6f1ee4dd67e308d9b53ddc9c2b257f97";
+      };
+    };
+    "swagger-converter-0.2.0" = {
+      name = "swagger-converter";
+      packageName = "swagger-converter";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.2.0.tgz";
+        sha1 = "354023cfc5ed3d4ef6895c310189067bbe66d616";
+      };
+    };
+    "swagger-editor-2.10.5" = {
+      name = "swagger-editor";
+      packageName = "swagger-editor";
+      version = "2.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-editor/-/swagger-editor-2.10.5.tgz";
+        sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a";
+      };
+    };
+    "swagger-test-templates-1.4.3" = {
+      name = "swagger-test-templates";
+      packageName = "swagger-test-templates";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz";
+        sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0";
+      };
+    };
+    "swagger-tools-0.9.16" = {
+      name = "swagger-tools";
+      packageName = "swagger-tools";
+      version = "0.9.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-tools/-/swagger-tools-0.9.16.tgz";
+        sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb";
+      };
+    };
     "tar-2.2.1" = {
       name = "tar";
       packageName = "tar";
@@ -2866,13 +5611,22 @@ let
         sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
       };
     };
-    "tar-4.4.0" = {
+    "tar-4.4.1" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz";
-        sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz";
+        sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv";
+      };
+    };
+    "term-size-1.2.0" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
+        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
     "throttle-1.0.3" = {
@@ -2884,6 +5638,15 @@ let
         sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7";
       };
     };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
@@ -2911,6 +5674,15 @@ let
         sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
+    "timed-out-4.0.1" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
+        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
+      };
+    };
     "to-buffer-1.1.0" = {
       name = "to-buffer";
       packageName = "to-buffer";
@@ -2920,6 +5692,42 @@ let
         sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa";
       };
     };
+    "to-iso-string-0.0.2" = {
+      name = "to-iso-string";
+      packageName = "to-iso-string";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz";
+        sha1 = "4dc19e664dfccbe25bd8db508b00c6da158255d1";
+      };
+    };
+    "to-object-path-0.3.0" = {
+      name = "to-object-path";
+      packageName = "to-object-path";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz";
+        sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
+      };
+    };
+    "to-regex-3.0.2" = {
+      name = "to-regex";
+      packageName = "to-regex";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
+        sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm";
+      };
+    };
+    "to-regex-range-2.1.1" = {
+      name = "to-regex-range";
+      packageName = "to-regex-range";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz";
+        sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
+      };
+    };
     "toiletdb-1.4.1" = {
       name = "toiletdb";
       packageName = "toiletdb";
@@ -2929,6 +5737,15 @@ let
         sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l";
       };
     };
+    "touch-3.1.0" = {
+      name = "touch";
+      packageName = "touch";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz";
+        sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q";
+      };
+    };
     "tough-cookie-2.3.4" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -2947,6 +5764,15 @@ let
         sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78";
       };
     };
+    "traverse-0.6.6" = {
+      name = "traverse";
+      packageName = "traverse";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+      };
+    };
     "trim-0.0.1" = {
       name = "trim";
       packageName = "trim";
@@ -2956,6 +5782,15 @@ let
         sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
       };
     };
+    "truncate-utf8-bytes-1.0.2" = {
+      name = "truncate-utf8-bytes";
+      packageName = "truncate-utf8-bytes";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz";
+        sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
@@ -2983,6 +5818,15 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
+    "type-is-1.6.16" = {
+      name = "type-is";
+      packageName = "type-is";
+      version = "1.6.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz";
+        sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x";
+      };
+    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -2992,13 +5836,58 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "uint64be-2.0.1" = {
+    "uglify-js-2.8.29" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.8.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";
+        sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+      };
+    };
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+    };
+    "uint64be-2.0.2" = {
       name = "uint64be";
       packageName = "uint64be";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz";
-        sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428";
+        url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz";
+        sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm";
+      };
+    };
+    "undefsafe-2.0.2" = {
+      name = "undefsafe";
+      packageName = "undefsafe";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz";
+        sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76";
+      };
+    };
+    "union-value-1.0.0" = {
+      name = "union-value";
+      packageName = "union-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz";
+        sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4";
+      };
+    };
+    "unique-string-1.0.0" = {
+      name = "unique-string";
+      packageName = "unique-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
+        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
     "unixify-1.0.0" = {
@@ -3037,6 +5926,24 @@ let
         sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec";
       };
     };
+    "unpipe-1.0.0" = {
+      name = "unpipe";
+      packageName = "unpipe";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+      };
+    };
+    "unset-value-1.0.0" = {
+      name = "unset-value";
+      packageName = "unset-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz";
+        sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
+      };
+    };
     "untildify-3.0.2" = {
       name = "untildify";
       packageName = "untildify";
@@ -3046,6 +5953,78 @@ let
         sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1";
       };
     };
+    "unzip-response-2.0.1" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
+      };
+    };
+    "upath-1.0.4" = {
+      name = "upath";
+      packageName = "upath";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz";
+        sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
+      };
+    };
+    "update-notifier-2.3.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz";
+        sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
+      };
+    };
+    "uri-js-3.0.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz";
+        sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
+      };
+    };
+    "urix-0.1.0" = {
+      name = "urix";
+      packageName = "urix";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz";
+        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+      };
+    };
+    "url-parse-lax-1.0.0" = {
+      name = "url-parse-lax";
+      packageName = "url-parse-lax";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz";
+        sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
+      };
+    };
+    "use-3.1.0" = {
+      name = "use";
+      packageName = "use";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz";
+        sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9";
+      };
+    };
+    "utf8-byte-length-1.0.4" = {
+      name = "utf8-byte-length";
+      packageName = "utf8-byte-length";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz";
+        sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61";
+      };
+    };
     "util-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -3064,13 +6043,22 @@ let
         sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a";
       };
     };
-    "utp-native-1.6.2" = {
+    "utils-merge-1.0.1" = {
+      name = "utils-merge";
+      packageName = "utils-merge";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    };
+    "utp-native-1.7.0" = {
       name = "utp-native";
       packageName = "utp-native";
-      version = "1.6.2";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz";
-        sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg";
+        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz";
+        sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz";
       };
     };
     "uuid-3.2.1" = {
@@ -3082,6 +6070,24 @@ let
         sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
       };
     };
+    "valid-url-1.0.9" = {
+      name = "valid-url";
+      packageName = "valid-url";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz";
+        sha1 = "1c14479b40f1397a75782f115e4086447433a200";
+      };
+    };
+    "validator-9.4.1" = {
+      name = "validator";
+      packageName = "validator";
+      version = "9.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+        sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1";
+      };
+    };
     "varint-3.0.1" = {
       name = "varint";
       packageName = "varint";
@@ -3136,6 +6142,24 @@ let
         sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
+    "widest-line-2.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz";
+        sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
     "winston-2.1.1" = {
       name = "winston";
       packageName = "winston";
@@ -3145,6 +6169,24 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
     "wrap-ansi-3.0.1" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -3163,6 +6205,24 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
+    "write-file-atomic-2.3.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
+        sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
+      };
+    };
+    "xdg-basedir-3.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
+        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+      };
+    };
     "xhr-2.4.1" = {
       name = "xhr";
       packageName = "xhr";
@@ -3190,6 +6250,15 @@ let
         sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
       };
     };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
     "yallist-3.0.2" = {
       name = "yallist";
       packageName = "yallist";
@@ -3199,6 +6268,24 @@ let
         sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
       };
     };
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    };
+    "z-schema-3.19.1" = {
+      name = "z-schema";
+      packageName = "z-schema";
+      version = "3.19.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz";
+        sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc";
+      };
+    };
   };
 in
 {
@@ -3247,7 +6334,7 @@ in
     dependencies = [
       sources."abstract-random-access-1.1.2"
       sources."ajv-5.5.2"
-      sources."ansi-diff-stream-1.2.0"
+      sources."ansi-diff-stream-1.2.1"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
@@ -3283,13 +6370,18 @@ in
           sources."kind-of-4.0.0"
         ];
       })
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-1.0.0"
       sources."buffer-equals-1.0.4"
+      sources."buffer-fill-0.1.0"
+      sources."buffer-from-1.0.0"
       sources."buffer-indexof-1.1.1"
-      sources."bulk-write-stream-1.1.3"
+      sources."bulk-write-stream-1.1.4"
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.3.2"
+      sources."circular-append-file-1.0.1"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
       sources."co-4.6.0"
@@ -3299,7 +6391,7 @@ in
       sources."colors-1.2.1"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.1"
+      sources."concat-stream-1.6.2"
       sources."connections-1.4.2"
       sources."content-types-0.1.0"
       sources."core-util-is-1.0.2"
@@ -3315,13 +6407,16 @@ in
       (sources."dat-doctor-1.3.1" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."dns-packet-1.3.1"
+          sources."dns-socket-1.6.3"
           sources."lru-2.0.1"
+          sources."multicast-dns-6.2.3"
           sources."pump-1.0.3"
         ];
       })
       sources."dat-encoding-5.0.1"
-      sources."dat-ignore-2.0.0"
-      (sources."dat-json-1.0.1" // {
+      sources."dat-ignore-2.1.0"
+      (sources."dat-json-1.0.2" // {
         dependencies = [
           sources."dat-encoding-4.0.2"
           sources."debug-2.6.9"
@@ -3339,6 +6434,7 @@ in
       })
       (sources."dat-node-3.5.8" // {
         dependencies = [
+          sources."buffer-alloc-unsafe-0.1.1"
           sources."minimist-0.0.8"
           sources."process-nextick-args-1.0.7"
           sources."pump-1.0.3"
@@ -3355,15 +6451,24 @@ in
       sources."deep-equal-0.2.2"
       sources."delayed-stream-1.0.0"
       sources."directory-index-html-2.1.0"
-      sources."discovery-channel-5.4.7"
+      (sources."discovery-channel-5.5.1" // {
+        dependencies = [
+          sources."pump-3.0.0"
+        ];
+      })
       (sources."discovery-swarm-4.4.2" // {
         dependencies = [
+          (sources."dns-discovery-6.1.0" // {
+            dependencies = [
+              sources."thunky-1.0.2"
+            ];
+          })
           sources."thunky-0.1.0"
         ];
       })
       sources."dns-discovery-5.6.1"
-      sources."dns-packet-1.3.1"
-      sources."dns-socket-1.6.3"
+      sources."dns-packet-4.1.0"
+      sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
       sources."duplexify-3.5.4"
@@ -3401,12 +6506,12 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.12.3" // {
+      (sources."hypercore-6.12.5" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
       })
-      sources."hypercore-protocol-6.6.0"
+      sources."hypercore-protocol-6.6.2"
       (sources."hyperdrive-9.12.3" // {
         dependencies = [
           sources."varint-4.0.1"
@@ -3468,11 +6573,12 @@ in
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
-      sources."multicast-dns-6.2.3"
+      sources."multicast-dns-7.0.0"
       sources."multicb-1.2.2"
+      sources."multistream-2.1.0"
       sources."mute-stream-0.0.7"
       sources."mutexify-1.2.0"
-      sources."nan-2.9.2"
+      sources."nan-2.10.0"
       sources."nanoassert-1.1.0"
       sources."nanobus-3.3.0"
       sources."nanotiming-1.0.1"
@@ -3541,14 +6647,14 @@ in
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
-      sources."sodium-javascript-0.5.4"
+      sources."sodium-javascript-0.5.5"
       sources."sodium-native-2.1.4"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.1.0"
       sources."sorted-indexof-1.0.0"
       sources."sparse-bitfield-3.0.3"
       sources."speedometer-1.0.0"
-      sources."sshpk-1.13.1"
+      sources."sshpk-1.14.1"
       sources."stack-trace-0.0.10"
       sources."status-logger-3.1.1"
       sources."stream-collector-1.0.1"
@@ -3581,14 +6687,14 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."uint64be-2.0.1"
+      sources."uint64be-2.0.2"
       sources."unixify-1.0.0"
       sources."unordered-array-remove-1.0.2"
       sources."unordered-set-1.1.0"
       sources."untildify-3.0.2"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
-      sources."utp-native-1.6.2"
+      sources."utp-native-1.7.0"
       sources."uuid-3.2.1"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
@@ -3650,10 +6756,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.4";
+    version = "5.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz";
-      sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz";
+      sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -3807,7 +6913,7 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."sntp-2.1.0"
-      sources."sshpk-1.13.1"
+      sources."sshpk-1.14.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
@@ -3852,124 +6958,76 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.8.0";
+    version = "0.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.8.0.tgz";
-      sha512 = "3z3mz92ya4hx3mg902sb6kwlkfz8dkc12hxcnp4sygbiahbiknzh585jrf9zf3bqd9xgsh9109dz5mqwjh268zl0nmn2n30fl7cqa49";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz";
+      sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.4"
-      sources."asn1-0.2.3"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      sources."caseless-0.12.0"
       sources."chownr-1.0.1"
-      sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
       sources."deep-extend-0.4.2"
-      sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
-      sources."ecc-jsbn-0.1.1"
-      sources."extend-3.0.1"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-1.1.0"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
       sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
       sources."glob-7.1.2"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.19"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.3.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
-      sources."mime-db-1.33.0"
-      sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.1"
+      sources."minipass-2.2.4"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."needle-2.2.0"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.3"
       sources."npm-packlist-1.1.10"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
-      sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
-      sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      (sources."rc-1.2.5" // {
+      (sources."rc-1.2.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-2.3.5"
-      sources."request-2.83.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
+      sources."sax-1.2.4"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.13.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.0"
-      sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
+      sources."tar-4.4.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."verror-1.10.0"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
       sources."yallist-3.0.2"
@@ -3986,10 +7044,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.35.8";
+    version = "1.36.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.8.tgz";
-      sha1 = "de87c7b33f00189654aea49b4eb56317dcdbe7cd";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.36.1.tgz";
+      sha1 = "43537276c39cc2d9e749d1fd7a3c159b2db39877";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -4057,13 +7115,595 @@ in
     production = true;
     bypassCache = true;
   };
+  swagger = nodeEnv.buildNodePackage {
+    name = "swagger";
+    packageName = "swagger";
+    version = "0.7.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/swagger/-/swagger-0.7.5.tgz";
+      sha1 = "3be6ee3d392c3b006fc7a9b5b2d60c7e834860fd";
+    };
+    dependencies = [
+      sources."URIjs-1.16.1"
+      sources."abbrev-1.1.1"
+      sources."align-text-0.1.4"
+      sources."amdefine-1.0.1"
+      sources."ansi-align-2.0.0"
+      sources."ansi-escapes-1.4.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."append-field-0.1.0"
+      sources."argparse-1.0.10"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-unique-0.3.2"
+      sources."assign-symbols-1.0.0"
+      sources."async-1.5.2"
+      sources."async-each-1.0.1"
+      sources."asynckit-0.4.0"
+      sources."atob-2.0.3"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          (sources."define-property-1.0.0" // {
+            dependencies = [
+              sources."kind-of-6.0.2"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."binary-extensions-1.11.0"
+      (sources."body-parser-1.12.4" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."qs-2.4.2"
+        ];
+      })
+      sources."boxen-1.3.0"
+      sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.1" // {
+        dependencies = [
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."buffer-from-1.0.0"
+      sources."busboy-0.2.14"
+      sources."bytes-1.0.0"
+      sources."cache-base-1.0.1"
+      sources."camelcase-4.1.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."center-align-0.1.3"
+      sources."chalk-1.1.3"
+      sources."charenc-0.0.2"
+      (sources."chokidar-2.0.3" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."cli-boxes-1.0.0"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-1.1.1"
+      sources."cliui-2.1.0"
+      sources."clone-2.0.0"
+      sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-1.9.1"
+      sources."color-name-1.1.3"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.15.1"
+      sources."component-emitter-1.2.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."configstore-3.1.1"
+      sources."connect-3.6.6"
+      sources."content-type-1.0.4"
+      sources."cookiejar-2.1.1"
+      sources."copy-descriptor-0.1.1"
+      sources."core-util-is-1.0.2"
+      sources."create-error-class-3.0.2"
+      sources."cross-spawn-5.1.0"
+      sources."crypt-0.0.2"
+      sources."crypto-random-string-1.0.0"
+      sources."dag-map-1.0.2"
+      sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-extend-0.4.2"
+      sources."define-property-2.0.2"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."dicer-0.2.5"
+      sources."diff-1.4.0"
+      sources."dot-prop-4.2.0"
+      sources."duplexer-0.1.1"
+      sources."duplexer3-0.1.4"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."escape-html-1.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.0"
+      sources."etag-1.8.1"
+      sources."event-stream-3.3.4"
+      sources."execa-0.7.0"
+      sources."exit-hook-1.1.1"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."extend-3.0.1"
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."figures-1.7.0"
+      sources."fill-range-4.0.0"
+      sources."finalhandler-1.1.0"
+      sources."for-in-1.0.2"
+      sources."form-data-2.3.2"
+      sources."formidable-1.2.1"
+      sources."fragment-cache-0.2.1"
+      sources."fresh-0.5.2"
+      sources."from-0.1.7"
+      sources."fs-extra-0.24.0"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.1.3"
+      sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.2"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."global-dirs-0.1.1"
+      sources."got-6.7.1"
+      sources."graceful-fs-4.1.11"
+      sources."graphlib-2.1.5"
+      sources."growl-1.9.2"
+      sources."handlebars-4.0.11"
+      sources."has-ansi-2.0.0"
+      sources."has-flag-3.0.0"
+      sources."has-value-1.0.0"
+      sources."has-values-1.0.0"
+      (sources."http-errors-1.6.2" // {
+        dependencies = [
+          sources."depd-1.1.1"
+        ];
+      })
+      sources."iconv-lite-0.4.8"
+      sources."ignore-by-default-1.0.1"
+      sources."import-lazy-2.1.0"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."inquirer-0.10.1"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-glob-4.0.0"
+      sources."is-installed-globally-0.1.0"
+      sources."is-invalid-path-0.1.0"
+      sources."is-npm-1.0.0"
+      sources."is-number-4.0.0"
+      sources."is-obj-1.0.1"
+      sources."is-odd-2.0.0"
+      sources."is-path-inside-1.0.1"
+      sources."is-plain-object-2.0.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."is-stream-1.1.0"
+      sources."is-valid-path-0.1.1"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      (sources."jade-0.26.3" // {
+        dependencies = [
+          sources."commander-0.6.1"
+          sources."mkdirp-0.3.0"
+        ];
+      })
+      sources."js-yaml-3.11.0"
+      (sources."json-refs-2.1.7" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+          sources."qs-6.5.1"
+          sources."superagent-3.8.2"
+        ];
+      })
+      (sources."json-schema-deref-sync-0.3.4" // {
+        dependencies = [
+          sources."lodash-4.17.5"
+        ];
+      })
+      sources."jsonfile-2.4.0"
+      sources."kind-of-6.0.2"
+      sources."latest-version-3.1.0"
+      sources."lazy-cache-1.0.4"
+      sources."lodash-3.10.1"
+      sources."lodash-compat-3.10.2"
+      sources."lodash._arraypool-2.4.1"
+      sources."lodash._basebind-2.4.1"
+      sources."lodash._baseclone-2.4.1"
+      sources."lodash._basecreate-2.4.1"
+      sources."lodash._basecreatecallback-2.4.1"
+      sources."lodash._basecreatewrapper-2.4.1"
+      sources."lodash._createwrapper-2.4.1"
+      sources."lodash._getarray-2.4.1"
+      sources."lodash._isnative-2.4.1"
+      sources."lodash._maxpoolsize-2.4.1"
+      sources."lodash._objecttypes-2.4.1"
+      sources."lodash._releasearray-2.4.1"
+      sources."lodash._setbinddata-2.4.1"
+      sources."lodash._shimkeys-2.4.1"
+      sources."lodash._slice-2.4.1"
+      sources."lodash.assign-2.4.1"
+      sources."lodash.bind-2.4.1"
+      sources."lodash.clonedeep-2.4.1"
+      sources."lodash.foreach-2.4.1"
+      sources."lodash.forown-2.4.1"
+      sources."lodash.get-4.4.2"
+      sources."lodash.identity-2.4.1"
+      sources."lodash.isarray-2.4.1"
+      sources."lodash.isequal-4.5.0"
+      sources."lodash.isfunction-2.4.1"
+      sources."lodash.isobject-2.4.1"
+      sources."lodash.keys-2.4.1"
+      sources."lodash.noop-2.4.1"
+      sources."lodash.support-2.4.1"
+      sources."longest-1.0.1"
+      sources."lowercase-keys-1.0.1"
+      sources."lru-cache-2.7.3"
+      sources."make-dir-1.2.0"
+      sources."map-cache-0.2.2"
+      sources."map-stream-0.1.0"
+      sources."map-visit-1.0.0"
+      sources."md5-2.2.1"
+      sources."media-typer-0.3.0"
+      sources."memory-cache-0.1.6"
+      sources."methods-1.1.2"
+      sources."micromatch-3.1.10"
+      sources."mime-1.4.1"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mixin-deep-1.3.1"
+      sources."mkdirp-0.5.1"
+      (sources."mocha-2.5.3" // {
+        dependencies = [
+          sources."commander-2.3.0"
+          sources."debug-2.2.0"
+          sources."escape-string-regexp-1.0.2"
+          sources."glob-3.2.11"
+          sources."minimatch-0.3.0"
+          sources."ms-0.7.1"
+          sources."supports-color-1.2.0"
+        ];
+      })
+      sources."mpath-0.2.1"
+      sources."ms-2.0.0"
+      (sources."multer-1.3.0" // {
+        dependencies = [
+          sources."ee-first-1.1.1"
+          sources."isarray-1.0.0"
+          sources."on-finished-2.3.0"
+          sources."readable-stream-2.3.5"
+          sources."string_decoder-1.0.3"
+        ];
+      })
+      sources."mute-stream-0.0.5"
+      sources."nan-2.10.0"
+      sources."nanomatch-1.2.9"
+      sources."native-promise-only-0.8.1"
+      (sources."nodemon-1.17.2" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
+          sources."debug-3.1.0"
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."has-values-0.1.4"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."is-fullwidth-code-point-2.0.0"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."lru-cache-4.1.2"
+          sources."minimist-1.2.0"
+          sources."strip-ansi-4.0.0"
+          sources."supports-color-5.3.0"
+        ];
+      })
+      sources."nopt-1.0.10"
+      sources."normalize-path-2.1.1"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."object-copy-0.1.0"
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."on-finished-2.3.0"
+      sources."once-1.4.0"
+      sources."onetime-1.1.0"
+      sources."optimist-0.6.1"
+      sources."p-finally-1.0.0"
+      sources."package-json-4.0.1"
+      sources."parseurl-1.3.2"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
+      sources."path-loader-1.0.4"
+      sources."path-to-regexp-1.7.0"
+      sources."pause-stream-0.0.11"
+      sources."pify-3.0.0"
+      sources."posix-character-classes-0.1.1"
+      sources."prepend-http-1.0.4"
+      sources."process-nextick-args-2.0.0"
+      sources."ps-tree-1.1.0"
+      sources."pseudomap-1.0.2"
+      sources."pstree.remy-1.1.0"
+      sources."punycode-2.1.0"
+      sources."qs-4.0.0"
+      sources."range-parser-1.2.0"
+      (sources."raw-body-2.0.2" // {
+        dependencies = [
+          sources."bytes-2.1.0"
+        ];
+      })
+      sources."rc-1.2.6"
+      sources."readable-stream-2.3.5"
+      sources."readdirp-2.1.0"
+      sources."readline2-1.0.1"
+      sources."reduce-component-1.0.1"
+      sources."regex-not-1.0.2"
+      sources."registry-auth-token-3.3.2"
+      sources."registry-url-3.1.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."resolve-url-0.2.1"
+      sources."restore-cursor-1.0.1"
+      sources."ret-0.1.15"
+      sources."right-align-0.1.3"
+      sources."rimraf-2.6.2"
+      sources."run-async-0.1.0"
+      sources."rx-lite-3.1.2"
+      sources."safe-buffer-5.1.1"
+      sources."safe-regex-1.1.0"
+      sources."sanitize-filename-1.6.1"
+      sources."semver-5.5.0"
+      sources."semver-diff-2.1.0"
+      sources."send-0.16.2"
+      (sources."serve-static-1.13.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
+      sources."set-immediate-shim-1.0.1"
+      sources."set-value-2.0.0"
+      sources."setprototypeof-1.0.3"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."sigmund-1.0.1"
+      sources."signal-exit-3.0.2"
+      sources."slash-1.0.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          (sources."define-property-0.2.5" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.1"
+      sources."source-map-url-0.4.0"
+      sources."spark-md5-1.0.1"
+      sources."split-0.3.3"
+      (sources."split-string-3.1.0" // {
+        dependencies = [
+          sources."extend-shallow-3.0.2"
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."sprintf-js-1.0.3"
+      sources."static-extend-0.1.2"
+      sources."statuses-1.3.1"
+      sources."stream-combiner-0.0.4"
+      sources."streamsearch-0.1.2"
+      sources."string-3.3.3"
+      sources."string-width-2.1.1"
+      sources."string_decoder-1.0.3"
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      sources."strip-json-comments-2.0.1"
+      (sources."superagent-1.8.5" // {
+        dependencies = [
+          sources."qs-2.3.3"
+          sources."readable-stream-1.0.27-1"
+        ];
+      })
+      sources."supports-color-2.0.0"
+      sources."swagger-converter-0.2.0"
+      sources."swagger-editor-2.10.5"
+      (sources."swagger-test-templates-1.4.3" // {
+        dependencies = [
+          sources."camelcase-1.2.1"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+          sources."kind-of-3.2.2"
+          sources."source-map-0.4.4"
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      (sources."swagger-tools-0.9.16" // {
+        dependencies = [
+          sources."cookiejar-2.0.6"
+          sources."depd-1.0.1"
+          sources."ee-first-1.1.0"
+          sources."extend-3.0.0"
+          sources."form-data-1.0.0-rc3"
+          sources."formidable-1.0.17"
+          sources."isarray-0.0.1"
+          sources."lodash-4.17.5"
+          sources."mime-1.3.4"
+          sources."ms-0.7.1"
+          sources."object-assign-3.0.0"
+          sources."on-finished-2.2.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+          sources."swagger-converter-0.1.7"
+        ];
+      })
+      sources."term-size-1.2.0"
+      sources."through-2.3.8"
+      sources."timed-out-4.0.1"
+      sources."to-iso-string-0.0.2"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."touch-3.1.0"
+      sources."traverse-0.6.6"
+      sources."truncate-utf8-bytes-1.0.2"
+      sources."type-is-1.6.16"
+      sources."typedarray-0.0.6"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."uglify-to-browserify-1.0.2"
+      (sources."undefsafe-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."set-value-0.4.3"
+        ];
+      })
+      sources."unique-string-1.0.0"
+      sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+        ];
+      })
+      sources."unzip-response-2.0.1"
+      sources."upath-1.0.4"
+      sources."update-notifier-2.3.0"
+      sources."uri-js-3.0.2"
+      sources."urix-0.1.0"
+      sources."url-parse-lax-1.0.0"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."utf8-byte-length-1.0.4"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."valid-url-1.0.9"
+      sources."validator-9.4.1"
+      sources."which-1.3.0"
+      sources."widest-line-2.0.0"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.3"
+      sources."wrappy-1.0.2"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
+      sources."xtend-4.0.1"
+      sources."yallist-2.1.2"
+      sources."yargs-3.10.0"
+      sources."z-schema-3.19.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The Swagger command-line. Provides Swagger utilities and project lifecycle support.";
+      homepage = "https://github.com/swagger-api/swagger-node#readme";
+      license = "Apache 2.0";
+    };
+    production = true;
+    bypassCache = true;
+  };
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.7.1";
+    version = "5.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz";
-      sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g";
+      url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz";
+      sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f";
     };
     buildInputs = globalBuildInputs;
     meta = {

From efbeb74d0d1b5b696f6420db6089f52ad92c8784 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 24 Mar 2018 04:17:34 -0500
Subject: [PATCH 1972/2266] memtier-benchmark: init at 1.2.11

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../networking/memtier-benchmark/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/memtier-benchmark/default.nix

diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix
new file mode 100644
index 00000000000..ae8d3d96483
--- /dev/null
+++ b/pkgs/tools/networking/memtier-benchmark/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, pkgconfig, libevent, pcre, zlib, openssl
+}:
+
+stdenv.mkDerivation rec {
+  name = "memtier-benchmark-${version}";
+  version = "1.2.11";
+
+  src = fetchFromGitHub {
+    owner  = "redislabs";
+    repo   = "memtier_benchmark";
+    rev    = "refs/tags/${version}";
+    sha256 = "0a1lz4j9whj6yf94xn7rna00abgrv2qs30vmpns1n9zqlpaj6b6a";
+  };
+
+  patchPhase = ''
+    substituteInPlace ./configure.ac \
+      --replace '1.2.8' '${version}'
+  '';
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libevent pcre zlib openssl ];
+
+  meta = {
+    description = "Redis and Memcached traffic generation and benchmarking tool";
+    homepage    = https://github.com/redislabs/memtier_benchmark;
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1235b2fd826..96d3ecee2c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3580,6 +3580,8 @@ with pkgs;
       };
     };
 
+  memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { };
+
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
   memtest86plus = callPackage ../tools/misc/memtest86+ { };

From 6a286fcba7f4244cfd175efffe5977da3b2c6c13 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 10:34:57 +0100
Subject: [PATCH 1973/2266] python.pkgs.pygtail: init at 0.8.0

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

diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix
new file mode 100644
index 00000000000..503dad717c2
--- /dev/null
+++ b/pkgs/development/python-modules/pygtail/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "pygtail";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "bgreenlee";
+    repo = pname;
+    rev = version;
+    sha256 = "1f8qlijiwn10jxg1bsi6q42fznbg8rw039yaxfh6rzbaj2gaxbz1";
+  };
+
+  # remove at next bump, tag is one commit early for 0.8.0
+  postPatch = ''
+    substituteInPlace pygtail/core.py \
+      --replace 0.7.0 0.8.0
+  '';
+
+  meta = with lib; {
+    description = "A library for reading log file lines that have not been read";
+    license = licenses.gpl2Plus;
+    homepage = https://github.com/bgreenlee/pygtail;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25aa2e9514f..94777a44286 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -339,6 +339,8 @@ in {
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
 
+  pygtail = callPackage ../development/python-modules/pygtail { };
+
   pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };
 
   pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };

From 2e6aacb056207879630d1b8bb2fb333d28bcf202 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 10:35:37 +0100
Subject: [PATCH 1974/2266] python.pkgs.logster: 7475c53822 -> 1.0.1

---
 .../python-modules/logster/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 11 ++--------
 2 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/logster/default.nix

diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix
new file mode 100644
index 00000000000..e4b57e4ce40
--- /dev/null
+++ b/pkgs/development/python-modules/logster/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pygtail }:
+
+buildPythonPackage rec {
+  pname = "logster";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "etsy";
+    repo = pname;
+    rev = version;
+    sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q";
+  };
+
+  propagatedBuildInputs = [ pygtail ];
+
+  meta = with lib; {
+    description = "Parses log files, generates metrics for Graphite and Ganglia";
+    license = licenses.gpl3Plus;
+    homepage = https://github.com/etsy/logster;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94777a44286..ca4a13b86df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -267,6 +267,8 @@ in {
 
   lmtpd = callPackage ../development/python-modules/lmtpd { };
 
+  logster = callPackage ../development/python-modules/logster { };
+
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
@@ -5425,15 +5427,6 @@ in {
 
   natsort = callPackage ../development/python-modules/natsort { };
 
-  logster = buildPythonPackage {
-    name = "logster-7475c53822";
-    src = pkgs.fetchgit {
-      url = git://github.com/etsy/logster;
-      rev = "7475c53822";
-      sha256 = "0565wxxiwksnly8rakb2r77k7lwzniq16kv861qd2ns9hgsjgy31";
-    };
-  };
-
   ncclient = callPackage ../development/python-modules/ncclient {};
 
   logfury = callPackage ../development/python-modules/logfury { };

From 8f0c697adf250a26c572710f0c6bf24f350b6aef Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 24 Mar 2018 09:35:49 +0000
Subject: [PATCH 1975/2266] krita: fix incorrect sha256

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

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index f74ad3c877c..6eaa4727e81 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09";
+    sha256 = "0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From 8a244db9f37920fc48ec259c3f4fd2a5ae51a452 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 12:07:52 +0100
Subject: [PATCH 1976/2266] libsForQt5.qtspeech: enable

---
 pkgs/development/libraries/qt-5/5.10/default.nix     | 1 +
 pkgs/development/libraries/qt-5/modules/qtspeech.nix | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/modules/qtspeech.nix

diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix
index f957b7633da..a45e055e60b 100644
--- a/pkgs/development/libraries/qt-5/5.10/default.nix
+++ b/pkgs/development/libraries/qt-5/5.10/default.nix
@@ -90,6 +90,7 @@ let
       qtscript = callPackage ../modules/qtscript.nix {};
       qtsensors = callPackage ../modules/qtsensors.nix {};
       qtserialport = callPackage ../modules/qtserialport.nix {};
+      qtspeech = callPackage ../modules/qtspeech.nix {};
       qtsvg = callPackage ../modules/qtsvg.nix {};
       qttools = callPackage ../modules/qttools.nix {};
       qttranslations = callPackage ../modules/qttranslations.nix {};
diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix
new file mode 100644
index 00000000000..7b4b19ccab5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix
@@ -0,0 +1,7 @@
+{ qtModule }:
+
+qtModule {
+  name = "qtspeech";
+  qtInputs = [ ];
+  outputs = [ "out" "dev" "bin" ];
+}

From 1b27260a0b9f7ef8ca8e75743ec5d6117f029e30 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 12:08:06 +0100
Subject: [PATCH 1977/2266] qgroundcontrol: 3.2.7 -> 3.3.0

---
 .../science/robotics/qgroundcontrol/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 087969fe61a..95462c02eb5 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchgit, git,  espeak, SDL2, udev, doxygen, cmake
 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
-, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
+, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech
 , makeWrapper, lndir
 , gst_all_1, qt-gstreamer1, pkgconfig, glibc
 }:
 
 stdenv.mkDerivation rec {
   name = "qgroundcontrol-${version}";
-  version = "3.2.7";
+  version = "3.3.0";
 
   qtInputs = [
     qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
-    qtquick1 qtquickcontrols qtgraphicaleffects
+    qtquick1 qtquickcontrols qtgraphicaleffects qtspeech
   ];
 
   gstInputs = with gst_all_1; [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/mavlink/qgroundcontrol.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1sla3sgj2p3h87d7kcaj53f8z5xzyadvsqlqzgh4d2n1f7sikdc5";
+    sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw";
     fetchSubmodules = true;
   };
 

From 20f51922c0b8907a98dd2d1359799fab2ffae78b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 24 Mar 2018 08:44:26 -0400
Subject: [PATCH 1978/2266] riscv-pk: Set platforms properly

---
 lib/systems/for-meta.nix       | 1 +
 pkgs/misc/riscv-pk/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 63f24b46535..43c0195c3f1 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -13,6 +13,7 @@ in rec {
   i686    = [ patterns.isi686 ];
   x86_64  = [ patterns.isx86_64 ];
   mips    = [ patterns.isMips ];
+  riscv   = [ patterns.isRiscV ];
 
   cygwin  = [ patterns.isCygwin ];
   darwin  = [ patterns.isDarwin ];
diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix
index d4705dd9dd7..e724869b235 100644
--- a/pkgs/misc/riscv-pk/default.nix
+++ b/pkgs/misc/riscv-pk/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
     description = "RISC-V Proxy Kernel and Bootloader.";
     homepage = https://github.com/riscv/riscv-pk;
     license = stdenv.lib.licenses.bsd3;
-    platforms = [ "riscv-linux" ];
+    platforms = stdenv.lib.platforms.riscv;
     maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }

From f59a544bf1db7141c9686bc65edc201582388d37 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 14:02:04 +0100
Subject: [PATCH 1979/2266] jsduck: fix build

json 1.8.3 is broken with ruby 2.4
---
 pkgs/development/tools/jsduck/Gemfile.lock | 2 +-
 pkgs/development/tools/jsduck/gemset.nix   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock
index d3e1556a7b3..2a95d72c946 100644
--- a/pkgs/development/tools/jsduck/Gemfile.lock
+++ b/pkgs/development/tools/jsduck/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
       parallel (~> 0.7.1)
       rdiscount (~> 2.1.6)
       rkelly-remix (~> 0.0.4)
-    json (1.8.3)
+    json (1.8.6)
     parallel (0.7.1)
     rdiscount (2.1.8)
     rkelly-remix (0.0.7)
diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix
index d80bd70dd72..493cc42f4f4 100644
--- a/pkgs/development/tools/jsduck/gemset.nix
+++ b/pkgs/development/tools/jsduck/gemset.nix
@@ -19,10 +19,10 @@
   json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "1.8.6";
   };
   parallel = {
     source = {
@@ -48,4 +48,4 @@
     };
     version = "0.0.7";
   };
-}
\ No newline at end of file
+}

From b5b77a688683441a36edf18df2278fba160e17e0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Mar 2018 14:26:30 +0100
Subject: [PATCH 1980/2266] qscreenshot: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/graphics/qscreenshot/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix
index c4f4f6472ed..fafc76a76ff 100644
--- a/pkgs/applications/graphics/qscreenshot/default.nix
+++ b/pkgs/applications/graphics/qscreenshot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dos2unix, which, qt }:
+{ stdenv, fetchurl, dos2unix, which, qt, Carbon }:
 
 stdenv.mkDerivation rec {
   name = "qscreenshot-1.0";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
   };
 
-  buildInputs = [ dos2unix which qt ];
+  buildInputs = [ dos2unix which qt ]
+    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
   # Remove carriage returns that cause /bin/sh to abort
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96d3ecee2c7..a515c543a91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17310,6 +17310,7 @@ with pkgs;
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
 
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
     qt = qt4;
   };
 

From 99f2b33519e4e02f155f182f0a99183b262d931b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 23 Mar 2018 11:57:59 +0100
Subject: [PATCH 1981/2266] CODEOWNERS: Add Profpatsch to /lib/generators.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’d like to be notified of changes so I can ensure the API always follows the same patterns.

Later (more specific) files replace more general codeowners [according to the documentation](https://help.github.com/articles/about-codeowners/), so I also listed `edolstra` and `nbp` again.
---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dde31a2c0c0..01a24d64988 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,6 +13,7 @@
 # Libraries
 /lib                        @edolstra @nbp
 /lib/systems                @nbp @ericson2314
+/lib/generators.nix         @edolstra @nbp @Profpatsch
 
 # Nixpkgs Internals
 /default.nix                          @nbp

From 50dc85ed6283bb17684597cbf95f9405d5637fea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Mar 2018 16:07:50 +0200
Subject: [PATCH 1982/2266] U-Boot: Disable parallel build

https://hydra.nixos.org/build/71880710
---
 pkgs/misc/uboot/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 807bc48a642..4cf1748bad4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -78,7 +78,9 @@ let
       runHook postInstall
     '';
 
-    enableParallelBuilding = true;
+    # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+    enableParallelBuilding = false;
+
     dontStrip = true;
 
     meta = with stdenv.lib; {

From 3131daace1eed2b642ab56c5843fd2057fbbfde3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Mar 2018 19:27:31 +0200
Subject: [PATCH 1983/2266] nixos/tests/installer: Give eval failure on
 unsupported boot methods

---
 nixos/tests/installer.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index f67011b4412..acf248d0a5a 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -80,8 +80,9 @@ let
         + optionalString isEfi (if pkgs.stdenv.isAarch64
             then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
             else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
-    in
-    ''
+    in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
+      throw "Non-EFI boot methods are only supported on i686 / x86_64"
+    else ''
       $machine->start;
 
       # Make sure that we get a login prompt etc.

From a6425fc66dbbcdd8dc23c8c721e15d6ed6126325 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Mar 2018 16:10:22 +0200
Subject: [PATCH 1984/2266] ghc: Disable on AArch64

For some reason compiling the proper GHC from the binary one eventually
segfaults at some point.

Since it has never worked, just disable it and investigate later.
---
 pkgs/development/compilers/ghc/8.2.1-binary.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index 8a08ab4b986..5cb3f2ea5ce 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -158,5 +158,6 @@ stdenv.mkDerivation rec {
   passthru = { targetPrefix = ""; };
 
   meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
+  # AArch64 should work in theory but eventually some builds start segfaulting
+  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
 }

From 8df9cf585aa48e408837102d072bac71b3acbee4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 24 Mar 2018 17:08:21 +0100
Subject: [PATCH 1985/2266] browserpass: 2.0.13 -> 2.0.17

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

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index c6d4a78e6b4..1e6e9e788d7 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "2.0.13";
+  version = "2.0.17";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "browserpass";
     owner = "dannyvankooten";
     rev = version;
-    sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l";
+    sha256 = "1gbhpx75bcacj6z5p4av0011c4chhzqcjjs2bvmfxpi7826hn9kn";
   };
 
   postInstall = ''

From 204a029101b028e479cdbd4e12fa4f74c1155ae5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 24 Mar 2018 17:09:55 +0100
Subject: [PATCH 1986/2266] openra: 20180218 -> 20180307

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

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index c6aedcd172e..069ed900e8f 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   name = "openra-${version}";
-  version = "20180218";
+  version = "20180307";
 
   meta = with stdenv.lib; {
     description = "Real Time Strategy game engine recreating the C&C titles";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "OpenRA";
     repo = "OpenRA";
     rev = "release-${version}";
-    sha256 = "1853p2q88602s3zf22wg1h2qx2x661n20bcjjbfmj0h2d4p9dmaf";
+    sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj";
 
     extraPostFetch = ''
       sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh

From 527e97f333a8b6240242a1ae269d86101e4eca45 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 24 Mar 2018 17:43:32 +0100
Subject: [PATCH 1987/2266] acme module: update for simp_le v0.8

Hopefully fixes #37689
---
 nixos/modules/security/acme.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 0736239ed2c..e9676d9dfb1 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -140,14 +140,6 @@ in
         '';
       };
 
-      tosHash = mkOption {
-        type = types.string;
-        default = "cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b";
-        description = ''
-          SHA256 of the Terms of Services document. This changes once in a while.
-        '';
-      };
-
       production = mkOption {
         type = types.bool;
         default = true;
@@ -196,7 +188,7 @@ in
               let
                 cpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
-                cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ]
+                cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
                           ++ optionals (data.email != null) [ "--email" data.email ]
                           ++ concatMap (p: [ "-f" p ]) data.plugins
                           ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)

From 285ef9be090dbe5779e0439d2dfa949a5a829acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sat, 24 Mar 2018 17:58:06 +0100
Subject: [PATCH 1988/2266] libcdio-paranoia: fix darwin build

---
 .../libraries/libcdio-paranoia/default.nix           | 12 ++++++++++--
 pkgs/top-level/all-packages.nix                      |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix
index b3aa2b19906..48e632ba52d 100644
--- a/pkgs/development/libraries/libcdio-paranoia/default.nix
+++ b/pkgs/development/libraries/libcdio-paranoia/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
+  libiconv, IOKit, DiskArbitration}:
 
 stdenv.mkDerivation {
   name = "libcdio-paranoia-0.94+2";
@@ -11,7 +12,14 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ libcdio ];
+  buildInputs = [ libcdio ] ++
+    stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
+
+  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;
+
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+    "--disable-ld-version-script"
+  ];
 
   meta = with stdenv.lib; {
     description = "CD paranoia on top of libcdio";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a515c543a91..6d31e7b2fc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9601,7 +9601,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
   };
 
-  libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { };
+  libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia {
+    inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit;
+  };
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 

From 64c756d50d5d838a6b5cdcec73b8ef090048aeb1 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 24 Mar 2018 17:23:55 +0000
Subject: [PATCH 1989/2266] babelstone-han: 10.0.2 -> 11.0.0

new font version; old link answers with 404
---
 pkgs/data/fonts/babelstone-han/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index b33295f89b2..acfcc918104 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,16 +1,16 @@
 {stdenv, fetchzip}:
 
 let
-  version = "10.0.2";
+  version = "11.0.0";
 in fetchzip {
   name = "babelstone-han-${version}";
 
-  url = http://www.babelstone.co.uk/Fonts/7932/BabelStoneHan.zip;
+  url = http://www.babelstone.co.uk/Fonts/3902/BabelStoneHan.zip;
   postFetch = ''
     mkdir -p $out/share/fonts/truetype
     unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
   '';
-  sha256 = "17r5cf028v66yzjf9qbncn4rchv2xxkl2adxr35ppg1l7zssz9v6";
+  sha256 = "1w3v69lacsy0nha20rkbs6f0dskf5xm6p250qx4a1m69d4a1gx7v";
 
   meta = with stdenv.lib; {
     description = "Unicode CJK font with over 32600 Han characters";

From ad3eb5d8fc6233eb2e71440d6b0fa412890d5c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sat, 24 Mar 2018 19:04:56 +0100
Subject: [PATCH 1990/2266] glyr: enable darwin build

---
 pkgs/tools/audio/glyr/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index e98667b8c04..23a33122c9f 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -15,16 +15,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ sqlite glib curl ];
 
-  configurePhase = ''
-    cmake -DCMAKE_INSTALL_PREFIX=$out
-  '';
-
   meta = with stdenv.lib; {
     license = licenses.lgpl3;
     description = "A music related metadata searchengine";
     homepage = https://github.com/sahib/glyr;
     maintainers = [ maintainers.sternenseemann ];
-    platforms = platforms.linux; # TODO macOS would be possible
+    platforms = platforms.unix;
   };
 }
 

From 46419cab7e7ff58a9a2b9aa18fef8a499af39295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 24 Mar 2018 19:25:18 +0100
Subject: [PATCH 1991/2266] pythonPackages.fonttools: 3.24.0 -> 3.24.1

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index d7e789b02fa..fdfa4e530cf 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d09126f443bc8797d1b7e76274e65f4c169c04722745953ecf536451b1d9a15f";
+    sha256 = "d13e98c9f3b635a5334dab69eb471d7286928ac82db7ca57b5bf4cdf3824789a";
     extension = "zip";
   };
 

From 5adec8d6c18fb24d002bf055ac3e0805146f4caa Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 24 Mar 2018 19:34:46 +0100
Subject: [PATCH 1992/2266] autossh: 1.4e -> 1.4f

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

diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index 9ff0376c8bc..452837ef2e4 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssh}:
 
 stdenv.mkDerivation rec {
-  name = "autossh-1.4e";
+  name = "autossh-1.4f";
   
   src = fetchurl {
     url = "http://www.harding.motd.ca/autossh/${name}.tgz";
-    sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly";
+    sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1";
   };
   
   buildInputs = [ openssh ];

From c71bcb2744c4a78dccf96716789602e3c41a0fac Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 19:36:06 +0100
Subject: [PATCH 1993/2266] grpcio: use protobuf3_5

---
 pkgs/development/python-modules/google_api_core/default.nix | 4 ++--
 .../python-modules/google_cloud_speech/default.nix          | 5 ++---
 pkgs/development/python-modules/google_gax/default.nix      | 5 +++--
 .../python-modules/googleapis_common_protos/default.nix     | 4 ++--
 pkgs/development/python-modules/grpcio/default.nix          | 4 ++--
 pkgs/top-level/python-packages.nix                          | 6 ++++++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 2899eeb4a8a..df148b1ede3 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, google_auth, protobuf, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }:
+, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }:
 
 buildPythonPackage rec {
   pname = "google-api-core";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347";
   };
 
-  propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ];
+  propagatedBuildInputs = [ google_auth protobuf3_5 googleapis_common_protos requests grpcio ];
   checkInputs = [ setuptools mock pytest ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index 9912316941f..75c14ff62eb 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -13,9 +13,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];
   checkInputs = [ pytest mock ];
 
-  checkPhase = ''
-    py.test
-  '';
+  # needs credentials
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Cloud Speech API enables integration of Google speech recognition into applications.";
diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix
index 24000161338..a8ac37e7e8c 100644
--- a/pkgs/development/python-modules/google_gax/default.nix
+++ b/pkgs/development/python-modules/google_gax/default.nix
@@ -1,5 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi
-, google_auth, ply, protobuf, grpcio, requests, googleapis_common_protos,  dill,  future,  pytest,  mock,  unittest2 }:
+, google_auth, ply, protobuf3_5, grpcio, requests
+, googleapis_common_protos, dill, future, pytest, mock, unittest2 }:
 
 buildPythonPackage rec {
   pname = "google-gax";
@@ -10,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji";
   };
 
-  propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ];
+  propagatedBuildInputs = [ google_auth ply protobuf3_5 grpcio requests googleapis_common_protos dill future ];
   checkInputs = [ pytest mock unittest2 ];
 
   # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where
diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 28e84f4846e..7427e590c0c 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, protobuf, pytest }:
+, protobuf3_5, pytest }:
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0";
   };
 
-  propagatedBuildInputs = [ protobuf ];
+  propagatedBuildInputs = [ protobuf3_5 ];
   checkInputs = [ pytest ];
 
   doCheck = false;  # there are no tests
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index d1f0903238c..47e9d179eea 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, lib
-, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }:
+, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }:
 
 buildPythonPackage rec {
   pname = "grpcio";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d";
   };
 
-  propagatedBuildInputs = [ six protobuf ]
+  propagatedBuildInputs = [ six protobuf3_5 ]
                         ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ]
                         ++ lib.optionals (isPy26 || isPy27) [ futures ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca4a13b86df..e11a541a251 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12151,6 +12151,12 @@ in {
     protobuf = pkgs.protobuf3_1;
   };
 
+  protobuf3_5 = callPackage ../development/python-modules/protobuf {
+    disabled = isPyPy;
+    doCheck = !isPy3k;
+    protobuf = pkgs.protobuf3_5;
+  };
+
   psd-tools = callPackage ../development/python-modules/psd-tools { };
 
   psutil = callPackage ../development/python-modules/psutil { };

From 8ac272f98d7d32594f38e7824b8c630e40663736 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jonathan.banafato@gmail.com>
Date: Sat, 24 Mar 2018 15:28:13 -0400
Subject: [PATCH 1994/2266] keybase-gui: Enable desktop notifications (#37711)

Add `libnotify` as a build input to make message notifications work.
---
 pkgs/tools/security/keybase-gui/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix
index 53b871306d7..1d50f5498c8 100644
--- a/pkgs/tools/security/keybase-gui/default.nix
+++ b/pkgs/tools/security/keybase-gui/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
-, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
-, nss, pango, systemd, xorg, utillinuxMinimal }:
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2
+, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
@@ -17,6 +17,7 @@ let
     glib
     gnome2.GConf
     gtk2
+    libnotify
     nspr
     nss
     pango

From 46a90e3273d6ff03c5b9492b778b2bf75f31abfa Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 18 Mar 2018 12:40:14 +0000
Subject: [PATCH 1995/2266] clipper: init at 6.4.2

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

diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
new file mode 100644
index 00000000000..31af3758782
--- /dev/null
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, ninja, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "6.4.2";
+  name = "Clipper-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip";
+    sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1";
+  };
+
+  sourceRoot = "cpp";
+
+  buildInputs = [ ];
+
+  nativeBuildInputs = [ cmake ninja unzip ];
+
+  meta = with stdenv.lib; {
+    longDescription = ''
+      The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
+      and line & polygon offsetting. The library is based on Vatti's clipping algorithm.
+    '';
+    homepage = https://www.angusj.com/delphi/clipper.php;
+    license = licenses.boost;
+    maintainers = with maintainers; [ mpickering ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f29919ab6ba..33c492cd94f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8524,6 +8524,8 @@ with pkgs;
 
   clearsilver = callPackage ../development/libraries/clearsilver { };
 
+  clipper = callPackage ../development/libraries/clipper { };
+
   cln = callPackage ../development/libraries/cln { };
 
   clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };

From 1e0a60b738064b9bad6fc36e4d939fff8eb7033f Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 18 Mar 2018 12:41:14 +0000
Subject: [PATCH 1996/2266] open-orienteering-mapper: init at 0.8.1

---
 .../gis/openorienteering-mapper/default.nix   | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/applications/gis/openorienteering-mapper/default.nix

diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
new file mode 100644
index 00000000000..6eb7fba646c
--- /dev/null
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools
+  , qtlocation, qtsensors, doxygen, cups, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "OpenOrienteering-Mapper-${version}";
+  version = "0.8.1";
+
+  buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups];
+
+  nativeBuildInputs = [ cmake makeWrapper ninja ];
+
+  src = fetchFromGitHub {
+    owner = "OpenOrienteering";
+    repo = "mapper";
+    rev = "v${version}";
+    sha256 = "10viw8bddl76mc2gh84jsl7h237yzvh4nim61pbd63vg1hlqisi6";
+  };
+
+  cmakeFlags =
+    [
+    # Required by the build to be specified
+    "-DPROJ4_ROOT=${proj}"
+
+    # Building the manual and bundling licenses fails
+    "-DLICENSING_PROVIDER:BOOL=OFF"
+    "-DMapper_MANUAL_QTHELP:BOOL=OFF"
+    ] ++
+    (stdenv.lib.optionals stdenv.isDarwin
+    [
+    # Usually enabled on Darwin
+    "-DCMAKE_FIND_FRAMEWORK=never"
+    # FindGDAL is broken and always finds /Library/Framework unless this is
+    # specified
+    "-DGDAL_INCLUDE_DIR=${gdal}/include"
+    "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
+    "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
+    # Don't bundle libraries
+    "-DMapper_PACKAGE_PROJ=0"
+    "-DMapper_PACKAGE_QT=0"
+    "-DMapper_PACKAGE_ASSISTANT=0"
+    "-DMapper_PACKAGE_GDAL=0"
+    ]);
+
+
+  postInstall =
+    stdenv.lib.optionalString stdenv.isDarwin ''
+    # Fixes "This application failed to start because it could not find or load the Qt
+    # platform plugin "cocoa"."
+    wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \
+      --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
+    mkdir -p $out/bin
+    ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
+    '';
+
+  meta = {
+    description = ''
+      OpenOrienteering Mapper is an orienteering mapmaking program
+      and provides a free alternative to the existing proprietary solution.
+    '';
+    homepage = https://www.openorienteering.org/apps/mapper/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; darwin;
+    maintainers = with stdenv.lib.maintainers; [mpickering];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33c492cd94f..7c5bc5fd280 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17036,6 +17036,8 @@ with pkgs;
 
   openjump = callPackage ../applications/misc/openjump { };
 
+  openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
+
   openscad = callPackage ../applications/graphics/openscad {};
 
   opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};

From a76a8cc59434e8906806330ca0615efa1a385378 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 24 Mar 2018 20:55:31 +0100
Subject: [PATCH 1997/2266] minio: 2018-02-09T22-40-05Z -> 2018-03-19T19-22-06Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index ea77b32a866..90a95987267 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2018-02-09T22-40-05Z";
+  version = "2018-03-19T19-22-06Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0qxrzmkm5hza5xbx9dkrgadwjg3hykwf79hix3s0laqyksmpj9mk";
+    sha256 = "0cqvam7i8caqlb0jdn89s1k18gfy4yndsszj7d81qg2sns0p5zgm";
   };
 
   goPackagePath = "github.com/minio/minio";

From a60c4b56f767eda0ccafc53110528e586ccc57dc Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 24 Mar 2018 21:50:23 +0100
Subject: [PATCH 1998/2266] translate-shell: 0.9.6.6 -> 0.9.6.7, fix packaging

---
 .../misc/translate-shell/default.nix          | 99 ++++---------------
 1 file changed, 18 insertions(+), 81 deletions(-)

diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix
index 3810da40849..8e8a22ed4e4 100644
--- a/pkgs/applications/misc/translate-shell/default.nix
+++ b/pkgs/applications/misc/translate-shell/default.nix
@@ -1,101 +1,38 @@
-{ stdenv, fetchFromGitHub, curl, fribidi, mpv, less, rlwrap, gawk, bash, emacs, groff, ncurses, pandoc }:
+{ stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "translate-shell";
-  version = "0.9.6.6";
+  version = "0.9.6.7";
 
   src = fetchFromGitHub {
     owner = "soimort";
     repo = "translate-shell";
-    rev = "v" + version;
-    sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq";
+    rev = "v${version}";
+    sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n";
   };
 
-  phases = [ "buildPhase" "installPhase" "postFixup" ];
+  buildInputs = [ makeWrapper ];
 
-  buildPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share
-    mkdir -p $out/share/man/man1
-  '';
-
-  installPhase = ''
-    cp $src/translate $out/bin/trans
-    cp $src/translate $out/bin/translate
-    cp $src/translate $out/bin/translate-shell
-
-    cp $src/translate.awk $out/share/translate.awk
-    cp $src/build.awk $out/share/build.awk
-    cp $src/metainfo.awk $out/share/metainfo.awk
-    cp $src/test.awk $out/share/test.awk
-
-    cp -r $src/include $out/share
-    cp -r $src/test $out/share
-    cp $src/man/trans.1 $out/share/man/man1
-
-    chmod +x $out/bin/translate
-    chmod +x $out/share/translate.awk
-    chmod +x $out/share/build.awk
-    chmod +x $out/share/metainfo.awk
-    chmod +x $out/share/test.awk
-  '';
-
-  postFixup = ''
-    substituteInPlace $out/bin/trans --replace "/bin/sh" "${bash}/bin/bash"
-    substituteInPlace $out/bin/trans --replace "gawk " "${gawk}/bin/gawk "
-    substituteInPlace $out/bin/trans --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/bin/translate --replace "/bin/sh" "${bash}/bin/bash"
-    substituteInPlace $out/bin/translate --replace "gawk " "${gawk}/bin/gawk "
-    substituteInPlace $out/bin/translate --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/bin/translate-shell --replace "/bin/sh" "${bash}/bin/bash"
-    substituteInPlace $out/bin/translate-shell --replace "gawk " "${gawk}/bin/gawk "
-    substituteInPlace $out/bin/translate-shell --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/share/translate.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
-    substituteInPlace $out/share/translate.awk --replace "metainfo" "$out/share/metainfo"
-    substituteInPlace $out/share/translate.awk --replace "include/" "$out/share/include/"
-
-    substituteInPlace $out/share/build.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
-    substituteInPlace $out/share/build.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/build.awk --replace "metainfo.awk" "$out/share/metainfo.awk"
-
-    substituteInPlace $out/share/metainfo.awk --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/share/test.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
-    substituteInPlace $out/share/test.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/test.awk --replace "test/" "$out/share/test/"
-
-    substituteInPlace $out/share/include/Translators/\*.awk --replace "include/" "$out/share/include/"
-
-    substituteInPlace $out/share/test/Test.awk --replace "test/" "$out/share/test/"
-    substituteInPlace $out/share/test/TestUtils.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/test/TestParser.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\""
-    substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk"
-
-    substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\""
-    substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi "
-    substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\""
-
-    substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc "
-
-    substituteInPlace $out/share/include/Translate.awk --replace "\"mpv " "\"${mpv}/bin/mpv "
-    substituteInPlace $out/share/include/Translate.awk --replace "\"less " "\"${less}/bin/less "
+  installFlags = [ "PREFIX=$(out)" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/trans \
+      --prefix PATH : ${stdenv.lib.makeBinPath [
+        gawk
+        curl
+        ncurses
+        rlwrap
+        groff
+        fribidi
+      ]}
   '';
 
   meta = with stdenv.lib; {
     homepage = https://www.soimort.org/translate-shell;
     description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium";
-    license = licenses.publicDomain;
-    maintainers = [ maintainers.ebzzry ];
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ ebzzry infinisil ];
     platforms = platforms.unix;
   };
 }

From f8f067d62727b3c77dc0ac9d245808714f8500c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <balazs.lengyel@tuwien.ac.at>
Date: Sat, 24 Mar 2018 15:58:35 +0100
Subject: [PATCH 1999/2266] wine: Unstable 3.3 -> 3.4 & reenable wineStaging

---
 pkgs/misc/emulators/wine/default.nix | 11 ++++-------
 pkgs/misc/emulators/wine/sources.nix |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 928e692df6b..91fb0da82d8 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -56,12 +56,9 @@ let wine-build = build: release:
       });
 
 in if wineRelease == "staging" then
-  let wineUnstable = wine-build wineBuild "unstable"; in
-    # wine staging is not yet at 3.0, using unstable
-    # FIXME update winestaging sources
-    wineUnstable
-    # callPackage ./staging.nix {
-    #   inherit libtxc_dxtn_Name wineUnstable;
-    # }
+  callPackage ./staging.nix {
+    inherit libtxc_dxtn_Name;
+    wineUnstable = wine-build wineBuild "unstable";
+  }
 else
   wine-build wineBuild wineRelease
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5950310a73f..d17c0f295e8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,18 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.3";
+    version = "3.4";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505";
+    sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    # FIXME update winestaging sources, when 3.3 is released
-    # FIXME then revert the staging derivation in ./default.nix
-    sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
+    sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 8067d4844e33a23a191c1ea7f7ac5c33d1499b81 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 24 Mar 2018 18:11:03 -0500
Subject: [PATCH 2000/2266] texlive: add cxxflags for clang

Fixes #37719
---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 8318ad2afe9..92778c5eed1 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -144,6 +144,9 @@ core = stdenv.mkDerivation rec {
     mv "$out"/share/{man,info} "$doc"/doc
   '' + cleanBrokenLinks;
 
+  # needed for poppler and xpdf
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)
   passthru = { inherit version buildInputs; };
 

From 7032c42dc008a007ac157dac8880125938a02350 Mon Sep 17 00:00:00 2001
From: Tyler Mauthe <me@tylermauthe.com>
Date: Sat, 24 Mar 2018 16:46:49 -0700
Subject: [PATCH 2001/2266] i3-gaps: 4.14.1 -> 4.15.0.1

---
 pkgs/applications/window-managers/i3/gaps.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index b322c7da193..d6668cde2bd 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,12 +3,12 @@
 i3.overrideDerivation (super : rec {
 
   name = "i3-gaps-${version}";
-  version = "4.14.1";
-  releaseDate = "2017-09-24";
+  version = "4.15.0.1";
+  releaseDate = "2018-03-13";
 
   src = fetchurl {
     url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
-    sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7";
+    sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
   };
 
   nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];

From 261a958170f1866b29ebb3429b7d271de23c87d0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 00:53:46 +0100
Subject: [PATCH 2002/2266] skhd: 0.0.10 -> 0.0.12

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index aa97a36e691..24eb644e96f 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.0.10";
+  version = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "0a0r8z9bvb1pzqag7nqa84xm99n0xvg27cw11qcv65snr06bqc9w";
+    sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h";
   };
 
   buildInputs = [ Carbon ];
@@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
   '';
 
-  # See https://github.com/koekeishiya/skhd/issues/28
-  hardeningDisable = [ "all" ];
-
   meta = with stdenv.lib; {
     description = "Simple hotkey daemon for macOS";
     homepage = https://github.com/koekeishiya/skhd;

From 72a4c54c71b1bebd974107fb792ad01e8ec9ce8e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 21:46:59 -0400
Subject: [PATCH 2003/2266] xmloscopy: init at 0.1.1

---
 pkgs/tools/text/xml/xmloscopy/default.nix | 52 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/tools/text/xml/xmloscopy/default.nix

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
new file mode 100644
index 00000000000..8c25e677c8b
--- /dev/null
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, makeWrapper, dev_only_shellcheck ? null,
+fetchFromGitHub,
+
+fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused,
+docbook5
+}:
+stdenv.mkDerivation rec {
+  name = "xmloscopy-${version}";
+  version = "v0.1.1";
+
+  buildInputs = [
+    makeWrapper
+    dev_only_shellcheck
+  ];
+
+  spath = lib.makeBinPath [
+    fzf
+    coreutils
+    libxml2
+    libxslt
+    jing
+    findutils
+    gnugrep
+    gnused
+  ];
+
+  src = fetchFromGitHub {
+    owner = "grahamc";
+    repo = "xmloscopy";
+    rev = version;
+    sha256 = "01i9hr0hh87p4qxfqx4vhml2mpdqggq2326vy7nymm2d4xpa5i1i";
+  };
+
+  installPhase = ''
+    sed -i "s/hard to say/${version}/" ./xmloscopy
+    type -P shellcheck && shellcheck ./xmloscopy
+    chmod +x ./xmloscopy
+    patchShebangs ./xmloscopy
+    mkdir -p $out/bin
+    cp ./xmloscopy $out/bin/
+    wrapProgram $out/bin/xmloscopy \
+      --set RNG "${docbook5}/xml/rng/docbook/docbook.rng" \
+      --set PATH "${spath}"
+  '';
+
+  meta = {
+    description = "wtf is my docbook broken?";
+    homepage = https://github.com/grahamc/xmloscopy;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c5bc5fd280..c3d4ce716f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5632,6 +5632,8 @@ with pkgs;
 
   xmlroff = callPackage ../tools/typesetting/xmlroff { };
 
+  xmloscopy = callPackage ../tools/text/xml/xmloscopy { };
+
   xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
 
   xmlto = callPackage ../tools/typesetting/xmlto {

From 6e4a51fe54df3e2965d15d9317460aaed17b0dbf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 22:47:38 -0400
Subject: [PATCH 2004/2266] xmloscopy: 0.1.1 -> 0.1.2

Ugh this is embarassing
---
 pkgs/tools/text/xml/xmloscopy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index 8c25e677c8b..337aa61af13 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -6,7 +6,7 @@ docbook5
 }:
 stdenv.mkDerivation rec {
   name = "xmloscopy-${version}";
-  version = "v0.1.1";
+  version = "v0.1.2";
 
   buildInputs = [
     makeWrapper
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "grahamc";
     repo = "xmloscopy";
     rev = version;
-    sha256 = "01i9hr0hh87p4qxfqx4vhml2mpdqggq2326vy7nymm2d4xpa5i1i";
+    sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456";
   };
 
   installPhase = ''

From dbcfee995858650d1b88192ce12a23da57088f3f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 22:40:06 -0700
Subject: [PATCH 2005/2266] commonsIo: 2.4 -> 2.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.6 with grep in /nix/store/5yl4dj084qj2x6xawqpbgs9bmlgxjjkb-commons-io-2.6
- found 2.6 in filename of file in /nix/store/5yl4dj084qj2x6xawqpbgs9bmlgxjjkb-commons-io-2.6
- directory tree listing: https://gist.github.com/a62494f31c4e13128a99cb347f615952
---
 pkgs/development/libraries/java/commons/io/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index d49165ac521..03b083328da 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4";
+  version = "2.6";
   name    = "commons-io-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
-    sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1";
+    sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
   };
 
   installPhase = ''

From b51e229d6550b6a3e57b7247db7333cf988b7103 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 00:49:58 -0700
Subject: [PATCH 2006/2266] enlightenment.efl: 1.20.6 -> 1.20.7

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina_btlog -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eet -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eet --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_decc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elm_prefs_cc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_cxx -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_cxx --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina-bench-cmp -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina-bench-cmp --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug --help` and found version 1.20.7
- found 1.20.7 with grep in /nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7
- found 1.20.7 in filename of file in /nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7
- directory tree listing: https://gist.github.com/087102bea4216e207ad77278be475a89
---
 pkgs/desktops/enlightenment/efl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index fff15a9981d..190ee6c3574 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.20.6";
+  version = "1.20.7";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "1h9jkb1pkp2g6ld7ra9mxgblx3x5id4162ja697klx9mfjkpxijn";
+    sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ea4042e8bf1565577b4f46f76cf985f6602eab1f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 01:53:25 -0700
Subject: [PATCH 2007/2266] fdk_aac: 0.1.5 -> 0.1.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.1.6 with grep in /nix/store/cp8yg64bk9zga197f0npsp23l1w23r1r-fdk-aac-0.1.6
- directory tree listing: https://gist.github.com/4a817b07a8c77aa7e3d16adb65f01186
---
 pkgs/development/libraries/fdk-aac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 59dc4721812..903f43b1e68 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "fdk-aac-${version}";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
-    sha256 = "1msdkcf559agmpycd4bk0scm2s2h9jyzbnnw1yrfarxlcwm5jr11";
+    sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma";
   };
 
   configureFlags = [ ]

From 75b43124118a23004caa9b36e7541f71d08864b3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 05:16:03 -0700
Subject: [PATCH 2008/2266] hdf4: 4.2.12 -> 4.2.13

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfls help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfls help` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vmake -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vmake --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vmake help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vshow -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vshow --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vshow help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdp help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdp version` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdp help` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfimport -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfimport -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfimport -h` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdiff -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack_check -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack_check --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack_check help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncgen -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump version` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump help` and found version 4.2.13
- found 4.2.13 with grep in /nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin
- directory tree listing: https://gist.github.com/556f493010a550af3ca5bbf318e609eb
---
 pkgs/tools/misc/hdf4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index bc8ea769e8b..1946cbeb3f0 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   name = "hdf-${version}";
-  version = "4.2.12";
+  version = "4.2.13";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2";
-    sha256 = "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id";
+    sha256 = "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm";
   };
 
   buildInputs = [

From 436d4a419262362840ccee20fc69d8186ba57cda Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 05:51:43 -0700
Subject: [PATCH 2009/2266] ibus-engines.libpinyin: 1.9.2 -> 1.9.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.3 with grep in /nix/store/z3sdj8l860r4vdb41pi3siakp98pnx8j-ibus-libpinyin-1.9.3
- directory tree listing: https://gist.github.com/bf125939ed0636cedf0daea5f6d08219
---
 .../inputmethods/ibus-engines/ibus-libpinyin/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 85399bffd3f..bd22aefe2a9 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-libpinyin-${version}";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner  = "libpinyin";
     repo   = "ibus-libpinyin";
     rev    = version;
-    sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb";
+    sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9";
   };
 
   buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];

From d1982e8ae7d4dd75115e65634fc94ad6f8dd1fb9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 12:06:19 -0700
Subject: [PATCH 2010/2266] libpqxx: 6.1.0 -> 6.1.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -h` got 0 exit code
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config --help` got 0 exit code
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config help` got 0 exit code
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -V` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -v` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config --version` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config version` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -h` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config --help` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config help` and found version 6.1.1
- found 6.1.1 with grep in /nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1
- directory tree listing: https://gist.github.com/5915a75a4c094a7918ab2b42fc150b80
---
 pkgs/development/libraries/libpqxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 97fb5f27d9d..eb70677b3e9 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libpqxx-${version}";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
     rev = version;
-    sha256 = "1dv96h10njg115216n2zm6fsvi4kb502hmhhn8cjhlfbxr9vc84q";
+    sha256 = "0yw0wvnpw0j560f5zv4gvmafi19d9hrknwjzl7qrss926aqx65jq";
   };
 
   nativeBuildInputs = [ gnused python2 ];

From f00db926c6f05dae081695521cb2da8f57203239 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 00:34:50 -0400
Subject: [PATCH 2011/2266] openjdk: Add JDK 10

---
 pkgs/development/compilers/openjdk/10.nix     | 222 ++++++++++++++++++
 .../openjdk/currency-date-range-jdk10.patch   |  13 +
 .../openjdk/fix-java-home-jdk10.patch         |  14 ++
 .../read-truststore-from-env-jdk10.patch      |  20 ++
 .../openjdk/swing-use-gtk-jdk10.patch         |  24 ++
 pkgs/top-level/all-packages.nix               |   6 +
 6 files changed, 299 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/10.nix
 create mode 100644 pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
 create mode 100644 pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
 create mode 100644 pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
 create mode 100644 pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch

diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
new file mode 100644
index 00000000000..d84b0c30242
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -0,0 +1,222 @@
+{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
+, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
+, libjpeg, giflib
+, setJavaClassPath
+, minimal ? false
+#, enableInfinality ? true # font rendering patch
+, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
+}:
+
+let
+
+  /**
+   * The JRE libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.system == "i686-linux" then
+      "i386"
+    else "amd64";
+
+  update = "10";
+  build = "46";
+  baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
+  repover = "jdk-${update}+${build}";
+  paxflags = if stdenv.isi686 then "msp" else "m";
+  jdk10 = fetchurl {
+             url = "${baseurl}/archive/${repover}.tar.gz";
+             sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
+          };
+  openjdk10 = stdenv.mkDerivation {
+    name = "openjdk-${update}-b${build}";
+
+    srcs = [ jdk10 ];
+    sourceRoot = ".";
+
+    outputs = [ "out" "jre" ];
+
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [
+      cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+      libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
+      libXi libXinerama libXcursor lndir fontconfig
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      gtk2 gnome_vfs GConf glib
+    ];
+
+    prePatch = ''
+      cd jdk10*
+    '';
+
+    patches = [
+      ./fix-java-home-jdk10.patch
+      ./read-truststore-from-env-jdk10.patch
+      ./currency-date-range-jdk10.patch
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      ./swing-use-gtk-jdk10.patch
+    ];
+
+    preConfigure = ''
+      chmod +x configure
+      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
+
+      configureFlagsArray=(
+        "--with-boot-jdk=${bootjdk.home}"
+        "--with-update-version=${update}"
+        "--with-build-number=${build}"
+        "--with-milestone=fcs"
+        "--enable-unlimited-crypto"
+        "--disable-debug-symbols"
+        "--disable-freetype-bundling"
+        "--with-zlib=system"
+        "--with-giflib=system"
+        "--with-stdc++lib=dynamic"
+
+        # glibc 2.24 deprecated readdir_r so we need this
+        # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+        "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
+    ''
+    + lib.optionalString minimal "\"--enable-headless-only\""
+    + ");"
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+    # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+    + stdenv.lib.optionalString stdenv.cc.isGNU ''
+      NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
+    '';
+
+    NIX_LDFLAGS= lib.optionals (!minimal) [
+      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ];
+
+    buildFlags = [ "all" ];
+
+    installPhase = ''
+      mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+
+      cp -av build/*/images/jdk/* $out/lib/openjdk
+
+      # Remove some broken manpages.
+      rm -rf $out/lib/openjdk/man/ja*
+
+      # Mirror some stuff in top-level.
+      mkdir $out/include $out/share/man
+      ln -s $out/lib/openjdk/include/* $out/include/
+      ln -s $out/lib/openjdk/man/* $out/share/man/
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux/*_md.h $out/include/
+
+      # Copy the JRE to a separate output and setup fallback fonts
+      cp -av build/*/images/jre $jre/lib/openjdk/
+      mkdir $out/lib/openjdk/jre
+      ${lib.optionalString (!minimal) ''
+        mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
+        lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+      ''}
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo
+      ${lib.optionalString minimal ''
+        for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
+          rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so
+        done
+      ''}
+
+      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+      # Make sure cmm/*.pf are not symlinks:
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      # in 9, it seems no *.pf files end up in $out ... ?
+      # rm -rf $out/lib/openjdk/jre/lib/cmm
+      # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
+      # Set PaX markings
+      exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+      echo "to mark: *$exes*"
+      for file in $exes; do
+        echo "marking *$file*"
+        paxmark ${paxflags} "$file"
+      done
+
+      # Remove duplicate binaries.
+      for i in $(cd $out/lib/openjdk/bin && echo *); do
+        if [ "$i" = java ]; then continue; fi
+        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+        fi
+      done
+
+      # Generate certificates.
+      (
+        cd $jre/lib/openjdk/jre/lib/security
+        rm cacerts
+        perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+      )
+
+      ln -s $out/lib/openjdk/bin $out/bin
+      ln -s $jre/lib/openjdk/jre/bin $jre/bin
+      ln -s $jre/lib/openjdk/jre $out/jre
+    '';
+
+    # FIXME: this is unnecessary once the multiple-outputs branch is merged.
+    preFixup = ''
+      prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
+      patchELF $jre
+      propagatedBuildInputs+=" $jre"
+
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $jre/nix-support
+      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+      EOF
+    '';
+
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        OUTPUTDIR=$(eval echo \$$output)
+        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+
+      # Test to make sure that we don't depend on the bootstrap
+      for output in $outputs; do
+        if grep -q -r '${bootjdk}' $(eval echo \$$output); then
+          echo "Extraneous references to ${bootjdk} detected"
+          exit 1
+        fi
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://openjdk.java.net/;
+      license = licenses.gpl2;
+      description = "The open-source Java Development Kit";
+      maintainers = with maintainers; [ edwtjo ];
+      platforms = ["i686-linux" "x86_64-linux"];
+    };
+
+    passthru = {
+      inherit architecture;
+      home = "${openjdk10}/lib/openjdk";
+    };
+  };
+in openjdk10
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
new file mode 100644
index 00000000000..e058eff0746
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
@@ -0,0 +1,13 @@
+--- ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
++++ ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+@@ -281,8 +281,8 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
++            if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
++                throw new RuntimeException("time is more than 20 years from present: " + time);
+             }
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
new file mode 100644
index 00000000000..c037fde2972
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
@@ -0,0 +1,14 @@
+--- a/src/hotspot/os/linux/os_linux.cpp	2017-07-04 23:09:02.533972226 -0400
++++ b/src/hotspot/os/linux/os_linux.cpp	2017-07-04 23:07:52.118338845 -0400
+@@ -2270,8 +2270,5 @@
+   assert(ret, "cannot locate libjvm");
+   char *rp = NULL;
+   if (ret && dli_fname[0] != '\0') {
+-    rp = os::Posix::realpath(dli_fname, buf, buflen);
+-  }
+-  if (rp == NULL) {
+-    return;
++    snprintf(buf, buflen, "%s", dli_fname);
+   }
+
+   if (Arguments::sun_java_launcher_is_altjvm()) {
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
new file mode 100644
index 00000000000..b5abc1d794d
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
@@ -0,0 +1,20 @@
+--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-06-26 21:48:25.000000000 -0400
++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-07-05 20:45:57.491295030 -0400
+@@ -71,6 +71,7 @@
+      *
+      * The preference of the default trusted KeyStore is:
+      *    javax.net.ssl.trustStore
++     *    system environment variable JAVAX_NET_SSL_TRUSTSTORE
+      *    jssecacerts
+      *    cacerts
+      */
+@@ -144,6 +145,9 @@
+                     String temporaryName = "";
+                     File temporaryFile = null;
+                     long temporaryTime = 0L;
++                    if (storePropName == null){
++                        storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
++                    }
+                     if (!"NONE".equals(storePropName)) {
+                         String[] fileNames =
+                                 new String[] {storePropName, defaultStore};
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
new file mode 100644
index 00000000000..b9258c500db
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
@@ -0,0 +1,24 @@
+--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
+@@ -607,11 +607,9 @@
+         if (osType == OSInfo.OSType.WINDOWS) {
+             return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+         } else {
+-            String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
+             Toolkit toolkit = Toolkit.getDefaultToolkit();
+-            if ("gnome".equals(desktop) &&
+-                    toolkit instanceof SunToolkit &&
+-                    ((SunToolkit) toolkit).isNativeGTKAvailable()) {
++            if (toolkit instanceof SunToolkit &&
++                    ((SunToolkit) toolkit).isNativeGTKAvailable()) {
+                 // May be set on Linux and Solaris boxs.
+                 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+             }
+@@ -1341,7 +1339,7 @@
+             lafName = (String) lafData.remove("defaultlaf");
+         }
+         if (lafName == null) {
+-            lafName = getCrossPlatformLookAndFeelClassName();
++            lafName = getSystemLookAndFeelClassName();
+         }
+         lafName = swingProps.getProperty(defaultLAFKey, lafName);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3d4ce716f5..be80143d29d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6379,6 +6379,12 @@ with pkgs;
         inherit (gnome2) GConf gnome_vfs;
       };
 
+  openjdk10 =
+      callPackage ../development/compilers/openjdk/10.nix {
+        bootjdk = openjdk9;
+        inherit (gnome2) GConf gnome_vfs;
+      };
+
   openjdk = openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };

From 351688f53e5407f3c7cab9ef3769334858f4a50c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 00:41:17 -0400
Subject: [PATCH 2012/2266] zulu: 9.0.4 -> 10

---
 pkgs/development/compilers/zulu/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix             | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 040af83ece2..908aa29e178 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -4,11 +4,11 @@
 , swingSupport ? true }:
 
 let
-  version = "9.0.0.15";
-  openjdk = "9.0.0";
+  version = "10.1+11";
+  openjdk = "10";
 
-  sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi";
-  sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b";
+  sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8";
+  sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
 
   platform = if stdenv.isDarwin then "macosx" else "linux";
   hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be80143d29d..10d230a4e8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6894,8 +6894,7 @@ with pkgs;
   z88dk = callPackage ../development/compilers/z88dk { };
 
   zulu8 = callPackage ../development/compilers/zulu/8.nix { };
-  zulu9 = callPackage ../development/compilers/zulu { };
-  zulu = zulu9;
+  zulu = callPackage ../development/compilers/zulu { };
 
   ### DEVELOPMENT / INTERPRETERS
 

From 040a9ab240fba0b0dae5b48692fff7be50d3281c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 00:49:02 -0400
Subject: [PATCH 2013/2266] minikube: 0.25.0 -> 0.25.2

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index d27693823a6..d181335ee35 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -15,15 +15,15 @@ let
   # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
   # currently https://storage.googleapis.com/minikube/k8s_releases.json
 
-  localkube-version = "1.9.0";
+  localkube-version = "1.9.4";
   localkube-binary = fetchurl {
     url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
-    sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh";
+    sha256 = "0c1n8p7q38hx864xvcsr01d028cizjfpsqbfpf1y24fnrpzacajw";
   };
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.25.0";
+  version = "0.25.2";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -31,7 +31,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby";
+    sha256 = "1h8sxs6xxmli7xkb33kdl4nyn1sgq2b8b2d6aj5wim11ric3l7pb";
   };
 
   patches = [

From b189247ba0b568da59bdb1ab82c5d95b8a85ba24 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 24 Mar 2018 22:04:25 -0700
Subject: [PATCH 2014/2266] treewide: use more HTTPS URLs

Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
---
 lib/licenses.nix                              |  2 +-
 .../services/cluster/kubernetes/default.nix   | 12 ++---
 .../applications/altcoins/ethsign/default.nix |  2 +-
 pkgs/applications/audio/audacious/default.nix |  2 +-
 pkgs/applications/audio/audacious/qt-5.nix    |  2 +-
 .../audio/lastfmsubmitd/default.nix           |  4 +-
 .../audio/mopidy-gmusic/default.nix           |  2 +-
 .../audio/mopidy-spotify/default.nix          |  2 +-
 pkgs/applications/graphics/leocad/default.nix |  2 +-
 pkgs/applications/misc/k2pdfopt/default.nix   |  2 +-
 pkgs/applications/misc/mupdf/default.nix      |  2 +-
 pkgs/applications/misc/mupdf/default.upstream |  2 +-
 pkgs/applications/misc/wordnet/default.nix    |  2 +-
 .../networking/firehol/default.nix            |  2 +-
 .../networking/ostinato/default.nix           |  2 +-
 .../science/electronics/pulseview/default.nix |  4 +-
 .../window-managers/i3/default.nix            |  2 +-
 .../window-managers/i3/status.nix             |  2 +-
 .../data/fonts/gentium-book-basic/default.nix |  2 +-
 .../sgml+xml/schemas/docbook-5.0/default.nix  |  2 +-
 pkgs/desktops/lxde/core/lxmenu-data.nix       |  2 +-
 pkgs/desktops/lxde/core/lxpanel/default.nix   |  2 +-
 .../compilers/adobe-flex-sdk/default.nix      |  2 +-
 pkgs/development/compilers/neko/default.nix   |  2 +-
 pkgs/development/compilers/opendylan/bin.nix  |  4 +-
 .../java-modules/junit/default.nix            |  2 +-
 pkgs/development/libraries/gamin/default.nix  |  2 +-
 .../libraries/ignition-transport/generic.nix  |  2 +-
 pkgs/development/libraries/isl/0.11.1.nix     |  2 +-
 pkgs/development/libraries/isl/0.12.2.nix     |  2 +-
 pkgs/development/libraries/isl/0.14.1.nix     |  2 +-
 pkgs/development/libraries/isl/0.15.0.nix     |  2 +-
 pkgs/development/libraries/isl/0.17.1.nix     |  2 +-
 pkgs/development/libraries/jama/default.nix   |  4 +-
 .../libraries/libaudclient/default.nix        |  2 +-
 pkgs/development/libraries/libmnl/default.nix |  2 +-
 .../libnetfilter_conntrack/default.nix        |  4 +-
 .../libnetfilter_cttimeout/default.nix        |  4 +-
 .../libraries/libnetfilter_log/default.nix    |  4 +-
 .../libraries/libtheora/default.nix           |  2 +-
 .../development/libraries/liburcu/default.nix |  4 +-
 pkgs/development/libraries/libvpx/git.nix     |  2 +-
 .../development/libraries/log4cxx/default.nix |  2 +-
 pkgs/development/libraries/movit/default.nix  |  2 +-
 .../libraries/netcdf-fortran/default.nix      |  2 +-
 pkgs/development/libraries/ogre/1.9.x.nix     |  2 +-
 pkgs/development/libraries/opencv/3.x.nix     |  2 +-
 .../libraries/pipewire/default.nix            |  2 +-
 pkgs/development/libraries/tnt/default.nix    |  4 +-
 pkgs/development/misc/amdapp-sdk/default.nix  |  2 +-
 .../python-modules/GeoIP/default.nix          |  2 +-
 .../python-modules/autobahn/default.nix       |  2 +-
 .../python-modules/cytoolz/default.nix        |  2 +-
 .../python-modules/flask-assets/default.nix   |  2 +-
 .../python-modules/flask-script/default.nix   |  2 +-
 .../python-modules/graph-tool/2.x.x.nix       |  2 +-
 .../python-modules/idna/default.nix           |  2 +-
 .../python-modules/jsonref/default.nix        |  2 +-
 .../python-modules/jsonrpc-async/default.nix  |  2 +-
 .../python-modules/locustio/default.nix       |  2 +-
 .../python-modules/logilab/constraint.nix     |  2 +-
 .../python-modules/meliae/default.nix         |  2 +-
 .../python-modules/moinmoin/default.nix       |  2 +-
 .../python-modules/pecan/default.nix          |  2 +-
 .../tools/database/pyrseas/default.nix        |  2 +-
 pkgs/development/tools/jbake/default.nix      |  4 +-
 pkgs/development/tools/libsigrok/default.nix  |  6 +--
 .../tools/libsigrokdecode/default.nix         |  4 +-
 .../tools/misc/lttng-tools/default.nix        |  2 +-
 .../tools/misc/lttng-ust/default.nix          |  2 +-
 pkgs/development/tools/misc/lttv/default.nix  |  4 +-
 pkgs/development/tools/sigrok-cli/default.nix |  4 +-
 pkgs/games/cataclysm-dda/default.nix          |  2 +-
 pkgs/games/cataclysm-dda/git.nix              |  2 +-
 pkgs/games/dxx-rebirth/assets.nix             |  2 +-
 pkgs/games/dxx-rebirth/default.nix            |  6 +--
 pkgs/games/dxx-rebirth/full.nix               |  2 +-
 pkgs/misc/emulators/fs-uae/default.nix        |  2 +-
 pkgs/misc/emulators/pcsxr/default.nix         |  2 +-
 .../linux/lttng-modules/default.nix           |  4 +-
 pkgs/servers/dict/dictd-wordnet.nix           |  2 +-
 pkgs/servers/gpm/default.nix                  |  4 +-
 pkgs/servers/irc/ngircd/default.nix           |  2 +-
 pkgs/servers/sql/mysql/5.7.x.nix              |  2 +-
 pkgs/tools/filesystems/bindfs/default.nix     |  2 +-
 pkgs/tools/filesystems/ceph/generic.nix       |  2 +-
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix   |  2 +-
 pkgs/tools/inputmethods/fcitx/unwrapped.nix   |  2 +-
 pkgs/tools/misc/argtable/default.nix          |  2 +-
 pkgs/tools/misc/edid-decode/default.nix       |  2 +-
 pkgs/top-level/python-packages.nix            | 50 +++++++++----------
 91 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index ba575c27052..767fd89b948 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -284,7 +284,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
 
   gpl2Oss = {
     fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
-    url = http://www.mysql.com/about/legal/licensing/foss-exception;
+    url = https://www.mysql.com/about/legal/licensing/foss-exception;
   };
 
   gpl2Plus = spdx {
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 4a2c6f0833e..39c5d78d419 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -279,7 +279,7 @@ in {
       tokenAuthFile = mkOption {
         description = ''
           Kubernetes apiserver token authentication file. See
-          <link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
         '';
         default = null;
         type = types.nullOr types.path;
@@ -288,7 +288,7 @@ in {
       basicAuthFile = mkOption {
         description = ''
           Kubernetes apiserver basic authentication file. See
-          <link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
         '';
         default = pkgs.writeText "users" ''
           kubernetes,admin,0
@@ -299,7 +299,7 @@ in {
       authorizationMode = mkOption {
         description = ''
           Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
-          <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
         '';
         default = ["RBAC" "Node"];
         type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
@@ -308,7 +308,7 @@ in {
       authorizationPolicy = mkOption {
         description = ''
           Kubernetes apiserver authorization policy file. See
-          <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
         '';
         default = [];
         type = types.listOf types.attrs;
@@ -332,7 +332,7 @@ in {
       runtimeConfig = mkOption {
         description = ''
           Api runtime configuration. See
-          <link xlink:href="http://kubernetes.io/docs/admin/cluster-management.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/cluster-management.html"/>
         '';
         default = "authentication.k8s.io/v1beta1=true";
         example = "api/all=false,api/v1=true";
@@ -342,7 +342,7 @@ in {
       admissionControl = mkOption {
         description = ''
           Kubernetes admission control plugins to use. See
-          <link xlink:href="http://kubernetes.io/docs/admin/admission-controllers/"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>
         '';
         default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];
         example = [
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
index b7d14a43921..0659c4fa258 100644
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -52,7 +52,7 @@ buildGoPackage rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/dapphub/ethsign;
+    homepage = https://github.com/dapphub/ethsign;
     description = "Make raw signed Ethereum transactions";
     license = [licenses.gpl3];
   };
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 6890b53f407..6e411c8448f 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Audio player";
-    homepage = http://audacious-media-player.org/;
+    homepage = https://audacious-media-player.org/;
     maintainers = with maintainers; [ eelco ramkromberg ];
     platforms = with platforms; linux;
     license = with licenses; [
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 8910fdc1b0a..019bde7cc64 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -81,7 +81,7 @@ mkDerivation {
 
   meta = with lib; {
     description = "Audio player";
-    homepage = http://audacious-media-player.org/;
+    homepage = https://audacious-media-player.org/;
     maintainers = with maintainers; [ ttuegel ];
     platforms = with platforms; linux;
     license = with licenses; [
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index 01b450ab7dd..d0c3eab6915 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
   version = "1.0.6";
 
   src = fetchurl {
-    url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
+    url = "https://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
     sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e";
   };
 
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   installCommand = "python setup.py install --prefix=$out";
 
   meta = {
-    homepage = http://www.red-bean.com/decklin/lastfmsubmitd/;
+    homepage = https://www.red-bean.com/decklin/lastfmsubmitd/;
     description = "An last.fm audio scrobbler and daemon";
   };
 }
diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix
index b792ec3428e..e58cddd4294 100644
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://www.mopidy.com/;
+    homepage = https://www.mopidy.com/;
     description = "Mopidy extension for playing music from Google Play Music";
     license = licenses.asl20;
     maintainers = [ maintainers.jgillich ];
diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 999883dc26c..64b5ee629b3 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://www.mopidy.com/;
+    homepage = https://www.mopidy.com/;
     description = "Mopidy extension for playing music from Spotify";
     license = licenses.asl20;
     maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 4dc1e89116e..ada55f0351e 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CAD program for creating virtual LEGO models";
-    homepage = http://www.leocad.org/;
+    homepage = https://www.leocad.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 1cab20baef1..ad2381394f4 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     mupdf_modded = mupdf.overrideAttrs (attrs: {
       name = "mupdf-1.10a";
       src = fetchurl {
-        url = "http://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
+        url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
         sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
       };
       # Excluded the pdf-*.c files, since they mostly just broke the #includes
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 1b510221d12..000a916b737 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   name = "mupdf-${version}";
 
   src = fetchurl {
-    url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
+    url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
     sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
   };
 
diff --git a/pkgs/applications/misc/mupdf/default.upstream b/pkgs/applications/misc/mupdf/default.upstream
index 07cafdb0c2a..852233633ca 100644
--- a/pkgs/applications/misc/mupdf/default.upstream
+++ b/pkgs/applications/misc/mupdf/default.upstream
@@ -1,4 +1,4 @@
-url http://mupdf.com/downloads/archive/
+url https://mupdf.com/downloads/archive/
 do_overwrite(){
   ensure_hash
   ensure_version
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index b93295850bc..71d95e13892 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
          for computational linguistics and natural language processing.
       '';
 
-    homepage = http://wordnet.princeton.edu/;
+    homepage = https://wordnet.princeton.edu/;
 
     maintainers = [ ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index cf41ca1b0b3..8bbc0abba22 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
       FireHOL, an iptables stateful packet filtering firewall for humans!
       FireQOS, a TC based bandwidth shaper for humans!
     '';
-    homepage = http://firehol.org/;
+    homepage = https://firehol.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ geistesk ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index b3a1c1a23b3..c0320251774 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   ostinatoIcon = fetchurl {
-    url = "http://ostinato.org/images/site-logo.png";
+    url = "https://ostinato.org/images/site-logo.png";
     sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
   };
 
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index a3f3b6b8933..4e86d1d917f 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "pulseview-0.4.0";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz";
     sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 9c24df004f3..46c87b0b189 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "4.15";
 
   src = fetchurl {
-    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    url = "https://i3wm.org/downloads/${name}.tar.bz2";
     sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91";
   };
 
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 19c9f8c9835..b54f6e8def3 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "i3status-2.11";
 
   src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    url = "https://i3wm.org/i3status/${name}.tar.bz2";
     sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
   };
 
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index 4c1e484253c..9b626291c2c 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -19,7 +19,7 @@ in fetchzip rec {
   sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd";
 
   meta = with stdenv.lib; {
-    homepage = http://software.sil.org/gentium/;
+    homepage = https://software.sil.org/gentium/;
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
     maintainers = with maintainers; [ ];
     license = licenses.ofl;
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
index 640659a6108..4986101584e 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
+++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation";
-    homepage = http://docbook.org/xml/5.0/;
+    homepage = https://docbook.org/xml/5.0/;
     maintainers = [ lib.maintainers.eelco ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index b17ab4fda65..6e8644b19b0 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool ];
 
   meta = {
-    homepage = http://lxde.org/;
+    homepage = https://lxde.org/;
     license = stdenv.lib.licenses.gpl2;
     description = "Freedesktop.org desktop menus for LXDE";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 1225f425b26..af9570a2c73 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight X11 desktop panel for LXDE";
-    homepage = http://lxde.org/;
+    homepage = https://lxde.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.ryneeverett ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index ccb366ffe1c..63dd315e8e4 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Flex SDK for Adobe Flash / ActionScript";
-    homepage = "http://www.adobe.com/products/flex.html";
+    homepage = "https://www.adobe.com/products/flex.html";
     license = stdenv.lib.licenses.mpl11;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 4dce11f93b1..42a585ff51f 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.2.0";
 
   src = fetchurl {
-    url = "http://nekovm.org/media/neko-${version}-src.tar.gz";
+    url = "https://nekovm.org/media/neko-${version}-src.tar.gz";
     sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
   };
 
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index 8382be7a209..d3f654749b0 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
   name = "opendylan-2013.2";
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
-      url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
+      url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
       sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h";
     }
     else if stdenv.system == "i686-linux" then fetchurl {
-      url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
+      url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
       sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5";
     }
     else throw "platform ${stdenv.system} not supported.";
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 5017cb39602..a7bfa545908 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -19,7 +19,7 @@ in rec {
     m2Path = "/junit/junit/${version}";
 
     meta = {
-      homepage = http://junit.org/junit4/;
+      homepage = https://junit.org/junit4/;
       description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
       license = stdenv.lib.licenses.epl10;
       platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 2dd32b6f110..2af7bbce18b 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation (rec {
   name = "gamin-0.1.10";
 
   src = fetchurl {
-    url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
+    url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 8206338fb08..639af2dd208 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://ignitionrobotics.org/libraries/math;
+    homepage = https://ignitionrobotics.org/libraries/math;
     description = "Math library by Ingition Robotics, created for the Gazebo project";
     license = licenses.asl20;
     maintainers = with maintainers; [ pxc ];
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index e2d7d7ffd03..cdb018d297b 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index d7143b8747e..880f91fcced 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix
index 8196dec283a..1ff4b7ec18a 100644
--- a/pkgs/development/libraries/isl/0.14.1.nix
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.15.0.nix
index eca3372ad4d..8b6080c2880 100644
--- a/pkgs/development/libraries/isl/0.15.0.nix
+++ b/pkgs/development/libraries/isl/0.15.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix
index 2136969c075..59d4d38ce57 100644
--- a/pkgs/development/libraries/isl/0.17.1.nix
+++ b/pkgs/development/libraries/isl/0.17.1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 55f44df2b4f..36eedadc4c2 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2.5";
   
   src = fetchurl {
-    url = http://math.nist.gov/tnt/jama125.zip;
+    url = https://math.nist.gov/tnt/jama125.zip;
     sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://math.nist.gov/tnt/;
+    homepage = https://math.nist.gov/tnt/;
     description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
index b81eba5252f..aab8fcd4beb 100644
--- a/pkgs/development/libraries/libaudclient/default.nix
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Legacy D-Bus client library for Audacious";
-    homepage = http://audacious-media-player.org/;
+    homepage = https://audacious-media-player.org/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 33ccccea2e9..2dbdb60b4b6 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       This library aims to provide simple helpers that allows you to re-use code and to avoid
       re-inventing the wheel.
     '';
-    homepage = http://netfilter.org/projects/libmnl/index.html;
+    homepage = https://netfilter.org/projects/libmnl/index.html;
     license = stdenv.lib.licenses.lgpl21Plus;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 17dea7b3d7d..1b4c471a256 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.6";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
     sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used
       by conntrack-tools among many other applications
     '';
-    homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
+    homepage = https://netfilter.org/projects/libnetfilter_conntrack/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index f30e12a4163..d16155374ca 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.0";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
     sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       With this library, you can create, update and delete timeout policies that can
       be attached to traffic flows. This library is used by conntrack-tools.
     '';
-    homepage = http://netfilter.org/projects/libnetfilter_cttimeout/;
+    homepage = https://netfilter.org/projects/libnetfilter_cttimeout/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
index f660cd7a781..0d8de14513e 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.1";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
     sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       system that deprecates the old syslog/dmesg based packet logging. This
       library has been previously known as libnfnetlink_log.
     '';
-    homepage = http://netfilter.org/projects/libnetfilter_log/;
+    homepage = https://netfilter.org/projects/libnetfilter_log/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ orivej ];
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 375c59f7763..fd58f4f44e7 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.theora.org/;
+    homepage = https://www.theora.org/;
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
     maintainers = with maintainers; [ spwhitt wkennington ];
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index aa106baf815..85f8b6df295 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "liburcu-${version}";
 
   src = fetchurl {
-    url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
+    url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
     sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw";
   };
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Userspace RCU (read-copy-update) library";
-    homepage = http://lttng.org/urcu;
+    homepage = https://lttng.org/urcu;
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 824449a347a..ef499f238d6 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -180,7 +180,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
-    homepage    = http://www.webmproject.org/;
+    homepage    = https://www.webmproject.org/;
     license     = licenses.bsd3;
     maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index ac0b7bf6834..8e854156424 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ libtool ];
 
   meta = {
-    homepage = http://logging.apache.org/log4cxx/index.html;
+    homepage = https://logging.apache.org/log4cxx/index.html;
     description = "A logging framework for C++ patterned after Apache log4j";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index d85d4f44407..3766140eea1 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.1";
 
   src = fetchurl {
-    url = "http://movit.sesse.net/${name}.tar.gz";
+    url = "https://movit.sesse.net/${name}.tar.gz";
     sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
   };
 
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 35f675a305a..a26db9c3a71 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fortran API to manipulate netcdf files";
-    homepage = http://www.unidata.ucar.edu/software/netcdf/;
+    homepage = https://www.unidata.ucar.edu/software/netcdf/;
     license = licenses.free;
     maintainers = [ maintainers.bzizou ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 694fbaa50c1..0f6495f0c9c 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A 3D engine";
-    homepage = http://www.ogre3d.org/;
+    homepage = https://www.ogre3d.org/;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 49574a4b421..101b38d6305 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -260,7 +260,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
-    homepage = http://opencv.org/;
+    homepage = https://opencv.org/;
     license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3;
     maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 90174bf749a..6658a554a35 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Server and user space API to deal with multimedia pipelines";
-    homepage = http://pipewire.org/;
+    homepage = https://pipewire.org/;
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jtojnar ];
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 5e3d1600000..23ef997e5ce 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0.12";
   
   src = fetchurl {
-    url = http://math.nist.gov/tnt/tnt_3_0_12.zip;
+    url = https://math.nist.gov/tnt/tnt_3_0_12.zip;
     sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://math.nist.gov/tnt/;
+    homepage = https://math.nist.gov/tnt/;
     description = "Template Numerical Toolkit: C++ headers for array and matrices";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index d0e64a16fdd..84020a5ac2d 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
-    homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/;
+    homepage = https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/;
     license = licenses.amd;
     maintainers = [ maintainers.offline ];
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix
index 6c4453774ce..0bacd8edb31 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/GeoIP/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "MaxMind GeoIP Legacy Database - Python API";
-    homepage = http://www.maxmind.com/;
+    homepage = https://www.maxmind.com/;
     maintainers = with lib.maintainers; [ jluttine ];
     license = lib.licenses.lgpl21Plus;
   };
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 5a6121aaf7f..69ee2b1b15f 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "WebSocket and WAMP in Python for Twisted and asyncio.";
-    homepage    = "http://crossbar.io/autobahn";
+    homepage    = "https://crossbar.io/autobahn";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
     platforms   = platforms.all;
diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
index 9c5a2b2110c..f7022d91626 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "http://github.com/pytoolz/cytoolz/";
+    homepage = "https://github.com/pytoolz/cytoolz/";
     description = "Cython implementation of Toolz: High performance functional utilities";
     license = "licenses.bsd3";
     maintainers = with lib.maintainers; [ fridh ];
diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index 53307333048..27d8f9c40c6 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ flask webassets flask_script nose ];
 
   meta = with lib; {
-    homepage = http://github.com/miracle2k/flask-assets;
+    homepage = https://github.com/miracle2k/flask-assets;
     description = "Asset management for Flask, to compress and merge CSS and Javascript files";
     license = licenses.bsd2;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix
index 33b44080343..72a3fb0c6f8 100644
--- a/pkgs/development/python-modules/flask-script/default.nix
+++ b/pkgs/development/python-modules/flask-script/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = http://github.com/smurfix/flask-script;
+    homepage = https://github.com/smurfix/flask-script;
     description = "Scripting support for Flask";
     license = licenses.bsd3;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 99fe4b73cb9..8c61a6b278a 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Python module for manipulation and statistical analysis of graphs";
-    homepage    = http://graph-tool.skewed.de/;
+    homepage    = https://graph-tool.skewed.de/;
     license     = licenses.gpl3;
     platforms   = platforms.all;
     maintainers = [ stdenv.lib.maintainers.joelmo ];
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index 635f8b33d3c..e66700d87ee 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    homepage = "http://github.com/kjd/idna/";
+    homepage = "https://github.com/kjd/idna/";
     description = "Internationalized Domain Names in Applications (IDNA)";
     license = lib.licenses.bsd3;
   };
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index ca9549b677b..6209c2593a7 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "An implementation of JSON Reference for Python";
-    homepage    = "http://github.com/gazpachoking/jsonref";
+    homepage    = "https://github.com/gazpachoking/jsonref";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
     platforms   = platforms.all;
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 1018c536ff7..2bdb93dfdf2 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A JSON-RPC client library for asyncio";
-    homepage = http://github.com/armills/jsonrpc-async;
+    homepage = https://github.com/armills/jsonrpc-async;
     license = licenses.bsd3;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index 4bc48810e71..c3e27c8b36a 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   buildInputs = [ mock unittest2 ];
 
   meta = {
-    homepage = http://locust.io/;
+    homepage = https://locust.io/;
     description = "A load testing tool";
   };
 }
diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix
index 952cc03e454..8f7229a4c0f 100644
--- a/pkgs/development/python-modules/logilab/constraint.nix
+++ b/pkgs/development/python-modules/logilab/constraint.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "logilab-database provides some classes to make unified access to different";
-    homepage = "http://www.logilab.org/project/logilab-database";
+    homepage = "https://www.logilab.org/project/logilab-database";
   };
 }
 
diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
index ec6c15b2501..5a348e5288c 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/pkgs/development/python-modules/meliae/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python Memory Usage Analyzer";
-    homepage = http://launchpad.net/meliae;
+    homepage = https://launchpad.net/meliae;
     license = licenses.gpl3;
     maintainers = with maintainers; [ xvapx ];
   };
diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix
index 6891dd2b627..2097470d4e4 100644
--- a/pkgs/development/python-modules/moinmoin/default.nix
+++ b/pkgs/development/python-modules/moinmoin/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Advanced, easy to use and extensible WikiEngine";
 
-    homepage = "http://moinmo.in/";
+    homepage = "https://moinmo.in/";
 
     license = licenses.gpl2Plus;
   };
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index 3a49a32a8a0..c6c5b99d980 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Pecan";
-    homepage = "http://github.com/pecan/pecan";
+    homepage = "https://github.com/pecan/pecan";
   };
 }
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index 20123a0600e..0390e7b86bb 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec {
   ];
   meta = {
     description = "A declarative language to describe PostgreSQL databases";
-    homepage = http://perseas.github.io/;
+    homepage = https://perseas.github.io/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ pmeunier ];
   };
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 9762926ddf5..045ade6e0ed 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "jbake-${version}";
 
   src = fetchzip {
-    url = "http://jbake.org/files/jbake-${version}-bin.zip";
+    url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
     sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
-    homepage = "http://jbake.org/";
+    homepage = "https://jbake.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ moaxcp ];
   };
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index 1f4c21cb7f9..0271cbee92c 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
   name = "libsigrok-${version}";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz";
     inherit sha256;
   };
 
   firmware = fetchurl {
-    url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
+    url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
     sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Core library of the sigrok signal analysis software suite";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index 57bb159c586..0099e574e4a 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libsigrokdecode-0.5.0";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
     sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Protocol decoding library for the sigrok signal analysis software suite";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index eea54dbdf8b..236402b5663 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tracing tools (kernel + user space) for Linux";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index edfc7dc30ca..b708ce490d2 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LTTng Userspace Tracer libraries";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
index 45dd86db41b..36a89726e81 100644
--- a/pkgs/development/tools/misc/lttv/default.nix
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "lttv-1.5";
 
   src = fetchurl {
-    url = "http://lttng.org/files/packages/${name}.tar.bz2";
+    url = "https://lttng.org/files/packages/${name}.tar.bz2";
     sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Graphical trace viewer for LTTng trace files";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
     # The rest of the LTTV package is distributed under the GNU GPL v2.
     license = with licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix
index 2d36b09adb3..3d8027a1299 100644
--- a/pkgs/development/tools/sigrok-cli/default.nix
+++ b/pkgs/development/tools/sigrok-cli/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "sigrok-cli-0.7.0";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
     sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Command-line frontend for the sigrok signal analysis software suite";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index 01829238daa..0de118234a7 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
       substances or radiation, now more closely resemble insects, birds or fish
       than their original form.
     '';
-    homepage = http://cataclysmdda.org/;
+    homepage = https://cataclysmdda.org/;
     license = licenses.cc-by-sa-30;
     maintainers = [ maintainers.skeidel ];
     platforms = platforms.unix;
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index fcc2481cb69..fe4dcb25175 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
       substances or radiation, now more closely resemble insects, birds or fish
       than their original form.
     '';
-    homepage = http://cataclysmdda.org/;
+    homepage = https://cataclysmdda.org/;
     license = licenses.cc-by-sa-30;
     platforms = platforms.unix;
   };
diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix
index 1fd64f5b00d..682d1e05069 100644
--- a/pkgs/games/dxx-rebirth/assets.nix
+++ b/pkgs/games/dxx-rebirth/assets.nix
@@ -42,7 +42,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Descent ${toString ver} assets from GOG";
-      homepage    = http://www.dxx-rebirth.com/;
+      homepage    = https://www.dxx-rebirth.com/;
       license     = licenses.unfree;
       maintainers = with maintainers; [ peterhoeg ];
       hydraPlatforms = [];
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 3b05ed14292..b780d5327f2 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -4,7 +4,7 @@
 
 let
   music = fetchurl {
-    url = "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa";
+    url = "https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa";
     sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc";
   };
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   version = "0.59.100";
 
   src = fetchurl {
-    url = "http://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz";
+    url = "https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz";
     sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka";
   };
 
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Source Port of the Descent 1 and 2 engines";
-    homepage = http://www.dxx-rebirth.com/;
+    homepage = https://www.dxx-rebirth.com/;
     license = licenses.free;
     maintainers = with maintainers; [ viric peterhoeg ];
     platforms = with platforms; linux;
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix
index baf8b80add1..020a4593de2 100644
--- a/pkgs/games/dxx-rebirth/full.nix
+++ b/pkgs/games/dxx-rebirth/full.nix
@@ -16,7 +16,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG";
-      homepage    = http://www.dxx-rebirth.com/;
+      homepage    = https://www.dxx-rebirth.com/;
       license     = with licenses; [ free unfree ];
       maintainers = with maintainers; [ peterhoeg ];
       platforms   = with platforms; linux;
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 6ba5290fa42..27abe5fd470 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.8.3";
 
   src = fetchurl {
-    url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
+    url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
     sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2";
   };
 
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index c402dd44428..5af3042bde4 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Playstation 1 emulator";
-    homepage = http://pcsxr.codeplex.com/;
+    homepage = https://pcsxr.codeplex.com/;
     maintainers = with maintainers; [ rardiol ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index ff6db1b41ee..7c2233714d4 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.10.5";
 
   src = fetchurl {
-    url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
+    url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
     sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = with licenses; [ lgpl21 gpl2 mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 8bed7f160f7..13a78d61098 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
          the wordnet data available to dictd and by extension for lookup with
          the dict command. '';
 
-    homepage = http://wordnet.princeton.edu/;
+    homepage = https://wordnet.princeton.edu/;
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 6096aa1ed74..3cb0d3931db 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "gpm-1.20.7";
 
   src = fetchurl {
-    url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
+    url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
     sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nico.schottelius.org/software/gpm/;
+    homepage = https://www.nico.schottelius.org/software/gpm/;
     description = "A daemon that provides mouse support on the Linux console";
     license = licenses.gpl2;
     platforms = platforms.linux ++ platforms.cygwin;
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index 4dd57b17fed..bdd88db0984 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ngircd-24";
 
   src = fetchurl {
-    url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
+    url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
     sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
   };
 
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 0c04f910e5b..b6b1dc7b127 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -71,7 +71,7 @@ self = stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://www.mysql.com/;
+    homepage = https://www.mysql.com/;
     description = "The world's most popular open source database";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index c558c9e8a32..a83ee771d69 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name    = "bindfs-${version}";
 
   src = fetchurl {
-    url    = "http://bindfs.org/downloads/${name}.tar.gz";
+    url    = "https://bindfs.org/downloads/${name}.tar.gz";
     sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc";
   };
 
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 3d35a10f3b3..34becf80c8a 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation {
   outputs = [ "dev" "lib" "out" "doc" ];
 
   meta = {
-    homepage = http://ceph.com/;
+    homepage = https://ceph.com/;
     description = "Distributed storage system";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ adev ak wkennington ];
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 7617d544d29..1a3352676b1 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://github.com/fcitx/fcitx-qt5;
+    homepage    = https://github.com/fcitx/fcitx-qt5;
     description = "Qt5 IM Module for Fcitx";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index 27eb35ce6ae..c7d0eecb763 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage    = http://github.com/fcitx/fcitx;
+    homepage    = https://github.com/fcitx/fcitx;
     description = "A Flexible Input Method Framework";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 76f42b1976a..6b1512e854b 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.argtable.org/;
+    homepage = https://www.argtable.org/;
     description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library";
     license = licenses.bsd3;
     maintainers = with maintainers; [ artuuge ];
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index e4968b12e6c..246898a7231 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "EDID decoder and conformance tester";
-    homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/;
+    homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.chiiruno ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a86c79da03d..6412cb59be2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -775,7 +775,7 @@ in {
 
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -790,7 +790,7 @@ in {
     };
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -810,7 +810,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -830,7 +830,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -855,7 +855,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -880,7 +880,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -896,7 +896,7 @@ in {
     propagatedBuildInputs = with self; [ azure-nspkg ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -921,7 +921,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -946,7 +946,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -965,7 +965,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -984,7 +984,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -1750,7 +1750,7 @@ in {
 
     meta = {
       description = "Python bindings for Oracle Berkeley DB";
-      homepage = http://www.jcea.es/programacion/pybsddb.htm;
+      homepage = https://www.jcea.es/programacion/pybsddb.htm;
       license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
     };
   };
@@ -1861,7 +1861,7 @@ in {
     doCheck = false;
 
     meta = {
-      homepage =  http://github.com/ralphbean/bugwarrior;
+      homepage =  https://github.com/ralphbean/bugwarrior;
       description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
       license = licenses.gpl3Plus;
       platforms = platforms.all;
@@ -4686,7 +4686,7 @@ in {
 
     meta = {
       description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
-      homepage = http://mg.pov.lt/gtimelog/;
+      homepage = https://mg.pov.lt/gtimelog/;
       license = licenses.gpl2Plus;
       maintainers = with maintainers; [ ocharles ];
       platforms = platforms.unix;
@@ -5512,7 +5512,7 @@ in {
 
     meta = {
       description = "PAM interface using ctypes";
-      homepage = "http://github.com/minrk/pamela";
+      homepage = "https://github.com/minrk/pamela";
       license = licenses.mit;
     };
   };
@@ -5561,7 +5561,7 @@ in {
 
     meta = {
       description = "A Python-based build/distribution/deployment scripting tool";
-      homepage    = http://github.com/paver/paver;
+      homepage    = https://github.com/paver/paver;
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
@@ -7640,7 +7640,7 @@ in {
 
     meta = {
       description = "Filesystem abstraction";
-      homepage    = http://pypi.python.org/pypi/fs;
+      homepage    = https://pypi.python.org/pypi/fs;
       license     = licenses.bsd3;
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
@@ -8398,7 +8398,7 @@ in {
     '';
 
     meta = {
-      homepage = "http://falcao.it/HTTPretty/";
+      homepage = "https://falcao.it/HTTPretty/";
       description = "HTTP client request mocking tool";
       license = licenses.mit;
     };
@@ -8838,7 +8838,7 @@ in {
 
     meta = {
       description = "Messaging library for Python";
-      homepage    = "http://github.com/celery/kombu";
+      homepage    = "https://github.com/celery/kombu";
       license     = licenses.bsd3;
     };
   };
@@ -9076,7 +9076,7 @@ in {
     '';
 
     meta = {
-      homepage = http://launchpad.net/pylockfile;
+      homepage = https://launchpad.net/pylockfile;
       description = "Platform-independent advisory file locking capability for Python applications";
       license = licenses.asl20;
     };
@@ -10383,7 +10383,7 @@ in {
     };
 
     meta = {
-      homepage = http://alastairs-place.net/projects/netifaces/;
+      homepage = https://alastairs-place.net/projects/netifaces/;
       description = "Portable access to network interfaces from Python";
     };
   };
@@ -10937,7 +10937,7 @@ in {
 
     meta = {
       description = "Draws Python object reference graphs with graphviz";
-      homepage = http://mg.pov.lt/objgraph/;
+      homepage = https://mg.pov.lt/objgraph/;
       license = licenses.mit;
     };
   };
@@ -18924,7 +18924,7 @@ EOF
     doCheck = false;
 
     meta = {
-      homepage = "http://matplotlib.org/basemap/";
+      homepage = "https://matplotlib.org/basemap/";
       description = "Plot data on map projections with matplotlib";
       longDescription = ''
         An add-on toolkit for matplotlib that lets you plot data on map projections with
@@ -19084,7 +19084,7 @@ EOF
 
     meta = {
       description = "Copy your docs directly to the gh-pages branch";
-      homepage = "http://github.com/davisp/ghp-import";
+      homepage = "https://github.com/davisp/ghp-import";
       license = "Tumbolia Public License";
       maintainers = with maintainers; [ garbas ];
     };
@@ -19200,7 +19200,7 @@ EOF
 
     meta = {
       description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
-      homepage = "http://docs.openstack.org/infra/system-config/jjb.html";
+      homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
       license = licenses.asl20;
       maintainers = with maintainers; [ garbas ];
     };

From 6e6d0bd23415beb3698cd167cf0a41997c839870 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 15:54:01 -0700
Subject: [PATCH 2015/2266] lightdm_gtk_greeter: 2.0.4 -> 2.0.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.Ened4Ypstm /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.5 with grep in /nix/store/w1whi2qkvm97pbk0mjigs7xhnd2vgczx-lightdm-gtk-greeter-2.0.5
- directory tree listing: https://gist.github.com/7fa4fc4e3d6e3d17e75f94d3a9798382
---
 .../display-managers/lightdm-gtk-greeter/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 685f9c159b6..3227151ce21 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -9,14 +9,14 @@
 
 let
   ver_branch = "2.0";
-  version = "2.0.4";
+  version = "2.0.5";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1";
+    sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From fc9c26d83847c3fa653277738f046f78af6509e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 14:11:13 -0700
Subject: [PATCH 2016/2266] kid3: 3.5.1 -> 3.6.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.FSRC6h0qrp /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli -h` got 0 exit code
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli --help` got 0 exit code
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli -h` and found version 3.6.0
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli --help` and found version 3.6.0
- found 3.6.0 with grep in /nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0
- found 3.6.0 in filename of file in /nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0
- directory tree listing: https://gist.github.com/55e96f99bdc127e8e0ab453dc59880e8
---
 pkgs/applications/audio/kid3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 24421b527e1..680542dc405 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -10,11 +10,11 @@
 stdenv.mkDerivation rec {
 
   name = "kid3-${version}";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
-    sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8";
+    sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p";
   };
 
   buildInputs = with stdenv.lib;

From d78464723bc79320601ae4be4a83b364e5a88c5c Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 22 Mar 2018 21:30:42 +0100
Subject: [PATCH 2017/2266] kmsxx: build with gcc6

gcc7 build fails with "internal compiler error"
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10d230a4e8d..35cf1a3baeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13214,7 +13214,9 @@ with pkgs;
 
   kmscube = callPackage ../os-specific/linux/kmscube { };
 
-  kmsxx = callPackage ../development/libraries/kmsxx { };
+  kmsxx = callPackage ../development/libraries/kmsxx {
+    stdenv = overrideCC stdenv gcc6;
+  };
 
   latencytop = callPackage ../os-specific/linux/latencytop { };
 

From 0beff72eaea15881fd253731a5493a1a41397c2d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 13:12:24 -0700
Subject: [PATCH 2018/2266] ircdHybrid: 8.2.21 -> 8.2.22

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.m29kbtRZ7x /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd -h` got 0 exit code
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd --help` got 0 exit code
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd -V` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd -v` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd --version` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd --help` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/ircd help` got 0 exit code
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/ircd version` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/ircd help` and found version 8.2.22
- found 8.2.22 with grep in /nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22
- directory tree listing: https://gist.github.com/4a91920bc15a662018a588fbd3e819d1
---
 pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index c13a0ee3d89..656f0aa0223 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "ircd-hybrid-8.2.21";
+  name = "ircd-hybrid-8.2.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
-    sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3";
+    sha256 = "1i5iv5hc8gbaw74mz18zdjzv3dsvyvr8adldj8p1726h4i2xzn6p";
   };
 
   buildInputs = [ openssl zlib ];

From d4930aceaf36f45912c6c06d41e7ed0d8b14a5a2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 12:58:33 -0700
Subject: [PATCH 2019/2266] imagemagick7: 7.0.7-22 -> 7.0.7-27

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.quAyurRyhL /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick -h` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick --help` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick help` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick --version` and found version 7.0.7-27
- found 7.0.7-27 with grep in /nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27
- directory tree listing: https://gist.github.com/4c89cc9d32b6739922d277619629d087
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index e716146ec7a..410c74ac6cf 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-22";
-    sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam";
+    version = "7.0.7-27";
+    sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k";
     patches = [];
   };
 in

From e08c2638f2c2e73f6f2647ab68cc77f8b4434d1d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 11:27:55 -0700
Subject: [PATCH 2020/2266] gitAndTools.gitRemoteGcrypt: 1.0.0 -> 1.0.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.HNtjNxAelH /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.3 with grep in /nix/store/y4rmp0i9bslzh2izpjhl9glklwhd9ypn-git-remote-gcrypt-1.0.3
- directory tree listing: https://gist.github.com/4dd37ba2fc098537882e10e0c38823bb
---
 .../git-and-tools/git-remote-gcrypt/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index 1208afa1963..5e41db0e03f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "git-remote-gcrypt-${version}";
-  version = "1.0.0";
+  version = "1.0.3";
   rev = version;
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "spwhitton";
     repo = "git-remote-gcrypt";
-    sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379";
+    sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1";
   };
 
   outputs = [ "out" "man" ];

From 38ad43dd897bf2b951149b744671a8e6cd65df5e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 11:13:11 -0700
Subject: [PATCH 2021/2266] gitAndTools.git-recent: 1.0.3 -> 1.0.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.Laok6v3TeR /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/git-recent -h` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/git-recent --help` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/git-recent help` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/.git-recent-wrapped -h` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/.git-recent-wrapped --help` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/.git-recent-wrapped help` got 0 exit code
- found 1.0.4 with grep in /nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4
- directory tree listing: https://gist.github.com/a5c51e3598313240f56c2e95a8ddf85e
---
 .../version-management/git-and-tools/git-recent/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index ae1139e9993..0272d441460 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -11,13 +11,13 @@ let
     ++ stdenv.lib.optional (utillinux != null) utillinux);
 in stdenv.mkDerivation rec {
   name = "git-recent-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
     rev = "v${version}";
-    sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4";
+    sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k";
   };
 
   buildInputs = [ makeWrapper ];

From 826d114390b4af5b4978dddaa1c9658254a59603 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 11:12:12 -0700
Subject: [PATCH 2022/2266] gitAndTools.git-extras: 4.4.0 -> 4.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.nnPD4LOmby /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-extras -v` and found version 4.5.0
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-extras --version` and found version 4.5.0
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-standup -h` got 0 exit code
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-standup help` got 0 exit code
- found 4.5.0 with grep in /nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0
- directory tree listing: https://gist.github.com/a7a8d5fdc1d2b452c08a12f2319907dd
---
 .../version-management/git-and-tools/git-extras/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index abd9013b6b0..e4db75c8ad7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "git-extras-${version}";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchurl {
     url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
-    sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn";
+    sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb";
   };
 
   dontBuild = true;

From cbb81720fc6eb50ecdde0f66b27becd8d1a392ae Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 02:34:10 -0700
Subject: [PATCH 2023/2266] rdma-core: 17 -> 17.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch -h` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch --help` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rxe_cfg -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rxe_cfg --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rxe_cfg help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibacm help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -V` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -v` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd --version` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -h` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd --help` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd -V` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd -v` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd --version` and found version 17.1
- found 17.1 with grep in /nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1
- found 17.1 in filename of file in /nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1
- directory tree listing: https://gist.github.com/bc45415978e0954a49f501d71dead508
---
 pkgs/os-specific/linux/rdma-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index b25ed85ce4b..9aa93806879 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "17";
+  version = "17.1";
 
 in stdenv.mkDerivation {
   name = "rdma-core-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "1xql46favv8i4ni4zqkk9ra2kcqq2dyn7jyi940c869lndmjw9ni";
+    sha256 = "019h5q0szjccdgfk13qy0f2dxd0n1fr407b3qqq1vcmx41w9b6vz";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 5dbaf1f018990e565b5d09c4188e16bce7f73f3a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 07:45:50 -0700
Subject: [PATCH 2024/2266] xineLib: 1.2.6 -> 1.2.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 -h` got 0 exit code
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 --help` got 0 exit code
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 help` got 0 exit code
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 -v` and found version 1.2.9
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 --version` and found version 1.2.9
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 -h` and found version 1.2.9
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 --help` and found version 1.2.9
- found 1.2.9 with grep in /nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9
- directory tree listing: https://gist.github.com/0b66f70c336b62519465be16269e2cce
---
 pkgs/development/libraries/xine-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 9bb9f7986e6..274a70057bd 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xine-lib-1.2.6";
+  name = "xine-lib-1.2.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
-    sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x";
+    sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];

From 90c143a9b96ed3e75c356dd4b4c34683c9b469ec Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 09:41:01 -0700
Subject: [PATCH 2025/2266] xmlrpc_c: 1.33.17 -> 1.39.12

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12/bin/xmlrpc-c-config --help` got 0 exit code
- ran `/nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12/bin/xmlrpc-c-config --version` and found version 1.39.12
- ran `/nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12/bin/xmlrpc-c-config --help` and found version 1.39.12
- found 1.39.12 with grep in /nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12
- directory tree listing: https://gist.github.com/02ef530309005ffeedbc4af16ffd467c
---
 pkgs/development/libraries/xmlrpc-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index 0b5f08bdf9b..92e3424a5f6 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmlrpc-c-1.33.17";
+  name = "xmlrpc-c-1.39.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
-    sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah";
+    sha256 = "026fh7w7y3q9pvxd09i5d4hq3l6gd81n9k19yq4zwbc398kg6c6q";
   };
 
   buildInputs = [ curl libxml2 ];

From 385d311ebebef1d74917c79a1000a19773b45ae6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 07:55:19 -0700
Subject: [PATCH 2026/2266] xineUI: 0.99.9 -> 0.99.10

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check -h` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check --help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check -V` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check --version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check -h` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check --help` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check help` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport -h` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport --help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport -V` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport --version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport -h` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport --help` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport help` and found version 0.99.10
- found 0.99.10 with grep in /nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10
- directory tree listing: https://gist.github.com/38a0309d9443aca1e54f071937c1e1cc
---
 pkgs/applications/video/xine-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 5e44116415e..b75145a3e4a 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -2,11 +2,11 @@
 , lirc, shared-mime-info, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "xine-ui-0.99.9";
+  name = "xine-ui-0.99.10";
   
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
-    sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd";
+    sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
   };
   
   nativeBuildInputs = [ pkgconfig shared-mime-info ];

From a48d58ff73781ebbc9e7107631f58b3c8c33e2f5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:49:38 -0700
Subject: [PATCH 2027/2266] pius: 2.2.4 -> 2.2.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.6 with grep in /nix/store/q9ca3k22liz3dsaipnlnw8fmggpqx1n1-pius-2.2.6
- directory tree listing: https://gist.github.com/0d14ff30c172f091a342653aae676f55
---
 pkgs/tools/security/pius/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 908a47e6326..eb05c374807 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, stdenv, pythonPackages, gnupg }:
 
-let version = "2.2.4"; in
+let version = "2.2.6"; in
 pythonPackages.buildPythonApplication {
   name = "pius-${version}";
   namePrefix = "";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
     owner = "jaymzh";
     repo = "pius";
     rev = "v${version}";
-    sha256 = "1yk6ngpk55yjdnzhm5sj675xbzwp7rir816a3aris647gsph1vlx";
+    sha256 = "1rffwyjd84rwx1w5yyqckirm1kdj80ldfwjlw91kk74swhpbpzzj";
   };
 
   patchPhase = ''

From 2e02bcaedcbaaa954d37524ba853e44c9a04b296 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Tue, 20 Mar 2018 17:07:15 +0000
Subject: [PATCH 2028/2266] toml: init at 0.9.4

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

diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix
new file mode 100644
index 00000000000..a80657dc4b4
--- /dev/null
+++ b/pkgs/development/python-modules/toml/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "toml";
+  version = "0.9.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf";
+  };
+
+  # This package has a test script (built for Travis) that involves a)
+  # looking in the home directory for a binary test runner and b) using
+  # git to download a test suite.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "a Python library for parsing and creating TOML";
+    homepage = "https://github.com/uiri/toml";
+    license = licenses.mit;
+    maintainers = with maintainers; [ twey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf755ada5bd..963b255a887 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -424,6 +424,8 @@ in {
 
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
+  toml = callPackage ../development/python-modules/toml { };
+
   unifi = callPackage ../development/python-modules/unifi { };
 
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };

From 275cd497314464226343fa31cee271fb9d4c8025 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 15 Mar 2018 21:25:14 +0100
Subject: [PATCH 2029/2266] geogebra: 5-0-382-0 -> 5-0-444-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index ef6b266eaaf..b486d01a409 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,20 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-382-0";
+  version = "5-0-444-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
-    urls = [
-      "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
-
-      # Fallback for 5-0-382-0
-      # To avoid breaks when latest geogebra version is
-      # removed from `download.geogebra.org`
-      "http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2"
-    ];
-    sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv";
+    urls = "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
+    sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
   };
 
   srcIcon = fetchurl {

From 404c80791f0c7a7eaf21a8f0b6209008508071c3 Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@gmail.com>
Date: Sun, 25 Mar 2018 09:00:31 +0200
Subject: [PATCH 2030/2266] debian-devscripts: add dpkg in PATH

The script uscan was complaining about missing dpkg, therefore I have
added it to the PATH.
---
 pkgs/tools/misc/debian-devscripts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 810bf06527b..a08f465d6cd 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -54,7 +54,8 @@ in stdenv.mkDerivation rec {
       wrapProgram "$i" \
         --prefix PERL5LIB : "$PERL5LIB" \
         --prefix PERL5LIB : "$out/share/devscripts" \
-        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
+        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" \
+        --prefix PATH : "${dpkg}/bin"
     done
   '';
 

From 155dfe385eca240c31fd4deaa9e92fd77aa31225 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 03:12:28 -0400
Subject: [PATCH 2031/2266] callHackage: Keep deriver, like callCabal2nix

---
 .../haskell-modules/make-package-set.nix      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 9912d1bcde2..bde4f85f678 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -136,13 +136,26 @@ let
     src    = "${component}/${name}.cabal";
   };
 
+  # Adds a nix file as an input to the haskell derivation it
+  # produces. This is useful for callHackage / callCabal2nix to
+  # prevent the generated default.nix from being garbage collected
+  # (requiring it to be frequently rebuilt), which can be an
+  # annoyance.
+  callPackageKeepDeriver = src: args:
+    overrideCabal (self.callPackage src args) (orig: {
+      preConfigure = ''
+        # Generated from ${src}
+        ${orig.preConfigure or ""}
+      '';
+    });
+
 in package-set { inherit pkgs stdenv callPackage; } self // {
 
     inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
 
     inherit (haskellLib) packageSourceOverrides;
 
-    callHackage = name: version: self.callPackage (self.hackage2nix name version);
+    callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
 
     # Creates a Haskell package from a source package by calling cabal2nix on the source.
     callCabal2nix = name: src: args: let
@@ -155,10 +168,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
                 then pkgs.lib.cleanSourceWith { inherit src filter; }
               else src;
       };
-    in overrideCabal (self.callPackage expr args) (orig: {
+    in overrideCabal (callPackageKeepDeriver expr args) (orig: {
          inherit src;
-         preConfigure =
-           "# Generated from ${expr}\n${orig.preConfigure or ""}";
        });
 
     # : { root : Path

From 2379cfc4ed98a88ce2c2b394b6768c0429f05da9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 25 Mar 2018 10:08:43 +0200
Subject: [PATCH 2032/2266] geogebra: add archive.org link for 5-0-444-0

The `geogebra` package is subject to break as upstream removes versioned
packages from their download server when five new releases are comming.

This is why I had to fix almost monthly the package by bumping the
version (these can be found by running `git log --online | grep
geogebra:`). As the package didn't cause any issues for several months
now I guess that using `archive.org` seems to be a suitable solution for
now.

/cc @sternenseemann @matthewbauer
---
 pkgs/applications/science/math/geogebra/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index b486d01a409..9e2c55d567c 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -7,7 +7,10 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   src = fetchurl {
-    urls = "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
+    urls = [
+      "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+      "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+    ];
     sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
   };
 

From db0d6c908d2bd5960aba4edc6011f15d0f27e2c6 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Sun, 25 Mar 2018 11:04:08 +0300
Subject: [PATCH 2033/2266] hyperfine: 0.4.0 -> 1.0.0

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

diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 32215173984..0b04ee1e281 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "hyperfine-${version}";
-  version = "0.4.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "hyperfine";
     rev    = "refs/tags/v${version}";
-    sha256 = "1ynqyacbx0x971lyd1k406asms58bc7vzl8gca3sg34rx0hx3wzi";
+    sha256 = "0prmnhyp20w71l3mjqgdr38q94cqr1xayzgj7ibbq2hdick4w5nn";
   };
 
-  cargoSha256 = "109yv1618bi19vh1jjv2ki06mafhcrv35a3a1zsr34kg3gsjv0rb";
+  cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s";
 
   meta = with stdenv.lib; {
     description = "Command-line benchmarking tool";

From 6e863d1558e29e46b371189a6c25d04170d1c7ef Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Mar 2018 14:09:22 +0200
Subject: [PATCH 2034/2266] gitlab-runner: 10.5.0 -> 10.6.0

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 5181361abf6..6cce9803c91 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.5.0";
+  version = "10.6.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1ywfki1599ggyq0g3r8f7pi1njvvjz41kjhssfax20ljm2c6q5v0";
+    sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0r71zvyg17926h2vpjr3q16l1yqcb8ky21ic5arc7jh82nzywywl";
+    sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "13c9jzqj92xf2dzk77xpsfc4dwffvjfp8bqy685shzz1lrrfhfvq";
+    sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 319c61c893f896279d3ad2e8ef26d0026909b191 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 14:39:31 +0200
Subject: [PATCH 2035/2266] ragel: fix clang build

/cc ZHF #36454
---
 pkgs/development/tools/parsing/ragel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 66895fb7fd3..6b497e45630 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -20,7 +20,7 @@ let
 
       configureFlags = [ "--with-colm=${colm}" ];
 
-      NIX_CFLAGS_COMPILE = "-std=gnu++98";
+      NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98";
 
       doCheck = true;
 

From 1d3f24be2b81fbac340c75688f9d7b931578c3d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 25 Mar 2018 07:56:15 -0500
Subject: [PATCH 2036/2266] emacsPackagesNg: lower priority of elpaPackages

Lowering the priority of melpaStablePackages (#36423) leaves elpaPackages ahead
of melpaPackages; the former carries outdated dependencies which should be
overridden by melpaPackages.

See also: #36423
---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index fbad836bc1b..acc087108c9 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -385,9 +385,9 @@ let
 in
   lib.makeScope newScope (self:
     {}
+    // elpaPackages self
     // melpaStablePackages self
     // melpaPackages self
-    // elpaPackages self
     // orgPackages self
     // packagesFun self
   )

From 713ff855e074c300c7921fcf01757ffc38e9e01a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 15:03:05 +0200
Subject: [PATCH 2037/2266] runit: mark linux only

/cc ZHF #36454
---
 pkgs/tools/system/runit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 7eced697373..aa2f50f2df0 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     homepage = http://smarden.org/runit;
     maintainers = with maintainers; [ rickynils joachifm ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 11aae21cf8c874be9a4dfa6bf86e8898264f522a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 25 Mar 2018 15:07:27 +0200
Subject: [PATCH 2038/2266] mp3blaster: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/audio/mp3blaster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
index ed7a4e786f0..eb5aa7c036c 100644
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, libvorbis }:
+{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }:
 stdenv.mkDerivation rec {
 
   version = "3.2.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     libvorbis
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin SDL;
 
   buildFlags = [ "CXXFLAGS=-Wno-narrowing" ];
 

From 7ccbca6010453263e8436994c50dae8570a5a096 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Mar 2018 14:35:40 +0200
Subject: [PATCH 2039/2266] opencv3: don't download ippicv if not enabled

On aarch64 ipp is not available but the derivation still tries to download it
leading to an error that the platform is not supported.

There is already an option to enable ipp which is disabled by default.
So the sensitive thing to do is to only download the ippicv package if
the option is enabled.

This makes opencv3 build on aarch64.
---
 pkgs/development/libraries/opencv/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 101b38d6305..efb9a7cdbe4 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure =
-    installExtraFiles ippicv + (
+    lib.optionalString enableIpp (installExtraFiles ippicv) + (
     lib.optionalString buildContrib ''
       cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")
 

From e52250b33c85ab3eb30325b0141ca16ed2cdbc5a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 15:23:49 +0200
Subject: [PATCH 2040/2266] scowl: fix darwin build

/cc ZHF #36454
---
 pkgs/data/misc/scowl/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index 5e4d17bcc8f..e54dc3fa9fe 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}:
+{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix
+, singleWordlist ? null
+}:
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "scowl";
@@ -11,10 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
   };
 
-  buildInputs = [];
-  nativeBuildInputs = [unzip zip perl aspell dos2unix];
+  postPatch = ''
+    substituteInPlace scowl/src/Makefile \
+        --replace g++ c++
+  '';
 
-  NIX_CFLAGS_COMPILE = " -Wno-narrowing ";
+  nativeBuildInputs = [ unzip zip perl aspell dos2unix ];
+  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
 
   preConfigure = ''
     patchShebangs .
@@ -34,8 +42,8 @@ stdenv.mkDerivation rec {
   installPhase = if singleWordlist == null then ''
     eval "$preInstall"
 
-    mkdir -p "$out/share/scowl" 
-    mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" 
+    mkdir -p "$out/share/scowl"
+    mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell"
     mkdir -p "$out/share/dict"
 
     cp -r scowl/speller/aspell "$out/lib/aspell"

From 3ca8b20328ca6aebe15e6356be2c2249c2a5a67f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 15:33:36 +0200
Subject: [PATCH 2041/2266] shairplay: fix darwin build

/cc ZHF #36454
---
 pkgs/servers/shairplay/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
index 33e2f39280a..f9b17b947cf 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/servers/shairplay/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # the build will fail without complaining about a reference to /tmp
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
     patchelf \
       --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \
       $out/bin/shairplay

From bec461a35ac10a4c8bc796df840722b785db3a44 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 25 Mar 2018 16:39:10 +0300
Subject: [PATCH 2042/2266] llvm_34, llvm_35: Disable on aarch64

https://hydra.nixos.org/build/71176565
https://hydra.nixos.org/build/71167754
---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 27047e7d941..30f2dba2883 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -90,6 +90,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 00b2548d56e..4d0cb8930f5 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
   };
 }
 

From be3449200d8e6460cfd9d989c9843db43205c193 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 25 Mar 2018 15:50:26 +0200
Subject: [PATCH 2043/2266] haskellPackages.shell-conduit: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 47768b948ff..4db43dac143 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -112,7 +112,13 @@ self: super: {
     # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
     # see: https://github.com/psibi/shell-conduit/issues/12
     doCheck = !pkgs.stdenv.isDarwin;
-  }));
+  })).overrideScope (self: super: {
+    # shell-conduit doesn't build with conduit 1.3
+    # see https://github.com/psibi/shell-conduit/issues/15
+    conduit = self.conduit_1_2_13_1;
+    conduit-extra = self.conduit-extra_1_2_3_2;
+    resourcet = self.resourcet_1_1_11;
+  });
 
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;

From 19fa3a5e53156dc4a2e6502430dc9ebc99787d76 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 25 Mar 2018 16:13:37 +0200
Subject: [PATCH 2044/2266] gogs: 0.11.29 -> 0.11.34

---
 pkgs/applications/version-management/gogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index a86a7f96e09..508c8b3fb6d 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.11.29";
+  version = "0.11.34";
 
   src = fetchFromGitHub {
     owner = "gogits";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0";
+    sha256 = "15xwcw3k7wbahdgp796gly79qkka21p7kvm84zfjgcsjjri0kdnz";
   };
 
   patches = [ ./static-root-path.patch ];

From f3ca47561c31a8eeeb24c722d57effe84a686d77 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 25 Mar 2018 16:14:48 +0200
Subject: [PATCH 2045/2266] fail2ban: install docs to $out/share/doc

fixes issue #28145
---
 pkgs/tools/security/fail2ban/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index a8de8742dd5..23061b6962e 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -26,6 +26,8 @@ pythonPackages.buildPythonApplication {
   doCheck = false;
 
   preInstall = ''
+    substituteInPlace setup.py --replace /usr/share/doc/ share/doc/
+  
     # see https://github.com/NixOS/nixpkgs/issues/4968
     ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
   '';

From 3301258190101c6b771c70490b1e66db3e758cd3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 16:36:22 +0200
Subject: [PATCH 2046/2266] swftools: fix darwin build

/cc ZHF #36454
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aaca158c0b..8de01dff613 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8219,7 +8219,9 @@ with pkgs;
 
   swfmill = callPackage ../tools/video/swfmill { };
 
-  swftools = callPackage ../tools/video/swftools { };
+  swftools = callPackage ../tools/video/swftools {
+    stdenv = gccStdenv;
+  };
 
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 

From d27f7942b7ab745c5a00a993e2316c46654117d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 25 Mar 2018 18:29:21 +0300
Subject: [PATCH 2047/2266] nixos/tests/misc: Fix on aarch64

The psmouse module is for PS/2 mouse only, which doesn't exist outside
x86. But we can test for the mousedev module just as well which is used
for the '-device usb-tablet' emulated by QEMU.
---
 nixos/tests/misc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 4fd9466dc50..179c95e7643 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -96,7 +96,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       $machine->succeed("systemctl start systemd-udev-settle.service");
       subtest "udev-auto-load", sub {
           $machine->waitForUnit('systemd-udev-settle.service');
-          $machine->succeed('lsmod | grep psmouse');
+          $machine->succeed('lsmod | grep mousedev');
       };
 
       # Test whether systemd-tmpfiles-clean works.

From 4308403c303f45d47bd85643261e27cc74dd47cb Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 25 Mar 2018 17:56:06 +0200
Subject: [PATCH 2048/2266] ptlib: fix build

patch typedef clashes with unixODBC>=2.3.5
---
 pkgs/development/libraries/ptlib/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index f980a14aa41..ae60a6f69d6 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -24,12 +24,16 @@ stdenv.mkDerivation rec {
     (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3;
       sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0";
     })
-    (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support;
-      sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4";
-    })
     ./ptlib-2.10.11-glibc-2.26.patch
   ];
 
+  # fix typedef clashes with unixODBC>=2.3.5
+  postPatch = ''
+    substituteInPlace include/ptlib/unix/ptlib/contain.h \
+      --replace "typedef uintptr_t    UINT" "typedef unsigned int    UINT" \
+      --replace "typedef wchar_t                 WCHAR" "typedef unsigned short          WCHAR"
+  '';
+
   meta = with stdenv.lib; {
     description = "Portable Tools from OPAL VoIP";
     maintainers = [ maintainers.raskin ];

From 6f463fa7d10cd4210341647e946cccab45500db9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 07:34:08 -0700
Subject: [PATCH 2049/2266] accounts-qt: 1.13 -> 1.15

- Built on NixOS
- ran `/nix/store/790jpjbv7n4ccfwbnp2hpxi6xnh0rp4m-accounts-qt-1.15/bin/accountstest --help` got 0 exit code
- ran `/nix/store/790jpjbv7n4ccfwbnp2hpxi6xnh0rp4m-accounts-qt-1.15/bin/accountstest --help` and found version 1.15
- found 1.15 with grep in /nix/store/790jpjbv7n4ccfwbnp2hpxi6xnh0rp4m-accounts-qt-1.15
- directory tree listing: https://gist.github.com/5d6d729f133d93d11e63e456638fd32e
---
 pkgs/development/libraries/accounts-qt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index e7a90e40548..a50c92924e9 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
-  version = "1.13";
+  version = "1.15";
 
   src = fetchFromGitLab {
-    sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
-    rev = version;
+    sha256 = "0cnra7g2mcgzh8ykrj1dpb4khkx676pzdr4ia1bvsp0cli48691w";
+    rev = "VERSION_${version}";
     repo = "libaccounts-qt";
     owner = "accounts-sso";
   };

From ea9c748aa415fbb077dbaae0b850f1858427b3ce Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 18:41:46 -0700
Subject: [PATCH 2050/2266] mysql_jdbc: 5.1.45 -> 5.1.46

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/81178700485a613e552bedbac7095177
---
 pkgs/servers/sql/mysql/jdbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 7125f9ef8e9..66e62b823d9 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "mysql-connector-java-5.1.45";
+  name = "mysql-connector-java-5.1.46";
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip";
-    sha256 = "1x3dygygj15p7zk825mqr0g80wlm3rfsqgbqnb11l133rk4s1ylw";
+    sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
   };
 
   buildInputs = [ unzip ant ];

From 5fd613599fea4692f43f15152014d2f95f202474 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 19:39:18 -0700
Subject: [PATCH 2051/2266] networkmanager_strongswan: 1.4.1 -> 1.4.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.3 with grep in /nix/store/y2jkp10za0xpb7slalbfp3qyh9sgls70-NetworkManager-strongswan-1.4.3
- directory tree listing: https://gist.github.com/3d79a64230389ed5f84ff788ad4c56f1
---
 pkgs/tools/networking/network-manager/strongswan.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 4fc9c904f5f..cfa304901b4 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
   pname   = "NetworkManager-strongswan";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchurl {
     url    = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
-    sha256 = "0r5j8cr4x01d2cdy970990292n7p9v617cw103kdczw646xwcxs8";
+    sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l";
   };
 
   postPatch = ''

From 74907512e14c3ea6ace8256c2ef622fe5e7f4da1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:05:37 -0700
Subject: [PATCH 2052/2266] pam_krb5: 4.7 -> 4.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.8 with grep in /nix/store/lbmm10zm3yif6n33xvw5irzhzsqkwk7b-pam-krb5-4.8
- directory tree listing: https://gist.github.com/8511cb10102508ce5701ed7e0830e60c
---
 pkgs/os-specific/linux/pam_krb5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 3f8c3c28f31..76dbbf1e1be 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pam, kerberos }:
 
 stdenv.mkDerivation rec {
-  name = "pam-krb5-4.7";
+  name = "pam-krb5-4.8";
 
   src = fetchurl {
     url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz";
-    sha256 = "04klg9a2rhdz0a2dw4f0ybcm28vcbab6lrynwq7rm4sn0hnzakwv";
+    sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs";
   };
 
   buildInputs = [ pam kerberos ];

From 642b62d61d7956324715ba266d1548dbf5616d4a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 22:31:59 -0700
Subject: [PATCH 2053/2266] oniguruma: 6.6.1 -> 6.7.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.7.1 with grep in /nix/store/adypaqqfpnmali0662725r7xdzgyqqh0-onig-6.7.1
- directory tree listing: https://gist.github.com/b40671987a847be6597a16cb977ff6a4
---
 pkgs/development/libraries/oniguruma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index b82f137ec6d..974c2e482ea 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "onig-${version}";
-  version = "6.6.1";
+  version = "6.7.1";
 
   src = fetchFromGitHub {
     owner = "kkos";
     repo = "oniguruma";
     rev = "v${version}";
-    sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz";
+    sha256 = "07xbx4f3h1aqvy6587xbr8fgcn679ph3bd86pp144y0agzw0d0q2";
   };
 
   nativeBuildInputs = [ cmake ];

From fc68b01b7737b114d480c3898e241c7e2760ec1e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 09:57:28 -0700
Subject: [PATCH 2054/2266] xpraGtk3: 2.1.3 -> 2.2.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/xpra -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/xpra --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/xpra --version` and found version 2.2.5
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/udev_product_version -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/udev_product_version --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/udev_product_version help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/..xpra-wrapped-wrapped -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/..xpra-wrapped-wrapped --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/..xpra-wrapped-wrapped --version` and found version 2.2.5
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/.xpra-wrapped -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/.xpra-wrapped --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/.xpra-wrapped --version` and found version 2.2.5
- found 2.2.5 with grep in /nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5
- directory tree listing: https://gist.github.com/78f0907352399b3a9966fb6f71f1f0d4
---
 pkgs/tools/X11/xpra/gtk3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 629c10f867f..7e620e0c2c8 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -7,11 +7,11 @@
 
 buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.1.3";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
+    sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
   };
 
   patchPhase = ''

From f3231c6ba487ba60d1d71bc8eecd18ce77c0041f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 09:07:38 -0700
Subject: [PATCH 2055/2266] gitAndTools.git-open: 1.3.1 -> 2.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.0 with grep in /nix/store/bl1bdnjxn6k22is2w6qvdjl7kvhzjv2s-git-open-2.0.0
- directory tree listing: https://gist.github.com/7c26064e56c054ea6ba2b4d9162267cd
---
 .../version-management/git-and-tools/git-open/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index 5272e2be07c..dc3fbbed199 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-open-${version}";
-  version = "1.3.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-open";
     rev = "v${version}";
-    sha256 = "1klj41vqgyyigqzi6s1ykz9vd8wvaq3skin63pi989dlsjf7igyr";
+    sha256 = "0lprzrjsqrg83gixfaiw26achgd8l7s56jknsjss4p7y0w1fxm05";
   };
 
   buildInputs = [ makeWrapper ];

From 5350a56dcf4b65d848c876efeb104e6c33c32cbb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:03:25 -0700
Subject: [PATCH 2056/2266] libcec_platform: 2.0.1 -> 2.1.0.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.1.0.1 with grep in /nix/store/klb1bvsf1az785f2jzvsg5g0sxs8g4l3-p8-platform-2.1.0.1
- directory tree listing: https://gist.github.com/be00d099a69bdff53bd6e138cf5d6877
---
 pkgs/development/libraries/libcec/platform.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 228dccea3e3..0005525a7cd 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake }:
 
-let version = "2.0.1"; in
+let version = "2.1.0.1"; in
 
 stdenv.mkDerivation {
   name = "p8-platform-${version}";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
-    sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9";
+    sha256 = "18381y54f7d18ckpzf9cfxbz1ws6imprbbm9pvhcg5c86ln8skq6";
   };
 
   nativeBuildInputs = [ cmake ];

From 4b19ab9635faec6221eb097d1fc879969c62f27c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 17:08:38 -0700
Subject: [PATCH 2057/2266] m17n_lib: 1.7.0 -> 1.8.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv -h` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv --help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv --version` and found version 1.8.0
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date -h` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date --help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date --version` and found version 1.8.0
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-config --version` and found version 1.8.0
- found 1.8.0 with grep in /nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0
- directory tree listing: https://gist.github.com/3d3a5a6fc658c968ce3a1298c9f32c56
---
 pkgs/tools/inputmethods/m17n-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index 982f35a9fe6..12b669c8777 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, m17n_db}:
 stdenv.mkDerivation rec {
-  name = "m17n-lib-1.7.0";
+  name = "m17n-lib-1.8.0";
 
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
-    sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f";
+    sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
   };
 
   buildInputs = [ m17n_db ];

From 2455478754f6757e0648e8c8a276da45b0b4fa1c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 15 Mar 2018 17:13:02 +0000
Subject: [PATCH 2058/2266] ocamlPackages.findlib: fix META for library
 `threads`

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

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 186b78ce3f3..997a81f889e 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4, ncurses, ocaml, writeText}:
+{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
 stdenv.mkDerivation rec {
   name = "ocaml-findlib-${version}";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [m4 ncurses ocaml];
 
-  patches = [ ./ldconf.patch ./install_topfind.patch ];
+  patches = [ ./ldconf.patch ./install_topfind.patch
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch";
+      sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3";
+    })
+  ];
 
   dontAddPrefix=true;
 

From 387d7916637ae4b0e71d54fbcbd58b6c416f3709 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 15 Mar 2018 17:19:31 +0000
Subject: [PATCH 2059/2266] ocamlPackages.findlib: automatically populate the
 CAML_LD_LIBRARY_PATH env. variable

With directories of the form:
  lib/ocaml/${ocaml.version}/site-lib/stubslibs
---
 pkgs/development/tools/ocaml/findlib/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 997a81f889e..6f136a7ef28 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
         if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
         fi
+        if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then
+            export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"
+        fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
         if test -n "$createFindlibDestdir"; then
           mkdir -p $OCAMLFIND_DESTDIR

From f84eb11a8af81471c0f65b17c190b0fc7508f350 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 09:40:26 -0700
Subject: [PATCH 2060/2266] bird2: 2.0.1 -> 2.0.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/bird/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird -h` got 0 exit code
- ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird --help` got 0 exit code
- ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird --version` and found version 2.0.2
- found 2.0.2 with grep in /nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2
- directory tree listing: https://gist.github.com/b5a31c5299059545befb8209b15fef9d
---
 pkgs/servers/bird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index ba29bfa433a..94bd92abb4f 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -48,7 +48,7 @@ in
   };
 
   bird2 = generic {
-    version = "2.0.1";
-    sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n";
+    version = "2.0.2";
+    sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3";
   };
 }

From ef4a5e2fc0fa7e795cffd052e52267ff0515b634 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 25 Mar 2018 16:50:06 +0000
Subject: [PATCH 2061/2266] gnome2.gtksourceview: fix build on Darwin

---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 05da0684641..9efca75e8f8 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -38,4 +38,6 @@ stdenv.mkDerivation rec {
   preConfigure = optionalString stdenv.isDarwin ''
     intltoolize --force
   '';
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 }

From fa4956d091e18d15c196b1aac0fbe6111a199260 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Fri, 23 Mar 2018 03:49:15 +0700
Subject: [PATCH 2062/2266] ahoviewer: 1.4.9 -> 1.5.0

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

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index b7647803b3d..5abe1931d33 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
-  version = "1.4.9";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
     rev = version;
-    sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
+    sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
   };
 
   enableParallelBuilding = true; 
@@ -20,9 +20,13 @@ stdenv.mkDerivation rec {
                   libsecret curl unrar libzip librsvg 
                   gst_all_1.gstreamer
                   gst_all_1.gst-plugins-good 
-                  gst_all_1.gst-plugins-bad 
                   gst_all_1.gst-libav
                   gst_all_1.gst-plugins-base ];
+
+  # https://github.com/ahodesuka/ahoviewer/issues/60
+  # Already fixed in the master branch
+  # TODO: remove this next release
+  makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
   
   postPatch = ''patchShebangs version.sh'';
   

From c276b454769999e94a543df0fc3c53be632394e5 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Sun, 25 Mar 2018 14:33:41 +0700
Subject: [PATCH 2063/2266] ahoviewer: add useUnrar option

---
 .../graphics/ahoviewer/default.nix            | 32 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5abe1931d33..5fb7e007806 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, 
-  gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
-  librsvg, gst_all_1, autoreconfHook, makeWrapper }:
+{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
+  gtkmm2, glibmm, libxml2, libsecret, curl, libzip,
+  librsvg, gst_all_1, autoreconfHook, makeWrapper,
+  useUnrar ? false, unrar
+}:
+
+assert useUnrar -> unrar != null;
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
@@ -13,23 +17,25 @@ stdenv.mkDerivation rec {
     sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
   };
 
-  enableParallelBuilding = true; 
-  
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
-  buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
-                  libsecret curl unrar libzip librsvg 
-                  gst_all_1.gstreamer
-                  gst_all_1.gst-plugins-good 
-                  gst_all_1.gst-libav
-                  gst_all_1.gst-plugins-base ];
+  buildInputs = [
+    glibmm libconfig gtkmm2 glibmm libxml2
+    libsecret curl libzip librsvg
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+  ] ++ stdenv.lib.optional useUnrar unrar;
 
   # https://github.com/ahodesuka/ahoviewer/issues/60
   # Already fixed in the master branch
   # TODO: remove this next release
   makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
-  
+
   postPatch = ''patchShebangs version.sh'';
-  
+
   postInstall = ''
     wrapProgram $out/bin/ahoviewer \
     --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8de01dff613..6847c309caf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14644,7 +14644,9 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
-  ahoviewer = callPackage ../applications/graphics/ahoviewer { };
+  ahoviewer = callPackage ../applications/graphics/ahoviewer {
+    useUnrar = config.ahoviewer.useUnrar or false;
+  };
 
   airwave = callPackage ../applications/audio/airwave/default.nix { };
 

From 001db3951d2817af4707bb87eef2536bd445cfd4 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 25 Mar 2018 18:58:46 +0200
Subject: [PATCH 2064/2266] opal: build with gcc6

build on gcc7 failed with
"Error: call of overloaded 'abs(unsigned int)' is ambiguous"
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8de01dff613..f6faf9b15c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10809,6 +10809,7 @@ with pkgs;
 
   opal = callPackage ../development/libraries/opal {
     ffmpeg = ffmpeg_2;
+    stdenv = overrideCC stdenv gcc6;
   };
 
   openh264 = callPackage ../development/libraries/openh264 { };

From 18d3088ba8c8f6b0e1fe051291af25cfe6bc0cf2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 19:30:51 +0200
Subject: [PATCH 2065/2266] haskell-either: drop obsolete override for
 ghc-8.4.x

Closes https://github.com/NixOS/nixpkgs/issues/37773.
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d953236784e..ed39896863b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -66,11 +66,6 @@ self: super: {
     doCheck         = false;
   });
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## free >=4.9 && <5
-  either = super.either_5;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## Cabal <2.2

From 5bb96e7161fa5e8fde60b7b83fb33a0624c53f5b Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 25 Mar 2018 19:28:22 +0200
Subject: [PATCH 2066/2266] helmholtz: fix failing build

---
 pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 8f04bf116a6..3670fb8347d 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -20,13 +20,16 @@ stdenv.mkDerivation rec {
     mv helmholtz~/src/Makefile .
     rm -rf helmholtz~/src/
     rm helmholtz~/helmholtz~.pd_darwin
+    rm helmholtz~/helmholtz~.pd_linux
     rm helmholtz~/helmholtz~.dll
     rm -rf __MACOSX
   '';
 
   patchPhase = ''
+    mkdir -p $out/helmholtz~
     sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile
     sed -i "s@-Wl@@g" Makefile
+    sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile
   '';
 
   installPhase = ''

From 784dd64e8a61c5c84181f46c5a28f68e7e72261e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 19:35:35 +0200
Subject: [PATCH 2067/2266] hackage2nix: disable broken builds

The following maintained builds fail (since quite some time):

 - network-arbitrary and network-uri-json (@alunduil)
 - pipes-csv (@jb55)
---
 .../haskell-modules/configuration-hackage2nix.yaml   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 00505f31b46..d4b39c11955 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2474,7 +2474,6 @@ package-maintainers:
     - bson-lens
     - cased
     - elm-export-persistent
-    - pipes-csv
     - pipes-mongodb
     - skeletons
     - streaming-wai
@@ -2492,9 +2491,6 @@ package-maintainers:
     - shakespeare
   abbradar:
     - Agda
-  alunduil:
-    - network-arbitrary
-    - network-uri-json
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
@@ -3509,6 +3505,7 @@ dont-distribute-packages:
   clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  classy-miso:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6505,6 +6502,7 @@ dont-distribute-packages:
   lmdb-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  load-font:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6990,6 +6988,7 @@ dont-distribute-packages:
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-api-support:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-arbitrary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bitcoin:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7008,6 +7007,7 @@ dont-distribute-packages:
   network-stream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-uri-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-uri-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-voicetext:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7107,6 +7107,7 @@ dont-distribute-packages:
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  odbc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   OddWord:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oden-go-packages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   odpic-raw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7372,6 +7373,7 @@ dont-distribute-packages:
   pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-csv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-fastx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8523,6 +8525,7 @@ dont-distribute-packages:
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9175,6 +9178,7 @@ dont-distribute-packages:
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]

From 8446b031c48a4fbc6b0532822874fa4f52c8defb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2018 02:30:40 +0100
Subject: [PATCH 2068/2266] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6272b092cf23aa30154cd90ab0f5786c69bceb17.
---
 .../haskell-modules/hackage-packages.nix      | 1600 +++++++++++++----
 1 file changed, 1242 insertions(+), 358 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ac04f2d7cea..cfe1a0cca17 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6178,6 +6178,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
+  "GLURaw_2_0_0_4" = callPackage
+    ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
+     mkDerivation {
+       pname = "GLURaw";
+       version = "2.0.0.4";
+       sha256 = "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq";
+       libraryHaskellDepends = [ base OpenGLRaw transformers ];
+       librarySystemDepends = [ libGL libGLU ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
+
   "GLUT" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
      , transformers
@@ -6196,6 +6210,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_13" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.13";
+       sha256 = "1j5sv95fy0fv1n57qxhkdqm20q0lj4h5x3r7php9jh70wl77q89x";
+       isLibrary = true;
+       isExecutable = true;
+       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
@@ -8653,6 +8686,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HStringTemplate_0_8_7" = callPackage
+    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
+     , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
+     , semigroups, syb, template-haskell, text, time, void
+     }:
+     mkDerivation {
+       pname = "HStringTemplate";
+       version = "0.8.7";
+       sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers deepseq directory
+         filepath mtl old-locale parsec pretty semigroups syb
+         template-haskell text time void
+       ];
+       description = "StringTemplate implementation in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HStringTemplateHelpers" = callPackage
     ({ mkDerivation, base, containers, directory, FileManipCompat
      , filepath, HSH, HStringTemplate, mtl, safe, strict
@@ -13979,6 +14031,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OpenGL_3_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
+     , OpenGLRaw, StateVar, text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGL";
+       version = "3.0.2.1";
+       sha256 = "1gsrlp2if5zwq0icjmsmva3cj719qpwagsmg6dlvps0xj4dqkjvs";
+       libraryHaskellDepends = [
+         base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
+         text transformers
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "OpenGLCheck" = callPackage
     ({ mkDerivation, base, checkers, haskell98, OpenGL, QuickCheck }:
      mkDerivation {
@@ -15778,6 +15848,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7.3";
+       sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -16581,10 +16669,8 @@ self: {
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.6.0";
-       sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb";
-       revision = "1";
-       editedCabalFile = "1nsakdi9y5nnwm8x9f2a1cvf55k0wnva3wkd9nmz9my8mlk2jfi3";
+       version = "0.6.1";
+       sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g";
        libraryHaskellDepends = [
          aeson base bytestring cereal cereal-text containers
          data-default-class directory exceptions executable-path fgl
@@ -23132,8 +23218,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "1.1.2";
-       sha256 = "15ixv4zzb03wiijx5g7l9csawfihklsh1jnphnwb6j8d1kpmmh5v";
+       version = "1.2";
+       sha256 = "092jril2vfi90bbi9wc2ir4gidqzq0w84mgbgz72icx63nni1ah0";
        libraryHaskellDepends = [
          aivika aivika-transformers array base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -27949,6 +28035,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apply-refact_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+     , silently, syb, tasty, tasty-expected-failure, tasty-golden
+     , temporary, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.5.0.0";
+       sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filemanip ghc ghc-exactprint mtl process
+         refact syb temporary transformers unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact syb temporary transformers
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact silently syb tasty
+         tasty-expected-failure tasty-golden temporary transformers
+         unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apportionment" = callPackage
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
@@ -28340,19 +28458,18 @@ self: {
      }) {};
 
   "argon2" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, tasty
-     , tasty-quickcheck, text, transformers
+    ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text-short
      }:
      mkDerivation {
        pname = "argon2";
-       version = "1.2.0";
-       sha256 = "1zzwlhb47ykqi6psgnpzmf4nlk5rwr4adpl7sz7x7iacy9xmayd5";
-       libraryHaskellDepends = [ base bytestring text transformers ];
+       version = "1.3.0.0";
+       sha256 = "0sszifmi74b2n19d4f5f30pfnivqm6n1jdwf2j402schkd1wz7cp";
+       libraryHaskellDepends = [ base bytestring deepseq text-short ];
        testHaskellDepends = [
-         base bytestring QuickCheck tasty tasty-quickcheck text
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/ocharles/argon2.git";
-       description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
+       description = "Memory-hard password hash and proof-of-work function";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30085,27 +30202,27 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
      , Cabal, cli-setup, composition-prelude, containers, dependency
      , dhall, directory, file-embed, filemanip, hashable, http-client
-     , http-client-tls, lens, lzma, mtl, optparse-applicative
-     , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
-     , text, unix, zip-archive, zlib
+     , http-client-tls, lzma, microlens, microlens-th, mtl
+     , optparse-applicative, parallel-io, process, shake, shake-ats
+     , shake-ext, tar, temporary, text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.7.1.0";
-       sha256 = "0lpyvcj5cki19fs9022yb1wzwis6a89f3i4s03rcll0lvshmxd2q";
+       version = "2.7.1.2";
+       sha256 = "0v519jzz8sh851jp3rcbzgh5ylr8ggk993svh4w6y4224y6wfi28";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring bzlib Cabal
          composition-prelude containers dependency dhall directory
-         file-embed filemanip hashable http-client http-client-tls lens lzma
-         mtl parallel-io process shake shake-ats shake-ext tar text unix
-         zip-archive zlib
+         file-embed filemanip hashable http-client http-client-tls lzma
+         microlens microlens-th mtl parallel-io process shake shake-ats
+         shake-ext tar text unix zip-archive zlib
        ];
        executableHaskellDepends = [
-         base composition-prelude directory lens optparse-applicative shake
-         shake-ats temporary text
+         base composition-prelude directory microlens optparse-applicative
+         shake shake-ats temporary text
        ];
        homepage = "https://github.com/vmchale/atspkg#readme";
        description = "A build tool for ATS";
@@ -31371,22 +31488,25 @@ self: {
      }) {};
 
   "aws-easy" = callPackage
-    ({ mkDerivation, amazonka, amazonka-core, base, bytestring, lens
-     , resourcet, template-haskell, text
+    ({ mkDerivation, amazonka, amazonka-dynamodb, amazonka-s3, base
+     , bytestring, lens, resourcet, split, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "aws-easy";
-       version = "0.1.0.0";
-       sha256 = "0lchj79l606a2wxh72g837ys3nb1628ps03wxm61s5fl49229c0w";
+       version = "0.1.0.1";
+       sha256 = "0sl3whg7x02c3cph5p72rlkycsr2m3ni0kad5rs0q644wgvhqvm5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         amazonka amazonka-core base bytestring lens resourcet
-         template-haskell text
+         amazonka base bytestring lens resourcet template-haskell
+       ];
+       executableHaskellDepends = [
+         amazonka amazonka-dynamodb amazonka-s3 base lens split text
+         unordered-containers
        ];
-       executableHaskellDepends = [ base ];
        homepage = "https://github.com/rcook/aws-easy#readme";
-       description = "AWS Easy: Helper functions for working with amazonka";
+       description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -31753,6 +31873,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-ses-easy" = callPackage
+    ({ mkDerivation, amazonka, amazonka-ses, base, criterion
+     , exceptions, lens, lucid, mtl, tasty, tasty-hspec, text
+     , text-conversions
+     }:
+     mkDerivation {
+       pname = "aws-ses-easy";
+       version = "0.1.0";
+       sha256 = "0wlwff18k1qf6n6q2bhd1n2w58nsdmqx5c1yhhfqxkjyxz9flccn";
+       libraryHaskellDepends = [
+         amazonka amazonka-ses base exceptions lens lucid mtl text
+         text-conversions
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/jxv/aws-ses-easy#readme";
+       description = "Wrapper over Amazonka's SES";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aws-sign4" = callPackage
     ({ mkDerivation, attempt, aws, base, blaze-builder, byteable
      , bytestring, bytestring-lexing, Cabal, case-insensitive
@@ -33213,8 +33353,8 @@ self: {
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.2.1";
-       sha256 = "0zlzxh6ps655zryifyzz7pbypv32w6a475ighbc840awkw59qvvy";
+       version = "0.2.4";
+       sha256 = "1s8kbvyc73lpc634snmrb9dxmji0pj526ynnjqb4k3knia3qb3sn";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -33243,7 +33383,7 @@ self: {
        ];
        homepage = "https://github.com/weldr/bdcs";
        description = "Tools for managing a content store of software packages";
-       license = "LGPL";
+       license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ostree;};
 
@@ -35743,22 +35883,22 @@ self: {
      , bytestring-lexing, case-insensitive, clustering, conduit
      , conduit-combinators, containers, criterion, data-default-class
      , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit
-     , IntervalMap, math-functions, matrices, mtl, parallel, primitive
-     , random, split, statistics, tasty, tasty-golden, tasty-hunit, text
-     , transformers, unordered-containers, vector, vector-algorithms
-     , word8
+     , IntervalMap, lens, math-functions, matrices, mtl, parallel
+     , primitive, random, split, statistics, tasty, tasty-golden
+     , tasty-hunit, text, transformers, unordered-containers, vector
+     , vector-algorithms, word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.4.1";
-       sha256 = "0kqj88g1fx17xbdy6h56xl4qpgk6xvyfqwnvjvi4ha4rw7dhddxr";
+       version = "0.5.0";
+       sha256 = "1nb549w2rzc9psdnz8xbma0qgm2hj4svrlm3x8vc2i1dklmljmvr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
          case-insensitive clustering conduit containers data-default-class
          data-ordlist double-conversion hexpat HsHTSLib http-conduit
-         IntervalMap math-functions matrices mtl parallel primitive split
-         statistics text transformers unordered-containers vector
+         IntervalMap lens math-functions matrices mtl parallel primitive
+         split statistics text transformers unordered-containers vector
          vector-algorithms word8
        ];
        testHaskellDepends = [
@@ -38581,7 +38721,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_35" = callPackage
+  "brick_0_35_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, stm, template-haskell, text, text-zipper
@@ -38589,8 +38729,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.35";
-       sha256 = "16vfm60nz2zx819nv4s83108w1bhiyqx99zmacrlc371nlpdiyby";
+       version = "0.35.1";
+       sha256 = "16z2gm2wvj0y4lc3z7wvdrfksx4a6przllw2ly8ymm1x4ii0khhw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38605,15 +38745,17 @@ self: {
      }) {};
 
   "brick-skylighting" = callPackage
-    ({ mkDerivation, base, brick, containers, skylighting, text, vty }:
+    ({ mkDerivation, base, brick, containers, skylighting-core, text
+     , vty
+     }:
      mkDerivation {
        pname = "brick-skylighting";
-       version = "0.1";
-       sha256 = "189qpq2cg45binlb9nq43h05g97ch56855xlz2givxw8psb0kb1i";
+       version = "0.2";
+       sha256 = "1x4kfjj4sa5gbxnbvh76b4isrmc6jr11py9b50jsyvs720plq778";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base brick containers skylighting text vty
+         base brick containers skylighting-core text vty
        ];
        homepage = "https://github.com/jtdaugherty/brick-skylighting/";
        description = "Show syntax-highlighted text in your Brick UI";
@@ -38808,6 +38950,47 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "brittany_0_10_0_0" = callPackage
+    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+     , containers, czipwith, data-tree-print, deepseq, directory, extra
+     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
+     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
+     , safe, semigroups, strict, syb, text, transformers, uniplate
+     , unsafe, yaml
+     }:
+     mkDerivation {
+       pname = "brittany";
+       version = "0.10.0.0";
+       sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       executableHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       testHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation parsec pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       homepage = "https://github.com/lspitzner/brittany/";
+       description = "Haskell source code formatter";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "broadcast-chan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -46014,6 +46197,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "classy-miso" = callPackage
+    ({ mkDerivation, base, containers, lens, megaparsec, miso
+     , network-uri, rfc, url
+     }:
+     mkDerivation {
+       pname = "classy-miso";
+       version = "0.0.0.1";
+       sha256 = "07mcxpp0brh3yh7qhzmg7vvv0kgy2gwms8mzlgvbfb608ggwh32b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers lens megaparsec miso network-uri rfc url
+       ];
+       executableHaskellDepends = [ base miso rfc ];
+       testHaskellDepends = [ base miso rfc ];
+       homepage = "https://github.com/RobertFischer/Classy-Miso#README.md";
+       description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-parallel" = callPackage
     ({ mkDerivation, base, lifted-base, monad-control, parallel
      , resourcet, transformers
@@ -49373,12 +49577,13 @@ self: {
      }) {};
 
   "composition-prelude" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, cpphs }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.3.0.4";
-       sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg";
+       version = "1.3.0.7";
+       sha256 = "15fi1f3yiqg1gdjlwv3a6h9np9z3v1yd1qnz47309b6qki5pb0k3";
        libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ cpphs ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -51497,8 +51702,8 @@ self: {
        pname = "containers-verified";
        version = "0.5.11.0";
        sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
-       revision = "1";
-       editedCabalFile = "12jw1aq053wbbam8n2vvfdl00yha551bbk4xnwxk9rwfday45m4j";
+       revision = "3";
+       editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3";
        libraryHaskellDepends = [ containers ];
        homepage = "https://github.com/nomeata/containers-verified";
        description = "Formally verified drop-in replacement of containers";
@@ -54389,8 +54594,8 @@ self: {
        pname = "cryptohash-md5";
        version = "0.11.100.1";
        sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi";
-       revision = "1";
-       editedCabalFile = "1drxjsn5chi9zj3djj85s1d6xqlc28ji70zpyicxl5fals10n5w3";
+       revision = "2";
+       editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -54410,8 +54615,8 @@ self: {
        pname = "cryptohash-sha1";
        version = "0.11.100.1";
        sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w";
-       revision = "1";
-       editedCabalFile = "167i2mjyr18949xckzv6f782n763f6w9k114p6kq74gbmxqjvmqb";
+       revision = "2";
+       editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -54454,8 +54659,8 @@ self: {
        pname = "cryptohash-sha512";
        version = "0.11.100.1";
        sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
-       revision = "1";
-       editedCabalFile = "0aj9ryzdpxz79n5bs5wx56s9rjxm25dm7agxbyzqdr93wi2rj8ny";
+       revision = "2";
+       editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -55213,8 +55418,8 @@ self: {
        pname = "cue-sheet";
        version = "1.0.1";
        sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
-       revision = "1";
-       editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx";
+       revision = "2";
+       editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
@@ -60062,8 +60267,8 @@ self: {
      }:
      mkDerivation {
        pname = "dependency";
-       version = "0.1.0.9";
-       sha256 = "02xlq32xpww584ng5wzzlxmh8d15dqc342mlnfiysh2lfdwqydzk";
+       version = "0.1.0.10";
+       sha256 = "1cr1h8c127sgbgjg1qy9c17aj3mfp1bh35ypv00sz19k0d6wvmly";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary containers deepseq microlens
          recursion-schemes tardis transformers
@@ -60682,20 +60887,58 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , insert-ordered-containers, neat-interpolation, optparse-generic
-     , shell-escape, text, text-format, trifecta
+  "dhall_1_12_0" = callPackage
+    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , contravariant, cryptonite, deepseq, directory, exceptions
+     , filepath, formatting, haskeline, http-client, http-client-tls
+     , insert-ordered-containers, lens-family-core, memory, mtl
+     , optparse-generic, parsers, prettyprinter
+     , prettyprinter-ansi-terminal, repline, scientific, tasty
+     , tasty-hunit, text, transformers, trifecta, unordered-containers
+     , vector
      }:
      mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.10";
-       sha256 = "0phi5z7rmbxjj83mps0lcpmcv320k8mrfpigls46smv7srmhsla1";
+       pname = "dhall";
+       version = "1.12.0";
+       sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dhall insert-ordered-containers
-         neat-interpolation shell-escape text text-format
+         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
+         containers contravariant cryptonite directory exceptions filepath
+         formatting http-client http-client-tls insert-ordered-containers
+         lens-family-core memory parsers prettyprinter
+         prettyprinter-ansi-terminal scientific text transformers trifecta
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base haskeline mtl optparse-generic prettyprinter
+         prettyprinter-ansi-terminal repline text trifecta
+       ];
+       testHaskellDepends = [
+         base deepseq insert-ordered-containers prettyprinter tasty
+         tasty-hunit text vector
+       ];
+       description = "A configuration language guaranteed to terminate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dhall-bash" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dhall, formatting
+     , insert-ordered-containers, neat-interpolation, optparse-generic
+     , shell-escape, text, trifecta
+     }:
+     mkDerivation {
+       pname = "dhall-bash";
+       version = "1.0.11";
+       sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers dhall formatting
+         insert-ordered-containers neat-interpolation shell-escape text
        ];
        executableHaskellDepends = [
          base bytestring dhall optparse-generic text trifecta
@@ -60725,37 +60968,55 @@ self: {
 
   "dhall-json" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, trifecta, yaml
+     , optparse-generic, text, trifecta, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.12";
-       sha256 = "174ssff7fcxgr13w8mcls7w4fy5xzywh8qb55zj9qragj4bkyjab";
+       version = "1.0.13";
+       sha256 = "03spz9csxgamj970ha9l5swcpbkrvzbjy9w028c1kswzs806699s";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ aeson base dhall text ];
+       libraryHaskellDepends = [
+         aeson base bytestring dhall text trifecta unordered-containers
+       ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-generic text
-         trifecta yaml
+         aeson aeson-pretty base bytestring dhall optparse-generic text yaml
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-lex" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
+     , hspec, hspec-dirstream
+     }:
+     mkDerivation {
+       pname = "dhall-lex";
+       version = "0.1.0.1";
+       sha256 = "02g8si9cfhwqsr6c507yw7sydyg8ma645z9c3n0cap1wj8fa0r8p";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ array base bytestring deepseq ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [ base bytestring hspec hspec-dirstream ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       description = "Lexer for the Dhall language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , insert-ordered-containers, neat-interpolation, optparse-generic
-     , scientific, text, text-format, trifecta
+    ({ mkDerivation, base, containers, data-fix, dhall, formatting
+     , hnix, insert-ordered-containers, neat-interpolation
+     , optparse-generic, scientific, text, trifecta
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.1";
-       sha256 = "01cdz8kjmm0ncdyq616mg6hjq7cwq5648cnrp6ggps5zc1d71176";
+       version = "1.1.2";
+       sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-fix dhall hnix insert-ordered-containers
-         neat-interpolation scientific text text-format
+         base containers data-fix dhall formatting hnix
+         insert-ordered-containers neat-interpolation scientific text
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text trifecta
@@ -60769,8 +61030,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.7";
-       sha256 = "11jp5yz11f701phzz74zf3spqhgmrdiq8ldbi96xmfjqhwnc9kmj";
+       version = "1.0.8";
+       sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -62288,6 +62549,8 @@ self: {
        pname = "direct-sqlite";
        version = "2.3.22";
        sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a";
+       revision = "1";
+       editedCabalFile = "0cfg6fjdl1p9lgsnc2b2lys9mcc30dvxr8a92q5nxpgc4mdkk5db";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
@@ -62297,6 +62560,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "direct-sqlite_2_3_23" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, directory
+     , HUnit, semigroups, temporary, text
+     }:
+     mkDerivation {
+       pname = "direct-sqlite";
+       version = "2.3.23";
+       sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz";
+       libraryHaskellDepends = [ base bytestring semigroups text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring directory HUnit temporary text
+       ];
+       homepage = "https://github.com/IreneKnapp/direct-sqlite";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "directed-cubical" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , parallel, QuickCheck, unordered-containers, vector
@@ -64083,14 +64364,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover_0_1_0_8" = callPackage
+  "doctest-discover_0_1_0_9" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.8";
-       sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x";
+       version = "0.1.0.9";
+       sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70361,6 +70642,8 @@ self: {
        pname = "except-exceptions";
        version = "0.1";
        sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs";
+       revision = "1";
+       editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk";
        libraryHaskellDepends = [ base exceptions transformers ];
        homepage = "https://github.com/thumphries/except-exceptions";
        description = "Safely deal with exceptions in ExceptT";
@@ -71300,6 +71583,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_5" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.5";
+       sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       homepage = "https://github.com/ndmitchell/extra#readme";
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -79546,6 +79847,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-eot_0_3" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec
+     , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
+     , shake
+     }:
+     mkDerivation {
+       pname = "generics-eot";
+       version = "0.3";
+       sha256 = "1r0qh27jpika9wfxk0i6kywsclrdqhaphl1qw26vfzka4dsfbjrb";
+       libraryHaskellDepends = [ base markdown-unlit ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec interpolate markdown-unlit
+         mockery QuickCheck shake
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/soenkehahn/generics-eot#readme";
+       description = "A library for generic programming that aims to be easy to understand";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
@@ -82900,8 +83222,8 @@ self: {
      }:
      mkDerivation {
        pname = "giphy-api";
-       version = "0.5.2.0";
-       sha256 = "1sbwv6mvjb17g95b1b1ggryhk6lykp2vwvxja3y6z9rjzb9i2wa4";
+       version = "0.6.0.1";
+       sha256 = "0146813vcnjgb8clyczlz8g6ngm9l702gib60f2m6rf2bc0bbpwd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83679,6 +84001,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "githud" = callPackage
+    ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, unix
+     }:
+     mkDerivation {
+       pname = "githud";
+       version = "2.0.1";
+       sha256 = "0qmc51dpsmil72xvv3g7mylr39ignrm8az6jv92b767s8ijqk5lh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl parsec process text unix ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "http://github.com/gbataille/gitHUD#readme";
+       description = "More efficient replacement to the great git-radar";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gitignore" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , http-conduit, network, safe, text
@@ -86941,6 +87283,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-easy" = callPackage
+    ({ mkDerivation, aeson, base, criterion, http-api-data, http-client
+     , mtl, servant, servant-client, tasty, tasty-hspec, text
+     , text-conversions, unordered-containers
+     }:
+     mkDerivation {
+       pname = "google-oauth2-easy";
+       version = "0.0.0";
+       sha256 = "03jzlshz7649rvgmql5nsq4hys253dlqpm163xqpccif1s34z59b";
+       libraryHaskellDepends = [
+         aeson base http-api-data http-client mtl servant servant-client
+         text text-conversions unordered-containers
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/jxv/google-oauth2-easy#readme";
+       description = "Opininated use of Google Authentication for ease";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "google-oauth2-for-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , hspec, http-types, req, time, unix, wai, warp
@@ -87568,8 +87930,8 @@ self: {
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.2.2";
-       sha256 = "0l1zjgn4jix9m2zbiwnms3c6004zqzpqxwvsdq9fmafbh7zhfvvx";
+       version = "0.3";
+       sha256 = "1dqmjg40h4gm6921yq84sx8x5sdbzhnv8xl7m2ylb872ddbzfwg3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87579,8 +87941,8 @@ self: {
          base containers monoid-subclasses parsers rank2classes
        ];
        testHaskellDepends = [
-         base checkers doctest monoid-subclasses parsers QuickCheck
-         rank2classes tasty tasty-quickcheck testing-feat
+         base checkers containers doctest monoid-subclasses parsers
+         QuickCheck rank2classes tasty tasty-quickcheck testing-feat
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq monoid-subclasses rank2classes
@@ -91526,8 +91888,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.6.0";
-       sha256 = "1ajwzyh3x185lvn22vi3wnfprf9fq0k1kxjxz575h87xwnq46y4v";
+       version = "1.6.1";
+       sha256 = "1fh9gg8yq0k5a54bk754kcbrmna0v66c7wnmd9z20f46wl3cdygs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92175,12 +92537,15 @@ self: {
      }) {};
 
   "hakyll-dir-list" = callPackage
-    ({ mkDerivation, base, containers, filepath, hakyll }:
+    ({ mkDerivation, base, containers, data-default, filepath, hakyll
+     }:
      mkDerivation {
        pname = "hakyll-dir-list";
-       version = "0.1.1.0";
-       sha256 = "0j5amghlsjdnvi4klag6ifwwzy05v17bsf7j6lzl32hcx66a62qb";
-       libraryHaskellDepends = [ base containers filepath hakyll ];
+       version = "1.0.0.1";
+       sha256 = "1xlb6dkkzska20gxjsazh5wipb4srpl9llg338znrj2491h37kqh";
+       libraryHaskellDepends = [
+         base containers data-default filepath hakyll
+       ];
        homepage = "http://github.com/freylax/hakyll-dir-list";
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
@@ -94497,6 +94862,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashtables_1_2_3_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
+     mkDerivation {
+       pname = "hashtables";
+       version = "1.2.3.0";
+       sha256 = "19bkpx43f3b5mya4jkygiafw402hvazawp6qr69h3wqkc6xv8mpr";
+       libraryHaskellDepends = [
+         base ghc-prim hashable primitive vector
+       ];
+       homepage = "http://github.com/gregorycollins/hashtables";
+       description = "Mutable hash tables in the ST monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashtables-plus" = callPackage
     ({ mkDerivation, base, criterion-plus, deepseq, hashable
      , hashtables, lens, loch-th, mtl, mwc-random, placeholders
@@ -95606,16 +95986,16 @@ self: {
      }) {};
 
   "haskell-packages" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
      , optparse-applicative, tagged, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "haskell-packages";
-       version = "0.5";
-       sha256 = "0b6hzz5ql6c9x7lxdldi50yw257cccp4d26jbdp51fi5chp2h7y6";
+       version = "0.6.1";
+       sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs";
        libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq directory filepath
+         base binary bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
        ];
@@ -97565,20 +97945,20 @@ self: {
 
   "hasktags" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
-     , unix, utf8-string
+     , utf8-string
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.4";
-       sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni";
+       version = "0.69.5";
+       sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath json unix utf8-string
+         base bytestring directory filepath json utf8-string
        ];
-       executableHaskellDepends = [ base directory filepath unix ];
+       executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit json unix utf8-string
+         base bytestring directory filepath HUnit json utf8-string
        ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
@@ -97745,6 +98125,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasmin_1_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, directory, doctest, doctest-discover, gitrev, hopfli
+     , hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, quickcheck-instances
+     , text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "1.0.2";
+       sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers matrix mtl numbers parsers text
+       ];
+       executableHaskellDepends = [
+         base bytestring gitrev hopfli optparse-applicative text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck quickcheck-instances text
+       ];
+       benchmarkHaskellDepends = [ base criterion directory text ];
+       homepage = "https://github.com/contivero/hasmin#readme";
+       description = "CSS Minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -100893,6 +101303,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "heterogeneous-list-literals" = callPackage
+    ({ mkDerivation, base, OneTuple }:
+     mkDerivation {
+       pname = "heterogeneous-list-literals";
+       version = "0.1.0.1";
+       sha256 = "0cb38kpw01fzwfrhlgi2l1869b8hd9cd7kzbyr1ap6ik5gkljq6k";
+       libraryHaskellDepends = [ base OneTuple ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/davidm-d/heterogeneous-list-literals";
+       description = "Allows the use of tuples as literals for Heterogeneous collections";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "heterolist" = callPackage
     ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata
      }:
@@ -103507,32 +103930,30 @@ self: {
   "hledger-iadd" = callPackage
     ({ mkDerivation, base, brick, containers, directory, free
      , hledger-lib, hspec, megaparsec, microlens, microlens-th
-     , optparse-applicative, QuickCheck, semigroups, text, text-format
-     , text-zipper, time, transformers, unordered-containers, vector
-     , vty, xdg-basedir
+     , optparse-applicative, QuickCheck, semigroups, text, text-zipper
+     , time, transformers, unordered-containers, vector, vty
+     , xdg-basedir
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.1";
-       sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv";
-       revision = "2";
-       editedCabalFile = "03cc91bzxmk3hffkmda3w87rgwarpdjbs1kwafix65avhw03g7ga";
+       version = "1.3.2";
+       sha256 = "1n21i1hqqrzd3fdrq6cclf8bfginwl4bhjy16vxfh9ba644920xf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base brick containers directory free hledger-lib megaparsec
          microlens microlens-th optparse-applicative semigroups text
-         text-format text-zipper time transformers unordered-containers
-         vector vty xdg-basedir
+         text-zipper time transformers unordered-containers vector vty
+         xdg-basedir
        ];
        executableHaskellDepends = [
          base brick directory free hledger-lib megaparsec microlens
-         optparse-applicative text text-format text-zipper time transformers
+         optparse-applicative text text-zipper time transformers
          unordered-containers vector vty xdg-basedir
        ];
        testHaskellDepends = [
-         base free hledger-lib hspec megaparsec QuickCheck text text-format
-         text-zipper time transformers vector
+         base free hledger-lib hspec megaparsec QuickCheck text text-zipper
+         time transformers vector
        ];
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
@@ -103580,29 +104001,29 @@ self: {
      , blaze-markup, bytestring, cmdargs, containers, csv, data-default
      , Decimal, deepseq, directory, doctest, extra, filepath, Glob
      , hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec
-     , pretty-show, regex-tdfa, safe, semigroups, split, test-framework
+     , pretty-show, regex-tdfa, safe, split, test-framework
      , test-framework-hunit, text, time, transformers, uglymemo
      , utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.5";
-       sha256 = "00k0wqib3hadi4rcnldr14q2va57b09whfbwzd14pz824x7pnfd7";
+       version = "1.5.1";
+       sha256 = "1bk2haj555fd6dws3zcp2a4slkhnl7wfjkx1x654a6nrdywlny3x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory extra
          filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec
-         pretty-show regex-tdfa safe semigroups split text time transformers
-         uglymemo utf8-string
+         pretty-show regex-tdfa safe split text time transformers uglymemo
+         utf8-string
        ];
        testHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
          doctest extra filepath Glob hashtables HUnit megaparsec mtl
-         mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups
-         split test-framework test-framework-hunit text time transformers
-         uglymemo utf8-string
+         mtl-compat old-time parsec pretty-show regex-tdfa safe split
+         test-framework test-framework-hunit text time transformers uglymemo
+         utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -103774,6 +104195,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
+  "hlibsass_0_1_7_0" = callPackage
+    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
+     mkDerivation {
+       pname = "hlibsass";
+       version = "0.1.7.0";
+       sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
+       configureFlags = [ "-fexternalLibsass" ];
+       setupHaskellDepends = [ base Cabal directory ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libsass ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/jakubfijalkowski/hlibsass";
+       description = "Low-level bindings to Libsass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libsass;};
+
   "hlint" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, data-default, directory, extra, filepath
@@ -103783,8 +104221,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1";
-       sha256 = "13chm0dhh1fn2iy3flnh7ahc3yzh8q0v10qxwd1739sywhykayg9";
+       version = "2.1.1";
+       sha256 = "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -107904,20 +108342,19 @@ self: {
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
      , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, lens, optparse-generic
+     , hspec-dirstream, language-ats, microlens, optparse-generic
      , system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.2.1.7";
-       sha256 = "01hinvxj9v04kzvyck01z4ky3b1gmffwxvl7wri2ggps26h2d5gf";
+       version = "0.2.1.8";
+       sha256 = "19hrl7qrhg9h2m5anzgxf6sfx7zr0a4r14mvjcn21cvj1jzs9j86";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base casing composition-prelude cpphs deepseq
-         haskell-src-exts language-ats lens optparse-generic
+         haskell-src-exts language-ats microlens optparse-generic
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
        ];
@@ -108032,6 +108469,30 @@ self: {
        pname = "hsass";
        version = "0.5.0";
        sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d";
+       revision = "1";
+       editedCabalFile = "00va8x51p6rbg8jbkxpyz74pa2pfm5dsrpi57icbyickx39iaydd";
+       libraryHaskellDepends = [
+         base bytestring data-default-class filepath hlibsass monad-loops
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring data-default-class hspec hspec-discover temporary
+       ];
+       homepage = "https://github.com/jakubfijalkowski/hsass";
+       description = "Integrating Sass into Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hsass_0_6_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, filepath
+     , hlibsass, hspec, hspec-discover, monad-loops, temporary
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hsass";
+       version = "0.6.0";
+       sha256 = "14wvgcp9skdqag16fvbbkfmimpxbm9y2hh9g6alacxasan8qjn6j";
        libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
@@ -108760,8 +109221,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.1.2";
-       sha256 = "1abwv4987xznfv6sx8sfhk04f4s7dpjvgzwzjzi8rwxibm8az09p";
+       version = "0.3.1.3";
+       sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109922,8 +110383,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-dirstream";
-       version = "0.4.0.0";
-       sha256 = "01090ph0njwv5cabj9f82xsiy0lk254sk3iq6l9h7dkh57sm7q9n";
+       version = "1.0.0.0";
+       sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -112550,6 +113011,8 @@ self: {
        pname = "http-media";
        version = "0.7.1.2";
        sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy";
+       revision = "1";
+       editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -125386,12 +125849,12 @@ self: {
     ({ mkDerivation, base, containers, mtl, read-bounded }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.9.0.1";
-       sha256 = "16q4skxkmc6xaj23ys5ddpazwcxvck7dvvilm8n4k0wam0llhs2h";
+       version = "0.9.1.0";
+       sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n";
        libraryHaskellDepends = [ base containers mtl read-bounded ];
        homepage = "https://github.com/thomaseding/lambda-options";
-       description = "A modern command-line parser for Haskell";
-       license = "unknown";
+       description = "Declarative command line parser using type-driven pattern matching";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -126107,17 +126570,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, criterion, deepseq, happy, hspec
-     , hspec-dirstream, lens, recursion-schemes, system-filepath
-     , transformers
+     , hspec-dirstream, microlens, microlens-th, recursion-schemes
+     , system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.2";
-       sha256 = "1hbngljls19a9mr6gz5qm80ibx8z75ky0s5gn57nmlsf8pazkfvz";
+       version = "1.2.0.3";
+       sha256 = "19gm7gj6l0b4qh5pnp1qv1q2g3gfp3mny9y8nrxvmbzrrc1ad7j9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         lens recursion-schemes transformers
+         microlens microlens-th recursion-schemes transformers
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -126338,26 +126801,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_3_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
-     , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , semigroups, split, template-haskell, text, th-lift
-     , th-lift-instances, time, transformers, unordered-containers, yaml
+  "language-docker_4_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
+     , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split
+     , template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "3.0.1";
-       sha256 = "1bs9ghajxz0a1jmzarb7fzn4z2m8qmcyydsf93rqlzxc8y8fhsp2";
+       version = "4.0.1";
+       sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa";
        libraryHaskellDepends = [
-         aeson base bytestring directory filepath free Glob mtl parsec
-         pretty semigroups split template-haskell text th-lift
-         th-lift-instances time transformers unordered-containers yaml
+         base bytestring free mtl parsec pretty split template-haskell text
+         th-lift time
        ];
        testHaskellDepends = [
-         aeson base bytestring directory filepath free Glob hspec HUnit mtl
-         parsec pretty process QuickCheck semigroups split template-haskell
-         text th-lift th-lift-instances time transformers
-         unordered-containers yaml
+         base bytestring directory filepath free Glob hspec HUnit mtl parsec
+         pretty process QuickCheck split template-haskell text th-lift time
        ];
        homepage = "https://github.com/hadolint/language-docker#readme";
        description = "Dockerfile parser, pretty-printer and embedded DSL";
@@ -128315,6 +128774,48 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "lens_4_16_1" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , Cabal, cabal-doctest, call-stack, comonad, containers
+     , contravariant, criterion, deepseq, directory, distributive
+     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
+     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
+     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
+     , tagged, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text
+     , th-abstraction, transformers, transformers-compat
+     , unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.16.1";
+       sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
+       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring call-stack comonad
+         containers contravariant distributive exceptions filepath free
+         ghc-prim hashable kan-extensions mtl parallel profunctors
+         reflection semigroupoids semigroups tagged template-haskell text
+         th-abstraction transformers transformers-compat
+         unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
+         simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring comonad containers criterion deepseq
+         generic-deriving transformers unordered-containers vector
+       ];
+       homepage = "http://github.com/ekmett/lens/";
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, lens }:
      mkDerivation {
@@ -132017,8 +132518,8 @@ self: {
      }:
      mkDerivation {
        pname = "lmdb-simple";
-       version = "0.3.1.0";
-       sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn";
+       version = "0.4.0.0";
+       sha256 = "1bq8zdym2x1yyzafyyw2syn9pg4w33y107qyrid67492zmck10zi";
        libraryHaskellDepends = [ base bytestring lmdb serialise ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -132112,6 +132613,7 @@ self: {
        homepage = "https://github.com/deech/load-font#load-font";
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loadavg" = callPackage
@@ -134667,8 +135169,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "4.0.1.0";
-       sha256 = "08nw11l8vpazyfny3f8alyb9r268wlh3q24032q34sk1n5d92pcl";
+       version = "4.0.2.0";
+       sha256 = "1syq92bxbyf5nxywpm1prds9ki63a601v55cjba1dalv3z2zh6n6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -136541,8 +137043,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40700.0.0";
-       sha256 = "1knf05p9qmk51ysvp2gp718d365g9n7myycb07w8d84f4vrphg51";
+       version = "40800.0.0";
+       sha256 = "0wzgy39halqd6bm0wvcsnk4l5ngdr4nwqbqk46jgnfb99nwsd3z6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136571,20 +137073,21 @@ self: {
   "mattermost-api" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, connection
      , containers, gitrev, hashable, HTTP, HUnit, memory, microlens
-     , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty
-     , tasty-hunit, template-haskell, text, time, unordered-containers
-     , websockets
+     , microlens-th, mtl, network-uri, pretty-show, process
+     , resource-pool, stm, tasty, tasty-hunit, template-haskell, text
+     , time, unordered-containers, websockets
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "40700.0.0";
-       sha256 = "1nhhlj6vgjndm34aw9kzmsjrkx7j3fir8rccx65d4c10labclsb9";
+       version = "40800.0.0";
+       sha256 = "0yjs97c4rf2idj88y5gnkdvshlaz49zna1ssx1d910gm5b5cnqy5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary bytestring connection containers gitrev hashable
          HTTP memory microlens microlens-th network-uri pretty-show process
-         stm template-haskell text time unordered-containers websockets
+         resource-pool stm template-haskell text time unordered-containers
+         websockets
        ];
        testHaskellDepends = [
          aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
@@ -136601,8 +137104,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "40700.0.0";
-       sha256 = "0dz254wmrxbavsjqhyn90gg6iplcgcpsw8p9fv0c5kxlafqwg0kf";
+       version = "40800.0.0";
+       sha256 = "1j9f291s51a8i55y338kcvfkmlb3xsd0c4cjh0nl97x7p30dxcm6";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -138284,12 +138787,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens_0_4_9" = callPackage
+  "microlens_0_4_9_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.9";
-       sha256 = "1zsisv6vlkphqw8rdi6c6phm6k3izc0n6vj1z1b6my7r8zyshlia";
+       version = "0.4.9.1";
+       sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
@@ -138446,14 +138949,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens-th_0_4_2" = callPackage
+  "microlens-th_0_4_2_1" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
      }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.4.2";
-       sha256 = "16962h9qxjw6mv7nqn2xz7kclfgllla52illrzpri738wnf2nwsd";
+       version = "0.4.2.1";
+       sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc";
        libraryHaskellDepends = [
          base containers microlens template-haskell th-abstraction
          transformers
@@ -139722,6 +140225,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_1_2" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.1.2";
+       sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtf" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-msgpack
      , hspec, QuickCheck, text
@@ -140599,6 +141116,8 @@ self: {
        pname = "monad-logger";
        version = "0.3.28.2";
        sha256 = "1dqrsqpqw4qfyida4j0z6dffds4sj7j282x4ir6wrq9j7nmns4yx";
+       revision = "1";
+       editedCabalFile = "1mk69zg6bbh0420ndf5f0qgsdzy11mn0pdcqgyna4r0pqkzflc0i";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions fast-logger
          lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -140610,6 +141129,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_28_3" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
+     , mtl, resourcet, stm, stm-chans, template-haskell, text
+     , transformers, transformers-base, transformers-compat
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.28.3";
+       sha256 = "11v5014zqp1sl801wc39yyix8m30vrf3ibas28bcdjyfrbhhvskp";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra exceptions fast-logger
+         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+         template-haskell text transformers transformers-base
+         transformers-compat unliftio-core
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -141245,12 +141787,12 @@ self: {
      }) {};
 
   "monad-var" = callPackage
-    ({ mkDerivation, base, stm, transformers }:
+    ({ mkDerivation, base, base-compat, stm }:
      mkDerivation {
        pname = "monad-var";
-       version = "0.1.2.0";
-       sha256 = "1nj10lhijwvim7js2vl9b9qq7x55dx7bk6q4jmvpz99c2vqfhyy5";
-       libraryHaskellDepends = [ base stm transformers ];
+       version = "0.2.1.0";
+       sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
+       libraryHaskellDepends = [ base base-compat stm ];
        homepage = "https://github.com/effectfully/monad-var#readme";
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
@@ -145839,25 +146381,25 @@ self: {
     ({ mkDerivation, attoparsec, base, errors, exceptions
      , extractable-singleton, hashable, hspec, hspec-wai, http-types
      , monad-control-aligned, mtl, poly-arity, pred-trie, regex-compat
-     , tasty, tasty-hspec, text, tries, unordered-containers
+     , tasty, tasty-hspec, text, tries, unordered-containers, wai
      , wai-middleware-content-type, wai-middleware-verbs
      , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "9.0.0";
-       sha256 = "1vdmwkr69n7ybwamfazy2p65r9s2fqbgvfy31wxiqyn6phg6r57v";
+       version = "9.0.0.1";
+       sha256 = "1y9562nq2hylcd0ahc28cfb9q1bsl4dg8ilrdsy64ls776dkj951";
        libraryHaskellDepends = [
          attoparsec base errors exceptions extractable-singleton hashable
          monad-control-aligned mtl poly-arity pred-trie regex-compat text
-         tries unordered-containers wai-middleware-content-type
+         tries unordered-containers wai wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        testHaskellDepends = [
          attoparsec base errors exceptions extractable-singleton hashable
          hspec hspec-wai http-types monad-control-aligned mtl poly-arity
          pred-trie regex-compat tasty tasty-hspec text tries
-         unordered-containers wai-middleware-content-type
+         unordered-containers wai wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        homepage = "https://github.com/athanclark/nested-routes#readme";
@@ -146277,6 +146819,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "netwire_5_0_3" = callPackage
+    ({ mkDerivation, base, containers, deepseq, parallel, profunctors
+     , random, semigroups, time, transformers
+     }:
+     mkDerivation {
+       pname = "netwire";
+       version = "5.0.3";
+       sha256 = "0bi2xyipz11vsai4wghdrh5yywzl0bkinfpmh0qdp77y7qlygpgi";
+       libraryHaskellDepends = [
+         base containers deepseq parallel profunctors random semigroups time
+         transformers
+       ];
+       homepage = "https://github.com/esoeylemez/netwire";
+       description = "Functional reactive programming library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netwire-input" = callPackage
     ({ mkDerivation, base, deepseq, netwire }:
      mkDerivation {
@@ -146495,7 +147055,7 @@ self: {
        homepage = "https://github.com/alunduil/network-arbitrary";
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ alunduil ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -146762,6 +147322,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-info_0_2_0_10" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "network-info";
+       version = "0.2.0.10";
+       sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/jystic/network-info";
+       description = "Access the local computer's basic network configuration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-interfacerequest" = callPackage
     ({ mkDerivation, base, bytestring, ioctl, network }:
      mkDerivation {
@@ -147274,7 +147847,7 @@ self: {
        homepage = "https://github.com/alunduil/network-uri-json";
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ alunduil ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri-static" = callPackage
@@ -147539,6 +148112,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "newtype-generics_0_5_3" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups
+     , transformers
+     }:
+     mkDerivation {
+       pname = "newtype-generics";
+       version = "0.5.3";
+       sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base hspec ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion semigroups ];
+       homepage = "http://github.com/sjakobi/bsb-http-chunked";
+       description = "A typeclass and set of functions for working with newtypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "newtype-th" = callPackage
     ({ mkDerivation, base, haskell-src-meta, newtype, syb
      , template-haskell
@@ -149411,38 +150002,39 @@ self: {
      }) {};
 
   "nvim-hs" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, data-default
-     , deepseq, directory, dyre, exceptions, filepath, foreign-store
-     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
-     , messagepack, monad-control, mtl, network, optparse-applicative
-     , process, QuickCheck, resourcet, setenv, stm, streaming-commons
-     , template-haskell, text, time, time-locale-compat, transformers
-     , transformers-base, utf8-string
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , containers, data-default, deepseq, directory, dyre, filepath
+     , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec
+     , messagepack, mtl, network, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, process, QuickCheck, resourcet
+     , setenv, stm, streaming-commons, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base, unliftio
+     , unliftio-core, utf8-string, void
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.2.4";
-       sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5";
+       version = "1.0.0.0";
+       sha256 = "036zf20aarrshqh0vpkmba5fj5sz28q0cd92dhxag12lp3zsindf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default deepseq directory dyre
-         exceptions filepath foreign-store hslogger lifted-base megaparsec
-         messagepack monad-control mtl network optparse-applicative process
-         resourcet setenv stm streaming-commons template-haskell text time
-         time-locale-compat transformers transformers-base utf8-string
+         base bytestring cereal cereal-conduit conduit containers
+         data-default deepseq directory dyre filepath foreign-store hslogger
+         megaparsec messagepack mtl network optparse-applicative
+         prettyprinter prettyprinter-ansi-terminal process resourcet setenv
+         stm streaming-commons template-haskell text time time-locale-compat
+         transformers transformers-base unliftio unliftio-core utf8-string
+         void
        ];
        executableHaskellDepends = [ base data-default ];
        testHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger hspec hspec-discover HUnit
-         lifted-base megaparsec messagepack mtl network optparse-applicative
+         base bytestring cereal cereal-conduit conduit containers
+         data-default directory dyre filepath foreign-store hslogger hspec
+         hspec-discover HUnit megaparsec messagepack mtl network
+         optparse-applicative prettyprinter prettyprinter-ansi-terminal
          process QuickCheck resourcet setenv stm streaming-commons
          template-haskell text time time-locale-compat transformers
-         transformers-base utf8-string
+         transformers-base unliftio unliftio-core utf8-string
        ];
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
@@ -149451,23 +150043,24 @@ self: {
      }) {};
 
   "nvim-hs-contrib" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default
-     , directory, exceptions, filepath, hspec, hspec-discover
-     , messagepack, mtl, nvim-hs, QuickCheck, text, time, utf8-string
-     , yaml
+    ({ mkDerivation, base, bytestring, data-default, directory
+     , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs
+     , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, text
+     , time, utf8-string, yaml
      }:
      mkDerivation {
        pname = "nvim-hs-contrib";
-       version = "0.2.0";
-       sha256 = "05999ma4whng6brn37bw2wbw7yf2hq9yw8sr12kwykdygxvykrbf";
+       version = "1.0.0.0";
+       sha256 = "150kg8gkai4cz7yv42vgn3b6rl6p44vfksq897kjaa3b12yjwd5x";
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring data-default directory exceptions
-         filepath messagepack mtl nvim-hs text time utf8-string yaml
+         base bytestring data-default directory filepath messagepack mtl
+         nvim-hs prettyprinter prettyprinter-ansi-terminal text time
+         utf8-string yaml
        ];
        testHaskellDepends = [
          base hspec hspec-discover nvim-hs QuickCheck
        ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs";
+       homepage = "https://github.com/neovimhaskell/nvim-hs-contrib";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149475,15 +150068,16 @@ self: {
 
   "nvim-hs-ghcid" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers, yaml
+     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers
+     , unliftio, yaml
      }:
      mkDerivation {
        pname = "nvim-hs-ghcid";
-       version = "0.2.0";
-       sha256 = "108fi3pnsc0yj5kmm0awqr7f3xqhyxg1yg29p2kw6bk8vvwjdlvf";
+       version = "1.0.0.0";
+       sha256 = "06yz73sx2z86dm1yhs3pqpi8g88157885fpm8hd6gkl2q4pjcwc8";
        libraryHaskellDepends = [
          base bytestring containers directory filepath ghcid nvim-hs
-         nvim-hs-contrib resourcet transformers yaml
+         nvim-hs-contrib resourcet transformers unliftio yaml
        ];
        homepage = "https://github.com/saep/nvim-hs-ghcid";
        description = "Neovim plugin that runs ghcid to update the quickfix list";
@@ -149954,15 +150548,32 @@ self: {
          inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;};
 
   "odbc" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , formatting, hspec, optparse-applicative, QuickCheck, text, time
+     , unixODBC, unliftio-core, weigh
+     }:
      mkDerivation {
        pname = "odbc";
-       version = "0.0.0";
-       sha256 = "1yyp21j0kmq7mc80z3vpmra16kbqb35pzblir1gppiz0wh1wmgpb";
-       doHaddock = false;
-       description = "TBA";
+       version = "0.0.1";
+       sha256 = "173ixmhw505306qg3ig3xvi16h30fk5314yk5mbmmv212k2w2vrp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq formatting text time
+         unliftio-core
+       ];
+       librarySystemDepends = [ unixODBC ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec QuickCheck text time
+       ];
+       benchmarkHaskellDepends = [ async base text weigh ];
+       description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unixODBC;};
 
   "oden-go-packages" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
@@ -156628,6 +157239,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_6_0_3" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , product-isomorphic, quickcheck-simple, template-haskell
+     , th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.6.0.3";
+       sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466";
+       libraryHaskellDepends = [
+         array base containers dlist names-th product-isomorphic
+         template-haskell th-data-compat transformers
+       ];
+       testHaskellDepends = [ base quickcheck-simple ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Binding between SQL database values and haskell records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistable-types-HDBC-pg" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC
      , persistable-record, relational-query-HDBC, text-postgresql
@@ -158714,7 +159345,7 @@ self: {
        ];
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-errors" = callPackage
@@ -162168,18 +162799,18 @@ self: {
 
   "potoki" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bytestring
-     , directory, foldl, hashable, potoki-core, profunctors, QuickCheck
-     , quickcheck-instances, random, rerebase, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, unagi-chan
+     , directory, foldl, hashable, potoki-core, profunctors, ptr
+     , QuickCheck, quickcheck-instances, random, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.11.1";
-       sha256 = "1xmxdlg213y1v09akc853zymbkxpg6pkfspwjb0g1kvnirjlj0rj";
+       version = "0.11.2";
+       sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
-         potoki-core profunctors text transformers unagi-chan
+         potoki-core profunctors ptr text transformers unagi-chan
          unordered-containers vector
        ];
        testHaskellDepends = [
@@ -162229,6 +162860,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "potoki-hasql" = callPackage
+    ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core
+     , profunctors, text, vector
+     }:
+     mkDerivation {
+       pname = "potoki-hasql";
+       version = "1.1";
+       sha256 = "03bssi3qdayrxrsy5ykf38r5kbl0m5svfm76k4yrwcpzpqk5h0sh";
+       libraryHaskellDepends = [
+         base bytestring hasql potoki potoki-core profunctors text vector
+       ];
+       homepage = "https://github.com/metrix-ai/potoki-hasql";
+       description = "Integration of \"potoki\" and \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "potrace" = callPackage
     ({ mkDerivation, base, bindings-potrace, bytestring, containers
      , data-default, JuicyPixels, vector
@@ -162655,6 +163302,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "predicate-class" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "predicate-class";
+       version = "0.1.0.1";
+       sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h";
+       libraryHaskellDepends = [ base ];
+       description = "Helper class for passing context along a predicate value";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "predicates" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -165956,8 +166614,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6.1";
-       sha256 = "0dqc35ca1668j2xfwmz8bqgbyld9gw3b0bld8s5gy6id7qfn7d26";
+       version = "0.6.2";
+       sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166803,16 +167461,15 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
-     , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels
-     , libqrencode, microlens, optparse-applicative, process, split
-     , vector
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
+     , microlens, optparse-applicative, process, split, vector
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.1.6";
-       sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn";
+       version = "1.0.1.7";
+       sha256 = "1l0xf77nkx8kv9xc07xlpg09b76isr3c8k7i03lfa3dgn9s6lh7l";
        libraryHaskellDepends = [
-         aeson base bytestring cryptonite directory either haskell-qrencode
+         aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens optparse-applicative process split
          vector
        ];
@@ -167158,8 +167815,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser";
-       version = "0.1.0.0";
-       sha256 = "0ixx2ff7b3m7i8yp23x8nx0bpq92r387ddqag1i0026hljwpqchr";
+       version = "0.1.0.1";
+       sha256 = "1rz3v3cks7ys6313gispxbs8wzm8h5lccl27f9nhha7rpzl9qkcj";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty QuickCheck semigroups text
@@ -167168,9 +167825,23 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
+
+  "queryparser-demo" = callPackage
+    ({ mkDerivation, base, containers, pretty, queryparser
+     , queryparser-vertica, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "queryparser-demo";
+       version = "0.1.0.0";
+       sha256 = "1ndm7rdwnl8sgfi5058hh1l7xisxbvxl8ign91hwpkyqfmgx3ypi";
+       libraryHaskellDepends = [
+         base containers pretty queryparser queryparser-vertica text
+         unordered-containers
+       ];
+       description = "Demo package containing queryparser examples";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "queryparser-hive" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, fixed-list
@@ -167180,8 +167851,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser-hive";
-       version = "0.1.0.0";
-       sha256 = "1lh8vj0wbgpsliq8dcfp6cibd0ka3gf8j0b132b1dy9hz8q3k99s";
+       version = "0.1.0.1";
+       sha256 = "0rj1v715wr3z76mp7i581bsjfvl9038kh4ccwlvjzi67afvds0b8";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty queryparser QuickCheck regex-tdfa semigroups
@@ -167189,9 +167860,7 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
 
   "queryparser-presto" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, fixed-list
@@ -167201,8 +167870,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser-presto";
-       version = "0.1.0.0";
-       sha256 = "10yh0j7xxmyxpfkixk8wjfl0sbb6y51kylvc6jnl3wclcyw31jvf";
+       version = "0.1.0.1";
+       sha256 = "0ibcbv76c1qv8w50v7gzq6vv3l9hbda5ir95k44rk1da6n53hj3b";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty queryparser QuickCheck regex-tdfa semigroups
@@ -167210,9 +167879,7 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
 
   "queryparser-vertica" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, fixed-list
@@ -167222,8 +167889,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser-vertica";
-       version = "0.1.0.0";
-       sha256 = "04g4ciqjkphyim0wjy3mn74fd8in38wkf3hyqsd0968syxdx6ykx";
+       version = "0.1.0.1";
+       sha256 = "0pkkgb3schbb25pw8k9varx3c0iwhfc47w4f2692y6s39vpm4d5z";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty queryparser QuickCheck regex-tdfa semigroups
@@ -167231,9 +167898,7 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
 
   "querystring-pickle" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, test-framework
@@ -167431,15 +168096,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_2" = callPackage
+  "quickcheck-classes_0_4_4" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, tagged, transformers
      , vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.2";
-       sha256 = "1whin052j39gdvqy1kvfrqiyfa76amclp6pschqd6xmmw2vly491";
+       version = "0.4.4";
+       sha256 = "0g4hjgjz1wpb8fwn70gd7di69mrn6z46q39g93z3w0cwydqlcgng";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups tagged transformers
@@ -170061,20 +170726,21 @@ self: {
 
   "reactive-banana" = callPackage
     ({ mkDerivation, base, containers, hashable, HUnit, pqueue
-     , psqueues, test-framework, test-framework-hunit, transformers
-     , unordered-containers, vault
+     , psqueues, semigroups, test-framework, test-framework-hunit
+     , transformers, unordered-containers, vault
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "1.1.0.1";
-       sha256 = "1hvhzr3cvg91l8kwxia0idg3n9jrh4knlcrmzm9j978dckzrc3mc";
+       version = "1.2.0.0";
+       sha256 = "1bwzkpackjpzk2igmlahr2qhgacad62v48lam97g9q85zww70p29";
        libraryHaskellDepends = [
-         base containers hashable pqueue transformers unordered-containers
-         vault
+         base containers hashable pqueue semigroups transformers
+         unordered-containers vault
        ];
        testHaskellDepends = [
-         base containers hashable HUnit pqueue psqueues test-framework
-         test-framework-hunit transformers unordered-containers vault
+         base containers hashable HUnit pqueue psqueues semigroups
+         test-framework test-framework-hunit transformers
+         unordered-containers vault
        ];
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Library for functional reactive programming (FRP)";
@@ -170782,8 +171448,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "1.0.0.2";
-       sha256 = "1k7jjargdhc5q7ay2r07fwd9wgcs249p1r1rr48qlw6lsccrparw";
+       version = "1.0.0.3";
+       sha256 = "00yj7h46pmy76iqsx1n0mlg04gzdrhyq10xm1xcl28y13jcjx9lc";
        libraryHaskellDepends = [
          base composition-prelude lens recursion-schemes
        ];
@@ -173947,6 +174613,8 @@ self: {
        pname = "resourcet";
        version = "1.1.11";
        sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil";
+       revision = "1";
+       editedCabalFile = "09sgrzaaishx645hrfflxckyaq0dwk22agjf4sz8nwjafyv3ssh9";
        libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat unliftio-core
@@ -174411,6 +175079,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "retry_0_7_6_2" = callPackage
+    ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
+     , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
+     , tasty-hunit, time, transformers
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.7.6.2";
+       sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad";
+       libraryHaskellDepends = [
+         base data-default-class exceptions ghc-prim random transformers
+       ];
+       testHaskellDepends = [
+         base data-default-class exceptions ghc-prim hedgehog HUnit mtl
+         random stm tasty tasty-hedgehog tasty-hunit time transformers
+       ];
+       homepage = "http://github.com/Soostone/retry";
+       description = "Retry combinators for monadic actions that may fail";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "retryer" = callPackage
     ({ mkDerivation, base, optparse-applicative, process }:
      mkDerivation {
@@ -177456,10 +178146,8 @@ self: {
      }:
      mkDerivation {
        pname = "sandi";
-       version = "0.4.1";
-       sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j";
-       revision = "1";
-       editedCabalFile = "1gk6vwydqdgz1s5glv4jlkaph7g19aqdf7yxbyq0m1afaj1rvjq9";
+       version = "0.4.2";
+       sha256 = "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b";
        libraryHaskellDepends = [
          base bytestring conduit exceptions stringsearch
        ];
@@ -181941,8 +182629,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.6.0";
-       sha256 = "1llhxqnbrydikrxdd10cfk4shgbfpxvlsym0lvvvbva4vci1k8wj";
+       version = "0.0.7.0";
+       sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2";
        libraryHaskellDepends = [
          aeson base base-compat bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -182227,6 +182915,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.5";
        sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
+       revision = "1";
+       editedCabalFile = "005b3z7wxcrad8210yw3qsndh3zh0v2h8j50qxl8sj1l6wqb7zs6";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -182254,6 +182944,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.2.5.3.9.1";
        sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m";
+       revision = "1";
+       editedCabalFile = "16lixcz9vkkgvcfwdfj3p6pmf458hymyywklzwnbhk7z16wjjhnv";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -183346,15 +184038,16 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, lens, shake, shake-ext, text
+     , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
+     , text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.5.0.9";
-       sha256 = "1fjbdik7a2izl8sbxnv1i36h55df0v7w23pn7ivk1p18mgljc9lf";
+       version = "1.5.0.10";
+       sha256 = "07dkzhig0c0rrqz9x7k2zv2m5b46l9p914j7758r5zb6vhlni94c";
        libraryHaskellDepends = [
-         base binary dependency directory hashable hs2ats language-ats lens
-         shake shake-ext text
+         base binary dependency directory hashable hs2ats language-ats
+         microlens microlens-th shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
@@ -183380,17 +184073,16 @@ self: {
      }) {};
 
   "shake-ext" = callPackage
-    ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory
-     , shake, template-haskell
+    ({ mkDerivation, base, Cabal, composition-prelude, directory, shake
+     , template-haskell
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.7.0.3";
-       sha256 = "0j1558a43bz7jqbbhn0myjwd9nrd6mnn4r26ix5wqhnsgfpxcw1j";
+       version = "2.7.0.4";
+       sha256 = "0pgqjbiijsl9jb5dzwrmayn5vz2wy4jckkmrikycnqhglz1q8six";
        libraryHaskellDepends = [
          base Cabal composition-prelude directory shake template-haskell
        ];
-       libraryToolDepends = [ cpphs ];
        homepage = "https://hub.darcs.net/vmchale/shake-ext";
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -186681,8 +187373,8 @@ self: {
        pname = "slug";
        version = "0.1.7";
        sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
-       revision = "2";
-       editedCabalFile = "0kvx1igj6fs9wrwkh68m19f5pxw1x46d489zgj6f5ah5w8wfxp2h";
+       revision = "3";
+       editedCabalFile = "1kqaqhg8bkrkax41pbi18612s0m9w2324n5akn5nhmxq0zla73vh";
        libraryHaskellDepends = [
          aeson base exceptions http-api-data path-pieces persistent
          QuickCheck text
@@ -189718,29 +190410,20 @@ self: {
      , http-types, list-t, monad-control, monad-control-aligned, mtl
      , nested-routes, path, path-extra, pred-trie, stm, strict, text
      , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
-     , uuid, wai-middleware-content-type, wai-transformers, websockets
-     , websockets-simple, wuss
+     , uuid, wai, wai-middleware-content-type, wai-transformers
+     , websockets, websockets-simple, wuss
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.1.1";
-       sha256 = "14apx9pxbl9s9i5d8i7x3y9wyzdyx3gspz4l4h4vaddg996pq0il";
+       version = "0.0.1.2";
+       sha256 = "05n95zq4lxj98xp7rqh7rlpv3ybkfgbb4x3jczgjkfxfn3caycxl";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
          http-client http-client-tls http-types list-t monad-control
          monad-control-aligned mtl nested-routes path path-extra pred-trie
          stm strict text tmapchan tmapmvar transformers unordered-containers
-         urlpath uuid wai-middleware-content-type wai-transformers
-         websockets websockets-simple wuss
-       ];
-       testHaskellDepends = [
-         aeson aeson-attoparsec async attoparsec attoparsec-uri base
-         bytestring deepseq exceptions extractable-singleton hashable
-         http-client http-client-tls http-types list-t monad-control
-         monad-control-aligned mtl nested-routes path path-extra pred-trie
-         stm strict text tmapchan tmapmvar transformers unordered-containers
-         urlpath uuid wai-middleware-content-type wai-transformers
+         urlpath uuid wai wai-middleware-content-type wai-transformers
          websockets websockets-simple wuss
        ];
        description = "Unified streaming dependency management for web apps";
@@ -193614,6 +194297,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_20_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , hashable, hspec, hspec-discover, lens, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.20.0";
+       sha256 = "0qkhgm951b377i7ny28faczw2s32rrmfvrh1lcgzfz7gszakb5bw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable lens
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable hspec
+         hspec-discover lens template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -193807,6 +194515,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-benchmarks" = callPackage
+    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit
+     , csv, deepseq, directory, gauge, list-t, list-transformer, logict
+     , machines, mtl, pipes, random, split, streaming, streamly, text
+     , transformers, typed-process, vector
+     }:
+     mkDerivation {
+       pname = "streaming-benchmarks";
+       version = "0.1.0";
+       sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Chart Chart-diagrams csv directory split text
+         typed-process
+       ];
+       benchmarkHaskellDepends = [
+         base conduit deepseq gauge list-t list-transformer logict machines
+         mtl pipes random streaming streamly transformers vector
+       ];
+       homepage = "http://github.com/composewell/streaming-benchmarks";
+       description = "Benchmarks to compare streaming packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, hspec, streaming
      , streaming-bytestring
@@ -193925,8 +194659,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.3.1.0";
-       sha256 = "151nyi75qrlvp5q3xi678rkg2vk0mrvpyr8c4yagh1df90amhvsm";
+       version = "0.3.1.1";
+       sha256 = "1qpcplkwdw8dinhn20wwnfgqf07gzyp61lx6m6w0126hr8fq9r35";
        libraryHaskellDepends = [
          base exceptions lifted-async monad-control stm streaming
          streaming-with transformers-base
@@ -194096,8 +194830,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-sort";
-       version = "0.1.0.0";
-       sha256 = "0zv66xdrg457gskfnviic9mmh38zk9vxsigrlbci8a2fwmphmjxg";
+       version = "0.1.0.2";
+       sha256 = "0877zzip19zdfn7a5b59x911rh7cjxqmxyrr9ivhahgh8igfsjf9";
        libraryHaskellDepends = [
          base binary bytestring directory exceptions streaming
          streaming-binary streaming-bytestring streaming-with transformers
@@ -194154,8 +194888,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-with";
-       version = "0.2.1.0";
-       sha256 = "04i4k7n37qblf9yxdj0bl1qr0arpkv2l06kx7f8aqf1xa7vvxz9i";
+       version = "0.2.1.1";
+       sha256 = "0wyq183z10sr0sdx28n316x22f4h8v67cg164qir3fb7q09pmqbg";
        libraryHaskellDepends = [
          base exceptions managed streaming-bytestring temporary transformers
        ];
@@ -194187,15 +194921,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_1_1" = callPackage
+  "streamly_0_1_2" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, criterion
      , exceptions, hspec, lifted-base, lockfree-queue, monad-control
      , mtl, stm, transformers, transformers-base
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.1.1";
-       sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6";
+       version = "0.1.2";
+       sha256 = "1axqac7zi2b87q91hxv75dpk4pfd4d4fcvsna7cjgkhkdvvjarzp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205310,8 +206044,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
-       revision = "2";
-       editedCabalFile = "03kkavw01mlgaxgc0ifvldn8pkq2dfncrwqrf0r33ldggfzm6qm3";
+       revision = "3";
+       editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
@@ -205949,8 +206683,8 @@ self: {
      }:
      mkDerivation {
        pname = "trackit";
-       version = "0.1";
-       sha256 = "0dcf3h140pwvyrfb0x6b4brp9bpr2p1krd1pvl014jvqak4q2q7d";
+       version = "0.2.1";
+       sha256 = "1rdsjpmilc2k7141glqswngckqlvfynfcppf84111x5ppdhkmvb4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -206019,6 +206753,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transaction" = callPackage
+    ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "transaction";
+       version = "0.1.1.1";
+       sha256 = "18i0x6abg02w9lf5zxb8gj1fw5450a45nw66sjy9kc0dhi7dcwq5";
+       libraryHaskellDepends = [ base mono-traversable ];
+       testHaskellDepends = [
+         base doctest Glob hspec mono-traversable QuickCheck
+       ];
+       homepage = "https://github.com/arowM/haskell-transaction#readme";
+       description = "Monadic representation of transactions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "transactional-events" = callPackage
     ({ mkDerivation, base, ListZipper, MonadPrompt, stm }:
      mkDerivation {
@@ -208898,6 +209649,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_3_3_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
+     , double-conversion, ghc-prim, hspec, QuickCheck, random, text
+     , weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.3.3.1";
+       sha256 = "03js8d0sv31a7m1q49l64vp4fhxlgxbgsjllrpmlahzjkcprlj70";
+       libraryHaskellDepends = [
+         base bytestring double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq random text weigh
+       ];
+       homepage = "https://github.com/knupfer/type-of-html";
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-operators" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -212185,6 +212958,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "userid_0_1_3_2" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, cereal, safecopy
+     , web-routes, web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.3.2";
+       sha256 = "0ym8r3jg7waypc74liv1v32sc1rv419axgbz97xznssb9wshcv3a";
+       libraryHaskellDepends = [
+         aeson base boomerang cereal safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "users" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
@@ -215127,11 +215917,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, vulkan }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "0.1.0.1";
-       sha256 = "192bid9aqndn7lh3vdvk2mhqc76z5fw2z4v362n2bjhdaadwipld";
+       version = "1.1.0.0";
+       sha256 = "038iaiy16cyb0g6xhgax8333lz0y4jfmv4r8dqvvmnnmhiak5j8x";
        libraryHaskellDepends = [ base ghc-prim ];
        librarySystemDepends = [ vulkan ];
-       homepage = "https://github.com/achirkin/genvulkan#readme";
+       homepage = "https://github.com/achirkin/vulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215685,6 +216475,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-handler-launch_3_0_2_4" = callPackage
+    ({ mkDerivation, async, base, bytestring, http-types, process
+     , streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.2.4";
+       sha256 = "0019vz9ha2mvliz3drjbj62v26mwhl9bl1vqr06ki40865hrr78f";
+       libraryHaskellDepends = [
+         async base bytestring http-types process streaming-commons
+         transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-handler-scgi" = callPackage
     ({ mkDerivation, base, bytestring, wai, wai-extra }:
      mkDerivation {
@@ -216114,8 +216921,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-content-type";
-       version = "0.6.0";
-       sha256 = "19c5sjrgfvc12f020cssr4ydsd7ib9wxabm594mn9z32sq6qv4f8";
+       version = "0.6.1.1";
+       sha256 = "08lcbyycgr2mb8i00ncph38r0yixx6nn5yfkvv96700wfn0338q4";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
          extractable-singleton hashable http-media http-types lucid mmorph
@@ -216131,6 +216938,7 @@ self: {
          transformers transformers-base unordered-containers urlpath wai
          wai-logger wai-transformers warp
        ];
+       homepage = "https://github.com/athanclark/wai-middleware-content-type#readme";
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216463,22 +217271,24 @@ self: {
      }) {};
 
   "wai-middleware-verbs" = callPackage
-    ({ mkDerivation, base, errors, exceptions, hashable, http-types
-     , mmorph, monad-logger, mtl, resourcet, transformers
-     , transformers-base, unordered-containers, wai
+    ({ mkDerivation, base, bytestring, exceptions, hashable, http-types
+     , mmorph, monad-control, monad-control-aligned, monad-logger, mtl
+     , resourcet, transformers, transformers-base, unordered-containers
+     , wai, wai-transformers
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
-       version = "0.3.2";
-       sha256 = "0rma394hfpycaqfyr9bpal2v27559hrm7yd83x7dh13jv9zsj7v9";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.1";
+       sha256 = "1x4x41b1gbr2xvfw1q766wcvdl13wwv9spa9zxvjdykg71knnw93";
        libraryHaskellDepends = [
-         base errors exceptions hashable http-types mmorph monad-logger mtl
-         resourcet transformers transformers-base unordered-containers wai
+         base bytestring exceptions hashable http-types mmorph monad-control
+         monad-control-aligned monad-logger mtl resourcet transformers
+         transformers-base unordered-containers wai wai-transformers
        ];
-       description = "Route different middleware responses based on the incoming HTTP verb";
+       homepage = "https://github.com/athanclark/wai-middleware-verbs#readme";
+       description = "Route Wai middlewares based on HTTP verbs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -217653,6 +218463,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes_0_27_14_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
+     , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
+     , split, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "web-routes";
+       version = "0.27.14.2";
+       sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring exceptions ghc-prim http-types mtl
+         parsec split text utf8-string
+       ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
+       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
+       description = "portable, type-safe URL routing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-boomerang" = callPackage
     ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }:
      mkDerivation {
@@ -218335,23 +219165,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-simple_0_1_1" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
-     , monad-control, profunctors, stm, tasty, tasty-hspec, transformers
-     , vector, wai-transformers, websockets
+  "websockets-simple_0_1_2_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions
+     , extractable-singleton, hspec, monad-control-aligned, profunctors
+     , stm, tasty, tasty-hspec, transformers, vector, wai-transformers
+     , websockets
      }:
      mkDerivation {
        pname = "websockets-simple";
-       version = "0.1.1";
-       sha256 = "0hakr1vrfj0n3sgax08vsa1bcnddqkizr2fb9pjk9abhw4hn5k2y";
+       version = "0.1.2.1";
+       sha256 = "1g3cqbdycjx82px06xvh4q3jjnp71llzsw4v0s815933fgfcck54";
        libraryHaskellDepends = [
-         aeson async base bytestring exceptions monad-control profunctors
-         stm transformers vector wai-transformers websockets
+         aeson async base bytestring exceptions extractable-singleton
+         monad-control-aligned profunctors stm transformers vector
+         wai-transformers websockets
        ];
        testHaskellDepends = [
-         aeson async base bytestring exceptions hspec monad-control
-         profunctors stm tasty tasty-hspec transformers vector
-         wai-transformers websockets
+         aeson async base bytestring exceptions extractable-singleton hspec
+         monad-control-aligned profunctors stm tasty tasty-hspec
+         transformers vector wai-transformers websockets
        ];
        homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Composable websockets clients";
@@ -221339,6 +222171,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xlsx_0_7_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
+     , bytestring, conduit, containers, criterion, data-default, deepseq
+     , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
+     , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, text, time, transformers, vector, xeno
+     , xml-conduit, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.7.2";
+       sha256 = "00qigyz4nc23abawapxhw0sgmj9c5qplkkvyv6xxffanx9kh8mmj";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary-search bytestring conduit
+         containers data-default deepseq errors extra filepath lens mtl
+         network-uri old-locale safe text time transformers vector xeno
+         xml-conduit zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff groom lens mtl raw-strings-qq
+         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
+         xml-conduit
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsx-tabular" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
@@ -222109,6 +222971,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmlgen_0_6_2_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers
+     , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
+     , unix
+     }:
+     mkDerivation {
+       pname = "xmlgen";
+       version = "0.6.2.2";
+       sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers mtl text
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath HUnit hxt process QuickCheck
+         text unix
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion text ];
+       description = "Fast XML generation library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xmlhtml" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
      , bytestring, bytestring-builder, containers, directory, hspec

From dfa16404295d4b918b0959f76a56026886bb90df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 19:33:04 +0200
Subject: [PATCH 2069/2266] haskell-brick: fix override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index ed39896863b..613af548c33 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -655,7 +655,7 @@ self: super: {
     });
 
   # Older versions don't compile.
-  brick = self.brick_0_35;
+  brick = self.brick_0_35_1;
   getopt-generics = self.getopt-generics_0_13_0_2;
   HaTeX = self.HaTeX_3_19_0_0;
   json = self.json_0_9_2;

From 7ac95d5a8a81fe2c70714bfdfe63fd74dc7f5bfa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 20:02:41 +0200
Subject: [PATCH 2070/2266] haskell-hledger-lib: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 613af548c33..a8ba253839a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -641,13 +641,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  # Fix missing semigroup instance for Journal.
-  hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch
-    { url = https://github.com/simonmichael/hledger/pull/718.patch;
-      sha256 = "1gcs9j934wvk9hbn27zm42dnvf4x1gxr54li4kdw3zi3160y2l5c";
-      stripLen = 1;
-    });
-
   # Fix missing semigroup instance.
   data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch
     { url = https://github.com/luqui/data-inttrie/pull/5.patch;

From eb8127a1d25d8c058d7f48e57025988ff7de4196 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 20:03:48 +0200
Subject: [PATCH 2071/2266] hackage: update db snapshot

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index c20e56a1711..792ff030492 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b09de4efc2a385cf3407072c24c21ec8ec774a03.tar.gz";
-  sha256 = "0yy3k5wgi9zgwz51gxakhlalwac59fkh0flydf334msrxlc3xf9z";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6272b092cf23aa30154cd90ab0f5786c69bceb17.tar.gz";
+  sha256 = "11qs8whpqkj1l3mhx9ibpwh5pwgwj0xb6r9r8c7wk414vdmaa5mw";
 }

From 1c7e358e3f55874b624f83c90f42c74ee12ef298 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 11:42:59 -0700
Subject: [PATCH 2072/2266] blender: 2.79a -> 2.79b

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/blender/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py help` got 0 exit code
- found 2.79b with grep in /nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b
- directory tree listing: https://gist.github.com/31e73f72bba2c0103ef5f038b4346d34
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 8133bf1c763..0ccca916a1e 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.79a";
+  name = "blender-2.79b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc";
+    sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c";
   };
 
   buildInputs =

From 2dec4a94ed6ddcb1dc5968d3d248e125e80a015d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 25 Mar 2018 20:48:55 +0200
Subject: [PATCH 2073/2266] vis: 0.4 -> 0.5

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

diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 2af6e93bcfc..7825188fea9 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vis-${version}";
-  version  = "0.4";
+  version  = "0.5";
 
   src = fetchFromGitHub {
     rev = "v${version}";
-    sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k";
+    sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb";
     repo = "vis";
     owner = "martanne";
   };

From bad2ecb9b52a1ce6070723bf86588c20b43be78a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:03:18 -0400
Subject: [PATCH 2074/2266] linux: 4.4.123 -> 4.4.124

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 58abf35e92b..766eef83ddf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.123";
+  version = "4.4.124";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "115mvgwcx2syjrn943k4qqyvqkysdm6rgq97dhf1gcxf671qb204";
+    sha256 = "0a91phmdpa82s3mqnyw2an3j4v18cksvy1akdyxf5w2byq51qd2r";
   };
 } // (args.argsOverride or {}))

From 36555e46f8e6e0b2573877ea70f99b064b0bda04 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:03:33 -0400
Subject: [PATCH 2075/2266] linux: 4.9.89 -> 4.9.90

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 0b18a624167..4832c79d02f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.89";
+  version = "4.9.90";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0a9l2gkyr1nhaak6vyjwgjn01ywpxwa8zp5fhw8rjnfk44bf2hql";
+    sha256 = "0mbl0d6z8yx7bn5m804kv17bh64pd0w0nc8lls4pw335jx7hkc0v";
   };
 } // (args.argsOverride or {}))

From 2d5d99a7e38635e1784b36c8e562d3f8a04be736 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:03:47 -0400
Subject: [PATCH 2076/2266] linux: 4.14.29 -> 4.14.30

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4e086259036..faf15156458 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.29";
+  version = "4.14.30";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "06a6q69jwvggns5rf473nfgfwlkfyj8zs6vrjppwf8lrrrq7pxhq";
+    sha256 = "0ib6zqn1psffgffmvqmh9x3wdh15yd8z0gwwkamvgwa8xcpv0nvw";
   };
 } // (args.argsOverride or {}))

From 1d41231daaee99a6523a3b9aeefafc7d830730e6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:04:02 -0400
Subject: [PATCH 2077/2266] linux: 4.15.12 -> 4.15.13

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 979e8fe05e1..f88ddadca8f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.12";
+  version = "4.15.13";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0j7l907m51y05cd1sqf3sn7vx4n6c07kn7q0ndnyg6wqb7h667h3";
+    sha256 = "1iam2adh6ghzv0lgh60c03pzrhv4axxw6k78xh209v889xdfjbhx";
   };
 } // (args.argsOverride or {}))

From 026d53020ccc93eb79a762fe99e02f116e7059b2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:05:35 -0400
Subject: [PATCH 2078/2266] linux-copperhead: 4.15.12.a -> 4.15.13.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 94885efef90..680c5d8d64f 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.12";
+  version = "4.15.13";
   revision = "a";
-  sha256 = "1n0sqhqvm9p6w1yh7si8rw84qxf9c5kch7pvjyrp51ir1xh7grfr";
+  sha256 = "0zmamaf600jja3m2i41rysxq0rqixiz1vvd1nf5bd8piqkd8dbvf";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 675dc1bfbfd87c02c8588d78ffc903fb6987f6e4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Mar 2018 14:11:00 -0500
Subject: [PATCH 2079/2266] apache-ant: init 1.9

1.9.x is a legacy version of ant supporting Java 5, 6, and 7

Fixes #37747
---
 .../tools/build-managers/apache-ant/1.9.nix   | 111 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +
 2 files changed, 114 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/apache-ant/1.9.nix

diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
new file mode 100644
index 00000000000..8816a005ca0
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -0,0 +1,111 @@
+{ fetchurl, stdenv, coreutils, makeWrapper }:
+
+let version = "1.9.6"; in
+
+stdenv.mkDerivation {
+  name = "ant-${version}";
+
+  buildInputs = [ makeWrapper ];
+
+  src = fetchurl {
+    url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
+    sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
+  };
+
+  contrib = fetchurl {
+    url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2;
+    sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out/bin $out/lib/ant
+      mv * $out/lib/ant/
+
+      # Get rid of the manual (35 MiB).  Maybe we should put this in a
+      # separate output.  Keep the antRun script since it's vanilla sh
+      # and needed for the <exec/> task (but since we set ANT_HOME to
+      # a weird value, we have to move antRun to a weird location).
+      # Get rid of the other Ant scripts since we provide our own.
+      mv $out/lib/ant/bin/antRun $out/bin/
+      rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
+      mkdir $out/lib/ant/bin
+      mv $out/bin/antRun $out/lib/ant/bin/
+
+      # Install ant-contrib.
+      unpackFile $contrib
+      cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/
+
+      cat >> $out/bin/ant <<EOF
+      #! ${stdenv.shell} -e
+
+      ANT_HOME=$out/lib/ant
+
+      # Find the JDK by looking for javac.  As a fall-back, find the
+      # JRE by looking for java.  The latter allows just the JRE to be
+      # used with (say) ECJ as the compiler.  Finally, allow the GNU
+      # JVM.
+      if [ -z "\$JAVA_HOME" ]; then
+          for i in javac java gij; do
+              if p="\$(type -p \$i)"; then
+                  export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
+                  break
+              fi
+          done
+          if [ -z "\$JAVA_HOME" ]; then
+              echo "\$0: cannot find the JDK or JRE" >&2
+              exit 1
+          fi
+      fi
+
+      if [ -z \$NIX_JVM ]; then
+          if [ -e \$JAVA_HOME/bin/java ]; then
+              NIX_JVM=\$JAVA_HOME/bin/java
+          elif [ -e \$JAVA_HOME/bin/gij ]; then
+              NIX_JVM=\$JAVA_HOME/bin/gij
+          else
+              NIX_JVM=java
+          fi
+      fi
+
+      LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
+
+      exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
+          -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
+          org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
+          -cp "\$CLASSPATH" "\$@"
+      EOF
+
+      chmod +x $out/bin/ant
+    ''; # */
+
+  meta = {
+    homepage = http://ant.apache.org/;
+    description = "A Java-based build tool";
+
+    longDescription = ''
+      Apache Ant is a Java-based build tool.  In theory, it is kind of like
+      Make, but without Make's wrinkles.
+
+      Why another build tool when there is already make, gnumake, nmake, jam,
+      and others? Because all those tools have limitations that Ant's
+      original author couldn't live with when developing software across
+      multiple platforms.  Make-like tools are inherently shell-based -- they
+      evaluate a set of dependencies, then execute commands not unlike what
+      you would issue in a shell.  This means that you can easily extend
+      these tools by using or writing any program for the OS that you are
+      working on.  However, this also means that you limit yourself to the
+      OS, or at least the OS type such as Unix, that you are working on.
+
+      Ant is different.  Instead of a model where it is extended with
+      shell-based commands, Ant is extended using Java classes.  Instead of
+      writing shell commands, the configuration files are XML-based, calling
+      out a target tree where various tasks get executed.  Each task is run
+      by an object that implements a particular Task interface.
+    '';
+
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f0efc2d8f4..a4726f59b89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6360,6 +6360,7 @@ with pkgs;
       callPackage ../development/compilers/openjdk-darwin { }
     else
       callPackage ../development/compilers/openjdk/7.nix {
+        ant = apacheAnt_1_9;
         bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
       };
 
@@ -7423,6 +7424,8 @@ with pkgs;
 
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
 
+  apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
+
   apacheKafka = apacheKafka_1_0;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };

From f590d17d325faebebbe37ee19e8b69a101e1b4b7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 12:33:32 -0700
Subject: [PATCH 2080/2266] darktable: 2.4.1 -> 2.4.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/darktable/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/36vw0ki4wqgvwj1f0xgb17qpdxpzijm7-darktable-2.4.2/bin/darktable-cltest help` got 0 exit code
- found 2.4.2 with grep in /nix/store/36vw0ki4wqgvwj1f0xgb17qpdxpzijm7-darktable-2.4.2
- directory tree listing: https://gist.github.com/2fb5b4b7836751e43911e4337febf1ab
---
 pkgs/applications/graphics/darktable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 14659d796fc..d81fea5ea39 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.1";
+  version = "2.4.2";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
+    sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r";
   };
 
   nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];

From 2a80448fed239d4cf15aad88a6387a611db9e5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 25 Mar 2018 18:46:28 +0200
Subject: [PATCH 2081/2266] keepassxc: fix darwin build

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 4daa1938aba..620039b5a94 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -14,6 +14,7 @@
 , yubikey-personalization
 , libXi
 , qtx11extras
+, qtmacextras
 
 , withKeePassBrowser ? true
 , withKeePassSSHAgent ? true
@@ -34,8 +35,18 @@ stdenv.mkDerivation rec {
     sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
+    "-Wno-old-style-cast"
+    "-Wno-error"
+    "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
+  ];
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace "/usr/local/bin" "../bin" \
+      --replace "/usr/local/share/man" "../share/man"
+  '';
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
   patches = [ ./darwin.patch ];
 
   cmakeFlags = [
@@ -72,7 +83,7 @@ stdenv.mkDerivation rec {
     qtx11extras
     yubikey-personalization
     zlib
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
 
   postInstall = optionalString stdenv.isDarwin ''
     # Make it work without Qt in PATH.

From 3f1a03b20ea5f8bd8dcb366656f33f32d91ec4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 25 Mar 2018 21:55:47 +0200
Subject: [PATCH 2082/2266] keepassxc: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 620039b5a94..0e1aecaab1d 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,13 +26,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassxc-${version}";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
+    sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [

From c948613a6532eb4fdce0329c3f0d5af1857ac0d6 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Sun, 25 Mar 2018 21:39:02 +0200
Subject: [PATCH 2083/2266] almir: also remove the corresponding module.

The almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 at about 2017-08
This module can no more be used without it.
---
 nixos/modules/misc/ids.nix              |   4 +-
 nixos/modules/module-list.nix           |   1 -
 nixos/modules/services/backup/almir.nix | 173 ------------------------
 3 files changed, 2 insertions(+), 176 deletions(-)
 delete mode 100644 nixos/modules/services/backup/almir.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 39a24cfecc5..c5dee2ca97a 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -106,7 +106,7 @@
       freenet = 79;
       ircd = 80;
       bacula = 81;
-      almir = 82;
+      #almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08
       deluge = 83;
       mysql = 84;
       rabbitmq = 85;
@@ -393,7 +393,7 @@
       freenet = 79;
       ircd = 80;
       bacula = 81;
-      almir = 82;
+      #almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08
       deluge = 83;
       mysql = 84;
       rabbitmq = 85;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d47600fbc61..9e232ce1f4e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -158,7 +158,6 @@
   ./services/audio/slimserver.nix
   ./services/audio/squeezelite.nix
   ./services/audio/ympd.nix
-  ./services/backup/almir.nix
   ./services/backup/bacula.nix
   ./services/backup/borgbackup.nix
   ./services/backup/crashplan.nix
diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
deleted file mode 100644
index fbb4ff4034f..00000000000
--- a/nixos/modules/services/backup/almir.nix
+++ /dev/null
@@ -1,173 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.almir;
-
-  bconsoleconf = pkgs.writeText "bconsole.conf"
-    ''
-      Director {
-        Name = ${cfg.director_name}
-        DIRport = ${toString cfg.director_port}
-        address = ${cfg.director_address}
-        Password = "${cfg.director_password}"
-      }
-    '';
-
-  productionini = pkgs.writeText "production.ini"
-    ''
-[app:main]
-use = egg:almir
-
-pyramid.reload_templates = false
-pyramid.debug_authorization = false
-pyramid.debug_notfound = false
-pyramid.debug_routematch = false
-pyramid.debug_templates = false
-pyramid.default_locale_name = en
-pyramid.includes =
-    pyramid_exclog
-exclog.extra_info = true
-
-sqlalchemy.url = ${cfg.sqlalchemy_engine_url}
-timezone = ${cfg.timezone}
-bconsole_config = ${bconsoleconf}
-
-[server:main]
-use = egg:waitress#main
-host = 127.0.0.1
-port = ${toString cfg.port}
-
-
-# Begin logging configuration
-
-[loggers]
-keys = root, almir, sqlalchemy, exc_logger
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-
-[logger_almir]
-level = WARN
-handlers =
-qualname = almir
-
-[logger_exc_logger]
-level = ERROR
-handlers =
-qualname = exc_logger
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARN" logs neither.  (Recommended for production systems.)
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-    '';
-in {
-  options = {
-    services.almir = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable Almir web server. Also configures postgresql database and installs bacula.
-        '';
-      };
-
-      port = mkOption {
-        default = 35000;
-        type = types.int;
-        description = ''
-          Port for Almir web server to listen on.
-        '';
-      };
-
-      timezone = mkOption {
-	description = ''
-         Timezone as specified in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-        '';
-        example = "Europe/Ljubljana";
-      };
-
-      sqlalchemy_engine_url = mkOption {
-        default = "postgresql:///bacula";
-        example = ''
-          postgresql://bacula:bacula@localhost:5432/bacula
-          mysql+mysqlconnector://<user>:<password>@<hostname>/<database>'
-          sqlite:////var/lib/bacula/bacula.db'
-        '';
-	description = ''
-         Define SQL database connection to bacula catalog as specified in http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls
-        '';
-      };
-
-      director_name = mkOption {
-        description = ''
-          Name of the Director to connect with bconsole.
-        '';
-      };
-
-      director_password = mkOption {
-        description = ''
-          Password for Director to connect with bconsole.
-        '';
-      };
-
-      director_port = mkOption {
-        default = 9101;
-        type = types.int;
-        description = ''
-          Port for Director to connect with bconsole.
-        '';
-      };
-
-      director_address = mkOption {
-        default = "127.0.0.1";
-        description = ''
-          IP/Hostname for Director to connect with bconsole.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.almir = {
-      after = [ "network.target" "postgresql.service" ];
-      description = "Almir web app";
-      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.pythonPackages.almir ];
-      environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
-      serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}";
-    };
-
-    environment.systemPackages = [ pkgs.pythonPackages.almir ];
-
-    users.extraUsers.almir = {
-      group = "almir";
-      uid = config.ids.uids.almir;
-      createHome = true;
-      shell = "${pkgs.bash}/bin/bash";
-    };
-
-    users.extraGroups.almir.gid = config.ids.gids.almir;
-  };
-}

From adb58440e687440ecf70d2571d8bba8d215dea6a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 25 Mar 2018 23:32:44 +0200
Subject: [PATCH 2084/2266] gajim: Re-enable tests

Just because the tests need GTK+, I think it's not a good idea to simply
disable them when we're still able to use an X virtual framebuffer to
run them anyway.

As with the package we had prior to version 1.0 I've disabled the
resolver test, because this one requires networking.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
---
 .../instant-messengers/gajim/default.nix        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index a60df1ead53..5a9f545bb0a 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,6 +1,7 @@
 { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
 , python, gtk3, gobjectIntrospection
 , nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, xvfb_run, dbus
 , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
 , enableE2E ? true, pycrypto, python-gnupg
 , enableSecrets ? true, libsecret
@@ -23,6 +24,11 @@ buildPythonApplication rec {
     sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
   };
 
+  postPatch = ''
+    # This test requires network access
+    echo "" > test/integration/test_resolver.py
+  '';
+
   buildInputs = [
     gobjectIntrospection gtk3
   ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
@@ -41,12 +47,13 @@ buildPythonApplication rec {
     ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
     ++ extraPythonPackages pythonPackages;
 
-  checkPhase = ''
-    ${python.interpreter} test/runtests.py
-  '';
+  checkInputs = [ xvfb_run dbus.daemon ];
 
-  # Tests try to use GTK+ which fails.
-  doCheck = false;
+  checkPhase = ''
+    xvfb-run dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      ${python.interpreter} test/runtests.py
+  '';
 
   meta = {
     homepage = http://gajim.org/;

From a0c525bd0a93fba70471392b8651882b52197788 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 25 Mar 2018 23:37:38 +0200
Subject: [PATCH 2085/2266] gajim: Add gnome3.defaultIconTheme to buildInputs

This is for systems that are not using a full desktop environment, so
Gajim can fall back to the default icon theme of Gnome 3.

Among just fixing aesthetics this also fixes a few exceptions that were
triggered by Gajim not finding the icons. One example of this is when
you enter the plugins dialog, the window is empty if the icons can't be
found.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 5a9f545bb0a..4b0533cefb4 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,6 +1,6 @@
 { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
 , python, gtk3, gobjectIntrospection
-, nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow
 , xvfb_run, dbus
 , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
 , enableE2E ? true, pycrypto, python-gnupg
@@ -30,7 +30,7 @@ buildPythonApplication rec {
   '';
 
   buildInputs = [
-    gobjectIntrospection gtk3
+    gobjectIntrospection gtk3 gnome3.defaultIconTheme
   ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
     ++ optional enableSecrets libsecret
     ++ optional enableSpelling gspell

From aeefaae044e09da97e1bc0e62f9e7ba4016c7dd0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 16:29:14 -0700
Subject: [PATCH 2086/2266] kotlin: 1.2.30 -> 1.2.31

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/kotlin/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlin -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlin-dce-js -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlinc -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlinc-js -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlinc-jvm -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlin-wrapped -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlin-dce-js-wrapped -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlinc-js-wrapped -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlinc-jvm-wrapped -h` got 0 exit code
- found 1.2.31 with grep in /nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31
- directory tree listing: https://gist.github.com/2abc86ffb8a29b93e0ee8cdc45c72125
---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index b6374908757..62c1c2c9670 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.30";
+  version = "1.2.31";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0wg08cncwfajxfx8860wdf5dr4h92j069qvdr90l5m01ff3nasad";
+    sha256 = "09l0vjff9kkiprf5irgq1sb9cils8plbzbrf55ajj8m5fyxcd6fs";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 92d53362d4da7e19b6a7a6b1b936a0a34a17c0c9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 10:47:41 -0400
Subject: [PATCH 2087/2266] Move all nixpkgs doc files in to the doc directory

This makes a makefile-driven developer workflow nicer.
---
 doc/default.nix                               |  40 +++---
 ...ntroduction.md => introduction.chapter.md} |   0
 .../{emscripten.md => emscripten.section.md}  |   0
 .../{haskell.md => haskell.section.md}        |   0
 doc/languages-frameworks/idris.section.md     |  39 ++++++
 doc/languages-frameworks/index.xml            |  16 +--
 doc/languages-frameworks/node.section.md      |  51 ++++++++
 .../{python.md => python.section.md}          |   0
 doc/languages-frameworks/r.section.md         | 120 +++++++++++++++++
 .../{rust.md => rust.section.md}              |   0
 .../{vim.md => vim.section.md}                |   0
 doc/manual.xml                                |   2 +-
 doc/{shell.md => shell.section.md}            |   0
 pkgs/development/idris-modules/README.md      |  40 +-----
 pkgs/development/node-packages/README.md      |  52 +-------
 pkgs/development/r-modules/README.md          | 121 +-----------------
 16 files changed, 242 insertions(+), 239 deletions(-)
 rename doc/{introduction.md => introduction.chapter.md} (100%)
 rename doc/languages-frameworks/{emscripten.md => emscripten.section.md} (100%)
 rename doc/languages-frameworks/{haskell.md => haskell.section.md} (100%)
 create mode 100644 doc/languages-frameworks/idris.section.md
 create mode 100644 doc/languages-frameworks/node.section.md
 rename doc/languages-frameworks/{python.md => python.section.md} (100%)
 create mode 100644 doc/languages-frameworks/r.section.md
 rename doc/languages-frameworks/{rust.md => rust.section.md} (100%)
 rename doc/languages-frameworks/{vim.md => vim.section.md} (100%)
 rename doc/{shell.md => shell.section.md} (100%)

diff --git a/doc/default.nix b/doc/default.nix
index ec458634a42..1adcd796820 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -45,45 +45,45 @@ pkgs.stdenv.mkDerivation {
     cp -s '${sources-langs}'/* ./languages-frameworks
   ''
   + toDocbook {
-      inputFile = ./introduction.md;
-      outputFile = "introduction.xml";
+      inputFile = ./introduction.chapter.md;
+      outputFile = "introduction.chapter.xml";
       useChapters = true;
     }
   + toDocbook {
-      inputFile = ./shell.md;
-      outputFile = "shell.xml";
+      inputFile = ./shell.section.md;
+      outputFile = "shell.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/python.md;
-      outputFile = "./languages-frameworks/python.xml";
+      inputFile = ./languages-frameworks/python.section.md;
+      outputFile = "./languages-frameworks/python.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/haskell.md;
-      outputFile = "./languages-frameworks/haskell.xml";
+      inputFile = ./languages-frameworks/haskell.section.md;
+      outputFile = "./languages-frameworks/haskell.section.xml";
     }
   + toDocbook {
-      inputFile = ../pkgs/development/idris-modules/README.md;
-      outputFile = "languages-frameworks/idris.xml";
+      inputFile = ./languages-frameworks/idris.section.md;
+      outputFile = "languages-frameworks/idris.section.xml";
     }
   + toDocbook {
-      inputFile = ../pkgs/development/node-packages/README.md;
-      outputFile = "languages-frameworks/node.xml";
+      inputFile = ./languages-frameworks/node.section.md;
+      outputFile = "languages-frameworks/node.section.xml";
     }
   + toDocbook {
-      inputFile = ../pkgs/development/r-modules/README.md;
-      outputFile = "languages-frameworks/r.xml";
+      inputFile = ./languages-frameworks/r.section.md;
+      outputFile = "languages-frameworks/r.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/rust.md;
-      outputFile = "./languages-frameworks/rust.xml";
+      inputFile = ./languages-frameworks/rust.section.md;
+      outputFile = "./languages-frameworks/rust.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/vim.md;
-      outputFile = "./languages-frameworks/vim.xml";
+      inputFile = ./languages-frameworks/vim.section.md;
+      outputFile = "./languages-frameworks/vim.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/emscripten.md;
-      outputFile = "./languages-frameworks/emscripten.xml";
+      inputFile = ./languages-frameworks/emscripten.section.md;
+      outputFile = "./languages-frameworks/emscripten.section.xml";
     }
   + ''
     echo ${lib.nixpkgsVersion} > .version
diff --git a/doc/introduction.md b/doc/introduction.chapter.md
similarity index 100%
rename from doc/introduction.md
rename to doc/introduction.chapter.md
diff --git a/doc/languages-frameworks/emscripten.md b/doc/languages-frameworks/emscripten.section.md
similarity index 100%
rename from doc/languages-frameworks/emscripten.md
rename to doc/languages-frameworks/emscripten.section.md
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.section.md
similarity index 100%
rename from doc/languages-frameworks/haskell.md
rename to doc/languages-frameworks/haskell.section.md
diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
new file mode 100644
index 00000000000..005ed360285
--- /dev/null
+++ b/doc/languages-frameworks/idris.section.md
@@ -0,0 +1,39 @@
+Idris packages
+==============
+
+This directory contains build rules for idris packages. In addition,
+it contains several functions to build and compose those packages.
+Everything is exposed to the user via the `idrisPackages` attribute.
+
+callPackage
+------------
+
+This is like the normal nixpkgs callPackage function, specialized to
+idris packages.
+
+builtins
+---------
+
+This is a list of all of the libraries that come packaged with Idris
+itself.
+
+build-idris-package
+--------------------
+
+A function to build an idris package. Its sole argument is a set like
+you might pass to `stdenv.mkDerivation`, except `build-idris-package`
+sets several attributes for you. See `build-idris-package.nix` for
+details.
+
+build-builtin-package
+----------------------
+
+A version of `build-idris-package` specialized to builtin libraries.
+Mostly for internal use.
+
+with-packages
+-------------
+
+Bundle idris together with a list of packages. Because idris currently
+only supports a single directory in its library path, you must include
+all desired libraries here, including `prelude` and `base`.
\ No newline at end of file
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 6743c131201..a1c265f6748 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -17,20 +17,20 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <xi:include href="bower.xml" />
 <xi:include href="coq.xml" />
 <xi:include href="go.xml" />
-<xi:include href="haskell.xml" />
-<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md  -->
+<xi:include href="haskell.section.xml" />
+<xi:include href="idris.section.xml" />
 <xi:include href="java.xml" />
 <xi:include href="lua.xml" />
-<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md  -->
+<xi:include href="node.section.xml" />
 <xi:include href="perl.xml" />
-<xi:include href="python.xml" />
+<xi:include href="python.section.xml" />
 <xi:include href="qt.xml" />
-<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md  -->
+<xi:include href="r.section.xml" />
 <xi:include href="ruby.xml" />
-<xi:include href="rust.xml" />
+<xi:include href="rust.section.xml" />
 <xi:include href="texlive.xml" />
-<xi:include href="vim.xml" />
-<xi:include href="emscripten.xml" />
+<xi:include href="vim.section.xml" />
+<xi:include href="emscripten.section.xml" />
 
 
 </chapter>
diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md
new file mode 100644
index 00000000000..17a203ed12b
--- /dev/null
+++ b/doc/languages-frameworks/node.section.md
@@ -0,0 +1,51 @@
+Node.js packages
+================
+The `pkgs/development/node-packages` folder contains a generated collection of
+[NPM packages](https://npmjs.com/) that can be installed with the Nix package
+manager.
+
+As a rule of thumb, the package set should only provide *end user* software
+packages, such as command-line utilities. Libraries should only be added to the
+package set if there is a non-NPM package that requires it.
+
+When it is desired to use NPM libraries in a development project, use the
+`node2nix` generator directly on the `package.json` configuration file of the
+project.
+
+The package set also provides support for multiple Node.js versions. The policy
+is that a new package should be added to the collection for the latest stable LTS
+release (which is currently 6.x), unless there is an explicit reason to support
+a different release.
+
+If your package uses native addons, you need to examine what kind of native
+build system it uses. Here are some examples:
+
+* `node-gyp`
+* `node-gyp-builder`
+* `node-pre-gyp`
+
+After you have identified the correct system, you need to override your package
+expression while adding in build system as a build input. For example, `dat`
+requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
+
+```nix
+dat = nodePackages.dat.override (oldAttrs: {
+  buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
+});
+```
+
+To add a package from NPM to nixpkgs:
+
+ 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
+    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
+    for packages depending on Node.js 4.x)
+ 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
+ 3. Build your new package to test your changes:
+    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
+    To build against a specific Node.js version (e.g. 4.x):
+    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
+ 4. Add and commit all modified and generated files.
+
+For more information about the generation process, consult the
+[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
+tool.
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.section.md
similarity index 100%
rename from doc/languages-frameworks/python.md
rename to doc/languages-frameworks/python.section.md
diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md
new file mode 100644
index 00000000000..c8f02bd1478
--- /dev/null
+++ b/doc/languages-frameworks/r.section.md
@@ -0,0 +1,120 @@
+R packages
+==========
+
+## Installation
+
+Define an environment for R that contains all the libraries that you'd like to
+use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
+
+```nix
+{
+    packageOverrides = super: let self = super.pkgs; in
+    {
+
+        rEnv = super.rWrapper.override {
+            packages = with self.rPackages; [
+                devtools
+                ggplot2
+                reshape2
+                yaml
+                optparse
+                ];
+        };
+    };
+}
+```
+
+Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
+profile. The set of available libraries can be discovered by running the
+command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
+output is the name that has to be passed to rWrapper in the code snipped above.
+
+However, if you'd like to add a file to your project source to make the
+environment available for other contributors, you can create a `default.nix`
+file like so:
+```nix
+let
+  pkgs = import <nixpkgs> {};
+  stdenv = pkgs.stdenv;
+in with pkgs; {
+  myProject = stdenv.mkDerivation {
+    name = "myProject";
+    version = "1";
+    src = if pkgs.lib.inNixShell then null else nix;
+
+    buildInputs = with rPackages; [
+      R
+      ggplot2
+      knitr
+    ];
+  };
+}
+```
+and then run `nix-shell .` to be dropped into a shell with those packages
+available.
+
+## RStudio
+
+RStudio uses a standard set of packages and ignores any custom R
+environments or installed packages you may have.  To create a custom
+environment, see `rstudioWrapper`, which functions similarly to
+`rWrapper`:
+
+```nix
+{
+    packageOverrides = super: let self = super.pkgs; in
+    {
+
+        rstudioEnv = super.rstudioWrapper.override {
+            packages = with self.rPackages; [
+                dplyr
+                ggplot2
+                reshape2
+                ];
+        };
+    };
+}
+```
+
+Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
+this into your user profile.
+
+Alternatively, you can create a self-contained `shell.nix` without the need to
+modify any configuration files:
+
+```nix
+{ pkgs ? import <nixpkgs> {}
+}:
+
+pkgs.rstudioWrapper.override {
+  packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
+}
+
+```
+
+Executing `nix-shell` will then drop you into an environment equivalent to the
+one above. If you need additional packages just add them to the list and
+re-enter the shell.
+
+## Updating the package set
+
+```bash
+nix-shell generate-shell.nix
+
+Rscript generate-r-packages.R cran  > cran-packages.nix.new
+mv cran-packages.nix.new cran-packages.nix
+
+Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
+mv bioc-packages.nix.new bioc-packages.nix
+```
+
+`generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
+
+
+## Testing if the Nix-expression could be evaluated
+
+```bash
+nix-build test-evaluation.nix --dry-run
+```
+
+If this exits fine, the expression is ok. If not, you have to edit `default.nix`
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.section.md
similarity index 100%
rename from doc/languages-frameworks/rust.md
rename to doc/languages-frameworks/rust.section.md
diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.section.md
similarity index 100%
rename from doc/languages-frameworks/vim.md
rename to doc/languages-frameworks/vim.section.md
diff --git a/doc/manual.xml b/doc/manual.xml
index eb0a24789d4..385079eb578 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -9,7 +9,7 @@
 
   </info>
 
-  <xi:include href="introduction.xml" />
+  <xi:include href="introduction.chapter.xml" />
   <xi:include href="quick-start.xml" />
   <xi:include href="stdenv.xml" />
   <xi:include href="multiple-output.xml" />
diff --git a/doc/shell.md b/doc/shell.section.md
similarity index 100%
rename from doc/shell.md
rename to doc/shell.section.md
diff --git a/pkgs/development/idris-modules/README.md b/pkgs/development/idris-modules/README.md
index 005ed360285..80b7ccefbcf 100644
--- a/pkgs/development/idris-modules/README.md
+++ b/pkgs/development/idris-modules/README.md
@@ -1,39 +1 @@
-Idris packages
-==============
-
-This directory contains build rules for idris packages. In addition,
-it contains several functions to build and compose those packages.
-Everything is exposed to the user via the `idrisPackages` attribute.
-
-callPackage
-------------
-
-This is like the normal nixpkgs callPackage function, specialized to
-idris packages.
-
-builtins
----------
-
-This is a list of all of the libraries that come packaged with Idris
-itself.
-
-build-idris-package
---------------------
-
-A function to build an idris package. Its sole argument is a set like
-you might pass to `stdenv.mkDerivation`, except `build-idris-package`
-sets several attributes for you. See `build-idris-package.nix` for
-details.
-
-build-builtin-package
-----------------------
-
-A version of `build-idris-package` specialized to builtin libraries.
-Mostly for internal use.
-
-with-packages
--------------
-
-Bundle idris together with a list of packages. Because idris currently
-only supports a single directory in its library path, you must include
-all desired libraries here, including `prelude` and `base`.
\ No newline at end of file
+Moved to [/doc/languages-frameworks/idris.section.md](/doc/languages-frameworks/idris.section.md)
diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index 17a203ed12b..9760285a915 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -1,51 +1 @@
-Node.js packages
-================
-The `pkgs/development/node-packages` folder contains a generated collection of
-[NPM packages](https://npmjs.com/) that can be installed with the Nix package
-manager.
-
-As a rule of thumb, the package set should only provide *end user* software
-packages, such as command-line utilities. Libraries should only be added to the
-package set if there is a non-NPM package that requires it.
-
-When it is desired to use NPM libraries in a development project, use the
-`node2nix` generator directly on the `package.json` configuration file of the
-project.
-
-The package set also provides support for multiple Node.js versions. The policy
-is that a new package should be added to the collection for the latest stable LTS
-release (which is currently 6.x), unless there is an explicit reason to support
-a different release.
-
-If your package uses native addons, you need to examine what kind of native
-build system it uses. Here are some examples:
-
-* `node-gyp`
-* `node-gyp-builder`
-* `node-pre-gyp`
-
-After you have identified the correct system, you need to override your package
-expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
-
-```nix
-dat = nodePackages.dat.override (oldAttrs: {
-  buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-});
-```
-
-To add a package from NPM to nixpkgs:
-
- 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
-    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
-    for packages depending on Node.js 4.x)
- 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
- 3. Build your new package to test your changes:
-    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
-    To build against a specific Node.js version (e.g. 4.x):
-    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
- 4. Add and commit all modified and generated files.
-
-For more information about the generation process, consult the
-[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
-tool.
+Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md)
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index c8f02bd1478..e6fd09d7647 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -1,120 +1 @@
-R packages
-==========
-
-## Installation
-
-Define an environment for R that contains all the libraries that you'd like to
-use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
-
-```nix
-{
-    packageOverrides = super: let self = super.pkgs; in
-    {
-
-        rEnv = super.rWrapper.override {
-            packages = with self.rPackages; [
-                devtools
-                ggplot2
-                reshape2
-                yaml
-                optparse
-                ];
-        };
-    };
-}
-```
-
-Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
-profile. The set of available libraries can be discovered by running the
-command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
-output is the name that has to be passed to rWrapper in the code snipped above.
-
-However, if you'd like to add a file to your project source to make the
-environment available for other contributors, you can create a `default.nix`
-file like so:
-```nix
-let
-  pkgs = import <nixpkgs> {};
-  stdenv = pkgs.stdenv;
-in with pkgs; {
-  myProject = stdenv.mkDerivation {
-    name = "myProject";
-    version = "1";
-    src = if pkgs.lib.inNixShell then null else nix;
-
-    buildInputs = with rPackages; [
-      R
-      ggplot2
-      knitr
-    ];
-  };
-}
-```
-and then run `nix-shell .` to be dropped into a shell with those packages
-available.
-
-## RStudio
-
-RStudio uses a standard set of packages and ignores any custom R
-environments or installed packages you may have.  To create a custom
-environment, see `rstudioWrapper`, which functions similarly to
-`rWrapper`:
-
-```nix
-{
-    packageOverrides = super: let self = super.pkgs; in
-    {
-
-        rstudioEnv = super.rstudioWrapper.override {
-            packages = with self.rPackages; [
-                dplyr
-                ggplot2
-                reshape2
-                ];
-        };
-    };
-}
-```
-
-Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
-this into your user profile.
-
-Alternatively, you can create a self-contained `shell.nix` without the need to
-modify any configuration files:
-
-```nix
-{ pkgs ? import <nixpkgs> {}
-}:
-
-pkgs.rstudioWrapper.override {
-  packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
-}
-
-```
-
-Executing `nix-shell` will then drop you into an environment equivalent to the
-one above. If you need additional packages just add them to the list and
-re-enter the shell.
-
-## Updating the package set
-
-```bash
-nix-shell generate-shell.nix
-
-Rscript generate-r-packages.R cran  > cran-packages.nix.new
-mv cran-packages.nix.new cran-packages.nix
-
-Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
-mv bioc-packages.nix.new bioc-packages.nix
-```
-
-`generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
-
-
-## Testing if the Nix-expression could be evaluated
-
-```bash
-nix-build test-evaluation.nix --dry-run
-```
-
-If this exits fine, the expression is ok. If not, you have to edit `default.nix`
+Moved to [/doc/languages-frameworks/r.section.md](/doc/languages-frameworks/r.section.md)

From 8c7be5927e8ba5c1925dad1d3af09624bd907116 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 10:50:05 -0400
Subject: [PATCH 2088/2266] Ignore generated XML and other generated files

---
 doc/.gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/.gitignore

diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000000..d8e765e38c2
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,5 @@
+*.chapter.xml
+*.section.xml
+.version
+out
+manual-full.xml

From 7e25ff7106f00bdca9957b1109e2fd9beca86ea1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 11:36:10 -0400
Subject: [PATCH 2089/2266] docs: Build with a makefile

---
 doc/Makefile         |  69 +++++++++++++++++++++++
 doc/default.nix      | 129 ++++++++-----------------------------------
 doc/shell.section.md |   2 +
 3 files changed, 95 insertions(+), 105 deletions(-)
 create mode 100644 doc/Makefile

diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 00000000000..366d971d781
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,69 @@
+MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
+
+.PHONY: all
+all: out/html/index.html out/epub/manual.epub
+
+.PHONY: clean
+clean:
+	rm -f ${MD_TARGETS} .version manual-full.xml
+	rm -rf ./out/
+
+validate: manual-full.xml
+	jing "$$RNG" manual-full.xml
+
+out/html/index.html: manual-full.xml style.css
+	mkdir -p out/html
+	xsltproc $$xsltFlags \
+		--nonet --xinclude \
+		--output $@ \
+		"$$XSL/docbook/xhtml/docbook.xsl" \
+		./manual-full.xml
+
+	cp ./style.css out/html/style.css
+
+	mkdir -p out/html/images/callouts
+	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
+
+out/epub/manual.epub: manual-full.xml
+	mkdir -p out/epub/scratch
+	xsltproc $$xsltFlags --nonet \
+		--output out/epub/scratch/ \
+		"$$XSL/docbook/epub/docbook.xsl" \
+		./manual-full.xml
+
+	cp "$$XSL/docbook/images/callouts/"*.gif out/epub/scratch/OEBPS
+	echo "application/epub+zip" > mimetype
+	zip -0Xq "out/epub/manual.epub" mimetype
+	rm mimetype
+	cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
+	rm -rf "out/epub/scratch/"
+
+manual-full.xml: ${MD_TARGETS} .version *.xml
+	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
+
+.version:
+	nix-instantiate --eval \
+		-E '(import ../lib).nixpkgsVersion' > .version
+
+%.section.xml: %.section.md
+	pandoc $^ -w docbook+smart \
+		-f markdown+smart \
+	  | sed -e 's|<ulink url=|<link xlink:href=|' \
+	      -e 's|</ulink>|</link>|' \
+	      -e 's|<sect. id=|<section xml:id=|' \
+	      -e 's|</sect[0-9]>|</section>|' \
+	      -e '1s| id=| xml:id=|' \
+	      -e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \
+	| cat  > $@
+
+%.chapter.xml: %.chapter.md
+	pandoc $^ -w docbook+smart \
+		--top-level-division=chapter \
+		-f markdown+smart \
+	  | sed -e 's|<ulink url=|<link xlink:href=|' \
+	      -e 's|</ulink>|</link>|' \
+	      -e 's|<sect. id=|<section xml:id=|' \
+	      -e 's|</sect[0-9]>|</section>|' \
+	      -e '1s| id=| xml:id=|' \
+	      -e '1s|\(<[^ ]* \)|\1|' \
+	| cat  > $@
diff --git a/doc/default.nix b/doc/default.nix
index 1adcd796820..b04c9c1b556 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -7,116 +7,35 @@ in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
-
   buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ];
 
-  xsltFlags = ''
-    --param section.autolabel 1
-    --param section.label.includes.component.label 1
-    --param html.stylesheet 'style.css'
-    --param xref.with.number.and.title 1
-    --param toc.section.depth 3
-    --param admon.style '''
-    --param callout.graphics.extension '.gif'
+  src = ./.;
+
+  XSL = "${pkgs.docbook5_xsl}/xml/xsl";
+  RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
+  xsltFlags = lib.concatStringsSep " " [
+    "--param section.autolabel 1"
+    "--param section.label.includes.component.label 1"
+    "--param html.stylesheet 'style.css'"
+    "--param xref.with.number.and.title 1"
+    "--param toc.section.depth 3"
+    "--param admon.style ''"
+    "--param callout.graphics.extension '.gif'"
+  ];
+
+  postPatch = ''
+    echo ${lib.nixpkgsVersion} > .version
   '';
 
+  installPhase = ''
+    dest="$out/share/doc/nixpkgs"
+    mkdir -p "$(dirname "$dest")"
+    mv out/html "$dest"
+    mv "$dest/index.html" "$dest/manual.html"
 
-  buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }:
-    let
-      extraHeader = lib.optionalString (!useChapters)
-        ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
-    in ''
-      {
-        pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
-          -f markdown+smart \
-          | sed -e 's|<ulink url=|<link xlink:href=|' \
-              -e 's|</ulink>|</link>|' \
-              -e 's|<sect. id=|<section xml:id=|' \
-              -e 's|</sect[0-9]>|</section>|' \
-              -e '1s| id=| xml:id=|' \
-              -e '1s|\(<[^ ]* \)|\1${extraHeader}|'
-      } > '${outputFile}'
-    '';
-  in
+    mv out/epub/manual.epub "$dest/nixpkgs-manual.epub"
 
-  ''
-    ln -s '${sources}/'*.xml .
-    mkdir ./languages-frameworks
-    cp -s '${sources-langs}'/* ./languages-frameworks
-  ''
-  + toDocbook {
-      inputFile = ./introduction.chapter.md;
-      outputFile = "introduction.chapter.xml";
-      useChapters = true;
-    }
-  + toDocbook {
-      inputFile = ./shell.section.md;
-      outputFile = "shell.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/python.section.md;
-      outputFile = "./languages-frameworks/python.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/haskell.section.md;
-      outputFile = "./languages-frameworks/haskell.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/idris.section.md;
-      outputFile = "languages-frameworks/idris.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/node.section.md;
-      outputFile = "languages-frameworks/node.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/r.section.md;
-      outputFile = "languages-frameworks/r.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/rust.section.md;
-      outputFile = "./languages-frameworks/rust.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/vim.section.md;
-      outputFile = "./languages-frameworks/vim.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/emscripten.section.md;
-      outputFile = "./languages-frameworks/emscripten.section.xml";
-    }
-  + ''
-    echo ${lib.nixpkgsVersion} > .version
-
-    # validate against relaxng schema
-    xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
-    ${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml
-
-    dst=$out/share/doc/nixpkgs
-    mkdir -p $dst
-    xsltproc $xsltFlags --nonet --xinclude \
-      --output $dst/manual.html \
-      ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
-      ./manual.xml
-
-    cp ${./style.css} $dst/style.css
-
-    mkdir -p $dst/images/callouts
-    cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/
-
-    mkdir -p $out/nix-support
-    echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
-
-    xsltproc $xsltFlags --nonet --xinclude \
-      --output $dst/epub/ \
-      ${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
-      ./manual.xml
-
-    cp -r $dst/images $dst/epub/OEBPS
-    echo "application/epub+zip" > mimetype
-    manual="$dst/nixpkgs-manual.epub"
-    zip -0Xq "$manual" mimetype
-    cd $dst/epub && zip -Xr9D "$manual" *
-    rm -rf $dst/epub
+    mkdir -p $out/nix-support/
+    echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
   '';
 }
diff --git a/doc/shell.section.md b/doc/shell.section.md
index 079574d4ae8..cb8832a814f 100644
--- a/doc/shell.section.md
+++ b/doc/shell.section.md
@@ -4,6 +4,8 @@ author: zimbatm
 date: 2017-10-30
 ---
 
+# mkShell
+
 pkgs.mkShell is a special kind of derivation that is only useful when using
 it combined with nix-shell. It will in fact fail to instantiate when invoked
 with nix-build.

From f67ea4a6d0b14a61af3ccd98ef1a37ce870162e1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 22:10:55 -0400
Subject: [PATCH 2090/2266] Document shell.nix / xmloscopy / make for the
 nixpkgs docs

---
 doc/contributing.xml | 24 ++++++++++++++++++++----
 doc/shell.nix        |  4 ++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 doc/shell.nix

diff --git a/doc/contributing.xml b/doc/contributing.xml
index a83059aa36e..8eed9c5416e 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -6,12 +6,28 @@
 
 <para>The DocBook sources of the Nixpkgs manual are in the <filename
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
-subdirectory of the Nixpkgs repository. If you make modifications to
-the manual, it's important to build it before committing. You can do that as follows:
+subdirectory of the Nixpkgs repository.</para>
+
+<para>You can quickly check your edits with <command>make</command>:</para>
 
 <screen>
-$ cd /path/to/nixpkgs
-$ nix-build doc
+  $ cd /path/to/nixpkgs/doc
+  $ nix-shell
+  [nix-shell]$ make
+</screen>
+
+<para>If you experience problems, run <command>xmloscopy --docbook5
+./manual.xml ./manual-full.xml</command> inside the nix-shell to help
+understand the docbook errors.</para>
+
+<para>After making modifications to the manual, it's important to
+build it before committing. You can do that as follows:
+
+<screen>
+  $ cd /path/to/nixpkgs/doc
+  $ nix-shell
+  [nix-shell]$ make clean
+  [nix-shell]$ nix-build .
 </screen>
 
 If the build succeeds, the manual will be in
diff --git a/doc/shell.nix b/doc/shell.nix
new file mode 100644
index 00000000000..22590142ee1
--- /dev/null
+++ b/doc/shell.nix
@@ -0,0 +1,4 @@
+{ pkgs ? import ../. {} }:
+(import ./default.nix).overrideAttrs (x: {
+  buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ];
+})

From 30dd2d3feb6d872372ee6f9ec86e58c3367589c7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 22:22:38 -0400
Subject: [PATCH 2091/2266] Validate when building outputs

---
 doc/Makefile    | 4 ++--
 doc/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 366d971d781..1ef668528ad 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,7 +11,7 @@ clean:
 validate: manual-full.xml
 	jing "$$RNG" manual-full.xml
 
-out/html/index.html: manual-full.xml style.css
+out/html/index.html: validate manual-full.xml style.css
 	mkdir -p out/html
 	xsltproc $$xsltFlags \
 		--nonet --xinclude \
@@ -24,7 +24,7 @@ out/html/index.html: manual-full.xml style.css
 	mkdir -p out/html/images/callouts
 	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
 
-out/epub/manual.epub: manual-full.xml
+out/epub/manual.epub: validate manual-full.xml
 	mkdir -p out/epub/scratch
 	xsltproc $$xsltFlags --nonet \
 		--output out/epub/scratch/ \
diff --git a/doc/default.nix b/doc/default.nix
index b04c9c1b556..5869920415c 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -7,7 +7,7 @@ in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
-  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ];
+  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ];
 
   src = ./.;
 

From fce1fb7e7573cacfd3edaa282cb4ebdcb58d6681 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 25 Mar 2018 07:37:41 -0400
Subject: [PATCH 2092/2266] Move validate to top-level  so it doesn't rebuild
 the outputs every time

---
 doc/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 1ef668528ad..f3a4d6b5aaf 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,17 +1,18 @@
 MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
 
 .PHONY: all
-all: out/html/index.html out/epub/manual.epub
+all: validate out/html/index.html out/epub/manual.epub
 
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
 	rm -rf ./out/
 
+.PHONY: validate
 validate: manual-full.xml
 	jing "$$RNG" manual-full.xml
 
-out/html/index.html: validate manual-full.xml style.css
+out/html/index.html: manual-full.xml style.css
 	mkdir -p out/html
 	xsltproc $$xsltFlags \
 		--nonet --xinclude \
@@ -23,8 +24,9 @@ out/html/index.html: validate manual-full.xml style.css
 
 	mkdir -p out/html/images/callouts
 	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
+	chmod u+w -R out/html/images/
 
-out/epub/manual.epub: validate manual-full.xml
+out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
 	xsltproc $$xsltFlags --nonet \
 		--output out/epub/scratch/ \

From 8cbf295b6c1d33fded6a78c7665f980bc2bb72d4 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 25 Mar 2018 03:27:28 +0200
Subject: [PATCH 2093/2266] chromium: 65.0.3325.162 -> 65.0.3325.181

dev: 66 -> 67

cc @YorikSar @aszlig
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 66d41a9c165..e30ec4228c8 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "13n84ky5fr5by71jd9ivj3q7czd2gxrnvbj8msskb62zamjb8z80";
-    sha256bin64 = "16f2b9sxyljrmj2rcfzamf9ji01pkamnb6qv363lf67fshm37ky0";
-    version = "65.0.3325.124";
+    sha256 = "18dampi62wwvscywvdz8lil0zhxdr4p6bhr4yv08arz029w356lc";
+    sha256bin64 = "129jq8ynj4y81rhzxyyfcfpllq3a6ddhiy766zw28s7d43q4zca2";
+    version = "66.0.3359.45";
   };
   dev = {
-    sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8";
-    sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw";
-    version = "66.0.3359.26";
+    sha256 = "09x7p83p188ms0awxj3kl9kdx796ns6m42smqd3jccnljx54jls2";
+    sha256bin64 = "1aa24gvbf9awm59n05jkb4wy6ssr7fns4rl1hd2c66cq2d4mx3d8";
+    version = "67.0.3377.1";
   };
   stable = {
-    sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2";
-    sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v";
-    version = "65.0.3325.162";
+    sha256 = "11w6wg862ixbgm7dpqag2lmbjknv83zlr9imd8zchvmrqr468rlk";
+    sha256bin64 = "0r14w94aa7zg2i3zjpwvb7d6fg9yg0xkki7jzcpjmzwygy78fs16";
+    version = "65.0.3325.181";
   };
 }

From a62fffd9a5c9441235b90c68dbd7bcba34940b6a Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 22 Mar 2018 17:58:57 -0400
Subject: [PATCH 2094/2266] ngspice: Move shared library to a new derivation

It turns out that the build system does not support building both the
command-line tool and the shared library at the same time. Consequently
the ngspice derivation has not provided the command-line tools since the
shared library was enabled in #31166.
---
 maintainers/maintainer-list.nix               |  5 ++++
 .../science/electronics/kicad/unstable.nix    |  6 +++--
 .../science/electronics/ngspice/default.nix   |  9 ++++---
 .../libraries/libngspice/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libngspice/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0524b26b831..b38d9b16353 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -572,6 +572,11 @@
     github = "bergey";
     name = "Daniel Bergey";
   };
+  bgamari = {
+    email = "ben@smart-cactus.org";
+    github = "bgamari";
+    name = "Ben Gamari";
+  };
   bhipple = {
     email = "bhipple@protonmail.com";
     github = "bhipple";
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index 21eddde8267..7209ee3edf6 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -3,10 +3,12 @@
 , doxygen, pcre, libpthreadstubs, libXdmcp
 
 , oceSupport ? true, opencascade_oce
-, ngspiceSupport ? true, ngspice
+, ngspiceSupport ? true, libngspice
 , scriptingSupport ? true, swig, python, wxPython
 }:
 
+assert ngspiceSupport -> libngspice != null;
+
 with lib;
 stdenv.mkDerivation rec {
   name = "kicad-unstable-${version}";
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
     cairo curl openssl boost
   ] ++ optional (oceSupport) opencascade_oce
-    ++ optional (ngspiceSupport) ngspice
+    ++ optional (ngspiceSupport) libngspice
     ++ optionals (scriptingSupport) [ swig python wxPython ];
 
   meta = {
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 114a2eea85f..96025e8faa6 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
+{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}:
 
 stdenv.mkDerivation {
   name = "ngspice-27";
@@ -8,15 +8,16 @@ stdenv.mkDerivation {
     sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
   };
 
-  buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
+  nativeBuildInputs = [ flex bison ];
+  buildInputs = [ readline libX11 libICE libXaw libXext fftw ];
 
-  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ];
+  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
 
   meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = http://ngspice.sourceforge.net;
     license = with licenses; [ "BSD" gpl2 ];
-    maintainers = with maintainers; [ viric rongcuid ];
+    maintainers = with maintainers; [ bgamari viric rongcuid ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
new file mode 100644
index 00000000000..b6d5912581b
--- /dev/null
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, bison, flex, fftw}:
+
+# Note that this does not provide the ngspice command-line utility. For that see
+# the ngspice derivation.
+stdenv.mkDerivation {
+  name = "libngspice-26";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
+    sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+  };
+
+  nativeBuildInputs = [ flex bison ];
+  buildInputs = [ fftw ];
+
+  configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ];
+
+  meta = with stdenv.lib; {
+    description = "The Next Generation Spice (Electronic Circuit Simulator)";
+    homepage = http://ngspice.sourceforge.net;
+    license = with licenses; [ "BSD" gpl2 ];
+    maintainers = with maintainers; [ bgamari ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..aa9bc5f5956 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3434,6 +3434,8 @@ with pkgs;
 
   libnabo = callPackage ../development/libraries/libnabo { };
 
+  libngspice = callPackage ../development/libraries/libngspice { };
+
   libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
 
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };

From 67f9d2425dedbea2c2611100a6fb5935de9a6123 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 25 Mar 2018 20:01:31 -0400
Subject: [PATCH 2095/2266] Add 'make debug' to call xmloscopy

---
 doc/Makefile         | 3 +++
 doc/contributing.xml | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index f3a4d6b5aaf..52d1f4630a8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,6 +3,9 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
 .PHONY: all
 all: validate out/html/index.html out/epub/manual.epub
 
+.PHONY: debug
+debug:
+	nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
diff --git a/doc/contributing.xml b/doc/contributing.xml
index 8eed9c5416e..7aa0df271ff 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -16,9 +16,8 @@ subdirectory of the Nixpkgs repository.</para>
   [nix-shell]$ make
 </screen>
 
-<para>If you experience problems, run <command>xmloscopy --docbook5
-./manual.xml ./manual-full.xml</command> inside the nix-shell to help
-understand the docbook errors.</para>
+<para>If you experience problems, run <command>make debug</command>
+to help understand the docbook errors.</para>
 
 <para>After making modifications to the manual, it's important to
 build it before committing. You can do that as follows:

From 373cc61045cec5cdf62929bd0a04442321f3a459 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 17:10:29 -0700
Subject: [PATCH 2096/2266] libmtp: 1.1.14 -> 1.1.15

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/libmtp/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-tracks -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-tracks --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-tracks help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-folders -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-folders --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-folders help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-hotplug help` got 0 exit code
- found 1.1.15 with grep in /nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin
- directory tree listing: https://gist.github.com/9d2ecb7c47b08cae415b4f3d91f3cb82
---
 pkgs/development/libraries/libmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index dca80bbbe88..88ef55715a7 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.14";
+  name = "libmtp-1.1.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "1s0jyhypxmj0j8s003ba1n74x63h1rw8am9q4z2ip3xyjvid65rq";
+    sha256 = "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h";
   };
 
   outputs = [ "bin" "dev" "out" ];

From f747740535ab7d7f8cbd196e56d8e853b4d4395e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 17:13:47 -0700
Subject: [PATCH 2097/2266] librelp: 1.2.14 -> 1.2.15

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/librelp/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.2.15 with grep in /nix/store/cjbd6mqjf4lgxl73dkvs9xc03yvdcwwv-librelp-1.2.15
- directory tree listing: https://gist.github.com/bc4e1fc397536ead26ce0d2df2c25296
---
 pkgs/development/libraries/librelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 5db5d2b5965..55bb22e660b 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.14";
+  name = "librelp-1.2.15";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "0marms2np729ck0x0hsj1bdmi0ly57pl7pfspwrqld9n8cd29xhi";
+    sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From aabf45c1637f3de98c5ca89188573985fbff153d Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 25 Mar 2018 20:14:55 -0400
Subject: [PATCH 2098/2266] openjdk10: minor cleanups

* with only one source bundle (per JEP-296), we can use src instead of
  srcs, and avoid the need to cd in prePatch

* fetch sources from jdk10u instead of jdk10, to make it easier to
  grab updates when they start coming.

* removed commented-out code that became irrelevant in the 8 -> 9
  transition (*.pf files, infinality font rendering)

* create jdk10, jre10, and jre10_headless attributes in
  all-packages.nix
---
 pkgs/development/compilers/openjdk/10.nix | 23 +++++------------------
 pkgs/top-level/all-packages.nix           | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
index d84b0c30242..2a0c7a1ac01 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -4,7 +4,6 @@
 , libjpeg, giflib
 , setJavaClassPath
 , minimal ? false
-#, enableInfinality ? true # font rendering patch
 , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
 }:
 
@@ -20,18 +19,16 @@ let
 
   update = "10";
   build = "46";
-  baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
   repover = "jdk-${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
-  jdk10 = fetchurl {
-             url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
-          };
+
   openjdk10 = stdenv.mkDerivation {
     name = "openjdk-${update}-b${build}";
 
-    srcs = [ jdk10 ];
-    sourceRoot = ".";
+    src = fetchurl {
+      url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
+      sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg";
+    };
 
     outputs = [ "out" "jre" ];
 
@@ -44,10 +41,6 @@ let
       gtk2 gnome_vfs GConf glib
     ];
 
-    prePatch = ''
-      cd jdk10*
-    '';
-
     patches = [
       ./fix-java-home-jdk10.patch
       ./read-truststore-from-env-jdk10.patch
@@ -126,12 +119,6 @@ let
 
       lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
 
-      # Make sure cmm/*.pf are not symlinks:
-      # https://youtrack.jetbrains.com/issue/IDEA-147272
-      # in 9, it seems no *.pf files end up in $out ... ?
-      # rm -rf $out/lib/openjdk/jre/lib/cmm
-      # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
-
       # Set PaX markings
       exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
       echo "to mark: *$exes*"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..969f94b5cde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6423,6 +6423,20 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
+  jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
+  jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+    (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+      (openjdk10.jre // { outputs = [ "jre" ]; }));
+  jre10_headless =
+    if stdenv.isArm || stdenv.isAarch64 then
+      oraclejre10
+    else if stdenv.isDarwin then
+      jre10
+    else
+      lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
+        (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+          ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;

From 25856e37e36400acaa13a4cb2f45baa602c0cec1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 20:39:38 -0400
Subject: [PATCH 2099/2266] haskellPackages: Fix overriding all-cabal-hashes

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

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index d528230b77c..7b512e46da8 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -15,7 +15,7 @@ let
 
   haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
-    inherit stdenv haskellLib ghc buildHaskellPackages extensible-self;
+    inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes;
   };
 
   commonConfiguration = configurationCommon { inherit pkgs haskellLib; };

From cb9c1c63c978f6813cbe74182ca09c70e8888d7c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 16 Apr 2017 15:18:44 +0200
Subject: [PATCH 2100/2266] nixos/tor: expose control socket

---
 nixos/modules/services/security/tor.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index fed91756e76..2c727de2102 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -5,6 +5,7 @@ with lib;
 let
   cfg = config.services.tor;
   torDirectory = "/var/lib/tor";
+  torRunDirectory = "/run/tor";
 
   opt    = name: value: optionalString (value != null) "${name} ${value}";
   optint = name: value: optionalString (value != null && value != 0)    "${name} ${toString value}";
@@ -38,6 +39,7 @@ let
     ''}
 
     ${optint "ControlPort" cfg.controlPort}
+    ${optionalString cfg.controlSocket.enable "ControlSocket ${torRunDirectory}/control GroupWritable RelaxDirModeCheck"}
   ''
   # Client connection config
   + optionalString cfg.client.enable ''
@@ -140,6 +142,17 @@ in
         '';
       };
 
+      controlSocket = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Wheter to enable Tor control socket. Control socket is created
+            in <literal>${torRunDirectory}/control</literal>
+          '';
+        };
+      };
+
       client = {
         enable = mkOption {
           type = types.bool;
@@ -692,7 +705,7 @@ in
 
         # Translated from the upstream contrib/dist/tor.service.in
         preStart = ''
-          install -o tor -g tor -d ${torDirectory}/onion
+          install -o tor -g tor -d ${torDirectory}/onion ${torRunDirectory}
           ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config
         '';
 
@@ -716,7 +729,7 @@ in
             DevicePolicy            = "closed";
             InaccessibleDirectories = "/home";
             ReadOnlyDirectories     = "/";
-            ReadWriteDirectories    = torDirectory;
+            ReadWriteDirectories    = [torDirectory torRunDirectory];
             NoNewPrivileges         = "yes";
           };
       };

From 0a8359f18cc275408c6de82027262e6fd9e382a5 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 20:43:23 -0400
Subject: [PATCH 2101/2266] GHCJS: Fix autogenerated node executables

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 2f6f5e51c0e..76c18cc486e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -352,6 +352,7 @@ stdenv.mkDerivation ({
       for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
         printWords '#!${nodejs}/bin/node' > "$exe"
+        echo >> "$exe"
         cat "$exeDir/all.js" >> "$exe"
         chmod +x "$exe"
       done

From 60cbe237641898d6990ff338cbdc99846f137288 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 17:46:46 -0700
Subject: [PATCH 2102/2266] links: 2.14 -> 2.15

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/links2/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.15 with grep in /nix/store/sv2bhipkaba7wbgkwinbq1xs430zmvra-links2-2.15
- directory tree listing: https://gist.github.com/c94bde5e3281eca9ed30751401d14020
---
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index f097d748d48..7c007e228f8 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.14";
+  version = "2.15";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
+    sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy";
   };
 
   buildInputs = with stdenv.lib;

From 0f5427195ffb4c99aa496af85f560f869a7e5622 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 18:30:36 -0700
Subject: [PATCH 2103/2266] neo4j: 3.3.2 -> 3.3.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/neo4j/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j --version` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j version` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j help` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-admin help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-admin --version` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-import --help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-import help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell -h` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell --help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell --version` and found version 3.3.4
- found 3.3.4 with grep in /nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4
- found 3.3.4 in filename of file in /nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4
- directory tree listing: https://gist.github.com/06dd1dc492c20ed7b979e977cbfed538
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 3b875576529..bc67e7eaf43 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.3.2";
+  version = "3.3.4";
 
   src = fetchurl {
     url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala";
+    sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From 41500cf2d77fdf3e5c27af5634c93843428dbda1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 21:49:19 -0400
Subject: [PATCH 2104/2266] Request older haddock library for haddock-api in
 GHC 8.0

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d4b39c11955..2f4587a6593 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2403,6 +2403,7 @@ extra-packages:
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-api == 2.17.*               # required on GHC 8.0.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
+  - haddock-library == 1.4.3            # required for haddock-api-2.17.x
   - haddock-library == 1.4.4            # required for haddock-api-2.18.x
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support

From 7151ce7f0a955930f50809c596ff881d11645582 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 26 Mar 2018 10:11:02 +0800
Subject: [PATCH 2105/2266] firefox-devedition-bin: 60.0b3 -> 60.0b6

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 0ad35ee1c1f..eeb130ed89b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b3";
+  version = "60.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "59a2c232a7551d3f75843bd71f5d1cf804098dc7bf3048bdac03c51d7e7da32b52e10aae2499d28d0dbe6cbfc5b2fde87c0624142ffc4026aeb4e790f927e889";
+      sha512 = "69913589af0b21f301a14efa66a625a5425f917282e9a28fb3cd21d51a62785fceeb810bc6f2b3ee7102a559f51379b5d78b3bf4540d016039c183d3bb069997";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "869b80d3f535c5e63ecc3c91150b5739d5f4d27137e11f279b534645660c761ec95155702c852b5bd915d41381e8f8c11f8631902bd0cc13f310b30d31aefda3";
+      sha512 = "16a078dcc10ce88562cdac50fc8925da21e282fa309718adf0bdfa3153d8659e24603b1254af64770ecb0d9112dc6024ab6d1810ef0696b895ef837dcf3c196f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b5f850afa0491da07705ef4e3f48a1aa0a4678744a2a19e6c4f52041f91faa9249362f983b6b0dba030644ff67b065e25315b50d1429b9967211b4873d355a80";
+      sha512 = "9f3f3606f80bf01ce66988f687cd1d849eb4e220e002a5652e5771cdf89269917a206ce1f1bee2191c61cab4c57f0b422a40c75f46e0cf6d9f278f4af4a4e028";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "843898c216e1c531151d2e123e1c7b822259915130ac198a7f115dcb11af079f27514fbb2796c00f6059d18d0d7b412ef7758c0a6b9b0e985b5272ef9662cf18";
+      sha512 = "7ead7009ab01a8e4601bc5b9a40041619dd1df0f421ad4e8629360318589cb9acfc95900925487f4cd1619d6b663b2d675c0115803131310358335a9813a17cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "f02f956b244ad48b94d0c45307d61b92a70d6cf2acd58789fb453287d0f53c47322dd538a0e1b17627a7e568728abb905a835c29c35add401bade4754d987dc0";
+      sha512 = "ef5f3db024f39a1b8d5ff0333d22effb4b82ecbe9a0f85b616c93a33ea1cce5b5a48ea3f483512044d16766f720164f773afb3a19a62be1b5458415b36694fbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "ab7fd7a674a7292cbd9f79a72129a212c95c8960c2673de52a3b566efebbaaff316820a5f2613394592c4bbe249876197bf4dafd9e84c6cee35858521358a49b";
+      sha512 = "e45c0cf476f8d1d5211df5268fcc49cf0ef88a3c6546003d5e4ade08cf0620cf712a5e37da643284c2e114a36b650f76bf28fa047edda73fd31200e5cc5a2a05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c9b7e536ea19b74ad5774e95a2195718692a99c7e59a0fd482cba9d7c62250983d0cd7689771db24b86c909df5e52a009e7d97be76807ad21dc5ab838dcf923b";
+      sha512 = "5c0574a0e7170d7cf1c5d04ed06439161d8dd2f7cf49d7da88ab01dddad22eae72764b518bddd04ea0c8fb4820dee5223fb6c062175358c9531bf6c13df50900";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "33d5175f1df479f85d582c8e95255dd42f004c5e53e5a11e31344db85eb1e49c7c83c2b348db840cfee44aedb17d52bdfeef63cb8f3e9a4530a33d34d05c0e5f";
+      sha512 = "3650054a3d97852e7cc450087d8a9ed41c122737c57c588e66646a846c41a2a7553fea263bda1828a89532ccb734a0aee7fc2803ae148ee6942462045813a0b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8d1f3c82a6543b8ae7ed19e5c6a34525899ca1219e2206ae2a6bf391fefa37447d611ef6896ea5210c1aa54e65edc23548dd76eb13f42b6939624409540729a7";
+      sha512 = "35cdc212c1ce673305dbbc05690b0b80323050b85f3793b4f0f1cc0b7416ff01cc1a7783066643cafb20206d5c8b51de4668c81849debc03cd71b8cc0aeb9375";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f1b2f7dc2ca26c0637a3cbf9d649750e2c8c885a40b0767310ca7624d8947c6ba09e6be9529814524c876fb9fb60390f47ed88c131227a14e5af9369456aa363";
+      sha512 = "bff9c7b7b3da3f0345fbcffa4f7be3496b6d127fff0014841b500eee261e84975f19e44983c6177e7c2e4f93c30d8b94e93f3210b5ffa28480e639ca51d96151";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5c6c8aade30d76f496cfafaf8c0882e72bc10c733486bcbc315ee5ad41565957f67c9b821b5b77424a67619211d5eb959c731beb28117c8b31ea18f9e4516342";
+      sha512 = "2ae654744dcda3627cf2ce9faee2b04d98b18aafbde71bb0c79c8751941df2df3a615b62c5e9f60a4c6c9ad3700e5765a7fdd0cd0f7af1c12e724d6343d077ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "bc7f71477781a9e9cc50e41fd1507293f48892cb2001bd79360ec4ff65e96fca6f69d6d063c9c6e44c0e982717ecbe6a6af05f14485c13816e415b3104d93456";
+      sha512 = "5b8dee9188e94ff32485a4dc94fe0afe9c0dbe5b6e8aceffdef098a3851e3c90e2e6562b7503c3ed4174bedab94e7cc8f065f591e8e1c1ccb9afcf803cc7804f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "645a7bb1a4b5adbd3d7d9e190fe8ac24cb81d311457f426f8592a8427a263a0b8ded1817b8026241b1f3bed8e2e526158c7f1339d4584c1302822bdf21ebe870";
+      sha512 = "56cfd8c2e8119ea515ad0051152da29f44cedb60e04707433546f44da1b67498221d39d38cc4c18c1fe7ff683361831795ab5e26405d3ca565313b5e47a1d32e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "12c3d21eb2c7a121080a645a75966caf757e886222c292b4ead3a23278bf35d4242e1440ed5f7eaedf1cc4a7436b6ca2130fd2accb075714c71a1ec31b1dfd06";
+      sha512 = "89e745399ec681fd121da56de264b92895bfb614a14e4d1c2802509bb0857aea75082c02166ad9d678452fcddb88dec4eb6f540a51a8257167a585538757bf43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "8cb1dbe49d8bf0696b6291452a7e389da21dabfd1bca59667038b2fc9647b588ab1632c5d1a8101c1352807c57f42ee1f909c1e1c926321a8583300f99a0934c";
+      sha512 = "49c02148c13c7bc9994d029b108adb8d6622c336f4a5262fbc6840527adc53af366138f447fe91ed436fd3b8f625eb57cb227097fac78cd92df50af00bf2b687";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "06bc6712e27514529dc17379d8fba4537440f7cfa7e84d2b4201386a886030f3b4a098b6230577a36cfa9c9968ac8c1432100a0047f86c0aa32d8fc1971d0122";
+      sha512 = "b5c9fae4d9ed3653511b6a7d2701f539203e39f319268332f726ae6f2345e356715ab26b92157cc5f39a285983f8d29b3e1bc1a6852a3ff6deab13b1cc169948";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "123a40d291431478f8fbaa13eb2197f3dc885755a1478519ed599b84fbe086c377b6208226e0409f156fb4d90ca1beb25fd255583018ae605d2aa4c5bf84d258";
+      sha512 = "cc4f76b0f3e8cb1879db79b324056f94a72458ec0d578698e9f59a61096684f940174cffcb90a9ebe5062ac53dba62237582989c86bdf4eef6b0c54104e289c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4b556676ad9fa3bedb4ae49685344cad23da8c47c68efe986d14166308b6de53cb2f0b696d89e55e9ec1a3e7d523016ee7b87f539d4d6b02facae2014e815858";
+      sha512 = "b7fd250110db719aed55f3508274ecd6b9eab72606947309e8d96d2fe76552607724ff74aeae12f9fcbaeeb15569a05d0449a051d18304e59df8f872965234bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "eb53b6c9a000c4b7277d164c39f0d53928fc29527cf35a79c1ad1418f620efc00a16663ca0a59db3ee7a1d51ca9b6652777154827e916fc0346685080ea0bc8b";
+      sha512 = "2a8c8a4c26fa9262db29aebbb5e9df647340669c3d0f549efcdb3f2ba4fa196abb22942df8b3358ec26321f0e264328fd138e8603157da4945567170f59eddea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "152b9ed4b6674f1f9f83caf6b344d83c8651beec699fdac4a9cca4ee82012bd8c8096b3bd6319a87b8ba3295088d56a2aa8be965940114b2fbbf85e102c63620";
+      sha512 = "bd197a1091b9401d3759f8df407d6bdaee36184e0479dd6c75ff216f73e3782739eba8bba99a6733bd6fdb25a0812ce0274e233390762d622ca3aef5bfe9dfeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8c498c56a8266389fc43c80971bc379a1c79d6769d8560e2620320f9ca502c420bc5b671be09dd50f67afda11a45b6fc56c17373e562691527190bf8334224d1";
+      sha512 = "93addd3420986aa0f44f642173b2a24b47bc488cb795b85eed0e01f99208b7c8757c6b1049ba519969047c18fdfb1fc1f43c397da75bbd7c763a4209ac6a5681";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "68a54a00c74b113f2f4c33c92d872c454da2c97e34c81c91e5807d2725415d81a6713b68459dd75a1602f908012d60883f9d483d23fd638dc0d43a75414319d6";
+      sha512 = "55cb7e0789b67d00a5b13e8c4ec2541ebd7fc9edb9cf5af38c23c937cee6b1f1900a73ee0d9c70a088d9cb093c806f309b97ee487532bb0cde1ddb0153150f62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1be7176d5a5708fca376f9146a8ca49debf0e4702365535685d2a3db68628892881b3be3ae3caee972f3839fd48528513131114c5044a31d6468c1e8606a9eeb";
+      sha512 = "62545eb38388650a91b3565237dfccddf9962e174d51b2cb5e38471e365ad155af08b4a04229e472669a5ad652b57d47428b90960ca09c4c8ece09549f23a01a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "b9239303030197b776debb5726a25864e54795627f59bfe4c0f24913d56a04b5d4f4f69ae1fd8c56d105e8edb185e64bde96226e043078703c3b5805b507ac4e";
+      sha512 = "e5da78332abbad7c913dc917905b5f5e1d3e5a558353778fb02952675da465dd619c544441a42ab94ac5c14077f380a240a5592d84a6e84d4bd77194e1b3eca5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "4b603bdd4f1b484a87894f3252418753e2f52d6cf298cda6d18bcfaddfae5269ef69ebd0a7e9d85da8ab42ccc4065809ab34a0ee36632c4ee4cc65fe4169cb99";
+      sha512 = "a9ed1e33b92a061e6578a4edd0db18216bdaf350fd5a65f75fdf7e3f130bf007abee353facff8bba2a22dd91643dce0c3e22055474005aec4aceed7ad8752973";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e27a814f7408198c200165da2fe6cb40fe0b11626e15d92e8224c12acf1dd133e419bf8f98b09dde3bc505b77750950f568bff295919fd1b38112e879a6694a5";
+      sha512 = "ad70fb5093d24c2d05b770074c3ed3605a0d131869bb07e185fdbb3f6f51de6c959f0c46af108718d17381fcc8e20d4ec9dee2d56ee02c4b056574844880b2d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ef6d2814d1ff70e2799a8a0d5c6aae1f711819db6e816f2e153e84701e93a0a7debe19dd0975a4092d8c179f0ef5fa8f2c53b1d0d046110914634fd3bd2ef301";
+      sha512 = "f15fe7fdcfc4409fb14fd4176539520be9fc4af45b4e62b0d3b8c7dddb946485d208879003551c780efc0633031bb08f46f5694340b9340f35532ca1ac6077f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d41bb50097c60e239b539de8b9b08d21552d556e36606078ebe36a48de8e07dbb60b3e2940c0c531f7632efd2206cde2fcc6294a1f3a74a5bed7100c75658c0b";
+      sha512 = "1024fb8811a0f97fbd391c406277061cf524414ed63a48805357fd486476cf744da28bbc166ac419f448d01748eda2e3243768db81965a4c7b88f129e0893b89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "d3a2a4aa920c864bbd28dd8cdc091b25d6b8d386f73144d6236ffbe63a99e74af6f6420a82bde6b2f8e35ddeeed0cfc33a1e9aadd425d778878aff3b447aecce";
+      sha512 = "27645528b9e8daeeb8ddf417820b27c48967437752a8a4939183e8c646840686d64ca3b21e6f26270965c0e54e44995da4ba1d325be85e740d6200ecd18972bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "f66cc73bfe130295e35c44cc2902c3f1ec7b271d673974e13e0d8be630f671ca548943f13c04a01f45cf5523b3e67147ed28a53794e714409cbe2078bdb0dd55";
+      sha512 = "863e4e532c22bc2c055fa354674b4dd38aea016ecc69383b746bfc0b70b634e0ff881dfa3de33d2a21811a9ac312ae2d7423fe8813c31d3af4d4403d07e5a729";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "f377f98e9d3b1774372add885bd45900e9d5a792d3b2c9c96f1ba4db0f7f03a7f693e400888c2d98a5fb67d4199f13f2262e0546f5e53491803872cca5e94ba4";
+      sha512 = "a72c6a0d80453e82d6081fdcb702fe2f91f17a7cdc4f1ffdfae8c340bdea87064b4ba7f52d114fcfd87cd30242220bd44b36f01d0b09a7cfd7808de4d48a7117";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ef1b293fc8569a23c2b60a47f65d672334a5ee8d20470460ea6a2972ae7e6be91ecfed3c3f2acdba614e7895060253444fdd805df00cb08a6a2abd4c0d98127d";
+      sha512 = "0df9a0cb44c7775e4631a66daabd7c02f1d6bb38b87e9487d13e52ce02a6b7a93d2bf87c1ff6a7d8275d2f4d0357cac0a87ff9a9e9edd2b25703b8d9340d3e1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "774ca258ad68a2a6a5c9943e7b9ffac96a54448217125fe61ff11a0ede25c96498f7153f3406c1322a1f83515147402a8b506aa81732f2617e73e388fdd0950f";
+      sha512 = "2ff27ca36d90608a4762453ae89a93eb130acb8bae864e31d30cd135820867730deeae4a65bb942d64346fb9318da791d51318a398bd2c44d8addf6c40296e52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "e29c6aadb5dbb9d456a11ff66d4b17296d6cb4417e4eda85a2666a79d6d2fca65b93cd7ceb385456e950730fa165462df164ffe17ac7696e359d96d08400257f";
+      sha512 = "cf1513ca85ba34bd863ed0f1a1f279d86778733a83114b0a055bdee7f1dc5742ac9b138a564699a28acdf695b5786c8d6c92999e588e9597fbf79ded3db903a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "487f9e0a439c2738f1eb2c55fa89e56b7829b8c66dc893ecb23f3705d86e1f8bd5948c2ba0ccf3a7eabeda68385371a49dd74b92e3daa2cc7fe07b958134ee60";
+      sha512 = "8236fdaf20caedb944464eb00cbe078bd64c904f2064ce9b884e4f84c72237e6848afb4247d6e62f7452afe0c13f233e23e4cba86933eb268386c78a9b6e5d8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "0e526712e2f203e1ec806216144abfcb9ef96c769f8f736298053a8ad33d6f9e3bc6e6f6b36c4aa93cd45ee8a6370a15e0da6aa312175e142b574db8f5e628ec";
+      sha512 = "7eb670c2c408976701391ae65889e49db09cc8c155069da4ec67e6f3a8d76406297b13fc60d4253c0a664f41bd67f7482999f2c2c9d56c56aab02d1a351f7997";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c21112fda5525ff7ded643407fe2be5c6b660449879a80dfd57b1f713c98679062cccc577a42573bc2bea9adecd660551c7f31c6962905cd51e6cb8eb14a22cd";
+      sha512 = "cfc48df47e33c7ec1e2a07b5ea915958a4762db558226cf78e014ebf2578660f93215272137dfa52f5a65ab1e99cd24f293d145e7dd1015a2cc3e644bd4dba70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ed6d0fc2a82ee3c0e14031d58bc2074dde5160492de7920220ac8e72ca995b553ca8c9899d9d8f256287a302bdfbffd65981d64d8c778fbe7e4f55365b6c317a";
+      sha512 = "a97ce4a5773caa3359828ec9216661ac480d9577bd511c44963309e46216e74e89ca876de035162654a07f5002359918f6eb4b7f1c305184e51461ce3e48ec51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "345bac14c394a432fa4ace22a439eaf2d16e6e0dfb6dd97e356c2b623000d14675154e34e4537b0f5bcd1e90c1111a263e7ba52a1ef6e81f6c8d0109a6263690";
+      sha512 = "6a02e273b1998654d9a31f9589a44c9f30975976cfcf3e9d74f0e66508b991e7eda148756951cf5bbf781ee37f8bef380c12d3c25637d7557d2480a6925ab629";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "702f85952d51286576c729c84e2709b32ffa0a1dd03c2911c1b20de7510e1a006531389c2bdbcbc1fd99fd3568db5a4157daed9c65a4be04648872a8200a808a";
+      sha512 = "ed5bb626dc1a0c29f4f7e222b6090c24f6803df53baaa632727fc087dff5cc4a97a85b9105e9d5b228cb27df95f50efbaa7298a4e8c3e39eaa424a7d08dfe042";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8286e8fb299022028cf17466c199badcebb23a9aa743d4c64b2737d3112a5d964fd0b534bec6892aea9d67877dece66c25b1ddf15e08a745924e815064768891";
+      sha512 = "5cf25bf3820051eab9e72637a66d6f1c082253953302363c2e95bc026422e84856dbee180c86b4c9bcf186db5dadfcd20efd6ec12e743be90d2a1b3ac229127e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "598d84026a03835044c8bb57e5f27ddd131a045c49c779a5813d06b789bb062ea2d4ed92f8d5fafeb1b2ed5dafcaa75e9c06f5c8354cbab80fba1d1db6ce61ca";
+      sha512 = "c0e418e15b74101c09ce61296da0cea9b94300e4265dde4837157330082678aa7b92286db2c883b7ae5577d86232eb3e3337d9acecbc2de14dfca5032ac798fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a410f8d101396f727920c4fbb91d1ec6885ea98317a1cbe7557d6ae7b40a9e428c6a6482cbfcf4857dd0b652cea8a6b3953fb76455234b2a6938cd55d9f9ccac";
+      sha512 = "f9859b355359ca2ae8833b52afb8f4830844f9c264cf0ba72a7bf72bb0070475b0fe4f4d5774bc3243c834dbc671b80c6d428a8b6828ea43b600be0c90f9dc9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "40fe8d2dd6f232ecfb0f48cb93f837cbb9f731c07c11d6c51c44bd596b050be89aadc610dea9782d42fde6ac8779cf72eb6b459df11d6ee1dde8b9960ec13926";
+      sha512 = "18d7e9659a284bb0f60d3f59e1d711844c75e6213b26445590fbee2878952aec0a42f3336f2ec20cfef284e41f1d8f2d3677ddf767c94a00112d021b95d2749f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "319fe8680ff501e100ae9b3e5a818d6fc69c1dbfff8e11e6ed55d9e25628b7435da4632e5a6b92758a0f2215d79f49f2aa1c1f98029f146af30e1be36dbd47ea";
+      sha512 = "b16bceeaeaeff3feebe8d895d92c32d23a6c6cd799d2dc7aca95bab84deff4288e7625eb680125695f144a21deac25d57d5c670424209c9e50e48052eaf10460";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a1826847c504931ab1554cfd4af989ab7046eefd9d1a28692a0b39bca390652d6e30d193076fbd59977460f5570b973bce1d0fec8c1ef6195ec70a836cbc5520";
+      sha512 = "5f176695bd41afc204360693f6587b54c3daf579dd0dee798228c5e9be09e816c9633d1ac0d92fa1c5ec3281354fc83e07c9406625f04c7331e0fce56414b7e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3e7b49261d343eca5fb0828d7a5b6d298222e31066a7395d948f34d597642f1580e93852c2824d40262d142e679dd2169a05626721ed7185b5d0ae31759d2b37";
+      sha512 = "724622a046e95409f1dce53ec389d86c6bd178f67cc4cf3037a5cd924f7d47a14e98e75f09dc0a7cbbc3332469d2c0a11003a3b99f10996d64cfa5c0f607916e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "e9eb9c11cec68272ab8bb60f0f099c81e4de395736663f47a1221ea089ce651f844c16e3594b1ff39c8f60d3a6cb40a28b08e8df1ccb2d458f138607c3020aba";
+      sha512 = "c563d9670859cdd0dc58242a3c456d5dcfca041135d5a24c2c5cd26e61a41ccba540346f66a48cae0da67ee4d6e2627a7845d9cb794cb801f5a04523af15edb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "e94899aacd5cb5d893482e99997262f021a8c4670f5696999d78f657d7f6edf60c4f9373efef9c20bd552d7b55cf335e797a6d0c7a975f7223d40ff7c27ddd65";
+      sha512 = "d6695401cf7e7120556b93aedcab43e5cfd4988136fd40591f9c878b708ba449daa3a1bafe09a18e4ed51053a7c6f646a29e94438628d81f409063e48ad97a97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e118054c8a2673cc771d4b2a3f9e4db4195ad487adc51a9e747545271bea4abb241ad264e474b30a03f88056477d0a26a3efd145a67ae2b5f9eb771d04c946e9";
+      sha512 = "7ab5d656e411be7b94d75d61887a9ed231c72b1f58b72f803310b000092c1f7d284c382a93cd998d64912a548c01785284c1d10f37359facf28ddc0f77ab5584";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "fec6a82125d6c6d9c42dc36e18553570717233c5a23535feb8264a1f3c4fe766bb1d21def103aaebd92942d0d957810c3e3cd7dfae9c94432b306783855b182e";
+      sha512 = "f1d7c8abc9b9ab70c4444a5a9d04ae42fdaf04cf3d865fe23e8f29a5713967385122520149e6e0c07ba54d7d376c654d730c671b027de047b77c584664222867";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "376fd767808b561233b14d65fcb39668d66078e2ec7f77005167f505a7393cbfbfecb7a2b643353b4dcf0c06b736d86100ede42d235cdc1983b31648cb683530";
+      sha512 = "7ff45b4c97399f451924ed1eced10e02fff31d8f0718eef449eb52a7bc7ef62e90b70cfd1796cf288e227b1fbd1a3e109c4bc085b7a3e1d2df5a90291569722a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "335007dbee3221ec42fa2dec5d7bfe4a9b4b614eb02d83ba6cc4c37abc6df1f9b5500ec65b326f06fb4225c65127bec8e3ab5d6824285c2e76e6ba5248d0a8ff";
+      sha512 = "b73283342298038102f74c6d2fa3cd947b9f03fcc2b8a7eff77b56e9cd6b0ec6d8476f8146fea510ec0ea2de811a61d8b86db0f412f4625325ae78ae9579d3f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "dc587b11b62269e6fc1b02abc4eaf99ed1121f1089f5c42854fbe55abdba7ae44fad1893df6558313ce0c11377b47937bb3acd496106411291a9b91a51947ab8";
+      sha512 = "182be98cf92c1ee0d13fd7bc8840e54e4a2facd450f2dc9437af8363e202628ef8d5172af7e38ae674f0dfa7e1d216a9d6750c62e574f73f6f61bcbd370f786f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "290d192cc9a46b95494e68e1f36c57d6c790554f3d1f05a66e8737a0ee59e26dbf53381a17c17f85c81a674292a4b7708ab5e0cd9f9f4ed8d21eec3bcdab0039";
+      sha512 = "bee217e50d42495730a9b861b07eda1d68f761b87dc2f3cb3f4e174d8179f65eb8e00d8564e8795ee10b736db338caf0e19174bde043efa8c5fbdbb12db55394";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "9ff963c28b5a1452c9e08ae7cb5de82991c282c7e5a6621958ac4d797bd74647b9048dac9e34cfe9558cf16fb1bd84f55373cac7b1b336e2f65b4d9635aad3f1";
+      sha512 = "e2366510cb2a0929689e255c59f029ca91faccc12ee92b42f6e9efb96c3c5c0af941be2b366ad6bb17c1c64fd3be18a9ec02ce2fb0d4a5e37bf94f3c49ea449f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "4378e5c31835efc3a7215ca74d85408e583e00c8979d4a3e5026e506765b49448d009e8feb5f2a2ba27d7db734d0ce3c0a1679ef1fc330e1637cb764ae7c8578";
+      sha512 = "159186c8e0456900a60b1b896d60b5d476f33ad330ebf926c8b36690eecd7b7bb365ef4b9ad2a5ccc0e3ddf635a7d6017a7ffa7919d1daf7d15f0bc4f7897678";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "da43aa7ba706d780420cda16d409425be026950a7c71c43327c8271fe6ff13cbcefb179cfdf3c1fe79cceae2d6cee6f9171697fb3bddec3b5589b8b1881d7a61";
+      sha512 = "7a8a08f3a587e859daf4f385b8abb5d83ea23cdad7797661394bb39bce04581d3c6aac417154ff9eb0f842a8b9b6280dae43edb8ad559586b6215d1e9a1421d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e31a35622a83383f00fc9defbd9d8e39e7819273d0698f802960adc094072427799254ac89f2a4de42070abb1efbc93b9298b4c076161a9478064aba44ca6b05";
+      sha512 = "471d8a445bc80a0c091c1dc07314e4256262299e7080656b4084225d7843dedc045cc30623f2d163937dfb5d2938564660a161c4f9fc0ec217e1238354e991b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "df75c385915e6316d8a4f9d04b4092889636e0de116fc2c33439047ab8340c3e17f87ef23dab3206197a2d807123f62efc61421770583e3f48268d67296cc39f";
+      sha512 = "968498b4db1b3b07532a8900b4f4018339ff988a13492bf2407bd80859abd927d571e86dd7c5363556c510f3a1559479f4022060f77bf62322fa8d3f41ab2901";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2ae471d5cd45b4c2c5af47df903eb550d2d68910c4086767238d8df05027e9221a3619f810c816d1079dc1e0012bbb7176b9a690d229c8dea6f7a088b5fe19d1";
+      sha512 = "7e1e1a8189e76a7bd1324e680488dfc5d5e2c6616b0b8c30d9511a74c04189e4e20367e66ea75dbd3365c339ead9f58a4c95553590bc5e09f977582014298dd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "01c936ecd336a2b29efd4a63c9f168da42a920a140502c3d5f160fa34f14e62b58a934dc5f102091999768bc2c37077acca8094219462dee72a91ce113f44bec";
+      sha512 = "b713c0fbdeff13b0ef0c1cd45ca5a5b8239afdc4e9644399d69993a01c5a6f8e7fe935c8cc45d98567b94d7ff3d4fa0e17cdf16fbf29cb1618d8618a5967daaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "af11baccc3925a2c877e5833aa0ee24673dcad71faa4e25020da1a62ec7fc3106036c46780fb48012358f8198ba6b56b7143e772427327c110a14c78eebc5b83";
+      sha512 = "85e9aaefe76edcb25f9ac86a90cd44aeddd480842382e95c0d95fcb3d05ef3ea7dd3861ff4796d4a3b2213d7fd94cd02136cc409cf9cc73748a30b97b882406f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "b84b2ce4420d4ad9e9e2417dd8435645c67a133a9594cb39df81c63e60e64c9cf33faa2b04b63e508696596185dbaf276b7e08dc27581f46afe10564ef31ff49";
+      sha512 = "a462bc19b39678309fa2efaeb08eec5f10b31eb2d552ce6c5c906643d13bffe152035269b26edec6674b0dd56f91c82b7ba56734fb99f4f65561bce4c76f0582";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3019e9b26b56a82b08046d3430556eda6ef22bfc576f704aba6a4ac9decc2f317c7a3fc0b1681346a7b9df7be335e899e123c50ab2b6ff6f743ef804a34c988f";
+      sha512 = "538c0985685681a22fc6ca3bc980bbe0401079b3aa313eddc709d7a98c8cd17bd3ca984734ef24266099549a75ba71bfab0459734634e6843c63b13dd91996fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "40af56ea7072beec4893bf9134e16bd5693081396e7cd135e2e51c6cdbf0a7e0dbe6a8a02119a822c71258920bd42ffed1d7f32c0a4cb5cb2c4f7b749e645184";
+      sha512 = "e0e0cb40842658c370ec275726f7ab1dec51d0efcd39f9ba3b3a95daed2e8e2b409e3952ed0c4a9ef2a40756464113bab55bc10f9f3801d8407151e8e649000c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7934f158163a28de2c4922f690c479d95764c36999d5df45afc56589d62c93aa3d0587535489acd0a2ded2c5ef9c084cac6938c20d08fda91e8fcc0b03c057cf";
+      sha512 = "3bcbf9f2b943081a957cce922ae56d636e23c5fe6b582ccba468da0a337cd1f1b4d14e84f8f971cc6bb65d61269004f2ac53efd30a9e784bc432c37628a86262";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d7c383bd900e3a2910d3ae599a582b5e6ad26cb6c93618a1c4c34cdcaded45873f995c65805b417da425525b912d6e883455641a844aac21a2471b457c7a608d";
+      sha512 = "9bbfcad0557739cec12539a36e7dcfddc62294ec2250e4d8087d44bb461db45d0511a4d4a31e968e22912c84d4b5e5fc1e6f68418c935b9d31b02de18c0f37e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "48c076fbda7a15e7a36bde08a8036b6987f7450872129506adbd90ae554db50c4d543289dae5260f2358b63192f06e06bfd964a3796caf41a2cac393dbdcb9ea";
+      sha512 = "d76abe1a6a98901488b80b60dfd1b1b4118024ce3f860d4d6fbf371684e335b0138157b26e02a95c7eef0bc677ed3a6e32eabe198248a2c50febaf30ccd3b60f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cbd6c317d82a2f19d266381bbaa9ec7d7db0cf9c665d9407c36188f95d4e45a1c97df15b62590be8dbf60347093bef95021c55f584897ade06c3c3cbd111e18e";
+      sha512 = "a0c0dc00686a3774d74311a04860d409a4e82ce79df57adf3de6da25cc13ff054674ba0c86eb36b0d3a29d7d4a3978202f4e86b18b8800e6af06e68d7524edfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "96a88afcf2d3b20b88c3f1550b623dd844d6f6e9d86c4b55af5d857c11dc57b2000de3fa685743e465ce3b89288eb940a3ab8984847566eea27717c8d94385f3";
+      sha512 = "c4f9b3e8fb475403a3b64278e4f2bb6e216f32d05077e837fdbfe11fdb4aedc8e7f3034f112295487a50d30b5c109445994ae284abf96100ab2c756f33c9a61c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "f6b77caefeef02b017ee434b256349a0ad954eef10f506ed95d82dc56835c1fda70431617bde9601057928d6c03fd98642cb84a4be81a6c4cd0a0de418f893f9";
+      sha512 = "4817e979a82b22116dd329ea096007978e52513aa6b6ef66fd4d38fae352873f8a204f1aa545549fbcc6df1a91bd07b74a27735ccac49712793ce1fa88f14054";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "746d3576912f8820fac11335efa1289011aed4681d2725d9f0d1c48001e06d01bdf704503bc5632061786e9360a00c85deabf905dd1a9e48c2fc8ecfbe32d6bd";
+      sha512 = "b262aef80e28385c8caad05a381b3e086abf509e402c639215253f006ba773b70ed4592be1f8a0c2f43a82f453a67910f5fc5305f702efa132e4cd2103df3407";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "1fd8b03e844fa4bd010fab41a36769bd3ebe2d09d0b4272d626964e175afb6564b8cc05f7c7c2daf4451edc468276f0d9b69e45d37106895efed75a8284ac288";
+      sha512 = "1dfabf1664ceff2000945e86d4c7cf867f86586e440462275e693194ee25489ef9ae50de95df7b0a2eb76cc1370f1c345c9ea2d7f68155faa2d08fd1694fc729";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d48b30585b56ffa8174008dcd8f6c5f82269ca60990bbf5fb327392b4cb56df086f1a87e8027f6e523c36905bb99d9f136450abac6354b13580ebe6d9d13bef1";
+      sha512 = "e84e9eeda4c98a7729e5a2efda377f4010d7d403400dd5d21b65078ddf15fa9f86c2b64512a195d8072ca9dccbea49e9d3e7b96d8ca391cb3886a204e3e5ea07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "2ce189f455c839ad1bd701b6faed3dc408a74b463b7282ee09ed01f002b1aa105f158aa25e8b6dd8f26c90801af300961ad025ba4bdd9d1d588ba15cb7fff897";
+      sha512 = "3c3088d249a72c565fed6f6998ea558c65fdefa654bdad5bce04e46aafa65381f2972cc4a12b2cad1bacabe9f257e16f91b08f851c8a3387dc4e0ae842528375";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "be2bda3d0b6017b777b078a0c85c51a77b8400132d65276c65721092f9c3602be0b9c136d630665e063cffcc081246118235181e89e41dff4edeb218fc03954c";
+      sha512 = "329ef21051652bc5d0fcdf55f2316f2cee19c16ceb33819e03c8b50622f86487d5bc86d5cc63fe588b2b8fdd333bd11e05a1cc36c555049faaa02dc369fab71f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0895b75497a40fdcc28663d3dae23913873d01ddc5b0c34192634b0704c7d81512a43306ef8ca25190f7b590cba8d753c59afed151a5761ff18ffca45b6623b8";
+      sha512 = "ba4063f13a0f1645303b15dcf25d7592983f42d8568f873d49cca6be7a28d115f483e6fd09e4629510b6960a84fd5c0d999b93138d1a39dfb7783a65eff0f068";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "dad44023860cd62bb141467ba6eee2624a5184c2a26cd42e3564055548bc074db34ca4aa4f6ed27df02ebd560deecf814e640174101043b1a65f2390b73ff0eb";
+      sha512 = "e41ea2b85f7c5fb1e46a7df01e90c7a570b3d026be785fa9cb1550770ae0cb44c80286885d6bd72b20c373ce201692fdea6548a6402cb09ab7ccfcb824702c21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7e4a048f64646202b34b19731dd0923f41981b2f1384a7fd2fadda603159d724ba02e1a07d9718a8264a3975c9d778b7ea0c9ad89a8a57032b685489c2bb2b56";
+      sha512 = "2dc99f7e36fb4a01ab79b72a7f55e6c98bfa8e1fa8fb0d682dafa33fb9941a0beda6f79faaa3dc0f8e38766982e39a04b96c9fb91075d08d1a1fdf5caf848e51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f52bb0f7241450beb5b4321554d8d974978ee86913af213246275a44fd2470fe8aa02b1e20cae770298da7381285bf263e3cecce7a59b3b5c4fdec59a03b752e";
+      sha512 = "2dd5dccc3fc05dfd48690424e7d88cb85ddd48c17d159d21cad67b17ecf132c487ddcf129ffd77de14c61f8dce9c297827e9fb77316d310db7fa65cbe23752b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "47b8df4d387f1155944b575cd99a5e3dffdfa241f230c9e76cdfffe0c37390713fa0c64b87f42740c87efbe52fde49f36680f549d953a2977f9db2fef0769980";
+      sha512 = "84d2d507bfb684ec308c35a8fa865cde2b36e8098f85c04008e07c7f6709cd30171dc1519048cf2f7dc9e8306135af485175b192921df0fe4b3fba45cb00f7c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "bec6e7592df7cdf1d44b4440a54ce3e7b968dfeccb055952efad14fbc0c40c098cd99b41448fe4d6257cb2f292be0bcc2e3345b851686ce15b5fd1e4be3e1396";
+      sha512 = "7615b6451a0982250661a3ba499659c5fd17231889df67b885b2168060f83699f96473ce44b2e3ab3b6464986038585a899acfd7afa6c3261a4c7c9361b7ebb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a26868c2dc5b489a6b6c4085d61d4ac194450f0a987751da1d43fcac4f0a77f4f2feb158730f129d630fc2d3ad09ac2dc7c21a98cfcd7ebfde4f7c1006cbc9cf";
+      sha512 = "622a1e87593f63a4908144b784caef9995e6b5d5351748724aef02b1c14ba25ad5541365bbcbc3f6f230655156f9fda86ae81510c4d5c352555bc7be82788695";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "003c7056023bf71f3bdff0da37f8ae66cb8735598ad6ffe71758cab1dc51f9fbd6abbb82f94b2d783d5298354778690e118977b324f96b7ef4b77870226f6e6e";
+      sha512 = "b3983b779a2336c19f3a8ef78228b78ea623c8bc7dac7062ba9fbed73b49eb62a1dbf5283e22be967930dc17f11abf7fed8ad4a9025d158a783349eeba2746d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1ed62850e036d808e121164a5ccdab32f2c8a25b14b06e6a57a869cb35912a9c64ab61a56820db913612317a3bc0ddc93e2d6a8b1e0b43278aca361742f16406";
+      sha512 = "595684c03e6664d9afba2ebea6b621baad182791f5d365e4865450559798ebb620cecadc5d9f93c99bd635431879c21dcd942611589ec1ab7b6ef1a46b92bc19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2cd3d32932c1243bdf58f1ed138b23f9e954a393f43539e9c01fe4348eb67efc1879d803d1e566dda3317b87c1ed9647c542c45b6c31c9c795fe696cbbc22292";
+      sha512 = "c605eb65b20826609b3d3eaa3fd41a4b4d0aa5e9c76a316ce31932e5d627d7e50df7d0284381d108790a82385dddb65a2e4b27d04f2d3ea7e168bb96b1dad5ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "b3e81e97920ca93902e7478ca749f9138b2d8974cb7e7d2496ad29ee82c40cd1d7c2230861d02689ab4ade9525823e52c7c736457cf1c3279dd1ee6ff3876f14";
+      sha512 = "3d57a416e7dcc74ee89d8fb5371b1fb0bc2246999a134ef027c66c70d6a131aa5972c00a7e6a4f215c05712fc616e998b88ee4ac5e7bef1837aef31b4430477a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "39779c6af211b751095ffc93c8ddf6402d545ae139ee6f5a492ed8c3b765cdf9ee626045cf189dc908f4599bb3054cbc26e70e24fd66fdc7d44b3e8631f93e7a";
+      sha512 = "f4eb7e97109f1f4a9b2670cd60e00a6cb02cb6b7717d5051738a1f197f083c480385642a3134ab382df86a216613586ed2268cd9a1e6554d7986c638486f2f1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "049c3602b06b9fc825e91ab51a7a8e1e8119e88cad178fbe137cbdbc0ca6bace8a3192970172e757bd10e608a030b5f5dda78564fb2269f2468661d95dc8daa1";
+      sha512 = "824345025c9980fd43d750c890ba16c2fcff2a6ce0ba124c35debb69183b92040ef4fc862f6b7bfe282fc20087e0de960093eaf6a95d5e56b8a4ae9ec4710948";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7c4bbdc7edf0d7ab81f3ba959e7ccf9d9df5e6f2f5068e23bd4dd9326aef3124bc95c2f70374853a2ea3816a6d94d6c30db44d81e2647ae5bab8a84bd24e9474";
+      sha512 = "87a55eed53878401f0a11c73fe8afb3d45ec4a2ad1779e230b6b43908ad8c0915e3ef0f923bab911c530e0b110fcfe18893480b8e85457d037ca2f9b7e838e50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "67aff8c6cd90d9da7a3ccc84e17f064e57167c7fb253f919a1a64403e6f8e67c6ca1a578a9266f9ecb5b70c6cee22f413df935dd34d2ec349f364a69d843d9b2";
+      sha512 = "7ffc03f7ce3c44b185bb0b443c3c7b8610fc7f155e71b829553dd4cb0ed52c59bffc0bc0e7bfaf03ed7f4387e9a4dca5c0560d993958fb52e91d1cfa62775386";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "7c2248656469859d2dbf880c94b4bafc62e62a8c84cee589b5837300074ac6cdf95798f4b9d810178abcdb1005d47df6681ed3a414b0b3ba0a3ce90c9ddc53fe";
+      sha512 = "a46338a641a8b31a8d12fee7afb67161b467f3572059d5d44ccc2b8fcef44f66e7bffd5c3c113bca100e9f72a101f50611cf5eaccb6637eb90d56ef005671de7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "f2e22d21d78cc09fe834b2e3ecfe33a648340ccf26c76bda307a1842e87d9fbee91fa86a6dab763a477602559fd777078e507445542099885b9aa9859fe56d8d";
+      sha512 = "b7b9560ebf460368d76fba33b0685ced7ee3cc2b9ce7035eef413a2a22c71e401bd64ad5dad3fce92d3141305244583bcc4c64a397491ec4b2b18c69ded60d2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "e8d45d60913daba14bfd527a6e59fe3b2c028c47425f89928a4933443e3ec608ae744db50326814cbe716a35e632cbaef8573ec523d41fa63cc1133d12227b96";
+      sha512 = "7ad200ce8927dea44d2dc998d3f80147d4b580cfea2f1492ed6176cbc6c7ef8b1704bf3ad631298c119dc1207d92b44d2cc9213db7c03e8c01486e0fc506c0c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c2a32a8dda48dd2e4e01ee23231788188050550c44812460084eb7dd09d042e3af0ae11aa6bacb671046be1effab018fa0a4d601e583910c4d8c5e269963e763";
+      sha512 = "3f6c83edbce8551907ed669c21d0d72e8279da81c28609e18f2be5b0bd44fed7b08315da8cabb5056238e921143b2a4980098ce82ae877f4bd50168c56bbb80b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "45e996b79bbc96515b8d2e767a92f25d5814fd035185e34ab1b32d1f319b908663f6334a1d95a0f34550b9416d283d152feecb47f4ee50b40560cde226dbeb3f";
+      sha512 = "bc99e02df22497b3623e47dd1f05f2c08b9517fe9c171cfec899f9b682c4bdb8ff900a8cbf31891c8db74ac7acc7204fdf54f8e8b5cc6acd17440b168b08cf00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ced9591c578ea8b335b01bf3aee458ae9254e1c744f699789fa54eeea2d8918dba4431ac65369f86e114f2be597395bb34e466fdf5fd291b688a00d99745a41c";
+      sha512 = "92a7f2aa34065a7a5daa82f8663f9eca5878723ce8f6a169cc34373af8c1a04e50902d55cbe8bd23da07176118f869938986f1547b429318aeec96acaa2dfe36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b560c780dbd0776f4833b037f81028ec349681682b6e575229e7149331026356411bc13ee743c0037fd38c15bf86da39756528c432cbdb036487e91ba9eb714a";
+      sha512 = "cd1f367793a67fc8dd5b9df8a73de85553e3d02007cd1aa5a90d156d82cd6612d7e6dac2cba3567e1892dfce7b2e507b77fe8a0d191167671068f6786624675c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f967733b7fc05009d65387e7bb185f64ad33e8adb659475f4f995f4df686ca47145ee841390834c162c604b27185ecaa225c9ccbb011dfd007355f495403d892";
+      sha512 = "a5ecab1f3c46264c76e0b631118c02705adaf3a1bccb92c6c863c971b602b80922015f0c1fd5c0448cc44f73152719fd94098b3c964d6aaf7da5e0d30cebc2ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "06f27ac999ade5ccbe214052590aead3c7fb07e93348b10632c044c0efa4bffc1524e72c2e96c4d2ab1adcc112900f15f36f1cfd943b52718be6c78ee718c1a3";
+      sha512 = "e94b95807610ab67e47e544f76fb6d411d864c33ce07fce4ee29bee101dc68f402855ac983094472b039e2c711745138991ee97f2ea00ae0f9e3fd59d19b0260";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "13a99f40d7062438671c1f1700be98b88b2a612aa88ff546e9c20031e5e3c8d2ed78b801468c63312d82cf91bcafefe48995c57bb2a90c113282b843e0c5c93c";
+      sha512 = "c3203b20feffca9181b7b0b5b22e1fcd31f8fefc4d4fb1a5029ec609fd2545f702cb91bc002d5cd4df46dd353bed75afab40cef3cedd37c79e002b161a3c767e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "15427ab80ea609ef48113ae08ffc3e7f43fa375c84d6028b361a38a128a14ace80a974058d1b748f31c308ecdbf08ca9bc3e509db7a1e10ba60421247af26932";
+      sha512 = "b1e833c8612a23757d094e92d17c36b8db2418cfc903a8a3b1542d4ec77f606394adb55a6ad10da9422ab69e784570544bd2135dfca52a519935d391b3928f6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "91a31afcf25deb27bb9ea29c1a859c2b6057f3421ba5cbb971e35b79e76856b5ff76486dc449485fccac13258f004d967886caba10c8531ceaa9b9f867cd0c1d";
+      sha512 = "108f4f6b6cf5beeb6939c8d22c75ae53f68d227c6341475547bf95f3423f26f40aa7c089be2b6d789806b2a9e35eba10046410b45ce032787e12aafb2ef7fdd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "527f8f14114648dee8079a066bf5baf07d977ace0f6e7d514f0a494aacc7cb91fa0456f45e43ae167537af5f038ed72e44b5b985fc3ddc01a7f61871074033cc";
+      sha512 = "9f352b4714ff40e65d70ef8e4488a1679f3c5cbd4a18d14d25e055a955a154eef2092cb0d378d5de9da3e16851f57697e3d30608fcd95072156f225e9e6e8632";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "791e69665bbe33ce84be02caf6f3b304a2012affe6508426cc4daf944c6616e613062265341a3e78b75a88c4a9d70ea5cdfd829d082189564a8905eb6007e86d";
+      sha512 = "401ba2a23fc180cb789abd5af3322bdafd65c4bab4f170d7d8f6fd34efc828809491698f8e1a5c217b93bec2827b7222c126479c1a4a96e3c0a22beaf363f90f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8121500520000276549b13b1179e817a7adccedfefce8727ad3cd45f3257dc404d5a72208b8393fca56ba2d00d3bd19e569ace9b14abc09faf971211c4ce586a";
+      sha512 = "235bdb35de6584a144dc7c6b58f9ea4c526c843f1cf973d68f042e99327a578f07e5470377c0307474eba5c972a9f50b940c4008d8de98689482bb76cbd41203";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "f72b870b007c5b25344f384bebb58a4034895d5d7a3f662a8262660f6d8bd4238bf6bbb9620264895fac6991c7d004375c83d37f5595104eda48c4f2df32924a";
+      sha512 = "50562a3253bbeacd68f6d4474fe448b53d7b1a7f3b2791d955dd7a064dfdf1b1bb53c9736fc90c593e5da4a33939f51748c760d6f1739ee5930ae459ac4e4e83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "912cce6d5407107b0c99f44229746207ac901c4a533f887e41214ff46aa41f3618c7acbfb38368c67846bf6be80b9714ffb4dd27d1251e19e538abeb21861956";
+      sha512 = "496f2629de38138c17eec6c9db1d2bf3aae0adbd7802e1a209f8e5b1b3cb9cb9538bdf6fad74189905882e1c4ab5aa3cc1482860864e3de9a4aafbd2ce66d080";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "fd344d214b13dcf70f32438ddf2d4ccc9edd58112ff4cea199300f2d59ebcd6ca3a556f88c5dde4bba9af27cb570c985136fd2aba47ef6d9b8b2455a09a44c08";
+      sha512 = "e34aaf8fdfdf0708ba1fa5f6205a9cc316b6074d3a439b92909229a94d7d55c5dae14554fc0cff27ea1768716133bc9675a1b34ee08fb2a892dc9dc85bce436a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "efb5d9f802448e7d16534a586225f1882d429822a595789ffb01ce92d047777ff541535fa094547a1b8724c61acd5a49ea31f9bd976c1f1d5f637ed08aee0665";
+      sha512 = "f3e26c456cefc519d222c837a2ea5515cecf803c4b215dd82ba1e9b5aaa97c7115ae22e7d7c29520c3faaea7d996f67028872ed8e7d6aba8e5bd1fb6f8ca493f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "c2c42d915ce9087bfa3748c4aa1e2a5481174a8a69b3c7fb675c6e5c528c3ed13b7d85a3aace049c75a434f47f35105cad724a94f0642291372e0dd82fdd4abc";
+      sha512 = "bdcdc0d42453a290a13bf0d420dc5f324d50e2b3ced7bc480c3faa35a27ed94d1fc455e6d32adad31960baef599cd779feb66fa76db25d7a9b0c49a1bca2af37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "8155b335afc8b377e9a4cc12507e0108e02624850211c46e1d9af13488325c06d14c67c12012d46bcb95d0d5f3642a1ddf93161fb6ab0e87ed8a56a82bcb1aa0";
+      sha512 = "8820e66d82bdaffd1c16d4f3aa9defeac9decb85f89bc03a2a0e9ef7c941ed7f499b1681930ed307220477b94c449a9f18c8688e535c91db3769d01ca90e1d96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "cddf96afa80f6935f018b69bde2368f8d4aab03c2669df1df136419e6f9dd7de7c0662530a696f1ff164837225c41a92ea5224c2aadc21e45db8341544c9d78e";
+      sha512 = "6f845a09bcde455d9a39943e44d4aaf0befa5aec65e1e0e40c170ecf9eab8d52e7b9cfb7b176d31b6cb7e96c7f2ce9675cebcff8cc8915622f8e5adbee23696f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b8ccb59dd3723b71cecbb1a3b47083f718f39f3f2aa69d5819f99d58b8a9d42902df04712e7aeef34401721f693e2a30b68353df2cb7f07c0e462708beca176a";
+      sha512 = "bc4bf3a3410c5625649126fbb008743ef20065cf9a36fa3e00f73418b3ca1728e03cfd25c1c97e381eb644bc213313f06903edf3d5dfd91230f9970850c4c6c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "7b2b6da809040f1d0a7b89134a8a9923ff0e43872e5c49a22866db5344e0021722ad38488f11df51ac19910509f854ed7e316f88cb6b03714668e7c580438271";
+      sha512 = "52b54fec39905d9be5ca88997d0e4872a88ee2a787a5bfb77f7f78010b8b2363f5bfeaf8c2015b2a2dbd388d8e27d968bc7f6a67ab5bcfa245ccb9e894f2e432";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "c4c90865c7703935675619831db10a1935cdd995a0dde10db022890fd31b02c20387157d080c7724bd1e67d639c434db9a5a53291fe0a3c97b07083b909b8714";
+      sha512 = "02631cb9137a681a45fc7b74c8c19237ad52ac9c5e392923027842a877d1700decc7e5f17a74958958c114036a2add93ffb610a3c9ac8ce3ab08af1b07cde11e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "30d3720e3ed73c312e3d0cabe41bc95df6769a1b61bb9eefe8da358bff5fb2906ad7199f989242a2a8ad84cbc30b3ea8b4dcc8cea125142f1588f50ceb9551ca";
+      sha512 = "5308c46510ac95ccc3faa0c631f6976b747089392974572390870806b6688cdbaf13e5ad010ffaa680cb7055e4c2d482a288afa7d991d9c52821859b21b70e19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "4fc63a75904ddad55379c7f6c7d6fef3f882e706c4a6d0cf27e990de5ff0fcb5b852fef3777f524e633040137736cfb1548f87f517e52419089c380801183126";
+      sha512 = "6bb52b82a721369ec69172f3529210b46f211bfca71a0cfc7c4db2ab9c15d6ac69f475e420d66ed15691e2c54b1766a1e7d8a277d0cd1b9318d796bd67228def";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "52f0251533b86b39f8ac166de96995e94ed1797effbd74cc487cf8fd42191fb98d04ec099ff850f053b9cd4e4c5188cb64673fb116db1bf18f43dcdfc102f102";
+      sha512 = "c820a0e1792dbb0bd52e9a5514ea0564fec70b685ba23618670f6b6e99de92f50c42b91b772649a67e84ca5f099db92b1434a400e347ce56b1954733ce976770";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6356befb14fb2a1d244df872912fe339ea0b2dc5148236a71a30b3f4120910fef56abae24e35eb871264db93abf1ea045342881f29e8098902935f7751351754";
+      sha512 = "3d8a71e12f995aebb8b74d99ed7b9704143b6320de3d44c19e94a6e56431b62648ea80a295214d0ba268c7249edb826bbf07c2a0f260c47a0f45a65a97fcdfc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "5522edbd771cf7233e8c805d45610acdc9832a4d76a4c5951f8dc5565810ab8805810e2543a66ca36f454e068411e573f73de3fe21e34e6b32a3349de869c9cf";
+      sha512 = "c5086f8606f0e94385d0edd5aef16ce559e8616cca629df3d67c45400bffd5e3ddbf7546b08dc5924f4e44afc5d16ce6b289bcc4a67007d9ad6356253ff49add";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "34a18384fafcd017594b94e8970da2d3521c8d90f3afaab0431a9a0d275630dd64adb892a8609a518217f097a3749ad65db646428cf28bcff5c9d6a03bdbd2a4";
+      sha512 = "744960232bf5d07ef8677f82fcae4454a69712010d6a6c62be3073c8e5826f8e43cea3c2e0d544db8e1e40bad83c42db7914412e37f516d8ac35fe46220a182d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b518c72b63ebea3d30575548e8ce6f15961d0891918d8e83996bee2fb9dcfd01fff9be4340b67733b356f2b77c0308727b2911317832099561b3e2ad050296dd";
+      sha512 = "975d0b008d16d46d48c97810b6fb9afc5a2ef42ed7f324ca285adb8d5535d8d9d73a32f1c2919a5435a14bbf95d89abb5ef1b3eba88a2af05f9aaee538488cdb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b1beef1b4049c8b1c828ab1e201161edec47e3e83da40173be576a17d8f269edbc538882f7d5049401cbfeba409c5e668c1781e2a519b88038480993222f01c0";
+      sha512 = "2890ac9b3271fc10943d96b15bf7fc880217e2317d6e915e41a687688f2afa7821649b6b4cc8ecaf7945d5058e576d127d10663278fa23a78f002ccb3fc75044";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e2c4f71b6a8bf6d33dc76217de9215d21f5f1d1712fa981ec8ca8c203895c7ba94190b7be51f89c9fba03148052727cf76449c6130e33ca2d4965ecb5e4194e1";
+      sha512 = "0295ecb400fa4f60795e731b26174d6d42ec86cadf3b8e546f5180968d6e2f383946de3189070b14de5f51f93560bacd76eeac35cd0c29d6a4a349fc508fbeae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "136d8600eb4635213d58f7ceb0550d821e937275e849e3f1b7dcc7e7aa4b4d8ad497947187f6ff5979ac5bdd2b677c20a2a3eac7029081436f1c6707010055da";
+      sha512 = "b08aa29142418dcf7159a9ae97d1095ce368f244c972022e23369db201c3e68a1b823b29f4e5ebe65aedc28990962d0fbcd2838a9d6c85e46128addb12e6cf54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "8d130eee3db7e528bb6d82870f29fafedf28ef474ddb4a263c41f914997a5e607e048ebe438fd16f687e824ea6917b495563034d4459e1e53c08e613948906c4";
+      sha512 = "f3778bc9dc46c1b4d02e148d64b450f26c388ed3ef6b3d757353ff8f9a97d99611ac6162267053fcbe0eb83df32435229f7b25110f079ab193d6f3faa5d35924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "bb484ab3c756bf1c5e591405fa22232f5e0b32cbaf0c0192edd3ff75e80a9f7773edc506c601f8b11593811c14636abff7a50a1cbc0944b664158543b8171052";
+      sha512 = "f87a23b6ff9ddbc7a45c60ac5d04e1bcefa39f743cb74cf9c701c320ecdfffe67c99a377d2419a97386167e19164bdd0bf6c2d2b5a057e4108cf9570390e4e98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "618668015e76163856467b2603000fed75505bd9e76d1557dd290b7a92da467280ab9ad30fde78f004ab60f883f783faac6293196ed9fd409f9b854e0ddee577";
+      sha512 = "81d792ec070194f4d51702711957a71bc01d69e7737e7e07132ee3047907f7abcfab300d0ab95ad4d50821e95a45d6b3762b51c16e8268132be742caaaeb5a8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "1445d4f5750b9100c5340c354c9b6c67dd2be5b73500c70def5c1522d0825ff808da868b39a60ec509684e77bcabbdf0816666f14b2dab7d5f48c4b6282ec1c9";
+      sha512 = "318998c6585db455b82fd278efe24f707abfccc69ff1ae12ab5ca6bfaf915db8ebb16f845eae7832d88aab6af8ca1c2b35bff504019ea265b938d5e7d09088c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "388da3ca86d5c9ba4adbd3ec90834941e2148c57138e6973628caaaa32d44ac8d18f8f2fc584dc43f0302c4c3568d2b6cadb94db40ab0ff24020e4fc3cb4cc7e";
+      sha512 = "ac63840ba086bec205d7c730d9d9503a0f72976c875544d09457e4fe37f802e56aa7075ac0ebec72ec9dcdc5ce67c99b83bb2779eb6c2bfa981f2e17895f801a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "62423703ead40cc91179eccd15f9b4ffef8072ce4f236d3a1685ce666426f8a0bc670da82f360dc8c2dfef4b927ccd408a4466b7382999604abaea11626f9149";
+      sha512 = "01807e206f1dfa499b2e578dbcc6987bef6d0dcf02e362e13ed845ad7d513e42f54e3f5113164ecf75376735ba4d45496624a283cbb0fb0a69e2bf80943b4dd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "162d7d4ac4baed3c16b119ddc5f3b0d71dcbe7e26a3977ea375776a033a9995be45a2069bd50e8bc378168731c983f36bb8b6b7f5551a1e10bcc1b9b3d471b2e";
+      sha512 = "85cf988e4038f28cee3fb95d62112de2883240bd493e7c03e4a8998baacf428ce529bd236a6fa9f90d764cab1c7e4d975c5d88a876e08474497151a4a71987f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "3fa114a52582387ba51b04729c1c4895b29c33dc743cb9e4593750389cd9d943f96cd127fd2b49448fed527bb1bb36ddf4579ef78502f66925627277f02e46df";
+      sha512 = "16094487fe1b1a49e500fd56f5b175510a07b7a44cb916d3840c3ac42580242e1b121738eb23f94c1dd8c7875ddf1821e8ce8bb2bd2d9ed799391707c168c82b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "62d16ba8dbb06fa54e1f4d6a383959740a466bfcceddeddb19dec45ace022ed272913d4096b43050bfef3a53c43329499794d5abfa9a6e911fd35a0f8df31cf7";
+      sha512 = "570f96ef84b4b12ee4c2d3eeab0bf57720954943696559850cd6e3c1eba0fbaf42085e3c6c60e74430208131c0f6e86735262c4c69c3f0490b191a75b8f91fd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "02fbb3eb9f13a8f340f5fc5c340de563041bfbcd77bc1f7f701b5b5eab6463bce6f3110e962e4c1a0667f3dbadc234511c3ad35718e3d84ea30952a178f56e7f";
+      sha512 = "cc883efbbea7e187881974dbbf27243d5fbb1810f8c605baf3628b32a308c15ba66598617fea40cf22a89990f5690fc7c8ee4f4256019794301ddf49982a45f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "10f64025be270572da5d3e35672b2656f902e896bb3cc7fe24e99b514c4647727308609c9e572f89f836fda677ef00b6a3be4ea4844d966437d53124605144b3";
+      sha512 = "1bfd3ad527b5d668a9296163890f2d7074b236eaea3661e17b39e086fa0a2fff96e8d6aca4b29ef9fbbb2c1d8ce8f7d38438dbd6c7689c1012ce86b9daca58eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "8f3db73e145bb4ddc0606bc8adbd228dec27b20c6bb5227897ece926df2759209966c61a2b67d4e6618fc205616c187dfd9e26e63e09ca761b2c9da3d53c113a";
+      sha512 = "b540ee3505c4b031ed348ff99135eb61214e99ae543de821d84b9f59078efb87b34536308ebd5aa00b1bd12dc311ff769580373b13f7814dd3661f821973e264";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f497c48ed108134f02d977eb7f0f9577eddaebacf3f1d177f95b1e481872b94ce9f6f7c5914d6fc1c0464fe999670dbd3a2935ff76d139b49d529b87adbce5eb";
+      sha512 = "bb8cfdbc08a20a719a14cadaebc50e8702dbab3007e43e6e2d3a951e9a6ad5af00f14f79be133411002852980b2efa37c8dd48af0e827f0c7cee98556f6f6f59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5a827468b04dcc308384e95017980d87249082e894998c77662b4d455bad5e8f91134e9c88ef159f89af974029302249a898ec932e01b4bd4d62c0b79b31718f";
+      sha512 = "6fa1f94847bf81ed7b3f676475ba4e6e7205d03980e4a7f031a16310e2525f15e09da85c63902ff2a5c249152dfef0f6502bb10e9ecd934359d9490f39564a0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f1bae26c1699036a832a021f0336ecfb8b61a378cf62ed6c8cf10c3a65e6546703474924b5f7145f30c2e9a458545ab6bcb999320a04bbbb65022731a23881b6";
+      sha512 = "3b3f751ec9893220e0cd264d9cb7f555d446d12f5e4efbd31501c38e39d3f3dd2ba14cb55ff5b99171588ea6474e7b6f0dbff1d927e3f19bd5a31bcf828b09bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "3df882e3542af5a1a82e344cde5f55f852f863ec652eb66f49e6f6145cf2eab3ea3b7f5a2170e4ad87a5dea0264f5002eb8d74e4e6e1662e3aece695ec6e405a";
+      sha512 = "a3668d643f18332b87aac8f718fcf783d3df063d0eda0a94c523157c7cfcd7da7af676d5e7d6253dec2dd657e4865f60cf441e4bc31684cfbb66f9ef497d12f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "235ad09d75274a5299226a99911596b16b6b3facc19a896865dfda2467d2352446187a1ae6b64259ad41089203313b76d8486c869aced85bf8aeab692b860879";
+      sha512 = "9d9b9327f687b596b368e3ac311d5e2cf17f6e171f2dded66cd09c19661c82a8475843675279359e1af73603dddbcc42c270512fb1b37fb54538b76e54df99b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b038b36b0cc8d0be3bb02b6851e9246bb849ba835cdc160c48c53df9ea5e937e0ed57c1d5e6200b11cf7c751b2f0e5cb69543d2e781852a9ae7e612a88a78b5e";
+      sha512 = "dc3ac85569698ea73e2f146d6945f1e1a863a55150d46e9064b87951ed3eeb8caaa40c7b89fe11644acdb06f610e6200dff3a3a6cd48838962f8908d08d56e34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "12184beb0c93718200e11f17ec53f71062c443881482a2406d558f4c76652e81b2c3c3b9b5750a03a06fc1460a31f0146062e94e6a13736d7654649726c2914a";
+      sha512 = "cd51c26629502707f277b111388794ade3c12af64fdfeb009daa01d676b64940c6155e9f8002b037106da3913125697ef7305cbbbfffdc9ba6701e6f476df058";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "0237960a4cfe37ac6c88b9df34396c19287c9d8fab62ab6668fd5aac1e2277d9c1a8e468379cd8929a5ccdb5e86828ccc0fc4a33e306203989764745256564eb";
+      sha512 = "10d6ce4f1f16d3a1373883911b29da8b01cf746b661f4d99a1601b3ea1e1ab77eb6429393e244c61af52f63e9d4b890f6a8df7deaaa1f2560795c16ca877b952";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "01acb4ca4726ae3ac8daa21aa0acf33fee71777f5dfdf496608afd8bd33dabb3c84bda1fd9c13230bb7b8c956db2409821f89d4122d9fbb29d8678cd8f9607d5";
+      sha512 = "b89d94cf18fc50a6ec3798b95ce4afa46d15ea42871955cc1b46f3e330c06552f9ed8e53d02d55c17c25f62186e6a3c1a6c45de1bc21f9bd7050bfdd4f965c78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b2384c56a236420ba479a8a3e24ffed3b4596e8af8e46b868e718412a05317faa6bc7e0c39410931b31cf464f24300aed3e23c66a7cc3871ed88dbdc31c07aa6";
+      sha512 = "7a34523c801b5332c26aea08263248e5f471130300320c2768f06df9ae5e3bd90a7c547e73dffb789c763b2ab7b94c2763534c9ee408a67680d63052db280b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d6b9e43c73bc9c38e93211abaab22e4f04bb68f31eb8351fdaab6c45bd7b70fa56bdcf3bb87901a569ea9917b59d7054bfeff1776373099268689238136dbadf";
+      sha512 = "a556466c16091dd2107e97bc52b1fea9875e15e5136762a57b71078d6189bf9dd57fcf1965c921df73dddd2edbd435e678f519a424ace1d0daebd665c4364f90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d5e303c5182e218e3e9173483e32160e78c9a1ec812142fcaca35f970a043a08d6ecd8e0a4de1ce06fe58569be456d2e44ec5a3ef234d5ebe4fb9c8521d4748c";
+      sha512 = "558c865772fb9eff258eadce29d2f03d97c3bf98b28d6c9210567b08c99f3532c1d2be534c5a6def292c060219e3d777d052d4e9db9927a1f85e41ed59f843d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "2b32e8f2257a4fa7576bafa69ac00b149d30e1114a0a174848deaf4cadbbd6b7073029515ae1b1e5a905bbd2dc53346507e8fb8dbceb625901bb9dc44da3ea85";
+      sha512 = "cea6b3546c6e94cc3667845a2c93de22068c4abd9fd79f73889acfa8b7d3f5e0af3783c252a07cd5c7e6c0a064c2e7932c4e2736b5f040266140e19ad6697ca3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "53a081d779acd8d10e9591c929c5bcdf6122d5a9f53a9b496556d4a4a7efcfad783ace2a99af5cc11ac295b16e1a055658b1b2cabb8385da2a99494f41280b91";
+      sha512 = "f3a72c805cef49afc1a9e59652698d295abfd70ee2e91ece11c2d68d58329c1bfc490f03470d277d4398b4b907588399d3733e3e907b751d636873b0465d6ca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "473130d04c3e559159c9801d55961fe261b8f45c593e7b869c31eea4c96f4cfc517a35c2f505c8a45bbc62405bc04d9b1d941614f6d9b3dff6eb8a05d50ed934";
+      sha512 = "10b03735d8f98180bbe9741cb26bf7f349b7a4afe65fc8bc0cee0bf61966ddf7be48b233092f90dc829a6cfa753c3e35cc07ed35fdd09965ade816b5f3e9aa20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "4f0661375fd0bdf67356c9b742095878e2288324b23da18c0f9c105c6c0f7d0bd8d4920423f4415ba9b164417936ed8def36fa945538599ca6544abafdade820";
+      sha512 = "4cfb064e57a3e90a4719cfc38520de2365bde3d9c0df17a34affa7bec1c19e7fbec0e3f7fd233331024706ab474110ebe9059d4ed6b6f1575491579f47c4b2f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "cd861dcc4e17ea389a42deb66feada2e614e91eaa8f2911de2c7e7fd66257759f937fcd96b2eb976ca7c605d7ad37cc3648bf67ec944fd93407ab9918553a6bc";
+      sha512 = "b6211e70b039f56f4b65339487fdde03c132211c0b362c6df2d7440c15856a946944e0a583b624b7e928c39a63706dd495a06a1ae088d2ca484ce79e5fe9c795";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "f1c0a5ecd076df26dc635bf0e6f6f43e4c00135f914b9393462efc6d969dd6ccb662df1c8745478952896950dbd216cb4dc88e0a1fdf4608a926702eefb4d835";
+      sha512 = "5973e89146d547f8cb02b613d54f88d77e7f00979f8f6c64db276313e101867f6c27a0e7d5bb7e894a6dfa8e185c467dec530d4e7baf9aab839ff34a811ea84a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2856270b337da7de6be743e3ec3bd2badafc14920a46d11e2b260daede010588c9634c2badb7b402b0247fb770f8b0c869119a1be8719487689ff48783c35753";
+      sha512 = "d9a3fd7752a0a1431a46ae385cbdd331cd86e758e28b994604135e67bd562baf5b9edc1735fe1d0681853e18a235cb29c1be52b4b951954c5d6045457b909b31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "95d8a14c884976c31be1230cc1f08706b8f1032d6727b0a88eddc8d9a2b1941da783d9113dba9963f5a3615d515a7906906779f8dd0d445220ee6aa633c2f6c7";
+      sha512 = "b6d6d4f6c950ea05680d6f9c5c247ae11c35cd3b1cb2a0429410f2e8ee05a7c2782ec7f220215f8dd7a5a2566c4bad05e6bb6c913a01788f707d8e37f9b9c408";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "c8f5706cb28419c2ed311b37dd4391898e5ea55cc70c3da9018eeb104be696d80e9eb6e22467601e44b3b11d48695479a9448b97b06a37b63d042f22056255f1";
+      sha512 = "472f6f670643baf59807eea9fcb171c61a305caa917c25626277d1e7a723e667f1ca5c1cb07b3b0b9cc3f8b50ad4d67456ec1c3214cbe813f43be5be74d90eca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "db68dedeed06365f5378c91241ba21474fa490234ee2f0e8ce8d5439879bc7e79a6b8a81ba4883c5b6f9eeaa86c8fafb4079681eda5c7c1de13bdb7a6587967e";
+      sha512 = "44743e46e04f5f175af5a6404c6f2702818167948dd841ffd2f9eac88622336af6943a03cd1e615c58c6090bd8dff8a08b967d7f6dbf781f91d551bd8b687c88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "d450c55f00b33546a37cc96b2daad0ff9d9bd74a4c8219fe2e584e683a813e328059851bad48f597c60c0e5afbd15ff5f2547249e9318ed1a4198f8db43ef653";
+      sha512 = "5da4efca4c9c8c45328afc78b24e6616ccad539127f94b8fc3525aba832c29d6bf3a54c9a964562d804a9095314ffa7e2daf67d55a0128304607e98a75088adc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3da1c044fd4abad499d44fb4e30942f6e92f0bf5b0bc98badf4cd7a4b63a62bf7a6752483964112bbc9fad91ec87ed40cc64fa5cf9c14edebcce22d78600e352";
+      sha512 = "d78e51e71b8f309171f1b78fa5c2ff9058b92051c0651953d875d38611d7180bbcde18a71d54a257ebfa24df43f86b526c92f73517dbe43de8ec173c33730353";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "69090fa168e4acfd16bbf9c0569b2d537570cb798b8d2bc5da26911c1030063ba0f1366b6453810c31038edac5fd6fbd988efec27e923d08ac61a2e2f654be4b";
+      sha512 = "0bbd82629f59d71407477608475d0773851615346ca7da6e338563eb70c18e7e54795c22ebf4d9cd965ed956ccead2950082a0e9780b13edc6478df985abcad7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "86bdce82f04c68e32e581d32ea1dda301e68f39a93d762d4e40a85def20490d54cb62ac4baaa4770236b098bcada9d9767f5a6bde263968919eeb2063e5a6fa5";
+      sha512 = "1799cda7b7f040a0471681891769c16c8b17e6ebcc6e037da0a45757f1863ed5a5def8d07d6fd4d172e32ca2de6cb45481bb1ccb8f8c2caa8d3b712ad4374466";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e3089af377c2f5faf97934e40e6abd782b4b518abf1bd6dbc9655dac192523051f11b1e7a016465c76005d42cf5382c21ee02ee65b80cffb00384e0b9f0889e6";
+      sha512 = "7da281d3e710897d7af9fe2b384e73b27e76af5ce5224a12cbed81400380e506e5fb17a0d91094295c6435acae942aa423cceb58ed97bb52835ac375af80410c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "fa001a1a31036a26dfb3914a24cb882ca3d5065f0687e0bbb4e33814dfa16f5f8f5d9cc44d24e664be7e87a7ef9fe21d2111859150bedc6f30d59e3badf9ad43";
+      sha512 = "4eda3e69ca5ab51d332aac0639de33994ba0b42fc244d191a7b1c6990edfeb453151de7c1e746feba1ac6d7edbd8c653cb29db76353175d687c0ef46c177013a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "629a28f9a05c758e1d748206cbd81db22fea7f847b16e42674717ec8ea33c035649d82a9418a691aa31507368fa2ab91590cae207439031703c1a8c8382d6a7d";
+      sha512 = "eb7615f59583a95ba013e517d42d80c5cf33362b2bbc6ec6250d17a0eaab574d72bda6970f38177791a93088eb5f8d1cd088e46faf373e323d9dd4772b12e8e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "5f5065f0bc2a515daf388f70d503743fdd2d55006b4bce58c9c85fdb06644c729eeff3a2ecea9b2a29be1a0f94147838287d9c7624e44df60014a1a99990a050";
+      sha512 = "be72ad38323c545fa7ddba6d105dc39eec6d3fa82fbbe1c4026c0087a555b77aff2802fd4f6c51a01efee78be7652527b759373d920f2c403e9f9db784a66369";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "0fcdcd5a965a8cbfdb1d0fab0419588b63b26216f65ca206052c0e36257d6b6d29a4c2639a0f8fe456ff8458e60766670a022c84f18426a60c3f230282206d55";
+      sha512 = "200631e7d275728c98f02da92c82de33f4e6d13e3b0fd2537c6395d3f8fe84aaa568ea3b8f2e63fefdd64e830e0df9ed10ac3631581c05cbb790f745ff9c4fd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a86b3ed1e28aab56223b1a8ed7d184fb526b75fa27178eedf676909aae0931cbca7948870d50966b08ff7ff3c79efd037ffed31a74f89f25d302c2fbcf8d4952";
+      sha512 = "0a85c88096d4b470b76c9162a5e6ee9e4f8f6d75cac8515b7b76c3ba4f8cf571713d451aa54f5608ae38bbb910c4bc13c7dd870060f82834b0fd1bbb64dfdbe1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "8e844efc0fbaec678092e97594aa4afc57b40ed6f8b38685a680aebfa4344ea6813a2bf2a93452e9b24683713493c5dcfb8414ecd51f9e2c334b1a5aab7b447a";
+      sha512 = "6eef06306bf53d92f33de53f65bd2c06eba4e2bf86b112bc7d9e90555721cee051d071047317d0e1b9b661aca22c71ebd553386bdce70c8a1a8ea35c14710095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a74566955c633d173c9da3c0300e8e8e327fc6fbc063bca00b934a2ef8dc4fb75e993e9ef263f2aa4709ba90c33593e990cf2fdb0d6a9fb944145c31e7cbc667";
+      sha512 = "3f3d4605a043dd32d416d55c2a6572a82f311af38feac305392cc0fb5ebb99c1c8a8513baa3927b008f178e2655c3431df284549fd6674186fb28f4eabe417e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e7cb5bc617eeba0977a749d5cd16f0787d588e73e20effc0a755bbc85ad9d3d422fbf0114a290a959202b0238848f7f525de8f58fda0035755acaf405fe5fca2";
+      sha512 = "aebe22d22150ae7e539f9761b1b9470b840e8b475510aa71b2256edb0a8de6e041622d0920b64ec4ebad0f71ed16e11cfaa8496b22bfc212e93a4f7727fe0bb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f97c705c1973122181052599a81f44710d0a1a9a7369384993b2636653fbeba2fa77a30e2f13e6dd359c6aab28d55a3a0551180b4934bee35ca79201b90d4f23";
+      sha512 = "a31ba99c189d2cc6dc432f5cf707390976e0f8b901bf0adc039eed276011d825bca22d2c9799b87b729baddb086f55bc2a9579929e1f97c6a5aea7917f07e01e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "c4a743e2ef548d26e0aca8392323c63d3a55861e5e9dd35f1b1c7fc4ff8b44aa54c5fb9261ea98b0a7ff4ca21edd3ff46e3b8791fda9927cacb9e75440092047";
+      sha512 = "e8b349efc6a322dcaa9c896d865df76f940eabb7c9157a9ef198159f7c92cee593a46e77c36a6a85d33ad44aa36a0f6fe094e2722883a84bb17d61201b6f67c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9ee0dfddf90dd63dc1069f83ae2d70fa4ceede0ef535369aeebd2629f35b3c54bcdc05ad337910d5e860c39ddbdbd82d3d6c3ac979ee835b16cbb99705594328";
+      sha512 = "e388c59cc421f2cc409642db6776a6cb05177f16c0878c7c07399fa311939fb2b09b5c9a50b57f7425c18f375b25c93ecbf6be0b44c4a534482574019c6e3d0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6ecf4202844494e297bc6232d05e9da34dd11ac2a3a19d7014ea54ad27a2accedda42c31fad1144b22f9cc839109deb90bda9592b4081a5ca731f2a5aa5c0237";
+      sha512 = "b9bcdca2b82d285c1c51054666744b9710fa492d460fe0e56707c5a92fdda013efced781ffe8774df588c8c4d1898a58915171d4317f37586dfa341bc27919dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e772139fc6618a7fad213c710582fc9bbc3d63ef364e83f92ff72e66d361e25ab2af750df7b8f53052ee9be8d5ce10cf9883c64f331a219dc3c4f4a633c53ca9";
+      sha512 = "9848b1a71e45d9b741a239cc12c52d22df1d663f784a3491174df75a479bc7eb610e913e49684658256464dd9e5cbf1a54be07fb821d4de1727614ce30f934ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "169abcdcb9e67b1a1cdb97398a688f0f432c525480e1cb47f7bb85f0bd9cb5fd2c58d8511e1e5fb44e93ffda3917abb34b5babd9ba4cb3fba76cd962eb6da9c3";
+      sha512 = "4e28013a4966da67d01cffdeb80da6cf530ebb093dec6de519914a42d3d1fe46a3543ae6e491ec0ac1e67f1d705756983693b07333436983e446a347f17a39cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "94ceddceb154f0fa0f70b7febf3a8741d7fbf85c2345220f9f3afc26622118ea23d4085aaaad6c1be92a01ef5e8c507d4035b70dda0363ea1e362666d3aaccbc";
+      sha512 = "3e54a685ab48b14b7e98a140027786973dc855bdf70466fdfdc9fff646c3c7331a7d3f569dc94ff268e8a4c42429c0991d227734b0c6497f8778d908eaa8b1f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "4c59ab3169489e9411ad97b23116232ea9dc63337bb0ab31b36d5051f39c96fcce3c5e5e23e7ad65cceb93f21d2a194f46a2884e639104fba6bd0e2b89e74592";
+      sha512 = "0d6f4df0197b5a03353b33c1d2201e43092f667340b0103fd9e312440425dd0c482a1ab1efa0be194b93d9c5002b6b2e96fbd4ab5a13fc7d967c90cf7c8fa976";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "31c31241d1b93fc5b4e8a543b248b92e457e4c454c0a9f2c4a36080560600c331ac68baf2c56b0284547bd32082af6a7bcb5e217f2b0e82a696411a8a340b308";
+      sha512 = "3e50a9e33836069e4ab5e368ebedaf7663ff26efc7a34e3602c3a099402cf5172a984669f579c2e24f65ca61a766cc0eaafc2d78713777cd8796bc77187d7ff0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3358555e67ee43160065b0b0a74ac76b0108eef9e5545a00d891c376e1f75520a982534944fe4e0991da4af076aae3f389527b272309e3bc507692b2b01eb1a4";
+      sha512 = "d37ab2e22d959def3a320b400cc31359a62b285c21d634fc52737109b158ae197a008dfa63336f9c94362279a7f3c8ed7440ccd457fc3eb30ec39cef5065c6fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5a84e72b7e84774e56f13a7edfc32ee7718171616ebdb2d1f031965631b79e08e5a5a392bbcb7a13fea22b8aa87a51a3d21d0ba8c471e507d5cc4171de9508cb";
+      sha512 = "3a789af772dfef54904c429e885c941427493e23fbe563acaeff3314113b0ed0d7d01b72e56db42eecb3a759690ea1b99e5a2830ea8a119432fb5cb80fed3796";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ff1221835cbdd6da1697a9f915ead88e8b1f0afe2dc33e001079143424ae8d12dc048985a918133b26c17ba7422dcaa9db873af1bbcf1f4add68a3e07d86497e";
+      sha512 = "4722689021e31ce9901c7cfe9f6af45ecd7d0d2b3456d152e3ca1b4cc473e6bcb093732f8e365203080db3e45f99f34b58eaf4f3b07157d1a7ef3233b937c7e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "34be87c79fd43f8d1e3da76a7f037f7dca411cbfacd3b7a72420abee9dd2863a85ea38c53d58bdd124d2d3510fcab0328ef1195cc332990b22400b90a6061c05";
+      sha512 = "aabb3ece3bff1c7c8d3341244468ca0f79b8656bc2ac156eb5aea935b2993497ed4f87c5095ddb710eff04a4d08eb8995cfbf8081ae1db86a026842142252d21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "78a0814b6bca4267d11be6a180836ef275c41c9b7e29e821ca3559835a5451b689c0a4a7c771d51726641d04e1fbc83a415eecf0b72b8b7ef1c41e0c92ea6dc3";
+      sha512 = "0bf938ec04eb1595a230a715f863fbbdfd59617b6b652aab52c756b47e12f06380351acbf111e560e0c299522777c8df881c6f73147ea697e9aae6d68371cac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "1549118be4af02a05465267fe48720dea903e1199c33980dffea6a59bc90d31009c61b4414ea57f03a59e27182b8fa6e8e6c95eeb97a88426d3b6ff67bdea590";
+      sha512 = "ba9e855a51afa3c92c1ee0309c4cc5b489d60be06b033b3b6a31de9328ac31e3566f99e5edbbe13ad125e730141890ac937126a73490f1bd6ea412fcf99e2ef4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "f8c1c8b9e97d4c09b70d047c2dc81b9f2b9342014b5e928f11d0705f83915597812d6ea71daf8e315e026f127b18f67161f116bb6139ff135181d25b0bd4ca66";
+      sha512 = "a27588eb0ed61068604c5cf7a816be660718cb59d200718456f3208218c624d9ba83d1b8c53f8cbab9a65ead095dfd4f76e5baa3ea1f5b6d13fa826b27de12ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "afb767b85b674d3c592fb7f6175cceb14f917edd68d2f272b3560450f91dcae5a30c84d9869a08418a727ba6e010364752b52a22f3fe2f0a881ca01cb137306d";
+      sha512 = "4bccf3f6d5a3b7dfa2bca47f31f7d22d7eea537c07cba8ea83088f3c71a6bfeb9c91fa945181b2765ecf4aae2ae8e0d61a7455bfcf9c1fc9c69cd3b0a9b5e8fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b33fc09c365ea57136dd53cca5a5bc54a8a5675e37716519a419e0e24286863741660af72cbb73809ae2efa0cad9828d523fced2ffe7c25f7b99781bbf74c382";
+      sha512 = "0f9b6b7df59b724706d93745080488c755ee34ce1466edaa18efd09e6b99da9582ae70d271efe4fb46d566d66256877b60b0da593071cfb7778ceb95a797319c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "6a03c39d8736dde23d1d9558b7ba371840a95fd5f74948e63ed4f9b404ed478815950c196bb18788d2b883a68cc4760ce329e8b110e12c355655ca8f52c1ad22";
+      sha512 = "58bea0b6a303e89a22f1f513ca15a3ee372a62871dd4e4def2249f72de9fd9f7724bf559b40b5f8e29f4439666e07b9611180296b51bfaa7558fa89f9c87ad5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "1b9b9907386e7efc27c28f602a4915e8b9863f5ef64748f44ea7418f7b48eec512e19e906353abbb92e4a360d8216ec93675aa890fcb9de469dc4d800b0e5a37";
+      sha512 = "00190deb133a575d93bd362032c6272a8c39d59c3d44663421a3a225e1abfdcad1b1cbf20e7b4ab766b8974c016984bcbdb945abe32841611b274f81d76c5217";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7d97a23fccd265da8403fa842458f4fd36c7316dd8720fb2d2a9a3a6ef1ca47eaa007a72348b8582d891ed2c27200ff40f62cd877dbd72ce213dbb10f64e533f";
+      sha512 = "11d38a85c29a0ef8457481109048539bccc859aa352dfe32608a695c69b5311b5218875519b6ccc341fb06d856294ef6d0c6db79fd96e057377dffe08fc4b2de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f027e228551efdbe2aebdc1244a4495b31fbe3c713adf4c8078d6cd65997e0701a1813f55208b13a9e51e6e80637c9e6d08571f38f1fa8111b42f6d463e819e6";
+      sha512 = "3c0789c98c65857b4cfb2620d2c6bd0400a89d790dbc94e688c11a84166686bf3cb716bbf71d1786a2c38543c0dafc68f8907492d3e843a07285678c31db7bc4";
     }
     ];
 }

From fab46dc9de6114e3dc813bb54029998f887246a4 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 26 Mar 2018 10:11:14 +0800
Subject: [PATCH 2106/2266] firefox-beta-bin: 60.0b3 -> 60.0b6

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 463b476f8c3..11867ce8703 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b3";
+  version = "60.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "803c819fa3085bc868ab3295ee1a6c7a6f7dba69fd5aaeb54244a561c252ae7fa7b710aaa13b7f8b7810145a737dc6d20e76fa35e85f3dad2535614681980245";
+      sha512 = "818e692ff3c7a142e343a09f8f6594ad933199125b1c9e9b6d0b6fdce5a495b1322bc18eebdcd748c9aa8e46e7c56266728e0c3f40de1613e583c36672db4712";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7cb3ce289e989ab70a472c6cedf97f925034d5762e2256d6a01c992c3913836c8f8f7e202a013ff128b8a1db97d8e683bdefab19e618c0c819e7a31643eb75bf";
+      sha512 = "dd4f43e2040ee5f0d5ffb0fd51a62d8f8175e867607068a3754ab214f05cfb1a167e5aa372ce193deec8571ae76ff0acabcc668ebdbf98c2e3de498065a3152f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "f454d77c05721082b759cb550ab2c0f32d7e788ed5eeae2e3706ffea040d5f181245a2c7e9018a2050139606b460dcdcfca92dc73af99e92deb9021ee6be2839";
+      sha512 = "d5f22c0ccd447595a52ac3472e0c2442f9a399287b115f57b10ef0812fa42a6d2b86eeb415bb1745a3b641218783a477fa7dd3146160e91475e6e8dee57dedc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "d876e0a98aa1a702850b9ab7a3c3b3954e6f376fe7ffa32e6b4e22f5a8d8cc3568b3c70aa636c2af8ef7abf0d05c5d7895b8320ff41fed2c251e0eea06492480";
+      sha512 = "2c73b86bedd50979943ca746105e2a217040cde9161be3e00c94fb34515b8ee28dabcb24bca83fe8a78f8c368e99d813be3d19e9679080d75e1b55eb6c74abde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "e2cc66552357ccae9136b42f93db1c6b521e514ccfebaf65d5b635b6f3a1a62e66113c3b56c50806d77aa8c8cae53240b83f5437b3a28b2bdf735713ead45e1a";
+      sha512 = "d622b8bcdc67fec6e8eda35f650f9ca3a6ea947d4ce17f582440ec5f9ed9bb4da6e32607a5f9883990e6efa8751ebf7cfd577d57e748cd44e06c528f692fb839";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9334167e1b9f236feb5784bf0be7dda40bf7be9162e57691e605cfd9a9e3e499ce6e5ddd1268574a0e637b5e62a5a74078a8bddd27951ac340c8e38ffbc43f81";
+      sha512 = "b95e2b2337ec40714091b4524e1155b6b5f33da8221f70425f20af9703386c9e7c65cb698f604b9fba2b032a8e38b32f7fd97264986806505f83b8fa569a1c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "e46010f4d7f76f88569728563000a35ec35fbcf48dd26663f93c774b1c321b5e7f8e0c4bb7c9a75919b01ebe70ca4eb211536714fecadbecc8fa2241c2e6f2ba";
+      sha512 = "ee5a7eac77c46dba07679e35bd5f3de7ec0d7f2a342fe900b7a09476ca164194874205054fc6f5fb114e5831e6412c674b79c5ea8402cf9a16a7400499fa03dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fea813a468c20b99d1b817d57161e699f4860ab1e114204398483b609872972dff379d7abdf20d383ac8432e2f0cd703de71bf44607f3baec6ce206f070f6527";
+      sha512 = "f051c711fb5e0bec5d7a819aa8a023641888048bbf3189cd9f3c381f0e695df1036743746ba8f9558435413662ea8c0e0d59be26fd6f56f451725b59855f3b6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "38658a9c361b2ebd57bb6da00a30bf7ff1a071e75b481007ae1b9b30b51d78b60b9d459a4b935c964f2625dd83d90e2e392a2fe1b6ed03e3e7139f669b2d07e6";
+      sha512 = "65af640674c8487e947869a7eb361b0b75d7e86bf2047f6d7280e7ce724efa4f842697651ec8b3597246cd199ada40dd237204f9e3357ec658056b9a18a4c1b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "b17cb97ef70a7667a114c2eb8fa4ab88aa2fdaf09055c1e30e6afc245a4d50eb6f2c3f817d176eabb06d297257f468f1326cc4e17c6a1652f501070780c19e2c";
+      sha512 = "9ce702615808d1515106c0efe657aa30ea9675b75450d31972733c5a02c058070fe4bb7110b3ecf87829d93e4e6c7eade8bb1cf49d11e0d36235ca3221dd38eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "924bc64e77ff15665cada5f9431d5a34fa71ea0fc57e9d7a57879f52b549bcfdf336af0f11b00861d8b4e8d60aa4c8f7cf0b01d05a5c1bbb0ca4a89a6dfc6caa";
+      sha512 = "8fa1eddf2875ae3a48574c92df88d9a0cb7f1dcfeea81047b61b1646914343a426f027359ead2b82afd52fb9dcba3d3f5212f47198ee7307912b060ad314e085";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "5c85992f95f5b975e63eff88b3595effc4ff74d04610a86c5b27184c24435cc2f3f22df06d1a7e84893ea2a823bfaf7da9f534fbd61d2e54e193764e0c24a19f";
+      sha512 = "8764ea6734d8eebb8229308d8d75b11e603e8e04fe26790bfaa58847f71e8bef9691544931c8019a5cd603dfa04997b20767be81897a18bd1fc1288c73174045";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "66cb534a5d5a770b58da042a92b6536fed714cfde257816e0a4dc611b6ac450ec364df8265e907b7b5482faffc8d5e200a86f40013a7e74f22762170d4c95d35";
+      sha512 = "65a6a13fc099785a6be9ae5b546bb9a370e7a0a8cec679d27e9c87c4e4d01cc9b07cb4486fe243d1cf82c0e774f543663f7f68e62ee31b16fb505179d81b6c30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "8486b3d9202fbc4d800cfa33510b645af94b6fb1c6715ec8e18f0cc4d414f87e4902d615b6b46ff0eba5bfb2c2228c05bbf53a927fd9c52ec7f0b1ac4889026f";
+      sha512 = "c61f865c1da38d137bb64e6cdd86e63a793a42c916e241db6ebcafd2b061d56c659690c98ccc65b1bb2224ab6b98ac7d6cacd85947f3f8b0b6a4ad6422db2f98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2c46b7aa34ad5eadc9fbb291fb4ca320676e37991863f72bf4cfe2266a6298ba3157d1a0d2fa6a056661ff8474d988e103e8f5b215cdfc4c457c6b7d279461c7";
+      sha512 = "d0fada9251271f3aff3222ae3cad1b429aadcf9801231388a79c63a2b14ce21a41fa93cd6353a0bac4ed3cb58bbb3375437e07c11ad939c1cf281554319a497d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f9be3db1e0436c3dd4fe30fc3e93e05fbb129fb5f666d912115cea17c208ecdaa0427f4446f38f190165b10c3288573574a6abaf20288ff9d68d6fae200af7dd";
+      sha512 = "ba962cd22bf2b0b3bb5a4c40d5e3628152af490586824dee3e890c02a86828945c4dfed7a9ff595d8cd60fc30f2cbc799cfca2b41ced1f56af303c4edef364d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "4091caa77bcb1d4602eb0f191949a88cef0e0fac5ab5b601fb987c1e8dd47442e9b2ca30077308fbf57f71fa6cbdb85f67df3187b71b4680ec2a51d558211e17";
+      sha512 = "fe5e94a6a0caf594df4b96c0803a71139249c993769d72d607baefc9bcfaa1a9b33d26267919bccaf1e707d6894ccbf0e85867783a104cce6211c891418ee46a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "7880561a54333992252b26124a857eebe745bb683ad9a9f2d34e7dca8c480f0fbebcb27562dd62ee0ab525b27e31013a7dbf0cde389cf8834353b6c3c2e96914";
+      sha512 = "06a5ac528b7f78bc215cbbb3db89450a215f277972c8cf3a1f80da686a48de9e4c603dee40432c29d62b2a566f2f0eba0eeeb5ace16fd4801820cd6100f8f2cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "440ec2334dc616da063af952c6a0a4e8966fcaed669d22b75be708800c033287bdfd66759d479bd2085bd601aea7a1bda27067341703da3d6a1c1b305d767384";
+      sha512 = "d88656e118cd66c3f7ef923b2b40e6674952259980df6ba15489ee1e283a5a4999105b178c3ca2e55ebd67572fbd679ff178b75a4f4f2acbadc6cf7f6a5beb01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "7b9242da1d9b16c66073bf4cc85d438f2f849b3a0641eebc485b55f4ea3ab750c0bc74952ffbaf80b23840ac375e45984e6cecf7fbd6de5f2405f81b22e23f68";
+      sha512 = "758d2d67280e08fe1b352ebae495d518143274eb38096908f22235340a3e67fdaeb073e79af30d36cf5c8251552562167931b5aa8ca7d3a54334fa684074b540";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "9b88838076dfaf6b1f243940e97d02885b17d5ff82466ebc8fbc9664c95a62e59e305cdff3bacb99739d6077fb6d3742ef2a4106dbf423003c0d75bacc296a14";
+      sha512 = "6e9442b5cc8a9689490903a4b12e48b23f16a08258386a842f20714e598f31fb1ef70f9f9f73910af888ce41a17a5acb0f2afd5ee776d10f1547e904eef780d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "f685409b69b27efaf703d248ecec25dd89e52f462bda69d509240a9d1f1480abf2a8849efb9e73bc8056378a0c1e4646f2341f7e84112582e3169eaf7300e3c3";
+      sha512 = "ace71b137db10e7fe9093e95213cae7e8a1f05ac1900905a1c1af68ec59e075ac450dfc537de62f0a7857ee49364fe1658028726d51c2e34120f1764020c1ec7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e44ecaded4ada349beac0205e659cce7ac962d7d6cd97040af43c7f904909177bdb4ec38ba7ff57f9aadcefa55b3dd09296af49ae97357d96382f45a3872a963";
+      sha512 = "ad923bdf87283beea05bd91f64a4582790b676b91816698dadd22c575db020b1470e06761872caf346d01a9cbee148189e98ab1930cd10b7ac88b69b76b4a5e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "99d79640df9b80f380438d18ddf668b22df7ce85f99bbb94234ee3f2d7944c590b22b73430d2c73f3c09c05655356c6549ad1cd33bf5bd6dd619ee427c183715";
+      sha512 = "af63f7cdb9a7a1b96925e55aaa86a592ae8a8303e49e9825197638aa79fc3a884d95a1bf0ce829f243fa767381ae40f26d040b2e5475058d84c95ad4648368a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "5597c5d5f1959f7a473094b415b3971d4343b9317fb27e6646be99e6ee8e07e9d97e1cc8e51a77fc63c03760713e9644c6d292e33324d6e599270f424262f6a9";
+      sha512 = "64b2a7d7686352082da9cafc08489c8394a780f452edb5b76eee16750ccf9b853ba69045bc6c4a4541531c6c76dbd5407fc0b6f1a8f5eeb66511f3e38ddc085e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "331097eeeb0356e3c281ad1bf870252f6a3312a0aea9a52158ee45993b7348fb15896f73b174bcaeac4c1b71631952291683ee6bc8a35b7156cfda280cc951be";
+      sha512 = "047abd61e221f6b7335cb826d72de19f30f3b83a5beb9249f8ea127abe7d497371628f360c8369bda4ff6237e2438bd37804ccec8cbc7970a4e795dcaca80196";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "5e78bca3a931bf8bcb94d33340dccef6289d32c5ccedc75cd347944e56f5c39f0780b1647924bac8faee94be51de39d93f477a959de4304bcac9f41ae51e52a6";
+      sha512 = "f0b6d6a21c213ba0886d8e830b5d8b91dca7e927a998f51ad7e885bf2d2768ceeb68626fb96d6641912127685c733984f8fd90879739782ec36103f08a8446da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "5d8aa24b3c859136b833cd0686cffb73541126d4de14e5be5bc5a70eb6e109fc36e6415af0d2a5c680350d34d0ba13afc21b49e65f9e8a210efe82ff0b8e20b5";
+      sha512 = "7cb2579de2774ecb0d810e943c5c821987bb0454a45e1c4b07d4b1988da634bebbb082d961db59e5ae9802cb58bf83500efad5cce7d8a06b1c47293b9eec6033";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "8bd6b551833aceb552c52efc4898546b639349c398abe1c62b6476f18e64de7efa63edd844c3902300014415d78466f461d5f37c5d8335d81c86000127f6901c";
+      sha512 = "cd8cdc7990681f755c163e866fa24fbaa741549b4fa7ac2c541a59180eb7e732052e536e5b231a088cfef2986ea0c53f10ce519c823c04238548c9e31945e383";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "bfb399e2e9086550498f0f954cab9bb061694a190375c4f26bb6d414ad6047bdccf21c83e509da10e2f4b18d20a169cf2d3e2d33d76f20ec0278c4f70c5ded19";
+      sha512 = "1736a87b10d6b8a9da5bfad680f0e6492581b21dc4dcba4424ef04b4fbf8070168d14b19cdca0f2dbb9e467b692fe31b885cb5a0d6d58d70de59ff4e522b6c79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e6611dfd935f95604f694aed4d17844d11a8713045ad529e64a62fd77a06b516994fe4eaf487eb629bacb597cdfb13bf9387ff023dac6cd78c1edc9a8e008975";
+      sha512 = "0836aba5563dd942e581c6c2855978ed1adc2f204ddd254c6588b06f7c47f0c11b40a4f935ad509cf9358d43b226b46fadbeb150c55b69889f3485145ae2710b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "a2d1206cf6ebfe5bf07e4525ca21079024eb3f4aed9c7a7b1a3f9eff416b821def976533698bd2f59c53179ec0c2613be7e80701a1c4216eeceadb8c13b30f47";
+      sha512 = "aca25ebbbe9ce3cce5ce6a03a4fce799735fab30c37f97ef27ca21ff5949919a660e2708c25da5e3e9d679c4d4dfa388636e8ddee60479bd35a46f9af3bb1b6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "bd3ca95d7e7b66a70f961eff93fcae884edb8a463fd2f98cdfb11e3925eebf7bb6da66cde6ae4a26d23d31c10396d47331895b8200cc5e854a89704cffbed437";
+      sha512 = "f2d010e76281e24055d17f6d3c8b8fc925420d8fbc837c14926b1f8f8adcfdd59a90f5048eae763e3f63ea3c722aae6bb0bf4ecc13d5d12194f9bee1c7385c64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "d47b65f5a863d790b5d6249d2b0201ae625303b48cd6327789ed36ba4f36ad12cc7146ebb03e68185928eda63dac3fc4b29131bc224009d571b0efbf9ca145e6";
+      sha512 = "1321cf7ac911fdb5ef58dabc151a75f916f154f5e30db58e0915f429a7c9cfb4afa39cd5b52a5d960f5e88a27727c8068fc9523db3363977683b20fd85e1438a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "28a574d023f84bb5b5224d9c9d9e62292fc86e6a12fe34045397f16917d19d8f4319d1a08742880367b6fc85a62ae7a09ef29b111709ab4a256740adea2f3bff";
+      sha512 = "e0c600dae1cac652c81d31119b289d20aaa71f3eb499d801c98ccedf9300832bd276994d899bd68dc4162a627729ee49b486b14c0314673fa0c02ef0ff01a19b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b01b97325b0265d060fad86f7cc77bcc14975c51da51639991190cba2f6c6935c48cbde0fd78850d579ea320dd2e9c87edaa0750663e5f0ac234932968fb8847";
+      sha512 = "5288a62e184f561920718aabf1a705c424f192505d20e24584feb8b776713e1e94669679ebd4795c656224e7890bfb532a1a26ebceede30ebda980867f25e5dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c0791c6f41097142035cc0a32f8d7c3a14c1975c4f4984db778240169aa48c3e4e89ea46d21c5a206278b34477499806346a47151472ee9b47d596da5eeb4664";
+      sha512 = "b47340fa3e4dafed945f1e85433b0266e1a8d40d1ccf707d7be8343c0b457b14d2aca836bf45d15e29695056784e6ff5a89f1ea8701933d2d12e885d042eb556";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "091e89df6c761fb0d3629a430d91fe9dde17cb74aead6395d39377ef7b1038ab75a46e2ecc2517605dde3e512d6cc1fd4fea706ca177b03b6fcc1854ebb99c2a";
+      sha512 = "36e56dc8d3e42b8e689db2725c100f74983c6f8b96d94714738e2b7dab237797df369368928437f7031bcddd78ac1e7d6c6d20d2d76502826ec93d561b596e53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "e84f09eaaca7f3eb2c4c8ab10f5fa48853b32a9b7eaec022a4f7cad7ed816d795886954aacca935ac4f44410c63c90e0c9c98f162a7afb517fa8063a1a26bf9c";
+      sha512 = "abcd115639fac3da0f271b95ea20eca18d3e42fb544f2de7c53e626c6619753cec658b89a5cb2b99f9192735843be9f1ba461e37a7c7df2dfc5c695455f4d13b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "82ee016a8ec7c91708bca2ac498378d240ad45e273d6ac5c4bdecdc2a2f3c042ec5f2f77935ffcb9e391f35c8ffe3876b16ad2200db855818fc889568f0929bc";
+      sha512 = "02af1e0c56fe69f7e6f5aed233601d25811effead3a80dae623787528953dd34f057aad958ae792875d3775c74b8b6051a9424dc8c11057bde3f38e18fe36b38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ecbe89381834657d3fb8d395cb58cb5bd28d9e30e160b50c6052ae49a60f1a58d8d79218f0f76814106575e01b063d9560dfd2a4278bac7db60427310414c6aa";
+      sha512 = "3950b6a88b260e9662395f4a049acb86ff9fecae19dfe16fe315785b7dd6816d88006e9916838ee21d9b085a34ea580cbc1d8f2cd67fd03b18ab57238b7ff624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "9cbe123386fe1c15ddb0613f2c2cfc6b0990fa824ffba0bc0c25069c02de1915e82531f5d22253297e97c8362e0fe1e66eaab84387f741b10528838ee2446c29";
+      sha512 = "770147e023008f566640b1485846bd3ed24a08065e0d1064d8e39449101c30e0414e92012fe49e75a0608d3b467f6c2b113daa12eae5623276a892c23a05a9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "c53e2b950b427a6d2c3ec7ca2c657581f1d4f4bd44b90771475e48f269fc2376ea4cef357e8c4d7d27869766e863b1302a860d4ef104bb664b119971823625aa";
+      sha512 = "37091abc6c7cebe2e6686598dc3d1dabc0019d2ebbbe85d929845d3772e08378a487911193ff5cea8f216cb9c20a4e16c349c6e4e85e979483c56919f918c4e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "4d43bbd65a4c76445a6dd5c35e6cf0013c24dee64289f4074a482d6ede232a86e04f751781dbbd65b18a08a96b4d6f45b5aa72dcf8062a23054755c4c58ce779";
+      sha512 = "118417f29c55e2309feb4569813433f05979a9145155cc5971dd7e1332899832ed3bbf63e377db0b6c80da62946d157e9b53e0ab3e664c188544deb2ace752bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d35456acb515a56fb411e3df647fba2d1e2f312a0fccb53dcda3ddf68e839fa8f38f78bd73afd63c1cfb8954f65986fb3a7623217ec8d631e36466b531358866";
+      sha512 = "791bb212dc0a55410656b70bfee150f609f46ca127093a5dea7abc9e73f959237e5f816db6ead316926e881aa4d2476624493e2e13d653fcaaf7356ca778147c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1197948644964f77108c95b9eb1b4c8132ac1b7503a9423f2d2cac8b52e7f6c2b30c451fa62573437ef74deb47017797e47f1441d60d40a17898717b95eddfe7";
+      sha512 = "ae1d37160a7a31b739259fb4b08598dee895a7af4c9d9edc1ebdaef13ea196da29cfd0c6bd3cc1ed9215c109671cd209d9bf1a13e735363bbf73230d80496859";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "309b0d6d3f2da1b6539e6243ef9b44dc27f4205a273f7ad82659c9691d0e86cd99ec388b9469f9d97e11f45f534b06a702656f735cce0fd1c95e09a9c7cb38e8";
+      sha512 = "7762806dc14ac8f2356a7fc1f7a7060f277c2271688aaca0d4d7cada0172eff4322497886d961812b0a400c1fcf41e20e15a80b101109ca5d300a21cece2799d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "ee705fe4393f1f07317dfff0732a671007971eb3f0e5d2348532c3b681455ef7d680c5dd20fc8fa41601cb0164b66371ce685b39812684fa89523a97a6361614";
+      sha512 = "eb40766df654371a35444ae888265a7838c98f463f9f7d2752bcd67031b8e5921076716b23b94da37ec907efeec30fcb7bb1cb0c43466c58c054ff3b6dcf3825";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ecf7977f395056f0e346bfbfb81a2d74c5ed544c9bd3989e16b2f0dd6d5e3fc3b6fb48977d0b468f2a869efd6929279982a9eec33318c65a61c282996366735a";
+      sha512 = "0d3a7d94e5d148dfc4836b78d3f7ed408bdc1cc1fecf81d4364c0ccd79b34e04768dc2be147cd0af2a502c5942aa349d704bed5a8eaed72e32b363fe360e37ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e51e235f2733c54f0af0ac912250b8eeb4277d29151da7a39c342c33cdbe381ee485aff5c2431cfbb088de8fb94c91b510efa8db614607819832ee8b13d86584";
+      sha512 = "3f66a086542472353c137902e635b5119325b11d74f4575bed4a90b6cbc3fb3cb9fe3bc5c01becf64b62063ce38fa7caad25cb80cc2b3b28ce69919b9a529a84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "45cb25937c1c791e3e55e9e70c469e28417048842e2993f917a7e7b340a0aa1afb985a8f1e6719ac26c1329299e2d55fa2cfde49c007b8444a97d16423c3920c";
+      sha512 = "a81ca3eedc13a54541a9d20980225f8f4ad599e4407f2813eef39bc081d914dff519f0f65ba4865739542cc7f1374c795d49acf5c388cf81f0ddbc91278553af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f3dd9601b114a0ec45951d187b1fa1e559e778c3033a5b9bc75b02cf49f6856fe77046f4f1a75149a58920414dd5ee0c98801d9dee7992aaa7ea6204deaf7c4a";
+      sha512 = "a89943d49a19a9baa199c79d138db7378392780ec31e2c3e64fb2a7d07cba688cd88119b22cf43a598470df4a3d647961b728e0c0f28aa54990ba8d747096112";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b937202e944242c4a35da64add8e4dcd9fb4354d1ecee9144d1cd1dea5f5ac1989ad8e3376099fe60705cf1486b2ef350aebe5d55e440ffaf6d9aa619ccc4def";
+      sha512 = "f8bcc977b7f88ab33ee6027ff58bd73edade0a9fd9352a5ae8614fdc6563718654d1b0764b03e0527a7f1e6e77abf39e5bfafce90e877f9c94acfdfe3484e35b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "881062e5e027824b5768db1df6aedef73f93721d5f4e4d1de5a31d02b3ac8a6a87ea5ae7889a6ade614180e15189304d529ba03440fc0b030061e1306ca1a02c";
+      sha512 = "e7074d790e75d8ffdbb88b8f21dabc7c9dbdc43af2c57db7d34a34785f317b5a6755f94ef05cf22f8d8a4fb5d06e6300538809a0cc14a6ea23927c79b0580c39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "b3939136fb7efd9712acedc71a0d45cc0129367f5a11a2798c788b693e85cecfdfce2b83a1fad2f8bebdaf7e973d963975bbd67c0ce342ba0a4d0d46ff2d01d8";
+      sha512 = "ddb0e7edcf47cc0337c7cd8cb1b6f63922514bf8ceaa964ca8c2bbe415f23a2cd147dca604bbf102a56ece7ea8634476a55a36c7915f54709fd1d68b1b4dc95d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "fdb3026d28c507c947f236ec9b44ee2c74f2e4b2df38d0bd23143d9c56c855a19cb99deb087f2253c1692436c1ac25590b78cc3ea713e890ee5d6b3ce70d2cf0";
+      sha512 = "6346c457b6e14d8deaec311012bb6bf62baf4f9c556ff244ee9f2048f8a8e6d0bf4172549ace00794ca3f8cc0be4f81e74cc1649a57e07a604b00bceecd91111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "9ee305e8b77eb8caed2e0ec5251f651d16eb7ddd748a23b4c3f17853dfc6018efb8262958f9843fca62799b8ae952b208dc97a4d51977b0e4a81ceefb2575179";
+      sha512 = "f1eda0b6d33065d8690160de1171806c8610a04c278cb812eb1f01dc204d1975b210544fc8263b474dd27ec44a4d35ffe5c59575a8cf2ba353ea9002220c78c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "17533028af974f7b785ee57fbd04e9ff0cb4f952269ebb9fba89a68a8e4af7790628afc74d87c1a338670bf05781cae5ba7cb8422d64055c54b39030a87a6741";
+      sha512 = "8c2f83daf3af4db3c9c2fe7edf67f8146f028353d5bccd83be338afda9c24cc7b79831fce80b9c67996b76bc483da8ecd3c49a212d5241eb2543d28fa64ff4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e7691565e57153059b7b635bca91e83ce777083920e18d3ad26af960919a7505fad2e6da3bed3c179df0835225a331ad0e855256e87078cd2d023fbf837969e5";
+      sha512 = "da8d122b5888c8d20ca55fce7987375e6e4cce13944363f86cffc1a68584e413548ac8da8c946f6a169ce1a0f991e749ec258a4fab2b0958a6cdcc1069c0768d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "001ffeb0a229e1deb751f7a7ae1b70e42b28cb47e321fbd4f89f948302ee31a5cf0ca513d51f978f6482f175dd2099dca46987ff22f72bbf60dc094146aac1aa";
+      sha512 = "1347817c9b98c5f6110bccf16e2adcf4fb7d04b9edf59a0b0401a1cc8c4614cf345d3ee07d465c52f421692befc4cd6561357e8b5950b1200100f3555721023b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "a96853819e1bd1fa9eae60e18ab1dc6ed304aefe6d13f8cc21ff500cf2415c7f60a623347d3b3632868446e1769aa0b8b0acfaf036281b3d8e838f849535579e";
+      sha512 = "1d06e60582c51808c9dbad7869258952cae1b5f10abc39fcf18a3ca57c0ec6065936a79976a851bbf1a98ce8e1654de0dd51bfd2fc8178297eeb40b6dc16a2b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "abf878e46f44d1516e3d1a0ad873065ceb6025a93b968b71e532ad98d7c977252b703362778b34743dae0b50d3a88238f09876dffe46ce09ca5f2785d48f7cfb";
+      sha512 = "87e5984e5263a406392e704571207f02050093839e58c833b3dc10a78f88b93e99479e317e17983a51a3615f03e84861d4bef8142493447d24ce42e57bb49e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "4f201854676008b06b4e790fb7f0ff39648bb14f7813e733038ca9a8acfd5dc2bcf527eb3bb45fdb58def786b0896adf9660c5adeecc1697bf459bb13b63eaa3";
+      sha512 = "c979e7ba1b36635197a3ed5ec581da57594fb014c2d71a0dba3c135db1c8e632b671203b3f9b4b5765c74d149a492c94ee327393903a683755b91b4677ef4b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6d5ecffeab534b86728a023c6507929e8dcf124e4f02431bcd40dcb5322ecb5ba38e39a1fbbba096fefbb9b0860c571408d8c7f0f90452baf3df9c4ced4e9efc";
+      sha512 = "886a2a0d6d88101365c2b497eb4f5dc56325818b5dc58495cd2dbed1fc0a8c91339e3bbf9f5c0b246c51cf44f2a61ea07421e06394460d2d0ec2b60c728eabf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "64ecd4446edf856c8249b18246ec2520b999118d4c0c815da472f50c4dc2434cf504059a2d11c8a72fb1ffeb76e7ff6fa62a55e52d478884f516773511465a06";
+      sha512 = "39739a0836f61a98dcd9b6633f4baf73fef07fa2dcd1c51b2309dbbdf62c4256e9b8b8fc94270e2608d4042d1c92e19f03337471a38539a8e9b803b109c2fb97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "0834f04f6c76ec8780d862e550c5e2bcd65acd7dc9b8629d194bb3407178fa3ae6c47d7f1421136f2966c9826b942c74335452a647e86c7b58b6708cc26c445c";
+      sha512 = "fe6d7fe4bacb0789b6b8ce7ec8fa0caf188b9258f21a0d30f9dcaf555822ced17240bc07f56e28c12342d42b5514f60d845a89755a92e3bdd68d7a33dac6ee0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c238708effad87e764a8ad86e08a41574d06a5f7985f8370a7067deb0e6d10c97c395186387f18167a70d28521a811617adfb7aa411084a3a1397465f2de8a3e";
+      sha512 = "59384b138f1279aa6c40ea95e6e4574eec4aff91ef2fddd14bce212f27a1be2acf91d751afd984eb7bce52a2dfa49ff977943ffaafa4915402d9cc31a5a0c95d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "7a1fb23ac7ca6c25e385cb27026064d5d17a613da19cd1b21c0710002a5d5473323d05eef05fb21e3fb1aa89630e38c4838cd211297569885c3aee251f7dd0a7";
+      sha512 = "863bbc400416d114e2ac4842e33d53065f872ff36df31305c800520c7e180b749676a11fec62ac1abc155a53d079374be4ed3ec19202d83a22e144f541fb4d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "306bade19239b1120e1fd8a879dcd98b695d966b94c061c10684e3ce3b9a2a6122d63b86f16cce9611306ef297dfd39003b5ba47ef29fbab33b1dbabc2097e7d";
+      sha512 = "cd3bd76bb005f0ecc66b7f4113fb7ce67f650c0f39c03dddd2ee2aa7e854e70d199cf70004d9b7b75fbf1b9083459e81ed0a9e4222985556042e4c542261b9b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "30fc79a7bbba6cd5c75d55c3169e91ac41d2259d77ccfeb4569cd5bfa3c0e7164b0e03e5722949e339197a0b82d9eea1f3de622b958ad75e6dc94ce0d10b7c00";
+      sha512 = "1ea3bafa52ff02080b21865d68c111ff5182a9d93607a260d51f59ee5bae560ed86ca1a3fcde3dc4d1b45431c1b1cce616f79775628a17a6bd3fb436c59d11a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "b31169a87228bfd44f144c2c36de4c24165bbbea48d5ab93039108d00a34a68dd31bb61371c472e866639b7e6b448b6c95ea2d9fb40b0c333057390269b9af2e";
+      sha512 = "219655c7a1c3b985e05ed162458c3988e3f7a60776e3c76fa7492bcc77b7fd7a37a3c3f622cda194e4ba82c863c63c1644df1e5f324271b7590775e59112d21d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "115c549157e802ed556dd8eeeff282dc045888a7da767136ab3568ebbe611924a500dec85cb7c5e5ed3b712f1478e9ea825c658cd8565718db7af04f4eea1e17";
+      sha512 = "0cfb2324ab02c302db9a19da5e4872eb9d5389c81ec2e66f434939f5fbc4cd9f97b8d72e7c745f29d62a12799eb8362ce928f16df967b4d6d557dd99a859b443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "61bf3b3e09f21d9f8cbebe0cd0ea428a04dd8877be004f32c610b8938f17ddc24d49279f98d9701069855d15ce0c0f8359e6448eeb1681d89ed1e1b69f9196d1";
+      sha512 = "a3c30300291d68ad7798ae29fc5c475e527cb8d555476820a75ef6a9ba90c8a0fdf71a69f8e69d6ac93e8fc8044106c2195b6964b23e9528071fd1bf925ba744";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "31f481aaa9db45b26b6d7236eb501e041cbaabbf47b922563f828f2415451ca5dab896027c4963bb22fa3c6dcdb26f0821e78f337c50cf6e8bb94246de86cb68";
+      sha512 = "f8e2eb014640112896fe94961537b058a71ca3929fb4cb2229c4de071416ab8ae466c6b53ff33f7bd5356e126b676c1cc15414c1d3dcd79ae0906091f86f17b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d877f2b0f4f082651092cddde4d1eb27ef261774b8e72de6e87a937a13f55676c8a7c1b978d75412235d89af7bb7773ef1f2f6260f3a7e8f63e3a2f8f769c12e";
+      sha512 = "20a38bea0bfca6ff08d7b4ac3a779f5d4edc17e90d213ba62011aefba7fcca1b6dd7d602fd36ea714d129f4ed6edef6d1c1d815be25975c0f3e699fc3b312487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f63bae9f41368903b9f87f0afcea69e74df57c355803cdabea540d22c001a42c4147a9d9823b8f0e2f9fd89cda4da831f2777a917a031c94203abbd4b2d6b117";
+      sha512 = "f62cf2814b271de78b21bfb696889fd47665d12cc8d729216870e48af2f0ed2b87460f90f1685dc78d34e41af4643eaa73bf51009f683520910bf90fe1ecccba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a2692f38c092805471d7892657917be266d1b6e319809e1d506deb136bf14f0c3685a9237c07dd5896a1102c809340370cf95741fb8235e0d9a6a791d167a74b";
+      sha512 = "b05e5ecfc31926cd3c4624ec7d70789a6d729adf40bb73c2c756a97e7e24a36de0fadf180bfac4a10c39a11c62485fbb9741e0badbd95fe95736c067f47b8c47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "4b9099f2159cdbf4868d427ed1baeace54666d9459c6c68e362fd83f1f68fdfe053f5eef387bbb5a721019a13cd66d9fb9ca08899eced3c8b48f1b368b407d93";
+      sha512 = "789a3c04d1cbb109e33682d3377c56a631b77a550829c296e439e6bca75bf3d3a240aab8936b0f5131ba7a6046a0cdd7f662839bb165ef83ac62c1982cdf5efe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "cd38d40e209c18b545a8b9cdf66ae09f87e09f319a7ec5586d45fd20dbae004a031168c10c3ef851f19976b240491cd230e54a1ab16e6c0d7061eb8762c5758e";
+      sha512 = "0153f20d08d73f796d57a1e1cbee63179a943f00c2afb3c9aec666943a9b46d94d602a6b74b815350f637c516701cf849703675f8f8d128750b057f3b40cb579";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9e108970f376dce2f32ac4d337200b0ea0dd784a4543f54cb864682f988f72e1b8e0c99dff170a3684be65ac5736a2606fa9281e622d1c6068054989dd9e3b94";
+      sha512 = "4bc96007e1bef433a2309a4e52dcec9f24a858940ad4400758d42981b3184211a0b6f23c2a1a3255f05676f69fe4339ce3a7b5a2a48f60aa62a1d3b5728d7f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f3ed96c5c411b5cc1a1cf3ac94d5518e741f3ddfbb7ca3c437aa7746b03b7bcac28c7a4252b74ee3205bc0ace7606b1dc50652e216ccac2ae6c398ef397658a1";
+      sha512 = "c8fd687dcc02f0937b7ce71cb422562a7bc286cb9ef44f3d8bee8a27ba1d21a5a9771ee4b362356ac7bcd9035e9c61f45bd9106873abca1dc96d00c016d228d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "36003ba95a33c7296e21f2e254c71f328c0f994d6f384a174789624fc527e9a5c94ee80f8784602fecbd6c8d50531032442c080fd657a6493418714daffdda11";
+      sha512 = "2bb9ab324b096663b6f7fbed363c424336d1772a87b9bd602654e29cf021ff486501be3c1846a8fcfdd8e9401589351eb2443ce927697eb5238db19f26e35989";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "eeae7d7bea78aae2530322060524087886bfed6e0eb90ed9c7be77996e17c658aeb758c7af9577f863016b3dee8d83b7dd5e61f3d283d932aa300ae8de2e3c53";
+      sha512 = "72a0341a9ca3ff0a5cb0e5a020d518571efbc6888d16fd6481b14a170f36436879d73f1c1df88699067e180733bf72a9d4c8e7f594d4f5b0f6416c8309a1d121";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "9405a8746752fa132cb137f7c6d59a9649f31130ad3ae888cdde419c2f016bf45dbb97ebf13392678453d1506f98d451e9fc7ae92eda4d5d64c0ba443a528568";
+      sha512 = "a59e7c9ed6eeed8d2f7bda902425a25926b81b4e5fd8b58cc692ed78ac37e2305aa02339ce20fa9d538d4afb226dd8f6c456571ee269722d798ed4d79e4a25da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "3e9491a63956451dc0cc7e2fc1e833f8ab2d49b8c5095300db545391a86aa73ea4ee8b9d7419906a19fcfa7927e27ee89b934aa79f90631b0c5dd1a9ebb0a764";
+      sha512 = "673783d9cfb09df51f30ff00fa5ece151a6faf730d91fc4926664346dd272feb741bb6846c8ffce99757640fadbab918efbe93f199fdfec3bb2a1e6ccf762dd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "a660a0ccf2a47c08834a183c54cd53f134b2421a4a9cef17e59b635c9a8364c007cd5a814c040ff9dbecd2373a31ce551c0df48ef7d8b194b53d5083535161d2";
+      sha512 = "cd44afecf36098de1032e76ac8b5ab46983e26a8caa8c8e842ec9c1d85528fdadb1507c80e5662a1c8ee1b744a6104418faa1d0792c4ec3177ff7a133bae4cdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "cdae561346298b4bb8f85d0dbc6bec471cf755c6c5f89c5a58ef5e15bfd2143729f903b488366f9d9b35c5e3df6f201680e8941db5c0b8d4632efaeb34e93711";
+      sha512 = "f722f3926aad0be53db7f6d6f48ffa739cfd34995b8fbf6a91f1634214bfbe7e9babebd285a720e41eea63c696a80d4b2ad905f7529e48000b3d6e5b6434660b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6ba067baed3af7a543188f491864c052fc1434d888245f8ad5378eff52afa9313a7a5add5416c14794b5a27a5bac353a3e798a8176eba62f6289d89bee2f3133";
+      sha512 = "53d92f7beae4a1d4d1443729e042d392908d184826aae925174c72ee059358282bf1d003155863ffee0daa527584dd33107a3486f849ee903823d123c5c10dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "829f8e22039e732fba4d480212d3f7bf3dd39cbb0996475c17e29e442d2a5263f33f4c36a4775ad21f984393f8738dbdeb7e33fdebe97eae0dff01a5be7ff22f";
+      sha512 = "9f6646a6d62bd7dffe925080bb471ee995b1ad6ad496b1ef58f7689d7349f93ddde3f8f6008dab983cc5826f0bf66d5e6512a9c7b0f121efc41b985e23761065";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "62b6b7d49511b28e67b41a192de49b7dd9d4f806f1df488c850a5da14f8ae0c87bfded01852962f9affb112536a9fdce5ab338b8875ca49798f7c78331dadee9";
+      sha512 = "d068521185090da46a9bb44ea1b9c285584d9a7028c0c20731046092bb1d924b4562409b524aebf293d4445cb0ab342fa9f3b33b2ed5b2e95f959b6f0dccb27e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "b00eb5696fbc132cffb2053c67ab1456ca394dd2540ed08e4aadb718152ea727f156647e0977ed30ac17701202c184f99e03fab58d7bce03c5030429a733a7fb";
+      sha512 = "2b695601c381c91058d8b7cbd63f46a63efa004b2b14430aae79838a890cbab818b34fc8401d5620dda5c17f22509befc3e6f737dd040eabd86444353a40fc30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e81bac0aeb2a5087e252d92fad3aa15d17aed5b818c14c4d32114cb1e2002ef52108aca1e72618ce8b52fd6fcc75bb6a590c78b36a9571caa64956c7d33f7313";
+      sha512 = "a890a5be030075461ed2936af7e0ff0d147c822e29fdf381f57e8c6e53dd8f9ba39d51dec6f2c28aacaf26847ddb9f1b8cc009a7b7ad22defe469b28c28ad7ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "a3b8dbd4e3fb0813d719416a297ba6416fb6a58ded329ab1ae8ed32c29bd7f0721ce35d550db2e02674449da62dfeddfdddc51b822475cef5d4f1c215b7adfef";
+      sha512 = "9e34dee7fb72b3f268935e32f95cef9bb1ce045c2488cb1db087eeb9b1db79b9e2f859f707aadc125b57604576a1a1b3d6856ff509e341603bcb64afc7edb63c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "e5a243e9a32b8dbf48178e20e6f6df2fa779d2fe7c761c3e8b85641a655e41868b86c794d12fe987be4dbafae4577dbb3e45038bfcd6e22ab0a477e8718170c2";
+      sha512 = "25a62ded79e4b559f9e857b7d451aefa3e54bb6f8e94ec25fc596de16563dbba44be1d196334a66861f8a835fda39f1742d5f5226e50ae9013b72c95a01d979c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3ad5d0adcae8346b771056d92255b57f46badb0023597fc16cfbecf6cb8e9a7246ba3b2c7729bba9e43869f3a882b0daa214d2ba5d0c4f913350ff5c5994ce7c";
+      sha512 = "eccafe2e8931aa5d4081cfafd6f39ce8094b85da4129ff86746670eded5e4946a63953b4f7431b11f0742c97bd7abcfec17ca8ba27f1ca3727019274832fee06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "e380c47484bd56a7edc648b36008f8fdd95729c341e26543239aa3acb7cb56b41108f1685f4b2840b181c612c0235b3c38d815bd5426b6dffbfbec6eb3b94776";
+      sha512 = "189e76b67d21370148216b5bbc8cac7aba30d32c0eeeb9e972f2d8dd3a9064f8c859fc0c59a531573b6d3d7ec6cdca3f9347197cb2b680f9bf335a236fa3633c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "ce9f7c0e9fd901be27572448ebefbab19749f11c49721dba53adccfc390240e4e1420b75c0cabd2e2e73edc34e6104898ec3372fd7f7072623769bf72db53c33";
+      sha512 = "3225e1708f34532b50c5cc35eff1cc4d6718328fe427fd98eb0a8f34fc44fddf25cf28296793f5473dae429e1cb82b4b7e5b99269178e11b2caaf5c8650d0d55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "4cb533495ab0fbff75a53b56411ce1c59cc2420dd9c463547f46067577f8b953cc59c3d2f203850f75708f38388591a086335416edbd8787070345bba4af28d0";
+      sha512 = "e1f8f7bd1ae5904349e58ebac109d169fffad677ac9ddb1ed39aef6c898eb112f419d743b79b278df62b41cc661471a5a4fb6fbe8994a10d6d247fda4154986f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "aaa9b8dc909d7e50a65d904d9fd7384a94aa365df8d6c8e3852926533c9407f6a08604205ae94914daa74d251b212a9f3707404f945072198141267540314edf";
+      sha512 = "1de3d7ba3c34c458842da33207c0036d7217bc3deeccd2715c7a22e57502ff41950a73972dc270acc02c63e16a39baa33eae125f77ab68a36ecd603a7e237a51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2db35215ea1bdc70fdc2c2e8eb576945bb0951b001784ef29fdaf7864c2d00d43122e58b45878e107afa7f0a85bbf332094a8c3cd08c04a5b9ea713fe6e25935";
+      sha512 = "a694fb77b1f8871875320fd9cc91a8def83cb32cf759e1513f8780685defa8f4b73741c5ad8f7da38f3e12b48d4032f2a04841e5f9be459714254aa46bfdc19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7020efe3d039e4861355cf56feec7dabf183432f49ec8f10792575a8cf33af0d7cbabad627ecaaee3d47988c2a1261ee62d509d664b4a8ba69d1e6d2b68f292e";
+      sha512 = "15a2e985f68eb528b88ad17fd06ec894c2b6b84b18b755befb0c01153a7a351650489adf2ae1f7a8a8848e260a0f112ce629ee6524e0967f2da5c60711c6ce74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "99939f05878be5a5758f9c45410682761b77fdde6559c31e511139955cfa18811fc0d9e19c2d7da254267b4c3bb6c34378bb26c8ed25f8b957a7e73af10f65fb";
+      sha512 = "29b840f1253b857ec28add64c576c4fe078428de191dc7b3d937e9321b9d47e39a1da555c09663e5fed86e6cb9b8f85094e416fc6f49076fa03850b381553d1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "74c2f0e8a9e5f9a1052e011a4af950ebc2bc5298661e7094d3776dfbe9b8ce4efdc6c7e0f6371277e530501a6bdc7fc4b5c36983679567d73db1d0434daaaf87";
+      sha512 = "4f586b5994be003c931cd4e1a1154dc02fcd1344f90a6a0e58cf2e86a601036b773c2fe38a55a6ceafcc489777a2a4ba9d9addce6057920843bdca4655b2407f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ddedd7552c4d85a7f3c3eedc80cb4213a67024351a34df41b0a8a6735cccf3c79f350f2a5621f8324dcbdd9fcc93d979829663d7fadca2367414013efc5d5cd4";
+      sha512 = "1f3d66fc796d501764a80f681efa8c85513005f6f9a510b4d3e61c251cc98f9140ca6cd56a199a46b9cc1cf4569b75e103826feadf29d6bbe517dd952b234886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "935c0697a13e020589cfb542ff61e5c67a0ca56f5a040d553b0d92f45efc79d7e5a1686e8981a88a01a307ccfe53284e4362850d95a8ad50aa5eae39e351e808";
+      sha512 = "fc812728d7bb259bd541847ad51f0614b051f13eae4c794140dfa8a651eada2ee82c36cd7f76c42252ae1bfad44f63d01f77d43f91e55f08f047f29f5b8dad5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "d8d43189178768267a5d4d66a8ae06918d4ab77cb400e1a40863a42f81ca9e75f9cef82a68f99c8e29edf8e9b3fca5af917ddce2c0f5a9ac257d9be02b3a143a";
+      sha512 = "cd12fde14e1f157ddb938b38e99ca05173aa8e5c5b09dd826c7aa2db8159dc1b123a792a772b226939fc44f5b9b364d630287431b3326394a4f964b9c83ba337";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "31835edca2286977c76544c6885f8b716c67c871276fc9856077d00292eb6130a4d4345ca56e7ae75c392863a598711f69882039145668a95194a65fc33d934c";
+      sha512 = "ee5f3d9ea385450b0bb3da154480b0b0d88c345fdab8a6ef43380d512c10300f5b00ecec28514bd74abac3b2c7ce492097b0189c4d7680fecc512a171edfb55b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "0ba71a5ce4a1966845e1ffbc9e7253980d18ff429e7be9a600c9d3ce1f28eac8350b1401f6a43413e86c8d4a552a2ec3f490dddeca9e34569ffb5cd56cb3c5a2";
+      sha512 = "abbca7a1410c717a8922d8dd0bdc2fe14a4a699f4ba1887bfd443466be523f5a0aefecb5d8163d1b77ab0a6448fe2fc3559933a5a8fbe7f119c45ed1bb4c48ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1e42024d4f5dab9a8cf37c6c9070617a5f4c631bff3c5cbf66a4a1d5d9e893fc320888bbefa6747a665b6941ecdc266537b539bdb6e165b30da4f832e38bb09d";
+      sha512 = "02bb6fc55ed10d05061071640bcaa8219ea719c3645f368c4fba44ba5accf71f8de9b7f4b9306dbc5da7716f4bfc3cb414706a31f336a8d24343f9de5c4c0a23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "0189234479d4b7da251571860f71c88d7358609208bce5bc698a969f054226a07442864557ae51c4a25955cca4bcef409f6a8aa347b00a1fe438d53325925ce9";
+      sha512 = "da929fcf02a4b08ac03f5ddd076e5b1433e69daeab0b246b0f475da0e56bd6b7f122ac14e34a14960e1d5f881ce2b9b9764c71d3b0245258bcbd3e57ad9c7a20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "03d15323c53d30c52b71a9046370011f39a8a8f2386be45d1bdc014fff1d4ea6efe979a199d3ee63f1fa18b0c7f5ee552e9048863b6454418d89075a70ff9dde";
+      sha512 = "bffbfc0f14495524555f3acaa0ff7bfebd605dedbbbbbbcb29abd3f2bdbd5b5d924fa562502af8f62714f11a00d060c33e8d9b3fc80c6410796175a04f8c9e70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ecb246da96e682d5bd0706adbfb2b6448c16c1bef9643db453d3ca17484b1a929c0eeb8f0a1416cf18fd7eba489d897f29a148a41050cb0603121b2c819e0a70";
+      sha512 = "e8bb642b9498b300c6f594cd1865776b633a2ab7e92b0171860ab9aee14c8d4d1845bbd3ed2417b8c3fc035a297bdd36d668f5b45eaed58adee0e6f5517ac5a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "1ffe32f481faf8c94450bf873b3391db3546f0692b5697ccfd76ac0fdc493a8fd9278c8c196df1b36468b62ea517fa120acee9bb610a66eb27c69641b4f22167";
+      sha512 = "c9dc7edbe2b7720459afa58e1ed2949b48e87edd29bebf4b9911e4d78e6e8b00cf0f81a5c36fe5e9c01d3c9071604acf9977adfb6034d25f88d48f7b171dc336";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "9f5754d2cb8ee16cbc901202bb59696bba08848c2ad739fd689b295fc2603ed72803acf344a7756b19fcb046490ad2acb878ad065cfb177e1c5c0df1ddb9d0c3";
+      sha512 = "e0c6aed3db6b4076d75d3eac57be9dff1198a83ca70043355c0ba5b2d9c3327e76f159fe3ba957379b8e59a4014d1231a9092876d3226c4da1643fa19bab13a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "d813571e696ce1d4b404c6167016d591148de7d6e02b8fa1df2da5dcefb55ae71649f3a53485024ad90fd33be94c020433efd7911b6c1f6c25c8380f5819e6e9";
+      sha512 = "223f90ad302b6c66afc9de7c1cf0b9cbcbfadefae2ec210d53399f6657fcabba0dcc0068e8e17e3afa68aa94e9ee654544ea5307a957ca26606a2e8777509cbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "1ccc37564d296c42f4b35a2214cc21d1a750e09e0c99555284f769ee7e3da9674377230e9c2467795bcaeccc2745d4ff969c4f5d4dab1bbcb216f7817bd7f100";
+      sha512 = "ed8199b9ba53cc4fbec41ffb68296abe628853029fc2f0f2d5cf13e1262b99a212070cc1ccbef67598d33bbfe94b5254fe4eb14d980ca0d13b4f6282bbd96b71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "be419aedecd14cd7458eb984ffc040f2f9d0316ca1b078adcf4ab0a1ae6f2acb7c04fbf0b43520aa5492ab3c9551aacc59e9c986434d466eb30b48cbcd4e70d1";
+      sha512 = "69daa139c5e88da0dff1690140876a19f3fae674f5a9b5c77bf74ff93179cf14a5ff17fcd2288f2d1bebe0e6bb8ee78f379e6afa564f7984c0ec5b05dba46318";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "41bb68dcc0cee8bbb4050b463648f8f59ed0f1bf4caf701f9c3ab9ba7830caf6655b368798cda6fde6949b4b04ecb1c73637d1db1aff5cfef3bbca7108d9a8c7";
+      sha512 = "dc8d69e8b01a2e6166acd15620d3c4a794160ba079fe0c618be31fb1df1bad320a692fa61f2f924a3e377ae36359ea732e02fa2090eba61ca6385f72759e02d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "42126ac31e47ff7045f43277b80bfb49cd241fc1a00f652eef3f0c2bc2a5de05c4bea6906287bb72dde52f5ecf58726cb3ce8a42081916d3af06b3b621c88647";
+      sha512 = "1b265db34eaac4c303805f585e147aaae408854c83bcf41c8e2c6934084f971fecdc32c1c33cd113f5e19a821db54e7c91fa2fb8ab9521987d2ab3ed8141a8a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3f475233602a09976644ba68472538f85885c54979914dac838be7df912de4818a9afe170e82c8f980555f5da6889db6fc2efacd932eb850bbc4ed6b28a41e2f";
+      sha512 = "3306b84daa72d3d70918f40310121c0baaa87ae967441083f5fae628435b75e85dccf941f6c30562bb45afb15ae4b5db5d4f28cfcfeaf8919bc153227f26b804";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "e500aee682c57ebe120a312a127801511adcc54c7e19de33e8f80bea457175f6139a7e306cb1bc43d63f6d150fc4c98ed0709a62ffef885b3ff87a768e09cfdb";
+      sha512 = "49c9f5883495e6cf68754c71b4b14d6ae5d7c508805c0ee610d9fe2603d15accaec8e4083fb4c7a76b5b26fe76d3d23c1071ef7dd267a318898a67df5fc96870";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "850d44141894ca1a5d98fe9e3391a4ce4f8fc3c0db3dff5c1b7eb7b75085add18c03da6984f433597102c77374133b2b4b48262d4ffa3abac8de6424feb6c3dd";
+      sha512 = "bfe04cd934fc5af29d6d823c77ca1f0a7171ce143d4797c203fa5cff5e33652d8c71783dfb933afdf6980bab97b7c889167a2614ce7b3199dbe265441cd078da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "ee8bd8595897d43db06e8c3e3247c33910c4665111f1e2a0101af5eaebda726a44167fae82bae309d391de1901057b97901d1ee6162163bcb565c630b1d72974";
+      sha512 = "b4a193e681322e104980710dae82fefca4c6f2b007ac035439dc95aab28046e2193de94656682af0f18a63c91f7bd724ec69fc2b239c7e633a93440f4ef5a0e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "be5d83bf8f06e55bd0a23a9e3338368cd4cb7f2126d88782d4916da3b866a72a6c0da213f3151ea09df4902000db55883aa12aee5e3f5e512507217cc01c5678";
+      sha512 = "ef041d3cff46f7ed02192db781193bca9a9f903f68c880f7546f49fbc30d9a01ae77d31f3717ea27f4617ad70ca838a89af1a10722e0c20976590eaa596c44de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0291d7a79dd44ef0491043da2af90c8caf576ba8cae370d3c69f6c7fe866748ebcb68888da9cb5e144745a97e0b519d46fd2f57cbbcf19d3157ef5c3e2d4b3e7";
+      sha512 = "b621992d02150a1aced53e0298277944aae6463d06eedc6a18c8cef3995fd9d8c68f149d81b0d1261bbb1e0199697e8f169a73ea2db0be5bf25233649a175442";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "490ce118948632d6b64d8c4157da8ac3665239ae7db5ed4cf6e176b35812d8a73ae535b93bbc6f4243c4f8ad8f0108162b8bfc0ed89d8f74c85b51aab977897c";
+      sha512 = "7236f8075a63316244b8c398996c486cc8a592e3be85029e6050cb1d01d037882e892a31b3e61f8554007d6c653497df244e95e57d59bee13610a36bad2eeb26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "ee6b365694b32964e17c15d37a621732185af437750bf6b78297c298931f1fa7e3477fe944dc52da6a8d8f6c2a4ee13340a37a5efd43d6c7d1a7ac4ff7be9502";
+      sha512 = "9288f03925476f2baadde3ad176763883b365dddca71290a51396f8bc5367d19cdceedccf7b9a3264dbc36fb9f49b443b6d1761a87b0f2c7d5c74dfd469d6a86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f82a8e742f0605326cf4edacf5f3875d9de5aa8b77c67567b42898fd5b86575ca4e34fe11ad3274b53ee951a4fee4ba3a1050b075e105d675175b58169b1a02e";
+      sha512 = "a75c0f644828cb6a2feb33774af2ff3374070693267983f7d9f92b94a1e4e40dbc75eb818c86e8c8682e76f90903b094efd4a0146da2f2594fe34df7e3d0fcb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "16e9db59eb9ac08f14c5cf36496ed6425c210e5ab71bc290e72239b7ef6b38070e000d889e5747763e78bc6bcaeed4bce0c45bc0a3f60d5b27a87038ba311035";
+      sha512 = "1f640beaed898e8c62170699ce997ef6b186a776cc2b54121c796521f7da3bfa89e40213b21d15fcd96bb0c7f526bec00e87e519a262c205b7696970382b7467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a6ddad3597feae0418e0bae57ecc507372da5a97b71048c2381272dc30e85109880cd56639f2089996cc5f652ca3b97f51c0d3022c1e16ecb3b143865db1d326";
+      sha512 = "6a70dc133122dcda74a2d78c350ed405c3ae7362cf8ded43493d8d5062e310d1501539407c9ba4ce871f99022ccd5336f4c0e1a2537ac27aa947fdad2dccc71d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "9701cc05e02c4cd1f28f056c5b19ba19bf4ff459df7a8fd185864a4b0d5686280669d4eeba38b20570d01459e5e0080b2faa7118a18bc2da36f99a452f7f12f9";
+      sha512 = "a5e03e293d293e219d6ed3216091544f3dea363c7d745fbe603829fa10390ae285ffeac9103c046f81a89acd53403b0c0a372050c1b8a5fc591303c7d27462d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9d00704ac0b02ea27a06c0339b4937aaeb40cf50e3ec6390c3c56270cee589e480a7b7f014fd03d86db970cb70e67b762ad4b728ecfbdaebea1ea2fcb6a25bb9";
+      sha512 = "7f88b803609ddc1bf173ac6c7b4ba7f2f748a44451a1bee857ab2f6000d3cdb5d0ba7518d00faaec64c5f162ad7ceb771272569efba5e20a66b581be9e1fabc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "33b0201e80bcca259edf60618e582b1c0ae0be1527ec105a81d972201a6439c9b8eb39fbcf9498adccfe79193dbcf98b7863c62bb0f230c0fe9912062522cf49";
+      sha512 = "9190155e48bcdd5497dee82307146bf4caa4dd1ff4b1e198daf9a6cd5bc7ee9f53ebb08420fc896af8087904705591d36b578a24ffcafc0d7cd4267bb8e0e795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b8de8b7f0aa9a399e8df81169567df5c3d4d20d40cb913749fe848bdd81e61eb5f0120b9836526c65ef58700120cac28fd43d2d8ea65d6ba28658bfc4b08a954";
+      sha512 = "bb91135bea41bfdea6b2c47a8982ab43f6cbc07b1cfe4f01ddff85f745416f52207783c7253fa231294e1ef3406624b55d01bbc3d08704be303730a6b72271c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "e10cbd32691c5797ecd2894b12d71568108c5ef48792ba8dc620b09b7f4819f6f5ab7ff41928861d7297bf2c72e1269b001afb8bf550ebef3f66a1c9caf7ef0a";
+      sha512 = "beed763be6cdd4eed7a2dd6ba5ccd56c9747905e331d11f2a849b161c7dbb16fb08c32a73574e1e127f07688e75261462e90f78853a9f68bd240ae68c20823d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "45a04cf4dd3007cf8976d27be5b318a978e04100b4121a63e9d5feb11d3208fef85cfbff27d71e0f46b7f70bdaad26a9a588aa7c89adac61e8ff87e3db46df64";
+      sha512 = "2ea035192a894496887dcf71b01834027be7f4744621f4eddaaf93d374399a03564aebcc747fc79d6a4feb3f28ee4f45c3e3fb2d3b849194856ecd7e8e8b89c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "77406b8edd59e48099675d3f2c9abe6f53259645f718d465aaa6f11ee12afc88a0577baa5f9e3f0efff54c025510d4ec4b4277f35401d8cd8fad212c1aa7c215";
+      sha512 = "364f07c66765a125f7c2d46784d3dc65b46881719131da2966ab59dc208e4e28d5abeb2e5e22ee8b31014e09b60199e2f78ba3b2d8a051ca93affc26cf5bd92e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "0978497ed23eacc9e18bd348e115266d4cc2d16ec51255cce2d93f7faa4d335067961e59ff44a7dc3adbf36dc96aa1b8383127d617a82dfb22b374a92e2cadf7";
+      sha512 = "4452a40b3f15e8ad7515fa8df963d4723b892b2fa2ed06c9a75b24ccf8d7d7dee01fd550ec75dd106f3e839d7639ccabeabe7113a59f920a848e946e07ab40d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "6458a6352c72db89496426dfcd9fad79cffa357d129fd3fba80a13ca2c903d9846820f453e0f480758bacc1fe0d3254a2e8f29c94db00a139402c83869974602";
+      sha512 = "a93b16147be352b2cdf4c5ddcdb92bbaa611e43b051e54032803158850a28c8a66970ba56c07d538a68a7ce703cc9fa449e8e0cf89ba4c2dc3aaed3adfa8a4e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f60cd6e3fa1d51e4f02044bea5af0a48f6c5a37865fa96238712eca362ab3ee9d5900b421ff2c0b1da30ac221455196940f62a3393a28fcf2f756a6830562797";
+      sha512 = "4d47dda173e0c8ffe8dd94b803aa7340de3dc24757dbfde6e18ba652c90a241c0c031d0e1d4002703ed2d5a046db73440eb20c56a8de36c35890b4455cd7a092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "4ac19276ff52f8ec8bb939ee87cec2b462e8c9e056bf6b00b2099fba0fdeb23602ba3dba0a4b93e03acfed82e3d6e6e9846d8881efaea61361badd88ad119738";
+      sha512 = "9f6e75b7dacfc1fbf1f713948954101cde55866d9f17e802c295e459abe076cf379848231580a2cd240a12acbceecea2d9d5085d7077d9f5401a8310bab94f2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a463e9edf4ebeedc1be086d43ce798e0556f852c3e8f10f8b935424fce6e9af3dc7912d4e4a5bf1f3e6d9855588cad9454035cd3b67f303713bdb203379d64ad";
+      sha512 = "b84e51deedbfe48d381eecbc43383e8c9db95b9444d6ab418a9ad03336164bfd9e46f62a2b8dc676f524a148b53d37cfb1dbda8f53fdc20b0ecf4c8d67073e16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "7f55648abf6547e236551d7409e598702c00bd17a844c46ac53fca70c433983bdcca8728902f8f040e5a8ee456bd339c15daf99eb06e93fa6145e983205e8b77";
+      sha512 = "ff9cd81e57a54e123f06399168847d7cb41ffb36618002353140eb83d38d3d8bd78304c022f011ad703ec8e54b19310810f3c9e6951e853da4dbf6fc5ef4b990";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "41c3e4981e582c3c2ed24b3e463fad58d6e57d60d5336dad79c568f821d03f5f1183cd16e6886f136ee19d27cf0a2c3e066385f1f653a4de37c82ec9dabb77e9";
+      sha512 = "ebf41ea935a6cbf3858aa8874518b345574b6d32a8e16159da2b5c219766d38aeb0207f4cbf90dee1ebc758676e65275a885d932dd148eba1757682195683bdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "1bbbcfce541ebabebbde96b76b9ad20caf5d88f018b8d81be0eb6887d1ac45f278f71032c8e48901ea527bcbb5b97da2e0c30c4ee644cbce3e4f2b913ad623ab";
+      sha512 = "770c9df8b2b8f317720d06e4b33ec13368f47da4e5d1344f676dfdddfb17a18036d2ab69f8954037d779bc64d4263b49d629d1c4c81652faef50aac90ffbb7f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "6006e946d16d59e584f5bba96c0016ff0f82205b8581d5d43f8e1789a3b3f14a8104019c85847b4c9b13673b47b48dfe7ac572c12e08f7a7593b2ce404bdf75e";
+      sha512 = "1a1f0706b37cc94980a592efb50b321bdec04594577d5e39f45274f76d68b4af44a84c2976f91e6992cfd2b29f7ef1bc2a8c3eecd06f49a846f36e3b588238e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3391a9dcd336b26d069c609f1806d0ea98bd9bd85688c006a5ff271a494d33d3d5f969122c12f845348bbe6065ceef5a67516816f307ab7409ee68a282d4fded";
+      sha512 = "8d300560c54e99420aafcf3752e157d256b215abc6894d7d84ac84056b1537addaecc628dcab1e3bbcc0533abdf6d66d34afeb63cdd680d87cf2f0bbf2d98018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "5026484442691f9d5b2c7c22759b8ce43cbcf19b5ce91644341fa18039f851d812fdeae64eb71fa27e016237aab33e3fd0ca6621c723e0c56b9156165d5d88dc";
+      sha512 = "3037344bf8c3c349089ddaab17bb5087cc6ff08d037426dfef379fa446ce9352b05ece1fb38c78c3f91eb130cec4055d448d8c8c95df035d2289872bec3c2019";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "64726b0dfd6ef6f2823249d794a1f7fa8bb31dbf54e120f13aeaa7aaf9ac56860b388e2cb6c1f51f33d4dade9d703ca323493570a98cde38adb4ff7d5ce76f8a";
+      sha512 = "0f1c97b9424024d06bd2e55e9b19a6aa1a864bbacdf1d3472ca49154d7b0076e672166a50152e9a79081fcb43482195696ce2461a6f2460f089306bcf8010c4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "08b0c2fa6fcf3caf7174bad1268e1ae8c3ab3273f4d6780c6aafba7ef68b7cf0535010aaa2af2af17b91ab48f979af2d37a57e980c4c6fd0b3bab04b020d8cf1";
+      sha512 = "63e3258ea9d03222922fca33f490539ddcb4665d681fc3cc1c8ee9c7aa19497eccca0e112994d51256b8dd674487aa47a907511fe1b1c0880aac42030fc8cf5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f7fa6326c1c10de051727d4c83eac04c633f730a08dbdbad3de228d30b0f57a0b158891c910348083279807bc9ae7eeb43ce0a317fce338c1c84553a3498002f";
+      sha512 = "dd3f7edee883324c2794a5753111f051efec6c1b406166e2a7952b57e29436a3cacfa959cf20e22940cceda73a6450be4f41da0c0d40b234f2260ec0aa7a2690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1f020762f8b8cdbf35b316ab041f16243d6df19ea84457b68b6a969e5ae504dc58886adb2d28267cbb6b09cf3664db4a8b0d475ab6b0cd382deff5f15e627f96";
+      sha512 = "405580d9f71e674122c034efd130597e4c8be01dcaed041bc12539343ae4a7ca3ed3dc0199c246559fe44bed48a1445e913a39a7bf0a9888df590295a6d0fe1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "3859b99a6ad2a14c176d19db4ccd3ca2ec36e57a92661af12636b111f6cb39c64c871066bf5334df90884ef103ff6be5d982e1603dca8feb98bc0ba53b02f9b2";
+      sha512 = "a2d67dd6cbe543f6baf46441fcdab2b4282a2a3d42d91bdcdf14ef4f6e513ac22c6d8a019f40b4e7080f17ac4ce83e1479b05d8f07d19f7e770c8ef691c3171c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "c168e337f050b09fb8006b550781a6da6cce79a3fdcb21a51c6d584b45569e872480d6a950e56442e755c9fb5fa7b8a8760525977ad13fe4372f67738e48484f";
+      sha512 = "186bc96ab6d55812c366048ceb1e05ebf4044401d6b67d7e8aa81c306a4bed26ef72a5ca25d3a0dc468645b3fa5b0016c02ed223ca5c2efd05656bb6519767ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "b59318bb6ed70da73f6803319bc606ada26a371c22e561f6460d2968da013bcd976602dc5b30e6b44af8225a44cfb62a121d5c215cf693196e7ccc5b23548b84";
+      sha512 = "538a8092f3e8c6d684d0de7f909cab7732b8c5bc3da722ee8c1cba4ef85f814ebac964db9803c245ee6065cd7bc6549cb2cbfb397df81e0d990a427bee9e9d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "35191d28de35f4e37ae8184ecb3c16f2ecf10cd8dc451f8f79471d480c3cc885c48abfe5723cc367625ab9fce570b79ef5898457c98198b1ca34905cf195c7a3";
+      sha512 = "f16f1fbf447ed9e026c924f68d5d3c04ca68320f0e23cd5ef1eb288ff2d50bd95332ba3759410a48d0a36fbeaf390cf8fe5537a58aea58aac64ca2f04e870c78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "4db053b433dd7adbcfa5794b276c7c107d0601bccc8c85cebca4796b18d0c8001ad1ba413c4c1f755e281c1ea16eacbf722f04e4d600ec77bb9ee13bc5fa12d8";
+      sha512 = "62ef181fbe71d0b91fec36eb90cfdb0c76a3b0eda2a6a3288528b1414a18a73c8beb0428e5cec0bdf80a3136541e92d9b302b0a880a4f72c568f7ca7c2d069f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0c32453132f2a220d47337c55ab41211f6b3af64f9c365f7cabb4386399fc877f670193f72157cfb7b9d6cc8410346d33af3546609c00530fafba0c7fc07e480";
+      sha512 = "bde5365d7d77145f0ec0d1256496f303d78f1dd2f7459ec8bd376c4417f71f585239dc85b7c0752cff9121ba6190ee831163fe8db4cd6e5f4c8282a25fc736bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "796d5f0459f2cb67e5fd7e763a0b30009097aaf6bc6767c21fd32bb18ec45fbdbe600384dfcf296a6c29bf8347d2e922165a1e3e9853ef59ecfcbf56715d122e";
+      sha512 = "dc7167af19c73d430389aa5ebf7d2a3b52193f195dbdd2a5f82709771fab4c8180fde202ea35268b62400aef869d6ef0cdbbcfe8e1d45ff07052dafd58dfb78c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "189620d864ffd79b78942ddc177d9749285cfb9f3c289a1b3c8fdf7cceeef9d3695ef586bc07845476304bebfa8af285bdcb0d150e7d1e5661d2fd4bde46db5d";
+      sha512 = "3c853df6b14641f94ffcf20f972c82dfbe883c176fbe4e20a530d811ddafddddd935acebfe68a4857f8d33c58c858ec31c4a0ca6f8d58d717a51f506ae880d87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "d17696909f8d3c3016c270d1dbd2c537acbba8846105ec88c46f337cb97ac05372a1acb4ec0120bf9fee35b5e3f72b65235b6f062120d63e61ff20c37e09dde1";
+      sha512 = "03de4d0db15191e601eb73543f2794053eb0d25ec1161e668d80446d54e664b442e19f121bcb2a09e1626c01ca6a44f62cb85f95fa71474b394647d1e07d63c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "dd0f67d9b205490f1205a6d33eea76c18bea40372f08ad84bf6e8ab4ab9e1abd71ef2ff729d692bed8204ed374c13f191e04f8140acacdc373eb897122ac93e1";
+      sha512 = "bd11447447f93dc062ebf121578c068e36892a0594470a3bd03b16054012fe5af66f3ac376c694f7f175f52e6066608de78a4724ff79a13b39138bf94b49c963";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "9da4f47e384a45b976de48967bafdad35b2ba418e2d6e260ba3c6859be2d0b67251099093071f4c0c93b61d877ac1316cbf6a217926c77cc35841ec7a4b9a160";
+      sha512 = "45f5f39edf86ce562026ca86f4749536c1f7a4e22381a67885bf0ccf1e1471048fb16e1601b9292d3d38e6d40412d40b86f53092b24ca51a5c99d4be4bcb4a6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5698c5c4f0db7d7b9725bada6951519a87a960aec8424e4c725826fdb7316a0b69c891ca32ce7d53d43a2839f7e523a573bed85892428047c41c4e122e168dda";
+      sha512 = "41c2dbcaf152a75ab1b6e5ecfcf1214a1dd7de6bd9d80ec4a88fb70123a24d8f147f75aa02b292cc468ae7f8a86a127756b45a0aadb7ad81dc182b24ae63b9dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "beb075342de69736b207ac5a7e804575843f700b5bd4166885391cc667616ebc11aac255b1a1d897d607f673d0dd4cc0c7cde0b5c3dfb5a3e492373c63a06d70";
+      sha512 = "ad14e5b1f262373757f0b3d3285a6efefaeb4fc75cf07ee41fd5baee24854b0838b994f57734188cf79a109415bdf738852d703b6704c4fa9d3fd3446204d3b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "ca5632727eb2f99fe4cb08e151ce270330652ee7ba267c3fddc7ab4213b2b210f3cd4077e528026dde4bcc7e40cfdbcae16bbeb9448942736691c16f37ad302f";
+      sha512 = "25ba4e079a9e74a972a9ad37a2555c5c42d71015ddf461575d12ebd7c2304166df4a1806a073c8a56f07b7d824a6231d3bb5ff00eff58eccc293457d93b3307d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "548f91230ab8d36e60289b6b22a985f1a9d5af286330734add837a1d75e021713316975cb09afd2157133cf702dd32e9e8b4f1fc07e2d92fb64961ea8583b453";
+      sha512 = "01ab6ae58d1057247759aea87521a607561a55b0e11f8cf01272bbd06070f9aa5c3ca728c2f2041674c90f038d8b5399c8cff25e199d1da4501bd616eaf8970a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "063c0746ba10471a6014413a374768ccad89eddee8d2abf5cf3680fcecaf396676fc9629095d6629fede3e13bf72b7e7a096814771986b2c73ca0084cb767970";
+      sha512 = "1c2df86fcf9efa649bd22c0863898cd91319e05ec2930e7c4cecfc46da3a47449fc7cf86a0fb41e1813ffa05fd7c8d11aef23a0bd2d2cb8a5ed0df93c71e860d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "6a8e52f2f318ee0d4518dbddc7ef8c80bb4fd2e0f7b5a962571f5f7bda24bd81c04c712b4a0e121ba3084ded4d5320f0258618e5bae333869b8a1e13f6aa6fdc";
+      sha512 = "523db80c388f657cea7f69ae787637d1349c42874c9a3fb6b726ff6553c789dbd428c2e8b2d207fbc57903e6ff5fbf7493582b91f98b7c497ec96e77b299baed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "ffe5948bdad294311b5e57a417fd47e8c719cb1c918ffc3113a90c922610cad6d1c0ab26fb4c369a89f4968e4781a425fa2de895b39395f84cdc91727cb76ae3";
+      sha512 = "52d78064592ebea903b5a05669ab73fa3e86d2c0ba014a6b4199138a8e0cf7271da513c254fb25a23b98e93d16348e47c2bd1f32f4644257744f9a3fcaa47648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "c57ea4d7168069797601ecc5f809dfb1af98a197f3a277caedcdcaab93f7e245e7020d8317a60ccd3e5696fa72f13b1a62c51f6eb78e608e943f05614f47d9f4";
+      sha512 = "8eaabd96695c083e3d744b72ae5ce318f63887a7e70681b9f6269cbee2db60309ca5e2dbe35e612d48014ec815266b1e3dfac6884a1a38a08d6a04f802a10a8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "858b988345519cd645d8b812ab2dc13ad886aa6cd8cfec594369d890d162664871a4728119f257179aeb1b16eaf317db71863fb59120ca51c31d74dd535aaee4";
+      sha512 = "c03118fc5530133cdb0298bbe6e041b3edbeb7cb9ab74680410d9dca4440d9d4beb44bf792683bf556effbe24a28d7d31be7c23fc160f5dab27c76e8ef4c7154";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8154d4883a05426d6ea6956d280d73f5bb9f4be10a95ae0909e74bfc0a82af418fd01d847be2afcf91866b2f26e616d40d5a90f7a483510b16ac611926ea1f24";
+      sha512 = "410c12bb9ab8258e3d6c01c68272228a17116e9f3531296bceb1947091eb97d0e077b8749c206a767c7d18782a4cd2b7a5146fae1195c481e6b17265c1b9f4c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "10dcda386ec18b02d365ef3c0f6659dc18002d1620e7b1e8426d2f128aef983389fda0779b6bc46b47bbe500069ad7331d0180ad2d0d0e539da317a4581f397c";
+      sha512 = "d998dbfb46c4bce19d926b746d45b7ee4d9b4353a8c2e8472ea29f51cb41df1b7384508d8d2c51e6090a31cf3349b557511efad9fff48fdb680efec3fa82c535";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "13ee97b06dac091a7c162353117cb9c4e6761229b015b61c61ea253f6ebf39049cfcabaf297519da4819de478707d79d679578965e4d8c123bfa3d9ac4cac7a2";
+      sha512 = "eb712a2a1065316711582423d3f930154075654a35d552c46a1efd95c56840329b07c03e4d2587594793d8dbe70e77f40b08a26aff33fe4d6a7f81f9144b8037";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "ff97a465cd036b16960997e367ef1d6705599888e89988007afb17628ff8efd8c312e3cf10570e5796cfbef0576cdb3984ed0228f3601be40cf40433d7fb344c";
+      sha512 = "e358146e4380d68dcde78c06aabd27edf025a946d8aced77da8ae5f553db485abd44e79d56dcf4a247935dc37e012d20a85ebcaa7653240ac4a137362af1508d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "d6c4e54b0f65b26651cdf1cffdce5945d2b9ab47e1344f18a57ddeadd472287f8bfe3db150ba17ae342fc6ff2cfe70d6f067b9ce69875f20adc86bfae1c82e39";
+      sha512 = "fc0ba49c238c9eed79c56213f2a3eafe0239db392105c8d9163c8c6bec0e96b2d0eca89cdddf89fcb3e1265e66dd15ab44bd126841a2ffde566a2aad87754992";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "8f0c4ee9a619114cc244872940a6224c29bf1121369ca448ef828e5295def03d483a0e36264cd4c174148a182e60ea561e73761f07172d5c99952f39392988ac";
+      sha512 = "2f87f1b962bf5c0bbb9d23b56a63cd097c9fd772c42dfb470bc3b8696f59ec42b314ecf93f041ea8e34aea0a82da946086b8aef1c7de68cde1a75266423aefc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a963c1f43ee578f078ada5d7a4bbdf104f3de01d910171e44be284ba7c2acb88e101a3f154e344800d38feb2571ec8694dc1c19427e167ffa0fa71656579bb72";
+      sha512 = "71eaa7ea7d7efa95de76c9c838e41bd5a925f7c0736fe60b54e3d38480b58957ac6e48bb64e4ec3c661bd78238f72b94c3d823a59d532c372866b4eff0d4c700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "8621b33463145af2390fc4dd08443576070a008ec3119e9a28761ab46cbcdec537ea773f6d0004c5ec6ebd9a823d4ad3f358bddcabbf153b62a0e2c5046495f2";
+      sha512 = "a84953aa555aa29a8ac55fec57179b773348f4347b944436053bc54a025c40411c08b0ca318df03b759393793870f7de69cc9c63a2f7bfc51695e9e2dab426ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b1e6b26af9101b3f6b6de836fbb618b75f58dd18137c1899847e0b0e59795c94f24f35515e24ef77be25825a3ed1921fe78d230989c71f59a21eaaffaad7d23b";
+      sha512 = "c99e242d473f004c614797c36cbf86b0781639133101838d6745eba4d83651d41ae7559928ac7db5f34bdc74f2e9ad144255aea7cf267026f51c15b2201a4786";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "e56acfc28ea49ec19e93aa36cc470baf7188e9ee2817bee6e57fc37d99c953925123981da0455af7375b7d8d4a2273c9f63a91a03a454d29b96d2964fb5d7616";
+      sha512 = "7fd406b95fd4aea4df73a1804260e7be85e7b30d92a4ab5f912b519aa9a26b42f5c0fbb41ec6046b5f4654fb146747cd582be214bfc167a34c151cd1ff5ec421";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "76c69116f962c4f41df1e4a0bc8015307f424ef86513f88c972c2d61b533bfa5bbb07e7a540c91bafba7313cc53b0c5002d9be0b2bbd483a4801a3874a7b4229";
+      sha512 = "966404ba6670fa614bb63337de97ad5a3ea25b1850f95c8a79ec965c318aa073fd818cf2299e1469a0e25953a60d1b1ab6bd3ff8dd6475f98e0c84de769c2369";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "bb500d84058a6451158f0cd4cc6c057eb3fdc1d65bd438112f5df8396425d7113ddb96e833ee9ccf5345fa2cb6f089a0a19f46ad264ba5e6d579b943329d5561";
+      sha512 = "c36f8ba24429d0eb7e28b10c3e8fe0bb6ce45c2e82eeaf635fac441a9168ce1c7fbce2acac1f4ee631f2cc772aed509669390b673f8acc2aeb7f778a3de160c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "0e6e5424e797a1c5870fb64aaf5b7d84d26d9bd31d74894efd5c7e326c0582a4ce30e7610c463c313c6cfbfd36f3d518a60577862e56638fcfd0cfb8accf4629";
+      sha512 = "afd4b06ad27716c389e612e7dcf37b2551dc66bf7bc6c63c7cb06886c082e9e4f4745591a4915ec924aa8bd0820994f3dd2eb88cedc7e053b29066d6b502e08a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "9d0b3a76660ae382564bc43268341225aa36d3241908fe727550529fea39066ed924ffd59193cac882d8aa0e306b2608a78d6d11d398e6ff81a9059158af3c84";
+      sha512 = "8cf82519981879d5f3fa77e51a39532a60759be78713acae27207928eb88a7494f14dc4ca1bb0c8acd2e5e4c667bb6a1f6738d1ab13b32c45daa707c90095abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "556436ce9648c7adf9470495ab8a2ccc33864e92c2e41f4a7af7c476b249035e4e55a43a888ae19e03e6b42fb931767dd1683f7c444a29aff79f931388fb7437";
+      sha512 = "953ffc804424233cc81886f2913a4a9a1f49a16e1e5748c2a7696a7e8305e0e0c6fd99b5b1b235ed864cb36ff1ae59a8e30242c226c17609e8e7b5572eed871c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "cbbdc94b148fecee3b71bcd23af09354fa4dd453af01167adb8ced16b9499afced409dee7c1a23e02aeda9a452c1a3eb36510ba0b5bd8879cb2f7ed4aaa39bf7";
+      sha512 = "f9287905756218ed481cc9154da2b48cfeeef00ffcac349b3f33e83348ddc4d3f43a9bbcb44a178fa63a3a39d9570159ac39244b9e5749999904a6053562ec20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "b21e8aa88ebf570aef2752a2b186347794df3677c4e3a1248b20b94a43e5eb2961545309f0b47b2445601256cb18f277caaa330c9ab12106fa5ab963c6c15226";
+      sha512 = "8092158575953a8294cc1072c586615c9355da4601c6ee40db589e23656d61abf6c71e36fdacbc412c24a7b1af1fcfded5d7cc257d633e90b1ca9d6bc077b007";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "29edf3dcc7194e6fd0d5d27f354705cd25afc1fe53149964d8131844f1b1c3f0a477c0115a291d78a9d5a370e4918d39fd6fb6c5f5b3ef150bae6052b2acc382";
+      sha512 = "8d7c63622d81912d37229373635eabc8c9005b5287be1b49a1c2e6dbcbc104ede51f5c56e98058c403f5b745292816eecee582d8efa80dcbcc968a578f606ac2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3460c285dbc67cac93b6ab4f477b25b56ab0ffbbad20c302d0901578c045e0f65dd65767de468b5f6b594e69837374405a1338bba7d67e0d8447c76f4b99a704";
+      sha512 = "648b7c95ed6ae65e7d5bbf2f18228a8f22725f517599e97c71701d8c2ea0cb2e4bad23ece3730553b45a95b0c9ab3f92674717420a43cc8bb571ec5f960554a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "85ef101a19505520b5f0c15c47ab3699b0dbdc65031ed12b000ccead70a0efccd489d8b0a7140d9d3cf93f906136e63cc51b62de160800b2dfd7dd25e035dba0";
+      sha512 = "dfbb2039de2ca8b3338418f29368a98020bb3d810eb1a31ef10ef5e82ce097afe5dd167859a9b3c097ff2f99b8127ce5adb0b354389fade5a0635953897bed15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "9de749c7e72264b48609d0485790048052394400ccc91dc0dbcddfecef2a6c81ab2035354aa15d3f0293339a086099e68d414f703a32b00a6c50a4f360c665fb";
+      sha512 = "3d5e0adf9c89aca8e7eee5771aabb095ef1cbdab84a73f7d44c2b4419746095d25d239d728ffd143c5a57683578892627d20943fdad3aa2bf2459082a6c38c0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d33b836d739967701a95776a7b19c1b0d6ca681ff3e471defbfa1a25c8bfad681dffde12f92d04ad2a47433a245326f0cbd0efa0654b45ae5ad6eec7efe5ba36";
+      sha512 = "38220ba22a453adab180f968d9f5227034d39e4cc56ada7d38a333d4d19dfd2b16af52937449c7a013c6b42c9238068aaa16ddc2899b53edad980d7467f7edaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5d8754131064ce271f708b30c658cb16c360b083deb62095a3a6639e547ae672cc3554300105fc6a1a947b71e732a612bd208bdb5a5a8da2d59da63c1e9be9c8";
+      sha512 = "eb793c434240a3b17975ea860b9aca6a695e4c51eb19c15c16fb320475f8a2e91631d1f8e74c8caac9ad5d34d4f2e522fd97608591f5d33f00401c68b0cb6e05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "e3dfd19dc6fbccaf4b300a44eafd8f9b10ba9838f8650569df5a397204c2374fd797b00b257a6b7e775ee2f9a5ec46ab37e1fdb0008ec35207b17fdb6f407223";
+      sha512 = "e2c16a1faeb1caf05f5d826a6d3e5a0fa5a18884518d70db25a3a92dde9776541e1ce4e2931885b4cbe3d168957e867d446aca1d88c50526ff35349f5545d48f";
     }
     ];
 }

From 46e7e5c898fd34b9dc51b789f3d18c3539a71a9c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 21:11:37 -0700
Subject: [PATCH 2107/2266] rofi-pass: 1.5.3 -> 2.0.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/rofi-pass/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -h` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -V` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -v` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --version` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped version` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -h` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --help` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped help` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass -h` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass --help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass help` got 0 exit code
- found 2.0.1 with grep in /nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1
- directory tree listing: https://gist.github.com/b535484b83f99920256e8f30a2b337f6
---
 pkgs/tools/security/pass/rofi-pass.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 61f51973ed3..3928f61fa96 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "1.5.3";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "carnager";
     repo = "rofi-pass";
     rev = version;
-    sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq";
+    sha256 = "1r5z9g2kc6qf9r2d7vanzdc594apf8fgyn1rh30fvxygl2976yrw";
   };
 
   buildInputs = [ makeWrapper ];

From e43e8254a14975a001e600ae1e2a688d7cbe7ed5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Mar 2018 14:41:05 +0800
Subject: [PATCH 2108/2266] neomutt: 20180223 -> 20180323

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

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index ea7e7ee282d..d9c2a136adf 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180223";
+  version = "20180323";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb";
+    sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) so we disable them for now.
+    # that has tests (20180223) as well as 20180323 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c

From 8163358cb0c766be78facd1ec5c5699edf745e4e Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 26 Mar 2018 09:39:17 +0200
Subject: [PATCH 2109/2266] testssl: 2.9.5-2 -> 2.9.5-3

Bugfix release: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-3
---
 pkgs/applications/networking/testssl/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 8ac2f7b0a3b..24ffe61b5ab 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgs }:
 
 let
-  version = "2.9.5-2";
+  version = "2.9.5-3";
   pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
   opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
 
@@ -12,13 +12,9 @@ in stdenv.mkDerivation rec {
     owner = "drwetter";
     repo = "testssl.sh";
     rev = "v${version}";
-    sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w";
+    sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n";
   };
 
-  nativeBuildInputs = with pkgs; [
-    makeWrapper
-  ];
-
   patches = [ ./testssl.patch ];
 
   postPatch = ''

From 2642940e71eb6ce42e6f0d00392285a98c60f369 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 5 Feb 2018 14:44:54 +0100
Subject: [PATCH 2110/2266] mu: 0.9.18 -> 1.0

---
 pkgs/tools/networking/mu/default.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index d0fd7af1290..f8c3d754100 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -5,28 +5,32 @@
 
 stdenv.mkDerivation rec {
   name = "mu-${version}";
-  version = "0.9.18";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner  = "djcb";
     repo   = "mu";
-    rev    = version;
-    sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y";
+    rev    = "v${version}";
+    sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc";
   };
 
-  # as of 0.9.18 2 tests are failing but previously we had no tests
+  # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests
   patches = [
     ./failing_tests.patch
   ];
 
-  # pmccabe should be a checkInput instead, but configure looks for it
+  # test-utils coredumps so don't run those
+  postPatch = ''
+    sed -i -e '/test-utils/d' lib/parser/Makefile.am
+  '';
+
   buildInputs = [
     sqlite xapian glib gmime texinfo emacs guile libsoup icu
   ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  checkInputs = [ pmccabe ];
 
-  doCheck = true;
+  nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];
+
+  enableParallelBuilding = true;
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
@@ -45,6 +49,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "A collection of utilties for indexing and searching Maildirs";
     license = licenses.gpl3Plus;

From d09b4d7b2eca0e39b7b84d61515add07f50763fe Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 26 Mar 2018 12:25:24 +0200
Subject: [PATCH 2111/2266] tor-browser-bundle-bin: 7.5.1 -> 7.5.2

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 1e1ea74b680..8f935f93379 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.1";
+  version = "7.5.2";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1c5mrc10gm5nklirzwflg7lrdr1v36354g9lgxnjk432izhwb1s0";
+      sha256 = "0fzfn1azkz6n82mz4vy5nnvx0xsd16cxa69wnvq33gcdw1jvjb2l";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0d274f3qhbf1cid3fmpk9s482bjvgcig3q7gdklv9va89bpxzsa6";
+      sha256 = "04yhny7nnrq3ahrax0ql002r7i3fsji8j3j9x2b6sr3g6lq91753";
     };
   };
 in

From c9ea1ff5236d141e07d279459d14f3c6a3fc5174 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sat, 24 Mar 2018 03:35:19 +0000
Subject: [PATCH 2112/2266] mpv: Add openal support

---
 pkgs/applications/video/mpv/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 6723c9dfe1f..421e0dbb8a3 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -32,6 +32,7 @@
 , youtubeSupport     ? true,  youtube-dl    ? null
 , vaapiSupport       ? true,  libva         ? null
 , drmSupport         ? true,  libdrm        ? null
+, openalSupport      ? true,  openalSoft   ? null
 , vapoursynthSupport ? false, vapoursynth   ? null
 , archiveSupport     ? false, libarchive    ? null
 , jackaudioSupport   ? false, libjack2      ? null
@@ -59,6 +60,7 @@ assert dvdnavSupport      -> available libdvdnav;
 assert bluraySupport      -> available libbluray;
 assert speexSupport       -> available speex;
 assert theoraSupport      -> available libtheora;
+assert openalSupport      -> available openalSoft;
 assert pulseSupport       -> available libpulseaudio;
 assert bs2bSupport        -> available libbs2b;
 assert cacaSupport        -> available libcaca;
@@ -113,6 +115,7 @@ in stdenv.mkDerivation rec {
     (enableFeature archiveSupport "libarchive")
     (enableFeature dvdreadSupport "dvdread")
     (enableFeature dvdnavSupport "dvdnav")
+    (enableFeature openalSupport "openal")
     (enableFeature vaapiSupport "vaapi")
     (enableFeature waylandSupport "wayland")
     (enableFeature stdenv.isLinux "dvbin")
@@ -143,6 +146,8 @@ in stdenv.mkDerivation rec {
     ++ optional vdpauSupport       libvdpau
     ++ optional speexSupport       speex
     ++ optional bs2bSupport        libbs2b
+    ++ optional openalSupport      openalSoft
+    ++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL
     ++ optional libpngSupport      libpng
     ++ optional youtubeSupport     youtube-dl
     ++ optional sdl2Support        SDL2

From 9ae966aaec02fb89a423a32de7a93252f4aadf81 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Mon, 26 Mar 2018 14:44:32 +0300
Subject: [PATCH 2113/2266] fd: 6.3.0 -> 7.0.0

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

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 3c826206869..889f9d56d93 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "fd-${version}";
-  version = "6.3.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "1q666k7rssjd2cbkm8bm2gsn5shlkh756qpam53kibi5ahrwa7dc";
+    sha256 = "0qykzkwrj4w3i5h1a328kadd7fgd91w0z2n4xr6i3csyaiwwgd1x";
   };
 
-  cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r";
+  cargoSha256 = "1qicgfaqzjm7sjzgxkci6bg495n227pyicj4ycds5z6mfy15hi4q";
 
   preFixup = ''
     mkdir -p "$out/man/man1"

From 35c8106701d663778d883f71f264889b3928e440 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 17 Mar 2018 13:46:09 +0000
Subject: [PATCH 2114/2266] gnumeric: 1.12.38 -> 1.12.39 goffice: 0.10.38 ->
 0.10.39

---
 pkgs/applications/office/gnumeric/default.nix  | 4 ++--
 pkgs/development/libraries/goffice/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 60c8b0280a1..badc02a3646 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
   isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
   isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
 in stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.38";
+  name = "gnumeric-1.12.39";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65";
+    sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f";
   };
 
   configureFlags = "--disable-component";
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index f67129c007e..6cdd19f307d 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.38";
+  name = "goffice-0.10.39";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "443199d7a9833fddaadfc4f9065c289e639eed480de316f37da816e396bb9764";
+    sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 760e972a860b88146e58a7d690787b4ad14f6936 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 26 Mar 2018 15:41:39 +0100
Subject: [PATCH 2115/2266] cloudfoundry-cli: fix build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7670add775f..bea9a0f65d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7575,7 +7575,9 @@ with pkgs;
 
   cl-launch = callPackage ../development/tools/misc/cl-launch {};
 
-  cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };
+  cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli {
+    go = go_1_9;
+  };
 
   coan = callPackage ../development/tools/analysis/coan { };
 

From 8fe59b5b297543c1186190bda7ba1b2ac29876a2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 26 Mar 2018 23:13:46 +0800
Subject: [PATCH 2116/2266] calamares: 3.1.10 -> 3.1.12

---
 pkgs/tools/misc/calamares/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index d4ee1661801..f66cc60c926 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "calamares";
-  version = "3.1.10";
+  version = "3.1.12";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc";
+    sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..a5d1021c35d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -941,7 +941,7 @@ with pkgs;
   caddy = callPackage ../servers/caddy { };
   traefik = callPackage ../servers/traefik { };
 
-  calamares = libsForQt59.callPackage ../tools/misc/calamares {
+  calamares = libsForQt5.callPackage ../tools/misc/calamares {
     python = python3;
     boost = pkgs.boost.override { python = python3; };
     libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; };

From 4874ce17019cb815a7f8bf6fd1d23b453faa2a01 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 26 Mar 2018 18:47:31 +0200
Subject: [PATCH 2117/2266] dockerTools.tarsum: Fix upstream import

---
 pkgs/build-support/docker/default.nix | 4 ++--
 pkgs/build-support/docker/tarsum.go   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 653a651df7b..f531f1349c6 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -44,8 +44,8 @@ rec {
 
     cp ${./tarsum.go} tarsum.go
     export GOPATH=$(pwd)
-    mkdir src
-    ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum
+    mkdir -p src/github.com/docker/docker/pkg
+    ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
     go build
 
     cp tarsum $out
diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go
index ad33bbac75b..f91a90bdbda 100644
--- a/pkgs/build-support/docker/tarsum.go
+++ b/pkgs/build-support/docker/tarsum.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"tarsum"
+	"github.com/docker/docker/pkg/tarsum"
 )
 
 func main() {

From 5e7ab184372843735ed26ec1d536d170b04e785d Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Mon, 26 Mar 2018 17:20:04 +0000
Subject: [PATCH 2118/2266] Use up-to-date versions of singletons and
 th-desguar for GHC 8.4.1

Fixes #37856
---
 .../configuration-ghc-8.4.x.nix               | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d953236784e..a80a8dfe5fc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -244,17 +244,7 @@ self: super: {
     };
   });
 
-  ## Upstreamed, awaiting a Hackage release
-  singletons = overrideCabal super.singletons (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## th-desugar ==1.7.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "goldfirere";
-      repo   = "singletons";
-      rev    = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce";
-      sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27";
-    };
-  });
+  singletons = super.singletons_2_4_1;
 
   ## Upstreamed, awaiting a Hackage release
   tar = overrideCabal super.tar (drv: {
@@ -269,18 +259,7 @@ self: super: {
     };
   });
 
-  ## Upstreamed, awaiting a Hackage release
-  th-desugar = overrideCabal super.th-desugar (drv: {
-    ##     • Could not deduce (MonadIO (DsM q))
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       from the context: Quasi q
-    src = pkgs.fetchFromGitHub {
-      owner  = "goldfirere";
-      repo   = "th-desugar";
-      rev    = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837";
-      sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw";
-    };
-  });
+  th-desugar = super.th-desugar_1_8;
 
   ## Upstreamed, awaiting a Hackage release
   websockets = overrideCabal super.websockets (drv: {

From 2b3ba40c03a87d2e9c3e1bff9f07da2c2a3e885a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Mar 2018 13:40:22 -0400
Subject: [PATCH 2119/2266] haskellPackages.lenz: Remove outdated patch.

---
 .../haskell-modules/configuration-common.nix          | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2155626daf..4a27cd012d7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -920,17 +920,6 @@ self: super: {
   # https://github.com/bos/text-icu/issues/32
   text-icu = dontCheck super.text-icu;
 
-  # https://github.com/strake/lenz.hs/issues/2
-  lenz =
-    let patch = pkgs.fetchpatch
-          { url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch;
-            sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn";
-          };
-    in overrideCabal super.lenz (drv:
-      { patches = (drv.patches or []) ++ [ patch ];
-        editedCabalFile = null;
-      });
-
   # https://github.com/haskell/cabal/issues/4969
   haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
   haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };

From a80856cec5811b9eb7778b157e5ea943db26e74b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 14:04:19 -0400
Subject: [PATCH 2120/2266] nixpkgs docs: Use SVGs for callouts

---
 doc/Makefile    | 10 ++++++----
 doc/default.nix |  6 +++---
 doc/style.css   | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 52d1f4630a8..714a2a3e273 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,7 +17,7 @@ validate: manual-full.xml
 
 out/html/index.html: manual-full.xml style.css
 	mkdir -p out/html
-	xsltproc $$xsltFlags \
+	xsltproc ${xsltFlags} \
 		--nonet --xinclude \
 		--output $@ \
 		"$$XSL/docbook/xhtml/docbook.xsl" \
@@ -26,17 +26,19 @@ out/html/index.html: manual-full.xml style.css
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
-	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
+	cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
 	chmod u+w -R out/html/images/
 
 out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
-	xsltproc $$xsltFlags --nonet \
+	xsltproc ${xsltFlags} --nonet \
 		--output out/epub/scratch/ \
 		"$$XSL/docbook/epub/docbook.xsl" \
 		./manual-full.xml
 
-	cp "$$XSL/docbook/images/callouts/"*.gif out/epub/scratch/OEBPS
+	cp ./style.css out/epub/scratch/OEBPS
+	mkdir -p out/epub/scratch/OEBPS/images/callouts/
+	cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
 	echo "application/epub+zip" > mimetype
 	zip -0Xq "out/epub/manual.epub" mimetype
 	rm mimetype
diff --git a/doc/default.nix b/doc/default.nix
index 5869920415c..a8f0e935bae 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,11 +16,11 @@ pkgs.stdenv.mkDerivation {
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--param html.stylesheet 'style.css'"
+    "--stringparam html.stylesheet 'style.css'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
-    "--param admon.style ''"
-    "--param callout.graphics.extension '.gif'"
+    "--stringparam admon.style ''"
+    "--stringparam callout.graphics.extension .svg"
   ];
 
   postPatch = ''
diff --git a/doc/style.css b/doc/style.css
index ac76a64bbb2..fe38986c118 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */
 }
 
 /* Extra space between chapters, appendices. */
-div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 
-{ 
+div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
+{
     margin-top: 1.5em;
 }
 
@@ -118,6 +118,14 @@ div.example pre.programlisting
     margin: 0 0 0 0;
 }
 
+.programlisting img {
+    width: 1em;
+}
+
+
+.calloutlist img {
+    width: 1.5em;
+}
 
 /***************************************************************************
                                Notes, warnings etc:
@@ -172,7 +180,7 @@ div.navfooter *
 
 
 /***************************************************************************
-                        Links colors and highlighting: 
+                        Links colors and highlighting:
  ***************************************************************************/
 
 a { text-decoration: none; }
@@ -209,7 +217,7 @@ tt, code
 .term
 {
     font-weight: bold;
-    
+
 }
 
 div.variablelist dd p, div.glosslist dd p
@@ -252,4 +260,4 @@ table
 div.affiliation
 {
     font-style: italic;
-}
\ No newline at end of file
+}

From 45e4dc0d5dc97349a4631d85107e12a260b25b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Mar 2018 19:25:55 +0100
Subject: [PATCH 2121/2266] python.pkgs.gpg: rename to gpgme

Let's be honest with what we expose.
---
 pkgs/development/python-modules/alot/default.nix | 6 +++---
 pkgs/top-level/python-packages.nix               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 7c704c9dc55..7abc56c4783 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme
-, service-identity, gpg
+, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
+, service-identity
 , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
 , withManpage ? false }:
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     configobj
     service-identity
     file
-    gpg
+    gpgme
   ];
 
   # some twisted tests need the network (test_env_set... )
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ad86720bb6..b5b86e3586a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8173,7 +8173,7 @@ in {
 
   google_gax = callPackage ../development/python-modules/google_gax { };
 
-  gpg = toPythonModule (pkgs.gpgme.override { withPython=true; });
+  gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
 
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 

From a11afa901f2094bba9e1f228ea53128d82acd04d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 26 Mar 2018 13:23:24 -0500
Subject: [PATCH 2122/2266] Use npth as "pth" for portability, for now only
 w/musl.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..a334398b54d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11002,7 +11002,8 @@ with pkgs;
 
   flatbuffers = callPackage ../development/libraries/flatbuffers { };
 
-  pth = callPackage ../development/libraries/pth { };
+  gnupth = callPackage ../development/libraries/pth { };
+  pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
 
   ptlib = callPackage ../development/libraries/ptlib {};
 

From da17974541af182f86bd98e992f1c25987adac55 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 14:45:00 -0400
Subject: [PATCH 2123/2266] Move the overridden CSS to overrides.css which can
 be applied on nixos.org

---
 doc/Makefile      | 2 ++
 doc/default.nix   | 2 +-
 doc/overrides.css | 8 ++++++++
 doc/style.css     | 9 ---------
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 doc/overrides.css

diff --git a/doc/Makefile b/doc/Makefile
index 714a2a3e273..b76ea9ed59e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -23,6 +23,7 @@ out/html/index.html: manual-full.xml style.css
 		"$$XSL/docbook/xhtml/docbook.xsl" \
 		./manual-full.xml
 
+	cp ./overrides.css out/html/
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
@@ -36,6 +37,7 @@ out/epub/manual.epub: manual-full.xml
 		"$$XSL/docbook/epub/docbook.xsl" \
 		./manual-full.xml
 
+	cp ./overrides.css out/epub/scratch/OEBPS
 	cp ./style.css out/epub/scratch/OEBPS
 	mkdir -p out/epub/scratch/OEBPS/images/callouts/
 	cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
diff --git a/doc/default.nix b/doc/default.nix
index a8f0e935bae..6f9804417ad 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--stringparam html.stylesheet 'style.css'"
+    "--stringparam html.stylesheet 'style.css overrides.css'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
     "--stringparam admon.style ''"
diff --git a/doc/overrides.css b/doc/overrides.css
new file mode 100644
index 00000000000..dd11eab82a8
--- /dev/null
+++ b/doc/overrides.css
@@ -0,0 +1,8 @@
+
+.programlisting img {
+    width: 1em;
+}
+
+.calloutlist img {
+    width: 1.5em;
+}
diff --git a/doc/style.css b/doc/style.css
index fe38986c118..23cbdff3891 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -118,15 +118,6 @@ div.example pre.programlisting
     margin: 0 0 0 0;
 }
 
-.programlisting img {
-    width: 1em;
-}
-
-
-.calloutlist img {
-    width: 1.5em;
-}
-
 /***************************************************************************
                                Notes, warnings etc:
  ***************************************************************************/

From 83624b970cf8016b3a85f09417f05dea502ba65e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 26 Mar 2018 15:14:30 -0400
Subject: [PATCH 2124/2266] linux: 4.16-rc6 -> 4.16-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index bcc1ec14561..5e8e861af25 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc6";
-  modDirVersion = "4.16.0-rc6";
+  version = "4.16-rc7";
+  modDirVersion = "4.16.0-rc7";
   extraMeta.branch = "4.16";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0kwn1qj44pyb404qhwm4qr8mmfni8qfh1raf010d62i48n7pgv0d";
+    sha256 = "13zpfjxd38202afjl6flc9brjw3sp4sfq3wls0v90k1i2b308qfi";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 807a308623441b6b765728d22751356d6e274a17 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 26 Mar 2018 12:31:11 -0700
Subject: [PATCH 2125/2266] qtwebengine: correct how NIX_BUILD_CORES is
 propagated to the gn driven ninja.

---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index df9995bc3b9..7e91cff065d 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -63,8 +63,9 @@ qtModule {
         src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
     '';
 
+
   preConfigure = ''
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
+    export NINJAFLAGS=-j$NIX_BUILD_CORES
 
     if [ -d "$PWD/tools/qmake" ]; then
         QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"

From 2456060458befca5f16b2a1dfd1efe895b83e004 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Mar 2018 16:13:46 -0400
Subject: [PATCH 2126/2266] haskellPackages.lenz-template: Fix against lenz 3

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4a27cd012d7..22e2e5cc722 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1003,4 +1003,7 @@ self: super: {
   # https://github.com/GaloisInc/pure-zlib/issues/6
   pure-zlib = doJailbreak super.pure-zlib;
 
+  # https://github.com/strake/lenz-template.hs/issues/1
+  lenz-template = doJailbreak super.lenz-template;
+
 }

From 0874789dd5659b2048bdb5c054bc976cb00142fb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 26 Mar 2018 14:32:50 -0500
Subject: [PATCH 2127/2266] gambit: enable on darwin

---
 pkgs/development/compilers/gambit/bootstrap.nix | 2 +-
 pkgs/development/compilers/gambit/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 7376aec2750..05e804a1f74 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Optimizing Scheme to C compiler, bootstrap step";
     homepage    = "http://gambitscheme.org";
     license     = stdenv.lib.licenses.lgpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
   };
 }
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 95e8dba762a..83e02b14708 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     description = "Optimizing Scheme to C compiler";
     homepage    = "http://gambitscheme.org";
     license     = stdenv.lib.licenses.lgpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
   };
 }

From f43878ca4db942296feea4840a04c12f3c18c3bb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 26 Mar 2018 17:01:39 -0500
Subject: [PATCH 2128/2266] gerbil: enable on darwin

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

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index c1a411120d0..555dbbfe460 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -85,7 +85,7 @@ EOF
     description = "Gerbil Scheme";
     homepage    = "https://github.com/vyzo/gerbil";
     license     = stdenv.lib.licenses.lgpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fare ];
   };
 }

From eb828c68317908bf044a2110fc1625d47893edcc Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 27 Mar 2018 01:24:46 +0200
Subject: [PATCH 2129/2266] systemd: add withSelinux option

false by default, so no rebuild
---
 pkgs/os-specific/linux/systemd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index a792283e70e..d0f35d6736d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -10,6 +10,7 @@
 , getent
 , hostPlatform
 , buildPackages
+, withSelinux ? false, libselinux
 }:
 
 assert stdenv.isLinux;
@@ -44,7 +45,7 @@ in stdenv.mkDerivation rec {
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
-    ];
+    ] ++ stdenv.lib.optionals withSelinux [ libselinux ];
 
   #dontAddPrefix = true;
 

From d46259560030851e9a0ea73375779b9bf56e3b92 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Mon, 26 Mar 2018 12:39:00 +0100
Subject: [PATCH 2130/2266] Add support for tarsnap options -H and -L

A new option `explicitSymlinks` will set `-H` when creating an archive.
This option makes tarsnap follow any symlinks specified explicitly on
the commandline, but not any found inside the file tree.

A new option `followSymlinks` will set `-L` when creating an archive.
This option makes tarsnap follow any symlinks found anywhere in the file
tree instead of storing them as-is.
---
 nixos/modules/services/backup/tarsnap.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 59e9d122fb5..c33aeb76cb0 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -238,6 +238,20 @@ in
                   Whether to produce verbose logging output.
                 '';
               };
+              explicitSymlinks = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Whether to follow symlinks specified as archives.
+                '';
+              };
+              followSymlinks = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Whether to follow all symlinks in archive trees.
+                '';
+              };
             };
           }
         ));
@@ -304,6 +318,8 @@ in
           let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \
                         -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
                         ${optionalString cfg.verbose "-v"} \
+                        ${optionalString cfg.explicitSymlinks "-H"} \
+                        ${optionalString cfg.followSymlinks "-L"} \
                         ${concatStringsSep " " cfg.directories}'';
           in if (cfg.cachedir != null) then ''
             mkdir -p ${cfg.cachedir}

From bde525aaaff5cd99e79a21e30b9fdfdf2cd616d2 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Tue, 27 Mar 2018 01:12:26 +0100
Subject: [PATCH 2131/2266] Add restore service for tarsnap archives

This service will never run automatically, but it encapsulates the
necessary logic and configuration to run a restore of the latest
archive, and allows to hook more specific logic, such as loading
a database dump, via `postStart`.
---
 nixos/modules/services/backup/tarsnap.nix | 47 ++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index c33aeb76cb0..88c847ed92c 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -299,7 +299,7 @@ in
         }) gcfg.archives);
 
     systemd.services =
-      mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
+      (mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
         description = "Tarsnap archive '${name}'";
         requires    = [ "network-online.target" ];
         after       = [ "network-online.target" ];
@@ -345,7 +345,50 @@ in
           CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
           PermissionsStartOnly = "true";
         };
-      }) gcfg.archives;
+      }) gcfg.archives) //
+
+      (mapAttrs' (name: cfg: nameValuePair "tarsnap-restore-${name}"{
+        description = "Tarsnap restore '${name}'";
+        requires    = [ "network-online.target" ];
+
+        path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
+
+        ##
+        preStart = ''
+          while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
+        '';
+
+        script =
+        let
+          tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
+          lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)'';
+          run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
+
+          in if (cfg.cachedir != null) then ''
+            mkdir -p ${cfg.cachedir}
+            chmod 0700 ${cfg.cachedir}
+
+            ( flock 9
+              if [ ! -e ${cfg.cachedir}/firstrun ]; then
+                ( flock 10
+                  flock -u 9
+                  ${tarsnap} --fsck
+                  flock 9
+                ) 10>${cfg.cachedir}/firstrun
+              fi
+            ) 9>${cfg.cachedir}/lockf
+
+             exec flock ${cfg.cachedir}/firstrun ${run}
+          '' else "exec ${run}";
+
+        serviceConfig = {
+          Type = "oneshot";
+          IOSchedulingClass = "idle";
+          NoNewPrivileges = "true";
+          CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
+          PermissionsStartOnly = "true";
+        };
+      }) gcfg.archives);
 
     # Note: the timer must be Persistent=true, so that systemd will start it even
     # if e.g. your laptop was asleep while the latest interval occurred.

From da04071c29fee118130d928d470f53710740cbc5 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Mar 2018 09:13:13 +0800
Subject: [PATCH 2132/2266] redis-desktop-manager: 0.9.0-alpha5 -> 0.9.1

---
 .../misc/redis-desktop-manager/default.nix     | 18 +++++++-----------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 169d6951d45..7a4348260fd 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -15,13 +15,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "redis-desktop-manager-${version}";
-  version = "0.9.0-alpha5";
+  version = "0.9.1";
 
   src = fetchgit {
     url = "https://github.com/uglide/RedisDesktopManager.git";
     fetchSubmodules = true;
     rev = "refs/tags/${version}";
-    sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
+    sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -30,17 +30,13 @@ stdenv.mkDerivation rec {
     qtquick1 qtquickcontrols qtsvg qttools qtcharts
   ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch";
-      sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq";
-    })
-  ];
-
-  patchFlags = "-d 3rdparty/gbreakpad -p1";
-
   dontUseQmakeConfigure = true;
 
+  # Disable annoying update reminder
+  postPatch = ''
+    sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp
+  '';
+
   buildPhase = ''
     srcdir=$PWD
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 565eeaa807f..0f9c306a08d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20562,7 +20562,7 @@ with pkgs;
     pcre = pcre-cpp;
   });
 
-  redis-desktop-manager = libsForQt59.callPackage ../applications/misc/redis-desktop-manager { };
+  redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { };
 
   robo3t = callPackage ../applications/misc/robo3t { };
 

From a8d08b04a2d2397ad1b189ac80981513f03eb891 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 21:06:42 -0400
Subject: [PATCH 2133/2266] documentation-highlighter: init

---
 pkgs/misc/documentation-highlighter/LICENSE   |  24 +++
 pkgs/misc/documentation-highlighter/README.md | 152 ++++++++++++++++++
 .../documentation-highlighter/default.nix     |  12 ++
 .../highlight.pack.js                         |   2 +
 .../documentation-highlighter/mono-blue.css   |  59 +++++++
 pkgs/misc/documentation-highlighter/update.sh |  42 +++++
 pkgs/top-level/all-packages.nix               |   2 +
 7 files changed, 293 insertions(+)
 create mode 100644 pkgs/misc/documentation-highlighter/LICENSE
 create mode 100644 pkgs/misc/documentation-highlighter/README.md
 create mode 100644 pkgs/misc/documentation-highlighter/default.nix
 create mode 100644 pkgs/misc/documentation-highlighter/highlight.pack.js
 create mode 100644 pkgs/misc/documentation-highlighter/mono-blue.css
 create mode 100755 pkgs/misc/documentation-highlighter/update.sh

diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/pkgs/misc/documentation-highlighter/LICENSE
new file mode 100644
index 00000000000..422deb7350f
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2006, Ivan Sagalaev
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of highlight.js nor the names of its contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md
new file mode 100644
index 00000000000..f4baa3c8e00
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/README.md
@@ -0,0 +1,152 @@
+This file was generated with pkgs/misc/documentation-highlighter/update.sh
+
+# Highlight.js
+
+[![Build Status](https://travis-ci.org/isagalaev/highlight.js.svg?branch=master)](https://travis-ci.org/isagalaev/highlight.js)
+
+Highlight.js is a syntax highlighter written in JavaScript. It works in
+the browser as well as on the server. It works with pretty much any
+markup, doesn’t depend on any framework and has automatic language
+detection.
+
+## Getting Started
+
+The bare minimum for using highlight.js on a web page is linking to the
+library along with one of the styles and calling
+[`initHighlightingOnLoad`][1]:
+
+```html
+<link rel="stylesheet" href="/path/to/styles/default.css">
+<script src="/path/to/highlight.pack.js"></script>
+<script>hljs.initHighlightingOnLoad();</script>
+```
+
+This will find and highlight code inside of `<pre><code>` tags; it tries
+to detect the language automatically. If automatic detection doesn’t
+work for you, you can specify the language in the `class` attribute:
+
+```html
+<pre><code class="html">...</code></pre>
+```
+
+The list of supported language classes is available in the [class
+reference][2].  Classes can also be prefixed with either `language-` or
+`lang-`.
+
+To disable highlighting altogether use the `nohighlight` class:
+
+```html
+<pre><code class="nohighlight">...</code></pre>
+```
+
+## Custom Initialization
+
+When you need a bit more control over the initialization of
+highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4]
+functions. This allows you to control *what* to highlight and *when*.
+
+Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using
+jQuery:
+
+```javascript
+$(document).ready(function() {
+  $('pre code').each(function(i, block) {
+    hljs.highlightBlock(block);
+  });
+});
+```
+
+You can use any tags instead of `<pre><code>` to mark up your code. If
+you don't use a container that preserve line breaks you will need to
+configure highlight.js to use the `<br>` tag:
+
+```javascript
+hljs.configure({useBR: true});
+
+$('div.code').each(function(i, block) {
+  hljs.highlightBlock(block);
+});
+```
+
+For other options refer to the documentation for [`configure`][4].
+
+
+## Web Workers
+
+You can run highlighting inside a web worker to avoid freezing the browser
+window while dealing with very big chunks of code.
+
+In your main script:
+
+```javascript
+addEventListener('load', function() {
+  var code = document.querySelector('#code');
+  var worker = new Worker('worker.js');
+  worker.onmessage = function(event) { code.innerHTML = event.data; }
+  worker.postMessage(code.textContent);
+})
+```
+
+In worker.js:
+
+```javascript
+onmessage = function(event) {
+  importScripts('<path>/highlight.pack.js');
+  var result = self.hljs.highlightAuto(event.data);
+  postMessage(result.value);
+}
+```
+
+
+## Getting the Library
+
+You can get highlight.js as a hosted, or custom-build, browser script or
+as a server module. Right out of the box the browser script supports
+both AMD and CommonJS, so if you wish you can use RequireJS or
+Browserify without having to build from source. The server module also
+works perfectly fine with Browserify, but there is the option to use a
+build specific to browsers rather than something meant for a server.
+Head over to the [download page][5] for all the options.
+
+**Don't link to GitHub directly.** The library is not supposed to work straight
+from the source, it requires building. If none of the pre-packaged options
+work for you refer to the [building documentation][6].
+
+**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be
+too big. If you don't see the language you need in the ["Common" section][5],
+it can be added manually:
+
+```html
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script>
+```
+
+**On Almond.** You need to use the optimizer to give the module a name. For
+example:
+
+```
+r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
+```
+
+
+## License
+
+Highlight.js is released under the BSD License. See [LICENSE][7] file
+for details.
+
+## Links
+
+The official site for the library is at <https://highlightjs.org/>.
+
+Further in-depth documentation for the API and other topics is at
+<http://highlightjs.readthedocs.io/>.
+
+Authors and contributors are listed in the [AUTHORS.en.txt][8] file.
+
+[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload
+[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
+[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block
+[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
+[5]: https://highlightjs.org/download/
+[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
+[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
+[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix
new file mode 100644
index 00000000000..a9fbcc178bb
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, runCommand }:
+runCommand "documentation-highlighter" {
+  meta = {
+    description = "Highlight.js sources for the Nix Ecosystem's documentation.";
+    homepage = https://highlightjs.org;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.grahamc ];
+  };
+} ''
+  cp -r ${./.} $out
+''
diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/misc/documentation-highlighter/highlight.pack.js
new file mode 100644
index 00000000000..f909702367e
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/misc/documentation-highlighter/mono-blue.css
new file mode 100644
index 00000000000..884c97c7673
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/mono-blue.css
@@ -0,0 +1,59 @@
+/*
+  Five-color theme from a single blue hue.
+*/
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #eaeef3;
+}
+
+.hljs {
+  color: #00193a;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-title,
+.hljs-section,
+.hljs-doctag,
+.hljs-name,
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-comment {
+  color: #738191;
+}
+
+.hljs-string,
+.hljs-title,
+.hljs-section,
+.hljs-built_in,
+.hljs-literal,
+.hljs-type,
+.hljs-addition,
+.hljs-tag,
+.hljs-quote,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #0048ab;
+}
+
+.hljs-meta,
+.hljs-subst,
+.hljs-symbol,
+.hljs-regexp,
+.hljs-attribute,
+.hljs-deletion,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-bullet {
+  color: #4c81c9;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh
new file mode 100755
index 00000000000..3b77af4af41
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl -p unzip
+
+set -eu
+set -o pipefail
+
+root=$(pwd)
+
+if [ ! -f "./update.sh" ]; then
+    echo "Please run this script from within pkgs/misc/documentation-highlighter/!"
+    exit 1
+fi
+
+scratch=$(mktemp -d -t tmp.XXXXXXXXXX)
+function finish {
+  rm -rf "$scratch"
+}
+trap finish EXIT
+
+
+mkdir $scratch/src
+cd $scratch/src
+
+token=$(curl https://highlightjs.org/download/ -c "$scratch/jar" \
+    | grep csrf \
+    | cut -d"'" -f6)
+
+curl --header "Referer: https://highlightjs.org/download/"\
+    -b "$scratch/jar" \
+    --data "csrfmiddlewaretoken=$token&nix.js=on&bash.js=on" \
+    https://highlightjs.org/download/ > $scratch/out.zip
+
+unzip "$scratch/out.zip"
+out="$root/"
+mkdir -p "$out"
+cp ./{highlight.pack.js,LICENSE,styles/mono-blue.css} "$out"
+
+(
+    echo "This file was generated with pkgs/misc/documentation-highlighter/update.sh"
+    echo ""
+    cat README.md
+) > "$out/README.md"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 565eeaa807f..ec7cc59917a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14202,6 +14202,8 @@ with pkgs;
 
   docbook5_xsl = docbook_xsl_ns;
 
+  documentation-highlighter = callPackage ../misc/documentation-highlighter { };
+
   cabin = callPackage ../data/fonts/cabin { };
 
   camingo-code = callPackage ../data/fonts/camingo-code { };

From 8dac5ce146c0c3afe963ea8bc955d5b147853345 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 08:24:27 -0400
Subject: [PATCH 2134/2266] nixpkgs docs: syntax highlight

---
 doc/.gitignore  |  1 +
 doc/Makefile    | 24 +++++++++++++++++++++---
 doc/default.nix |  8 +++++++-
 doc/style.css   |  2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/doc/.gitignore b/doc/.gitignore
index d8e765e38c2..d0ba103fa9f 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -3,3 +3,4 @@
 .version
 out
 manual-full.xml
+highlightjs
diff --git a/doc/Makefile b/doc/Makefile
index b76ea9ed59e..c16e70e9c6a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,16 +6,17 @@ all: validate out/html/index.html out/epub/manual.epub
 .PHONY: debug
 debug:
 	nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
+
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
-	rm -rf ./out/
+	rm -rf ./out/ ./highlightjs
 
 .PHONY: validate
 validate: manual-full.xml
 	jing "$$RNG" manual-full.xml
 
-out/html/index.html: manual-full.xml style.css
+out/html/index.html: manual-full.xml style.css highlightjs
 	mkdir -p out/html
 	xsltproc ${xsltFlags} \
 		--nonet --xinclude \
@@ -23,12 +24,22 @@ out/html/index.html: manual-full.xml style.css
 		"$$XSL/docbook/xhtml/docbook.xsl" \
 		./manual-full.xml
 
+	mkdir -p out/html/highlightjs/
+	echo "document.onreadystatechange = function () { \
+	  var listings = document.querySelectorAll('.programlisting, .screen'); \
+	  for (i = 0; i < listings.length; ++i) { \
+	     hljs.highlightBlock(listings[i]); \
+	  } \
+	} " > out/html/highlightjs/loader.js
+
+	cp -r highlightjs out/html/
+
 	cp ./overrides.css out/html/
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
 	cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
-	chmod u+w -R out/html/images/
+	chmod u+w -R out/html/
 
 out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
@@ -47,6 +58,13 @@ out/epub/manual.epub: manual-full.xml
 	cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
 	rm -rf "out/epub/scratch/"
 
+highlightjs:
+	mkdir -p highlightjs
+	cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
+	cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
+	cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
+
+
 manual-full.xml: ${MD_TARGETS} .version *.xml
 	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
 
diff --git a/doc/default.nix b/doc/default.nix
index 6f9804417ad..8abde58bb11 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -11,12 +11,18 @@ pkgs.stdenv.mkDerivation {
 
   src = ./.;
 
+  # Hacking on these variables? Make sure to close and open
+  # nix-shell between each test, maybe even:
+  # $ nix-shell --run "make clean all"
+  # otherwise they won't reapply :)
+  HIGHLIGHTJS = pkgs.documentation-highlighter;
   XSL = "${pkgs.docbook5_xsl}/xml/xsl";
   RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--stringparam html.stylesheet 'style.css overrides.css'"
+    "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
+    "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
     "--stringparam admon.style ''"
diff --git a/doc/style.css b/doc/style.css
index 23cbdff3891..83dae0dd2cd 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -104,7 +104,7 @@ pre.screen, pre.programlisting
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
-    color: #600000;
+
     background: #f4f4f8;
     font-family: monospace;
     border-radius: 0.4em;

From 970f2b5063ba59aed2583a9741e79658a92d7656 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 20:57:32 -0500
Subject: [PATCH 2135/2266] Revert "justStaticExecutables: enable -dead_strip
 on mac to shrink closure"

This reverts commit 24d313e2039b6d89f8a1ba4c5be12b134479fe67.

Fixes #37750
---
 pkgs/development/haskell-modules/lib.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index fef827cd9a1..1e58eed2fe0 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -230,8 +230,6 @@ rec {
     isLibrary = false;
     doHaddock = false;
     postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-  } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) {
-    configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"];
   });
 
   /* Build a source distribution tarball instead of using the source files
@@ -260,7 +258,7 @@ rec {
      the cabal file are actually used.
 
      The first attrset argument can be used to configure the strictness
-     of this check and a list of ignored package names that would otherwise 
+     of this check and a list of ignored package names that would otherwise
      cause false alarms.
    */
   checkUnusedPackages =

From 799e8c574548d1bc1bad3b9e8264abcdb93bf083 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 21:01:21 -0500
Subject: [PATCH 2136/2266] Revert "shellcheck: dont statically compile"

This reverts commit e746cbd904c255f81a73a4c1dcff2560fee137fd.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 020b35d571f..8cc1893d0a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8169,7 +8169,7 @@ with pkgs;
 
   shards = callPackage ../development/tools/build-managers/shards { };
 
-  shellcheck = haskellPackages.ShellCheck;
+  shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
 
   schemaspy = callPackage ../development/tools/database/schemaspy { };
 

From 0709ebba722b8a2408365f1a731bef884a2b6e29 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 14:31:43 -0700
Subject: [PATCH 2137/2266] gnustep.gui: 0.25.0 -> 0.26.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/gnustep-gui/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gclose -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gclose --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gclose help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gcloseall -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gcloseall --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gcloseall help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gopen -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gopen --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gopen help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/make_services -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/make_services --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/make_services help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/set_show_service --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gclose-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gclose-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gclose-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gcloseall-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gcloseall-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gcloseall-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gopen-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gopen-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gopen-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.make_services-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.make_services-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.make_services-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.set_show_service-wrapped --help` got 0 exit code
- found 0.26.2 with grep in /nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2
- found 0.26.2 in filename of file in /nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2
- directory tree listing: https://gist.github.com/1f55420b15dcdd93eb98a06634b7fb25
---
 pkgs/desktops/gnustep/gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix
index a28fef8f3d9..399bad2581f 100644
--- a/pkgs/desktops/gnustep/gui/default.nix
+++ b/pkgs/desktops/gnustep/gui/default.nix
@@ -1,12 +1,12 @@
 { gsmakeDerivation, fetchurl, base }:
 let
-  version = "0.25.0";
+  version = "0.26.2";
 in
 gsmakeDerivation {
   name = "gnustep-gui-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz";
-    sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5";
+    sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc";
   };
   buildInputs = [ base ];
   patches = [ ./fixup-all.patch ];

From dab9d404ce5814a0d27e347872e0e44f9901b573 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 27 Mar 2018 15:10:05 +0800
Subject: [PATCH 2138/2266] ncftp: man and doc files were missing

---
 pkgs/tools/networking/ncftp/default.nix | 33 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 4c632899ac2..0a0eadbfcba 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ncurses, coreutils }:
 
-let version = "3.2.6"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ncftp-${version}";
+  version = "3.2.6";
 
   src = fetchurl {
     url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz";
@@ -11,24 +11,29 @@ stdenv.mkDerivation {
 
   buildInputs = [ ncurses ];
 
-  preConfigure = ''
-    find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
-    find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
-    find . -name "*.c" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
-    sed 's@/bin/ls@${coreutils}/bin/ls@g' -i configure
+  enableParallelBuilding = true;
 
-    find . -name "*.sh" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
-    find . -name "*.in" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
-    find . -name "*.c" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
-    sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure
+  preConfigure = ''
+    find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \
+      -e 's@/bin/ls@${coreutils}/bin/ls@g' \
+      -e 's@/bin/rm@${coreutils}/bin/rm@g'
   '';
 
-  configureFlags = [ "--mandir=$out/share/man/" ];
+  postInstall = ''
+    rmdir $out/etc
+    mkdir -p $out/share/doc
+    cp -r doc $out/share/doc/ncftp
+  '';
+
+  configureFlags = [
+    "--enable-ssp"
+    "--mandir=$(out)/share/man/"
+  ];
 
   meta = with stdenv.lib; {
     description = "Command line FTP (File Transfer Protocol) client";
-    homepage = http://www.ncftp.com/ncftp/;
+    homepage = https://www.ncftp.com/ncftp/;
+    maintainers = with maintainers; [ bjornfor ];
     platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
   };
 }

From 41676002b28dc0e71306e309c2805438ed256517 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 10 Mar 2018 22:23:42 +0100
Subject: [PATCH 2139/2266] nixos/systemd: add option for cgroup accounting

---
 nixos/modules/system/boot/systemd.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 92c9ee0c469..b8a2d42e0fb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -524,6 +524,14 @@ in
       '';
     };
 
+    systemd.enableCgroupAccounting = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable cgroup accounting.
+      '';
+    };
+
     systemd.extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -725,6 +733,13 @@ in
 
       "systemd/system.conf".text = ''
         [Manager]
+        ${optionalString config.systemd.enableCgroupAccounting ''
+          DefaultCPUAccounting=yes
+          DefaultIOAccounting=yes
+          DefaultBlockIOAccounting=yes
+          DefaultMemoryAccounting=yes
+          DefaultTasksAccounting=yes
+        ''}
         ${config.systemd.extraConfig}
       '';
 

From 1b8d2a311904ef2f83819bc2039bf734028316aa Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Tue, 27 Mar 2018 04:40:44 -0500
Subject: [PATCH 2140/2266] bcachefs-tools: 2018-02-08 -> 2018-03-20

---
 .../filesystems/bcachefs-tools/Makefile.patch      | 13 +++++++++++++
 pkgs/tools/filesystems/bcachefs-tools/default.nix  | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/filesystems/bcachefs-tools/Makefile.patch

diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch
new file mode 100644
index 00000000000..812f9954cf2
--- /dev/null
+++ b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index af7a206..553ac70 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr)
+ 	INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
+ else
+ 	ROOT_SBINDIR=$(PREFIX)/sbin
+-	INITRAMFS_DIR=/etc/initramfs-tools
++	INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools
+ endif
+ 
+ .PHONY: all
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 0a5017de53c..3684b216cd7 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,17 +1,19 @@
 { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
-, keyutils, liburcu, zlib, libaio }:
+, keyutils, liburcu, zlib, libaio, zstd }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2018-02-08";
+  name = "bcachefs-tools-unstable-2018-03-20";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "fc96071b58c28ea492103e7649c0efd5bab50ead";
-    sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy";
+    rev = "ff5e165532a2eed87700649d03f91a612a58e92a";
+    sha256 = "1mikhffkr4a1yhy36yh70dhgcimcpvdm5mjl5fyni0bpgqrw67dn";
   };
 
+  enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];
+  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ];
+  patches = [ ./Makefile.patch ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Tool for managing bcachefs filesystems";
     homepage = https://bcachefs.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ davidak ];
+    maintainers = with maintainers; [ davidak chiiruno];
     platforms = platforms.linux;
   };
 }

From 1f4f6d79ac54b240f6f7120bcb18d5e9e9a16707 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Tue, 27 Mar 2018 04:41:49 -0500
Subject: [PATCH 2141/2266] linux_testing_bcachefs: 4.15.2018.02.09 ->
 4.15.2018.03.22

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 5aae37418ce..f5e219bc74e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,15 +1,15 @@
 { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.15.2018.02.09";
+  version = "4.15.2018.03.22";
   modDirVersion = "4.15.0";
   extraMeta.branch = "master";
-  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];
+  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ];
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4";
-    sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib";
+    rev = "919a34d47a68f3e5f00a7ce5efb67748ec31bd62";
+    sha256 = "1j17my3046ry8zdcvf8h2vnij89wkwmv64w3g2pf9lksh2909djw";
   };
 
   extraConfig = ''

From 6558ec1dd5d7dcdd105c8ca4a2b7a79dfafdd63a Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Tue, 27 Mar 2018 12:53:11 +0300
Subject: [PATCH 2142/2266] zstd: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 6617a4346e5..8fa2d181de5 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
-    sha256 = "15h9i9ygry0znlmvll5r21lzwgyqzynaw9q2wbj4bcn7zjy4c1pn";
+    sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       speed is preserved and remain roughly the same at all settings, a
       property shared by most LZ compression algorithms, such as zlib.
     '';
-    homepage = http://www.zstd.net/;
+    homepage = https://facebook.github.io/zstd/;
     # The licence of the CLI programme is GPLv2+, that of the library BSD-2.
     license = with licenses; [ gpl2Plus bsd2 ];
 

From 9a4871ad826f767992823c6ac385e96d12fb7af0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Mar 2018 12:00:17 +0200
Subject: [PATCH 2143/2266] tdesktop: 1.2.14 -> 1.2.15

tdesktopPackages.preview: 1.2.14 -> 1.2.15
---
 .../instant-messengers/telegram/tdesktop/default.nix |  4 ++--
 .../instant-messengers/telegram/tdesktop/generic.nix | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index afba9ab022a..df0b6f39ca5 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.2.14";
-    sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l";
+    version = "1.2.15";
+    sha256Hash = "18srw7g8h5zmc0plzqd03aijaylrsfaybraw97b1w9hj4lf2bl92";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "310557";
     archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 7027e70f0c8..2588340de1d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,7 +1,7 @@
 { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
 
 { mkDerivation, lib, fetchgit, fetchsvn
-, pkgconfig, pythonPackages, cmake, makeWrapper
+, pkgconfig, pythonPackages, cmake, wrapGAppsHook
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
 }:
@@ -37,7 +37,10 @@ mkDerivation rec {
       --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
   '';
 
-  nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
+  nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ];
+
+  # We want to run wrapProgram manually (with additional parameters)
+  dontWrapGApps = true;
 
   buildInputs = [
     qtbase qtimageformats gtk3 libappindicator-gtk3
@@ -113,11 +116,14 @@ mkDerivation rec {
     for icon_size in 16 32 48 64 128 256 512; do
       install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done
+  '';
 
+  postFixup = ''
     # This is necessary to run Telegram in a pure environment.
+    # We also use gappsWrapperArgs from wrapGAppsHook.
     wrapProgram $out/bin/telegram-desktop \
+      "''${gappsWrapperArgs[@]}" \
       --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
-      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
       --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
     sed -i $out/bin/telegram-desktop \
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","

From b0482248fefbf3b6cdd9c92053cfb49778a3a3a8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Mar 2018 08:12:14 -0400
Subject: [PATCH 2144/2266] meta: Add badPlatforms attribute for platform
 blacklisting.

---
 pkgs/stdenv/generic/check-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 113b95f3ab0..2f4ff62f767 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -165,6 +165,7 @@ let
     isFcitxEngine = bool;
     isIbusEngine = bool;
     isGutenprint = bool;
+    badPlatforms = platforms;
   };
 
   checkMetaAttr = k: v:
@@ -174,7 +175,8 @@ let
   checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
 
   checkPlatform = attrs:
-    lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms;
+    (!(attrs ? meta.platforms) || lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms) &&
+    (!(attrs ? meta.badPlatforms && lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.badPlatforms));
 
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.
@@ -189,7 +191,7 @@ let
       { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
     else if !allowBroken && attrs.meta.broken or false then
       { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
-    else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !(checkPlatform attrs) then
+    else if !allowUnsupportedSystem && !allowBroken && !(checkPlatform attrs) then
       { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }

From cdf9a78a3ebb535fa6ba88fce88c655776d2474f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Mar 2018 17:45:22 -0400
Subject: [PATCH 2145/2266] kexectools: Disable only on RISC-V if Linux.

The isKexecable flag treated Linux without kexec as just a normal
variant, when it really should be treated as a special case incurring
complexity debt to support.
---
 lib/meta.nix                                  | 2 ++
 lib/systems/inspect.nix                       | 2 --
 nixos/modules/system/boot/kexec.nix           | 2 +-
 pkgs/os-specific/linux/kexectools/default.nix | 1 +
 pkgs/os-specific/linux/systemd/default.nix    | 3 ++-
 pkgs/top-level/all-packages.nix               | 4 +---
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 199030c103a..8516cc1cd6f 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -86,4 +86,6 @@ rec {
         then { system = elem; }
         else { parsed = elem; };
     in lib.matchAttrs pattern platform;
+
+  enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
 }
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index e8ea2bed25f..2f0c402f398 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -39,8 +39,6 @@ rec {
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
 
-    isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
-                       [ "x86" "arm" "aarch64" "mips" ];
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
     isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 14ebe66e632..3fc1af28f62 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  config = lib.mkIf (pkgs.kexectools != null) {
+  config = lib.mkIf (pkgs.kexectools.meta.available) {
     environment.systemPackages = [ pkgs.kexectools ];
 
     systemd.services."prepare-kexec" =
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index c4c5b7cc3b9..26f3d89c662 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
     platforms = platforms.linux;
+    badPlatforms = platforms.riscv;
   };
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d0f35d6736d..763c28464ab 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -41,7 +41,8 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-      libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
+      libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
+    [ libseccomp libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 831fc8344cb..8d2a17a79da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3131,9 +3131,7 @@ with pkgs;
 
   keepalived = callPackage ../tools/networking/keepalived { };
 
-  kexectools = if hostPlatform.isKexecable
-                 then callPackage ../os-specific/linux/kexectools { }
-               else null;
+  kexectools = callPackage ../os-specific/linux/kexectools { };
 
   keybase = callPackage ../tools/security/keybase { };
 

From 26e8d58cb545004acb7cbd00db81a402923a2445 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Mar 2018 17:52:20 -0400
Subject: [PATCH 2146/2266] libseccomp: Disable only on RISC-V if Linux.

The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
---
 lib/systems/inspect.nix                           | 2 --
 pkgs/development/libraries/libseccomp/default.nix | 1 +
 pkgs/os-specific/linux/systemd/default.nix        | 6 ++++--
 pkgs/tools/package-management/nix/default.nix     | 4 ++--
 pkgs/top-level/all-packages.nix                   | 4 +---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 2f0c402f398..d7fabf684b7 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -41,8 +41,6 @@ rec {
 
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
-    isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
-                        [ "x86" "arm" "aarch64" "mips" ];
   };
 
   matchAnyAttrs = patterns:
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index d953fd12e68..e0c77a0cf35 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://github.com/seccomp/libseccomp";
     license     = licenses.lgpl21;
     platforms   = platforms.linux;
+    badPlatforms = platforms.riscv;
     maintainers = with maintainers; [ thoughtpolice wkennington ];
   };
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 763c28464ab..7b3590e5c19 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -41,8 +41,10 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-      libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
-    [ libseccomp libffi audit lz4 bzip2 libapparmor
+      libmicrohttpd ] ++
+      stdenv.lib.meta.enableIfAvailable kexectools ++
+      stdenv.lib.meta.enableIfAvailable libseccomp ++
+    [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 5140ddd0283..677c3896fc1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -30,7 +30,7 @@ let
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals is20 [ brotli ] # Since 1.12
-      ++ lib.optional (hostPlatform.isSeccomputable) libseccomp
+      ++ lib.meta.enableIfAvailable libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -60,7 +60,7 @@ let
           hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system
       ) ''--with-system=${hostPlatform.nix.system}''
          # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
-      ++ lib.optional (!hostPlatform.isSeccomputable) "--disable-seccomp-sandboxing";
+      ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing";
 
     makeFlags = "profiledir=$(out)/etc/profile.d";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d2a17a79da..7c61381281d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9792,9 +9792,7 @@ with pkgs;
 
   libgroove = callPackage ../development/libraries/libgroove { };
 
-  libseccomp =  if hostPlatform.isSeccomputable
-                  then callPackage ../development/libraries/libseccomp { }
-                else null;
+  libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };
 

From 7d45fff670c7a7439788509eb39aa9eeaa22cc0f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 13:50:17 -0700
Subject: [PATCH 2147/2266] gegl_0_3: 0.3.28 -> 0.3.30

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/gegl/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl -h` got 0 exit code
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl --help` got 0 exit code
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl -V` and found version 0.3.30
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl --version` and found version 0.3.30
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl -h` and found version 0.3.30
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl --help` and found version 0.3.30
- found 0.3.30 with grep in /nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30
- directory tree listing: https://gist.github.com/d252f515654f002ddf4d8f3301559e56
---
 pkgs/development/libraries/gegl/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index 03f6054791e..e743b60573c 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -3,11 +3,11 @@
 , libwebp, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gegl-0.3.28";
+  name = "gegl-0.3.30";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-    sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm";
+    sha256 = "0lg5j5kn24qvyb6fn7khxf3jadkacbpnb9nrqzy7w665s8xakd7q";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

From 64340f42c1a137c7980b0d24557e491a93c806de Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 27 Mar 2018 00:29:58 +0200
Subject: [PATCH 2148/2266] pantheon-terminal: fixes #10171 Using the 'memory'
 GSettings backend

---
 .../pantheon/apps/pantheon-terminal/default.nix   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index 22e790784d5..7f259d66954 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:
+{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   majorVersion = "0.4";
@@ -9,19 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
   };
 
-  preConfigure = ''
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig"
-  '';
-
-  preFixup = ''
-    for f in $out/bin/*; do
-      wrapProgram $f \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
-    done
-  '';
-
   nativeBuildInputs = [
-    perl cmake vala_0_38 pkgconfig makeWrapper
+    perl cmake vala_0_38 pkgconfig wrapGAppsHook
     # For setup hook
     gobjectIntrospection
   ];

From ca28546bfcc32be8a13be71c474b245ff2d9f84b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Mar 2018 08:56:36 -0400
Subject: [PATCH 2149/2266] sbt: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 01a112bcecc..e59633a8571 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a";
+    sha256 = "0w6j9isrcr1iqrwjlpv73l09wyqknd426almnpnzmqd1m10wwxsz";
   };
 
   patchPhase = ''

From 945b681d3b1e32d2dcea528ce4e5396408c1bb74 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Mar 2018 08:59:09 -0400
Subject: [PATCH 2150/2266] ammonite: 1.0.5 -> 1.1.0

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 3aa64356896..beebd8ada9b 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.0.5";
+  version = "1.1.0";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l";
+    sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 737bf1d22902f8f0039d7e89cdaa648eee755013 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Tue, 27 Mar 2018 14:39:56 +0200
Subject: [PATCH 2151/2266] apacheHttpd: 2.4.29 -> 2.4.33

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

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 41e65b588e1..dd076606da5 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.29";
+  version = "2.4.33";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00";
+    sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05";
   };
 
   # FIXME: -dev depends on -doc

From f396dd1dcb466ab119af7fa76a69fa5c77d5f831 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 26 Mar 2018 14:14:28 +0000
Subject: [PATCH 2152/2266] nvidiaLegacy304: fix build

Fixes #37768. Fixes #33395. Closes #37866.

abbradar: don't fix settings in a NixOS module.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d0348bd67d4..1e2b8cae9ff 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -50,8 +50,8 @@ rec {
     prePatch = let
       debPatches = fetchurl {
         url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
-            + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
-        sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
+            + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz";
+        sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l";
       };
       prefix = "debian/module/debian/patches";
       applyPatches = pnames: if pnames == [] then null else

From 25ac79647cea487127c071f4ae9742e0bc70aab2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 16:39:05 +0300
Subject: [PATCH 2153/2266] linuxPackages.nvidia_x11_legacy173: drop

There's no kernel in nixpkgs suitable for this old driver -- tested with 4.4.
---
 nixos/modules/hardware/video/nvidia.nix       |  2 -
 .../linux/nvidia-x11/builder-legacy173.sh     | 99 -------------------
 pkgs/os-specific/linux/nvidia-x11/default.nix |  2 -
 .../linux/nvidia-x11/legacy173.nix            | 53 ----------
 4 files changed, 156 deletions(-)
 delete mode 100755 pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy173.nix

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index eafc9869315..a1f1cef07ad 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -16,8 +16,6 @@ let
         kernelPackages.nvidia_x11
     else if elem "nvidiaBeta" drivers then
         kernelPackages.nvidia_x11_beta
-    else if elem "nvidiaLegacy173" drivers then
-      kernelPackages.nvidia_x11_legacy173
     else if elem "nvidiaLegacy304" drivers then
       kernelPackages.nvidia_x11_legacy304
     else if elem "nvidiaLegacy340" drivers then
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
deleted file mode 100755
index 5d47df9a87a..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-source $stdenv/setup
-
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
-    sh $src -x
-}
-
-
-buildPhase() {
-    if test -z "$libsOnly"; then
-        echo "Building linux driver against kernel: " $kernel;
-
-        cd usr/src/nv/
-
-        shopt -s nullglob
-
-        for a in $kpatches; do
-          patch -p1 < $a
-        done
-
-        # Workaround: get it to build on kernels that have CONFIG_XEN
-        # set.  Disable the test, apply a patch to disable the Xen
-        # functionality.
-        
-        #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord
-        #patch -p1 < $xenPatch
-
-        # Create the module.
-        kernelVersion=$(cd $kernel/lib/modules && ls)
-        sysSource=$(echo $kernel/lib/modules/$kernelVersion/source)
-        sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
-        unset src # used by the nv makefile
-        make SYSSRC=$sysSource SYSOUT=$sysOut module
-        cd ../../..
-    fi
-}
-
-
-installPhase() {
-
-    # Install libGL and friends.
-    mkdir -p $out/lib
-    cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/
-
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
-    ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
-    ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
-    ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
-
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
-    set +e
-    # Legacy nvidia doesn't have cuda
-    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    set -e
-    
-    if test -z "$libsOnly"; then
-        
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/
-
-        ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
-        ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
-
-        patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-xconfig; do
-	    cp usr/bin/$i $out/bin/$i
-	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-    
-        # Header files etc.
-        cp -prd usr/include usr/share $out
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-    fi
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 1e2b8cae9ff..4f753a5cb6a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -63,6 +63,4 @@ rec {
     in applyPatches [ "fix-typos" ];
     patches = maybePatch_drm_legacy;
   };
-
-  legacy_173 = callPackage ./legacy173.nix { };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
deleted file mode 100644
index 51a230974c8..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}:
-
-let
-
-  versionNumber = "173.14.39";
-
-in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}-${kernel.version}";
-
-  builder = ./builder-legacy173.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "https://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
-        sha256 = "08xb7s7cxmj4zv4i3645kjhlhhwxiq6km9ixmsw3vv91f7rkb6d0";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
-        sha256 = "1p2ls0xj81l8v4n6dbjj3p5wlw1iyhgzyvqcv4h5fdxhhs2cb3md";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  kernel = kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  inherit versionNumber;
-
-  dontStrip = true;
-
-  glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-
-  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
-
-  programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ];
-
-  passthru = {
-    settings = null;
-    persistenced = null;
-    useGLVND = false;
-    useProfiles = false;
-  };
-
-  meta = {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for Legacy NVIDIA graphics cards";
-    license = stdenv.lib.licenses.unfree;
-  };
-}

From 00e5b20d1789d8527eb54c84cefef47369003d7c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 16:40:15 +0300
Subject: [PATCH 2154/2266] linuxPackages.nvidia_x11: build only for x86 Linux

---
 pkgs/os-specific/linux/nvidia-x11/generic.nix      | 2 +-
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 +-
 pkgs/os-specific/linux/nvidia-x11/settings.nix     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index bde8ad361dc..c8ae7cefb5a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -79,7 +79,7 @@ let
       homepage = http://www.nvidia.com/object/unix.html;
       description = "X.org driver and kernel module for NVIDIA graphics cards";
       license = licenses.unfreeRedistributable;
-      platforms = platforms.linux;
+      platforms = [ "i686-linux" "x86_64-linux" ];
       maintainers = [ maintainers.vcunat ];
       priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
     };
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 22fd1242700..21e6cb5d500 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index bbe3af5d016..740067af558 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }

From 4b67702e5bbed2471cd550e38dcff8ed9313e73f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 16:40:33 +0300
Subject: [PATCH 2155/2266] linuxPackages.nvidia_x11_legacy304.settings: force
 i686

This legacy settings application doesn't support x86_64.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 1 +
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 4f753a5cb6a..57899d6f893 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -46,6 +46,7 @@ rec {
     persistencedSha256 = null;
     useGLVND = false;
     useProfiles = false;
+    settings32Bit = true;
 
     prePatch = let
       debPatches = fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index c8ae7cefb5a..13e5d1b76ea 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -6,6 +6,7 @@
 , useGLVND ? true
 , useProfiles ? true
 , preferGtk2 ? false
+, settings32Bit ? false
 
 , prePatch ? ""
 , patches ? []
@@ -68,7 +69,7 @@ let
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      settings = callPackage (import ./settings.nix self settingsSha256) {
+      settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };

From deae713d6d9c96cd79fcffa74081b181e864dd4d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Mar 2018 15:02:24 +0800
Subject: [PATCH 2156/2266] firefox-devedition-bin: 60.0b6 -> 60.0b7

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index eeb130ed89b..257b871a845 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b6";
+  version = "60.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "69913589af0b21f301a14efa66a625a5425f917282e9a28fb3cd21d51a62785fceeb810bc6f2b3ee7102a559f51379b5d78b3bf4540d016039c183d3bb069997";
+      sha512 = "b296f17578b97bcb14c5d3c24dd0587318ad49d6ab4d1c9f1632e6ac16cd217e069ca4dfe26c5da0b5ba599f1ec300c9e47dad3a12fbc36b13300c18b657bc5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "16a078dcc10ce88562cdac50fc8925da21e282fa309718adf0bdfa3153d8659e24603b1254af64770ecb0d9112dc6024ab6d1810ef0696b895ef837dcf3c196f";
+      sha512 = "e00cb5e5fd8360604b1ce5bfa5900bf4872d3aa3efad108bd5f17997e6ce6f1cef2925d3f90544cc003a029c155697c9a3da68a6b330b5ca23f3b8a20143b19e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "9f3f3606f80bf01ce66988f687cd1d849eb4e220e002a5652e5771cdf89269917a206ce1f1bee2191c61cab4c57f0b422a40c75f46e0cf6d9f278f4af4a4e028";
+      sha512 = "dcc97c738e8a24214abcb034b061ce92ae084252125d7a8230bf93fd79f37180358fddbc97fb724935752954b14258f6f8844ac05ac3d5a5e0f998e852ea9b9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "7ead7009ab01a8e4601bc5b9a40041619dd1df0f421ad4e8629360318589cb9acfc95900925487f4cd1619d6b663b2d675c0115803131310358335a9813a17cf";
+      sha512 = "48f5a1775d115458515e8f6338d4f74e4134de9b114ac3a7a3cad688f121c3611524574d480cc8bc9f9d98ec991ca159ffb0c150fba65ad6ccbdf343495e07c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "ef5f3db024f39a1b8d5ff0333d22effb4b82ecbe9a0f85b616c93a33ea1cce5b5a48ea3f483512044d16766f720164f773afb3a19a62be1b5458415b36694fbf";
+      sha512 = "b97490a5bd434bd4fdaf3d2922b0d2c603916e545d094af08a47ee45c6cdb53f0eb248bb570d5a2bf1a532e8583e63f8d54535cdae6111c8b114eaaac247d723";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e45c0cf476f8d1d5211df5268fcc49cf0ef88a3c6546003d5e4ade08cf0620cf712a5e37da643284c2e114a36b650f76bf28fa047edda73fd31200e5cc5a2a05";
+      sha512 = "0939bf8224a804962b6fb509ea9af63dbd5044bf585b43def172870b99bc8fb9e3bfa7a218142a80c7bab67ae9fecb7d274630c35cbf938f294d3db53fd3ad31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "5c0574a0e7170d7cf1c5d04ed06439161d8dd2f7cf49d7da88ab01dddad22eae72764b518bddd04ea0c8fb4820dee5223fb6c062175358c9531bf6c13df50900";
+      sha512 = "89a171b9be48f61b7c821e675a00b51e8eb6a259c69ab9f3051603c6e3fecec03c42de915f01d07c0c81803689a61ab9788ae4f6f14877076fa7a2dfe187a10e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "3650054a3d97852e7cc450087d8a9ed41c122737c57c588e66646a846c41a2a7553fea263bda1828a89532ccb734a0aee7fc2803ae148ee6942462045813a0b7";
+      sha512 = "fc6026947802e40494a4f05291be61c780cc70b0a572451b7fd11d45589718a40df2c89767ffb9aa1db63dcdb2ce660261222d85efd067262e6eaff6e6b33dec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "35cdc212c1ce673305dbbc05690b0b80323050b85f3793b4f0f1cc0b7416ff01cc1a7783066643cafb20206d5c8b51de4668c81849debc03cd71b8cc0aeb9375";
+      sha512 = "8b5e359aaaa20a9f62b897543d31c569eb880483eadead008ead3038ae44fe01cc2dcfbf0d856970bae5553176d79b5408867b8a4d652c2da12bb4bbd61db29d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "bff9c7b7b3da3f0345fbcffa4f7be3496b6d127fff0014841b500eee261e84975f19e44983c6177e7c2e4f93c30d8b94e93f3210b5ffa28480e639ca51d96151";
+      sha512 = "514297f576bb475425a41a47cf2f42792dd8cb3ddce218c9d52ef421281a34cc14a04e9621a31573a0e5b19f90246c0309b8a4b68d70b835868bf8c1dc80bea3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "2ae654744dcda3627cf2ce9faee2b04d98b18aafbde71bb0c79c8751941df2df3a615b62c5e9f60a4c6c9ad3700e5765a7fdd0cd0f7af1c12e724d6343d077ab";
+      sha512 = "8067067e8d5a869a043359dabf095de32a874291b7c70ad332e62deb7ff18e85f7c60d58a880ed466a26424ef01d16858fc0542516661a39e6303133eb3b3d6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "5b8dee9188e94ff32485a4dc94fe0afe9c0dbe5b6e8aceffdef098a3851e3c90e2e6562b7503c3ed4174bedab94e7cc8f065f591e8e1c1ccb9afcf803cc7804f";
+      sha512 = "8e2264934d7499c55b465befbaa2b00607d4e6ae2a63aa034c5470a1086ae09db747aba9996452499e567d7698aebe3294e86e5649507d4b2ab589997e12e1ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "56cfd8c2e8119ea515ad0051152da29f44cedb60e04707433546f44da1b67498221d39d38cc4c18c1fe7ff683361831795ab5e26405d3ca565313b5e47a1d32e";
+      sha512 = "df10773c792da6f2ad8adacd032ff516820532dfefc77f1f5bbd7c92d355f7ae2694b63153fc8b06ea6bb0966025afb1d834d20da14dee7e55309927253105d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "89e745399ec681fd121da56de264b92895bfb614a14e4d1c2802509bb0857aea75082c02166ad9d678452fcddb88dec4eb6f540a51a8257167a585538757bf43";
+      sha512 = "d0865076a81e293b7c4ca0ed29903dd0b6bc93d516fda6330afbd06995359353692385c0ce43399a07c1c8027c164277c6941e80c7f1b0b793b346ed9ff1860d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "49c02148c13c7bc9994d029b108adb8d6622c336f4a5262fbc6840527adc53af366138f447fe91ed436fd3b8f625eb57cb227097fac78cd92df50af00bf2b687";
+      sha512 = "63e5e19c17df4589640b4c11cdce7d19991336da61f7ad484600ded979974995d8eb22fc97b759bd5c8c1d251ba7fe6b222f4faec7f5eae564466ee5003a30c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b5c9fae4d9ed3653511b6a7d2701f539203e39f319268332f726ae6f2345e356715ab26b92157cc5f39a285983f8d29b3e1bc1a6852a3ff6deab13b1cc169948";
+      sha512 = "a0206ac251b033cfef6a669729f5d46ed4c3b80fd3f4bb979ff304d1c479a713dd19f2b1217695a1a61540c9e4af5c9ef96a20eabe97c13617674cbce587e9fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "cc4f76b0f3e8cb1879db79b324056f94a72458ec0d578698e9f59a61096684f940174cffcb90a9ebe5062ac53dba62237582989c86bdf4eef6b0c54104e289c7";
+      sha512 = "88c53b3220f68aa626a5e08c00fec4f99174e2dc7cc40aad30f4e56d7fd555dab0ed564ae4f831f9fe0ad844e0a0c5019dd8afeadd8a7203b460cba15ccd0a0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b7fd250110db719aed55f3508274ecd6b9eab72606947309e8d96d2fe76552607724ff74aeae12f9fcbaeeb15569a05d0449a051d18304e59df8f872965234bf";
+      sha512 = "f67f2af138a426b005662a99ad5991a3ddbc2b1629561e542c49b9bc1c669bae64e0f7f2ccb91b229442ac8e24a4ddcf395c986cd63922791007cb8e50da3f4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2a8c8a4c26fa9262db29aebbb5e9df647340669c3d0f549efcdb3f2ba4fa196abb22942df8b3358ec26321f0e264328fd138e8603157da4945567170f59eddea";
+      sha512 = "2a13c058eb565a993c07031d586eb8131ea5ab6eb2963ecbcfd3bac7ba1a73f4cf6b03f7b6d8bdf7895630da9ea59e1dad185695293eceb3a36ef1f9a6dca8f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "bd197a1091b9401d3759f8df407d6bdaee36184e0479dd6c75ff216f73e3782739eba8bba99a6733bd6fdb25a0812ce0274e233390762d622ca3aef5bfe9dfeb";
+      sha512 = "129857f8609e7bc2aab8bc6ef4ff3fc2bdce9c9ddb5c5ae2c9db811980e04773964d4b6cb28276435995f887d0ab4affb574006a3d924dec893fcb379125cbee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "93addd3420986aa0f44f642173b2a24b47bc488cb795b85eed0e01f99208b7c8757c6b1049ba519969047c18fdfb1fc1f43c397da75bbd7c763a4209ac6a5681";
+      sha512 = "637e6ae40a3ebf9e07db45df4c8719c34f3f924fb65973013c55fbad8c88057911034085cd83bbdbfaa7c5fe553245b3fd14eeed66ebe131b7c640f9503f9036";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "55cb7e0789b67d00a5b13e8c4ec2541ebd7fc9edb9cf5af38c23c937cee6b1f1900a73ee0d9c70a088d9cb093c806f309b97ee487532bb0cde1ddb0153150f62";
+      sha512 = "b874e873cfba69bf8f5c9f6deb02b5d2c958ecfba186b3f888a29095620f36c51993dcbe6f860b190405cb5924cc8c46a687ff61c746e3558568e4f77a0e80be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "62545eb38388650a91b3565237dfccddf9962e174d51b2cb5e38471e365ad155af08b4a04229e472669a5ad652b57d47428b90960ca09c4c8ece09549f23a01a";
+      sha512 = "2735d0b00e9cd24b96816deda48be1dee3499a3aaf2638f9e2d69bd741c50d4559c29279acc6b535183956cd383d96f3fc1d97af42734dc662896db6f39b4d3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e5da78332abbad7c913dc917905b5f5e1d3e5a558353778fb02952675da465dd619c544441a42ab94ac5c14077f380a240a5592d84a6e84d4bd77194e1b3eca5";
+      sha512 = "d202d77f12eb2d525ff0fa692c3f4c2cee721ffed8cd76edecb5e05b91a714d50aefdfccff9c2c00886f937ca701d5832ef757700fdcc33ecabecf7cfee9989d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "a9ed1e33b92a061e6578a4edd0db18216bdaf350fd5a65f75fdf7e3f130bf007abee353facff8bba2a22dd91643dce0c3e22055474005aec4aceed7ad8752973";
+      sha512 = "5dbf297fb4fa3deb06e40e9babe4113ec745a0d75b189dfce1426428cfd0601822f99bf14c1b3179fbf1781d21f005ce35eb48bdef75354754e3d19182f89705";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ad70fb5093d24c2d05b770074c3ed3605a0d131869bb07e185fdbb3f6f51de6c959f0c46af108718d17381fcc8e20d4ec9dee2d56ee02c4b056574844880b2d0";
+      sha512 = "baea9cce74688548cece12939d21cda6c144041af233692cff73f7c65b1a7ea8e8da2567e7708792d5fbcaffb60942f6a7e0168634d1e99272540bcbebd94e7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f15fe7fdcfc4409fb14fd4176539520be9fc4af45b4e62b0d3b8c7dddb946485d208879003551c780efc0633031bb08f46f5694340b9340f35532ca1ac6077f1";
+      sha512 = "9938be04ced6d938a8775484ac4a2a6bb26d3983669a8d655f020d13002281ad10fb78aeff12fa83cd0aaec76111c7db19556a72c98c6be8cd0ef1f27e33610a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1024fb8811a0f97fbd391c406277061cf524414ed63a48805357fd486476cf744da28bbc166ac419f448d01748eda2e3243768db81965a4c7b88f129e0893b89";
+      sha512 = "abb228a45b18cfde9006f0a8bce48d16df4a2b5bf378e5f22c25accee1e5e50ce5a27ad9700651f6e06dba366449c72142c5f12d8147f3ed1daaadc9ad873291";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "27645528b9e8daeeb8ddf417820b27c48967437752a8a4939183e8c646840686d64ca3b21e6f26270965c0e54e44995da4ba1d325be85e740d6200ecd18972bd";
+      sha512 = "73078fdd72f4a4e1049d3e586315671d769395beac8d2c942c145075f64c6c559670f9256086a61d1eb0e7b017e6ccc96697837341878d5284fd36ed83d34b90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "863e4e532c22bc2c055fa354674b4dd38aea016ecc69383b746bfc0b70b634e0ff881dfa3de33d2a21811a9ac312ae2d7423fe8813c31d3af4d4403d07e5a729";
+      sha512 = "1292ee821d166f3cd854a3eddda9af6f1dc51e0c6a96be3ddab253d73993081172890ec0009f5c17254a810447a54e0977848f91c358edf0fab409c4c14a3518";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "a72c6a0d80453e82d6081fdcb702fe2f91f17a7cdc4f1ffdfae8c340bdea87064b4ba7f52d114fcfd87cd30242220bd44b36f01d0b09a7cfd7808de4d48a7117";
+      sha512 = "c086de065985c639c2536cd1d68d5fcca2c45f8bdebe320d59a38090d4207ca7fe19ddfe4c8aa3fc9237fd7338b5d6e1c9a78f3ab4776a080a1079287c46dc5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "0df9a0cb44c7775e4631a66daabd7c02f1d6bb38b87e9487d13e52ce02a6b7a93d2bf87c1ff6a7d8275d2f4d0357cac0a87ff9a9e9edd2b25703b8d9340d3e1f";
+      sha512 = "79bd164b30b4fc7cb71a9dd79c8c55c8cb5a4a3ecf3e1e50760726dd740a22cf467f08827bb5bf11e5268d13db52b47a3d21950aed5dd60c9cb6bdd6aad0abf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "2ff27ca36d90608a4762453ae89a93eb130acb8bae864e31d30cd135820867730deeae4a65bb942d64346fb9318da791d51318a398bd2c44d8addf6c40296e52";
+      sha512 = "53a4b5266a68b08bf94ee4911cfbf61ff942b91ef1d908be280bc3dd425849fbe3b1cd406aadbf0f2bcbe7e2ba704ade48afee690663f305912676f6830e3fbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "cf1513ca85ba34bd863ed0f1a1f279d86778733a83114b0a055bdee7f1dc5742ac9b138a564699a28acdf695b5786c8d6c92999e588e9597fbf79ded3db903a2";
+      sha512 = "008b5f8f65192c4839d0a6b09137b44bec50cced603c2280a93dc76a16a1b4893fb5d9aaff50e97eafd843a2cac632e80150aebd05074810a23f767605c53ee7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "8236fdaf20caedb944464eb00cbe078bd64c904f2064ce9b884e4f84c72237e6848afb4247d6e62f7452afe0c13f233e23e4cba86933eb268386c78a9b6e5d8c";
+      sha512 = "f593320a45d1a8b1312cfba188f527dc5847be1bd91df0e9175bc29aa83d4435f3f508e2b80566fea86019b1157c7fdc24a4e639727eddcd9e121d34973190a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7eb670c2c408976701391ae65889e49db09cc8c155069da4ec67e6f3a8d76406297b13fc60d4253c0a664f41bd67f7482999f2c2c9d56c56aab02d1a351f7997";
+      sha512 = "400e28842ce0aef5f813e74c3450681a100a26afd5aa7d9f53cdcb23463e75513c63c3ecc60a3a134e43d194234088f6403ebb74616eac2539efbaa02931d671";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "cfc48df47e33c7ec1e2a07b5ea915958a4762db558226cf78e014ebf2578660f93215272137dfa52f5a65ab1e99cd24f293d145e7dd1015a2cc3e644bd4dba70";
+      sha512 = "89da8aa715cea7e1399ab315f8805744f6ed45cfc5afcda99bb3fcaa46f7c0f35c9d2d06bc708d9461616bebbe926561d292346555a8c2470cb6b2ff88589c3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a97ce4a5773caa3359828ec9216661ac480d9577bd511c44963309e46216e74e89ca876de035162654a07f5002359918f6eb4b7f1c305184e51461ce3e48ec51";
+      sha512 = "e9ef581defc3e8e161f6a8601f2ffe8fefb6fed876dba88b13c54b30a719b07c406db0d40c9b80f99735943985ebcec7802fe450f8ba5c32ee956dc5fcd46963";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6a02e273b1998654d9a31f9589a44c9f30975976cfcf3e9d74f0e66508b991e7eda148756951cf5bbf781ee37f8bef380c12d3c25637d7557d2480a6925ab629";
+      sha512 = "c224bc20c1e8daa860189e710060d57ae7da1b7a2db1db5bfb096014af3a0d24d66ff9ca0c0eb226fcab1cf2ed512329a98b27b8d9647e2a2a681ec57acd9025";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "ed5bb626dc1a0c29f4f7e222b6090c24f6803df53baaa632727fc087dff5cc4a97a85b9105e9d5b228cb27df95f50efbaa7298a4e8c3e39eaa424a7d08dfe042";
+      sha512 = "1d09ad8de34eab1483405793334bbda5b7c2be3a539e020d34f262f39515404efac8686e1583c04363e13f3a6abf725d3973f8603686293572673d79bd943fe2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "5cf25bf3820051eab9e72637a66d6f1c082253953302363c2e95bc026422e84856dbee180c86b4c9bcf186db5dadfcd20efd6ec12e743be90d2a1b3ac229127e";
+      sha512 = "d143c07b03d36c62d816064f417da9d0910ace7b0ca295c571931e5e827f77ccda6a7fe48a73c048971630742dae38c7bbcdd0f076c26ab39d649a73b237b356";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c0e418e15b74101c09ce61296da0cea9b94300e4265dde4837157330082678aa7b92286db2c883b7ae5577d86232eb3e3337d9acecbc2de14dfca5032ac798fd";
+      sha512 = "cc05b4a6921d505e027a7f071505d1047d7a5deb464d76b07fcee192a38942716fb700574a41eac7f4ab77e94270f61cee78242be59ec649e73e93721341cbd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f9859b355359ca2ae8833b52afb8f4830844f9c264cf0ba72a7bf72bb0070475b0fe4f4d5774bc3243c834dbc671b80c6d428a8b6828ea43b600be0c90f9dc9a";
+      sha512 = "70e3c2f35f8fd3415e28e84a12f7cd657c7850ce8a6d9deb33fcfca90798dfe98271ce18d3833ca5c5825747a73cc76138cc1fd372acdd0b85f155a50c1f4633";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "18d7e9659a284bb0f60d3f59e1d711844c75e6213b26445590fbee2878952aec0a42f3336f2ec20cfef284e41f1d8f2d3677ddf767c94a00112d021b95d2749f";
+      sha512 = "b85bd926fd24ad9f07f35bd831cc6cbf0a228a89150b0387ed4ebe8e3f6052cc47f85f5627fb33b0b8f58ecd90d6987412e183f0f4be9925e30cb8fb62116ae7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b16bceeaeaeff3feebe8d895d92c32d23a6c6cd799d2dc7aca95bab84deff4288e7625eb680125695f144a21deac25d57d5c670424209c9e50e48052eaf10460";
+      sha512 = "a3c142310fcf970cd4bc85be065794b25d85c7356aee241f14214feb17a5585094b730931209c1533eb5e2d8890bb0ac3f252e70942397530dc001b1d3eb43c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5f176695bd41afc204360693f6587b54c3daf579dd0dee798228c5e9be09e816c9633d1ac0d92fa1c5ec3281354fc83e07c9406625f04c7331e0fce56414b7e3";
+      sha512 = "36d14585e06659b879cbd319770042d3652d2e7cc2db05da64358c7c1cd17fc123764c0dc9e1da9d242c5e8deccc840d80738207b255f39c94a209572dbf437b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "724622a046e95409f1dce53ec389d86c6bd178f67cc4cf3037a5cd924f7d47a14e98e75f09dc0a7cbbc3332469d2c0a11003a3b99f10996d64cfa5c0f607916e";
+      sha512 = "cf0c9b369e3557f130fa83e2e6c603945d9ef257f1060e6910a5ba1431c9d41839ea1d9ab51388ac91c646252386ae7eff5f6612748b00a25489f399ef447bcd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "c563d9670859cdd0dc58242a3c456d5dcfca041135d5a24c2c5cd26e61a41ccba540346f66a48cae0da67ee4d6e2627a7845d9cb794cb801f5a04523af15edb1";
+      sha512 = "91d7ef34465a184646b51750953e114ba326413117678187b4c3770859323715edae2ce1ea5a755b9610197ceb65ce3ce6a1f9077e45c3db1b89a3ad11d18367";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "d6695401cf7e7120556b93aedcab43e5cfd4988136fd40591f9c878b708ba449daa3a1bafe09a18e4ed51053a7c6f646a29e94438628d81f409063e48ad97a97";
+      sha512 = "01dbafdbd7c48ba8f3da536e5d25fd9c7656125cb508d9c52d413625a77fb0fbff2baabbfc2d8a636a29a35e767d9f055dad90d3adf4f6224961d1de7866eabb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "7ab5d656e411be7b94d75d61887a9ed231c72b1f58b72f803310b000092c1f7d284c382a93cd998d64912a548c01785284c1d10f37359facf28ddc0f77ab5584";
+      sha512 = "09f6e0effe61d0b24ae3e02937a1408c08a8c9601451c632e61856277ac72a3c39d7153b768eb7a7cf3af744c919f3dad969d11f6b84b584b2817a2a518e9db0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f1d7c8abc9b9ab70c4444a5a9d04ae42fdaf04cf3d865fe23e8f29a5713967385122520149e6e0c07ba54d7d376c654d730c671b027de047b77c584664222867";
+      sha512 = "f536df8eb68868ec0174531804bf91d552fbb41afb74bf52ea7c559431a194163a628da65d5218238ea91dc19f65f0bd44afb8f1d95aeb0d072120d6fc7f1f13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "7ff45b4c97399f451924ed1eced10e02fff31d8f0718eef449eb52a7bc7ef62e90b70cfd1796cf288e227b1fbd1a3e109c4bc085b7a3e1d2df5a90291569722a";
+      sha512 = "17150e6f79cd485477a00bed5f720c82683a45bcb94e6269a84068adccf06f17c4610e0e16d0b208e1ca864349fff0f44ae3f6c287a20249631469f783e44d1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b73283342298038102f74c6d2fa3cd947b9f03fcc2b8a7eff77b56e9cd6b0ec6d8476f8146fea510ec0ea2de811a61d8b86db0f412f4625325ae78ae9579d3f6";
+      sha512 = "582dabb84d58aaf61ed3d204cf5973d320b447c2eaa41d246f523a10061179fa73d8327bdd0c4ab8def7106677211caf424476674370731dabcc641d88f8b735";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "182be98cf92c1ee0d13fd7bc8840e54e4a2facd450f2dc9437af8363e202628ef8d5172af7e38ae674f0dfa7e1d216a9d6750c62e574f73f6f61bcbd370f786f";
+      sha512 = "dfa017fb5ab7140cf27d2c0cb305d4f5b93d8220995d50f401af25eec6235dd482f64083bee4dc72264094a9231f866ec99cc8f0de271dbdfbf9ebbaefd7af9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "bee217e50d42495730a9b861b07eda1d68f761b87dc2f3cb3f4e174d8179f65eb8e00d8564e8795ee10b736db338caf0e19174bde043efa8c5fbdbb12db55394";
+      sha512 = "3c5ee916d8f01ecdc0132aaaf6506df41a603eb4e373fe9c8a8fc21f3015dc1643e3153984b8b86f6cb230ac3dd55296913684c03c0b0e6a11315291458b5c60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e2366510cb2a0929689e255c59f029ca91faccc12ee92b42f6e9efb96c3c5c0af941be2b366ad6bb17c1c64fd3be18a9ec02ce2fb0d4a5e37bf94f3c49ea449f";
+      sha512 = "19f0fa885b869ef5fedacd46a24621e9132d23d042220e19a10ac8d5d2170a7eb9a39b4c13c0448528247da9c61bb580dae05a1cb80e7cc4775b101a1fe307a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "159186c8e0456900a60b1b896d60b5d476f33ad330ebf926c8b36690eecd7b7bb365ef4b9ad2a5ccc0e3ddf635a7d6017a7ffa7919d1daf7d15f0bc4f7897678";
+      sha512 = "32107b6e62961d30e9b7d17cd96104d6ebc761ff6d9448850222ee2909958cb7ef0fd51ccd883280051926dcb346b32043713cc5f872fc99a22ecfb46f031b2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "7a8a08f3a587e859daf4f385b8abb5d83ea23cdad7797661394bb39bce04581d3c6aac417154ff9eb0f842a8b9b6280dae43edb8ad559586b6215d1e9a1421d7";
+      sha512 = "3b798d8f415d35f260566ecefa1808f547bf0dd43330895f0129d9388755b3169da8fed80079da1c090f4707acccddaff05dfd2d37a4be562d07276ec2672318";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "471d8a445bc80a0c091c1dc07314e4256262299e7080656b4084225d7843dedc045cc30623f2d163937dfb5d2938564660a161c4f9fc0ec217e1238354e991b6";
+      sha512 = "6fa1f9e9b82ce40231e88b8439f4dbfb15ab40e2583fde9c1129fc8a668d13e3338bdaf37deab90e2c87ac0a8452c90eedd11c8adab1356a9d9d5035b644f522";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "968498b4db1b3b07532a8900b4f4018339ff988a13492bf2407bd80859abd927d571e86dd7c5363556c510f3a1559479f4022060f77bf62322fa8d3f41ab2901";
+      sha512 = "d330c66e31ec9fbecdc5fe56d50ad2aa6a6afb49c098a6546a093a777fe415a1429b233cb29405993914836314cef2335b0d5723a1fa67070f294d3d5e1bc467";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "7e1e1a8189e76a7bd1324e680488dfc5d5e2c6616b0b8c30d9511a74c04189e4e20367e66ea75dbd3365c339ead9f58a4c95553590bc5e09f977582014298dd1";
+      sha512 = "041fd534ca158c3e073a98391d903f2d8a738aa71354b30655a4e96c7490922208d7534f7008d6ddedf91434476346f810441ec56dd76201b81672b51faf08e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "b713c0fbdeff13b0ef0c1cd45ca5a5b8239afdc4e9644399d69993a01c5a6f8e7fe935c8cc45d98567b94d7ff3d4fa0e17cdf16fbf29cb1618d8618a5967daaf";
+      sha512 = "f95b4e9f08e9d89272f50b7841660cfb9db01f3f5971ceae239219c7b01a16f0bb5484f6e7fc5907e194555774d4e57a8664f9fb026c35adfb74dfa0b246a769";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "85e9aaefe76edcb25f9ac86a90cd44aeddd480842382e95c0d95fcb3d05ef3ea7dd3861ff4796d4a3b2213d7fd94cd02136cc409cf9cc73748a30b97b882406f";
+      sha512 = "6a093c9c19e2ec27b1c1ebac0626a644789b15963d04cbb8cf6e1ba584913b9d886c73b1d60c1ce90a2524d243ea52460decbee433e67a88c1735643927a04de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a462bc19b39678309fa2efaeb08eec5f10b31eb2d552ce6c5c906643d13bffe152035269b26edec6674b0dd56f91c82b7ba56734fb99f4f65561bce4c76f0582";
+      sha512 = "934fa8c9a17b61472d324629b397108ed746e7f7586868734e01ea9ac6e23c75cf1237b5f930a11802fb89d3c97b3a52ff44f9b18a796758edf623929f61cbde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "538c0985685681a22fc6ca3bc980bbe0401079b3aa313eddc709d7a98c8cd17bd3ca984734ef24266099549a75ba71bfab0459734634e6843c63b13dd91996fe";
+      sha512 = "05531b6333b123cc9f2f677043a4b7e5e7101ccbdec684603ffd9998433f09989bdfabcc65d57378823d0e9631bf44b29aa78938339619c0f34ac883086cd50c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e0e0cb40842658c370ec275726f7ab1dec51d0efcd39f9ba3b3a95daed2e8e2b409e3952ed0c4a9ef2a40756464113bab55bc10f9f3801d8407151e8e649000c";
+      sha512 = "9353da96ca92385ec156606e2f4cc18cf4c04ffc3459f8cef79778bf8a3440d47767d7ec67477f4ef535818e9d4faa19e656289598a50f0b0300df7b81738a32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3bcbf9f2b943081a957cce922ae56d636e23c5fe6b582ccba468da0a337cd1f1b4d14e84f8f971cc6bb65d61269004f2ac53efd30a9e784bc432c37628a86262";
+      sha512 = "65b0d02e215523d7a859f8ada01fe78f5468bbbaf6b2d4988587383d3c008bd7595887804ba91a284fddbc613ca8dbd07058e9403c7bba808b57f7589886cb23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "9bbfcad0557739cec12539a36e7dcfddc62294ec2250e4d8087d44bb461db45d0511a4d4a31e968e22912c84d4b5e5fc1e6f68418c935b9d31b02de18c0f37e7";
+      sha512 = "d31ed2cf15eca0aeca8267257823a3d294a96e1bb64c4e56d7a3a1098a865406c3ea2c741cfcd2f6624f00eb5fd61430eb2d5bb841c9c8c2f1b7ec4dea2178dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "d76abe1a6a98901488b80b60dfd1b1b4118024ce3f860d4d6fbf371684e335b0138157b26e02a95c7eef0bc677ed3a6e32eabe198248a2c50febaf30ccd3b60f";
+      sha512 = "cafce03f660421ec23d76bfc52575c8dc1cb82542d205f3b9c1e9217c636a07e86facdb2c6a43808ad299e45aaa85f0a44a41f9f67ac1bf2feef0c81eb582f64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a0c0dc00686a3774d74311a04860d409a4e82ce79df57adf3de6da25cc13ff054674ba0c86eb36b0d3a29d7d4a3978202f4e86b18b8800e6af06e68d7524edfc";
+      sha512 = "49290b484575b2de9fdf06973c14be9640f5ffd8c7e54a2462911234670b3e6ed554e92c5dcfd40ecd7100c50b9427873d9105835877661c8a92a6e181d588c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c4f9b3e8fb475403a3b64278e4f2bb6e216f32d05077e837fdbfe11fdb4aedc8e7f3034f112295487a50d30b5c109445994ae284abf96100ab2c756f33c9a61c";
+      sha512 = "c9b5ee5942fa3064bdcc629ef672253cf87f627024d97158a1b2a4fa8f1e6fee46e0dcf68e163cfd21f63b7867fbeaf27faf9893f182eb8d0c2f37566009700d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "4817e979a82b22116dd329ea096007978e52513aa6b6ef66fd4d38fae352873f8a204f1aa545549fbcc6df1a91bd07b74a27735ccac49712793ce1fa88f14054";
+      sha512 = "18f4af488f0286414e03b38aa9a03563ab8768e161b874ef8bd8e5b35d9605866bff4a24684180509c0a4bfce168c2379e02d9b3bbc22e25e914fb035fad8ba7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "b262aef80e28385c8caad05a381b3e086abf509e402c639215253f006ba773b70ed4592be1f8a0c2f43a82f453a67910f5fc5305f702efa132e4cd2103df3407";
+      sha512 = "625e9497b9a4546ffc9c28cbe5c63fa8a3cd6412b16e18123de5f4062dab8b37dac381661ad5d9aeb91c6ab65dfb956cae3148fcf087e342bb52df6472c3add3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "1dfabf1664ceff2000945e86d4c7cf867f86586e440462275e693194ee25489ef9ae50de95df7b0a2eb76cc1370f1c345c9ea2d7f68155faa2d08fd1694fc729";
+      sha512 = "0dc3a1d0cb54b9798ca42906a97982bdde4ab7fd7daec5d424867107c502fe742536b7bcef0ba00d366ea2941358fa2260e32ed491926ab58060a19e0518af88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e84e9eeda4c98a7729e5a2efda377f4010d7d403400dd5d21b65078ddf15fa9f86c2b64512a195d8072ca9dccbea49e9d3e7b96d8ca391cb3886a204e3e5ea07";
+      sha512 = "3355f47c8e8d0b2e5c7323baa356d60a47863b808323740a766494e7ae8c149b064b5d34cef38a5202d6e1ae0353fba6cde14365e785996ebf884a0c828634a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3c3088d249a72c565fed6f6998ea558c65fdefa654bdad5bce04e46aafa65381f2972cc4a12b2cad1bacabe9f257e16f91b08f851c8a3387dc4e0ae842528375";
+      sha512 = "86bd1d27ed36ebf84a72bcf5c0ff0dcd800dfcf53c5e34f2f7000dba8894c864b985d85e410e8bdbb35fde8bdbae2198c5f4661d20a84af87bff25fadb46f49d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "329ef21051652bc5d0fcdf55f2316f2cee19c16ceb33819e03c8b50622f86487d5bc86d5cc63fe588b2b8fdd333bd11e05a1cc36c555049faaa02dc369fab71f";
+      sha512 = "b06fdfd947ea58cb8ccfc137cb488c1cbe3c643d494acfdb6c94419f1dfad03866ef3d1d14ef7edb45aaf00e73405dbd1bc594ae195ea91dc480a4015226e1c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ba4063f13a0f1645303b15dcf25d7592983f42d8568f873d49cca6be7a28d115f483e6fd09e4629510b6960a84fd5c0d999b93138d1a39dfb7783a65eff0f068";
+      sha512 = "6a668a793b6bba79c476f58c05d1354b7598ac424e119d514e04e0da26cc4610f162a6af26e169013670ae97acc4c67f799daa06615ec3461e41d10a82202657";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e41ea2b85f7c5fb1e46a7df01e90c7a570b3d026be785fa9cb1550770ae0cb44c80286885d6bd72b20c373ce201692fdea6548a6402cb09ab7ccfcb824702c21";
+      sha512 = "20f3a15732e4bb0911d3546e63a61a175c49c496294851aee86a25508c9a42321f1620546175db4a5387ac2dacae0e4baffba6b46b6cbaff5d0932c26cff68c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2dc99f7e36fb4a01ab79b72a7f55e6c98bfa8e1fa8fb0d682dafa33fb9941a0beda6f79faaa3dc0f8e38766982e39a04b96c9fb91075d08d1a1fdf5caf848e51";
+      sha512 = "e0229a82be96e88cc3169ef9bfe2df4e4c909be1332bea72a9caf32235146594526fb9351c7a787a1d1e95fefca955c962ea58d3ae3e978d921da8a1096d3e8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2dd5dccc3fc05dfd48690424e7d88cb85ddd48c17d159d21cad67b17ecf132c487ddcf129ffd77de14c61f8dce9c297827e9fb77316d310db7fa65cbe23752b8";
+      sha512 = "4e1acc4b2a624e2bd14449f6f40369c57780197d01e7afd5ca9f568e091711e92bd99c9029d540adf5abb10479816646add2094f5e7321e3aa17b457b03b07d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "84d2d507bfb684ec308c35a8fa865cde2b36e8098f85c04008e07c7f6709cd30171dc1519048cf2f7dc9e8306135af485175b192921df0fe4b3fba45cb00f7c2";
+      sha512 = "2b42f4573ab90c0a99a2b37dfdfc0a6454ffb856dfa3e3c31a74322056ad2f3460a58b3d21140bc2068e7fbec0d5a329ccb0f670643f0700474ed65009c0d429";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7615b6451a0982250661a3ba499659c5fd17231889df67b885b2168060f83699f96473ce44b2e3ab3b6464986038585a899acfd7afa6c3261a4c7c9361b7ebb3";
+      sha512 = "f8025fca340f791b15f0d9d5f9a298d8b2540ad440be9bcfd811c0ba45a839fa76486d4191a0d4a743af629e85edb9c38f602d918a5727c4e756002628b508d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "622a1e87593f63a4908144b784caef9995e6b5d5351748724aef02b1c14ba25ad5541365bbcbc3f6f230655156f9fda86ae81510c4d5c352555bc7be82788695";
+      sha512 = "ca3f7f90ff76670406600c3c55ff77ac456720c89ab9a03376d7b3772dd9a279dc07fec19666b424ef328a24692323970e9552bee44eed6795d9e4d4b6e7e989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b3983b779a2336c19f3a8ef78228b78ea623c8bc7dac7062ba9fbed73b49eb62a1dbf5283e22be967930dc17f11abf7fed8ad4a9025d158a783349eeba2746d9";
+      sha512 = "47869c846d5eda3f208d3485db3d7329c291147fdb66c9aa05e23a0c9fb94aecf578709eb9b4ac58945bb3d8243abc6c4faad968e77b6151674cad8aee4abb13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "595684c03e6664d9afba2ebea6b621baad182791f5d365e4865450559798ebb620cecadc5d9f93c99bd635431879c21dcd942611589ec1ab7b6ef1a46b92bc19";
+      sha512 = "37c8845ff3668169288bacfcde152b257e12b320fb624b4f82eb565cb388c09082338d3336f827f1b1a2960e719bef1498aea3f5a0d9d937bb83ab4f3c194616";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c605eb65b20826609b3d3eaa3fd41a4b4d0aa5e9c76a316ce31932e5d627d7e50df7d0284381d108790a82385dddb65a2e4b27d04f2d3ea7e168bb96b1dad5ca";
+      sha512 = "d09ed017f8cda8567db84dd8bef373413f93ae5be9bd4be085f0c8076afe62ac08adb98e8a54996d761b27e0b49fb89a719629e6bea8354bf51203fc47b9bb14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "3d57a416e7dcc74ee89d8fb5371b1fb0bc2246999a134ef027c66c70d6a131aa5972c00a7e6a4f215c05712fc616e998b88ee4ac5e7bef1837aef31b4430477a";
+      sha512 = "8a30ce7402c05688b65db8f8c13dd271608150e84ceddc27187a89ba58c592dd61ee078f061ed8ae1ae1b6ceecd6b85e88c10958127dd712550263a4e7cd1556";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f4eb7e97109f1f4a9b2670cd60e00a6cb02cb6b7717d5051738a1f197f083c480385642a3134ab382df86a216613586ed2268cd9a1e6554d7986c638486f2f1d";
+      sha512 = "d3f9afd0d46f3e3eb585d66129a6cd9ddd9e287cf10c1154439025eff815e1f6cac27f4a6c7110f84692c2c4cda5e9bf79c2a852ccc4ca5ef764171a4268aa49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "824345025c9980fd43d750c890ba16c2fcff2a6ce0ba124c35debb69183b92040ef4fc862f6b7bfe282fc20087e0de960093eaf6a95d5e56b8a4ae9ec4710948";
+      sha512 = "d49e251ec1b0d570652efa24526760fda3dcfac5d355d4f158cc231adf8449a48f0863966080484281985ce41ce7959c05b4918d5013f727ec73d22212a9d906";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "87a55eed53878401f0a11c73fe8afb3d45ec4a2ad1779e230b6b43908ad8c0915e3ef0f923bab911c530e0b110fcfe18893480b8e85457d037ca2f9b7e838e50";
+      sha512 = "8ed8579a8866b61d2946976f3086ef7bfb743d8c5ebc84de57551d3b3b1d539447c8f750346b045ef04f215b6fef1244d44701ca1278714af74c4d3a06d158da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7ffc03f7ce3c44b185bb0b443c3c7b8610fc7f155e71b829553dd4cb0ed52c59bffc0bc0e7bfaf03ed7f4387e9a4dca5c0560d993958fb52e91d1cfa62775386";
+      sha512 = "94b0a77e93ddec74bb8c77a6d087bf463019afa584a1d06b69eeedbb817b8846fb8706241c057c6f33ef1480dc72eae7b1191ea040c67094a83b9c650b62ea7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "a46338a641a8b31a8d12fee7afb67161b467f3572059d5d44ccc2b8fcef44f66e7bffd5c3c113bca100e9f72a101f50611cf5eaccb6637eb90d56ef005671de7";
+      sha512 = "f38648dd9162dee03b1c17638c235fac73099e58d1ac8f38ebc3bc0d22f83555f2dcfd5d07448410373f030f1463161c5f93268ad4bc52c0186328a9803705e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "b7b9560ebf460368d76fba33b0685ced7ee3cc2b9ce7035eef413a2a22c71e401bd64ad5dad3fce92d3141305244583bcc4c64a397491ec4b2b18c69ded60d2d";
+      sha512 = "7ed9bd4713b95e5078e2619054aad9e42c3996db7d20071383e2c158ede85e3527c6ecc2b8b6bcfd0541c32a4c2fa56591721c937cb15cb0c898f9e0f5448afa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "7ad200ce8927dea44d2dc998d3f80147d4b580cfea2f1492ed6176cbc6c7ef8b1704bf3ad631298c119dc1207d92b44d2cc9213db7c03e8c01486e0fc506c0c2";
+      sha512 = "a9502645b4a8e3d63fa0131e198ad07742247fbc8aa52a873fe1095f3e52d73407331a647220311488d46c4599ec4d21b40050612b73ca3f1bc793da1aad7157";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "3f6c83edbce8551907ed669c21d0d72e8279da81c28609e18f2be5b0bd44fed7b08315da8cabb5056238e921143b2a4980098ce82ae877f4bd50168c56bbb80b";
+      sha512 = "58ab4a269c202d2863784d20a274aef9f9e11c5536f0542d77b3bcb5ddc48815659470da6193db5f12491d164ae47a2761d2d53ab8b68e7a61c4d4fcfb262e27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "bc99e02df22497b3623e47dd1f05f2c08b9517fe9c171cfec899f9b682c4bdb8ff900a8cbf31891c8db74ac7acc7204fdf54f8e8b5cc6acd17440b168b08cf00";
+      sha512 = "320a259bde544a2f9876ea31b7117b958a3b9e5962d6d6c1b84cd3c0a13e1da58817b5844e4833ad87fba30dc60468088e8796ca2113993dcaa5941739fc8fee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "92a7f2aa34065a7a5daa82f8663f9eca5878723ce8f6a169cc34373af8c1a04e50902d55cbe8bd23da07176118f869938986f1547b429318aeec96acaa2dfe36";
+      sha512 = "9640cca8e0a4c7ca4758532acd07e1f92f9544fdec640395e6ac1b7daa1c3e87619ea8f32c6509347507834188fcb4a4e7b61d8a8e16e1123475a573936bea8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "cd1f367793a67fc8dd5b9df8a73de85553e3d02007cd1aa5a90d156d82cd6612d7e6dac2cba3567e1892dfce7b2e507b77fe8a0d191167671068f6786624675c";
+      sha512 = "8c5c0d5673ce502f2300fdfa573b5763794ef98698884b6fe7f037c7dcde0adf5aa3bac0407df8c1486f195aec970415344cb46dcc08aff8144353e77d7d317c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a5ecab1f3c46264c76e0b631118c02705adaf3a1bccb92c6c863c971b602b80922015f0c1fd5c0448cc44f73152719fd94098b3c964d6aaf7da5e0d30cebc2ac";
+      sha512 = "becb389fd7e8574c7d53464b67329cbba901f6459bf96a904fd38e4489224b7d7035ced7f80da6a50bbe2321589371e3a46a78c51d9c388183de7d409b38fd0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e94b95807610ab67e47e544f76fb6d411d864c33ce07fce4ee29bee101dc68f402855ac983094472b039e2c711745138991ee97f2ea00ae0f9e3fd59d19b0260";
+      sha512 = "7686883f06bcdd7d1d7affeddb70ae3477e7f4cc865e23541814c9b4de1dced322ad1b27a71748198f9678dc2f88d9bfb82f21c55f780891fbd0fc6b3d9f8761";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c3203b20feffca9181b7b0b5b22e1fcd31f8fefc4d4fb1a5029ec609fd2545f702cb91bc002d5cd4df46dd353bed75afab40cef3cedd37c79e002b161a3c767e";
+      sha512 = "f4de362efce3e639fae3795f5d5d8c26511fa18244264197e35a476b0eb1034c2045dd5518004d63c9d56d77faeaf437d4c6bbd5d673941fc908ffd3267f621f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b1e833c8612a23757d094e92d17c36b8db2418cfc903a8a3b1542d4ec77f606394adb55a6ad10da9422ab69e784570544bd2135dfca52a519935d391b3928f6d";
+      sha512 = "7692c77a4eee2ab32546f3f92d252b36848c662ed39e8f8b6ab3b25be93003c610586cc3f8d871da16ec60eae86f4ddcdf4dd264a30e5aa3e2fdbfb6395be441";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "108f4f6b6cf5beeb6939c8d22c75ae53f68d227c6341475547bf95f3423f26f40aa7c089be2b6d789806b2a9e35eba10046410b45ce032787e12aafb2ef7fdd6";
+      sha512 = "fd723c59ec13513deb0e8b7a25e79c7d59b0e2af037714e36608a76bac724c649c82fc28062e385b620eed71ce7a5743c828498e30dbd964376509f2a17a2c22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "9f352b4714ff40e65d70ef8e4488a1679f3c5cbd4a18d14d25e055a955a154eef2092cb0d378d5de9da3e16851f57697e3d30608fcd95072156f225e9e6e8632";
+      sha512 = "9294dbd56ac055a41e0a5abfd7c0c2e1630dfaaeb5f4bc88c20ce15b5ecaa43debd00a117389509f4c6c74c488f9893e68de36159fb791396cb886469cf772e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "401ba2a23fc180cb789abd5af3322bdafd65c4bab4f170d7d8f6fd34efc828809491698f8e1a5c217b93bec2827b7222c126479c1a4a96e3c0a22beaf363f90f";
+      sha512 = "f7a871abd3e91b904f69284e72467ab54e13a5f0f207237f520ebd290011f4bfc1448287272dde84bc0389a8708942e215cae384c6dde6c25416182d5adaf11c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "235bdb35de6584a144dc7c6b58f9ea4c526c843f1cf973d68f042e99327a578f07e5470377c0307474eba5c972a9f50b940c4008d8de98689482bb76cbd41203";
+      sha512 = "b8a1de2af55414b73482e9031ebc91c3b1bcf7b9f031ad6df3029c6854fee74018d216e3410550f6a75e49832ab447af661f77ab84d33ee323eee10e15dede3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "50562a3253bbeacd68f6d4474fe448b53d7b1a7f3b2791d955dd7a064dfdf1b1bb53c9736fc90c593e5da4a33939f51748c760d6f1739ee5930ae459ac4e4e83";
+      sha512 = "c65f20e5493935f1bfde0a704aa17768ebf3898fa6d8baba255bff4625b32e2d9a3aca12494d07a1dd5b0f53da764e589b096564b91602ead15dcf054181a29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "496f2629de38138c17eec6c9db1d2bf3aae0adbd7802e1a209f8e5b1b3cb9cb9538bdf6fad74189905882e1c4ab5aa3cc1482860864e3de9a4aafbd2ce66d080";
+      sha512 = "827be1a041070afd835a564733bde9ed5c435fdbdc63ed95807d84aaaad351c82db8d64fccf8f760a8434fc0968abfc041abf008eca71c4c53d292adfb731a9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e34aaf8fdfdf0708ba1fa5f6205a9cc316b6074d3a439b92909229a94d7d55c5dae14554fc0cff27ea1768716133bc9675a1b34ee08fb2a892dc9dc85bce436a";
+      sha512 = "8b3c8e748e3e9d02f5aece76c5e0c067c72d3575e40b49643f4ad9f3360b19ed0f026f690c8056cb0d72e0d81a50cc7c6b41c090a12a2ed4abd8e8b3a087d920";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f3e26c456cefc519d222c837a2ea5515cecf803c4b215dd82ba1e9b5aaa97c7115ae22e7d7c29520c3faaea7d996f67028872ed8e7d6aba8e5bd1fb6f8ca493f";
+      sha512 = "269e02ce58b98ee54f39c69ee95fb1ea5dfad7ac157fa2df6bf009718cc58b4b3bafe0bf4796cca4836d87d4a3b3845bcd062b64f2265bac9dfe930acc7ffa27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "bdcdc0d42453a290a13bf0d420dc5f324d50e2b3ced7bc480c3faa35a27ed94d1fc455e6d32adad31960baef599cd779feb66fa76db25d7a9b0c49a1bca2af37";
+      sha512 = "3c998e4bcac8362dd8932cf4ce53e3a18f322b22b9a98251a30e586aa00a3dc61222b0c1836e6e7d2ebefaeda0d196b1cd5d4da19d740287387e8ac9282c4c1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "8820e66d82bdaffd1c16d4f3aa9defeac9decb85f89bc03a2a0e9ef7c941ed7f499b1681930ed307220477b94c449a9f18c8688e535c91db3769d01ca90e1d96";
+      sha512 = "708e216a9443bad1abbf7280c484a6f285bd585e05293d7f7d676fefc1c9c5d3d6c6a4e1e7f7c5cf88f74c9671e542b8525c8969008225a28347bf170ba1f8f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "6f845a09bcde455d9a39943e44d4aaf0befa5aec65e1e0e40c170ecf9eab8d52e7b9cfb7b176d31b6cb7e96c7f2ce9675cebcff8cc8915622f8e5adbee23696f";
+      sha512 = "319c5e63fed5f9c97ee0b290bde3f8199417fb857d8c3b36ba731e0b9dc3a176a899c129aa09c1ebb6e4dd449d298db661b532876ffb4bb6454458428a653478";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "bc4bf3a3410c5625649126fbb008743ef20065cf9a36fa3e00f73418b3ca1728e03cfd25c1c97e381eb644bc213313f06903edf3d5dfd91230f9970850c4c6c7";
+      sha512 = "348a6a8e91bc205e86643522fdcb9e6df7f28618b8fc7b1f84fb505b7cd3b40ff0244fe1960778ab8500a1f397ff30236eb2a78aa7b78a545c61e4754daba40c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "52b54fec39905d9be5ca88997d0e4872a88ee2a787a5bfb77f7f78010b8b2363f5bfeaf8c2015b2a2dbd388d8e27d968bc7f6a67ab5bcfa245ccb9e894f2e432";
+      sha512 = "3b5f95a388fa4779998da9da8db214f1f4319505d9dfbc0f5e900c3aff35da88152f1486f939d5eeb44f2e5e9149635852e3a40182986b771535ea7b6ad5bda5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "02631cb9137a681a45fc7b74c8c19237ad52ac9c5e392923027842a877d1700decc7e5f17a74958958c114036a2add93ffb610a3c9ac8ce3ab08af1b07cde11e";
+      sha512 = "1cc320ad036995b5190aa5017323a409e068de7e813ee61d31fb8a232ea5439fd6190ba840be0a2c6ebdeb9af68dd8895c51f95dbf839f3769ae4bd927de95bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "5308c46510ac95ccc3faa0c631f6976b747089392974572390870806b6688cdbaf13e5ad010ffaa680cb7055e4c2d482a288afa7d991d9c52821859b21b70e19";
+      sha512 = "8b5181da6b8ff98f48fae289e44ec8b31d6df9575e4cb45b38f03bc2d653bc8f0803c75804adee8a6bd5cc0395f8548d9c9629ebaf8e1b38e7d9783e8ccbf8ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6bb52b82a721369ec69172f3529210b46f211bfca71a0cfc7c4db2ab9c15d6ac69f475e420d66ed15691e2c54b1766a1e7d8a277d0cd1b9318d796bd67228def";
+      sha512 = "e20e0148e3b09570c36b2c41812b90e9e68ab5e936b44e54e7ab3c84ae2006ad5543820bd75337f23d5e5dfc27678a53ce749273d32212912335c4346f7946f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c820a0e1792dbb0bd52e9a5514ea0564fec70b685ba23618670f6b6e99de92f50c42b91b772649a67e84ca5f099db92b1434a400e347ce56b1954733ce976770";
+      sha512 = "455cbcbde1fa1173d11188daf641372de887b9280313e5cc1ef28e290c32b5be8a3e7ab1ac85948da8da8fae8be41fa736a70a7a1e0b4d4de8acb7b3b1235d6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3d8a71e12f995aebb8b74d99ed7b9704143b6320de3d44c19e94a6e56431b62648ea80a295214d0ba268c7249edb826bbf07c2a0f260c47a0f45a65a97fcdfc8";
+      sha512 = "9ef0ee15207812c2e92463350695c7afc952324d4cf55a99bd4bd6424b1b7c5215cca84afecbf86be05af17bc5a67a8a95005f93e5f93f95b4cb4db074d59c40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c5086f8606f0e94385d0edd5aef16ce559e8616cca629df3d67c45400bffd5e3ddbf7546b08dc5924f4e44afc5d16ce6b289bcc4a67007d9ad6356253ff49add";
+      sha512 = "3595fbb8b3ee186193d4c0b84c339f560238075fbd7a8d69fb3f2b4716dc85e4b0b799cc3524ab3ae646e777284ed3ae80ab5f2bf6648a8ad425505120c04a0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "744960232bf5d07ef8677f82fcae4454a69712010d6a6c62be3073c8e5826f8e43cea3c2e0d544db8e1e40bad83c42db7914412e37f516d8ac35fe46220a182d";
+      sha512 = "b1bff7c52877be383a55707f421bdb18b21fee45979c16ad91d4665336a6796731930da4051460430eeb36765ec4f8fa489eeac4583a57cf7553cbee59156c33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "975d0b008d16d46d48c97810b6fb9afc5a2ef42ed7f324ca285adb8d5535d8d9d73a32f1c2919a5435a14bbf95d89abb5ef1b3eba88a2af05f9aaee538488cdb";
+      sha512 = "7798c4b84854d8084fd53e241eee0c5a36fb278e0130f5131eb0e04f23d7ad4fd597e21780ca546c4be1f46e13b2a8aa9c704e6b9b48b6c88ddf6f48e10da753";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "2890ac9b3271fc10943d96b15bf7fc880217e2317d6e915e41a687688f2afa7821649b6b4cc8ecaf7945d5058e576d127d10663278fa23a78f002ccb3fc75044";
+      sha512 = "6c236ada8a5cd397a7ec94b4480482da351fbd7eccaa2db93faa47d04add275d135075109f48c2a06b7bcdd8876907753dc5be4b7b1cce08f3eb9985fd1063b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0295ecb400fa4f60795e731b26174d6d42ec86cadf3b8e546f5180968d6e2f383946de3189070b14de5f51f93560bacd76eeac35cd0c29d6a4a349fc508fbeae";
+      sha512 = "5bf77ba43776a5bb3de3a57bbf99de96c8b547c664ad940bb9dea69b5231a176347622ab631765cc2ae0d75ee1493397bfe6d6fc42a61dca89f79d96c3738479";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b08aa29142418dcf7159a9ae97d1095ce368f244c972022e23369db201c3e68a1b823b29f4e5ebe65aedc28990962d0fbcd2838a9d6c85e46128addb12e6cf54";
+      sha512 = "70ffeabbef6b53d8aac4f54e19f077495a5895ec5427e8fd00ba4cf149763d003f1b0660fb80d9f837c1910c103487bb77b15dc345fa339f2585142590f82de0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f3778bc9dc46c1b4d02e148d64b450f26c388ed3ef6b3d757353ff8f9a97d99611ac6162267053fcbe0eb83df32435229f7b25110f079ab193d6f3faa5d35924";
+      sha512 = "1e6daed8dcabc37603ab9ab4ffdd8d16984c64d913b0b32eb21d53cc1f8088a0fca4ef140a090a5fcb92894acc3702b5d5423c5d2e06759a80800e03cb09e139";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f87a23b6ff9ddbc7a45c60ac5d04e1bcefa39f743cb74cf9c701c320ecdfffe67c99a377d2419a97386167e19164bdd0bf6c2d2b5a057e4108cf9570390e4e98";
+      sha512 = "904ae45defdfa71aec5cd59b3d6418c92b792680a6400a0a1621a8a087c58d7fd518fc216da93761023f8c8d821253d992585c2ace74878be209daf45fe6193b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "81d792ec070194f4d51702711957a71bc01d69e7737e7e07132ee3047907f7abcfab300d0ab95ad4d50821e95a45d6b3762b51c16e8268132be742caaaeb5a8d";
+      sha512 = "65d9c2b59b26ea37c8c7c44ab0136935fa715328ecbf0af5392ade21f77225cadf3efe2b2e0c6babb735557eb6c0a3d4b833aeff5e38bc27059badda334d1021";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "318998c6585db455b82fd278efe24f707abfccc69ff1ae12ab5ca6bfaf915db8ebb16f845eae7832d88aab6af8ca1c2b35bff504019ea265b938d5e7d09088c8";
+      sha512 = "68964a74d1fd81664bdfaf8d614f7a78237beb3cfa6d86ee7e569361afa378df1fe1430f4cdb19ef59e960c264aa7032dd1991ea4396c88c7e8d521fc29aab9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ac63840ba086bec205d7c730d9d9503a0f72976c875544d09457e4fe37f802e56aa7075ac0ebec72ec9dcdc5ce67c99b83bb2779eb6c2bfa981f2e17895f801a";
+      sha512 = "8cbd78d7822ea1cc37adaceec7ef1208422c5069c93a9057543c7a3446754cf6cadfac8ef220db77ea80182c0cb0bf4fb5675d7777f87f5610a3c482abcdd3bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "01807e206f1dfa499b2e578dbcc6987bef6d0dcf02e362e13ed845ad7d513e42f54e3f5113164ecf75376735ba4d45496624a283cbb0fb0a69e2bf80943b4dd5";
+      sha512 = "0e8030bb95051862294bfa94201d2e701736f9a46cbac0848f7036552a53af131fdbad64780be307a63bb8d74b6c7f9b015cfe6c2959e839293e1ac3bc0d596c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "85cf988e4038f28cee3fb95d62112de2883240bd493e7c03e4a8998baacf428ce529bd236a6fa9f90d764cab1c7e4d975c5d88a876e08474497151a4a71987f5";
+      sha512 = "c34f58438b653023c68502a284d51ba5ea895b350d262942e4546d098ed17a10f32f4ae455e9a24ac17fad860d9db38cc01460196fb92096273d6e52a4b62b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "16094487fe1b1a49e500fd56f5b175510a07b7a44cb916d3840c3ac42580242e1b121738eb23f94c1dd8c7875ddf1821e8ce8bb2bd2d9ed799391707c168c82b";
+      sha512 = "a367fa5bf03b2c05dceb9dcb08597e1feb2dee91a3a2389efab6a3838f2b2f569a62d0ccf44d8a78654097545da8d7c002f127113e671af3befbf886556b3b87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "570f96ef84b4b12ee4c2d3eeab0bf57720954943696559850cd6e3c1eba0fbaf42085e3c6c60e74430208131c0f6e86735262c4c69c3f0490b191a75b8f91fd8";
+      sha512 = "cd8f8d6e563ff79b99c9af0031db1ebfb7278e980d8d093d1610058510b5880d44c8c93e4ce365b91175ac3082eb445d815e3fe26dd30bdfcb16d4159e9661a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cc883efbbea7e187881974dbbf27243d5fbb1810f8c605baf3628b32a308c15ba66598617fea40cf22a89990f5690fc7c8ee4f4256019794301ddf49982a45f7";
+      sha512 = "1eef9e5469b98cbf3873a7ebeddf74250f81436fd0729dbd46cffd95ff13e96cf1f1b65bab55ec784e6ba2ca4159ffa1d9121a97a55de1d6ba9daeef1f711f57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1bfd3ad527b5d668a9296163890f2d7074b236eaea3661e17b39e086fa0a2fff96e8d6aca4b29ef9fbbb2c1d8ce8f7d38438dbd6c7689c1012ce86b9daca58eb";
+      sha512 = "7f94a36d30847b27f39fb6838bbb73302582917cfb932171cdcd00c033f24b0b23a82fcbb0ceb8416cac58e27f8b298e6bff9dbdf1f3fdd6b91621d897afca0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b540ee3505c4b031ed348ff99135eb61214e99ae543de821d84b9f59078efb87b34536308ebd5aa00b1bd12dc311ff769580373b13f7814dd3661f821973e264";
+      sha512 = "4a474a6a1b0386369eb5f719aa938bfafe51958adafdb854e8242db3a3da8799efc6cb1055f4f85e805e8edfc8117e96de958e9b415e3974efbb6055ee097fdc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "bb8cfdbc08a20a719a14cadaebc50e8702dbab3007e43e6e2d3a951e9a6ad5af00f14f79be133411002852980b2efa37c8dd48af0e827f0c7cee98556f6f6f59";
+      sha512 = "74145ff3b86d515e3cd7c5080091e5a734b125432443d7ff5d6bb79aa1f2d1d28443f1db25ede8452e58ff81b58ab397bbdca44058d6713183864d353fa4d857";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6fa1f94847bf81ed7b3f676475ba4e6e7205d03980e4a7f031a16310e2525f15e09da85c63902ff2a5c249152dfef0f6502bb10e9ecd934359d9490f39564a0d";
+      sha512 = "ac13b8b3e7adf1c2daea80d6f294d784f7912f7166f4305675de821a048e84241081848ec1b0ee5ef96207cbf1b7b5aa77973c993f9450c4dde0d0d9c60936c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "3b3f751ec9893220e0cd264d9cb7f555d446d12f5e4efbd31501c38e39d3f3dd2ba14cb55ff5b99171588ea6474e7b6f0dbff1d927e3f19bd5a31bcf828b09bc";
+      sha512 = "8a89f909e525df4260855263f8d7007cf83176912fd19a0de425b1ec4893fddccff3723f01cbb48457a8c2e3a2ea1c9c969a71d171f3a282342626a2d6821277";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "a3668d643f18332b87aac8f718fcf783d3df063d0eda0a94c523157c7cfcd7da7af676d5e7d6253dec2dd657e4865f60cf441e4bc31684cfbb66f9ef497d12f8";
+      sha512 = "56b92973f3803e91b9859dbe7f0c35eb92364e9983e48dc063a3db637af0e22478047c7c6f5e1b75448c73cde117700955af25038f9bbda4178c8cfb39b5f0fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "9d9b9327f687b596b368e3ac311d5e2cf17f6e171f2dded66cd09c19661c82a8475843675279359e1af73603dddbcc42c270512fb1b37fb54538b76e54df99b5";
+      sha512 = "ba03388e6cc42238383d7b779a0c53cd65a71caa30b6e6ece78317bb95173b27081489d6ed67de37608cd3029b162777451d4ceaa69234d71423daedcba1e57b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "dc3ac85569698ea73e2f146d6945f1e1a863a55150d46e9064b87951ed3eeb8caaa40c7b89fe11644acdb06f610e6200dff3a3a6cd48838962f8908d08d56e34";
+      sha512 = "62c345ea2b6321e6be77f54864c9ce8c1e8cd68ba7a496e1e779c905f6f02aad19556a4e7cb4b2a61466773db0eb3d5e0d187d7cdd2dcac700a3d509dc31247b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "cd51c26629502707f277b111388794ade3c12af64fdfeb009daa01d676b64940c6155e9f8002b037106da3913125697ef7305cbbbfffdc9ba6701e6f476df058";
+      sha512 = "c8f60684f81114f5095bf106ea456bac5569b767d10dc59b4d9adcd67b66701432cc3d906ddde76c0d71d18716972a48e65a7b36a1c91f471e6e2d5655dde917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "10d6ce4f1f16d3a1373883911b29da8b01cf746b661f4d99a1601b3ea1e1ab77eb6429393e244c61af52f63e9d4b890f6a8df7deaaa1f2560795c16ca877b952";
+      sha512 = "429edb9fd687057dd4e77e4a6cf2b1df1d2f830472e75edb6d975986583a0726beedff4025c0889c28599cb36f9a894097a4e391fe333a44410ed73faa27cd47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "b89d94cf18fc50a6ec3798b95ce4afa46d15ea42871955cc1b46f3e330c06552f9ed8e53d02d55c17c25f62186e6a3c1a6c45de1bc21f9bd7050bfdd4f965c78";
+      sha512 = "afc42947556d206f8ca0e83cad9462c057ad5d31a2829504d4a7d904d31884ede260f2a92fa0f1e5ac68aa333c2ef65b41ad229d51d1109d41703c6f928f1541";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7a34523c801b5332c26aea08263248e5f471130300320c2768f06df9ae5e3bd90a7c547e73dffb789c763b2ab7b94c2763534c9ee408a67680d63052db280b4e";
+      sha512 = "9318d88ed98c3d7d30cb67d12ca1ed4c3857c2fd4dedfdd8248e76edce7757f5d6703854b7c82f6fa25a721f6b476ac6fcac2f93cec6b36c192ff38e28ea4e41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "a556466c16091dd2107e97bc52b1fea9875e15e5136762a57b71078d6189bf9dd57fcf1965c921df73dddd2edbd435e678f519a424ace1d0daebd665c4364f90";
+      sha512 = "76fded79e5d2c268a370927f033883311ce3baffb3c3ad6c5cb2c205f4dacc78727b3ec845f8c98cf9311df51d079e7cf386f0356b804b4da32498d539f90056";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "558c865772fb9eff258eadce29d2f03d97c3bf98b28d6c9210567b08c99f3532c1d2be534c5a6def292c060219e3d777d052d4e9db9927a1f85e41ed59f843d0";
+      sha512 = "0e344600ea643346258eaf507171dfa71c033aeaeac30d2872c62396007a521f68393f502bd32047fcbbcb8bf083fea5e7dd5d4c626c97ae8741797520ccbf04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cea6b3546c6e94cc3667845a2c93de22068c4abd9fd79f73889acfa8b7d3f5e0af3783c252a07cd5c7e6c0a064c2e7932c4e2736b5f040266140e19ad6697ca3";
+      sha512 = "a68a04d7fff97141635feedee2f89eacfb36e73f298490aff4640ed0f09d16f5dfb8e3e7275fba3c77a5a79b7c6dab09cd85ed87bc007eb420d7be897c3228d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f3a72c805cef49afc1a9e59652698d295abfd70ee2e91ece11c2d68d58329c1bfc490f03470d277d4398b4b907588399d3733e3e907b751d636873b0465d6ca4";
+      sha512 = "702de0dc1a5a8d36558332aa5b8bf0a16571f8953a2de486906f57a0ec644723c65c12c63c0ad944f7db1a93fae2a96ac24220f7068f3098cb2cdc9e64d1c782";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "10b03735d8f98180bbe9741cb26bf7f349b7a4afe65fc8bc0cee0bf61966ddf7be48b233092f90dc829a6cfa753c3e35cc07ed35fdd09965ade816b5f3e9aa20";
+      sha512 = "22156bfb697297c35a22ce55af66d02e58a7879db0fa1edda04450836564e5e67ef4789be90e85e5881acdbd55654c10c2b0d8a0d2bb06b6775ce1d908abd5cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "4cfb064e57a3e90a4719cfc38520de2365bde3d9c0df17a34affa7bec1c19e7fbec0e3f7fd233331024706ab474110ebe9059d4ed6b6f1575491579f47c4b2f9";
+      sha512 = "21e9bd936d57ca6e12d58d185ad15786d5fcc00dade092a0cf47aa395d3a7b93d6eb7d63ab5784c4787e9613c866f3ccc307869225001495eeb0d0e8f6d653bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "b6211e70b039f56f4b65339487fdde03c132211c0b362c6df2d7440c15856a946944e0a583b624b7e928c39a63706dd495a06a1ae088d2ca484ce79e5fe9c795";
+      sha512 = "89d8e1adc81f0ac12208760a5cf8f7f1b94bf977052d6762618c6decf6472dfc62cdb9f42303fa9cddcf4a9bcfb7e7a52db7bd5080beba994bf5fe8434b7ab2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "5973e89146d547f8cb02b613d54f88d77e7f00979f8f6c64db276313e101867f6c27a0e7d5bb7e894a6dfa8e185c467dec530d4e7baf9aab839ff34a811ea84a";
+      sha512 = "021bef0155b80b4bc74fcc197f8b901e1cda73c6b2ef9e5d4f82a9702ea59b38b427f79fcdcc393873a5004ee87e609a58fc33c871eb3f8d43deafa07c52b913";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d9a3fd7752a0a1431a46ae385cbdd331cd86e758e28b994604135e67bd562baf5b9edc1735fe1d0681853e18a235cb29c1be52b4b951954c5d6045457b909b31";
+      sha512 = "f4fca659d0c46e3945323e695ed6fc8ccf57bb7967114c4da97a552ff93c892320dc11525cc57111690b799c23a1f0221448d963123294b41ce6de428cbe50bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b6d6d4f6c950ea05680d6f9c5c247ae11c35cd3b1cb2a0429410f2e8ee05a7c2782ec7f220215f8dd7a5a2566c4bad05e6bb6c913a01788f707d8e37f9b9c408";
+      sha512 = "d79841de7eaa394a033793ab01a7e6b45c9055622c28de3585fae2ab5ea1265dc90a4f27064edbd0662c5c820db4d4a906e3bc60f07dcc800a70291a913f6c9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "472f6f670643baf59807eea9fcb171c61a305caa917c25626277d1e7a723e667f1ca5c1cb07b3b0b9cc3f8b50ad4d67456ec1c3214cbe813f43be5be74d90eca";
+      sha512 = "ec9610ed1c0be19b14243584bd649e04d376091e21e19337fb0d573c79c5a73f4188e207faba30d03cc555d9556d83ffc5ad0418b2b5a079ab5cda5371ce8f26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "44743e46e04f5f175af5a6404c6f2702818167948dd841ffd2f9eac88622336af6943a03cd1e615c58c6090bd8dff8a08b967d7f6dbf781f91d551bd8b687c88";
+      sha512 = "0526371496118f44595bd6adf161870956ff72184ee0a57a00d2c374e3e76295a3cd781f0dcc70a6c23561da721448c715203ca04d082819341f14c479230a9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "5da4efca4c9c8c45328afc78b24e6616ccad539127f94b8fc3525aba832c29d6bf3a54c9a964562d804a9095314ffa7e2daf67d55a0128304607e98a75088adc";
+      sha512 = "b45fc0b6569c2276dffafc6a97638c7acf57e4cc71455380ee4af68f4117700570e2728b14ac49e9ffed55be84147d0448dfd73d55aa59dc350ab3d1846be2b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "d78e51e71b8f309171f1b78fa5c2ff9058b92051c0651953d875d38611d7180bbcde18a71d54a257ebfa24df43f86b526c92f73517dbe43de8ec173c33730353";
+      sha512 = "3521526588d64ee31a666728628515a83b3a8a6e9e68ee5c07dd151c128a5fbc3f1871bd44cd38b681cef2d55a3d1c770db3227e0cb64df64125699a1c30ae88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0bbd82629f59d71407477608475d0773851615346ca7da6e338563eb70c18e7e54795c22ebf4d9cd965ed956ccead2950082a0e9780b13edc6478df985abcad7";
+      sha512 = "c36237398172fd7e14c340393b68bb810fb7072979b953a17084a5afd90394e6f355b4d05dbb4a33887aca8a3dc90c8efefd24598aafcb6948ce8ea199614887";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "1799cda7b7f040a0471681891769c16c8b17e6ebcc6e037da0a45757f1863ed5a5def8d07d6fd4d172e32ca2de6cb45481bb1ccb8f8c2caa8d3b712ad4374466";
+      sha512 = "8067d2b0332f812c43456cb3bb8d26a8ee4e25065aa35d892235a1ce89603562fe3537aef767d06cb9952e3c3a90c3a2f77911c9e24c7ffdcfd43980619341dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "7da281d3e710897d7af9fe2b384e73b27e76af5ce5224a12cbed81400380e506e5fb17a0d91094295c6435acae942aa423cceb58ed97bb52835ac375af80410c";
+      sha512 = "b15763c9b95278ae9137239157341707e10c1b64a46f1502351438798a14337040c4aacd6dd7d6e11342b7fcc4d222a591f3ab74bcd8e7fc198bacd2345875f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "4eda3e69ca5ab51d332aac0639de33994ba0b42fc244d191a7b1c6990edfeb453151de7c1e746feba1ac6d7edbd8c653cb29db76353175d687c0ef46c177013a";
+      sha512 = "2566da69640f5e602244dfa5b773fa99500f47f4b88ce914e3a4703f7b03b55f6887b5a1e6596f5614e43d85c343accdd5a6797ab90954437140ef06fc29a2fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "eb7615f59583a95ba013e517d42d80c5cf33362b2bbc6ec6250d17a0eaab574d72bda6970f38177791a93088eb5f8d1cd088e46faf373e323d9dd4772b12e8e6";
+      sha512 = "be1ad5cea319b29d1bafab2aae668fcde126c440daf8a433442d44c539a07b3eb60d20d5af837ef0d820fa74430512ff5c0b747471c995ff208351b3d1e8cfff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "be72ad38323c545fa7ddba6d105dc39eec6d3fa82fbbe1c4026c0087a555b77aff2802fd4f6c51a01efee78be7652527b759373d920f2c403e9f9db784a66369";
+      sha512 = "a44149ec66afae54278c4716d3b39a519202fd8b388fafb5ba4c6efcc97b1406aa4307f5d583746d4c0c8df2caeed96b2d4aa3440032ee26cfa46e835ec780b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "200631e7d275728c98f02da92c82de33f4e6d13e3b0fd2537c6395d3f8fe84aaa568ea3b8f2e63fefdd64e830e0df9ed10ac3631581c05cbb790f745ff9c4fd1";
+      sha512 = "0cc0a338948789fc370de9beb3982ed1c53e31fcd290473f08000356c0a3637e1fa8ad500bc1327c198dfeafd1f3d9527e6a74e80f6204f419263750b4e61e1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "0a85c88096d4b470b76c9162a5e6ee9e4f8f6d75cac8515b7b76c3ba4f8cf571713d451aa54f5608ae38bbb910c4bc13c7dd870060f82834b0fd1bbb64dfdbe1";
+      sha512 = "b39f505e618327022112a471bfb75345c0f9a489c268a7062e563a76829a4c216fe151726ef5d1895e3434131af573b825507ca6dcf53b81c78cf8813cbb9d87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "6eef06306bf53d92f33de53f65bd2c06eba4e2bf86b112bc7d9e90555721cee051d071047317d0e1b9b661aca22c71ebd553386bdce70c8a1a8ea35c14710095";
+      sha512 = "f077c9c36635560ba319c573b8c2a2d560edbd9488fa0121c436aa37f76373eb081289510a0eadf112c5b44687f3971198a89537dc891740c739238711b2c6b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3f3d4605a043dd32d416d55c2a6572a82f311af38feac305392cc0fb5ebb99c1c8a8513baa3927b008f178e2655c3431df284549fd6674186fb28f4eabe417e6";
+      sha512 = "3855c0a21777563999370dca08f4fc139f1e2724ae6eaa45857cdb0d6590a44d3abf2d24660549d7010dd64ca62de1f7e720a1dad35d45b7cdfa8df322193a07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "aebe22d22150ae7e539f9761b1b9470b840e8b475510aa71b2256edb0a8de6e041622d0920b64ec4ebad0f71ed16e11cfaa8496b22bfc212e93a4f7727fe0bb5";
+      sha512 = "89f18a34c29744e336607a9de3fbdf7b461f9ec12efb90a56a316991b03ec33b7014998268089369263d8ee81fa4b7f0a1b007b87978545d8fae00ad5933b2a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a31ba99c189d2cc6dc432f5cf707390976e0f8b901bf0adc039eed276011d825bca22d2c9799b87b729baddb086f55bc2a9579929e1f97c6a5aea7917f07e01e";
+      sha512 = "8dc5b13599b5666ef5bce95131c293a4c22c34dec80ffb7b864a387e62a36c904acf278c261340f136fd5528d098ddb0d16601b751acd2e407dabce7216e7127";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e8b349efc6a322dcaa9c896d865df76f940eabb7c9157a9ef198159f7c92cee593a46e77c36a6a85d33ad44aa36a0f6fe094e2722883a84bb17d61201b6f67c6";
+      sha512 = "0b56c672bb4125289467c741f58c07f9acbc16233c959f1eff0eb0187f5ad9c08193a51373db3057207a14aed55f94d17d42db2d784beb896cd0f66c543d76b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e388c59cc421f2cc409642db6776a6cb05177f16c0878c7c07399fa311939fb2b09b5c9a50b57f7425c18f375b25c93ecbf6be0b44c4a534482574019c6e3d0e";
+      sha512 = "6ad35e3cdbeab355c54d62332ebef650ff417ef7a133fc7fd18f287a1e489e8ddeb2675532ab33efcbc560127e23139dff3a85ad7515cce6fd2ca22c673484b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b9bcdca2b82d285c1c51054666744b9710fa492d460fe0e56707c5a92fdda013efced781ffe8774df588c8c4d1898a58915171d4317f37586dfa341bc27919dd";
+      sha512 = "8026c5bfcec6e8b11571af0a253854b087cc25737dda79083e6dcaf1c48f60592418a0f73c1966d963b7f526a6ce828a27d2e37312612fde12d89b667bd29db1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "9848b1a71e45d9b741a239cc12c52d22df1d663f784a3491174df75a479bc7eb610e913e49684658256464dd9e5cbf1a54be07fb821d4de1727614ce30f934ab";
+      sha512 = "c9e978ca93a1e7120f3aeae2c300c8af4aff83a278717657ea1ae5cf4fb5707e871e7fd1d5c74da2fabacfb2d46c687954dddcc50ff585862cd3cbc6f41a1d46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "4e28013a4966da67d01cffdeb80da6cf530ebb093dec6de519914a42d3d1fe46a3543ae6e491ec0ac1e67f1d705756983693b07333436983e446a347f17a39cd";
+      sha512 = "71dcb1dfd06802377730c35e6e842a0591c9ec287efd191eca4566c73bd456c02c5d7cfd68a49c7537612a46bdb7c09f6fa5d6734dd1252544401a047f13a524";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3e54a685ab48b14b7e98a140027786973dc855bdf70466fdfdc9fff646c3c7331a7d3f569dc94ff268e8a4c42429c0991d227734b0c6497f8778d908eaa8b1f5";
+      sha512 = "f46349d5207dfed0711ad2f7a858dc28c61f924d0272f6209a63d710f7bb6800930930d0b10b6493652699b4d139146f6a4e0a00b63d1d4ea4e58869c664aa65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "0d6f4df0197b5a03353b33c1d2201e43092f667340b0103fd9e312440425dd0c482a1ab1efa0be194b93d9c5002b6b2e96fbd4ab5a13fc7d967c90cf7c8fa976";
+      sha512 = "5ad4c5c10d4a01b2766201d1ca906b9f7112d58722253f6488bf552922e5fb2ee2d44cf9ef3ea74c2e62c062e8a6f52f44738b7e38917997e5e2c24d6a19003c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3e50a9e33836069e4ab5e368ebedaf7663ff26efc7a34e3602c3a099402cf5172a984669f579c2e24f65ca61a766cc0eaafc2d78713777cd8796bc77187d7ff0";
+      sha512 = "47dc4a61b145a2ac4b8e91907d9115f67433d68aaedb841b40b4bf3fe234ef1972fa2ebbbdfa4a099881500da815b5c4d0ae37824aa21392fcbf4900469f0c5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "d37ab2e22d959def3a320b400cc31359a62b285c21d634fc52737109b158ae197a008dfa63336f9c94362279a7f3c8ed7440ccd457fc3eb30ec39cef5065c6fe";
+      sha512 = "0d2df7c1f41713d0ccc2a6436dea281d5e7daba90397c5f02f52ade4225326cc1866dafc0ac6c2dc57883b44bc6fb11f6515c1a18d15e138a6acb4e6924f3924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3a789af772dfef54904c429e885c941427493e23fbe563acaeff3314113b0ed0d7d01b72e56db42eecb3a759690ea1b99e5a2830ea8a119432fb5cb80fed3796";
+      sha512 = "98be094aeee77d6abcea37e6ffe339f13df99ba557c5ec90edaf025d1adb21ef240fd963d056532bf0ab3b77f84e2a7997dbed6299db4f2785cdbb61fd529249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4722689021e31ce9901c7cfe9f6af45ecd7d0d2b3456d152e3ca1b4cc473e6bcb093732f8e365203080db3e45f99f34b58eaf4f3b07157d1a7ef3233b937c7e4";
+      sha512 = "08f1e6d0a2492c2f4c423f025172ee29a2b5db49fdb04887664d4f800c2763a2c1dd7f4764ab175437527099c825714526620e6ff11b300bd61a3c522491b8ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "aabb3ece3bff1c7c8d3341244468ca0f79b8656bc2ac156eb5aea935b2993497ed4f87c5095ddb710eff04a4d08eb8995cfbf8081ae1db86a026842142252d21";
+      sha512 = "538e82bd706abf3bc52053f9d388c1017f28dd94cbc44fc5255cd81f93504f413c2c65d218f1ed0916fdbe9b4ad50d8b2af4612c84f7115f305ba6d135c7db26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0bf938ec04eb1595a230a715f863fbbdfd59617b6b652aab52c756b47e12f06380351acbf111e560e0c299522777c8df881c6f73147ea697e9aae6d68371cac8";
+      sha512 = "0f21274153c4ec5021914889d7e69a6aa84057ad9c85a282f91957f0e2f14d4c4da30dd2c7aaed2d082c37c28555e65ad7ac1742394ab7a3cbe8ff7dcb3f3473";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ba9e855a51afa3c92c1ee0309c4cc5b489d60be06b033b3b6a31de9328ac31e3566f99e5edbbe13ad125e730141890ac937126a73490f1bd6ea412fcf99e2ef4";
+      sha512 = "b34beb110fb96c03d8e19b93272a951f7e94e792fe2e1a5789c52e316a1de99020d25b246b38212f912b12d7b87f55cbbbac24d470a432b1a715f313cdb5f7fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a27588eb0ed61068604c5cf7a816be660718cb59d200718456f3208218c624d9ba83d1b8c53f8cbab9a65ead095dfd4f76e5baa3ea1f5b6d13fa826b27de12ae";
+      sha512 = "7b2e7ef70597b6a0c0c66eb003927953d4416221fd967ccb259d3980a640b16b65ca6c6b757559baa010ef12e76ee8c92a255bb5cff4af256efb775179c24130";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "4bccf3f6d5a3b7dfa2bca47f31f7d22d7eea537c07cba8ea83088f3c71a6bfeb9c91fa945181b2765ecf4aae2ae8e0d61a7455bfcf9c1fc9c69cd3b0a9b5e8fa";
+      sha512 = "758fb694aaa821c4234d5a05d6f1035844e2f30a6afb559198bd88a6fd27125178e933293302fb26b64789c141b965778ed5c36426b60930314738be98951455";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "0f9b6b7df59b724706d93745080488c755ee34ce1466edaa18efd09e6b99da9582ae70d271efe4fb46d566d66256877b60b0da593071cfb7778ceb95a797319c";
+      sha512 = "ed46f4b40f8140fae43b292371ee5b991afdf295877d0c92530f8c988096f28434b8b396def5b66e4d2c273e4d0fc2fe6177c125d9adc57e6eeca995d8916c1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "58bea0b6a303e89a22f1f513ca15a3ee372a62871dd4e4def2249f72de9fd9f7724bf559b40b5f8e29f4439666e07b9611180296b51bfaa7558fa89f9c87ad5c";
+      sha512 = "d961992fc8643c8bc8344e8c439628c5c8e786acf9875b38035e36759f8d194804910326df0caf0ba0af13a6aab1dd026908ca1b81e64f6e99113059508f2134";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "00190deb133a575d93bd362032c6272a8c39d59c3d44663421a3a225e1abfdcad1b1cbf20e7b4ab766b8974c016984bcbdb945abe32841611b274f81d76c5217";
+      sha512 = "891caf22f30eb4765f1c1d12dfd71e5155ba7334538be894317efca94f4d5b789e7ee9e7bfe6261f63ea0b6efd61d45d06e21c6d54c6a561ffc0673f7e725776";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "11d38a85c29a0ef8457481109048539bccc859aa352dfe32608a695c69b5311b5218875519b6ccc341fb06d856294ef6d0c6db79fd96e057377dffe08fc4b2de";
+      sha512 = "e197199cc971e75839b6b60bba9379dab65e81ea0e93f007fee2e447d2e0b850bd2b7b380517a925497fbc6e01e9cbe8f1170629d3087c5a7c5887c08c1c2740";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3c0789c98c65857b4cfb2620d2c6bd0400a89d790dbc94e688c11a84166686bf3cb716bbf71d1786a2c38543c0dafc68f8907492d3e843a07285678c31db7bc4";
+      sha512 = "7de394922b2a14643b377e185bc91e4b72abc12fe65aff4deb7509445bdd3902b4c647277feabf6168f2dd63c6976f4cdcd42eedcf6f945648ad0a9cc64990ce";
     }
     ];
 }

From 29e757ecc537baaa7a51eee69f4da7c0ab02b4bf Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Mar 2018 15:02:33 +0800
Subject: [PATCH 2157/2266] firefox-beta-bin: 60.0b6 -> 60.0b7

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 11867ce8703..f1fd748cf84 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b6";
+  version = "60.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "818e692ff3c7a142e343a09f8f6594ad933199125b1c9e9b6d0b6fdce5a495b1322bc18eebdcd748c9aa8e46e7c56266728e0c3f40de1613e583c36672db4712";
+      sha512 = "ffd25de3de0a1a7524e750136b9439ceb79afa8e5ded88d3a7bd42aac3276717de51b7740bab09ccd075deda148212124ddc1a6ae07146274d3c8177176ed247";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "dd4f43e2040ee5f0d5ffb0fd51a62d8f8175e867607068a3754ab214f05cfb1a167e5aa372ce193deec8571ae76ff0acabcc668ebdbf98c2e3de498065a3152f";
+      sha512 = "039e4699bbbfd1c0bb655b158d671897e70b3d7b0c51069b0ff52a03a78d6b7cef4ea46164b7ad510a3e71c2df924569a6acffc66c77171950860ea8c08131b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "d5f22c0ccd447595a52ac3472e0c2442f9a399287b115f57b10ef0812fa42a6d2b86eeb415bb1745a3b641218783a477fa7dd3146160e91475e6e8dee57dedc6";
+      sha512 = "fdfdfab6ae2247a746d4e62680917c9853ecbf9643bb07a86d61f797ac244401013427b0c2abe8f88a56ac3396b2c3e67e857e97a9c11a774067544b7c2458c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2c73b86bedd50979943ca746105e2a217040cde9161be3e00c94fb34515b8ee28dabcb24bca83fe8a78f8c368e99d813be3d19e9679080d75e1b55eb6c74abde";
+      sha512 = "9ed3f5da2f9e40cd02efe435caa28a928bd1d8c87bc13f059e0e612cb9194a05d80b3daf502d10335b49f6c8c10d587ca328f7309cb351d54b49545378978f47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "d622b8bcdc67fec6e8eda35f650f9ca3a6ea947d4ce17f582440ec5f9ed9bb4da6e32607a5f9883990e6efa8751ebf7cfd577d57e748cd44e06c528f692fb839";
+      sha512 = "9cc2cf3cebd2ba4fd3ce65bc6f38b916736cd2eb056e5f9114f51b0bc8e2bcf5dea507e056f21f4428314b20c1647854ba8b48862dda17f5aad07b35b3d863be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "b95e2b2337ec40714091b4524e1155b6b5f33da8221f70425f20af9703386c9e7c65cb698f604b9fba2b032a8e38b32f7fd97264986806505f83b8fa569a1c68";
+      sha512 = "ca3d5f2dc4eb850c2a907b095ba9f59b5a4d51f28bdcc5bb4f27b6e631e91beb0e374427c9fce74ee25f540907adc21d4d5933d512fb47cbc41eabe51ef2d58a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ee5a7eac77c46dba07679e35bd5f3de7ec0d7f2a342fe900b7a09476ca164194874205054fc6f5fb114e5831e6412c674b79c5ea8402cf9a16a7400499fa03dc";
+      sha512 = "8c02488c170d705923aa4022c32c75f405ab01a83c821b228d90d030c69235c19ab9c6ebeb4e5a926ac3ff2e06a639a549b98632ed167037e6447dfe5f977bd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f051c711fb5e0bec5d7a819aa8a023641888048bbf3189cd9f3c381f0e695df1036743746ba8f9558435413662ea8c0e0d59be26fd6f56f451725b59855f3b6c";
+      sha512 = "82c3fc46eb2a8b080632b183e250f5063422e55f0bddad16b42a436cbdc6567b3e0de7bedc280128a34838fa08aef875c29e0dd0358a31deea13d5e6f499a349";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "65af640674c8487e947869a7eb361b0b75d7e86bf2047f6d7280e7ce724efa4f842697651ec8b3597246cd199ada40dd237204f9e3357ec658056b9a18a4c1b0";
+      sha512 = "8ce4697b290e9df4247879d75cd30c19a3e517268f25731ea59078df363bcda584b70b0e9602cb35999b7c127cb505a3c8ebfe6d117761a2fe74e7a93c82f499";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9ce702615808d1515106c0efe657aa30ea9675b75450d31972733c5a02c058070fe4bb7110b3ecf87829d93e4e6c7eade8bb1cf49d11e0d36235ca3221dd38eb";
+      sha512 = "fdb54d86095c1ff2d6c2c7873552a5b7ab49c26a70c192f4b24ba1b1f31acb48280db6bb47e688f5bf625d5f01c40f115b5c4cdb2dc6d16f73038528aaae5e4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "8fa1eddf2875ae3a48574c92df88d9a0cb7f1dcfeea81047b61b1646914343a426f027359ead2b82afd52fb9dcba3d3f5212f47198ee7307912b060ad314e085";
+      sha512 = "625dee91caecd225121c968b4dcf0d339cf44530217474f292602c779bd5c058c72630d1977de5517bcef5150049b91d37e87dc33ca77b986dd1d61fa975b11a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "8764ea6734d8eebb8229308d8d75b11e603e8e04fe26790bfaa58847f71e8bef9691544931c8019a5cd603dfa04997b20767be81897a18bd1fc1288c73174045";
+      sha512 = "0b38399bf8b1d577990a7e07a46d855c525ec638eb5040b2c4401a38f83822523cb51d97d007babb91916d764a585f7160d8ad627d6582f15451e851a2226f3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "65a6a13fc099785a6be9ae5b546bb9a370e7a0a8cec679d27e9c87c4e4d01cc9b07cb4486fe243d1cf82c0e774f543663f7f68e62ee31b16fb505179d81b6c30";
+      sha512 = "75dd3380634145249c98cc7f4fe9a773827efa37f8dd5eaaa19da3373c143fe22d144189aaa0d1040193900eb1e36ad28d47f969cb0ac8356e494316ca107cca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c61f865c1da38d137bb64e6cdd86e63a793a42c916e241db6ebcafd2b061d56c659690c98ccc65b1bb2224ab6b98ac7d6cacd85947f3f8b0b6a4ad6422db2f98";
+      sha512 = "3c51d9feaeacd1ad824f4acad7fca73b2e4afee28fc2ec8ffecc2f1ec442eb1ade1c37c429a97400314a5e76b6f3cbccc08d44cac9098252f481c3154ba422a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d0fada9251271f3aff3222ae3cad1b429aadcf9801231388a79c63a2b14ce21a41fa93cd6353a0bac4ed3cb58bbb3375437e07c11ad939c1cf281554319a497d";
+      sha512 = "68883704fcc49795ee2260b8bc4e06b736adc73db4707ee43b7b539f59836ecfc217e391e73dbd3830f8bdd5fe169b03dff516af378609e65a626e91ea20849d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "ba962cd22bf2b0b3bb5a4c40d5e3628152af490586824dee3e890c02a86828945c4dfed7a9ff595d8cd60fc30f2cbc799cfca2b41ced1f56af303c4edef364d0";
+      sha512 = "d02bcc433a88db175887454142b5017e5c6c8b47633d46f24b43397b938f8835daab1fa48c6b7531d275400590f2cbe391867ecb64130a449e9501e3cadd201a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "fe5e94a6a0caf594df4b96c0803a71139249c993769d72d607baefc9bcfaa1a9b33d26267919bccaf1e707d6894ccbf0e85867783a104cce6211c891418ee46a";
+      sha512 = "e47a519360cf397f09f2d04e1e4875863852a88b2cd3ec8b7ce16fc475114d0e0da041f63f91a1b51178b528ce791f3e4ba3c1fd37f6de55929a9002e4f7624b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "06a5ac528b7f78bc215cbbb3db89450a215f277972c8cf3a1f80da686a48de9e4c603dee40432c29d62b2a566f2f0eba0eeeb5ace16fd4801820cd6100f8f2cf";
+      sha512 = "74dcd67de284b0b5f55c59292f3a53b0371960bb5dc134fdf79810e02c08f9a90547b29af5300e3f5f55ce7b8da788d52d492d6349a67999ac1e64c8f4059429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d88656e118cd66c3f7ef923b2b40e6674952259980df6ba15489ee1e283a5a4999105b178c3ca2e55ebd67572fbd679ff178b75a4f4f2acbadc6cf7f6a5beb01";
+      sha512 = "437ca724cfe872ec616e5c3be80e3ed2a56112aa324e2a5dfb31ce89295b2bdcfdbd57c017ddb54f12e8013b27d3cbef243c75da7b2230237632597203d9e6a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "758d2d67280e08fe1b352ebae495d518143274eb38096908f22235340a3e67fdaeb073e79af30d36cf5c8251552562167931b5aa8ca7d3a54334fa684074b540";
+      sha512 = "029f38e891ac57791c5ef5946782c9d1b846d965fd2e2a5b12cf12ee4fa600c333ba8275d9d15c85ce259064944279a71f70aa9f5acf07f8c6d5a79ab0ae8a78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "6e9442b5cc8a9689490903a4b12e48b23f16a08258386a842f20714e598f31fb1ef70f9f9f73910af888ce41a17a5acb0f2afd5ee776d10f1547e904eef780d8";
+      sha512 = "c5baccd9d9a76744e12c1e3d25b3291a75f9b943bb3f6c02a3f2bed5e1d76d62362a8c53b1ee10328c1f0b43619d900e2f99bed977aca2dddf5116d37b1e4751";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ace71b137db10e7fe9093e95213cae7e8a1f05ac1900905a1c1af68ec59e075ac450dfc537de62f0a7857ee49364fe1658028726d51c2e34120f1764020c1ec7";
+      sha512 = "24c07b08bb1184db2882164775abd356be6057a5afdaff3b80c43b0c6fe64ae478b0b75b2d473fc722381eb7c80fdc0f511a5d23d06dc181a1d11f811a5f9207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ad923bdf87283beea05bd91f64a4582790b676b91816698dadd22c575db020b1470e06761872caf346d01a9cbee148189e98ab1930cd10b7ac88b69b76b4a5e0";
+      sha512 = "412db155c7f6c0acca7ee5c0b34adae4be9693326b342d0fbcf8e72eb355fcc190262c56b3b29763a1fe0b849572d635d0614fdbe5e82531486a9217c9eafc7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "af63f7cdb9a7a1b96925e55aaa86a592ae8a8303e49e9825197638aa79fc3a884d95a1bf0ce829f243fa767381ae40f26d040b2e5475058d84c95ad4648368a9";
+      sha512 = "8bebd039ee647de940573fab6f31e56b42799ee0718ae7ce0c19250c7585c12dc8b0da71ac7990417c404656bbb00ddfc8e3d3f8b9f4d15bb804c1141d8f8e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "64b2a7d7686352082da9cafc08489c8394a780f452edb5b76eee16750ccf9b853ba69045bc6c4a4541531c6c76dbd5407fc0b6f1a8f5eeb66511f3e38ddc085e";
+      sha512 = "4cc05bf5872e5a92f7dcbc509b214a81aad18b0efe8a705e7611ad769dfe2768d4134dfd1ae07713e11649833377cf6b04034fffde0587d44fbe377ce44cf05a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "047abd61e221f6b7335cb826d72de19f30f3b83a5beb9249f8ea127abe7d497371628f360c8369bda4ff6237e2438bd37804ccec8cbc7970a4e795dcaca80196";
+      sha512 = "06d7a689fd0af0c87237cc7d8230c3adafd03447c5edfca1f1940c913bb6c6732c08b16f82147214bb9ba89f07c719fdf15ddb47e5fafbfcaafdeed87078012c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f0b6d6a21c213ba0886d8e830b5d8b91dca7e927a998f51ad7e885bf2d2768ceeb68626fb96d6641912127685c733984f8fd90879739782ec36103f08a8446da";
+      sha512 = "ba395b7917be98b51bccba8acd2744fb713a07684d6810fc023e0fbfe4b1a39c323d319f7f98a8297a9023a55e58c62ddf899aec926d467a9c3de7e2b4763783";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7cb2579de2774ecb0d810e943c5c821987bb0454a45e1c4b07d4b1988da634bebbb082d961db59e5ae9802cb58bf83500efad5cce7d8a06b1c47293b9eec6033";
+      sha512 = "81e259af02d7523510f3e340f89218561fbe68b71fd52f2dde06856f3b0b9f10208e19393d1404043019a690d593c232d1b3c8c94c25b35d388444545296ff8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "cd8cdc7990681f755c163e866fa24fbaa741549b4fa7ac2c541a59180eb7e732052e536e5b231a088cfef2986ea0c53f10ce519c823c04238548c9e31945e383";
+      sha512 = "1574939452f4c4bbb6817870979b56c2a2c0845c3c3b563ddcd7c622b9d6a1f68423b8e414e4202ad4980782b6030a7c5ac47c1f497bc25905a896d8a330e3dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "1736a87b10d6b8a9da5bfad680f0e6492581b21dc4dcba4424ef04b4fbf8070168d14b19cdca0f2dbb9e467b692fe31b885cb5a0d6d58d70de59ff4e522b6c79";
+      sha512 = "8e4e5ea879d76da839d32d33b3fb30bc29ce69ecbcd126a75cf5899c1a0671931918d54a9e98ed55b0327d5c3c5910ffedfe49c9a27980f757142726f09092ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "0836aba5563dd942e581c6c2855978ed1adc2f204ddd254c6588b06f7c47f0c11b40a4f935ad509cf9358d43b226b46fadbeb150c55b69889f3485145ae2710b";
+      sha512 = "6da7117e0831fc4b1a9423c5151159681b9666f3f565f014bd749b97bb30f715158444329b8ea06e408a530792324b6ecaba5b946a35ce410531c6ef482bd8bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "aca25ebbbe9ce3cce5ce6a03a4fce799735fab30c37f97ef27ca21ff5949919a660e2708c25da5e3e9d679c4d4dfa388636e8ddee60479bd35a46f9af3bb1b6e";
+      sha512 = "a8dd7949e21712e384c3e9a40b35b37ec6e78de3043d3edce920cd09f43f69738e6d9c40b534a268066ffb652b5dfffb85aaac8b76716afed0e8d716bd406548";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "f2d010e76281e24055d17f6d3c8b8fc925420d8fbc837c14926b1f8f8adcfdd59a90f5048eae763e3f63ea3c722aae6bb0bf4ecc13d5d12194f9bee1c7385c64";
+      sha512 = "3824f5cb19c75587e1c01c9196d3705f366f4399e0c043dd0e8f5fcd5a43f1b1f4a3c3a4e35364904514fc6df27d976cc663e0789a908c095c81fd8c3bba4997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1321cf7ac911fdb5ef58dabc151a75f916f154f5e30db58e0915f429a7c9cfb4afa39cd5b52a5d960f5e88a27727c8068fc9523db3363977683b20fd85e1438a";
+      sha512 = "8afd3fdea42d099eaf06609354dd593168f510e799702b0cc3c934bbab6ccfd973dd564df196bdfa7182a58977cc2bee6528ab7e228aacdbb3f6062c37a4a1f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "e0c600dae1cac652c81d31119b289d20aaa71f3eb499d801c98ccedf9300832bd276994d899bd68dc4162a627729ee49b486b14c0314673fa0c02ef0ff01a19b";
+      sha512 = "e010b72cb25946634662921a46a930fc9e3f26ac3e350cd20ecaf50a61ae8d73a941383a411e450efbb2e786a71aeadf31cb268bb43f58689bc37e7a7786ab6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "5288a62e184f561920718aabf1a705c424f192505d20e24584feb8b776713e1e94669679ebd4795c656224e7890bfb532a1a26ebceede30ebda980867f25e5dc";
+      sha512 = "4e529dcc52bb77c0d4c9bf9390862ad04c112af89a8864715ef2a9047a8bef431ddccad2798dc9aaacf5ca1ea47189873f348d5544854e903045a4456c095978";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b47340fa3e4dafed945f1e85433b0266e1a8d40d1ccf707d7be8343c0b457b14d2aca836bf45d15e29695056784e6ff5a89f1ea8701933d2d12e885d042eb556";
+      sha512 = "ead2ae4612d418a25d162fc41de423f57245f83c5b79ae149582572f4301f468369c9325502a571d648a89a7d45dbb64be94e66248e1520a59b8afd57f5c651c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "36e56dc8d3e42b8e689db2725c100f74983c6f8b96d94714738e2b7dab237797df369368928437f7031bcddd78ac1e7d6c6d20d2d76502826ec93d561b596e53";
+      sha512 = "1aa9a80b85e931e1812ef2e8afa10e9d0d198e756ebf4d4d1a49824e271637b9a5e9e629dbc641a98f65c9de033aeab41e1288ff8a0537deeb4ec730c5d29f1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "abcd115639fac3da0f271b95ea20eca18d3e42fb544f2de7c53e626c6619753cec658b89a5cb2b99f9192735843be9f1ba461e37a7c7df2dfc5c695455f4d13b";
+      sha512 = "ac2a2b0b3bb3cfc60161ccacb5d5c28aae7706f1d3fb547dc3aabb2c4547172bb0302f37b63a878df73dfdb23afe5a50da80e9f5a25df6f9e767cf1435937c1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "02af1e0c56fe69f7e6f5aed233601d25811effead3a80dae623787528953dd34f057aad958ae792875d3775c74b8b6051a9424dc8c11057bde3f38e18fe36b38";
+      sha512 = "d59037aaafd743f7df2cd9b4c0d26ad862fb4e7fe78da103e4995f06c6abbacdd935ca7c340a157695062823c7d035ed166f26590904a9975f8ce7f4cde2294e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "3950b6a88b260e9662395f4a049acb86ff9fecae19dfe16fe315785b7dd6816d88006e9916838ee21d9b085a34ea580cbc1d8f2cd67fd03b18ab57238b7ff624";
+      sha512 = "7b4ac4f0d1502056d5201b6ecc95498bf181c7197c629a6d5b4d41fc61f96261d65657b25a57be42e78f0f87da56ac4b6342ba308d1067c16df8523c460dbc86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "770147e023008f566640b1485846bd3ed24a08065e0d1064d8e39449101c30e0414e92012fe49e75a0608d3b467f6c2b113daa12eae5623276a892c23a05a9c8";
+      sha512 = "87122ae571aa64da2048f17813b2fc881c876952ffdefeb2d8417b251159a69b48be4e682ab269cf1b86270bcaed00e82df93f3cdd68aae5a130baec4961cf97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "37091abc6c7cebe2e6686598dc3d1dabc0019d2ebbbe85d929845d3772e08378a487911193ff5cea8f216cb9c20a4e16c349c6e4e85e979483c56919f918c4e6";
+      sha512 = "b3c79cedaefac1f2321b06702b2da02765d096c357940516fdf36127f5177e09c543e94ad7d4010994c728688fadf83f989ead456cf74ce7386892a14e7a6f28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "118417f29c55e2309feb4569813433f05979a9145155cc5971dd7e1332899832ed3bbf63e377db0b6c80da62946d157e9b53e0ab3e664c188544deb2ace752bb";
+      sha512 = "4f412acec51f8a3008dd0fb4d793baae3386b8f9af9917ce36b7d7e3b3174c18743792f6dc9e4815d164f0dbbfd888a556c9e284a0dc9247742e381c3675d541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "791bb212dc0a55410656b70bfee150f609f46ca127093a5dea7abc9e73f959237e5f816db6ead316926e881aa4d2476624493e2e13d653fcaaf7356ca778147c";
+      sha512 = "5cdcfb4aede50ace119ec97816144a90f8e0e8fcbed811297079ad321ceab968de8d546d816d896b7a59ebd509205953af86d0d205d04b4f1647b25e5823427f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ae1d37160a7a31b739259fb4b08598dee895a7af4c9d9edc1ebdaef13ea196da29cfd0c6bd3cc1ed9215c109671cd209d9bf1a13e735363bbf73230d80496859";
+      sha512 = "5ba8e2a4167f1c93e771d1b37a90929f355acaaf78bfb3d372f04e2b84cdb003d77e1e70df1d71e2a21aaaadc3b28f2acafcc0cb354253e844bb4b2122f19852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7762806dc14ac8f2356a7fc1f7a7060f277c2271688aaca0d4d7cada0172eff4322497886d961812b0a400c1fcf41e20e15a80b101109ca5d300a21cece2799d";
+      sha512 = "c1fd37d95207b3d4b77dd1f24802d052471d78a6ed9e93aef14f54f7521f1102e497ccdf46d9ccad78043fdf1652168990ca5c97b4149453841f24eab7bf07c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "eb40766df654371a35444ae888265a7838c98f463f9f7d2752bcd67031b8e5921076716b23b94da37ec907efeec30fcb7bb1cb0c43466c58c054ff3b6dcf3825";
+      sha512 = "c03c50475ab7454c7e485f5af2774338ac2f859b142a9b3f4ec51206b6c316cf8f931446f9f52b2241fd84f0082a7ebf4d396ec759aea798cdf954ccd0a5f50f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "0d3a7d94e5d148dfc4836b78d3f7ed408bdc1cc1fecf81d4364c0ccd79b34e04768dc2be147cd0af2a502c5942aa349d704bed5a8eaed72e32b363fe360e37ef";
+      sha512 = "41cc681434e485ada9157c1f7cb44692f2116127897f59ff8bccc9528710e461f98e548ede123b4678ba715e5b066ac765c5c0a120cc6a063256f7d42985dbcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3f66a086542472353c137902e635b5119325b11d74f4575bed4a90b6cbc3fb3cb9fe3bc5c01becf64b62063ce38fa7caad25cb80cc2b3b28ce69919b9a529a84";
+      sha512 = "7122d0db4656c267692d67129c930ccaec28829591f5ae29492b39c25b1267fea844e984a7815338c9528c323fb93631e0b26bf10a01c1696fe5f547f429a56c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a81ca3eedc13a54541a9d20980225f8f4ad599e4407f2813eef39bc081d914dff519f0f65ba4865739542cc7f1374c795d49acf5c388cf81f0ddbc91278553af";
+      sha512 = "8bf59af36730d9e94433ff901c56874452e3c201e8cdc08fcdd37ed82b3815c8326512f5e7548e264e8e79175cecda833675bbbeec179e37cd2e1c58438e3dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "a89943d49a19a9baa199c79d138db7378392780ec31e2c3e64fb2a7d07cba688cd88119b22cf43a598470df4a3d647961b728e0c0f28aa54990ba8d747096112";
+      sha512 = "fc33eb79dbd44752a3a76b69c1aaafb8f576c3d56e76f11a121754c759b059d318b25a21ae665b8af7bcaf994e1d9be2846e311355296768a1715c5f7b8b8404";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f8bcc977b7f88ab33ee6027ff58bd73edade0a9fd9352a5ae8614fdc6563718654d1b0764b03e0527a7f1e6e77abf39e5bfafce90e877f9c94acfdfe3484e35b";
+      sha512 = "8db174868151dca6b63a769db1e10ba38b49dd5bdc4d8656fae2a3005d7fb7f57f6b8f324a6a1ba2f116b22b1d8413ac4df6e4e93bd1c335d6e6bd601dda429c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "e7074d790e75d8ffdbb88b8f21dabc7c9dbdc43af2c57db7d34a34785f317b5a6755f94ef05cf22f8d8a4fb5d06e6300538809a0cc14a6ea23927c79b0580c39";
+      sha512 = "a21cc4aec4dfe03b8dd3fae776524a597e91068ffba7ec1ccb8670edabd59e7d193f4ec97c996c7e99973432d02184408e0508ffd155f45480053c81205eae5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ddb0e7edcf47cc0337c7cd8cb1b6f63922514bf8ceaa964ca8c2bbe415f23a2cd147dca604bbf102a56ece7ea8634476a55a36c7915f54709fd1d68b1b4dc95d";
+      sha512 = "e51c63e90a07b411cd8d4f0ee4374b980cd64b623138e1e58a679c59c23a30e5a232229208c3dad3659e8ded306935b6c88d0214dec7008f4a62a5645e1d6b0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "6346c457b6e14d8deaec311012bb6bf62baf4f9c556ff244ee9f2048f8a8e6d0bf4172549ace00794ca3f8cc0be4f81e74cc1649a57e07a604b00bceecd91111";
+      sha512 = "083bea1f3d92a85a1748cad54e67221733929fb1f799c0827b32c061d4e0c8d16a82633537d5efe2bdf06ca7ce5eb0af646586e822ec53a40db18b34c6159a0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f1eda0b6d33065d8690160de1171806c8610a04c278cb812eb1f01dc204d1975b210544fc8263b474dd27ec44a4d35ffe5c59575a8cf2ba353ea9002220c78c8";
+      sha512 = "f2a276353249e5e75e9ab9abb97d7245c1dc45f07ee4c77204e58b4b58560ad9d0145654faf32f18615b5f92442e82e3f4fb78d7158f83108e95e25a62d1054a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "8c2f83daf3af4db3c9c2fe7edf67f8146f028353d5bccd83be338afda9c24cc7b79831fce80b9c67996b76bc483da8ecd3c49a212d5241eb2543d28fa64ff4db";
+      sha512 = "cbd247f8e531ddd9d134eb6b2dd2fc41bcf2ea161e46ce983a4e4705851fb600d18b0d4cfc1ddf6dd0a565a9218015c9008aef1334f0195690d0b03ef05784c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "da8d122b5888c8d20ca55fce7987375e6e4cce13944363f86cffc1a68584e413548ac8da8c946f6a169ce1a0f991e749ec258a4fab2b0958a6cdcc1069c0768d";
+      sha512 = "bd44ff3d64617ee639ff3f1a4153b0c71770b4f2c26c8eea5f99f2d7a589ddec6bb553aeab8b8931a39599ea897a22a42559e4c771195962110aa7f2cf1a2f5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1347817c9b98c5f6110bccf16e2adcf4fb7d04b9edf59a0b0401a1cc8c4614cf345d3ee07d465c52f421692befc4cd6561357e8b5950b1200100f3555721023b";
+      sha512 = "fe917779578a5f8ffe2f109d60b5b0bf8b2b88974a2e82f9b067ff88d9dd5e210878ddd2e1653c17a0f0e0bdb61bb1e5edc613bc72cc43165b287430808c0f10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "1d06e60582c51808c9dbad7869258952cae1b5f10abc39fcf18a3ca57c0ec6065936a79976a851bbf1a98ce8e1654de0dd51bfd2fc8178297eeb40b6dc16a2b2";
+      sha512 = "ace9275a6933abf4cc0288fbec2be91ab9ce8ba0e25ec6e9bcdcbc14a5a0fecae6ca489ff7c226496ec345c4c27af645f0694b51ad7703adb81db14be66bacaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "87e5984e5263a406392e704571207f02050093839e58c833b3dc10a78f88b93e99479e317e17983a51a3615f03e84861d4bef8142493447d24ce42e57bb49e7c";
+      sha512 = "74d5263c8b231a61f4adf3fa710bd0fc281bad1ee97d52b10dac108c81e49f1d26a0a69a8331abaa6157cfe086499188b4729b3542ff093ed344674ea733ec84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "c979e7ba1b36635197a3ed5ec581da57594fb014c2d71a0dba3c135db1c8e632b671203b3f9b4b5765c74d149a492c94ee327393903a683755b91b4677ef4b97";
+      sha512 = "3ec07d59c4ddc7763a4a1a4981dc4cddf56be53e22e7cc679e7115bd29ed1584dc434704f26847cb2aaf02149c31379caca16b6fe2054fb26aae24562ddb4a01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "886a2a0d6d88101365c2b497eb4f5dc56325818b5dc58495cd2dbed1fc0a8c91339e3bbf9f5c0b246c51cf44f2a61ea07421e06394460d2d0ec2b60c728eabf8";
+      sha512 = "b9f4d4808a1b60e55d98ba49f49420708f90ab481e0d382f9d37a22039969553e976a4c7a36ec9971f35dd2fddb1a97f8524241ffca98e57aff991985310a2ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "39739a0836f61a98dcd9b6633f4baf73fef07fa2dcd1c51b2309dbbdf62c4256e9b8b8fc94270e2608d4042d1c92e19f03337471a38539a8e9b803b109c2fb97";
+      sha512 = "9fe06c2b06a3cf07a9d3d081fa693efd8f445d5257ab4d7fb094822cb023962b69d7640ccf92e6cef6acc7d09114510f9a80224d7399dba3228cf66a08893021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "fe6d7fe4bacb0789b6b8ce7ec8fa0caf188b9258f21a0d30f9dcaf555822ced17240bc07f56e28c12342d42b5514f60d845a89755a92e3bdd68d7a33dac6ee0c";
+      sha512 = "ce15f5e51e3e74b18a3fac89408cd15ba37486e108d98760e0e902f0f3151d837dc1d85e028bac707c95c86e3c38ed2498a9de6051917c5dbe0cc4fb13ee2425";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "59384b138f1279aa6c40ea95e6e4574eec4aff91ef2fddd14bce212f27a1be2acf91d751afd984eb7bce52a2dfa49ff977943ffaafa4915402d9cc31a5a0c95d";
+      sha512 = "2b4611153876f77ecb42029844e5b85285ad7700fa3abf7d61ab27bdd60fbda8357e951edec43ac20ec62cb29eeb12cfaa7edede9757f35673003b9edf3b2070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "863bbc400416d114e2ac4842e33d53065f872ff36df31305c800520c7e180b749676a11fec62ac1abc155a53d079374be4ed3ec19202d83a22e144f541fb4d32";
+      sha512 = "faf89b596a239ddd18ca65b8679a54f7ef6615504935789f397bf804eea86f2f852925e260c78bd123f7de811f2cf619d6366caee5e55fec52cb1beef338f931";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "cd3bd76bb005f0ecc66b7f4113fb7ce67f650c0f39c03dddd2ee2aa7e854e70d199cf70004d9b7b75fbf1b9083459e81ed0a9e4222985556042e4c542261b9b5";
+      sha512 = "b653bfe0b5f89363508ac9a5835655b39ccaf8a95d9c4be3337f8e2180873e194e0b1d8fbb35a8332b33bfe1090fb430f66ae2fd66518c1f3c342eba578afcc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "1ea3bafa52ff02080b21865d68c111ff5182a9d93607a260d51f59ee5bae560ed86ca1a3fcde3dc4d1b45431c1b1cce616f79775628a17a6bd3fb436c59d11a6";
+      sha512 = "deb8665f03b730cf36fe5307cbb5e5f9ef532c756df7e442d35deabd1e72f960f5a90b39efd6e306572d8601ea5a2c56ed1dd5c3a8d4236fccd0ca15ebfe600c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "219655c7a1c3b985e05ed162458c3988e3f7a60776e3c76fa7492bcc77b7fd7a37a3c3f622cda194e4ba82c863c63c1644df1e5f324271b7590775e59112d21d";
+      sha512 = "0d26ef79bef420664e5b34628258e50dca8b203aa7f92e6a3a3231cf40dcff4d027cb575689964021954d21f5db348e1140b4c4e4f080da9a56a12087708c416";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "0cfb2324ab02c302db9a19da5e4872eb9d5389c81ec2e66f434939f5fbc4cd9f97b8d72e7c745f29d62a12799eb8362ce928f16df967b4d6d557dd99a859b443";
+      sha512 = "eafa596c235859b2f64f5b07e24ef5b4c2920beecd4bab4ec9537bec3c452db1fc42719f20afb00fb6fccea495ed4981e6bbfec4ac29a56ade0785a41cc04160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "a3c30300291d68ad7798ae29fc5c475e527cb8d555476820a75ef6a9ba90c8a0fdf71a69f8e69d6ac93e8fc8044106c2195b6964b23e9528071fd1bf925ba744";
+      sha512 = "c6059f8a0624e39dd3a3ea6fdc6cca028a5bdbc0b75a971f2160aacc4f3eea1bed566941d7c01a82a4233942f1c56dbdab41d5c403cff6fcc5b6a7aad6fc8365";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f8e2eb014640112896fe94961537b058a71ca3929fb4cb2229c4de071416ab8ae466c6b53ff33f7bd5356e126b676c1cc15414c1d3dcd79ae0906091f86f17b0";
+      sha512 = "0ca496e789bdfca3276127f2fa3cf2ee8a257fc383d66ab10553165de3413db46b99b4a6c3f049d429cb7a35a03252de6164e63563a066bc15f5a26bfe8d7a40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "20a38bea0bfca6ff08d7b4ac3a779f5d4edc17e90d213ba62011aefba7fcca1b6dd7d602fd36ea714d129f4ed6edef6d1c1d815be25975c0f3e699fc3b312487";
+      sha512 = "9bcc8395623a1d5600698b357bbe95861cba29b8484ac7db1432597fa205ee972c6005c16ba2c44ba8487b4800b6bb697c79f06d0d1df0858915e42d9fd044e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f62cf2814b271de78b21bfb696889fd47665d12cc8d729216870e48af2f0ed2b87460f90f1685dc78d34e41af4643eaa73bf51009f683520910bf90fe1ecccba";
+      sha512 = "92972a32c35969ae21407c188dc107e6d436347a87f2de5233a242f2b9ab6d46681f2f44a601aebb0c52fc1084bc58b64875bf165e047e7ae9dd88cc5b5a95aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "b05e5ecfc31926cd3c4624ec7d70789a6d729adf40bb73c2c756a97e7e24a36de0fadf180bfac4a10c39a11c62485fbb9741e0badbd95fe95736c067f47b8c47";
+      sha512 = "9bd7fd4e84b1151729756b8caafe5521557dc0747c467db95f822a59fb4e9aca02f781751126ad49291eba428691c262c1b2cf8f47b61daf860172de6b493f8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "789a3c04d1cbb109e33682d3377c56a631b77a550829c296e439e6bca75bf3d3a240aab8936b0f5131ba7a6046a0cdd7f662839bb165ef83ac62c1982cdf5efe";
+      sha512 = "e6c3adaed2881cbb0004a2851d7c499a53e7c4fd928047c2be861c45277350dc0474c198f8335e0eafdb624d7fa3d4752814ea33d6f8c857abcfef409552686a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0153f20d08d73f796d57a1e1cbee63179a943f00c2afb3c9aec666943a9b46d94d602a6b74b815350f637c516701cf849703675f8f8d128750b057f3b40cb579";
+      sha512 = "6354405bec7ae13716c9d784ce8cea4d5e5ba950c6ca985785501bf6704305c00c3758f1a304790cbf1fc8a6203c0df2b72dce70cd3d4d3002eb8260519d7e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "4bc96007e1bef433a2309a4e52dcec9f24a858940ad4400758d42981b3184211a0b6f23c2a1a3255f05676f69fe4339ce3a7b5a2a48f60aa62a1d3b5728d7f97";
+      sha512 = "fd4b499f8d7fb635692a71549668fa1f7608c452073caa18b826f6fd063d39cc11c6149435c8c467c157d16a51bb2389e828f8b856df70c60721f0617b169f81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "c8fd687dcc02f0937b7ce71cb422562a7bc286cb9ef44f3d8bee8a27ba1d21a5a9771ee4b362356ac7bcd9035e9c61f45bd9106873abca1dc96d00c016d228d5";
+      sha512 = "224a15e6426a2f770d489b2afe061b2ad9f92b2f9c01bd117a6f0b074a759f1e77a4333b9e84558121a5784970cc470392eeceba4c07c1d51861b85525d2e443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "2bb9ab324b096663b6f7fbed363c424336d1772a87b9bd602654e29cf021ff486501be3c1846a8fcfdd8e9401589351eb2443ce927697eb5238db19f26e35989";
+      sha512 = "b91cc032fc9362e23d6339efdc0dfbc1397ef3e4b067f2cdef1d69972867b331f29ba2b1d21d7c1f7986d928efcb4713b439528dc23c0a7d2228a55ffe49ed24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "72a0341a9ca3ff0a5cb0e5a020d518571efbc6888d16fd6481b14a170f36436879d73f1c1df88699067e180733bf72a9d4c8e7f594d4f5b0f6416c8309a1d121";
+      sha512 = "0c6ecd3364fd47485eb3ff139c0e46200eb2fc6ceb50c3ba203c67348f7e46cf1968e7e225b48da5f65cb63ebfae4371dded2de89a40a629e86b21352c6fa309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a59e7c9ed6eeed8d2f7bda902425a25926b81b4e5fd8b58cc692ed78ac37e2305aa02339ce20fa9d538d4afb226dd8f6c456571ee269722d798ed4d79e4a25da";
+      sha512 = "84109b6b1a27a470f3edf67bcdefa1e0341f97889344049f125889b379f55621ad8a8eec4390ab5cd0f070e105c956da11abf7ee18fba18fef9a068164bfabdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "673783d9cfb09df51f30ff00fa5ece151a6faf730d91fc4926664346dd272feb741bb6846c8ffce99757640fadbab918efbe93f199fdfec3bb2a1e6ccf762dd6";
+      sha512 = "2d1700364e00a36196b65a1b223aff3de48f2873196a9d70e1f99a9b9b570ea0b7182a722bcb18d3fc3085ece48b0f87fcde56849877fc677a51195f14623665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "cd44afecf36098de1032e76ac8b5ab46983e26a8caa8c8e842ec9c1d85528fdadb1507c80e5662a1c8ee1b744a6104418faa1d0792c4ec3177ff7a133bae4cdf";
+      sha512 = "9e2c0da8cd220cce4c6180d37a954375ad3ad4ca93144c61f0ea20da82b74025ba06637602a864bfc56f53c65ff5cc470f6da41ab094611a78b1ca15064ec16f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f722f3926aad0be53db7f6d6f48ffa739cfd34995b8fbf6a91f1634214bfbe7e9babebd285a720e41eea63c696a80d4b2ad905f7529e48000b3d6e5b6434660b";
+      sha512 = "d75958cfb3c72f0622dde818345b408350cc48e407dcd83376807659ef687340879e7da99bbea1ef2dc9440897ceb0618161e1986ac3607a86a1386629b9752c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "53d92f7beae4a1d4d1443729e042d392908d184826aae925174c72ee059358282bf1d003155863ffee0daa527584dd33107a3486f849ee903823d123c5c10dad";
+      sha512 = "5f277be4f4196b4cbee8ced0ddf861818120672f1ffb7733a7b0be22eb1c9069a59818fb8e193a274db2fe5a8cc648eecbc254d7e49e9e15a77a91f80c86f36d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "9f6646a6d62bd7dffe925080bb471ee995b1ad6ad496b1ef58f7689d7349f93ddde3f8f6008dab983cc5826f0bf66d5e6512a9c7b0f121efc41b985e23761065";
+      sha512 = "945af4c0fa363170b45268290274b73765959212033ada481b1e7143ccf0440cda981f5f009cdc84c2d145d109c275430b769a6c96bbfa736ca6885633eeb8de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d068521185090da46a9bb44ea1b9c285584d9a7028c0c20731046092bb1d924b4562409b524aebf293d4445cb0ab342fa9f3b33b2ed5b2e95f959b6f0dccb27e";
+      sha512 = "fc793fd7d840f71991a4c2721739d1747baed2175fdae113d93123f302346ee28c6f6d1b4999a066fab9eb9eff2be848bc2ae8c92d2cb98376110e442e0b4f61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "2b695601c381c91058d8b7cbd63f46a63efa004b2b14430aae79838a890cbab818b34fc8401d5620dda5c17f22509befc3e6f737dd040eabd86444353a40fc30";
+      sha512 = "de65d81fc55c67be74f5da3ba5edd89f40929943b16aff7c8b311f9667004a00de873fd17e03a684517a8504f90e0b06700703b0484af6072aefda0640ccacb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "a890a5be030075461ed2936af7e0ff0d147c822e29fdf381f57e8c6e53dd8f9ba39d51dec6f2c28aacaf26847ddb9f1b8cc009a7b7ad22defe469b28c28ad7ab";
+      sha512 = "a6fb5246b50962816ea30d84f9508771662442add3368bfe1020d691adb8e467baba89bd260ab27e506c6fa9201156bca9b59f97b878f5b10007b1a9f856544d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "9e34dee7fb72b3f268935e32f95cef9bb1ce045c2488cb1db087eeb9b1db79b9e2f859f707aadc125b57604576a1a1b3d6856ff509e341603bcb64afc7edb63c";
+      sha512 = "816aaf7b63f95b0cb14b58022b708105ae2d4487354579860d25a2e264a0cbe1aab3a2d7d310fc7b2b5e9daf9c7c6cd11ff61113da36dbc2b552e26dae542e51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "25a62ded79e4b559f9e857b7d451aefa3e54bb6f8e94ec25fc596de16563dbba44be1d196334a66861f8a835fda39f1742d5f5226e50ae9013b72c95a01d979c";
+      sha512 = "023aa98c7881691ae4cce0d63477452bfe01483a35a40b2bbf63c33c13fa9382548c66f8f43d2da57f96410c78fb48dc96c06671182aac97fa8aefb175118f4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "eccafe2e8931aa5d4081cfafd6f39ce8094b85da4129ff86746670eded5e4946a63953b4f7431b11f0742c97bd7abcfec17ca8ba27f1ca3727019274832fee06";
+      sha512 = "21662f8627c3f08e7070b9e62acdb9864dbb8d6530ed2b92ac62f51621a92feb5232eb96f1ac6df2c2aad2c4901a8eccbd2fe0ac3a1d32450cf48dfe6c5c8a52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "189e76b67d21370148216b5bbc8cac7aba30d32c0eeeb9e972f2d8dd3a9064f8c859fc0c59a531573b6d3d7ec6cdca3f9347197cb2b680f9bf335a236fa3633c";
+      sha512 = "3f84903bf9b3ab64c93364d0d555474c8929fa1ea15f345fe0515f0e82a660ea1bb5594c3e879ff4b0d32d9602c01e4983c5d45e966234d478d6592951300e25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3225e1708f34532b50c5cc35eff1cc4d6718328fe427fd98eb0a8f34fc44fddf25cf28296793f5473dae429e1cb82b4b7e5b99269178e11b2caaf5c8650d0d55";
+      sha512 = "df0568896c58af9237025f212c5e7efe3e788f9d97ffec602a66dd0680b0c1b7e7207b0fd46e39fc69ca2f91a117353f92b7b05f9e61c42e54f6987389f87f2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e1f8f7bd1ae5904349e58ebac109d169fffad677ac9ddb1ed39aef6c898eb112f419d743b79b278df62b41cc661471a5a4fb6fbe8994a10d6d247fda4154986f";
+      sha512 = "b880e3f3eff3ef3ba36402be569c36f8c438d49e54b378f0a4bb725bca0122cd327fffd25d672c3eebcab7eebd6840f0154b72c4b17dc32e8711af0bf9b9770e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "1de3d7ba3c34c458842da33207c0036d7217bc3deeccd2715c7a22e57502ff41950a73972dc270acc02c63e16a39baa33eae125f77ab68a36ecd603a7e237a51";
+      sha512 = "9fe7497dde682766bc18893f343e5e40250a9f88514b9ab6c5f6b4341d840b1a71849a66022f6e312fb53d87daac61885e0ed7fe353da9741fb8da443d6b637c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a694fb77b1f8871875320fd9cc91a8def83cb32cf759e1513f8780685defa8f4b73741c5ad8f7da38f3e12b48d4032f2a04841e5f9be459714254aa46bfdc19c";
+      sha512 = "e9c7263be2b8e18a5f48d79e9601d74b5ecba6c1d04b2d0973209891dc9451a1d81601a92534202daac773562dc02e6c03cab1f5b4af221e41a778395573c59f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "15a2e985f68eb528b88ad17fd06ec894c2b6b84b18b755befb0c01153a7a351650489adf2ae1f7a8a8848e260a0f112ce629ee6524e0967f2da5c60711c6ce74";
+      sha512 = "697398491023ad0695f4f14fcab4d7cc62a1adba61de374eb0f35938d179d00693372964a3c64f286f48b8a73a5f460500dc307fec03c4641d2171cf3a8bf84e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "29b840f1253b857ec28add64c576c4fe078428de191dc7b3d937e9321b9d47e39a1da555c09663e5fed86e6cb9b8f85094e416fc6f49076fa03850b381553d1b";
+      sha512 = "15204710b24d93a343dc9cac242b816beceacf207006ec6e8d08949aa9f880d015ec69b2328c3cc9961d33d6c3c817eb5971214f1b9b160e3bd1f6ba6f74c5d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "4f586b5994be003c931cd4e1a1154dc02fcd1344f90a6a0e58cf2e86a601036b773c2fe38a55a6ceafcc489777a2a4ba9d9addce6057920843bdca4655b2407f";
+      sha512 = "9ecfa49068162b750fcc9c0e7ddd5df5c6acb5df0e02c93a52d7520af0768bb6469a340659b6289fd383ea3195d0b54523bcdd2bd1366103ded73369e3d87244";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1f3d66fc796d501764a80f681efa8c85513005f6f9a510b4d3e61c251cc98f9140ca6cd56a199a46b9cc1cf4569b75e103826feadf29d6bbe517dd952b234886";
+      sha512 = "093cb81f51345f5862715ec4fcf4d573a7cfc4d5105a3957bdc16731c620f85cf7541e9995919689f48dd42636a45c4390f6fdd294d119998f9ed1f05a228ce2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "fc812728d7bb259bd541847ad51f0614b051f13eae4c794140dfa8a651eada2ee82c36cd7f76c42252ae1bfad44f63d01f77d43f91e55f08f047f29f5b8dad5b";
+      sha512 = "8d5a3a57cbaff56cae50dfbf73fecb5f7ab7fd78d4c3ed6e2e26b4e4271eb065bb104f0ab36b1c8e45f4ec255595167089200448267029a1831ea072926d70bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "cd12fde14e1f157ddb938b38e99ca05173aa8e5c5b09dd826c7aa2db8159dc1b123a792a772b226939fc44f5b9b364d630287431b3326394a4f964b9c83ba337";
+      sha512 = "0e761be550dce2f7b92c5066c7978db3de51deac09909f4908f07fea9bcdd4061362d96f96b0df9d2414b64c700d5389f1ef50b211250c7f19dc31dfb8d39135";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "ee5f3d9ea385450b0bb3da154480b0b0d88c345fdab8a6ef43380d512c10300f5b00ecec28514bd74abac3b2c7ce492097b0189c4d7680fecc512a171edfb55b";
+      sha512 = "e633dac1f889a53f6a5653012889f802bdcb6ef78fd16563d1b1db5d37718f7bd49da4978ea6e5868b216e175ddf45908b4fdb7fbb7c56e9f949071c4f08d140";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "abbca7a1410c717a8922d8dd0bdc2fe14a4a699f4ba1887bfd443466be523f5a0aefecb5d8163d1b77ab0a6448fe2fc3559933a5a8fbe7f119c45ed1bb4c48ce";
+      sha512 = "d5d77ee359d5c89264477d4ae70194e3187b3f44f413de4e10ed81add87bc8fc77e39aacc95f9192fadbbc6c81b5666c4952bc7d3778040ce6315b83f5effeb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "02bb6fc55ed10d05061071640bcaa8219ea719c3645f368c4fba44ba5accf71f8de9b7f4b9306dbc5da7716f4bfc3cb414706a31f336a8d24343f9de5c4c0a23";
+      sha512 = "6d5c4c1d1a245f58750ecea5bcdd592d76f013ff34c9f4812a24559077a04a38cfef011530ad17d1a9b2d030186099eceb891f1b468ee1a0c9504da5ec311ff7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "da929fcf02a4b08ac03f5ddd076e5b1433e69daeab0b246b0f475da0e56bd6b7f122ac14e34a14960e1d5f881ce2b9b9764c71d3b0245258bcbd3e57ad9c7a20";
+      sha512 = "354d0e64c85b6e56aa2bb0d4188c9dd20abb180b99dab6d9d1c13bc8bcf8b3ce5c9f136d099e0357579d60673ac52a35facc3351eba2465edf67a5dda2b8be78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "bffbfc0f14495524555f3acaa0ff7bfebd605dedbbbbbbcb29abd3f2bdbd5b5d924fa562502af8f62714f11a00d060c33e8d9b3fc80c6410796175a04f8c9e70";
+      sha512 = "b748c6d1b146d99fe3dcde6f1eb0047d58f6950227d63811e9813c11578e8dfa59839c70062ef12e7a9ccfcdbe97bd3bf589d398dba75ca9544550463ed72da1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e8bb642b9498b300c6f594cd1865776b633a2ab7e92b0171860ab9aee14c8d4d1845bbd3ed2417b8c3fc035a297bdd36d668f5b45eaed58adee0e6f5517ac5a1";
+      sha512 = "835607109dc7de538df2de97526244eed96f4e09f5f177f0a9c161cf69024a9c90c8ea00694909d1a1ce8be1a18f43854b57746856120898e8da458436cd5e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c9dc7edbe2b7720459afa58e1ed2949b48e87edd29bebf4b9911e4d78e6e8b00cf0f81a5c36fe5e9c01d3c9071604acf9977adfb6034d25f88d48f7b171dc336";
+      sha512 = "f29e43945b2c3c8430b807b07eb64e2128e532780959739c2ec03c41adac0fcff208efbd47b68359efa29384a205f192cecd23c3f4d7ccf0b7e4c6406d88c60f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e0c6aed3db6b4076d75d3eac57be9dff1198a83ca70043355c0ba5b2d9c3327e76f159fe3ba957379b8e59a4014d1231a9092876d3226c4da1643fa19bab13a6";
+      sha512 = "ba42ea29971bb9510cbae8b6c4bf7e105b18aaed5db7fbb375b4edcce800fe7d3c5fff6a4d9d08b57682d42f1eb177e20d59c832561348ce4fe5bb9f9193f399";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "223f90ad302b6c66afc9de7c1cf0b9cbcbfadefae2ec210d53399f6657fcabba0dcc0068e8e17e3afa68aa94e9ee654544ea5307a957ca26606a2e8777509cbb";
+      sha512 = "58d30c2995d3f3b7d27e4e519fb0fd6629e3187722382c2a0d89d7a4206e8b1d9a1f5d67349d335c30d5160cefc42080563a0725d3873faa7b2619628e2435e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ed8199b9ba53cc4fbec41ffb68296abe628853029fc2f0f2d5cf13e1262b99a212070cc1ccbef67598d33bbfe94b5254fe4eb14d980ca0d13b4f6282bbd96b71";
+      sha512 = "78ece52df0d26e588f3d446892c4cbbaac4f5269c423b73ee820908dcebe7be465ecfcfb83bf926fb2f3f8e428b479b3bc36f3380ba8cdb8116700ba034f4d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "69daa139c5e88da0dff1690140876a19f3fae674f5a9b5c77bf74ff93179cf14a5ff17fcd2288f2d1bebe0e6bb8ee78f379e6afa564f7984c0ec5b05dba46318";
+      sha512 = "c2452881f0d58779f0269608d548e7630861ffc99e91e6520d04b5644714cae8cb75995b3e5f6aade4aa0e85fa636d5bea81415e9c541a67a81237ea37450951";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "dc8d69e8b01a2e6166acd15620d3c4a794160ba079fe0c618be31fb1df1bad320a692fa61f2f924a3e377ae36359ea732e02fa2090eba61ca6385f72759e02d7";
+      sha512 = "8cb6ba55405a481386d0085fe51ff7bdc401fea280dd7f30f8a9a1644f75d404eade352547e2d74887c236f4ec4f1d8644c029dc786115bcca6dc8c359c2a0ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "1b265db34eaac4c303805f585e147aaae408854c83bcf41c8e2c6934084f971fecdc32c1c33cd113f5e19a821db54e7c91fa2fb8ab9521987d2ab3ed8141a8a1";
+      sha512 = "11460b2f813f06fb8c5e142e0d586559e4cbd852a5226fd4d505265136d79667dbf52a6ce26b33adbff3558dd40529af2b5386bed21c5060146d76e8c5eeaf1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3306b84daa72d3d70918f40310121c0baaa87ae967441083f5fae628435b75e85dccf941f6c30562bb45afb15ae4b5db5d4f28cfcfeaf8919bc153227f26b804";
+      sha512 = "957649ac1888b086509ad006da7b4502cd72172d0bf47da173232043378025bfba7fc5a5ce5ace30a852958a73a426611e33abd119e11b9e8136fd4828ec79b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "49c9f5883495e6cf68754c71b4b14d6ae5d7c508805c0ee610d9fe2603d15accaec8e4083fb4c7a76b5b26fe76d3d23c1071ef7dd267a318898a67df5fc96870";
+      sha512 = "72c69909ea8cd9999effa62b8fa42b5c10760e03100a4d6ba2c40322935edeb986f02b43bc2520acf1b7a89a55bb1edc0618df97e5d46e3fef1bea3c81ef3456";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "bfe04cd934fc5af29d6d823c77ca1f0a7171ce143d4797c203fa5cff5e33652d8c71783dfb933afdf6980bab97b7c889167a2614ce7b3199dbe265441cd078da";
+      sha512 = "7bef71a8f24e9878509c74ba54afcebd8a18bbc79a4508b5168d943b6c021d3055a5f2e92cb26382c678c389c44eaa592305489fa9d7d82cadcf2fee83aeee6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b4a193e681322e104980710dae82fefca4c6f2b007ac035439dc95aab28046e2193de94656682af0f18a63c91f7bd724ec69fc2b239c7e633a93440f4ef5a0e5";
+      sha512 = "6f46633155624cf94b44131e03912f708045783bfd2a69a14767f1c0a78136ec9ebb8056cab7a5c6eb674c0db93d4446858a744479b54c05d9367bedf5440a64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "ef041d3cff46f7ed02192db781193bca9a9f903f68c880f7546f49fbc30d9a01ae77d31f3717ea27f4617ad70ca838a89af1a10722e0c20976590eaa596c44de";
+      sha512 = "14134389090a1ec88ee91160c5c888df8a8799cd2a146341585c2080591a0fb69bf2a0c2c6c753bf38d29c6457eda7b3b862de406ea0a46f511ec1ba26a8aa17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b621992d02150a1aced53e0298277944aae6463d06eedc6a18c8cef3995fd9d8c68f149d81b0d1261bbb1e0199697e8f169a73ea2db0be5bf25233649a175442";
+      sha512 = "afcf3141907a289d47d2460df6689bbc38b0715ec75df57b0b874e1c9f2591921cf268490340d754db7f2666d8eff94650a4f2f291e4308b61f64d4935d42bab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7236f8075a63316244b8c398996c486cc8a592e3be85029e6050cb1d01d037882e892a31b3e61f8554007d6c653497df244e95e57d59bee13610a36bad2eeb26";
+      sha512 = "37ba6326fd0f572ab0bfc6667f026f5f5787500bdd62ed0123da31884304b18926759f92b8352c445e6ca04bcbd30dc6ec2859071c30786f97a218ac211c4dc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "9288f03925476f2baadde3ad176763883b365dddca71290a51396f8bc5367d19cdceedccf7b9a3264dbc36fb9f49b443b6d1761a87b0f2c7d5c74dfd469d6a86";
+      sha512 = "f0855d26bdcaea247db6b3649a7d93d0d96dc75119ee9bdba84412829a67b8f4c853a16eedcb9a550d53183f54098515cb2b09531053923d57ed7d0efa4d80a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a75c0f644828cb6a2feb33774af2ff3374070693267983f7d9f92b94a1e4e40dbc75eb818c86e8c8682e76f90903b094efd4a0146da2f2594fe34df7e3d0fcb0";
+      sha512 = "912da96f4101232c59d64641c093a5bbed63af9b2424232f7e71c1a37156e34ea59ddc0945dcee8d7706d0f70e0246c9c8ec8eb5dba1b205c901c438c544d660";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "1f640beaed898e8c62170699ce997ef6b186a776cc2b54121c796521f7da3bfa89e40213b21d15fcd96bb0c7f526bec00e87e519a262c205b7696970382b7467";
+      sha512 = "ec7c5658848fb5350a08a48c5d8886cb17799bacb4ad521544a2a720c0dd6a5f78c09f93a066c081d09c6e52ef943aabfdfe8c33a17e628ea8b77de49b2f6d2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "6a70dc133122dcda74a2d78c350ed405c3ae7362cf8ded43493d8d5062e310d1501539407c9ba4ce871f99022ccd5336f4c0e1a2537ac27aa947fdad2dccc71d";
+      sha512 = "328417ba8209fdb1a48aeebd7f90fdbeea2f3ca409a7300e8097a020cfa83cf468289f709f62633039d841504bc4bccde5de5acc68dde6c625033aa16bc3c1fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "a5e03e293d293e219d6ed3216091544f3dea363c7d745fbe603829fa10390ae285ffeac9103c046f81a89acd53403b0c0a372050c1b8a5fc591303c7d27462d1";
+      sha512 = "961005b2b0cf5c16cbbbf63d7d1b4d191aaa90263556328ad0da3076859ac3e6daf522828315da4d0d052b9698c310d46b8859f1ef4faf0929e3b7095a39f052";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "7f88b803609ddc1bf173ac6c7b4ba7f2f748a44451a1bee857ab2f6000d3cdb5d0ba7518d00faaec64c5f162ad7ceb771272569efba5e20a66b581be9e1fabc8";
+      sha512 = "deb6a8044a816f6f4bd2464c570f3679fed5248f0868712136b0eac67728dcd2a5dfc894642369af1edd503d6b882235d2fec0c5878256126263eb7715bf146a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9190155e48bcdd5497dee82307146bf4caa4dd1ff4b1e198daf9a6cd5bc7ee9f53ebb08420fc896af8087904705591d36b578a24ffcafc0d7cd4267bb8e0e795";
+      sha512 = "bb165fc18e0e1913745a6c20230c2c8af495b8ae5453f689230d78a1401c66e05ef124f22c6f302cafe6247d21eaa20fe9802891d7eb99b5492a2b9a153d04e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "bb91135bea41bfdea6b2c47a8982ab43f6cbc07b1cfe4f01ddff85f745416f52207783c7253fa231294e1ef3406624b55d01bbc3d08704be303730a6b72271c7";
+      sha512 = "fc5d5b08f230bda12033e737843f9df099514fb3a86e937b08308755f996db1bd639b55db659b7fd14fd21ffb46d45abbf92ae7b9c909d94eb4b9d31a5a4730c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "beed763be6cdd4eed7a2dd6ba5ccd56c9747905e331d11f2a849b161c7dbb16fb08c32a73574e1e127f07688e75261462e90f78853a9f68bd240ae68c20823d5";
+      sha512 = "f006a764693de3200e8925f03da886b59def39fdcdf412375900e2206606d91a1a972d74be3dd186005205e1b400a95a4b9259b82a2fc167df94fd9cded2b959";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2ea035192a894496887dcf71b01834027be7f4744621f4eddaaf93d374399a03564aebcc747fc79d6a4feb3f28ee4f45c3e3fb2d3b849194856ecd7e8e8b89c0";
+      sha512 = "401967304b43bf57d6013c972edded392f6dd696ef6d633cf24253d407eb731ed9547d3ba7023114e25e3cf4546dd2136e79ae0a0df8378d5fb069fcd84fb623";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "364f07c66765a125f7c2d46784d3dc65b46881719131da2966ab59dc208e4e28d5abeb2e5e22ee8b31014e09b60199e2f78ba3b2d8a051ca93affc26cf5bd92e";
+      sha512 = "8a639cd9fd5cd5de3eb82341e9ecf04833f79b3efde86843918e793e6c26118b9b2f51f26400d0714bf2e6f2a795e4d5af7219d4529d7ff6a413a51b74b98aee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "4452a40b3f15e8ad7515fa8df963d4723b892b2fa2ed06c9a75b24ccf8d7d7dee01fd550ec75dd106f3e839d7639ccabeabe7113a59f920a848e946e07ab40d3";
+      sha512 = "5293d81dbf117183f5316429486b8cd192e3468a139e530e53197d34199409b62089df7021ee8937fc3c3ec89112762ac0a996455f47c08598d1c7f9cef79f80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "a93b16147be352b2cdf4c5ddcdb92bbaa611e43b051e54032803158850a28c8a66970ba56c07d538a68a7ce703cc9fa449e8e0cf89ba4c2dc3aaed3adfa8a4e6";
+      sha512 = "34d896688ebe205c37785b9274bfeeef5afdad4ed33a3da23e6164db4ad46618abbc915eb57de23b9b0357e0db9988377b12c956df165468d387cfc861c94ebb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4d47dda173e0c8ffe8dd94b803aa7340de3dc24757dbfde6e18ba652c90a241c0c031d0e1d4002703ed2d5a046db73440eb20c56a8de36c35890b4455cd7a092";
+      sha512 = "37f10b8b932b218ad17d302859f8b67b2438673b4dac6651d1a5844fd659b0fc639caeb99d07f46afbbb1b99c194afbf62088b50df5ab3ed0a902ee469eeb1c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "9f6e75b7dacfc1fbf1f713948954101cde55866d9f17e802c295e459abe076cf379848231580a2cd240a12acbceecea2d9d5085d7077d9f5401a8310bab94f2b";
+      sha512 = "848419a3528beac1d0035a90c1b1a5067251a52fffed3492a8211101dd2d23581edad844f803c7fbe0e5142d7f5e9bb463f0cfe5a048b2632e7529beb06c7eb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "b84e51deedbfe48d381eecbc43383e8c9db95b9444d6ab418a9ad03336164bfd9e46f62a2b8dc676f524a148b53d37cfb1dbda8f53fdc20b0ecf4c8d67073e16";
+      sha512 = "8fdac24f76ed898c8885f38b630e725e73602d9559c56afee4d171586591fcdd40419114a46c8ddd8028ef0a129d47e50bdacdbcf14f8f3fcfd42656f74f8763";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "ff9cd81e57a54e123f06399168847d7cb41ffb36618002353140eb83d38d3d8bd78304c022f011ad703ec8e54b19310810f3c9e6951e853da4dbf6fc5ef4b990";
+      sha512 = "5416420355d3dcd44186eeb3c2d32ef88f557de1a59568d2fac33696998cc87aeb84ef0f1669e677451361f38088d93a4655f007b5e5cf3e7f5553671ab93c59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "ebf41ea935a6cbf3858aa8874518b345574b6d32a8e16159da2b5c219766d38aeb0207f4cbf90dee1ebc758676e65275a885d932dd148eba1757682195683bdb";
+      sha512 = "af6d83073b99e33be15ce32fe1269a0c447b503b7898f3a115ddbd22f8eb27475742c8a3ba083d83c9780aad989096f9b6e89129173c30f66cf2fdf3395c199a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "770c9df8b2b8f317720d06e4b33ec13368f47da4e5d1344f676dfdddfb17a18036d2ab69f8954037d779bc64d4263b49d629d1c4c81652faef50aac90ffbb7f1";
+      sha512 = "4d052f2333b28681fc141b104729fe74e7750b6e6eb6e359e7eb721b17e7fd93163eb9fca860311a0b2f183a3bae107d4fcbb39e3208495b4cb343953c17e29f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "1a1f0706b37cc94980a592efb50b321bdec04594577d5e39f45274f76d68b4af44a84c2976f91e6992cfd2b29f7ef1bc2a8c3eecd06f49a846f36e3b588238e7";
+      sha512 = "23381ecbb86926f88b4e7e98db0bb3633193979688f30d2828cd676206e155d9c3ed7c9a0bd5de25d1b065e7fcdb2df97205863a1444151151a8e0fa622df557";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "8d300560c54e99420aafcf3752e157d256b215abc6894d7d84ac84056b1537addaecc628dcab1e3bbcc0533abdf6d66d34afeb63cdd680d87cf2f0bbf2d98018";
+      sha512 = "f38dfbc8db02c16be7e111a1dcf53f0fe5e6ff1f52f84562ddfa07a994bb89179d78b43cafb4de07a9a2872edf0a5f7b27c5a1445e0603197daf6d2b4ff83bd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "3037344bf8c3c349089ddaab17bb5087cc6ff08d037426dfef379fa446ce9352b05ece1fb38c78c3f91eb130cec4055d448d8c8c95df035d2289872bec3c2019";
+      sha512 = "b92ad03428560f30b3fdba23d9ae979ab96d26ffbefd45f392169d5743dc50d04faba5e9607b0740df94366458d9870cb83661558e760f6ad89fd97f363abb7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "0f1c97b9424024d06bd2e55e9b19a6aa1a864bbacdf1d3472ca49154d7b0076e672166a50152e9a79081fcb43482195696ce2461a6f2460f089306bcf8010c4f";
+      sha512 = "3c47fb41d7dbcd9b14b6b294a6e807c76b9973476fd8ff8c4d5e4da14db40bb15aade489155cac8e33584f15d841fd9caecc338556879063c3d0124b6eef70b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "63e3258ea9d03222922fca33f490539ddcb4665d681fc3cc1c8ee9c7aa19497eccca0e112994d51256b8dd674487aa47a907511fe1b1c0880aac42030fc8cf5d";
+      sha512 = "30736ccd9684e851ddd5ed7ee227c36a8248c1d400fe123a1866d2f090c8536fff494e168f17014f4f6df651b8215e30c31badfb4457c5b70f238ecd42a7738d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "dd3f7edee883324c2794a5753111f051efec6c1b406166e2a7952b57e29436a3cacfa959cf20e22940cceda73a6450be4f41da0c0d40b234f2260ec0aa7a2690";
+      sha512 = "28a686b3e721f60284154bf21f0919841db7240764b23a77ad5bdff4b6ea0ab1ab0a8195b8f347e7caf17c43ef3f87401d896e9cc3f176033def1c81be76a61b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "405580d9f71e674122c034efd130597e4c8be01dcaed041bc12539343ae4a7ca3ed3dc0199c246559fe44bed48a1445e913a39a7bf0a9888df590295a6d0fe1d";
+      sha512 = "0c174ab063858acb4cb70a2d97b0359266d334d80a4cf0fb1d0a31cfe0bed03bd72e8cb8a80a8736193d494fffc84427b8780e633715dcdea50c4ed86c4ab6bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "a2d67dd6cbe543f6baf46441fcdab2b4282a2a3d42d91bdcdf14ef4f6e513ac22c6d8a019f40b4e7080f17ac4ce83e1479b05d8f07d19f7e770c8ef691c3171c";
+      sha512 = "7ca54b7240de10b0c91fefdee717b472a7b583021e1ba072a44b4d9b5dce35a931e91c983f21ff346cd4b8330640b7fd8a9034bd2806578f7e0e6aea809c7cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "186bc96ab6d55812c366048ceb1e05ebf4044401d6b67d7e8aa81c306a4bed26ef72a5ca25d3a0dc468645b3fa5b0016c02ed223ca5c2efd05656bb6519767ea";
+      sha512 = "e785b2403fa2627fe75c94a3d5af2d639a7b7c9c213f4a58fc15b80085279b7ca39ff1e31e4abdc6427dc9b99955e51f44ccd027075244795383d6777d4ce79c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "538a8092f3e8c6d684d0de7f909cab7732b8c5bc3da722ee8c1cba4ef85f814ebac964db9803c245ee6065cd7bc6549cb2cbfb397df81e0d990a427bee9e9d32";
+      sha512 = "cda35867160bd4ef2d1f96e2588a8bb3ee44c2c3f8b15daad16da56e637cec97336dd023204349ad36a4b11fb5c6dfee3fbcf85434ac321a2b55bc4b34b88b71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f16f1fbf447ed9e026c924f68d5d3c04ca68320f0e23cd5ef1eb288ff2d50bd95332ba3759410a48d0a36fbeaf390cf8fe5537a58aea58aac64ca2f04e870c78";
+      sha512 = "3291c2789d0d34346c8a5e8b6cdb324d96a89883dc5c5c68bf7ec6419da99b0ecab1039e09e70a38bb64ed7721e518d21c380fa117fc7d22f612c440e2d7361e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "62ef181fbe71d0b91fec36eb90cfdb0c76a3b0eda2a6a3288528b1414a18a73c8beb0428e5cec0bdf80a3136541e92d9b302b0a880a4f72c568f7ca7c2d069f5";
+      sha512 = "d911a6053241a42ba092cfaa64b4b52c60d10fea33bb3e1d5c9826a3f0b8ed0070ab6905b8f801c34d537cf110a8b33abba7e251039ec82fdc6dcf1fe44ebf47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "bde5365d7d77145f0ec0d1256496f303d78f1dd2f7459ec8bd376c4417f71f585239dc85b7c0752cff9121ba6190ee831163fe8db4cd6e5f4c8282a25fc736bd";
+      sha512 = "0589d36886d66cb5f29a9f17f4f2fb2249d6d88fe1a2c98c7e70ca60d8ec0cf2a5d93d9beb0bd25af91b20fd4d34a292a80b91c619c1b08ea07a143ef8874271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "dc7167af19c73d430389aa5ebf7d2a3b52193f195dbdd2a5f82709771fab4c8180fde202ea35268b62400aef869d6ef0cdbbcfe8e1d45ff07052dafd58dfb78c";
+      sha512 = "98f12874a37d09f05635f70589d410c59c5719e9dbc6cded8b673d28558f79566a94975a596e121497a9352bc96d3f646b74244a0fa36c48690fc60945bc462d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "3c853df6b14641f94ffcf20f972c82dfbe883c176fbe4e20a530d811ddafddddd935acebfe68a4857f8d33c58c858ec31c4a0ca6f8d58d717a51f506ae880d87";
+      sha512 = "f8316f566941ebadb77d11c365249cbf16cde1856b97753f057ab67d1bf5fb2a13aa18e2d5a3f0be1e5a856cf37feac91b4f629b1ef210a97040f15bcf2316ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "03de4d0db15191e601eb73543f2794053eb0d25ec1161e668d80446d54e664b442e19f121bcb2a09e1626c01ca6a44f62cb85f95fa71474b394647d1e07d63c9";
+      sha512 = "1744b771f83ef60159dd073c73f2fec6b3213fc3e9cdea8ba1367e50f2a8555ecd4cedea1c8813f8a9196528339928fef60b94c67d7fca9f118348165bc49213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "bd11447447f93dc062ebf121578c068e36892a0594470a3bd03b16054012fe5af66f3ac376c694f7f175f52e6066608de78a4724ff79a13b39138bf94b49c963";
+      sha512 = "6e25ba8aca1add8829e6b3982f2b3d394b8342b74ded519dd86b877e8e9405bfa2133894044bba9071b734046e03e87e649f94dfdc50af5310fd236c39429aa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "45f5f39edf86ce562026ca86f4749536c1f7a4e22381a67885bf0ccf1e1471048fb16e1601b9292d3d38e6d40412d40b86f53092b24ca51a5c99d4be4bcb4a6f";
+      sha512 = "48a818e9e6f71381cfdc2f330dee0fbbdf7d8f403f2fef3dbe8ea5aed8f51f07fd18943cb94a6aacb032a02cc3eaea9c45e09ea383945765ed14f355661b21e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "41c2dbcaf152a75ab1b6e5ecfcf1214a1dd7de6bd9d80ec4a88fb70123a24d8f147f75aa02b292cc468ae7f8a86a127756b45a0aadb7ad81dc182b24ae63b9dd";
+      sha512 = "7b96ae68a111f133343ae4b56864e86edce3c50a88a18cd9d7e7406b1ee49645ceac89c870687a18020e9e382d707b26f5a34d3141c69459c599396605d74d68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "ad14e5b1f262373757f0b3d3285a6efefaeb4fc75cf07ee41fd5baee24854b0838b994f57734188cf79a109415bdf738852d703b6704c4fa9d3fd3446204d3b6";
+      sha512 = "a58596fcaf9cdcac330c2559d5e2225a47187fce8cb3d4d633e263a1370b0ef99ac214d8ccb3993da22c895333d511e8ae60ae88b92d59f3c137345531bf2762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "25ba4e079a9e74a972a9ad37a2555c5c42d71015ddf461575d12ebd7c2304166df4a1806a073c8a56f07b7d824a6231d3bb5ff00eff58eccc293457d93b3307d";
+      sha512 = "e139fd7712e7ad97ab14d75e7764618bb8af2590085322dd6309191e4e9dcfeb383c2ecab4664b682ee07c1fdb60280ab6a58d683e6a809664221534dd2b555e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "01ab6ae58d1057247759aea87521a607561a55b0e11f8cf01272bbd06070f9aa5c3ca728c2f2041674c90f038d8b5399c8cff25e199d1da4501bd616eaf8970a";
+      sha512 = "af50e838b7f0c9c85bd19d0ad0f40852e5260fd7c757a346a7fe2345713a6a12f679c5b9aa8a5fb430521c72aba84a9b61cd131c61d13ee5abea2f3cf3227cc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "1c2df86fcf9efa649bd22c0863898cd91319e05ec2930e7c4cecfc46da3a47449fc7cf86a0fb41e1813ffa05fd7c8d11aef23a0bd2d2cb8a5ed0df93c71e860d";
+      sha512 = "deaa920c77e9cbf73637451f4539a0e68f87e05997cad3501a34a7a864aef5e71fcf4cbaac1dc262fbe30ac3785583ac12baf5983449c9afebfb39fa6d372d16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "523db80c388f657cea7f69ae787637d1349c42874c9a3fb6b726ff6553c789dbd428c2e8b2d207fbc57903e6ff5fbf7493582b91f98b7c497ec96e77b299baed";
+      sha512 = "7ae0b550ae2bc3f1100eaf9e7de0afa15a61bc2e50936ec0b93d6da9c53768e2c73c1a31854dab9d564344abaf22155c62b3b430b07367b47b61a79a8a58a662";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "52d78064592ebea903b5a05669ab73fa3e86d2c0ba014a6b4199138a8e0cf7271da513c254fb25a23b98e93d16348e47c2bd1f32f4644257744f9a3fcaa47648";
+      sha512 = "b97664f85fdbc301496d77efc95ab17892104a72558909399f7ceeee5427dc643aaed0e1ed48c392f2c3da47b221557f9f99522779c2a21cbc5baf08af66749b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "8eaabd96695c083e3d744b72ae5ce318f63887a7e70681b9f6269cbee2db60309ca5e2dbe35e612d48014ec815266b1e3dfac6884a1a38a08d6a04f802a10a8a";
+      sha512 = "52fcfb51c723085a6d24c2a8993aaa7d2146071689dae71f8dd6a7fd561741fe8e4a23e5ea2f6525ee0a4b970d63cf7751bd8fa5a771dc0b1463039bb17828fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c03118fc5530133cdb0298bbe6e041b3edbeb7cb9ab74680410d9dca4440d9d4beb44bf792683bf556effbe24a28d7d31be7c23fc160f5dab27c76e8ef4c7154";
+      sha512 = "feb2a04fc6dbe4efb0e1937173bf7d06670e04f7dee56fbfe6983a81ee1862b89dd9eaec9bf7efec29e388efeb17a30c24bc276caa4e430fc2eeb87c84882ef9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "410c12bb9ab8258e3d6c01c68272228a17116e9f3531296bceb1947091eb97d0e077b8749c206a767c7d18782a4cd2b7a5146fae1195c481e6b17265c1b9f4c5";
+      sha512 = "41722381775abb0ff845cb8b38bf7fa2782f7af0cd8c12b5a86bdaec797d4aa6a2ee2ce35c234a1a17b9e4f69aefb244e3e8531c1d151a002a81b562ee24179f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d998dbfb46c4bce19d926b746d45b7ee4d9b4353a8c2e8472ea29f51cb41df1b7384508d8d2c51e6090a31cf3349b557511efad9fff48fdb680efec3fa82c535";
+      sha512 = "63b9385ccba72f5c2ba3bc735685d6d35363b0d523e508cdb603f59209b750fdff050fad791a0c01abeb7385c1c94fd24d4df00b2177ab47d3da53a7d0f74175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "eb712a2a1065316711582423d3f930154075654a35d552c46a1efd95c56840329b07c03e4d2587594793d8dbe70e77f40b08a26aff33fe4d6a7f81f9144b8037";
+      sha512 = "b39a4bf8465e4690b06c1372ca2a3e6355e00e466865a4a764cf6fa75965c94b6b887259c3020c8423cfc0b1eb7c5cda8aa3574e5eead4d9363f6f048cfc1e19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e358146e4380d68dcde78c06aabd27edf025a946d8aced77da8ae5f553db485abd44e79d56dcf4a247935dc37e012d20a85ebcaa7653240ac4a137362af1508d";
+      sha512 = "0b943f1da58ff29cd95dd18db809d660ef452dc18ca047d1d7cfcac388cae09a123d52e096676cd0dd3be3bda12fee2df69337064acf7994ba6672664684fc24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "fc0ba49c238c9eed79c56213f2a3eafe0239db392105c8d9163c8c6bec0e96b2d0eca89cdddf89fcb3e1265e66dd15ab44bd126841a2ffde566a2aad87754992";
+      sha512 = "d2eea20f4d10198f3cf0969478e19b2ae6b4b359c67afb850d56a9d23c6affd3550848074f72bb79063aee1678a5ac0a0e176f41553dad1eb59eb7f8cf3fa4cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "2f87f1b962bf5c0bbb9d23b56a63cd097c9fd772c42dfb470bc3b8696f59ec42b314ecf93f041ea8e34aea0a82da946086b8aef1c7de68cde1a75266423aefc8";
+      sha512 = "485df58d959663023689c4bac2866b8b67e935570b04cfa8dedf52d104555a5da18faf0e3567e699d677ed1456daf144d1b3baa943b5b8c8c056c46a6a403299";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "71eaa7ea7d7efa95de76c9c838e41bd5a925f7c0736fe60b54e3d38480b58957ac6e48bb64e4ec3c661bd78238f72b94c3d823a59d532c372866b4eff0d4c700";
+      sha512 = "23bfaab1a790092acb452939ca4523a23d70315c163ef85e2b902c5aff8128a237a9458f1cd44a5a40f8f9c3d432ec0f61af92e9bdea5069876026b9868e9651";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a84953aa555aa29a8ac55fec57179b773348f4347b944436053bc54a025c40411c08b0ca318df03b759393793870f7de69cc9c63a2f7bfc51695e9e2dab426ae";
+      sha512 = "3e2688847c4088a08bf5c1e2b14508edd0206ded8ccb0316fe9fa21851f27628389e0f332906c2293b5122e38baa31701ffce830e763959d330fac43a4d8a2da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c99e242d473f004c614797c36cbf86b0781639133101838d6745eba4d83651d41ae7559928ac7db5f34bdc74f2e9ad144255aea7cf267026f51c15b2201a4786";
+      sha512 = "370f10422839661f17b762ed88b9b4edec93c324393a9abd0e757ba047c49b246c04dec2872eca4bd23af8578ebbaee07d2ec2d2a11e3c4f12998d2de0f21b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7fd406b95fd4aea4df73a1804260e7be85e7b30d92a4ab5f912b519aa9a26b42f5c0fbb41ec6046b5f4654fb146747cd582be214bfc167a34c151cd1ff5ec421";
+      sha512 = "4d5903bff1a3aec38246037ce21dd0f14e69e11b9a39befc76b9298e1f3ee4ff1e686d186b9e3d2a80d39619ab6eaf65c9cefe3f3c0efd3064aa092485a2940c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "966404ba6670fa614bb63337de97ad5a3ea25b1850f95c8a79ec965c318aa073fd818cf2299e1469a0e25953a60d1b1ab6bd3ff8dd6475f98e0c84de769c2369";
+      sha512 = "a4507b52028c4ff4d79734ae8b5e93d79d1c70b89e91fd6aff13df4587be94b35e0c4cce2670d1c709c86bc80bbda14f976095aa8445ba8c59c5fbd5a23955d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "c36f8ba24429d0eb7e28b10c3e8fe0bb6ce45c2e82eeaf635fac441a9168ce1c7fbce2acac1f4ee631f2cc772aed509669390b673f8acc2aeb7f778a3de160c9";
+      sha512 = "b3b633360df42b85a6f2b7ab34ee69c572d0be444ce32e03b76ad799933a1b2fe1afff5de62c9040bb0fbbaec74db47837d0d813f73ce248f82dd6418d171795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "afd4b06ad27716c389e612e7dcf37b2551dc66bf7bc6c63c7cb06886c082e9e4f4745591a4915ec924aa8bd0820994f3dd2eb88cedc7e053b29066d6b502e08a";
+      sha512 = "8ec8b7299eb0e147f5a53b59cb4c3ce3098d94c81e73e3aa4ab60047dd7aa7de2d430598fcf319d8e85b7247d1631172f4bd52a7817d61f7a1cb6e6667993bca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8cf82519981879d5f3fa77e51a39532a60759be78713acae27207928eb88a7494f14dc4ca1bb0c8acd2e5e4c667bb6a1f6738d1ab13b32c45daa707c90095abd";
+      sha512 = "0f25570fbc9647ec04f7ec6a9447d0e70757c42355293e8ec5130e2a84f92db7178ac319dd8a871e03c3e0780cee8d33df1b1e99ddce515d20cc1833cec02183";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "953ffc804424233cc81886f2913a4a9a1f49a16e1e5748c2a7696a7e8305e0e0c6fd99b5b1b235ed864cb36ff1ae59a8e30242c226c17609e8e7b5572eed871c";
+      sha512 = "2c7e18368e33296b70a2be416b47b8cf96dfccdfc24286b7a7bf9ea13607b10f05a615a7509d40853613161bb17949a3051b98bc1e92a85d5117250a9c448f53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f9287905756218ed481cc9154da2b48cfeeef00ffcac349b3f33e83348ddc4d3f43a9bbcb44a178fa63a3a39d9570159ac39244b9e5749999904a6053562ec20";
+      sha512 = "27b1f9768659c884eb612cae804466d7b3d589f5dc21b1edf11fb30354755854cffa337e05cc27edf22c9e393462c7a0a7d47f7fcc2d25a166112aab9b6817da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8092158575953a8294cc1072c586615c9355da4601c6ee40db589e23656d61abf6c71e36fdacbc412c24a7b1af1fcfded5d7cc257d633e90b1ca9d6bc077b007";
+      sha512 = "19afb81413abb2f9cb1d3d6680a5e541ca9104574e019560933c43769839e7c72062e8ad3a60717ff9d198de239cfa8a5a5aea05bb09ae3f3de027798f00cfca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "8d7c63622d81912d37229373635eabc8c9005b5287be1b49a1c2e6dbcbc104ede51f5c56e98058c403f5b745292816eecee582d8efa80dcbcc968a578f606ac2";
+      sha512 = "50139c75f33b56cdaa21c42356e2021a06ad584238635044ead82b614d5f41d5d07c3733d506b35039b6ad06d1f4075d64d34ebe454a8d16a041fdc69d1857cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "648b7c95ed6ae65e7d5bbf2f18228a8f22725f517599e97c71701d8c2ea0cb2e4bad23ece3730553b45a95b0c9ab3f92674717420a43cc8bb571ec5f960554a1";
+      sha512 = "0a22c2ee0a64603d70bfcb4b88d3784ca24a832548702861874c46e84ea343af02b0d38920fb08b9c4e97ad7b7316d302804044bf11919ed0466b310798d4bb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "dfbb2039de2ca8b3338418f29368a98020bb3d810eb1a31ef10ef5e82ce097afe5dd167859a9b3c097ff2f99b8127ce5adb0b354389fade5a0635953897bed15";
+      sha512 = "00fd8f528becb07d26e1af065797704f2611967e95e01dccaa62862eb21f86f448a0768157257de529c7323541ea3373cd3169e3907a2c7afd8da0fc26b1dd87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "3d5e0adf9c89aca8e7eee5771aabb095ef1cbdab84a73f7d44c2b4419746095d25d239d728ffd143c5a57683578892627d20943fdad3aa2bf2459082a6c38c0e";
+      sha512 = "3f17f4df5c9237b2d3bb649063b88eea597c5aadf04f376cb903f4da0a0afa9b0a60c46387222091dee3be53993fd7b2ff0153946d4baae1e65288f7564e0fe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "38220ba22a453adab180f968d9f5227034d39e4cc56ada7d38a333d4d19dfd2b16af52937449c7a013c6b42c9238068aaa16ddc2899b53edad980d7467f7edaa";
+      sha512 = "828535de7fd12a8066354049383d6ab6cedc2bd442a6b4d4b878e04de6b182dda28d79765f523bdb691914c807f805cad5796273f470f8a55a461adac8776cee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "eb793c434240a3b17975ea860b9aca6a695e4c51eb19c15c16fb320475f8a2e91631d1f8e74c8caac9ad5d34d4f2e522fd97608591f5d33f00401c68b0cb6e05";
+      sha512 = "5f810768fd9a138634763119eb1000f4a68e9cf0202afd3ef0511efc23864f34f3c168a81cd8b22333f16c7a613cd0c0125c49c14320a4755c9bf156f26a593c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "e2c16a1faeb1caf05f5d826a6d3e5a0fa5a18884518d70db25a3a92dde9776541e1ce4e2931885b4cbe3d168957e867d446aca1d88c50526ff35349f5545d48f";
+      sha512 = "ccfd807a6033d00e2c9781b40d14ebb075c66f333338e4f167992923ffe564d2939a459515a36435e1c882c1dfe9c523ed225b1672756bd83d5b4db183a7c985";
     }
     ];
 }

From 67adb994bcbd3d0b160bb3589fb1e436beda0a0c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 17:16:18 +0300
Subject: [PATCH 2158/2266] linuxPackages.nvidia_x11_legacy173: drop mentions

Thanks to pbogdan for noticing this. I'd like to have a "no direct commit"
policy implemented for my own good ^_^".

Tested with ofborg's outpaths.nix
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 831fc8344cb..1e2175f875d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13470,7 +13470,6 @@ with pkgs;
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
 
-    nvidia_x11_legacy173 = nvidiaPackages.legacy_173;
     nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
     nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
     nvidia_x11_beta      = nvidiaPackages.beta;

From aacd7d6d58fd2cc6108e914a87c6aa419c5361dd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Mar 2018 17:00:59 +0200
Subject: [PATCH 2159/2266] androidStudioPackages.{dev,canary}: 3.2.0.6 ->
 3.2.0.7

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 4583066842a..fa929d714b7 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   latestVersion = {
-    version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
-    build = "173.4658582";
-    sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
+    version = "3.2.0.7"; # "Android Studio 3.2 Canary 8"
+    build = "173.4670218";
+    sha256Hash = "0p1lls1pkhji8x0p32clsiq3ng64jhqv2vxkhdkmsbh5p4dc1g21";
   };
 in rec {
   # Old alias

From c515f7036ecd42456c01411bfd79bfc99c6cfbc4 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Tue, 27 Mar 2018 16:35:54 +0100
Subject: [PATCH 2160/2266] Address @yegortimoshenko review

---
 nixos/modules/services/backup/tarsnap.nix | 48 ++++++++++-------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 88c847ed92c..4fc7c24813a 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -304,7 +304,7 @@ in
         requires    = [ "network-online.target" ];
         after       = [ "network-online.target" ];
 
-        path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
+        path = with pkgs; [ iputils tarsnap utillinux ];
 
         # In order for the persistent tarsnap timer to work reliably, we have to
         # make sure that the tarsnap server is reachable after systemd starts up
@@ -314,9 +314,9 @@ in
           while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
         '';
 
-        script =
-          let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \
-                        -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
+        script = let
+          tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
+          run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
                         ${optionalString cfg.verbose "-v"} \
                         ${optionalString cfg.explicitSymlinks "-H"} \
                         ${optionalString cfg.followSymlinks "-L"} \
@@ -329,7 +329,7 @@ in
               if [ ! -e ${cfg.cachedir}/firstrun ]; then
                 ( flock 10
                   flock -u 9
-                  tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck
+                  ${tarsnap} --fsck
                   flock 9
                 ) 10>${cfg.cachedir}/firstrun
               fi
@@ -351,35 +351,29 @@ in
         description = "Tarsnap restore '${name}'";
         requires    = [ "network-online.target" ];
 
-        path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
+        path = with pkgs; [ iputils tarsnap utillinux ];
 
-        ##
-        preStart = ''
-          while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
-        '';
-
-        script =
-        let
+        script = let
           tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
           lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)'';
           run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
 
-          in if (cfg.cachedir != null) then ''
-            mkdir -p ${cfg.cachedir}
-            chmod 0700 ${cfg.cachedir}
+        in if (cfg.cachedir != null) then ''
+          mkdir -p ${cfg.cachedir}
+          chmod 0700 ${cfg.cachedir}
 
-            ( flock 9
-              if [ ! -e ${cfg.cachedir}/firstrun ]; then
-                ( flock 10
-                  flock -u 9
-                  ${tarsnap} --fsck
-                  flock 9
-                ) 10>${cfg.cachedir}/firstrun
-              fi
-            ) 9>${cfg.cachedir}/lockf
+          ( flock 9
+            if [ ! -e ${cfg.cachedir}/firstrun ]; then
+              ( flock 10
+                flock -u 9
+                ${tarsnap} --fsck
+                flock 9
+              ) 10>${cfg.cachedir}/firstrun
+            fi
+          ) 9>${cfg.cachedir}/lockf
 
-             exec flock ${cfg.cachedir}/firstrun ${run}
-          '' else "exec ${run}";
+           exec flock ${cfg.cachedir}/firstrun ${run}
+        '' else "exec ${run}";
 
         serviceConfig = {
           Type = "oneshot";

From f8ed783f4f0f2239f0c084fe1700529304376697 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 27 Mar 2018 11:42:51 -0400
Subject: [PATCH 2161/2266] meta: Simplify platform check logic

Code golf or readability, you decide
---
 pkgs/stdenv/generic/check-meta.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 2f4ff62f767..26522ad6045 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -174,9 +174,10 @@ let
     else "key '${k}' is unrecognized; expected one of: \n\t      [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
   checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
 
-  checkPlatform = attrs:
-    (!(attrs ? meta.platforms) || lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms) &&
-    (!(attrs ? meta.badPlatforms && lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.badPlatforms));
+  checkPlatform = attrs: let
+      anyMatch = lib.any (lib.meta.platformMatch hostPlatform);
+    in  anyMatch (attrs.meta.platforms or lib.platforms.all) &&
+      ! anyMatch (attrs.meta.badPlatforms or []);
 
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.

From bc7df1734f88dfe7e55f56f52d593ff129ec2282 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 11:03:03 -0500
Subject: [PATCH 2162/2266] gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 14bee08e381..4862e0eab93 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,4 +13,4 @@ nixos/doc/** linguist-documentation
 nixos/doc/default.nix linguist-documentation=false
 
 nixos/modules/module-list.nix merge=union
-pkgs/top-level/all-packages.nix merge=union
+# pkgs/top-level/all-packages.nix merge=union

From f5a48fe3c9cf2bca2b59e19a41c4ea5ad6469949 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 27 Mar 2018 18:07:13 +0200
Subject: [PATCH 2163/2266] electrum: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 47dfa30436f..425203be01c 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "1hc0ylkq89459wy3av42hp73p34pmh7grsa3qm8fb1k0qg17zy78";
+    sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 707a1ce0da3a5226410ad4e39f1ad433c1cb024c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 27 Mar 2018 18:07:27 +0200
Subject: [PATCH 2164/2266] tor-browser-bundle-bin: 7.5.2 -> 7.5.3

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 8f935f93379..8a8abb42f55 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.2";
+  version = "7.5.3";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0fzfn1azkz6n82mz4vy5nnvx0xsd16cxa69wnvq33gcdw1jvjb2l";
+      sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "04yhny7nnrq3ahrax0ql002r7i3fsji8j3j9x2b6sr3g6lq91753";
+      sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr";
     };
   };
 in

From f3c8036a709e30b615c2b6de33b621798110011e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Mar 2018 10:43:16 +0000
Subject: [PATCH 2165/2266] coqPackages.bignums: make it available for Coq 8.8

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

diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 45786c5a955..474ce05c1d4 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, coq }:
 
-let param =
+let params =
   {
     "8.6" = {
       rev = "v8.6.0";
@@ -14,7 +14,8 @@ let param =
       rev = "V8.8+beta1";
       sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
     };
-  }."${coq.coq-version}"
+  };
+  param = params."${coq.coq-version}"
 ; in
 
 stdenv.mkDerivation rec {
@@ -37,6 +38,6 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
 }

From c91c50367e8bb267e6c0659f0ddd88038f76c93e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 28 Mar 2018 00:22:40 +0800
Subject: [PATCH 2166/2266] plasma: 5.12.3 -> 5.12.4

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 20fdddfe46c..117401b0eab 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 14b5f3a39ad..df031ba0627 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz";
-      sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk";
-      name = "bluedevil-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz";
+      sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x";
+      name = "bluedevil-5.12.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz";
-      sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw";
-      name = "breeze-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz";
+      sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7";
+      name = "breeze-5.12.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz";
-      sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b";
-      name = "breeze-grub-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz";
+      sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs";
+      name = "breeze-grub-5.12.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz";
-      sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x";
-      name = "breeze-gtk-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz";
+      sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c";
+      name = "breeze-gtk-5.12.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz";
-      sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn";
-      name = "breeze-plymouth-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz";
+      sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr";
+      name = "breeze-plymouth-5.12.4.tar.xz";
     };
   };
   discover = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz";
-      sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd";
-      name = "discover-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz";
+      sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq";
+      name = "discover-5.12.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz";
-      sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m";
-      name = "drkonqi-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz";
+      sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6";
+      name = "drkonqi-5.12.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz";
-      sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1";
-      name = "kactivitymanagerd-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz";
+      sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg";
+      name = "kactivitymanagerd-5.12.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kde-cli-tools-5.12.3.tar.xz";
-      sha256 = "0d2mkrpy2pib0za75m2mg6pvkklbwizh14cqi3zabqi384fys1j3";
-      name = "kde-cli-tools-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz";
+      sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb";
+      name = "kde-cli-tools-5.12.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz";
-      sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy";
-      name = "kdecoration-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz";
+      sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj";
+      name = "kdecoration-5.12.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kde-gtk-config-5.12.3.tar.xz";
-      sha256 = "0wsxz5v585srkn8qbb4b82ci1wgrpzg87krixzsxzd3k0wc0c71q";
-      name = "kde-gtk-config-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz";
+      sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6";
+      name = "kde-gtk-config-5.12.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz";
-      sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p";
-      name = "kdeplasma-addons-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz";
+      sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5";
+      name = "kdeplasma-addons-5.12.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz";
-      sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm";
-      name = "kgamma5-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz";
+      sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h";
+      name = "kgamma5-5.12.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz";
-      sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa";
-      name = "khotkeys-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz";
+      sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f";
+      name = "khotkeys-5.12.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz";
-      sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr";
-      name = "kinfocenter-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz";
+      sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3";
+      name = "kinfocenter-5.12.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz";
-      sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4";
-      name = "kmenuedit-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz";
+      sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099";
+      name = "kmenuedit-5.12.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz";
-      sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9";
-      name = "kscreen-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz";
+      sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315";
+      name = "kscreen-5.12.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz";
-      sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm";
-      name = "kscreenlocker-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz";
+      sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m";
+      name = "kscreenlocker-5.12.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz";
-      sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h";
-      name = "ksshaskpass-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz";
+      sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5";
+      name = "ksshaskpass-5.12.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz";
-      sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc";
-      name = "ksysguard-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz";
+      sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk";
+      name = "ksysguard-5.12.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz";
-      sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz";
-      name = "kwallet-pam-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz";
+      sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q";
+      name = "kwallet-pam-5.12.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz";
-      sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi";
-      name = "kwayland-integration-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz";
+      sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla";
+      name = "kwayland-integration-5.12.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz";
-      sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71";
-      name = "kwin-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz";
+      sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8";
+      name = "kwin-5.12.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz";
-      sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1";
-      name = "kwrited-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz";
+      sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy";
+      name = "kwrited-5.12.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz";
-      sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4";
-      name = "libkscreen-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz";
+      sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr";
+      name = "libkscreen-5.12.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz";
-      sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l";
-      name = "libksysguard-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz";
+      sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd";
+      name = "libksysguard-5.12.4.tar.xz";
     };
   };
   milou = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz";
-      sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq";
-      name = "milou-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz";
+      sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7";
+      name = "milou-5.12.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz";
-      sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856";
-      name = "oxygen-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz";
+      sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa";
+      name = "oxygen-5.12.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz";
-      sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8";
-      name = "plasma-desktop-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz";
+      sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy";
+      name = "plasma-desktop-5.12.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz";
-      sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww";
-      name = "plasma-integration-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz";
+      sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb";
+      name = "plasma-integration-5.12.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz";
-      sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w";
-      name = "plasma-nm-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz";
+      sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj";
+      name = "plasma-nm-5.12.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz";
-      sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l";
-      name = "plasma-pa-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz";
+      sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56";
+      name = "plasma-pa-5.12.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz";
-      sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli";
-      name = "plasma-sdk-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz";
+      sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2";
+      name = "plasma-sdk-5.12.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz";
-      sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7";
-      name = "plasma-tests-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz";
+      sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9";
+      name = "plasma-tests-5.12.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz";
-      sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h";
-      name = "plasma-vault-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz";
+      sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n";
+      name = "plasma-vault-5.12.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz";
-      sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy";
-      name = "plasma-workspace-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz";
+      sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7";
+      name = "plasma-workspace-5.12.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-wallpapers-5.12.3.tar.xz";
-      sha256 = "0gmpf0d7dzpnmm9lzgjqmr201mjkvjwbf0qlg5n87w7j9j4c580v";
-      name = "plasma-workspace-wallpapers-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz";
+      sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j";
+      name = "plasma-workspace-wallpapers-5.12.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz";
-      sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk";
-      name = "plymouth-kcm-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz";
+      sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn";
+      name = "plymouth-kcm-5.12.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.3";
+    version = "1-5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/polkit-kde-agent-1-5.12.3.tar.xz";
-      sha256 = "0kb2ijjfqncrw02lrkh6jw2g2rps7aqs7v20gjdam9sacmnwy5j0";
-      name = "polkit-kde-agent-1-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz";
+      sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q";
+      name = "polkit-kde-agent-1-5.12.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz";
-      sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484";
-      name = "powerdevil-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz";
+      sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx";
+      name = "powerdevil-5.12.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz";
-      sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2";
-      name = "sddm-kcm-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz";
+      sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7";
+      name = "sddm-kcm-5.12.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz";
-      sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali";
-      name = "systemsettings-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz";
+      sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a";
+      name = "systemsettings-5.12.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz";
-      sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh";
-      name = "user-manager-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz";
+      sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm";
+      name = "user-manager-5.12.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/xdg-desktop-portal-kde-5.12.3.tar.xz";
-      sha256 = "0swy8kcczvs2ariyjrkln6mvc0xqrjznpkhw5gzyh61v3hpddgk9";
-      name = "xdg-desktop-portal-kde-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz";
+      sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c";
+      name = "xdg-desktop-portal-kde-5.12.4.tar.xz";
     };
   };
 }

From fb1f35424e7dc10d83830ec7a1177f413e7e622c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Mar 2018 18:26:03 +0200
Subject: [PATCH 2167/2266] pythonPackages.scapy: 2.3.3 -> 2.4.0

---
 .../python-modules/scapy/default.nix          | 22 ++++++++++++-------
 .../python-modules/scapy/fix-version-1.patch  |  4 ++--
 .../python-modules/scapy/fix-version-2.patch  | 20 ++++++++++-------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 1f4a34d18a3..d7b2a827f7d 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -1,30 +1,36 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, isPyPy
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k, pythonOlder
 , matplotlib, pycrypto, ecdsa
-# Python3: pyx
+, enum34, mock
 }:
 
 buildPythonPackage rec {
   pname = "scapy";
-  version = "2.3.3";
+  version = "2.4.0";
   name = pname + "-" + version;
 
-  disabled = isPy3k || isPyPy;
+  disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "secdev";
     repo = "scapy";
     rev = "v${version}";
-    sha256 = "1c22407vhksnhc0rwrslnp9zy05qmk2zmdm2imm3iw7g6kx7gak1";
+    sha256 = "0dw6kl1qi9bf3rbm79gb1h40ms8y0b5dbmpip841p2905d5r2isj";
   };
 
-  # Temporary workaround, only needed for 2.3.3
+  # TODO: Temporary workaround
   patches = [ ./fix-version-1.patch ./fix-version-2.patch ];
 
-  propagatedBuildInputs = [ matplotlib pycrypto ecdsa ];
+  propagatedBuildInputs =
+    [ matplotlib pycrypto ecdsa ]
+    ++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ]
+    ++ lib.optional doCheck [ mock ];
+
+  # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate)
+  doCheck = if isPy3k then false else true;
 
   meta = with stdenv.lib; {
     description = "Powerful interactive network packet manipulation program";
-    homepage = http://www.secdev.org/projects/scapy/;
+    homepage = https://scapy.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos bjornfor ];
diff --git a/pkgs/development/python-modules/scapy/fix-version-1.patch b/pkgs/development/python-modules/scapy/fix-version-1.patch
index 3864a41964e..33d099e7a64 100644
--- a/pkgs/development/python-modules/scapy/fix-version-1.patch
+++ b/pkgs/development/python-modules/scapy/fix-version-1.patch
@@ -1,11 +1,11 @@
 --- a/setup.py	2018-02-15 22:14:08.531591678 +0100
-+++ b/setup.py	2018-02-15 22:14:57.947703737 +0100
++++ b/setup.py	2018-03-27 17:15:38.617315539 +0200
 @@ -47,7 +47,7 @@
  
  setup(
      name='scapy',
 -    version=__import__('scapy').VERSION,
-+    version='2.3.3',
++    version='2.4.0',
      packages=[
          'scapy',
          'scapy/arch',
diff --git a/pkgs/development/python-modules/scapy/fix-version-2.patch b/pkgs/development/python-modules/scapy/fix-version-2.patch
index 62d43b51fbb..41a195fb722 100644
--- a/pkgs/development/python-modules/scapy/fix-version-2.patch
+++ b/pkgs/development/python-modules/scapy/fix-version-2.patch
@@ -1,11 +1,15 @@
---- a/scapy/__init__.py	2017-12-29 18:57:35.315472160 +0100
-+++ b/scapy/__init__.py	2018-02-15 22:36:43.102132489 +0100
-@@ -73,7 +73,7 @@
-                 tag = f.read()
-             return tag
-         except:
--            return 'unknown.version'
-+            return '2.3.3'
+--- a/scapy/__init__.py	2018-03-27 17:38:52.706481269 +0200
++++ b/scapy/__init__.py	2018-03-27 17:39:56.576688890 +0200
+@@ -82,9 +82,10 @@
+             if match:
+                 return "git-archive.dev" + match.group(1)
+             elif sha1:
+-                return "git-archive.dev" + sha1
++                return '2.4.0'
+             else:
+-                return 'unknown.version'
++                return '2.4.0'
++
  
  VERSION = _version()
  

From 9df1ad5a2d8eb9a26e394530d3dbd16360de5633 Mon Sep 17 00:00:00 2001
From: Wilga <wilga@cat3.de>
Date: Tue, 27 Mar 2018 19:14:31 +0200
Subject: [PATCH 2168/2266] libsepol,libselinux: fix i686 build

---
 pkgs/os-specific/linux/libselinux/default.nix | 2 ++
 pkgs/os-specific/linux/libsepol/default.nix   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 4ddc3010221..8dc906b2993 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
   # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
   hardeningDisable = [ "fortify" ];
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
   '';
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 59962e911d4..40872f7c1ac 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
 
   passthru = { inherit se_release se_url; };
 

From 95a819c0026a7a3c0dd2099e1c53fea95430c505 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 27 Mar 2018 19:18:49 +0200
Subject: [PATCH 2169/2266] libreoffice: wrap to set JAVA_HOME,
 SAL_USE_VCLPLUGIN and DBus session if not set

---
 .../office/libreoffice/default.nix            |  2 +-
 .../applications/office/libreoffice/still.nix |  2 +-
 .../office/libreoffice/wrapper.nix            | 16 ++++
 .../office/libreoffice/wrapper.sh             | 27 ++++++
 pkgs/top-level/all-packages.nix               | 89 ++++++++++---------
 5 files changed, 90 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/applications/office/libreoffice/wrapper.nix
 create mode 100644 pkgs/applications/office/libreoffice/wrapper.sh

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 7da7a6bf734..89af45814bf 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -269,7 +269,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook ];
 
   passthru = {
-    inherit srcs;
+    inherit srcs jdk;
   };
 
   requiredSystemFeatures = [ "big-parallel" ];
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 866b8e92337..d1e80724aaf 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -261,7 +261,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook ];
 
   passthru = {
-    inherit srcs;
+    inherit srcs jdk;
   };
 
   requiredSystemFeatures = [ "big-parallel" ];
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
new file mode 100644
index 00000000000..8566bd76e1e
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -0,0 +1,16 @@
+{ libreoffice, runCommand, dbus, bash }:
+let
+  jdk = libreoffice.jdk;
+in
+(runCommand "${libreoffice.name}" {
+  inherit dbus libreoffice jdk bash;
+} ''
+  mkdir -p "$out/bin"
+  ln -s "${libreoffice}/share" "$out/share"
+  substituteAll "${./wrapper.sh}" "$out/bin/soffice"
+  chmod a+x "$out/bin/soffice"
+
+  for i in $(ls "${libreoffice}/bin/"); do
+    test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
+  done
+'') // { inherit libreoffice dbus; }
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
new file mode 100644
index 00000000000..591b4251506
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -0,0 +1,27 @@
+#!@bash@/bin/bash
+export JAVA_HOME="${JAVA_HOME:-@jdk@}"
+export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
+
+if uname | grep Linux > /dev/null && 
+       ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" && 
+         test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then
+    dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
+    mkdir "$dbus_tmp_dir"
+    dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
+    cat "@dbus@/share/dbus-1/system.conf" |
+        grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf"
+    if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+        "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session"  >&2 &
+        export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
+    fi
+    if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then
+        "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 &
+        export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system"
+    fi
+fi
+
+"@libreoffice@/bin/$(basename "$0")" "$@"
+code="$?"
+
+test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir"
+exit "$code"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 546e4514a17..0b4215a31ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16458,51 +16458,52 @@ with pkgs;
 
   libreoffice = hiPrio libreoffice-still;
 
-  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome2) GConf ORBit2 gnome_vfs;
-    inherit (gnome3) defaultIconTheme;
-    zip = zip.override { enableNLS = false; };
-    bluez5 = bluez5_28;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        carlito dejavu_fonts
-        freefont_ttf xorg.fontmiscmisc
-        liberation_ttf_v1_binary
-        liberation_ttf_v2_binary
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    stdenv = overrideCC stdenv gcc5;
-  });
-
-  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome2) GConf ORBit2 gnome_vfs;
-    inherit (gnome3) defaultIconTheme;
-    zip = zip.override { enableNLS = false; };
-    bluez5 = bluez5_28;
-    poppler = poppler_0_61;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        freefont_ttf xorg.fontmiscmisc
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-    icu = icu58;
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    stdenv = overrideCC stdenv gcc5;
-  });
+  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
+    { libreoffice = callPackage ../applications/office/libreoffice {
+      inherit (perlPackages) ArchiveZip CompressZlib;
+      inherit (gnome2) GConf ORBit2 gnome_vfs;
+      inherit (gnome3) defaultIconTheme;
+      zip = zip.override { enableNLS = false; };
+      bluez5 = bluez5_28;
+      fontsConf = makeFontsConf {
+        fontDirectories = [
+          carlito dejavu_fonts
+          freefont_ttf xorg.fontmiscmisc
+          liberation_ttf_v1_binary
+          liberation_ttf_v2_binary
+        ];
+      };
+      clucene_core = clucene_core_2;
+      lcms = lcms2;
+      harfbuzz = harfbuzz.override {
+        withIcu = true; withGraphite2 = true;
+      };
+      # checking whether g++ supports C++14 or C++11... configure: error: no
+      stdenv = overrideCC stdenv gcc5;
+  };});
 
+  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
+    { libreoffice = callPackage ../applications/office/libreoffice/still.nix {
+      inherit (perlPackages) ArchiveZip CompressZlib;
+      inherit (gnome2) GConf ORBit2 gnome_vfs;
+      inherit (gnome3) defaultIconTheme;
+      zip = zip.override { enableNLS = false; };
+      bluez5 = bluez5_28;
+      poppler = poppler_0_61;
+      fontsConf = makeFontsConf {
+        fontDirectories = [
+          freefont_ttf xorg.fontmiscmisc
+        ];
+      };
+      clucene_core = clucene_core_2;
+      lcms = lcms2;
+      harfbuzz = harfbuzz.override {
+        withIcu = true; withGraphite2 = true;
+      };
+      icu = icu58;
+      # checking whether g++ supports C++14 or C++11... configure: error: no
+      stdenv = overrideCC stdenv gcc5;
+  };});
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
     inherit (gnome3) libpeas gsettings-desktop-schemas dconf;

From b71ffc1b25b46297f1e52fd0c0ac491d296160f2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 23 Mar 2018 23:56:45 +0100
Subject: [PATCH 2170/2266] qpid-cpp: fix build

The compilation broke due to the flag `-Werror=int-in-bool-context`
which caused several compilation errors with GCC v7. Disabling this
warning manually with `-Wno-error` in `NIX_CFLAGS_COMPILE` should be
fine.

This package experienced several radical changes as the entire python
build in `$src/management/python` was broken since the given Python
interpreter missed several needed modules (including
`pythonPackages.qpid-python`). As the CMake build tried to invoke the
affected `setup.py` manually and patched the shebangs with `disutil` and
caused non-functional executables, I split the package up into two
parts, the actual `qpid-cpp` lib and the Python module that will be
composed using `buildEnv`.

Furthermore I added myself as maintainer for the package as the diff
became quite huge and we should have more folks available to maintain
this.

See https://hydra.nixos.org/build/71519082/log
See tickets #36453 and #31747
---
 pkgs/servers/amqp/qpid-cpp/default.nix | 56 +++++++++++++++++---------
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index ea2c0325148..a838fa3b904 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }:
+{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
 
-stdenv.mkDerivation rec {
+let
   name = "qpid-cpp-${version}";
-
   version = "1.37.0";
 
   src = fetchurl {
@@ -10,24 +9,45 @@ stdenv.mkDerivation rec {
     sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
   };
 
-  buildInputs = [ cmake python2 boost libuuid ruby ];
-
-  # the subdir managementgen wants to install python stuff in ${python} and
-  # the installation tries to create some folders in /var
-  patchPhase = ''
-    sed -i '/managementgen/d' CMakeLists.txt
-    sed -i '/ENV/d' src/CMakeLists.txt
-  '';
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://qpid.apache.org;
     repositories.git = git://git.apache.org/qpid.git;
     repositories.svn = http://svn.apache.org/repos/asf/qpid;
     description = "An AMQP message broker and a C++ messaging API";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.cpages ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cpages ma27 ];
   };
+
+  qpid-cpp = stdenv.mkDerivation {
+    inherit src meta name;
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ boost libuuid ruby python2 ];
+
+    # the subdir managementgen wants to install python stuff in ${python} and
+    # the installation tries to create some folders in /var
+    postPatch = ''
+      sed -i '/managementgen/d' CMakeLists.txt
+      sed -i '/ENV/d' src/CMakeLists.txt
+      sed -i '/management/d' CMakeLists.txt
+    '';
+
+    NIX_CFLAGS_COMPILE = [
+      "-Wno-error=deprecated-declarations"
+      "-Wno-error=unused-function"
+      "-Wno-error=int-in-bool-context"
+    ];
+  };
+
+  python-frontend = buildPythonPackage {
+    inherit name meta src;
+
+    sourceRoot = "${name}/management/python";
+
+    propagatedBuildInputs = [ qpid-python ];
+  };
+in buildEnv {
+  name = "${name}-env";
+  paths = [ qpid-cpp python-frontend ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b4215a31ff..be6957c7a57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12716,6 +12716,7 @@ with pkgs;
 
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
     boost = boost155;
+    inherit (pythonPackages) buildPythonPackage qpid-python;
   };
 
   quagga = callPackage ../servers/quagga { };

From c787555b94329ded65ef274e6763b616a59c77fc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Mar 2018 13:05:40 -0500
Subject: [PATCH 2171/2266] firmwareLinuxNonfree: 2018-01-04 -> 2018-03-20

---
 .../linux/firmware/firmware-linux-nonfree/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index acdba5987bb..dc2a5278fdc 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2018-01-04-${src.iwlRev}";
+  version = "2018-03-20-${src.iwlRev}";
 
   # The src runCommand automates the process of building a merged repository of both
   #
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
 
   src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
     shallowSince = "2017-10-01";
-    baseRev = "65b1c68c63f974d72610db38dfae49861117cae2";
-    iwlRev = "iwlwifi-fw-2017-11-15";
+    baseRev = "44476f2465dac9c22bce90da66e86b2b56ba34f0";
+    iwlRev = "iwlwifi-fw-2018-03-02";
 
     # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
     # randomly mutate the hash to break out of fixed hash, when updating
-    outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz";
+    outputHash = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma";
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";

From 82f626702314928c9c8f4ea309430e3aa0680d57 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 26 Mar 2018 14:03:18 +0200
Subject: [PATCH 2172/2266] treewide: remove placeholder usage

see https://github.com/NixOS/nixpkgs/commit/2abac54c033778104533a269aaa08a1e75f677ad
---
 pkgs/applications/backup/deja-dup/default.nix       |  2 +-
 pkgs/desktops/gnome-3/apps/file-roller/default.nix  |  2 +-
 .../gnome-3/apps/gnome-characters/default.nix       |  2 +-
 .../gnome-3/core/evolution-data-server/default.nix  |  1 -
 .../gnome-3/core/gnome-settings-daemon/default.nix  |  2 +-
 pkgs/desktops/gnome-3/core/libgee/default.nix       |  7 ++-----
 .../core/libgee/fix_introspection_paths.patch       | 13 +++++++++++++
 pkgs/desktops/gnome-3/core/totem/default.nix        |  2 +-
 .../libraries/glib-networking/default.nix           |  2 +-
 pkgs/development/libraries/gvfs/default.nix         |  6 +++---
 pkgs/development/libraries/libwnck/3.x.nix          |  4 ++--
 pkgs/development/libraries/spice-gtk/default.nix    |  2 +-
 pkgs/os-specific/linux/dbus-broker/default.nix      |  4 ++--
 pkgs/tools/misc/colord/default.nix                  | 10 +++++-----
 14 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index 1ea4b4d2750..ef7aa96beb0 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ duplicity ];
 
-  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
 
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index a9148fa52db..80f2a825c12 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
 
-  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
 
   postPatch = ''
     chmod +x postinstall.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 7ca25848374..1587fec2c69 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
 
   mesonFlags = [
-    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+    "-Ddbus_service_dir=share/dbus-1/services"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 350c29fa907..8abb51b56e7 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     "-DENABLE_VALA_BINDINGS=ON"
     "-DENABLE_INTROSPECTION=ON"
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
-    "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
   ];
 
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 99b66fc1fe7..2a59d39e8cf 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dudev_dir=${placeholder "out"}/lib/udev"
+    "-Dudev_dir=lib/udev"
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index a65d0f401f0..a5ce9ee5e10 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -6,8 +6,6 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  outputs = [ "out" "dev" ];
-
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
@@ -15,12 +13,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  patches = [ ./fix_introspection_paths.patch ];
+
   nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
   buildInputs = [ glib ];
 
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 00000000000..67003f45164
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 49bd43e6195..b4c15b5dce2 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ];
+  mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 2e0e8cbb910..51ee5487f5f 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
+  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules";
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index b0b2d21e2bd..436cf56dc13 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
     ]);
 
   mesonFlags = [
-    "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
-    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
-    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+    "-Dgio_module_dir=lib/gio/modules"
+    "-Dsystemduserunitdir=lib/systemd/user"
+    "-Ddbus_service_dir=share/dbus-1/services"
     "-Dtmpfilesdir=no"
   ] ++ stdenv.lib.optionals (!gnomeSupport) [
     "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index f2d05d14d69..937fa28b902 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{
   nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
   propagatedBuildInputs = [ libX11 gtk3 ];
 
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "lib/girepository-1.0";
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f9b3de36b2c..4fae3696c63 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
 
-  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
+  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions";
 
   configureFlags = [
     "--with-gtk3"
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 5d0728b7e24..67e4df3d6f9 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dbus glib linuxHeaders systemd ];
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
 
   postInstall = ''
     install -Dm644 ../README $out/share/doc/dbus-broker/README
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 043ea44bb8c..9b633014009 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
-  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
-  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
-  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
+  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "lib/tmpfiles.d";
+  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "share/bash-completion/completions";
+  PKG_CONFIG_UDEV_UDEVDIR = "lib/udev";
 
   postFixup = ''
     wrapProgram "$out/libexec/colord-session" \

From fc58ab2ff23939ae9fbc99b11ea3a758e95ae003 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Mar 2018 11:29:24 +0200
Subject: [PATCH 2173/2266] LTS Haskell 11.2

This update was generated by hackage2nix v2.9.2-2-gebc40be from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/0200fecf27c208e0b66af88ea86728fdb295499d.
---
 .../configuration-hackage2nix.yaml            |  180 +-
 .../haskell-modules/hackage-packages.nix      | 2264 +++--------------
 2 files changed, 496 insertions(+), 1948 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2f4587a6593..ae79162e29b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,22 +38,22 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.1
+  # LTS Haskell 11.2
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
   - accelerate ==1.1.1.0
-  - accelerate-arithmetic ==1.0
+  - accelerate-arithmetic ==1.0.0.1
   - accelerate-bignum ==0.1.0.0
   - accelerate-blas ==0.1.0.1
   - accelerate-fft ==1.1.0.0
-  - accelerate-fftw ==1.0
-  - accelerate-fourier ==1.0.0.4
+  - accelerate-fftw ==1.0.0.1
+  - accelerate-fourier ==1.0.0.5
   - accelerate-io ==1.0.0.1
   - accelerate-llvm ==1.1.0.0
   - accelerate-llvm-native ==1.1.0.1
   - accelerate-llvm-ptx ==1.1.0.1
-  - accelerate-utility ==1.0
+  - accelerate-utility ==1.0.0.1
   - accuerr ==0.2.0.2
   - ace ==0.6
   - action-permutations ==0.0.0.1
@@ -235,7 +235,7 @@ default-package-overrides:
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
   - buchhaltung ==0.0.7
-  - buffer-builder ==0.2.4.4
+  - buffer-builder ==0.2.4.5
   - buffer-pipe ==0.0
   - butcher ==1.3.0.0
   - bv ==0.5
@@ -252,7 +252,7 @@ default-package-overrides:
   - bytestring-tree-builder ==0.2.7.1
   - bytestring-trie ==0.2.4.1
   - bzlib ==0.5.0.5
-  - bzlib-conduit ==0.3.0
+  - bzlib-conduit ==0.3.0.1
   - c2hs ==0.28.3
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
@@ -275,7 +275,7 @@ default-package-overrides:
   - cassava-records ==0.1.0.4
   - cassette ==0.1.0
   - cast ==0.1.0.2
-  - cayley-client ==0.4.4
+  - cayley-client ==0.4.5
   - cereal ==0.5.5.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
@@ -303,6 +303,7 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
+  - cisco-spark-api ==0.1.0.2
   - clang-compilation-database ==0.1.0.1
   - classyplate ==0.3.0.2
   - classy-prelude ==1.4.0
@@ -351,7 +352,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0.1
+  - conduit ==1.3.0.2
   - conduit-algorithms ==0.0.8.0
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
@@ -429,12 +430,12 @@ default-package-overrides:
   - czipwith ==1.0.0.0
   - data-accessor ==0.2.2.7
   - data-accessor-mtl ==0.2.0.4
-  - data-accessor-template ==0.2.1.14
+  - data-accessor-template ==0.2.1.15
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
   - data-checked ==0.3
-  - data-clist ==0.1.2.0
+  - data-clist ==0.1.2.1
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
   - data-default-instances-containers ==0.0.1
@@ -442,7 +443,7 @@ default-package-overrides:
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==2.0.1.0
   - data-diverse-lens ==2.1.0.0
-  - datadog ==0.2.0.0
+  - datadog ==0.2.2.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
   - data-fix ==0.2.0
@@ -467,8 +468,9 @@ default-package-overrides:
   - dbcleaner ==0.1.3
   - dbus ==0.10.15
   - debian-build ==0.10.1.0
-  - debug ==0.1
+  - debug ==0.1.1
   - Decimal ==0.5.1
+  - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
   - dejafu ==1.3.2.0
   - dependent-map ==0.2.4.0
@@ -478,6 +480,7 @@ default-package-overrides:
   - deriving-compat ==0.4.1
   - descriptive ==0.9.4
   - dhall ==1.11.1
+  - dhall-json ==1.0.13
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
@@ -487,7 +490,7 @@ default-package-overrides:
   - dimensional ==1.1
   - directory-tree ==0.12.1
   - direct-rocksdb ==0.0.3
-  - direct-sqlite ==2.3.22
+  - direct-sqlite ==2.3.23
   - discount ==0.1.1
   - discrimination ==0.3
   - disk-free-space ==0.1.0.1
@@ -516,7 +519,7 @@ default-package-overrides:
   - doctemplates ==0.2.2.1
   - doctest ==0.13.0
   - doctest-discover ==0.1.0.7
-  - doctest-driver-gen ==0.2.0.0
+  - doctest-driver-gen ==0.2.0.1
   - do-list ==1.0.1
   - dom-parser ==3.0.0
   - dotenv ==0.5.2.4
@@ -544,7 +547,7 @@ default-package-overrides:
   - editor-open ==0.6.0.0
   - either ==5
   - either-unwrap ==1.1
-  - ekg ==0.4.0.14
+  - ekg ==0.4.0.15
   - ekg-core ==0.1.1.4
   - ekg-json ==0.1.0.6
   - ekg-statsd ==0.2.2.0
@@ -558,7 +561,7 @@ default-package-overrides:
   - email-validate ==2.3.2.5
   - enclosed-exceptions ==1.0.2
   - entropy ==0.3.8
-  - enummapset ==0.5.2.1
+  - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
   - envelope ==0.2.2.0
   - envparse ==0.4
@@ -603,7 +606,7 @@ default-package-overrides:
   - extensible ==0.4.8
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.4
+  - extra ==1.6.5
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - fail ==4.9.0.0
@@ -643,7 +646,7 @@ default-package-overrides:
   - flexible-defaults ==0.0.1.2
   - FloatingHex ==0.4
   - floatshow ==0.2.4
-  - flow ==1.0.11
+  - flow ==1.0.12
   - fmlist ==0.9.2
   - fmt ==0.5.0.0
   - fn ==0.3.0.2
@@ -659,7 +662,7 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.3.1
+  - formatting ==6.3.2
   - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
@@ -714,7 +717,7 @@ default-package-overrides:
   - genvalidity-unordered-containers ==0.1.0.0
   - genvalidity-uuid ==0.0.0.0
   - genvalidity-vector ==0.1.0.0
-  - getopt-generics ==0.13.0.1
+  - getopt-generics ==0.13.0.2
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-events ==0.7.2
@@ -725,7 +728,7 @@ default-package-overrides:
   - ghcjs-perch ==0.3.3.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1
+  - ghc-prof ==1.4.1.1
   - ghc-syb-utils ==0.2.3.3
   - ghc-tcplugins-extra ==0.2.4
   - ghc-typelits-extra ==0.2.4
@@ -740,14 +743,14 @@ default-package-overrides:
   - ginger ==0.7.3.0
   - git ==0.2.1
   - github ==0.19
-  - github-release ==1.1.5
+  - github-release ==1.1.6
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
   - github-webhooks ==0.9.1
   - gitrev ==1.3.1
   - gl ==0.8.0
-  - glabrous ==0.3.4
+  - glabrous ==0.3.5
   - glaze ==0.3.0.1
   - glazier ==0.11.0.1
   - glazier-pipes ==0.1.5.1
@@ -761,8 +764,8 @@ default-package-overrides:
   - gloss-raster ==1.11.1.1
   - gloss-raster-accelerate ==2.0.0.0
   - gloss-rendering ==1.11.1.1
-  - GLURaw ==2.0.0.3
-  - GLUT ==2.7.0.12
+  - GLURaw ==2.0.0.4
+  - GLUT ==2.7.0.13
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.5.1
   - goggles ==0.3.2
@@ -793,6 +796,7 @@ default-package-overrides:
   - haddock-library ==1.4.5
   - hailgun ==0.4.1.6
   - hailgun-simple ==0.1.0.0
+  - hakyll ==4.12.0.1
   - half ==0.2.2.3
   - hamilton ==0.1.0.2
   - HandsomeSoup ==0.4.2
@@ -807,7 +811,7 @@ default-package-overrides:
   - hashable-time ==0.2.0.1
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
-  - hashtables ==1.2.2.1
+  - hashtables ==1.2.3.0
   - haskeline ==0.7.4.2
   - haskell-gi ==0.21.0
   - haskell-gi-base ==0.21.0
@@ -837,6 +841,7 @@ default-package-overrides:
   - hasql-pool ==0.4.3
   - hasql-transaction ==0.6
   - hastache ==0.6.1
+  - hasty-hamiltonian ==1.3.2
   - HaTeX ==3.18.0.0
   - haxl ==0.5.1.0
   - HaXml ==1.25.4
@@ -910,7 +915,7 @@ default-package-overrides:
   - HPDF ==1.4.10
   - hpio ==0.9.0.5
   - hpp ==0.5.1
-  - hpqtypes ==1.5.1.1
+  - hpqtypes ==1.5.2.0
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
@@ -958,7 +963,7 @@ default-package-overrides:
   - hsshellscript ==3.4.5
   - hstatistics ==0.3
   - hstatsd ==0.1
-  - HStringTemplate ==0.8.6
+  - HStringTemplate ==0.8.7
   - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
@@ -987,7 +992,7 @@ default-package-overrides:
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==1.1.0.2
+  - hunit-dejafu ==1.1.0.3
   - hvect ==0.4.0.0
   - hw-balancedparens ==0.2.0.1
   - hw-bits ==0.7.0.2
@@ -995,8 +1000,8 @@ default-package-overrides:
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
-  - hw-fingertree ==0.1.0.0
-  - hw-fingertree-strict ==0.1.0.1
+  - hw-fingertree ==0.1.0.1
+  - hw-fingertree-strict ==0.1.0.2
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.2
   - hw-int ==0.0.0.3
@@ -1074,8 +1079,8 @@ default-package-overrides:
   - ip ==1.1.2
   - ip6addr ==0.5.3
   - iproute ==1.7.3
-  - IPv6Addr ==1.0.1
-  - IPv6DB ==0.2.5
+  - IPv6Addr ==1.0.2
+  - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
   - irc-client ==1.1.0.2
@@ -1101,7 +1106,7 @@ default-package-overrides:
   - jose-jwt ==0.7.8
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
-  - json ==0.9.1
+  - json ==0.9.2
   - json-autotype ==1.0.18
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.3
@@ -1128,7 +1133,7 @@ default-package-overrides:
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.1
+  - lackey ==1.0.2
   - lambdabot-core ==5.1.0.1
   - lambdabot-irc-plugins ==5.1.0.1
   - lame ==0.1.1
@@ -1143,7 +1148,7 @@ default-package-overrides:
   - language-javascript ==0.6.0.11
   - lapack-carray ==0.0.1
   - lapack-ffi ==0.0.1
-  - lapack-ffi-tools ==0.1
+  - lapack-ffi-tools ==0.1.0.1
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - latex ==0.1.0.3
@@ -1152,7 +1157,7 @@ default-package-overrides:
   - lca ==0.3.1
   - leancheck ==0.7.0
   - leapseconds-announced ==2017.1.0.1
-  - lens ==4.16
+  - lens ==4.16.1
   - lens-accelerate ==0.1.0.0
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1189,7 +1194,7 @@ default-package-overrides:
   - List ==0.6.2
   - ListLike ==4.6
   - listsafe ==0.1.0.1
-  - list-t ==1.0.0.1
+  - list-t ==1.0.1
   - llvm-hs ==5.1.3
   - llvm-hs-pure ==5.1.2
   - lmdb ==0.2.5
@@ -1202,10 +1207,10 @@ default-package-overrides:
   - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.4
+  - logging-effect ==1.2.5
   - logging-effect-extra ==1.2.2
   - logging-effect-extra-file ==1.1.2
-  - logging-effect-extra-handler ==1.1.3
+  - logging-effect-extra-handler ==1.1.4
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
@@ -1234,7 +1239,7 @@ default-package-overrides:
   - markov-chain ==0.0.3.4
   - markup ==4.0.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.1.2.0
+  - massiv ==0.1.4.0
   - massiv-io ==0.1.1.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1287,7 +1292,7 @@ default-package-overrides:
   - mmark ==0.0.5.6
   - mmark-cli ==0.0.3.0
   - mmark-ext ==0.2.0.0
-  - mmorph ==1.1.1
+  - mmorph ==1.1.2
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
   - model ==0.4.4
@@ -1319,7 +1324,7 @@ default-package-overrides:
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
   - MonadRandom ==0.5.1
-  - monad-recorder ==0.1.0
+  - monad-recorder ==0.1.1
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
   - monads-tf ==0.1.0.3
@@ -1333,7 +1338,7 @@ default-package-overrides:
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.16
+  - morte ==1.6.18
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.2
@@ -1350,11 +1355,11 @@ default-package-overrides:
   - mwc-probability ==2.0.2
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
-  - mysql ==0.1.4
+  - mysql ==0.1.5
   - mysql-haskell ==0.8.3.0
   - mysql-haskell-nem ==0.1.0.0
   - mysql-haskell-openssl ==0.8.3.0
-  - mysql-simple ==0.4.4
+  - mysql-simple ==0.4.5
   - nagios-check ==0.3.2
   - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
@@ -1391,7 +1396,7 @@ default-package-overrides:
   - network-transport-tests ==0.2.4.2
   - network-uri ==2.6.1.0
   - newtype ==0.2
-  - newtype-generics ==0.5.2.2
+  - newtype-generics ==0.5.3
   - next-ref ==0.1.0.2
   - nfc ==0.1.0
   - nicify-lib ==1.0.1
@@ -1431,11 +1436,11 @@ default-package-overrides:
   - online ==0.2.1.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.0.0
+  - opaleye ==0.6.1.0
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.1
-  - OpenGL ==3.0.2.0
+  - OpenGL ==3.0.2.1
   - OpenGLRaw ==3.2.7.0
   - openpgp-asciiarmor ==0.1
   - opensource ==0.1.0.0
@@ -1458,7 +1463,7 @@ default-package-overrides:
   - pagination ==0.2.1
   - palette ==0.1.0.5
   - pandoc ==2.1.2
-  - pandoc-citeproc ==0.14.1.5
+  - pandoc-citeproc ==0.14.3
   - pandoc-types ==1.17.3.1
   - pango ==0.13.4.0
   - papillon ==0.1.0.5
@@ -1521,7 +1526,7 @@ default-package-overrides:
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
   - pipes-category ==0.3.0.0
-  - pipes-concurrency ==2.0.9
+  - pipes-concurrency ==2.0.10
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.13
   - pipes-fastx ==0.3.0.0
@@ -1557,7 +1562,7 @@ default-package-overrides:
   - postgresql-simple ==0.5.3.0
   - postgresql-simple-migration ==0.1.11.0
   - postgresql-simple-queue ==1.0.1
-  - postgresql-simple-url ==0.2.0.0
+  - postgresql-simple-url ==0.2.1.0
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.2
   - post-mess-age ==0.2.1.0
@@ -1582,7 +1587,7 @@ default-package-overrides:
   - pretty-show ==1.6.16
   - pretty-simple ==2.1.0.0
   - pretty-types ==0.2.3.1
-  - prim-array ==0.2.1
+  - prim-array ==0.2.2
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
   - prim-uniq ==0.1.0.1
@@ -1607,7 +1612,7 @@ default-package-overrides:
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-descriptors ==0.2.2.0
-  - proto-lens-optparse ==0.1.0.4
+  - proto-lens-optparse ==0.1.1.0
   - protolude ==0.2.1
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
@@ -1655,8 +1660,8 @@ default-package-overrides:
   - rank-product ==0.2.0.1
   - Rasterific ==0.7.2.3
   - rasterific-svg ==0.3.3.1
-  - ratel ==1.0.2
-  - ratel-wai ==1.0.1
+  - ratel ==1.0.3
+  - ratel-wai ==1.0.2
   - ratio-int ==0.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
@@ -1715,7 +1720,7 @@ default-package-overrides:
   - rest-types ==1.14.1.1
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.6.1
+  - retry ==0.7.6.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
@@ -1741,10 +1746,10 @@ default-package-overrides:
   - sampling ==0.3.2
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbp ==2.3.9
+  - sbp ==2.3.13
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1782,7 +1787,7 @@ default-package-overrides:
   - servant-docs ==0.11.2
   - servant-elm ==0.4.0.1
   - servant-exceptions ==0.1.1
-  - servant-foreign ==0.11
+  - servant-foreign ==0.11.1
   - servant-generic ==0.1.0.1
   - servant-github-webhook ==0.4.0.0
   - servant-js ==0.9.3.2
@@ -1816,7 +1821,7 @@ default-package-overrides:
   - shake-language-c ==0.11.0
   - shakespeare ==2.0.15
   - shelltestrunner ==1.9
-  - shelly ==1.7.1
+  - shelly ==1.7.2
   - shikensu ==0.3.8
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
@@ -1830,7 +1835,7 @@ default-package-overrides:
   - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
-  - singleton-bool ==0.1.3
+  - singleton-bool ==0.1.4
   - singleton-nats ==0.4.0.4
   - singletons ==2.3.1
   - siphash ==1.0.3
@@ -1845,7 +1850,7 @@ default-package-overrides:
   - smtp-mail ==0.1.4.6
   - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
-  - snap-core ==1.0.3.1
+  - snap-core ==1.0.3.2
   - snap-server ==1.0.3.3
   - snowflake ==0.1.1.1
   - soap ==0.2.3.6
@@ -1917,7 +1922,7 @@ default-package-overrides:
   - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
-  - streamly ==0.1.0
+  - streamly ==0.1.1
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
@@ -1934,7 +1939,7 @@ default-package-overrides:
   - stringsearch ==0.3.6.6
   - string-transform ==1.0.0
   - stripe-core ==2.3.0
-  - strive ==5.0.3
+  - strive ==5.0.4
   - structs ==0.1.1
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
@@ -1942,8 +1947,8 @@ default-package-overrides:
   - svg-builder ==0.1.0.2
   - svg-tree ==0.6.2.2
   - swagger ==0.3.0
-  - swagger2 ==2.2
-  - swish ==0.9.2.0
+  - swagger2 ==2.2.1
+  - swish ==0.9.2.1
   - syb ==0.7
   - syb-with-class ==0.6.1.8
   - symbol ==0.2.4
@@ -1966,12 +1971,12 @@ default-package-overrides:
   - tasty ==1.0.1.1
   - tasty-ant-xml ==1.1.3
   - tasty-auto ==0.2.0.0
-  - tasty-dejafu ==1.1.0.1
+  - tasty-dejafu ==1.1.0.2
   - tasty-discover ==4.2.0
   - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
-  - tasty-hspec ==1.1.3.3
+  - tasty-hspec ==1.1.4
   - tasty-html ==0.4.1.1
   - tasty-hunit ==0.10.0.1
   - tasty-kat ==0.0.3
@@ -2037,7 +2042,7 @@ default-package-overrides:
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-editors ==0.5.6
-  - threepenny-gui ==0.8.2.2
+  - threepenny-gui ==0.8.2.3
   - threepenny-gui-flexbox ==0.4.2
   - th-reify-compat ==0.0.1.3
   - th-reify-many ==0.1.8
@@ -2095,13 +2100,13 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.6
+  - turtle ==1.5.7
   - turtle-options ==0.1.0.4
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
   - type-combinators-singletons ==0.2.1.0
   - TypeCompose ==0.9.12
-  - typed-process ==0.2.1.0
+  - typed-process ==0.2.2.0
   - type-fun ==0.1.1
   - type-hint ==0.1
   - type-level-integers ==0.0.1
@@ -2112,7 +2117,7 @@ default-package-overrides:
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
-  - tz ==0.1.3.0
+  - tz ==0.1.3.1
   - tzdata ==0.1.20180122.0
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
@@ -2131,8 +2136,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - unique ==0
   - Unique ==0.4.7.2
+  - unique ==0
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2145,7 +2150,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.5.0
+  - unliftio ==0.2.6.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2156,7 +2161,7 @@ default-package-overrides:
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
   - urlpath ==8.0.1
-  - userid ==0.1.3.1
+  - userid ==0.1.3.2
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
@@ -2196,7 +2201,7 @@ default-package-overrides:
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.3.0
   - verbosity ==0.2.3.0
-  - versions ==3.3.1
+  - versions ==3.3.2
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.3
   - vinyl ==0.7.0
@@ -2205,10 +2210,10 @@ default-package-overrides:
   - vivid-supercollider ==0.3.0.0
   - void ==0.7.2
   - vty ==5.20
-  - wai ==3.2.1.1
-  - wai-app-static ==3.1.6.1
+  - wai ==3.2.1.2
+  - wai-app-static ==3.1.6.2
   - wai-cli ==0.1.1
-  - wai-conduit ==3.0.0.3
+  - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.22.0
@@ -2231,8 +2236,8 @@ default-package-overrides:
   - wai-session-postgresql ==0.2.1.2
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
-  - wai-websockets ==3.0.1.1
-  - warp ==3.2.18.1
+  - wai-websockets ==3.0.1.2
+  - warp ==3.2.18.2
   - warp-tls ==3.2.4.2
   - wave ==0.1.5
   - wavefront ==0.7.1.2
@@ -2240,7 +2245,7 @@ default-package-overrides:
   - webdriver-angular ==0.1.11
   - webpage ==0.0.5
   - web-plugins ==0.2.9
-  - web-routes ==0.27.14
+  - web-routes ==0.27.14.2
   - web-routes-boomerang ==0.28.4.2
   - web-routes-happstack ==0.23.11
   - web-routes-hsp ==0.24.6.1
@@ -2285,7 +2290,7 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
-  - wuss ==1.1.6
+  - wuss ==1.1.8
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2305,7 +2310,7 @@ default-package-overrides:
   - xml-basic ==0.1.3
   - xml-conduit ==1.8.0
   - xml-conduit-writer ==0.1.1.2
-  - xmlgen ==0.6.2.1
+  - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0
   - xmlhtml ==0.2.5.2
   - xml-html-qq ==0.1.0.1
@@ -2340,6 +2345,7 @@ default-package-overrides:
   - yesod-form ==1.6.1
   - yesod-form-bootstrap4 ==0.1.0.2
   - yesod-gitrepo ==0.3.0
+  - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
   - yesod-paginator ==0.11.0
   - yesod-persistent ==1.6.0
@@ -2377,7 +2383,7 @@ default-package-overrides:
   - zlib-lens ==0.1.2.1
   - zot ==0.0.3
   - zstd ==0.1.0.0
-  - ztail ==1.2
+  - ztail ==1.2.0.1
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cfe1a0cca17..57840713aba 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6166,19 +6166,6 @@ self: {
      }) {};
 
   "GLURaw" = callPackage
-    ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
-     mkDerivation {
-       pname = "GLURaw";
-       version = "2.0.0.3";
-       sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q";
-       libraryHaskellDepends = [ base OpenGLRaw transformers ];
-       librarySystemDepends = [ libGL libGLU ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
-
-  "GLURaw_2_0_0_4" = callPackage
     ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -6189,28 +6176,9 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, OpenGL, StateVar
-     , transformers
-     }:
-     mkDerivation {
-       pname = "GLUT";
-       version = "2.7.0.12";
-       sha256 = "1dgix79r8jdp0b2ncx14v6abaqcanr3y91h1zr954vl3kyyidxb6";
-       isLibrary = true;
-       isExecutable = true;
-       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_13" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
      , transformers
      }:
@@ -6226,7 +6194,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
@@ -8667,26 +8634,6 @@ self: {
      }) {};
 
   "HStringTemplate" = callPackage
-    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
-     , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
-     , syb, template-haskell, text, time, void
-     }:
-     mkDerivation {
-       pname = "HStringTemplate";
-       version = "0.8.6";
-       sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh";
-       revision = "1";
-       editedCabalFile = "05j23rsll9xxj92gk1qvaksd9z985fpdmbp8mv73ywwjl29kfwyb";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers deepseq directory
-         filepath mtl old-locale parsec pretty syb template-haskell text
-         time void
-       ];
-       description = "StringTemplate implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HStringTemplate_0_8_7" = callPackage
     ({ mkDerivation, array, base, blaze-builder, bytestring, containers
      , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
      , semigroups, syb, template-haskell, text, time, void
@@ -8702,7 +8649,6 @@ self: {
        ];
        description = "StringTemplate implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HStringTemplateHelpers" = callPackage
@@ -10431,25 +10377,6 @@ self: {
      }) {};
 
   "IPv6Addr" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
-       version = "1.0.1";
-       sha256 = "01s2lml150mcb9qfaq0i19fx8ri19c0dba3rzl0q9w30kv8ykxyz";
-       libraryHaskellDepends = [
-         aeson attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       homepage = "https://github.com/MichelBoucey/IPv6Addr";
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_1_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -10466,40 +10393,9 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IPv6DB" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
-     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
-     , optparse-applicative, text, unordered-containers, vector, wai
-     , wai-logger, warp
-     }:
-     mkDerivation {
-       pname = "IPv6DB";
-       version = "0.2.5";
-       sha256 = "0n8998fkdp6p1gr5j7kg0xfkh88cxmqiwxzh75q0xmkasphx4yfq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
-         optparse-applicative text unordered-containers vector wai
-         wai-logger warp
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-types vector
-       ];
-       homepage = "http://ipv6db.cybervisible.com";
-       description = "A RESTful Web Service for IPv6-related data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "IPv6DB_0_2_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
      , optparse-applicative, text, unordered-containers, vector, wai
@@ -14015,23 +13911,6 @@ self: {
      }) {};
 
   "OpenGL" = callPackage
-    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
-     , OpenGLRaw, StateVar, text, transformers
-     }:
-     mkDerivation {
-       pname = "OpenGL";
-       version = "3.0.2.0";
-       sha256 = "1yqf8li6h2cwd7s3n99afmqyx628v9xkrf6jy8n4sqadf9cr9ags";
-       libraryHaskellDepends = [
-         base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
-         text transformers
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "OpenGL_3_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
      , OpenGLRaw, StateVar, text, transformers
      }:
@@ -14046,7 +13925,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -20434,25 +20312,6 @@ self: {
      }) {};
 
   "accelerate-arithmetic" = callPackage
-    ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "accelerate-arithmetic";
-       version = "1.0";
-       sha256 = "0gqclqxsa3vbv34h3sgbmhfnx646ipanhnf8xhq160w5ha0ng932";
-       libraryHaskellDepends = [
-         accelerate accelerate-utility base QuickCheck utility-ht
-       ];
-       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;
-     }) {};
-
-  "accelerate-arithmetic_1_0_0_1" = callPackage
     ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
      , utility-ht
      }:
@@ -20469,7 +20328,6 @@ self: {
        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;
      }) {};
 
   "accelerate-bignum" = callPackage
@@ -20482,8 +20340,8 @@ self: {
        pname = "accelerate-bignum";
        version = "0.1.0.0";
        sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w";
-       revision = "1";
-       editedCabalFile = "0gwfw6bzy00spi0nm82p63fjc7sigk733ysnla64znqilca8nrmv";
+       revision = "2";
+       editedCabalFile = "00s0n5jqahn15m8x81chavv8blzjjb8z6368pl3diaadd8bi8hsv";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
@@ -20671,22 +20529,6 @@ self: {
      }) {};
 
   "accelerate-fftw" = callPackage
-    ({ mkDerivation, accelerate, accelerate-io, base, carray, fft
-     , storable-complex
-     }:
-     mkDerivation {
-       pname = "accelerate-fftw";
-       version = "1.0";
-       sha256 = "0b4jr7v3jllvlis0f554l9289zm07ddjgp5q2rp5l47rmsmaak7z";
-       libraryHaskellDepends = [
-         accelerate accelerate-io base carray fft storable-complex
-       ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
-       description = "Accelerate frontend to the FFTW library (Fourier transform)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-fftw_1_0_0_1" = callPackage
     ({ mkDerivation, accelerate, accelerate-io, base, carray, fft
      , storable-complex
      }:
@@ -20700,36 +20542,9 @@ self: {
        homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic
-     , accelerate-llvm-native, accelerate-utility, base, containers
-     , criterion, QuickCheck, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "accelerate-fourier";
-       version = "1.0.0.4";
-       sha256 = "1263ximbciszb6cij232vxsxfj5rj7n77l88fd7vh6ayx7rrr45m";
-       libraryHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-utility base containers
-         QuickCheck transformers utility-ht
-       ];
-       testHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-utility base QuickCheck
-         utility-ht
-       ];
-       benchmarkHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-llvm-native
-         accelerate-utility base criterion utility-ht
-       ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
-       description = "Fast Fourier transform and convolution using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-fourier_1_0_0_5" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic
      , accelerate-llvm-native, accelerate-utility, base, containers
      , criterion, QuickCheck, transformers, utility-ht
@@ -20753,7 +20568,6 @@ self: {
        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;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -20784,6 +20598,8 @@ self: {
        pname = "accelerate-io";
        version = "1.0.0.1";
        sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm";
+       revision = "1";
+       editedCabalFile = "1qf7f1swy5h1fqaciw1swvwrvmqrcmi03v0vqsx6ccxf2zxcjlal";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
@@ -20894,18 +20710,6 @@ self: {
      }) {};
 
   "accelerate-utility" = callPackage
-    ({ mkDerivation, accelerate, base, utility-ht }:
-     mkDerivation {
-       pname = "accelerate-utility";
-       version = "1.0";
-       sha256 = "16ir7ra99dhk04sg7ap7wwsbazdnadsnkd0ggq60j5cr2jp7x6lk";
-       libraryHaskellDepends = [ accelerate base utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-utility/";
-       description = "Utility functions for the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-utility_1_0_0_1" = callPackage
     ({ mkDerivation, accelerate, base, utility-ht }:
      mkDerivation {
        pname = "accelerate-utility";
@@ -20915,7 +20719,6 @@ self: {
        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;
      }) {};
 
   "accentuateus" = callPackage
@@ -30208,8 +30011,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.7.1.2";
-       sha256 = "0v519jzz8sh851jp3rcbzgh5ylr8ggk993svh4w6y4224y6wfi28";
+       version = "2.8.0.0";
+       sha256 = "0wkfx3nk2v1wzmg3d6ghq0zkj85f6vr74vvvhc6mvwd5x0nya645";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -32236,6 +32039,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "backprop_0_1_4_0" = callPackage
+    ({ mkDerivation, base, bifunctors, criterion, deepseq, directory
+     , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive
+     , reflection, time, transformers, type-combinators, vector
+     }:
+     mkDerivation {
+       pname = "backprop";
+       version = "0.1.4.0";
+       sha256 = "0gshjm0xgzsgd3q0a5ahg3xyk50jfgq7c4rqs1jxq9nmd9m1pq5h";
+       libraryHaskellDepends = [
+         base deepseq microlens primitive reflection transformers
+         type-combinators vector
+       ];
+       benchmarkHaskellDepends = [
+         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
+         mwc-random time transformers vector
+       ];
+       homepage = "https://github.com/mstksg/backprop#readme";
+       description = "Heterogeneous automatic differentation (backpropagation)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "backtracking-exceptions" = callPackage
     ({ mkDerivation, base, either, free, kan-extensions, mtl
      , semigroupoids, semigroups, transformers
@@ -32995,6 +32821,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basen-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck }:
+     mkDerivation {
+       pname = "basen-bytestring";
+       version = "0.1.0.0";
+       sha256 = "0v2839zc5n58na1kb1q9qalcnjwriq5w9hk9qs7b9xh2jmwwldcz";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
+       homepage = "https://github.com/FilWisher/basen-bytestring#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
      mkDerivation {
@@ -35695,10 +35533,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, rank1dynamic }:
      mkDerivation {
        pname = "bindynamic";
-       version = "1.0.0.0";
-       sha256 = "0vi4wyxx4qvfrhir8p66h5laqq2m1q3dh3i0syjfd6vaxa9c7sgi";
-       revision = "1";
-       editedCabalFile = "1rd7l106zka0hndbixmr3wzdj8gx6vwhlaaxkn170kprf4xs3p6j";
+       version = "1.0.0.1";
+       sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        homepage = "https://github.com/lspitzner/bindynamic";
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
@@ -39300,31 +39136,6 @@ self: {
      }) {};
 
   "buffer-builder" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "buffer-builder";
-       version = "0.2.4.4";
-       sha256 = "1n1dvd1xqxi6aklrhnsmymmj7qxf7sfcigqs0j6a1137fzxvmh01";
-       libraryHaskellDepends = [
-         base bytestring mtl text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base bytestring criterion deepseq HTF
-         quickcheck-instances text vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring criterion deepseq http-types json-builder
-         text vector
-       ];
-       homepage = "https://github.com/chadaustin/buffer-builder";
-       description = "Library for efficiently building up buffers, one piece at a time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "buffer-builder_0_2_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
      , text, unordered-containers, vector
@@ -39347,7 +39158,6 @@ self: {
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -39398,8 +39208,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffon";
-       version = "0.1.0.0";
-       sha256 = "073a2gzazihqyki175xhb97szqyvv2ijjrh7byik25z1xlkn599d";
+       version = "0.1.0.1";
+       sha256 = "1v9kxm3yrw871567j8qza7gayllhsb77pxqriin4akvg77llz7l9";
        libraryHaskellDepends = [
          base monad-primitive mwc-random mwc-random-monad primitive
          transformers
@@ -40421,31 +40231,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
-     , data-default, hspec, mtl, random, resourcet
-     }:
-     mkDerivation {
-       pname = "bzlib-conduit";
-       version = "0.3.0";
-       sha256 = "11nz2lkrv39rb7ayhnqlpjrxsprnv92ygwwvgmp3i32l9fakwhpw";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bindings-DSL bytestring conduit data-default mtl resourcet
-       ];
-       librarySystemDepends = [ bzip2 ];
-       testHaskellDepends = [
-         base bindings-DSL bytestring conduit data-default hspec mtl random
-         resourcet
-       ];
-       benchmarkHaskellDepends = [
-         base bindings-DSL bytestring conduit data-default mtl resourcet
-       ];
-       homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
-       description = "Streaming compression/decompression via conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) bzip2;};
-
-  "bzlib-conduit_0_3_0_1" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
      , data-default-class, hspec, mtl, random, resourcet
      }:
@@ -40470,7 +40255,6 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -43551,27 +43335,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.4";
-       sha256 = "17463g65cylkjxpih414wfg0vqvxj81ylzp2hg04sa1h75zhdjkv";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -46198,17 +45961,18 @@ self: {
      }) {};
 
   "classy-miso" = callPackage
-    ({ mkDerivation, base, containers, lens, megaparsec, miso
-     , network-uri, rfc, url
+    ({ mkDerivation, base, containers, data-default, lens, megaparsec
+     , miso, network-uri, rfc, transformers, url
      }:
      mkDerivation {
        pname = "classy-miso";
-       version = "0.0.0.1";
-       sha256 = "07mcxpp0brh3yh7qhzmg7vvv0kgy2gwms8mzlgvbfb608ggwh32b";
+       version = "0.0.0.2";
+       sha256 = "12qz2s5qhmjryp5x06jcv2gl3ipjhw0knsn1qawl1kn278hpyvp9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers lens megaparsec miso network-uri rfc url
+         base containers data-default lens megaparsec miso network-uri rfc
+         transformers url
        ];
        executableHaskellDepends = [ base miso rfc ];
        testHaskellDepends = [ base miso rfc ];
@@ -50351,35 +50115,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, kan-extensions
-     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
-     , resourcet, safe, silently, split, text, transformers, unix
-     , unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.3.0.1";
-       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -50406,7 +50141,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -56619,21 +56353,6 @@ self: {
      }) {};
 
   "data-accessor-template" = callPackage
-    ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
-     }:
-     mkDerivation {
-       pname = "data-accessor-template";
-       version = "0.2.1.14";
-       sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4";
-       libraryHaskellDepends = [
-         base data-accessor template-haskell utility-ht
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
-       description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-accessor-template_0_2_1_15" = callPackage
     ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
      }:
      mkDerivation {
@@ -56646,7 +56365,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-accessor-transformers" = callPackage
@@ -56798,18 +56516,6 @@ self: {
      }) {};
 
   "data-clist" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "data-clist";
-       version = "0.1.2.0";
-       sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f";
-       libraryHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/sw17ch/data-clist";
-       description = "Simple functional ring type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-clist_0_1_2_1" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
@@ -56819,7 +56525,6 @@ self: {
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-concurrent-queue" = callPackage
@@ -58310,34 +58015,6 @@ self: {
      }) {};
 
   "datadog" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, buffer-builder
-     , bytestring, Cabal, dlist, exceptions, hspec, http-client
-     , http-client-tls, http-types, lens, lifted-base, monad-control
-     , network, old-locale, random, text, time, transformers-base
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "datadog";
-       version = "0.2.0.0";
-       sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9";
-       libraryHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring dlist http-client
-         http-client-tls http-types lens lifted-base monad-control network
-         old-locale text time transformers-base unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring Cabal dlist
-         exceptions hspec http-client http-client-tls http-types lens
-         lifted-base monad-control network old-locale random text time
-         transformers-base unordered-containers vector
-       ];
-       homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "datadog_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, auto-update, base, buffer-builder
      , bytestring, Cabal, dlist, exceptions, hspec, http-client
      , http-client-tls, http-types, lens, lifted-base, monad-control
@@ -59413,37 +59090,6 @@ self: {
      }) {};
 
   "debug" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, clock, containers
-     , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
-     , js-jquery, libgraph, monoidal-containers, open-browser
-     , prettyprinter, prettyprinter-compat-ansi-wl-pprint
-     , template-haskell, text, uniplate, unordered-containers, vector
-     , yaml
-     }:
-     mkDerivation {
-       pname = "debug";
-       version = "0.1";
-       sha256 = "05wnaz5p5szba0r6sqz5c0db63wpscmip635v1x35nv3crb2j1r0";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring clock containers deepseq directory extra
-         ghc-prim hashable Hoed js-jquery libgraph monoidal-containers
-         open-browser prettyprinter prettyprinter-compat-ansi-wl-pprint
-         template-haskell text uniplate unordered-containers vector
-       ];
-       executableHaskellDepends = [ aeson base directory filepath yaml ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory extra filepath text
-       ];
-       homepage = "https://github.com/ndmitchell/debug";
-       description = "Simple trace-based debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "debug_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, clock, containers
      , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
      , libgraph, open-browser, prettyprinter
@@ -60988,14 +60634,16 @@ self: {
 
   "dhall-lex" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
-     , hspec, hspec-dirstream
+     , hspec, hspec-dirstream, scientific
      }:
      mkDerivation {
        pname = "dhall-lex";
-       version = "0.1.0.1";
-       sha256 = "02g8si9cfhwqsr6c507yw7sydyg8ma645z9c3n0cap1wj8fa0r8p";
+       version = "0.2.0.0";
+       sha256 = "0yxffkmpkab7apvxj5i8a3x233smb5wps5j39h38d91v6kqf5yy2";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ array base bytestring deepseq ];
+       libraryHaskellDepends = [
+         array base bytestring deepseq scientific
+       ];
        libraryToolDepends = [ alex ];
        testHaskellDepends = [ base bytestring hspec hspec-dirstream ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
@@ -61039,6 +60687,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-to-cabal" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
+     , dhall, Diff, filepath, formatting, hashable
+     , insert-ordered-containers, optparse-applicative, prettyprinter
+     , tasty, tasty-golden, text, transformers, trifecta, vector
+     }:
+     mkDerivation {
+       pname = "dhall-to-cabal";
+       version = "1.0.0.1";
+       sha256 = "0qs00xhsk09azm7sqfihnwmapilmkybmcim1wzlw3h6y4jj6nmq9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers dhall formatting hashable
+         insert-ordered-containers text transformers trifecta vector
+       ];
+       executableHaskellDepends = [
+         base Cabal contravariant dhall hashable insert-ordered-containers
+         optparse-applicative prettyprinter text
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal Diff filepath tasty tasty-golden text
+       ];
+       homepage = "https://github.com/ocharles/dhall-to-cabal";
+       description = "Compile Dhall expressions to Cabal files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dhcp-lease-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty
      , tasty-hunit, text
@@ -62542,25 +62218,6 @@ self: {
      }) {};
 
   "direct-sqlite" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, directory
-     , HUnit, temporary, text
-     }:
-     mkDerivation {
-       pname = "direct-sqlite";
-       version = "2.3.22";
-       sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a";
-       revision = "1";
-       editedCabalFile = "0cfg6fjdl1p9lgsnc2b2lys9mcc30dvxr8a92q5nxpgc4mdkk5db";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring directory HUnit temporary text
-       ];
-       homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "direct-sqlite_2_3_23" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, directory
      , HUnit, semigroups, temporary, text
      }:
@@ -62575,7 +62232,6 @@ self: {
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "directed-cubical" = callPackage
@@ -64418,8 +64074,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
-       version = "0.2.0.0";
-       sha256 = "02irp8bwr8172m5ix6jgpbhz3nks5khq31v03b5xlrh58nk5hqaf";
+       version = "0.2.0.1";
+       sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base doctest ];
@@ -64431,12 +64087,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-driver-gen_0_2_0_1" = callPackage
+  "doctest-driver-gen_0_2_0_2" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
-       version = "0.2.0.1";
-       sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld";
+       version = "0.2.0.2";
+       sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base doctest ];
@@ -65281,8 +64937,8 @@ self: {
      }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.2.2";
-       sha256 = "1cw8jq1j2yirrk80rk2n1m17avxf3xqln96gnih8xzip248q9bjj";
+       version = "0.3";
+       sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        benchmarkHaskellDepends = [
          base conduit conduit-combinators exceptions gauge list-t ListT
@@ -66451,13 +66107,15 @@ self: {
      }) {};
 
   "easytest" = callPackage
-    ({ mkDerivation, async, base, containers, mtl, random, stm, text }:
+    ({ mkDerivation, async, base, call-stack, containers, mtl, random
+     , stm, text, transformers
+     }:
      mkDerivation {
        pname = "easytest";
-       version = "0.1";
-       sha256 = "0wjimph83n5fvqgh85ng255qgw3yvagvv7ky1a9lz2blhzb02hh7";
+       version = "0.1.1";
+       sha256 = "11pbc26s908vms9ldsm0wfa171g79b24kg9knaip0v7vdspcj74v";
        libraryHaskellDepends = [
-         async base containers mtl random stm text
+         async base call-stack containers mtl random stm text transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/joelburget/easytest";
@@ -67242,27 +66900,6 @@ self: {
      }) {};
 
   "ekg" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
-     , filepath, network, snap-core, snap-server, text, time
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg";
-       version = "0.4.0.14";
-       sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd";
-       revision = "3";
-       editedCabalFile = "1llpsbki0v9p0c820qwv6m4433wfrxfhv8yxrg2xyrrxr8g0p42a";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring ekg-core ekg-json filepath network snap-core
-         snap-server text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg";
-       description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg_0_4_0_15" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -67281,7 +66918,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -68822,18 +68458,6 @@ self: {
      }) {};
 
   "enummapset" = callPackage
-    ({ mkDerivation, base, containers, deepseq }:
-     mkDerivation {
-       pname = "enummapset";
-       version = "0.5.2.1";
-       sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
-       libraryHaskellDepends = [ base containers deepseq ];
-       homepage = "https://github.com/michalt/enummapset";
-       description = "IntMap and IntSet with Enum keys/elements";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "enummapset_0_5_2_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, semigroups }:
      mkDerivation {
        pname = "enummapset";
@@ -68843,7 +68467,6 @@ self: {
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapset-th" = callPackage
@@ -71567,23 +71190,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.4";
-       sha256 = "02i4wjp9wgnp2f89d7fj3jnc2pkkcnw068qh85sim3pfabz0a9hw";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       homepage = "https://github.com/ndmitchell/extra#readme";
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_5" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -71598,7 +71204,6 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -72028,8 +71633,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.3.3.2";
-       sha256 = "08szj3rli8vnzl34j4x6xcydhk3k1nm12ziwqrxffbnsrvzjslvi";
+       version = "0.3.3.3";
+       sha256 = "1wm4s2xx3r3bjrkby4dddkc274pqvaa3q94j14pj8hayja6hd6ci";
        setupHaskellDepends = [ ats-pkg base Cabal ];
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        librarySystemDepends = [ numbertheory ];
@@ -75166,21 +74771,6 @@ self: {
      }) {};
 
   "flow" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
-       version = "1.0.11";
-       sha256 = "11cgab1wyqdjzyx6ygh91yl03w70aivspmlavl4if6p9yr5z9rw7";
-       revision = "2";
-       editedCabalFile = "13gyzkk29qkq8pnfnxvq2ymag2r3f6h1hpxk7yhy1r3k9hmp5469";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       homepage = "https://github.com/tfausak/flow#readme";
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_12" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
@@ -75191,7 +74781,6 @@ self: {
        homepage = "https://github.com/tfausak/flow#readme";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -76335,23 +75924,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
-     , integer-gmp, old-locale, scientific, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.3.1";
-       sha256 = "0yfl3xb0dyig8imzxxaq2lh6gy3rn07c6zxncvmzjzlpzy6kqc2n";
-       libraryHaskellDepends = [
-         array base bytestring clock ghc-prim integer-gmp old-locale
-         scientific text time transformers
-       ];
-       testHaskellDepends = [ base hspec ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_2" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, semigroups, text, time
      , transformers
@@ -76367,7 +75939,6 @@ self: {
        testHaskellDepends = [ base hspec semigroups ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -77580,8 +77151,8 @@ self: {
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "frp-arduino";
-       version = "0.1.0.3";
-       sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5";
+       version = "0.1.1.0";
+       sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
@@ -80718,26 +80289,6 @@ self: {
      }) {};
 
   "getopt-generics" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, filepath
-     , generics-sop, hspec, QuickCheck, safe, silently, tagged
-     }:
-     mkDerivation {
-       pname = "getopt-generics";
-       version = "0.13.0.1";
-       sha256 = "10sfab5frm53bll8kh6bkwg0y0cv47740sxy6gsnd9fycvixf0k9";
-       libraryHaskellDepends = [
-         base base-compat base-orphans generics-sop tagged
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans filepath generics-sop hspec
-         QuickCheck safe silently tagged
-       ];
-       homepage = "https://github.com/soenkehahn/getopt-generics#readme";
-       description = "Create command line interfaces with ease";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "getopt-generics_0_13_0_2" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, filepath
      , generics-sop, hspec, QuickCheck, safe, silently, tagged
      }:
@@ -80755,7 +80306,6 @@ self: {
        homepage = "https://github.com/soenkehahn/getopt-generics#readme";
        description = "Create command line interfaces with ease";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getopt-simple" = callPackage
@@ -81488,28 +81038,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.1";
-       sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       homepage = "https://github.com/maoe/ghc-prof";
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -81529,7 +81057,6 @@ self: {
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -83850,27 +83377,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.1.5";
-       sha256 = "04248cgs4wi348c9v6qdn6yhyrg8mmdq75nib4rpr795sk1gvdfb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_1_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -83892,7 +83398,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -84401,27 +83906,6 @@ self: {
      }) {};
 
   "glabrous" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
-       version = "0.3.4";
-       sha256 = "00dwlxl05g2s6br0nya2ayp24yjmf8rg6y3yi6bnqs0a2fyyzq42";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       homepage = "https://github.com/MichelBoucey/glabrous";
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_0_3_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -84440,7 +83924,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/glabrous";
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -88444,8 +87927,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphite";
-       version = "0.9.6.0";
-       sha256 = "0qryrwsj4pwvk804hv0cqglk197y895xlhgf5mq9azsp7ll39w3v";
+       version = "0.9.8.0";
+       sha256 = "1ylpa2kkbdhfgiq7g1kdlvjzs2ln3ag8pssp0widzz1p0is8ldm1";
        libraryHaskellDepends = [
          base bytestring cassava containers deepseq graphviz hashable
          process QuickCheck random semigroups text unordered-containers
@@ -91273,22 +90756,20 @@ self: {
 
   "hackage-repo-tool" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , hackage-security, network, network-uri, optparse-applicative, tar
-     , time, unix, zlib
+     , hackage-security, network, network-uri, old-time
+     , optparse-applicative, tar, time, unix, zlib
      }:
      mkDerivation {
        pname = "hackage-repo-tool";
-       version = "0.1.1";
-       sha256 = "1x34f28wqa1v935d90fzhra2d1c5kj6nrp79iyp53kj2kmqw5xi3";
-       revision = "2";
-       editedCabalFile = "04mlgliz33sb9dwzayd858b42pa30a7wpcd9jgmk1kc59dlv1y38";
+       version = "0.1.1.1";
+       sha256 = "05r4i7zhwbsv9ci4yid57fnb5lkx254pch9arq5a11dvwsvdzvzw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal directory filepath hackage-security network
-         network-uri optparse-applicative tar time unix zlib
+         network-uri old-time optparse-applicative tar time unix zlib
        ];
-       homepage = "https://github.com/well-typed/hackage-security";
+       homepage = "https://github.com/haskell/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91323,6 +90804,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hackage-security_0_5_3_0" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, Cabal, containers, cryptohash-sha256, directory
+     , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec
+     , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, temporary, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security";
+       version = "0.5.3.0";
+       sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring Cabal
+         containers cryptohash-sha256 directory ed25519 filepath ghc-prim
+         mtl network network-uri parsec pretty tar template-haskell time
+         transformers zlib
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal containers network-uri QuickCheck tar tasty
+         tasty-hunit tasty-quickcheck temporary time zlib
+       ];
+       homepage = "https://github.com/haskell/hackage-security";
+       description = "Hackage security library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hackage-security-HTTP" = callPackage
     ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl
      , network, network-uri, zlib
@@ -92380,6 +91888,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_12_1_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , file-embed, filepath, fsnotify, http-conduit, http-types
+     , lrucache, mtl, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
+     , resourcet, scientific, tagsoup, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, time-locale-compat
+     , unordered-containers, utillinux, vector, wai, wai-app-static
+     , warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.12.1.0";
+       sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory file-embed filepath
+         fsnotify http-conduit http-types lrucache mtl network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-tdfa resourcet scientific tagsoup text time
+         time-locale-compat unordered-containers vector wai wai-app-static
+         warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base bytestring containers filepath QuickCheck tasty tasty-hunit
+         tasty-quickcheck text unordered-containers yaml
+       ];
+       testToolDepends = [ utillinux ];
+       homepage = "http://jaspervdj.be/hakyll";
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -94847,22 +94394,6 @@ self: {
      }) {};
 
   "hashtables" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
-     mkDerivation {
-       pname = "hashtables";
-       version = "1.2.2.1";
-       sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs";
-       revision = "1";
-       editedCabalFile = "0wcjkd8imgx3j4ygj3r2cdfzknk1bbq0745axy7kbm2sckz1xqcz";
-       libraryHaskellDepends = [
-         base ghc-prim hashable primitive vector
-       ];
-       homepage = "http://github.com/gregorycollins/hashtables";
-       description = "Mutable hash tables in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashtables_1_2_3_0" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
      mkDerivation {
        pname = "hashtables";
@@ -94874,7 +94405,6 @@ self: {
        homepage = "http://github.com/gregorycollins/hashtables";
        description = "Mutable hash tables in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashtables-plus" = callPackage
@@ -104298,16 +103828,16 @@ self: {
 
   "hlrdb" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite
-     , hashable, hedis, hlrdb-core, memory, random, store, time-exts
+     , hashable, hedis, hlrdb-core, memory, random, store, time
      , unordered-containers
      }:
      mkDerivation {
        pname = "hlrdb";
-       version = "0.1.0.0";
-       sha256 = "1kqm14kd5app34438b3w9h1nxr6fp1dvrf58xrbv2xn2y65jb5jc";
+       version = "0.2.0.0";
+       sha256 = "1x7vw2mcwd703dr5mjghsjd04yxwl6z7wzdysgk75i4l7f0lcqfq";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptonite hashable hedis
-         hlrdb-core memory random store time-exts unordered-containers
+         hlrdb-core memory random store time unordered-containers
        ];
        homepage = "https://github.com/identicalsnowflake/hlrdb";
        description = "High-level Redis Database";
@@ -104317,14 +103847,14 @@ self: {
 
   "hlrdb-core" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl
-     , profunctors, random, unordered-containers
+     , profunctors, random, time, unordered-containers
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.0.0";
-       sha256 = "1gy5sycr4han0i0lk8m3rl99pagd9slfry0b94c05cj6kai6c9ss";
+       version = "0.1.1.0";
+       sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i";
        libraryHaskellDepends = [
-         base bytestring hashable hedis lens mtl profunctors random
+         base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
        ];
        homepage = "https://github.com/identicalsnowflake/hlrdb-core";
@@ -104457,6 +103987,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-backprop_0_1_1_0" = callPackage
+    ({ mkDerivation, ANum, backprop, base, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
+     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
+     , vector, vector-sized
+     }:
+     mkDerivation {
+       pname = "hmatrix-backprop";
+       version = "0.1.1.0";
+       sha256 = "1q9vgyy8qiilsw5qix1c6489jyjiqgz2yf1ad0n4qqwm32dfqcz2";
+       libraryHaskellDepends = [
+         ANum backprop base finite-typelits ghc-typelits-knownnat
+         ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens
+         vector vector-sized
+       ];
+       testHaskellDepends = [
+         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
+         microlens microlens-platform vector-sized
+       ];
+       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
+       description = "hmatrix operations lifted for backprop";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -107234,37 +106789,6 @@ self: {
      }) {};
 
   "hpqtypes" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , data-default-class, exceptions, HUnit, lifted-base, monad-control
-     , mtl, postgresql, QuickCheck, random, resource-pool, scientific
-     , test-framework, test-framework-hunit, text, text-show, time
-     , transformers, transformers-base, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hpqtypes";
-       version = "1.5.1.1";
-       sha256 = "0nkrah6ny24qayr03dyar5yhb90k5as3fn19pzsp6df8gi6j375r";
-       revision = "1";
-       editedCabalFile = "0k255rbvzinwrav3k7f3n2hssiv9p3bb51fg4vp2mhnm9igfy5b9";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default-class exceptions
-         lifted-base monad-control mtl resource-pool text text-show time
-         transformers transformers-base vector
-       ];
-       librarySystemDepends = [ postgresql ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions HUnit lifted-base monad-control
-         mtl QuickCheck random scientific test-framework
-         test-framework-hunit text text-show time transformers-base
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/scrive/hpqtypes";
-       description = "Haskell bindings to libpqtypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) postgresql;};
-
-  "hpqtypes_1_5_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default-class, directory, exceptions, filepath, HUnit
      , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
@@ -113769,18 +113293,6 @@ self: {
      }) {};
 
   "hunit-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
-       version = "1.1.0.2";
-       sha256 = "1r6i135dj3kn2sx49asy2k0i88vfb13z7giyzj1qs8m8cfx2pi89";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hunit-dejafu_1_1_0_3" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
@@ -113790,7 +113302,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-gui" = callPackage
@@ -114242,23 +113753,6 @@ self: {
      }) {};
 
   "hw-fingertree" = callPackage
-    ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hw-fingertree";
-       version = "0.1.0.0";
-       sha256 = "0hh1f9m92s53254a2bk3h4i77girf8nni8rmyrd0ljramn4hiz55";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base deepseq HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       description = "Generic finger-tree structure, with example instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-fingertree_0_1_0_1" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
      , hw-hspec-hedgehog, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -114275,7 +113769,6 @@ self: {
        homepage = "https://github.com/haskell-works/hw-fingertree#readme";
        description = "Generic finger-tree structure, with example instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -114285,28 +113778,28 @@ self: {
      }:
      mkDerivation {
        pname = "hw-fingertree-strict";
-       version = "0.1.0.1";
-       sha256 = "18ki65cmbvbqj97y1v25sh2bvilkkg6q6pzzyprmgv24yscqkrp3";
+       version = "0.1.0.2";
+       sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
+       homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme";
        description = "Generic strict finger-tree structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-fingertree-strict_0_1_0_2" = callPackage
-    ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+  "hw-fingertree-strict_0_1_0_3" = callPackage
+    ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
+     , hw-hspec-hedgehog, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "hw-fingertree-strict";
-       version = "0.1.0.2";
-       sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.0.3";
+       sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm";
+       libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -122281,21 +121774,6 @@ self: {
      }) {};
 
   "json" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
-     , pretty, syb, text
-     }:
-     mkDerivation {
-       pname = "json";
-       version = "0.9.1";
-       sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn";
-       libraryHaskellDepends = [
-         array base bytestring containers mtl parsec pretty syb text
-       ];
-       description = "Support for serialising Haskell to and from JSON";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json_0_9_2" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
      , pretty, syb, text
      }:
@@ -122308,7 +121786,6 @@ self: {
        ];
        description = "Support for serialising Haskell to and from JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-api" = callPackage
@@ -122436,6 +121913,39 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "json-autotype_1_1_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, GenericPretty, hashable, lens, mtl
+     , optparse-applicative, pretty, process, QuickCheck, scientific
+     , smallcheck, text, uniplate, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "json-autotype";
+       version = "1.1.2";
+       sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers filepath GenericPretty hashable lens mtl
+         pretty process scientific text uniplate unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         lens mtl optparse-applicative pretty process scientific text
+         uniplate unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath GenericPretty
+         hashable lens mtl optparse-applicative pretty process QuickCheck
+         scientific smallcheck text uniplate unordered-containers vector
+       ];
+       homepage = "https://github.com/mgajda/json-autotype";
+       description = "Automatic type declaration for JSON input data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "json-b" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-nums, bytestring-trie
      , bytestringparser-temporary, containers, utf8-string
@@ -124892,14 +124402,14 @@ self: {
      , exceptions, fast-logger, filepath, http-client, lifted-base
      , MonadRandom, network, optparse-applicative, process, raaz, random
      , random-shuffle, readline, SafeSemaphore, secret-sharing, servant
-     , servant-client, servant-server, socks, split, stm, text, time
-     , token-bucket, transformers, unbounded-delays, unix, unix-compat
-     , utf8-string, wai, warp, zxcvbn-c
+     , servant-client, servant-server, socks, split, stm, text
+     , text-short, time, token-bucket, transformers, unbounded-delays
+     , unix, unix-compat, utf8-string, wai, warp, zxcvbn-c
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20170811";
-       sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py";
+       version = "0.20180326";
+       sha256 = "01kagnpliw0qmhhrx1lcaxdg41sq76km3c1gzk3b9siyqkszhq08";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -124908,8 +124418,8 @@ self: {
          http-client lifted-base MonadRandom network optparse-applicative
          process raaz random random-shuffle readline SafeSemaphore
          secret-sharing servant servant-client servant-server socks split
-         stm text time token-bucket transformers unbounded-delays unix
-         unix-compat utf8-string wai warp zxcvbn-c
+         stm text text-short time token-bucket transformers unbounded-delays
+         unix unix-compat utf8-string wai warp zxcvbn-c
        ];
        homepage = "https://keysafe.branchable.com/";
        description = "back up a secret key securely to the cloud";
@@ -125688,19 +125198,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
-       version = "1.0.1";
-       sha256 = "0vlic5ad1zdqhlg0jd3zgc65acq7270607blkf6qgm6bk2g3j1pr";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_2" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
@@ -125711,7 +125208,6 @@ self: {
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -127693,29 +127189,6 @@ self: {
      }) {inherit (pkgs) liblapack;};
 
   "lapack-ffi-tools" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, containers
-     , explicit-exception, filepath, non-empty, optparse-applicative
-     , parsec, pathtype, transformers, unordered-containers, utility-ht
-     , vector
-     }:
-     mkDerivation {
-       pname = "lapack-ffi-tools";
-       version = "0.1";
-       sha256 = "1x5sv2b4rkglqqgpl44mprwxkkycnv48d5s526m3wmvxzdgz7adz";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         base bytestring cassava containers explicit-exception filepath
-         non-empty optparse-applicative parsec pathtype transformers
-         unordered-containers utility-ht vector
-       ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
-       description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lapack-ffi-tools_0_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers
      , explicit-exception, filepath, non-empty, optparse-applicative
      , parsec, pathtype, transformers, unordered-containers, utility-ht
@@ -127736,7 +127209,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
        description = "Generator for Haskell interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "large-hashable" = callPackage
@@ -128732,49 +128204,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, call-stack, comonad, containers
-     , contravariant, criterion, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.16";
-       sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z";
-       revision = "4";
-       editedCabalFile = "18nipajdyqz5vpqx0mrl5c1a97jb8wm2skq57jashgygq5h8y7g4";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring call-stack comonad
-         containers contravariant distributive exceptions filepath free
-         ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids semigroups tagged template-haskell text
-         th-abstraction transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
-         simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_16_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -128813,7 +128242,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -129208,6 +128636,8 @@ self: {
        pname = "lenz-template";
        version = "0.2.0.0";
        sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
+       revision = "1";
+       editedCabalFile = "05rgdgqk2yb92wlfs13844bdh7a2k2rddnxf9fcnz1c3qq4wkyi5";
        libraryHaskellDepends = [
          base base-unicode-symbols containers lenz template-haskell
        ];
@@ -131624,24 +131054,6 @@ self: {
      }) {};
 
   "list-t" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
-     , mtl, mtl-prelude, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "list-t";
-       version = "1.0.0.1";
-       sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa";
-       libraryHaskellDepends = [
-         base base-prelude mmorph monad-control mtl transformers
-         transformers-base
-       ];
-       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
-       homepage = "https://github.com/nikita-volkov/list-t";
-       description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "list-t_1_0_1" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
      , mtl, mtl-prelude, transformers, transformers-base
      }:
@@ -131656,7 +131068,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -133176,29 +132587,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.2.4";
-       sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_2_5" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
@@ -133219,7 +132607,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -133262,25 +132649,6 @@ self: {
      }) {};
 
   "logging-effect-extra-handler" = callPackage
-    ({ mkDerivation, base, exceptions, logging-effect, time
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect-extra-handler";
-       version = "1.1.3";
-       sha256 = "0pxsnah1v2d0zk5x3w8whifb0f78shhn0kpg5iq00ggpwg6x686i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base exceptions logging-effect time wl-pprint-text
-       ];
-       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
-       description = "Handy logging handler combinators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-effect-extra-handler_1_1_4" = callPackage
     ({ mkDerivation, base, exceptions, logging-effect, time
      , wl-pprint-text
      }:
@@ -133297,7 +132665,6 @@ self: {
        homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -134716,8 +134083,8 @@ self: {
      }:
      mkDerivation {
        pname = "lz4-conduit";
-       version = "0.2";
-       sha256 = "18zl3cxa8f6n64p1iz9l834vkk93bjdb37h69jj5wdd4q6hc51km";
+       version = "0.3";
+       sha256 = "18yjrf9iw4bwq25x7fd95lf99qcqj9nm3hdq6lkgxc5plgy94nyf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136608,25 +135975,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, data-default, data-default-class, deepseq
-     , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.1.2.0";
-       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
-       libraryHaskellDepends = [
-         base data-default-class deepseq ghc-prim primitive vector
-       ];
-       testHaskellDepends = [
-         base data-default deepseq hspec QuickCheck safe-exceptions vector
-       ];
-       homepage = "https://github.com/lehins/massiv";
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_1_4_0" = callPackage
     ({ mkDerivation, base, data-default, data-default-class, deepseq
      , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
      }:
@@ -136643,7 +135991,6 @@ self: {
        homepage = "https://github.com/lehins/massiv";
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -139946,15 +139293,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_15_0_0" = callPackage
+  "miso_0_17_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.15.0.0";
-       sha256 = "1kkh71psj0acia9r1mzvp16lzmc6gsma81shp7bhfy35yhbvwsl4";
+       version = "0.17.0.0";
+       sha256 = "0vf6yd2yib2snxsvaw78c4nzk5pghi7mh8bkykgy8vpcllg204ym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140213,19 +139560,6 @@ self: {
      }) {};
 
   "mmorph" = callPackage
-    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
-     mkDerivation {
-       pname = "mmorph";
-       version = "1.1.1";
-       sha256 = "17hhfvdr2cclrhslsph3jaly7gfn7caajbzh7xr2prgvxmjhsdg3";
-       libraryHaskellDepends = [
-         base mtl transformers transformers-compat
-       ];
-       description = "Monad morphisms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmorph_1_1_2" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "mmorph";
@@ -140236,7 +139570,6 @@ self: {
        ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmtf" = callPackage
@@ -140856,6 +140189,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control-aligned_0_0_1_1" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control-aligned";
+       version = "0.0.1.1";
+       sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/athanclark/monad-control#readme";
+       description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-coroutine" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers
      , transformers-compat
@@ -141514,23 +140864,6 @@ self: {
      }) {};
 
   "monad-recorder" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "monad-recorder";
-       version = "0.1.0";
-       sha256 = "1n3bp3vian88b6wq2r3qybbnvnflphf1815g1qd6kb9r7d4z2g9i";
-       libraryHaskellDepends = [
-         base exceptions monad-control mtl transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "http://github.com/harendra-kumar/monad-recorder";
-       description = "Record and replay the results of monadic actions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-recorder_0_1_1" = callPackage
     ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
      , transformers, transformers-base
      }:
@@ -141545,7 +140878,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/monad-recorder";
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-resumption" = callPackage
@@ -142714,38 +142046,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, http-client, http-client-tls
-     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
-     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.16";
-       sha256 = "1k7j9dvl3m8l77r9m8d02nm9dxkr17y57d58x49icvk7bq0ij29x";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page optparse-applicative text text-format
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_18" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
      , http-client-tls, microlens, microlens-mtl, mtl
@@ -142776,7 +142076,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -145046,22 +144345,6 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
-     }:
-     mkDerivation {
-       pname = "mysql";
-       version = "0.1.4";
-       sha256 = "13k6vdmkdbhjlgfsjw6r2smrxhkbiqkw9rdnfx554lc843dpb1lv";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring containers ];
-       librarySystemDepends = [ mysql ];
-       testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/paul-rouse/mysql";
-       description = "A low-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mysql;};
-
-  "mysql_0_1_5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
      }:
      mkDerivation {
@@ -145075,7 +144358,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -145160,25 +144442,6 @@ self: {
      }) {};
 
   "mysql-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
-     , text, time
-     }:
-     mkDerivation {
-       pname = "mysql-simple";
-       version = "0.4.4";
-       sha256 = "1rrwhc9szdsn1wm5y510kyj0cfhavw01j61vywf96yw57132y75m";
-       libraryHaskellDepends = [
-         attoparsec base base16-bytestring blaze-builder blaze-textual
-         bytestring mysql old-locale pcre-light text time
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/paul-rouse/mysql-simple";
-       description = "A mid-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mysql-simple_0_4_5" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, hspec, mysql, old-locale
      , pcre-light, text, time
@@ -145195,7 +144458,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql-simple";
        description = "A mid-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-quasi" = callPackage
@@ -148097,22 +147359,6 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
-     , semigroups, transformers
-     }:
-     mkDerivation {
-       pname = "newtype-generics";
-       version = "0.5.2.2";
-       sha256 = "1hjw9w0hrjvf9akspgjcwidicviflf0ba3jg91dhg9n8cf9y82i9";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base hspec HUnit ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion semigroups ];
-       description = "A typeclass and set of functions for working with newtypes, with generics support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "newtype-generics_0_5_3" = callPackage
     ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups
      , transformers
      }:
@@ -148127,7 +147373,6 @@ self: {
        homepage = "http://github.com/sjakobi/bsb-http-chunked";
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -151199,35 +150444,6 @@ self: {
      }) {};
 
   "opaleye" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , case-insensitive, containers, contravariant, dotenv, hspec
-     , hspec-discover, multiset, postgresql-simple, pretty
-     , product-profunctors, profunctors, QuickCheck, semigroups, text
-     , time, time-locale-compat, transformers, uuid, void
-     }:
-     mkDerivation {
-       pname = "opaleye";
-       version = "0.6.0.0";
-       sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q";
-       revision = "2";
-       editedCabalFile = "1zhb7i4za87ixxwwh792drvydr0ln9krwkml1mmdz38a9s0zyhn6";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring case-insensitive
-         contravariant postgresql-simple pretty product-profunctors
-         profunctors semigroups text time time-locale-compat transformers
-         uuid void
-       ];
-       testHaskellDepends = [
-         aeson base containers contravariant dotenv hspec hspec-discover
-         multiset postgresql-simple product-profunctors profunctors
-         QuickCheck semigroups text time transformers
-       ];
-       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
-       description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye_0_6_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
@@ -151252,7 +150468,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -153726,41 +152941,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, 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.14.1.5";
-       sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       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 containers 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;
-     }) {};
-
-  "pandoc-citeproc_0_14_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
      , bytestring, Cabal, containers, data-default, directory, filepath
      , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec
@@ -153793,7 +152973,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
@@ -159253,20 +158432,6 @@ self: {
      }) {};
 
   "pipes-concurrency" = callPackage
-    ({ mkDerivation, async, base, contravariant, pipes, stm, void }:
-     mkDerivation {
-       pname = "pipes-concurrency";
-       version = "2.0.9";
-       sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4";
-       libraryHaskellDepends = [
-         async base contravariant pipes stm void
-       ];
-       testHaskellDepends = [ async base pipes stm ];
-       description = "Concurrency for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-concurrency_2_0_10" = callPackage
     ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
      , void
      }:
@@ -159280,7 +158445,6 @@ self: {
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -162509,28 +161673,6 @@ self: {
      }) {};
 
   "postgresql-simple-url" = callPackage
-    ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-url";
-       version = "0.2.0.0";
-       sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p";
-       revision = "1";
-       editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb";
-       libraryHaskellDepends = [
-         base network-uri postgresql-simple split
-       ];
-       testHaskellDepends = [
-         base postgresql-simple tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/futurice/postgresql-simple-url";
-       description = "Parse postgres:// url into ConnectInfo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "postgresql-simple-url_0_2_1_0" = callPackage
     ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
      , tasty-quickcheck
      }:
@@ -164064,18 +163206,6 @@ self: {
      }) {};
 
   "prim-array" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive }:
-     mkDerivation {
-       pname = "prim-array";
-       version = "0.2.1";
-       sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf";
-       libraryHaskellDepends = [ base ghc-prim primitive ];
-       homepage = "https://github.com/andrewthad/prim-array#readme";
-       description = "Primitive byte array with type variable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "prim-array_0_2_2" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, semigroups }:
      mkDerivation {
        pname = "prim-array";
@@ -164085,7 +163215,6 @@ self: {
        homepage = "https://github.com/andrewthad/prim-array#readme";
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-spoon" = callPackage
@@ -165639,20 +164768,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.0.4";
-       sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-optparse_0_1_1_0" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -165664,7 +164779,6 @@ self: {
        homepage = "https://github.com/google/proto-lens#readme";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -168096,15 +167210,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_4" = callPackage
+  "quickcheck-classes_0_4_5" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, tagged, transformers
      , vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.4";
-       sha256 = "0g4hjgjz1wpb8fwn70gd7di69mrn6z46q39g93z3w0cwydqlcgng";
+       version = "0.4.5";
+       sha256 = "0nbfizi0f7cacspv5w008gmmw0nvbjv6nafsxifiy7mqhdlv4qx5";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups tagged transformers
@@ -170080,25 +169194,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "1.0.2";
-       sha256 = "0mwgnz8s0xpyggdxpakij66fmkdhvc6ra00h451pwy3f3m3g6vpy";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base filepath hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
@@ -170118,26 +169213,9 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
-       version = "1.0.1";
-       sha256 = "190kgqhvda3r5gqk0j8pzr6d123fl77dv3i1csglq22yzrwynkv3";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       homepage = "https://github.com/tfausak/ratel-wai#readme";
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
      }:
@@ -170151,7 +169229,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel-wai#readme";
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rating-systems" = callPackage
@@ -174256,8 +173333,8 @@ self: {
        pname = "req-conduit";
        version = "1.0.0";
        sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx";
-       revision = "1";
-       editedCabalFile = "14m20b2i0kygminqw35y3wi1na7bfpkyg1yc03a48qy6rrdqgnc2";
+       revision = "2";
+       editedCabalFile = "1cbzvqfs8glr004viya4x3p08x8lmkrgwwxjy78s32xkf8b2xxpr";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -175059,27 +174136,6 @@ self: {
      }) {};
 
   "retry" = callPackage
-    ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
-     , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
-     , tasty-hunit, time, transformers
-     }:
-     mkDerivation {
-       pname = "retry";
-       version = "0.7.6.1";
-       sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82";
-       libraryHaskellDepends = [
-         base data-default-class exceptions ghc-prim random transformers
-       ];
-       testHaskellDepends = [
-         base data-default-class exceptions ghc-prim hedgehog HUnit mtl
-         random stm tasty tasty-hedgehog tasty-hunit time transformers
-       ];
-       homepage = "http://github.com/Soostone/retry";
-       description = "Retry combinators for monadic actions that may fail";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "retry_0_7_6_2" = callPackage
     ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
      , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
      , tasty-hunit, time, transformers
@@ -175098,7 +174154,6 @@ self: {
        homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retryer" = callPackage
@@ -176207,6 +175262,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "roku-api" = callPackage
+    ({ mkDerivation, base, bytestring, http-client, network, text, xml
+     , xml-extractors
+     }:
+     mkDerivation {
+       pname = "roku-api";
+       version = "0.1.0.0";
+       sha256 = "01vqmzqpdj40qxym3iapn1csr10ld9a9imci1pyncdly6q3a343c";
+       libraryHaskellDepends = [
+         base bytestring http-client network text xml xml-extractors
+       ];
+       description = "Bindings to Roku's External Control API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "roles" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -177425,6 +176495,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "s3-signer_0_4_0_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable
+     , bytestring, case-insensitive, cryptohash, http-types, time
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "s3-signer";
+       version = "0.4.0.0";
+       sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder byteable bytestring
+         case-insensitive cryptohash http-types time utf8-string
+       ];
+       testHaskellDepends = [ base blaze-builder bytestring time ];
+       doHaddock = false;
+       homepage = "https://github.com/dmjio/s3-signer";
+       description = "Pre-signed Amazon S3 URLs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
@@ -178426,33 +177517,6 @@ self: {
      }) {};
 
   "sbp" = callPackage
-    ({ mkDerivation, aeson, array, base, base64-bytestring
-     , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , resourcet, tasty, tasty-hunit, template-haskell, text, yaml
-     }:
-     mkDerivation {
-       pname = "sbp";
-       version = "2.3.9";
-       sha256 = "180krzjl9p1apm54qnna9xkj9451kah1ndix7c7g0if492a75qd6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
-         text
-       ];
-       executableHaskellDepends = [
-         aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet yaml
-       ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       homepage = "https://github.com/swift-nav/libsbp";
-       description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "sbp_2_3_13" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -178477,7 +177541,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -182088,23 +181151,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, hspec-discover
-     , http-types, lens, servant, text
-     }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.11";
-       sha256 = "1n8cjlk16m24wdxicyp0js1lsshqf27bk5a6qykc2f8kiriw5jcf";
-       libraryHaskellDepends = [
-         base base-compat http-types lens servant text
-       ];
-       testHaskellDepends = [ base hspec servant ];
-       testToolDepends = [ hspec-discover ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_11_1" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -182119,7 +181165,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generate" = callPackage
@@ -184043,8 +183088,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.5.0.10";
-       sha256 = "07dkzhig0c0rrqz9x7k2zv2m5b46l9p914j7758r5zb6vhlni94c";
+       version = "1.5.0.11";
+       sha256 = "1i7ijgy5n0lqzmmggsbf4vf55y3yxz2anlhrw6n3a4jsb4ram3lx";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats
          microlens microlens-th shake shake-ext text
@@ -184078,8 +183123,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.7.0.4";
-       sha256 = "0pgqjbiijsl9jb5dzwrmayn5vz2wy4jckkmrikycnqhglz1q8six";
+       version = "2.7.0.5";
+       sha256 = "1s69gvxjjn1s8smlhbrc1dvq1saivpslp7150xwavmxkiynp54lc";
        libraryHaskellDepends = [
          base Cabal composition-prelude directory shake template-haskell
        ];
@@ -184692,36 +183737,6 @@ self: {
      }) {};
 
   "shelly" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , enclosed-exceptions, exceptions, filepath, hspec, HUnit
-     , lifted-async, lifted-base, monad-control, mtl, process
-     , system-fileio, system-filepath, text, time, transformers
-     , transformers-base, unix-compat
-     }:
-     mkDerivation {
-       pname = "shelly";
-       version = "1.7.1";
-       sha256 = "068gabny23r9qs2fnn5vjyy77zi59c323ypmnmd71w7qwyfa2pl8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions lifted-async lifted-base monad-control mtl process
-         system-fileio system-filepath text time transformers
-         transformers-base unix-compat
-       ];
-       testHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions filepath hspec HUnit lifted-async lifted-base
-         monad-control mtl process system-fileio system-filepath text time
-         transformers transformers-base unix-compat
-       ];
-       homepage = "https://github.com/yesodweb/Shelly.hs";
-       description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shelly_1_7_2" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
      , HUnit, lifted-async, lifted-base, monad-control, mtl, process
@@ -184749,7 +183764,6 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly-extra" = callPackage
@@ -186425,20 +185439,6 @@ self: {
      }) {inherit (pkgs.xorg) libXft;};
 
   "singleton-bool" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "singleton-bool";
-       version = "0.1.3";
-       sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if";
-       revision = "1";
-       editedCabalFile = "0wpwwqgrfgzi6cf4j1jpxwi8b30s80zch2xzcgzcmjmaai7kgc1n";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/phadej/singleton-bool#readme";
-       description = "Type level booleans";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singleton-bool_0_1_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "singleton-bool";
@@ -186448,7 +185448,6 @@ self: {
        homepage = "https://github.com/phadej/singleton-bool#readme";
        description = "Type level booleans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singleton-dict" = callPackage
@@ -188037,43 +187036,6 @@ self: {
      }) {};
 
   "snap-core" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
-     , case-insensitive, containers, deepseq, directory, filepath
-     , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
-     , network, network-uri, old-locale, parallel, QuickCheck, random
-     , readable, regex-posix, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector
-     , zlib
-     }:
-     mkDerivation {
-       pname = "snap-core";
-       version = "1.0.3.1";
-       sha256 = "0m2pbz7r5dllk859r8bs3yjkmdh4xrw0vafz390jfmj15vaz0j87";
-       revision = "1";
-       editedCabalFile = "0yf3i0pb14zff083cnz4lszg5bkbbzg5r1v3yj9s66dchrszrjbd";
-       libraryHaskellDepends = [
-         attoparsec base bytestring bytestring-builder case-insensitive
-         containers directory filepath hashable HUnit io-streams lifted-base
-         monad-control mtl network network-uri old-locale random readable
-         regex-posix text time transformers transformers-base unix-compat
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring bytestring-builder case-insensitive
-         containers deepseq directory filepath hashable HUnit io-streams
-         lifted-base monad-control mtl network network-uri old-locale
-         parallel QuickCheck random readable regex-posix test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         transformers transformers-base unix-compat unordered-containers
-         vector zlib
-       ];
-       homepage = "http://snapframework.com/";
-       description = "Snap: A Haskell Web Framework (core interfaces and types)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "snap-core_1_0_3_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , case-insensitive, containers, deepseq, directory, filepath
      , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
@@ -188106,7 +187068,6 @@ self: {
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-cors" = callPackage
@@ -192113,8 +191074,8 @@ self: {
        pname = "stache";
        version = "1.2.1";
        sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb";
-       revision = "3";
-       editedCabalFile = "0r7qx7h3lz6v5fvfkky7crw5ms8vszx0d8xlkr94xa9n7mxbndh3";
+       revision = "4";
+       editedCabalFile = "03qy0mlyiwpv98aq74m3pyarg6v6w9vn8qlq6ljdlb40xi1p9s7z";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -193395,8 +192356,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.1.3";
-       sha256 = "1sd36j3f7s8dlz2g6w1yir19yys4pn28arw4nlpknpm7dzm6vs1g";
+       version = "0.2.1.4";
+       sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194904,10 +193865,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.1.0";
-       sha256 = "1apw961n69rix4vvb7bsdald0w1qnal1vawi66nw64cyn696sbzi";
-       revision = "1";
-       editedCabalFile = "0cx4s17r2nn6xwa9lpcn7scvbqqxi6ihxyb20axhj5rim8iz94hm";
+       version = "0.1.1";
+       sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195615,25 +194574,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "5.0.3";
-       sha256 = "1ins8aqxknnz9a00lb074f79ifd1r9lkkwdbx4ksy9cnnd3rnyl1";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [ base bytestring markdown-unlit time ];
-       homepage = "https://github.com/tfausak/strive#readme";
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_5_0_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -195654,7 +194594,6 @@ self: {
        homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -196974,38 +195913,6 @@ self: {
      }) {};
 
   "swagger2" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
-     , hashable, hspec, hspec-discover, http-media, HUnit
-     , insert-ordered-containers, lens, mtl, network, QuickCheck
-     , scientific, template-haskell, text, time, transformers
-     , transformers-compat, unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.2";
-       sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6";
-       revision = "1";
-       editedCabalFile = "0dhs44zhb2yh4yxw88yvlijcd255ppm1ch7dz7pn7sdv1wr6kxq5";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers generics-sop hashable
-         http-media insert-ordered-containers lens mtl network scientific
-         template-haskell text time transformers transformers-compat
-         unordered-containers uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         text time unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/GetShopTV/swagger2";
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
      , hashable, hspec, hspec-discover, http-media, HUnit
@@ -197034,7 +195941,6 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -197108,32 +196014,6 @@ self: {
      }) {};
 
   "swish" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hashable
-     , HUnit, intern, mtl, network-uri, old-locale, polyparse
-     , semigroups, test-framework, test-framework-hunit, text, time
-     }:
-     mkDerivation {
-       pname = "swish";
-       version = "0.9.2.0";
-       sha256 = "0lgd71qa4fs9zzrapi0mkgsdlip5kxjkhz1v1xj6ifaaq8f2f8jp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers directory filepath hashable intern mtl network-uri
-         old-locale polyparse semigroups text time
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers hashable HUnit network-uri old-locale semigroups
-         test-framework test-framework-hunit text time
-       ];
-       homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
-       description = "A semantic web toolkit";
-       license = "LGPL";
-     }) {};
-
-  "swish_0_9_2_1" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hashable
      , HUnit, intern, mtl, network-uri, old-locale, polyparse
      , semigroups, test-framework, test-framework-hunit, text, time
@@ -197157,7 +196037,6 @@ self: {
        homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
        description = "A semantic web toolkit";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sws" = callPackage
@@ -199660,18 +198539,6 @@ self: {
      }) {};
 
   "tasty-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "1.1.0.1";
-       sha256 = "0yqaplhwdyfg2wddz0yhzy6c7akpkhi0nkm62171wxfapzpjbbrk";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_1_0_2" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
@@ -199681,7 +198548,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
@@ -199821,23 +198687,6 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-hspec";
-       version = "1.1.3.3";
-       sha256 = "00ym5jlh11smmg3aryfylnwjbmi62gsy5jl1pv85bc8gl0kqa85d";
-       libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck 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_4" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
      }:
@@ -199852,7 +198701,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
@@ -204040,31 +202888,6 @@ self: {
      }) {};
 
   "threepenny-gui" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, exceptions, file-embed, filepath, hashable
-     , network-uri, safe, snap-core, snap-server, stm, template-haskell
-     , text, transformers, unordered-containers, vault, vector
-     , websockets, websockets-snap
-     }:
-     mkDerivation {
-       pname = "threepenny-gui";
-       version = "0.8.2.2";
-       sha256 = "13s6n7pxbmr0j2g5xiqpacfnshqg0jq91y161rmmp3wix4bav6am";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default deepseq
-         exceptions file-embed filepath hashable network-uri safe snap-core
-         snap-server stm template-haskell text transformers
-         unordered-containers vault vector websockets websockets-snap
-       ];
-       homepage = "http://wiki.haskell.org/Threepenny-gui";
-       description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threepenny-gui_0_8_2_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, file-embed, filepath, hashable
      , network-uri, safe, snap-core, snap-server, stm, template-haskell
@@ -204087,7 +202910,6 @@ self: {
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -205516,6 +204338,25 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "tinylog_0_14_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , double-conversion, fast-logger, text, transformers, unix-time
+     }:
+     mkDerivation {
+       pname = "tinylog";
+       version = "0.14.1";
+       sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni";
+       libraryHaskellDepends = [
+         base bytestring containers double-conversion fast-logger text
+         transformers unix-time
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://gitlab.com/twittner/tinylog/";
+       description = "Simplistic logging using fast-logger";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tinytemplate" = callPackage
     ({ mkDerivation, base, QuickCheck, text }:
      mkDerivation {
@@ -208438,29 +207279,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.6";
-       sha256 = "1cx25845i4n00xjb5dg9jg1p229nra0j5r2jwpwarra5c092df2p";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_7" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -208481,7 +207299,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -209649,15 +208466,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "type-of-html_1_3_3_1" = callPackage
+  "type-of-html_1_3_3_2" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
      , double-conversion, ghc-prim, hspec, QuickCheck, random, text
      , weigh
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.3.3.1";
-       sha256 = "03js8d0sv31a7m1q49l64vp4fhxlgxbgsjllrpmlahzjkcprlj70";
+       version = "1.3.3.2";
+       sha256 = "0ah3j0r1yrqyrsg9blg0yxffjrikrlvi77d1cq368qmx3rnn5rnh";
        libraryHaskellDepends = [
          base bytestring double-conversion ghc-prim text
        ];
@@ -209871,26 +208688,6 @@ self: {
      }) {};
 
   "typed-process" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
-     , process, stm, temporary, transformers
-     }:
-     mkDerivation {
-       pname = "typed-process";
-       version = "0.2.1.0";
-       sha256 = "1l6wpkwnz4lriq1n0hxv3mdvzmrf44ddkb1ys8cyj3ywfn2xh56j";
-       libraryHaskellDepends = [
-         async base bytestring process stm transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring bytestring hspec process stm temporary
-         transformers
-       ];
-       homepage = "https://haskell-lang.org/library/typed-process";
-       description = "Run external processes, with strong typing of streams";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typed-process_0_2_2_0" = callPackage
     ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
      , process, stm, temporary, transformers
      }:
@@ -209908,7 +208705,6 @@ self: {
        homepage = "https://haskell-lang.org/library/typed-process";
        description = "Run external processes, with strong typing of streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -210236,34 +209032,6 @@ self: {
      }) {};
 
   "tz" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, thyme, time, timezone-olson, timezone-series
-     , tzdata, vector
-     }:
-     mkDerivation {
-       pname = "tz";
-       version = "0.1.3.0";
-       sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-default deepseq
-         template-haskell time tzdata vector
-       ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th time tzdata
-       ];
-       benchmarkHaskellDepends = [
-         base criterion lens thyme time timezone-olson timezone-series
-       ];
-       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-       homepage = "https://github.com/nilcons/haskell-tz";
-       description = "Efficient time zone handling";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tz_0_1_3_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -210289,7 +209057,6 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
@@ -211369,6 +210136,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uniprot-kb" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, neat-interpolation
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "uniprot-kb";
+       version = "0.1.0.1";
+       sha256 = "037scgl1g4754vw5fnz7bqfwd24i9mrk2l87hkpd841ln5v7j0hi";
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
+         attoparsec base hspec neat-interpolation QuickCheck text
+       ];
+       homepage = "https://github.com/biocad/uniprot-kb#readme";
+       description = "UniProt-KB format parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uniq-deep" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -211959,27 +210743,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , process, stm, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.5.0";
-       sha256 = "0c08i5vnhjw28i321dpjap1a9jz3g85gq2zm39v8pl6w89ilcq81";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath process stm transformers unix
-         unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec process stm
-         transformers unix unliftio-core
-       ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_6_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, time, transformers, unix, unliftio-core
      }:
@@ -211998,7 +210761,6 @@ self: {
        homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -212943,22 +211705,6 @@ self: {
      }) {};
 
   "userid" = callPackage
-    ({ mkDerivation, aeson, base, boomerang, cereal, safecopy
-     , web-routes, web-routes-th
-     }:
-     mkDerivation {
-       pname = "userid";
-       version = "0.1.3.1";
-       sha256 = "12alrvzh1z15md5gbvci58xffw35g4626qr30v7cz6sz4pplfnb9";
-       libraryHaskellDepends = [
-         aeson base boomerang cereal safecopy web-routes web-routes-th
-       ];
-       homepage = "http://www.github.com/Happstack/userid";
-       description = "The UserId type and useful instances for web development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "userid_0_1_3_2" = callPackage
     ({ mkDerivation, aeson, base, boomerang, cereal, safecopy
      , web-routes, web-routes-th
      }:
@@ -212972,7 +211718,6 @@ self: {
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "users" = callPackage
@@ -215010,23 +213755,6 @@ self: {
      }) {};
 
   "versions" = callPackage
-    ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec
-     , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "versions";
-       version = "3.3.1";
-       sha256 = "0d94gkhx8b1w34mw05sidwvmysyb1z3p985nrrfaqzsp4xjqg0h4";
-       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
-       testHaskellDepends = [
-         base checkers microlens QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Types and parsers for software version numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "versions_3_3_2" = callPackage
     ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec
      , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
      }:
@@ -215041,7 +213769,6 @@ self: {
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vgrep" = callPackage
@@ -215999,25 +214726,6 @@ self: {
      }) {};
 
   "wai" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring
-     , bytestring-builder, hspec, http-types, network, text
-     , transformers, vault
-     }:
-     mkDerivation {
-       pname = "wai";
-       version = "3.2.1.1";
-       sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring bytestring-builder http-types network
-         text transformers vault
-       ];
-       testHaskellDepends = [ base blaze-builder bytestring hspec ];
-       homepage = "https://github.com/yesodweb/wai";
-       description = "Web Application Interface";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai_3_2_1_2" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hspec-discover
      , http-types, network, text, transformers, vault
      }:
@@ -216033,7 +214741,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -216088,40 +214795,6 @@ self: {
      }) {};
 
   "wai-app-static" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
-     , bytestring, containers, cryptonite, directory, file-embed
-     , filepath, hspec, http-date, http-types, memory, mime-types
-     , mockery, network, old-locale, optparse-applicative
-     , template-haskell, temporary, text, time, transformers
-     , unix-compat, unordered-containers, wai, wai-extra, warp, zlib
-     }:
-     mkDerivation {
-       pname = "wai-app-static";
-       version = "3.1.6.1";
-       sha256 = "0s36i0ca440l78d35isaam98z9x0dc0llx0ry48r901f3vrsq65k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder blaze-html blaze-markup bytestring containers
-         cryptonite directory file-embed filepath http-date http-types
-         memory mime-types old-locale optparse-applicative template-haskell
-         text time transformers unix-compat unordered-containers wai
-         wai-extra warp zlib
-       ];
-       executableHaskellDepends = [
-         base bytestring containers directory mime-types text
-       ];
-       testHaskellDepends = [
-         base bytestring filepath hspec http-date http-types mime-types
-         mockery network old-locale temporary text time transformers
-         unix-compat wai wai-extra zlib
-       ];
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
-       description = "WAI application for static serving";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-app-static_3_1_6_2" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, cryptonite, directory, file-embed, filepath, hspec
      , http-date, http-types, memory, mime-types, mockery, network
@@ -216153,7 +214826,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-cli" = callPackage
@@ -216176,22 +214848,6 @@ self: {
      }) {};
 
   "wai-conduit" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, conduit
-     , http-types, transformers, wai
-     }:
-     mkDerivation {
-       pname = "wai-conduit";
-       version = "3.0.0.3";
-       sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring conduit http-types transformers wai
-       ];
-       homepage = "https://github.com/yesodweb/wai";
-       description = "conduit wrappers for WAI";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-conduit_3_0_0_4" = callPackage
     ({ mkDerivation, base, bytestring, conduit, http-types
      , transformers, wai
      }:
@@ -216205,7 +214861,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-cors" = callPackage
@@ -217712,31 +216367,6 @@ self: {
      }) {};
 
   "wai-websockets" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
-     , file-embed, http-types, network, text, transformers, wai
-     , wai-app-static, warp, websockets
-     }:
-     mkDerivation {
-       pname = "wai-websockets";
-       version = "3.0.1.1";
-       sha256 = "0ccasczm9x8sx6bpywd8ga3qji2rqkz1l2fy856qz7jdazmazgka";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring case-insensitive http-types network
-         transformers wai websockets
-       ];
-       executableHaskellDepends = [
-         base blaze-builder bytestring case-insensitive file-embed
-         http-types network text transformers wai wai-app-static warp
-         websockets
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "Provide a bridge between WAI and the websockets package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-websockets_3_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, file-embed
      , http-types, network, text, transformers, wai, wai-app-static
      , warp, websockets
@@ -217758,7 +216388,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wait-handle" = callPackage
@@ -217896,41 +216525,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, 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.18.1";
-       sha256 = "15narz2dawzqmc8sys9cigg2dnn4a681cn07cgnpbvlyadwi5bpn";
-       libraryHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         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
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client 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
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_18_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -217963,7 +216557,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
@@ -218443,27 +217036,6 @@ self: {
      }) {};
 
   "web-routes" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
-     , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
-     , split, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "web-routes";
-       version = "0.27.14";
-       sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak";
-       revision = "1";
-       editedCabalFile = "061kp8rpmbpr9f9n3kja8160z209hwz42yy3kikn6b446rdc4pdr";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring exceptions ghc-prim http-types mtl
-         parsec split text utf8-string
-       ];
-       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
-       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
-       description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes_0_27_14_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, exceptions
      , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
      , split, text, utf8-string
@@ -218480,7 +217052,6 @@ self: {
        homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-boomerang" = callPackage
@@ -221201,21 +219772,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.6";
-       sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_8" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -221228,7 +219784,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -222951,27 +221506,6 @@ self: {
      }) {};
 
   "xmlgen" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
-     , unix
-     }:
-     mkDerivation {
-       pname = "xmlgen";
-       version = "0.6.2.1";
-       sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers mtl text
-       ];
-       testHaskellDepends = [
-         base bytestring containers filepath HUnit hxt process QuickCheck
-         text unix
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion text ];
-       description = "Fast XML generation library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xmlgen_0_6_2_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
      , unix
@@ -222990,7 +221524,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Fast XML generation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmlhtml" = callPackage
@@ -223948,6 +222481,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_29" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
+     , mockery, resourcet, scientific, semigroups, template-haskell
+     , temporary, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.29";
+       sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       testHaskellDepends = [
+         aeson 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-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -228582,27 +227145,6 @@ self: {
      }) {};
 
   "ztail" = callPackage
-    ({ mkDerivation, array, base, bytestring, filepath, hinotify
-     , process, regex-posix, time, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ztail";
-       version = "1.2";
-       sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk";
-       revision = "4";
-       editedCabalFile = "1x8vaflxrmkwqig8wvbbkc761l52y5h45sclnidm5zmwxrv1j3zd";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array base bytestring filepath hinotify process regex-posix time
-         unix unordered-containers
-       ];
-       description = "Multi-file, colored, filtered log tailer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ztail_1_2_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, filepath, hinotify
      , process, regex-posix, time, unix, unordered-containers
      }:

From 5dd264af4201e06b86f75b9a2fa46ffffa1b2351 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Mar 2018 11:59:30 +0200
Subject: [PATCH 2174/2266] haskell-getopt-generics: drop obsolete override for
 GHC 8.4.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b2914766d16..9b9b1ca8e04 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -628,7 +628,6 @@ self: super: {
 
   # Older versions don't compile.
   brick = self.brick_0_35_1;
-  getopt-generics = self.getopt-generics_0_13_0_2;
   HaTeX = self.HaTeX_3_19_0_0;
   json = self.json_0_9_2;
   matrix = self.matrix_0_3_6_1;

From 234c42b8e6a705048765cf122fd858f7e35a82df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Mar 2018 12:00:10 +0200
Subject: [PATCH 2175/2266] haskell-json: drop obsolete override for GHC 8.4.1

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9b9b1ca8e04..11de2835422 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -629,7 +629,6 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_35_1;
   HaTeX = self.HaTeX_3_19_0_0;
-  json = self.json_0_9_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_1_3;
   pandoc-types = self.pandoc-types_1_17_4_2;

From dddf0314bc0b08e863628ab756ffe37c20f1985a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 25 Mar 2018 16:29:44 -0400
Subject: [PATCH 2176/2266] haskell-hnix: jailbreak deriving-compat dependency

Reported as https://github.com/jwiegley/hnix/issues/98
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 22e2e5cc722..71d7f96aa85 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -244,6 +244,8 @@ self: super: {
   # base bound
   digit = doJailbreak super.digit;
 
+  # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
+  hnix = doJailbreak super.hnix;
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;

From 8cc6897ae9fc80e0c3933ff13f15c2f240c00c6e Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 27 Mar 2018 20:08:48 +0100
Subject: [PATCH 2177/2266] buildRustCrate: fix equality testing

Use string equality instead of integer equality.
---
 pkgs/build-support/rust/build-rust-crate.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 8a9a07fd7a8..75563e34c38 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -19,7 +19,7 @@ let makeDeps = dependencies:
       echo_build_heading() {
        start=""
        end=""
-       if [[ x"${colors}" -eq x"always" ]]; then
+       if [[ x"${colors}" = x"always" ]]; then
          start="$(printf '\033[0;1;32m')" #set bold, and set green.
          end="$(printf '\033[0m')" #returns to "normal"
        fi
@@ -34,7 +34,7 @@ let makeDeps = dependencies:
       noisily() {
         start=""
         end=""
-        if [[ x"${colors}" -eq x"always" ]]; then
+        if [[ x"${colors}" = x"always" ]]; then
           start="$(printf '\033[0;1;32m')" #set bold, and set green.
           end="$(printf '\033[0m')" #returns to "normal"
         fi
@@ -194,7 +194,7 @@ let makeDeps = dependencies:
       bold=""
       green=""
       boldgreen=""
-      if [[ "${colors}" -eq "always" ]]; then
+      if [[ "${colors}" = "always" ]]; then
         norm="$(printf '\033[0m')" #returns to "normal"
         bold="$(printf '\033[0;1m')" #set bold
         green="$(printf '\033[0;32m')" #set green
@@ -230,7 +230,7 @@ let makeDeps = dependencies:
           ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
           $LINK ${deps}$EXTRA_LIB --cap-lints allow \
           $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
-        if [ "$crate_name_" -ne "$crate_name" ]; then
+        if [ "$crate_name_" != "$crate_name" ]; then
           mv target/bin/$crate_name_ target/bin/$crate_name
         fi
       }

From 4bf9b4a328e2f8e34be4da1732206a85a2900855 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 27 Mar 2018 19:36:12 +0200
Subject: [PATCH 2178/2266] openssl: 1.0.2n -> 1.0.2o (fixes CVE-2017-3738,
 CVE-2018-0739)

Announcement can be found at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index af6a540b97c..b029615d792 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -113,8 +113,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2n";
-    sha256 = "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp";
+    version = "1.0.2o";
+    sha256 = "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc";
   };
 
   openssl_1_1_0 = common {

From 72110322c089fc850347f86d7a45053e6b2de7b2 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 27 Mar 2018 19:40:12 +0200
Subject: [PATCH 2179/2266] openssl_1_1_0: 1.1.0g -> 1.1.0h (fixes
 CVE-2018-0739, CVE-2017-3738)

Also fixes CVE-2018-0733 but we do not support HP-UX to my knowledge :-)

Announcement at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt
---
 pkgs/development/libraries/openssl/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index b029615d792..5a9052222cb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -118,15 +118,8 @@ in {
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0g";
-    sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy";
-    patches = [
-      (fetchpatch {
-        name = "CVE-2017-3738.patch";
-        url = "https://github.com/openssl/openssl/commit/563066.patch";
-        sha256 = "0ni9fwpxf8raw8b58pfa15akbqmxx4q64v0ldsm4b9dqhbxf8mkz";
-      })
-    ];
+    version = "1.1.0h";
+    sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq";
   };
 
 }

From 73a7d67795654d35647d217d6d1d3cb0f9cf0899 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 27 Mar 2018 22:06:13 +0200
Subject: [PATCH 2180/2266] firefox: 59.0.1 -> 59.0.2

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 19a16dfe3a2..897575e4908 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -18,10 +18,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "59.0.1";
+    version = "59.0.2";
     src = fetchurl {
-      url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2";
-      sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw";
+      url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2";
+      sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv";
     };
 
     patches = nixpkgsPatches ++ [

From 5ed0ae686b7fca2718076ef7c5ad58c9a44aefcc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Mar 2018 01:27:32 -0500
Subject: [PATCH 2181/2266] slim: musl patch

---
 pkgs/applications/display-managers/slim/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 5d06c2221b3..5160e02963f 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
+{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
 , fontconfig, freetype, pam, dbus_libs, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,10 @@ stdenv.mkDerivation rec {
       # Allow to set logfile to a special "/dev/stderr" in order to continue
       # logging to stderr and thus to the journal.
       ./no-logfile.patch
-    ];
+    ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch";
+      sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm";
+    });
 
   preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
 

From 0b53d63dad1ea50512dde126c3c3b46de59c4cce Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 25 Mar 2018 18:26:39 +0000
Subject: [PATCH 2182/2266] ocamlPackages.lwt3: 3.0.0 -> 3.3.0

---
 .../development/ocaml-modules/lwt/default.nix | 69 +++++++------------
 pkgs/development/ocaml-modules/lwt/legacy.nix | 57 +++++++++++++++
 pkgs/top-level/ocaml-packages.nix             | 10 +--
 3 files changed, 86 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/lwt/legacy.nix

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 53ba904f628..37bcff375ea 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,57 +1,36 @@
-{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
-, react, ssl, libev, pkgconfig, ncurses, glib
-, ppx_tools, result, cppo
-, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
-, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
+{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
+, ocaml, findlib, camlp4, cppo
+, ocaml-migrate-parsetree, ppx_tools_versioned, result
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4"
-then throw "lwt is not available for OCaml ${ocaml.version}"
-else
-
-let sha256 = {
-  "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
-  "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
-  "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
-}."${version}"; in
-
-let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
-
-buildOcaml rec {
-  name = "lwt";
-  inherit version;
+stdenv.mkDerivation rec {
+  version = "3.3.0";
+  name = "ocaml${ocaml.version}-lwt-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
-    inherit sha256;
+    sha256 = "0n87hcyl4svy0risj439wyfq6bl77qxq3nraqgdr1qbz5lskbq2j";
   };
 
+  preConfigure = ''
+    ocaml src/util/configure.ml -use-libev true -use-camlp4 true
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
-  ++ stdenv.lib.optional ppxSupport ppx_tools;
+  buildInputs = [ ncurses ocaml findlib jbuilder camlp4 cppo
+    ocaml-migrate-parsetree ppx_tools_versioned ];
+  propagatedBuildInputs = [ libev result ];
 
-  propagatedBuildInputs = [ result ]
-  ++ optionals [ react ssl ]
-  ++ [ libev ];
+  installPhase = ''
+    ocaml src/util/install_filter.ml
+    ${jbuilder.installPhase}
+  '';
 
-  configureScript = "ocaml setup.ml -configure";
-  prefixKey = "--prefix ";
-  configureFlags =
-  optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ]
-  ++ [ "--enable-camlp4" ]
-  ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];
-
-  createFindlibDestdir = true;
-
-  hasSharedObjects = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://ocsigen.org/lwt;
-    description = "Lightweight thread library for Objective Caml";
-    license = licenses.lgpl21;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = with maintainers; [
-      z77z vbgl gal_bolle
-    ];
+  meta = {
+    homepage = "https://ocsigen.org/lwt/";
+    description = "A cooperative threads library for OCaml";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix
new file mode 100644
index 00000000000..53ba904f628
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt/legacy.nix
@@ -0,0 +1,57 @@
+{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
+, react, ssl, libev, pkgconfig, ncurses, glib
+, ppx_tools, result, cppo
+, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
+, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4"
+then throw "lwt is not available for OCaml ${ocaml.version}"
+else
+
+let sha256 = {
+  "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
+  "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
+  "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
+}."${version}"; in
+
+let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
+
+buildOcaml rec {
+  name = "lwt";
+  inherit version;
+
+  src = fetchzip {
+    url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
+  ++ stdenv.lib.optional ppxSupport ppx_tools;
+
+  propagatedBuildInputs = [ result ]
+  ++ optionals [ react ssl ]
+  ++ [ libev ];
+
+  configureScript = "ocaml setup.ml -configure";
+  prefixKey = "--prefix ";
+  configureFlags =
+  optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ]
+  ++ [ "--enable-camlp4" ]
+  ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];
+
+  createFindlibDestdir = true;
+
+  hasSharedObjects = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://ocsigen.org/lwt;
+    description = "Lightweight thread library for Objective Caml";
+    license = licenses.lgpl21;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [
+      z77z vbgl gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 65d3de2d9e2..5c2ec39ade7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -366,12 +366,10 @@ let
 
     lru = callPackage ../development/ocaml-modules/lru { };
 
-    lwt2 = callPackage ../development/ocaml-modules/lwt { };
+    lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { };
 
     lwt3 = if lib.versionOlder "4.02" ocaml.version
-      then callPackage ../development/ocaml-modules/lwt {
-        version = "3.0.0";
-      }
+      then callPackage ../development/ocaml-modules/lwt { }
       else throw "lwt3 is not available for OCaml ${ocaml.version}";
 
     ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
@@ -650,7 +648,9 @@ let
 
     ssl = callPackage ../development/ocaml-modules/ssl { };
 
-    stog = callPackage ../applications/misc/stog { };
+    stog = callPackage ../applications/misc/stog {
+      ocaml_lwt = lwt2;
+    };
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 

From be48c2effc058bb9319d2c920204548439117646 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Mar 2018 20:34:08 +0000
Subject: [PATCH 2183/2266] ocamlPackages.lwt_ppx: init at 3.3.0

---
 pkgs/development/ocaml-modules/lwt/ppx.nix | 19 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix          |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/lwt/ppx.nix

diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix
new file mode 100644
index 00000000000..3cf08d06f1e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt/ppx.nix
@@ -0,0 +1,19 @@
+{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}";
+
+  inherit (lwt) src;
+
+  buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ];
+
+  propagatedBuildInputs = [ lwt ];
+
+  buildPhase = "jbuilder build -p lwt_ppx";
+  installPhase = "${jbuilder.installPhase} lwt_ppx.install";
+
+  meta = {
+    description = "Ppx syntax extension for Lwt";
+    inherit (lwt.meta) license platforms homepage maintainers;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5c2ec39ade7..7ac8508d889 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -374,6 +374,10 @@ let
 
     ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
 
+    lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
+      lwt = lwt3;
+    };
+
     lwt_react = callPackage ../development/ocaml-modules/lwt_react {
       lwt = lwt3;
     };

From 1874f09c40bb664470198a8cffa45bab1d31fccc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Mar 2018 20:34:15 +0000
Subject: [PATCH 2184/2266] flow: 0.66.0 -> 0.68.0

---
 pkgs/development/tools/analysis/flow/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 4a2d298495d..dbe19935d62 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices,
-  findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }:
+  findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.66.0";
+  version = "0.68.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0l1sdd1n0llmz8m81vym3zhcn824sr9w46h9jpb7i7wrcm4y410d";
+    sha256 = "0wags0msk7s1z3gi6ns6d7zdpqk8wh5ryafvdyk6zwqwhaqgr5jw";
   };
 
   installPhase = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa
+    ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa
   ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be6957c7a57..8e7bf14f224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7780,7 +7780,7 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
-    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt
+    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx
       wtf8 dtoa;
   };
 

From b353ff944a4724c09cb5aca380cce37ecc2dd5f0 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 27 Mar 2018 22:28:58 +0100
Subject: [PATCH 2185/2266] linuxPackages.ena: 1.5.0 -> 1.5.2

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

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 9ed691d69f0..e3f382ababc 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.0";
+  version = "1.5.2";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj";
+    sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm";
   };
 
   hardeningDisable = [ "pic" ];

From 24a2c3fe58d712617eff1dd6aa078ba0a26e3127 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 28 Mar 2018 00:18:18 +0200
Subject: [PATCH 2186/2266] firefox-esr: 52.7.2esr -> 52.7.3esr

Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 897575e4908..9aa17c3d2d0 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -41,10 +41,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.7.2esr";
+    version = "52.7.3esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395";
+      sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw";
     };
 
     patches = nixpkgsPatches;

From 6abbe39551bba6a0b201e313bda291b0ce33f95c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 28 Mar 2018 00:27:17 +0200
Subject: [PATCH 2187/2266] firefox-bin: 59.0.1 -> 59.0.2

Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/
---
 .../browsers/firefox-bin/release_sources.nix  | 778 +++++++++---------
 1 file changed, 389 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 851c95fb1a2..3dd7d9e8e65 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "59.0.1";
+  version = "59.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ach/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b982f2bd54312d66b7a1d6d6e775bad21eb1bce3bbe161cf980d03e55d4bfb5eaa217b05c16c72cd55165cdf7ee409c2e0a56143a82374f66c67609fed1464ae";
+      sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/af/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "fbafd3dcfc473b7ebc0d6230cff487819c37b6f41135060cceca72e8704afa147edf71405c1367137bab6c8013fdd98ad487bd7039a291f64b0b37eb468d5b18";
+      sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/an/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b7cf1261c2e776874ecb7c709d82f288e74d16770acd3215fbdcf44f6167544e626c1f809e4d68dac7a040e0dacba0095d24c1994fe329e5613c7a561ad652f2";
+      sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ar/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "16e308336b1ea37bc7aa18184e30eee4f1a073bc1dfe009c515a338f6412de6ad19ce96653cd58aa99d4ca34476e16693c03b01b7d5b1df3154ecab58fca157b";
+      sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/as/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "a6de3e421126adf95a02911db3140791c5a5dc9030e63327fbafd5fa3f5d6d81f4d62fa705c84a573788840e921ea1ab71e52d08df443405a6c8b2e69773e76b";
+      sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ast/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "2bd15deae2a01d09a622df87ce5329adb5d5da2e76dce678aaee202eec2a7ddd0ae79de205d3dabbcd189fbd3aa5293ee551c31bb3850b3cd7e5c02d73862548";
+      sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/az/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ba021c1531fbcc1c7f4b44f798d0046c39b2578fb4fa8f81927f7a4bb3a3e8b3d7de545bb2d818cfe1c095cb4387477d05541b5e5021c56086a700e8cf928b64";
+      sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/be/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ba5ac2b182f9534825468829b62359f5c24a2cfcfc0e27ff47469b814f746240155ceb228bb7fdf1855e378048806b70106bc0a3999b0cc2d4f69b28f7565784";
+      sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bg/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "a1aff58b327ffa5dc62975e31e59306350bc8b4a2b38e5993aea4ca70fd4c0e295b7e25a8deafc9d354fc674d8c55ae917a110bfa832f54fd0067f4e2f35dd71";
+      sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-BD/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "fe96f073482488f66f0b7a46852d763212e444c80cba0f495e275b4c73711374949d742bd8ca0c69cb9e662e71b13b28084c004b3530f702445796d7c1716f0d";
+      sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "31d8f589ec72a8ff3315fec3bcf9894ff6590768f2c380313c38efa2106bbc71bd11d54b553eca568cee0a7768f0e57b3ef8038d14ae2615fa1160145b123cb0";
+      sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/br/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7ed8310521f981a4ff75037198a9bcde4fa07077c298c43f5baf532e84be017d604d27d59ae38c10d0c422a1cc793652c148e7c3944171044f4e9f267b64993b";
+      sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "7ce16040b19d61d39936fd220351d6dce0210aa0edc0494d1956d1f19d7e027cb2d8d100940bbc34a77f05d305a5af3708d16bc78bd9b2364407bdb71ff05052";
+      sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ca/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "8f8ec749c55c4dd930d3e359b9a3003edddfb6ca36f6f65f0119d0049b09a4c3cbaf558178a327583769fafa2d64272099882833e2ef7d6956b606c05f8a6b76";
+      sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cak/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "41f6ae5d0aa44b90724e578d51ad7a3d6903dd74d30957a8786cddbd3ae427da0a453c1504a11ff13ab9dbb350829c1928d27ca0ec67e94995346e1414109e26";
+      sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e219ec91c7346a72b64503f89088554f8d322968fbed0ff764d90df53fac06d4febf407773192530ad98d6c51dea23fb7c5f07e2b9099c736759a3b60b8b0a48";
+      sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cy/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c6650b47193449b28e1d9f6420b59c1235986ececcf724234e26fd8168f52120274d3d8acd8aba036c494393eb635c0ccd68833a1961a36a10b04b1a1050bd7a";
+      sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/da/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b66299d7f65fdde01b644a21524635806c703df27cb4eff928189d65285f12140926e8d20d1f83b54263b8b17b7621034ac1da5867fd28d36b2733212c9b65ab";
+      sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/de/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "463ebdafacbe1eb4d0df9d4843ceb41849fc2680404e1e5f4af563bcd4fc4410f8cb212a396ccfca874c37a4cb245bfef8de4aa9620d3e30908f1c94d262cf71";
+      sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/dsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "947dbe47ad286c57a62557532232a5e833cc6f7b6295699415c727bc30cd1cd67074a568c1f842e3e7b95460595b16b0a9c87e94f38a37f22b5e8db82a3a4932";
+      sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/el/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b0d5015676280816cde17b217e078c8b912aaa87167317393c0c20b8ebb27460ead4a4656587bda19b93fcf4362e07ce11a0f5410cee733ab44bc2b1f0a1f093";
+      sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-GB/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "94864d56052d619d495c527af0941979470a3c7410e51c01e5a04be565a62a29a6055eaaa9f5b4bd6b443fb87702f52c935b3071b4ddccaf97a494fc2256728f";
+      sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-US/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ef8c7518bc9abd2f730efa428ccc418410c7c571b32c06633ecf82c949aeb3e4006d888362ab511d55db98ee2d6e152f9ed7cecdd976272c89f8cc5957c9132e";
+      sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-ZA/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "7e172fd957b000d77e4ff832ebbbf6b46a192668289394370ec95f12e5f319cee59da140bb3a809bcb7e161349c32f682083e7639bfb3f6fa5cab53ac4f33716";
+      sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eo/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "369e76a861625bc9e757980c896fbd1563e5127ce770557aa7e81cd80040146af62c526ab148168b2a078a9c16432e97e96ca4fffa5db5945c3475353cfc894f";
+      sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-AR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "a053bba1fb77617ccd9b2bb1595ebaf040760307dedc9984d3ccf5212f572835f9463611f38bce684e71728b04c4d3e484cbe6c20875b0703d39c3fdcddc6cec";
+      sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-CL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "618eb3fef5f3669bc104ba60b76cf280503bbb4f2700341e95a6024fb3113c56388fcfeca294e3fffa3af5db15d639c0e7613397505c63509d7f248e7a1825e2";
+      sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-ES/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "f8fa78438bf7561d422d9187b16c1284df2a79c6f8cfdbdcd838501b5f2fca1d2e05bfad6d59b9484f46e4dabd2630706a8c47f3323534e24ef4c8fbc4937a56";
+      sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-MX/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "4dfc8c70cfd5eca191ed4feaaf8c4dcf2dadfd7226f1ebd939997e8bdcd7d867afe0c27a51cf5d578c380665023770b2e54110dc2af78ca63a2a38165d879665";
+      sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/et/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "9710192f0c87ebbbd68bf336f1560007a86f9c9d55ee3df7311725f7c81e1415f5d5346378fc86424cf1d94e51efcaf791318f040c3652132dacce59a8c2668b";
+      sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "47a76627b97b2190f532ac82a6684787a6cd45f4f831b2af6315e6242367af68f84be7965cb6d91df89d8e43d04655c0e41231eff0b86cf329ffff5b26a56dc4";
+      sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fa/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3a888e43b737998938a624003c6eca6362aad95d0e13203d655d67c4b76c69484240da43d00e24a809e1fa40b18249c9549d52794f9cd92469a028ddb4b585ec";
+      sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ff/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "365b907bb5d720874d206cc2fd3e6f21095ea1681a0bff5ffe51b49135bb3b3984e5cbb0a50951afc5bab3ef2bd2ea55af29912d25dba8f4680bf6bc25f24b05";
+      sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9361b0554f221e13c4146f9eb0df4af64625062a368ff828d80350e932ef0bf6f9cd87e3399bdb42ca5e7ca0dfaec9357d57a345a978ff936958ddd074ac6c67";
+      sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "61123f188e491c32e9b912026554afee17d83ed8bb3480bc6ed8f10f46049e81f2444f6850c5a9f7841f9e897311ac0955105401fd2661ee703243c6e204fd60";
+      sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fy-NL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "4575949552f1e0951d75b2f3eae5a6ea5fbbc6b69f0ba5d82b69922209a46b8f9701112cd1dd61b6c892eb1f4e6463e28874f3f84891e3eca3de0b52036ad429";
+      sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ga-IE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "4a05d48803502ee435ea3b50f38ed262aa57048b0f013c7165af37ad44494a1aae7f643e14d5aaaf7a2d5a1085a67a078e70ade9e614bfe33295351686661ccd";
+      sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gd/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "df9dcc72aacd44ecf73f0ddc34a6d97dafc9deddb35075273c2b958b2c23ce3a346433b050766f8b83040c495c2a84b454cd7742cdf6b59b69894a94553c21c0";
+      sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "3f55336a02249aa06674adbe8f378ad2b1a7b99164608f04cefe8c642ecffd336f9f370fcc190debeb89f97f630032d41aacb46e03cfd09a9a20bdf5f207312d";
+      sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "9bdb650bb25ad573a5722595d7b062b370d79ef6a9079354ee467ae8fdb8e319d3b666bef0569286a868e7d64453b2c69098945539a259184334910f70914211";
+      sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gu-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "5f2621253981d58aa643da76dadae44da76bad3f50d08c35c43d52da5b0a8521ee4c5df5262558edb4b2bd817985aa02d6ff908f326d99ea58dd4d96b9f04819";
+      sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/he/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "ba7b0bedc2f8146dddb7f0a8a2c357dea4d23481e85f23e5d1f820da6b9c6ea84298ef609967e62741a2f9b57a6c4e94b0a90896daccb80b888313c75359879a";
+      sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hi-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "7804c9b6bab169fda70db8ff3f638add9fc22a6b8f9adde30482558e97d32946085258bfdf93b0e67a35709c474fb3aa028816e7f501dd554ef05a282f656815";
+      sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "e97cd1b68d5a1d471edfddedbc05321444880dc9ad2910010c447515ace632c25b0516ca1dbd529d44777c8f9046b5a660a768bdb35ac5e199d1685724c6a7ef";
+      sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "098842a0e8226eee716859b7e1bd1919a2bd251bc368ff6df58c95b556dc503f15186bb483503087a7e02d785453edc77d081e267b08487c0ff874361a82ee1d";
+      sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "cd6846f6268d96f84d405aac06c11322e188da3124ad848faaaaac7cd562c004655a8f7732294b0ce2ca42597c82d82fe8b1eb65dc5b0b659f7be342aec648ca";
+      sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hy-AM/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3e4f4f536c4dbd4337e301272fd433e4e0ea26976f2a5add8a0d90f310e2c3fb14a4b558c556214409788bc2be09d36bdbf95bc5385260b70408f00ec71c30da";
+      sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ia/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "35adfd5eaaeb3d40e32d501ff49979e4db878b6fab5598d64c3943cf57f846e439ef88693b39a03df65367436ce3efada9c367ee5de20a1d769620b00299bbaf";
+      sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/id/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3203f599f6ed436280143aaa563780c64864488f125462a56241785f9e7d6d48b2d3fadd0366fee131d575d8dadc8ca4820716a03de4c3b23eb0f0b033cc73f3";
+      sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/is/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2100f728268efc1d2c0f96e745e2574847aa844ef4366dab44f9f0d89e79372a2180d530c7fdfe627e17644871b3a71387037057058a0ebd117e187343b5d1fc";
+      sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/it/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "abef6687c0e0b90f9857e29d5b82ded6dbc0b304dcabf2586e1328bbfb9948b37f582a5ac1c58cb46026ed674863c437a15872c46741fc4e8d0a4a4be80cc05e";
+      sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ja/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d953aabe2368ebe9f944d91769b6e0fe18b1b5ad819040705283af6739b03fdf6fe9f3cfdbadf5231c9789ce62dbbe831035f8776f570e0be1e483b6eea578a3";
+      sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ka/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "52c4b6338dbc79a670b33e97d7996daf1ef72c22982f16840ea0cde0e6ec16eda6eee1688e6eafa2ce6eaa9cacb33ceb7196f2923c81d4e1fdb3af9c200b9c7f";
+      sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kab/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "4832c730d37b5890a85091109ca150b882202be9028b448aa57fa8e74a2f91673d2c6be4e963235c0453cbf070a996423e64f7cd93caed973d5c5018d26d7a4d";
+      sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "efb2fac05f337f22c326822efa17f7063dc71180d54621b95c000d6c86bf5180d5ecb012ab72cef23177cf07d7f46f507bda862f87dea507a4c1be026829ca1d";
+      sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/km/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c7817dc8cd3e78b15708a863727627ebcdc6ad054da252f273a6e68cc914f5999fd6d7495d64586e1d218c068c9f38250db0ae54944a67f1116e5a12132c9dcd";
+      sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "9ed4c6d0a6a5579d1cb32e35a97df2b05d836e5eab5df59406da4d86ebae6374c38649232c2dff849865f538ce4264d8f08c7fa6c778f9ac65362cd47297ce51";
+      sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ko/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f133fda3bfbc59f895ead4257a097102af10954f0fb7ddd6bc9337a520641d8f1a26bd86011c0922c2770e8191e68d96e46d56a76d498c7a44c713207a9f8585";
+      sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lij/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e4d55a021271186cf3553781aab1953c9bc53b86c5d8550c6d45bfcf2363dcf32def20d411c4df10aca3e7c2a79ee527b23e248910ec1bbef8d1e15793e1b831";
+      sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lt/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "a08315a4134181e2f8c559e0c70ff05b1455f85a85d5b5b06c5b8cc70bb17f3761468af42c27be476ea3e342365262f18b98c523e35576425ee8e5ef8df9c362";
+      sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lv/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "e6e62886b8bf972668e3da6452bbaa970cd16aa5593c8a3d765e0d784ba755e17641a1d7e5410ea6474484eb14b3b6b18b69e3be38f2e2ff30890afa18c9a405";
+      sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mai/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "a28537a457989974e11161ae84dee2de28d783447c0a0a6b5b03a36fcd1650d609ddbb40ed063f0c68149d314b1eb17dfe92d5396c855794d45a0bf8e3491c7a";
+      sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "da601ab25113316cb9ad44d2a8bd0eba23800fc97ab18ade8324048b1d7c757c51db9fe039992d18fa7b78846b5be496d9f3439500448f21d66a9d3a335479ae";
+      sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ml/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "eacba5bf549f1398f561ad574775af8c749251f9d4a57a2c91400236cb2b72b00e429d4dcd4597b6dc6fe95a629d4b56c2c1776e03cf5d158cbc85743bbdd443";
+      sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "e9e9b13cc3c4f48871d5b73ea88aba384d0ae792f7c2bb49f41d5b7da36243c108dd96925c122abb0b202ba8ee7591d8edd783546402c2066f5459883a255897";
+      sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ms/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "edf6153c9e18e620558e283086a96d49e484a74983b7d5823b1c17f9276f3c41d4282a46dc120a181a7e53595e1434f56658d34b2cad4c97e30753c07c899fbf";
+      sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/my/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c153e6cc2bb3ea49de8dea3661b4c5ec23193cd40e68da8160108b40fcda6717e35e7ef3bd2708ac2e47014b224e53f74b9183cb2c50f36d517f1a5ade425d40";
+      sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nb-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "1b94a618ec8f132bbf5b246354da4b424a682fcca74259b94f1ff5cb12cb0602d327dc7b9af2814fde45e5da829159df316442db6388fc45bee8c8255418a1ee";
+      sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ne-NP/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "552aa2504e1d5c15a413a0e7e47b509d37a8b424be9ec4371f0920a9ac8b6ada2cafb9adf054b695499d41fc9b606f6f0c95d99104318cee1d69998ed7bd1812";
+      sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2449c6f7cb6106e7f49b5160ecf973a73882d653c68a8e5648a31595367ba41dd93e334f3a67e69958f4bf429a17069bdf5d66163f2be14e86068a30acc29045";
+      sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nn-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c80169f8f2cab78efa8ad06a6e3dcea41359bfa2b4af7baa034b88c934d27243eb5b20b4ca4f956707472daaf1e315ee4d34e5abdc25edbdd0b8aa3915c14d5a";
+      sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/or/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "48ebeb9e4233b303bf5300c9d7413c82f9340a7f1fdb4ce23cd9868ae6c8c7b61532535dde653fec0f9a56a3b8d4595d451c3abddee75f6aeaa5b2450f26b0d7";
+      sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pa-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "4d2caea086ddd56544b59793d3e2422940d64b16a623e9b9717329a639ce8a89f9e69d7c8ed9121bd08d692462c99316e1364d89eb8d1cbe978c67f99bff2469";
+      sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "6d10818fe57a2b10bd5cccf068f42ef8e2d949a79c4ce6e4b2ae088944f17dee8ce14396b2e3f86d492e3ce31780bbd96ecd4bfe39cb8e15dbc70cbdad6a3927";
+      sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-BR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "b2a8732a03983b00e7e606099a215a8b6545e093e243662988400e059757f6699571a29e6c24433b345de5e47484d19c08685fe1b5410d71bfafe023d3bbc669";
+      sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-PT/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ffc7c4a8cb7a092ffb86ff32ff8d6e54b4c49600ea9c8ac77e337f4c71b283adced784d23cfe8e69d034b9cc22f118756af44fc5a22003c77c33135a24197b2c";
+      sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/rm/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ca174bb51554e73d647207c62f4f17de52b47ca6960dc13f45becf0a0e43b73edcc7925a913fd42e3b151acaeded5bb68d6cdc6ac17f3add2bcdecb8a4b20c3e";
+      sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ro/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "4046be435da5d23a46ea007ed04c35cc9431d22858211fb2647df1ad4e00e84476544448ca86ce353b889a8db92fa1723c0598e7d560fc9980b1c7b82fae1552";
+      sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ru/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "a7b4becbe30e27c8bec3c71af691a03b916774a77e4626a89743a7a7deeb07e9489ba6e276e80b53becb78e5c2575465b6f141f694b71bf9cd68dd761c0442bb";
+      sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/si/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a9d8162bd8784be11924e9cc0567ea720b87232d175dee18212dbecd8280fecc610a964df77a3499c5f25cbbd466344221f5b071c8d83c3268d936e108adae48";
+      sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "999229f133193f19b49b9e4107515963fa28b524323cbf88a2d13542568997a91af911c42a3b353ab3d9dc4d05e45b8e2c9e08b4e6436da6292073365cb5db0d";
+      sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "10ecfc7d338462aa350aa957b3ca6c0de5eba93fdd680aa2dc406bbc0cbad821854c9a45dd12c72403393d7f9447d5dcc86981921f0eab4ce3c06549c642e08f";
+      sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/son/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "c0cea7d6ca475896c0b2b281a4a0df33311eda128d573b38b89b8f1653596d8d16bba713b8cc8bba267afc2a5cf734aa578532afaa3197cc92c5cd03db030dd1";
+      sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sq/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "45191b5974de941748d38ae74e87b135ffc813d5f207219b21469ca7804cb4b6ce9e7fdc1892bc6a6f4fc15d0935a7e770e82baf94f1c31dc77d1108d5f25cba";
+      sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "e931f1d47644d6a770f193cea61148445d8f43eaf5670d7cc76b3b115db15ccd4fc0938a59e7bce237d2d05a924660a791f4b19d44ccf06572d814a692cb9173";
+      sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sv-SE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "95a8391082341543c2044a72d7f52de39767079957c99ec75c6daf95607877fce0ff1d3c42175964516cf93ff632789647f420687d51e717d3d51a280f5c9272";
+      sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ta/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "428e2269126ce169f0e83ba1274d4a11cbad2964dd6bb31e8f3c3afdfd3968fc9a06d0f92a77a0bd745f36810a526a75f8c670489cb8a28bfe086cd04819fb0e";
+      sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/te/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "34c0b91b14d70670ed0d1624a5d6b93ead775151b432add41bc13544ac2fc5acdf3ad9f8f26059655effc8f5507081461f737289011b41bb3972edf7dcf933ec";
+      sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/th/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "bd7bce3cf04674cd6423fcf7276bbcd3585c061b77c692cf33680f122b09d2c5c29ba0a2d8ec857425d9741ffce1ee23383d35c9b7a620aef5579d59dcbe0049";
+      sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/tr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "580604b9e4336aa6eac536d4514a41603890ceb6e9630609b4a36cfb0b34952f3d273ba1d100ea1b5509a6dc8dce9f10a335bf5aee7a0c6b133abaae3c4c7352";
+      sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "f6c7a9fe068ce1f760a7ca45a82dc5dd28c7e054823e3b9dacb6d00d628ba56c8b2d831a36237290d8803b3284b90cbd29c3ef685cd0d4973ee338b91ab541d8";
+      sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ur/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "41c6ae7d2f80704754865982d4b64252a9a04a222c5cde279708960c8a2c167f68805ca2302a86f03ab55ba93afd069d4c289434dff8ec61b245123347e53e78";
+      sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uz/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "5974e06472aa75eb2b9cdf1494d8bdf0f394d5a7493e9f77d631f47dbf0a0047dffda5fdbe23f32dbe65612b9b77caeb7c3f15887cc51fa7c2609d3960b9d32a";
+      sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/vi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "5b35c3ab9593074c8f88f2ad34db0e161c075d8b04785ea658a8ba49172707e9776a5882b291645d0aea5e333870723b5fbbe6c7957f7ee02c9674eb237a63ee";
+      sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/xh/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "8ae8b2f36cac9e1aac1f44a786d6992ea6b31dd83cfc22d1cfd75d057ae429a35e1d61272aac7ecd24d4dbfd8448f54682388e4e708222d1c2f6c6e54c0b0da8";
+      sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-CN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "76e09c7f0835270ed7788330486e1d00d10e8237e5e6b5af9bc2de227fdabb958c697c11f74d7df5b6876339adac09b6bd5e87c9d31b3c7945ffd00ef0d7527b";
+      sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-TW/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "87f298e06f0b58500231367da1e9fcf19f39c25cbf2b4d20980f45947539398f6f394833a6baa676c6ea27f87da26e5f211333c76ce91b40e7a3e2a6c6a33fea";
+      sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ach/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "3d922035f62c78c21e997f0b9e1265c8f9f8bbcd53d67d7042d8d30d418d54b3bc4f5b8fa056149d8c8dcd54afcae1ba3e418fc0b89ec19b7c3af27239a0d4d9";
+      sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/af/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "d85f3a911741b6dceb35ea6f2daab06a6258e66b07b79fa7fba4b1c277ae8debe5fb1c45c3d9eb07b910a172ff94baf6e4520a6fe755cdeaf19204b4dadb1f42";
+      sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/an/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "f1be5c00436a1b613fe46f5adfc19eafbb0639687346a3939437e10e64a7ba0c94b9656bff988a07210be68c7e57e982e9280aa03a0e69c2cce9f3501846ff20";
+      sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ar/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "aa2ce3ec19633a86d998132fe54eba30e52fc29d5b1dcde1c3197aab0bcf0a9f73caac3662d58e5465923edabcfb0559e8f23bff7f13b5cf89a11bde7d4b2eb2";
+      sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/as/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "993be32e81700a094358999edc280a0e0999efd1478eb03f0924c0fa6b8c6347e69e0408725b916a80f350d3fe93484bfe83137fc0ba007e7f7a0f41d1c12e60";
+      sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ast/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ed49c1ea33b0057a8b6cd406820c788248016bede3983121503a8c5332fb305837add00f7a5c75ea0aeacbda16873cb519980f440d9c11b0b54b01c674832132";
+      sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/az/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "f02af6b9865d4f6469f62c1168bc33ac1f2abbd0a238d38524643dc5fd84de4a48b146928ca7c6d82f9db3e55ebbe861c29850a0a3aca3b3c1cea632a6938f0d";
+      sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/be/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "5b82b010b2ad960b8281e0cc016f7125bdae1b1f3b93a581998c4ef891ecf49b6b075949420d595ad644aa5c75ac6c552e7d26086b5ee6e807df5179ee6ad36d";
+      sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bg/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b404b3f97a9dc8675e701ea2ef8bc0a57b40a2390d98573434fdc82097b12abf28e9179de3cdecd0e3c03f0cf78f47cade1e41795eaafc113ea2c954a197a1e1";
+      sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-BD/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a992b1cd5ae8c2237acc97bd1f7e61dfe2abb3b93c270e64d2ca190d8ebb84c84f8a45de5cfe7eb853f4e3e99d79eb19838c4d0a02c73f13795fbc42e79ec04a";
+      sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4188f40867dc0f23b2c52d59e569b7f030d4392bf7715d35678c69a29b85b0573bc3de6701bc550735881b1055bc66258f4c7090e5f4277ea494a60549ad98d0";
+      sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/br/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "c69b56c43aea2821d9b085c7be10d3cd8c7f609b8c053d8fe8bbce5f719001e620bc56d1e70fd85c77e01501a0df466cbca62e2e6ecff78196ad91b6c30cd8cb";
+      sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "77dab75b3c10d6ec24ddfa436dc9a6e037da3d692912d0417a6781890eef992cef250e8a38d5c1d03045dec7a073d2658a3d17a1f3e9c6d85a58c93ee7b4e19b";
+      sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ca/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "7fdf1fa6eb06cc338d06d30e8f1ca432cf1d7930a534c6c613e0f1278ccc70f1e81f74e43cce1e1b865bdcf2b9bf10607d73fb18d51e796c731a735f1e729dcc";
+      sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cak/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e4e35ea7e81190343337439a3fc95786f318c1f0dc338f2d816a9845b596473067095d0f3b446087ca8dea98dd2aff4db1c8e9a8c1f8fc5d304644b06e0042ee";
+      sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "48288a7ceb3fbd579511950b9c6d5fc133c1fcea8435994e804ea423e0cbfaf4780fdd6317bfea37a958f800a79b62792e01c7aa25a908fe62b21684d6fda060";
+      sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cy/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "ae9fc1b0c8d9b46b86b6ec9bcfd97798fbab2410c6ddfab531e364871be70a3a74c48936bfec085220bc5f37397cd83fd31da4a709f337c57a8bd944e635e7c7";
+      sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/da/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "9ea4433a5c295abba639faed9681d68fb8976b1935a131ab763f6ac12f32afab2c1ead3709ad741e04c005b19fe230e13a93334434c76a033df69d6891f960a4";
+      sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/de/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6d864350a270efabd5258157c78ac6b70bb81677939bfd381b6996fb672da240b5c7ef5780819729d3ade763b9eb5a4222c361394e48d9c1c9eafc54795be93f";
+      sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/dsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "71e5608acee3d2cac48160e71739540c6d94fe5523415d9b639a3b493910347d38f6230afc0febb444e35838e3d402fb5b3018cf437eb48632ca1d8b873ce0e9";
+      sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/el/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "37ec4073075a29403e4637b48a74bed5c470ad9722c28cfc3e1d7aa5bb63034a0660fcdd2f78d8681ad21b569bc9060be05f4e1cd3eaa3d347ba0d2304075eba";
+      sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-GB/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d2731ba3dad5298e07edb49b608f04784312e6d7e0d1219eb45dfd38a65ef62c1f9b94eff5f97bf35d75ba36cce8a831db6964251873572edc60656a87ea5ff8";
+      sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-US/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d56c62b111bb629a30e9de4098a9bfb11b9b437bab572f3e588f4d565d86979c64ec0bd4be4a54b6c1d2718e5cd91094ea046424c9e85952a4ddac2c5de8fc24";
+      sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-ZA/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "5fd28d0239dd61c54a062a0f6efd5d0f406bcb483cbcc111a631199d430839129dcdba84b4da66d35f1c5052d530da07e3bc8fdd7f177a366974bfa54cb3303b";
+      sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eo/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "327b89fbc100d238f2c1211752ea1a95d2a5c33cdbf8fba35b44ff52f2b63f2d05d84c4c714090693df28c0057e29d047278fef6d4f7e5989ec207495bac3134";
+      sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-AR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "676b58cde2394983a7be06039fcd1150f6e73c95518f5889702cf71ce780c4994629c5452924354ce9826aa5e0726a5de75321295f55004afd10f727d456659d";
+      sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-CL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "274acb52107294b4a65f22114da6e79d4bcb6b06a126002a371c983a926a2ab9882896439f94ee2d2ded5e5955d42cc4a87fc0f16c8960e42d406b773e2a5fd5";
+      sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-ES/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "d23192f6cbbad388d8f3183876a176197bd82ea0bd596ef03935eb020d5d6dbb94692335dbfc1b98e63097b7c66521154b0b3d013cc769c83bd48883646e44d8";
+      sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-MX/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "48da06b532fa91a6b482b57a8cbbdfe3ee938b353433d22af479786129bed784380134ddebbfdc58bf06f5fb81629ec982ec5e1d9b51e92d75bde44014770fa3";
+      sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/et/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "71ec513f6b3dba3145c7b424c8f331c2108d0420a75a91045b4dfa4529448923e3ccc8fcb6b90cc01d8acd18e2164755ace78aae2d8da5eec056222b4dcb1b00";
+      sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b978c35a4ccf0efb9023f22cb05ae9696c94c8a642e3deded9c44900c84d3c0a58cfbce95aaafe7e99ee108db07a6b07a76813f7c2c3d971757eca817dc10ba6";
+      sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fa/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a67f89767cbeb3b37012c4a1ee64c53e74b30de6c5a14bce2fca15a16ce11a048ccba4e55f88ce7f2a888b7248df51fcfd03e0b0715e826f6b936db953313994";
+      sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ff/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "d7b7d9b86b90d5ca609870313b2533b6feb048060902727ccf34dbbb4f180f7fdd69683e34a7483804a1ba2dae8b264ed3fbff81b065083631b234a2893d4716";
+      sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "7c555f5ebe3fd74eb782cf9f3508c9714844cbaaa3520bc1c3b60bc8d2840874850e5f92bbd1db4f2dcc4cfba211f4aba485307f898f0b47d4b9ec93b4346ec8";
+      sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "edf4f0669c732312c27aa40f4aca66aa2a676f9b019cf1d35d0deef2ab4d27f5441ca9aafb3ed896e20538f765de4715b67a546e4364f384e05748cd495b3f0c";
+      sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fy-NL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "58238d57335a18e63230fcbc67f83059e2439528f3d0ac508750dcfad4a2c48296e43c53ecc203258f917f87be78fe50dcafaabf88b6183d5d790761bd21a7ff";
+      sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ga-IE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "fe4865df72926342c139309d34c8d42187b39e098848ff32b7a0bfa21798f2d1e6dc0879dcb17ae150d977942f355c532de7d402fca3226010de8812da0ffbe0";
+      sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gd/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "68f94b2511f72a2049c07a20d120fe282a6b85a3f4284e9695ab5cbd6eadd4ee1926bcb133fc7f7394d90d2e3b47e2ee75b9860a49229012c208a144fde5e85a";
+      sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "24bb4da7b5bd5a8bbb3d5bc8ccdc96ed29d9435ef00c35c70b67e0aec5baacbb910d77daec54fddaae7d68541bf1e9d051f3b1bc80e8467cc78f3c503acc0682";
+      sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "24a6a40ecf5f8ca418c83c828cdc6905ed43afe137a0d59b036e68c093df3d8be679c64d06a71973a891d5765f9c366252959d6c95cfc8a5e9b5b145999526df";
+      sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gu-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b36047e9e9957002d33be2c540104dc530d010a646ab8d8516ecffde0b89b9a6f82bf8b94bb3f55fafb002b5c39437b7941d5fb2a0cfdccc5159c2013db1b058";
+      sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/he/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "c4d0195f72ee0afd3aa746d0a1ae5f0f7ef58646f6b4e7bffff8b1c4ac863275881c29fb7cca09ff12765e9902a6bf9404f11b45399919c9873758bbae8d017f";
+      sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hi-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7bab64a89c03e37add1c6d45756acc3ba19751313f212f3069b9c1938f7533ad1d0cb99b7bca392bb5598e2c10b461f79a47b45dbb77285f7afe12f5de781e94";
+      sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "aa68496e4e82fa5f491b0df056460ab3169be81869248fff0d3ce2a180c9b9963edfbfbe5b051846302ab713f436836dc63d40f65ac10ab185bc12e5942fc71b";
+      sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "89640b9df29c1fa946351fb74ca61e6f318ac190976f75b73aa56c66f2a67ef88b64c663cbdeea86c30c6644cf7870b59c2f9fa479ac6557e368dd486fbc4a34";
+      sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "46a6cdddc77b1d29bf85b40e6e33ab0d6b11a72d425ff59e9156cae7548288f02e3e1a54d296e4e1df1efc1e8e3c252a955c2a5be8bcb9e22d9d0e6e6b12d08e";
+      sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hy-AM/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "0697f146aa1e7d0d4aa8be28b72a642c66a15d7e6a2208a4d704ee8559f4f814a8a6cf601c58a7516816c86a374bca5f755d30e11ca668d9f77c8ea4e388f204";
+      sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ia/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "107bdfde5633415250fa0cd34ecf29dc39bceb8a5762445b9b5429f4c83690193fe433128799446029f458492d4bb2fea27d7654dcba5a7ce3007bcf40052ff2";
+      sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/id/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "6935a4805b0498d5246f73720e02a022665fa40750937d31ba35d887ab289bcfc65fd122e6c18297443a6488a92a983e00844d384611e04e2e947d20a1aa82a5";
+      sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/is/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "f04f5a86e348802e38593a0c6868a1f0c534113d4511a35ad4e831a2b3d00d8d9f7522e9813230e2abe710708d61c502337de031f934813275e0d81eea8b0379";
+      sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/it/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c0db0620e0df091f31ff576d5c87004f4c283a7455afb0098a5de50cfc8bb7879ece4d8525ec1c7f4d0af9d7934d254f114cbded07c8a93126cc6b35d6058f61";
+      sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ja/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "8a705718db55246b74ec0d1baa30e82c18b5898151d4b0ffa7f888cd53cf704444627c47a00af70eb381f9d5e4d163119ac57b23eb316524a4f949a722809d6a";
+      sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ka/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "6c0c0f2b67f327e03d874ea02fd084caac2756c21838c9787a03213961bc585db5bb0f2eb068a714dcc028a7d503836f1e7f652f60e08c0e9ab45f496e53b780";
+      sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kab/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "381d4835f2dfc3a3a553d228e821daaa6966efcb47ca5d7a625813d59db8081a81a46dfd2f246842c937f75121585124c0e7607a9bd0cafb59ab42d88a2c908c";
+      sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "82f0e6cbbc9a686be9bf76a0c582800f75edd3f608671faceb813addc0e2fb66a631082e083016118dd3aff8775432ef566319cf9834a8aaa09ed6f774ddc34d";
+      sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/km/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "7b1e81cf13051609897ad632afa18709dc6d9bbc66a6b7289188abe2f04a9bd1be159aa08342ce746930fc0cb50b19f0ff8abbea695787433acd25ad1cb48c58";
+      sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "c17d8eba5bd0c1923f958dbde4a2fca62c423213b249fa1e2829361ade947aad32cdbe257cccf5d5160dd36033e827a78c6934db6bf96f166152b967a2c5d07d";
+      sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ko/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c34c899ed8628829dcfb48b80a8b4022db9fadafc4edac4e227849ee58e06b0a9cd4fe089e080ff65e70177f7068686dab678f2e7b04dafbf1338caaea779b62";
+      sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lij/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "be96ae1d90a0e5f2308af47cae8bef7e028f01ef156bbd0497e578a0440a7362b18c63b36806ab4f1f2f1c4f8d6c9e5d9d03593ce38d1271809745cd2b266584";
+      sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lt/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "b141b12385d040596085c328ce95b4ac741ccaebe1e950f00ebe09e96a2ea5b5ade4c5438f9b622423ef658f84659bab414eb467227cd9a664542fe76471d1f1";
+      sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lv/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "ca296c7d74bfb0b4aa59da3f82dfe32b7c6564953c9850513bcb429ad68b6c867112eef7b7a2f9e1eb0bb8b7baa5f0f4caf4c9da311729e21976d70f8847bf44";
+      sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mai/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "378b32c8ca6cf0319c54dc239bfcd9edc8b834a5ecbe8c990ff8d7f7f28a89a30c53384c413352219309bf537dc4b0961ec0ea7eb2c1a4977b062c280ec130df";
+      sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "7925c3a6beca9e35cf301dc7b4ebb059fc87cd710e0243c71b65c55918d10ada853b4a4b8a1c7aa0e0c89bd8e9cd4414d5a162a430cf2222e3d5c0e824b96c73";
+      sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ml/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "aa291245bcd21bd1e1a08f1b84346ec61311df8a9fa6f9b4af5b9cc6fcac6f332472cfe009f02faa9d842383c5e0588dd7705eaffb37c030f5e20951a4c0b2f9";
+      sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3bf781cc015ff35393f2d30244bc7a8c32a0ac789b0eb9da9616b1d58bb211982db2b03873a91d500f3972d0ddc32383a8e77af4b2f453d2fb8dccb71c7532c4";
+      sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ms/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "705665d30a04883d1fe5791348edc2fe0aa1554cbf2932901b99ef1f4334a1ea9658574fc02c05ee64f6b2e3e8d487b8520b1f1963f285f6475af1334160e5b9";
+      sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/my/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "b1272fc81d358c3386cbdebad0595c7595b1d16dcee3fdef5f49776d6607f8737bdd4807140989e16873455df4a8746e00b8d3548f60cc9b22c282a5cea5a136";
+      sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nb-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "b44fc5f73c1dc3625ce50c9f6058f56f874a91e04178bb179667c6fde462a2436c6b35d58155ccabf340742f03d0ac1470b56fba405a13caaec4075567b3b8c7";
+      sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ne-NP/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "bb063e310856adfbf3fe433d60d4fa19e8d5ace617064d334faa595cffc77d39d4e4e303b82858af8a956d43956928c7fcf70f319ce4059dae9b750d46ee3cf7";
+      sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "64f3cfc10133c3fb0e566422282764679f9d1587b1aa742f24e9ba77f1f45e2c1dde4cb9b97d0eb3895b745cf2037a6dda9bcec469fce3b1ee125967f2869380";
+      sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nn-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "621c8767c5874fe530a0b4775df12be89c778915ba1f0d46271390c2208672d4211a9de501449458e88429483bf1ce453db652256c59308b3d42aa294d36649b";
+      sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/or/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "3c271c3e01611d8e046d44fc90ea3a13cc974ad3fe08aeb1c3fa5f18f104dd1481a5a5c9273bf21a29b7aa15f49791584b32bacd26063ffde1ea4846166d4225";
+      sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pa-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b0f6248a44d247c7affc35c2c4e664620e6ad5b83c4135d66f803245180052e77fa84db9d05b96475a221d5c2c288b73ad23cd7c717cabf2557282d72731cf4e";
+      sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "75726fff593b0143a192cf3947f6c83a30c77552b227ccf2e5d0869b7a48dde22b1d555fee3baae8398b5cab58e1523ba7e15db6e237ece085b920f5fbbf4094";
+      sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-BR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "701ffb3a4dd31cb6cf50a5523a384f222b6578c2d2a2870dc1e1cd985137dc9b78e81de092b1ebaee0108164bebc94aa1a8ea12981c02d49f885d8d6c9c8281c";
+      sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-PT/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a978e219a044b3e507ff5d907626939f8f9d0c3c988662ccdf394e613ca1127b2714c9973d90bd7d835e2af574d115b495c277f2d668142155b54e9098a285ae";
+      sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/rm/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f0f3d5e022793bc92cc84fa5f8b413fc1ae1ec9da126386283297b41e47d722b4399722f69a05aac216d46d1a1ee90a1b6fb57194284c157e68c84121d4d989c";
+      sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ro/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "4995938aeb22e69a6cd8a6b37b479e9d23a140b73ce2e5c4e29e6ff4f34d702db426346a596e207c2dd2e4d1bc6f1dfea00bc7ab7a2eae763ffe9fcfbf3e00b5";
+      sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ru/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "32ab4f1bca6a51d204c54f4485d9642e8ccbebc008cd56e0cba55ea3a5ae5aebca050fe1e8e2b2a7fdf04480ecbab04515c0944c0d5aae0b81e350370cc2cabd";
+      sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/si/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c2407c652b1907b3508f655c1bc831ecda75b8135dbfcaa1aed1a509a65fe2f21f22720bc80fdceede1e77c86fe39d0badf8d23f37ae48310df132c115bca448";
+      sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "f2a99e4f688a3384d23d36a87017ba0b5f28bfef2152867f8e8c8ca134a26e26052339c6edca1c24dfe5db5ce09d194675cac364a4918e46ae765d30ae3ab8d0";
+      sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "f454a9cf5a2e1528a546a82d6c2a1f4f2a668bd2b56633216d3955ec5c1c89d8734d8cdb0ee9306698aaa5060bc5f4797a9e0fa1c8967a00fd204eb035a8ba29";
+      sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/son/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "4b020b9c0f6e9bd594afc47900025dbd2223e50668f9f43f139b00f5534487806810bc933ab0258f5fcc8c277f7c5d2411d8605dd0fbae893f5809f9cc400c22";
+      sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sq/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "959f10db2a46cd8616686618d55119b01f0ac8e00e79093a949788ac903b6d3845a919a420d7517813e28b1227bd6f70fe8be9df39de8406743ddd7c65865e28";
+      sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "407e9337429d644ed75d3b2ae4953c5da3c6994e2f2ef2320becbde68662f16c711c987d4dfe2f0a784833b3c721c62cdd0080cdc1ed45a099b0c7b256411b85";
+      sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sv-SE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "f59c60fbeb82cb56ddd447d4c3d4125ea3a98e95a74e7802d73eac25489f2acd4566e01397b9ee6c70260779bb895fb104ace61f2ce9268b4f3f3758d686de1b";
+      sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ta/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "3ddc5a37d37a7db421f46d1d66d52197473f0e73c5c633ae52f12caa473ad5a4e73612a57bfc8d5d212c2b573b8308fb1b7697f78e153094230f8da64f074b64";
+      sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/te/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "c60cd73ec1eb27f9ab5e4ea63d3b4dc691c5c85d57a486ea408cda99f0c44c6c17e7d8e2a1de585dab1d4717bcdd7417b38b785c6f37722a3056a701163917b8";
+      sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/th/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0ec9c7b5143268d1266e939e5ed2617edf41c99e5bddf2d4240f49b1ee2822c4c6b269a24aa607623bc82a54b501cebc1f924a9c87fac21f95108089495414f6";
+      sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/tr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ecf26013bc9cc189c89780c4b8b01c4f25dbc8f3f6c7bf924f528fe06ebf8c4952133e8446b3e0c8a09e3fa9d84b09883b3d4665d27ca7c028d90d3fe3d7fc1b";
+      sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c8595f21e86c4d1124b882ae4f1be026756b7cecb3ed5a02b4c723c37a999e2829881fab5d6349485078965881a91cfaf28bc926b5e96245e1771a9160adec76";
+      sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ur/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "8d7be769c17135ad58a120cba472565597ddf05893f061e1efe2d2cf57c79bd8ec6f6a55e3271773fbc6a452e1794979cc619cc1a41d1bb13670b4f1badf4bb6";
+      sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uz/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "cd75b674a8ff62be2abc78cfa25873950914a7ef0fb6b652c483486c8dec888bed9276c2c7b323e5787ce802583e1d140d9414e7af9ce3ffc736e38fb1521177";
+      sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/vi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "c5f9cb57563ff819236358c0ad18992f2c3f8b80decf690ec3945b029e2dbd6bc6f564af2a5bb6394eddb8a52ed0a0cab446cbd9c49284de821a814b766b60b0";
+      sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/xh/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "9f96977530f745eeb1cdb14b40bf657e9a3d9e322b250fab799b37d801665fa47a47aa88c1f28998a29ed69523e42f300b69e008f5d2ff7f166e12b3c1fb4497";
+      sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-CN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5f3cbcfad55017b30e72ec4fb266d5b9f822804cee329c67c5998ad44a9fb6852b32764179586862cff1dc311c9a9a84259894282d57b5d2146c1d4de86442e4";
+      sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-TW/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3f48bc028239f8cc8bf2f818129b1509f0e8d895087e8e7b16375df447e0d0ba7b543679a808aa579fc92bf2fc4af6c3797eacf03c905ce3714eed897a8b8f86";
+      sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa";
     }
     ];
 }

From 418b37a77865fa2f56c5be19da8580278245f17e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 00:45:34 +0200
Subject: [PATCH 2188/2266] =?UTF-8?q?phpPackages.php-cs-fixer:=202.10.4=20?=
 =?UTF-8?q?=E2=86=92=202.11.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index c36cf6f9215..02d9ec51b3d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -383,11 +383,11 @@ let
 
   php-cs-fixer = pkgs.stdenv.mkDerivation rec {
     name = "php-cs-fixer-${version}";
-    version = "2.10.4";
+    version = "2.11.1";
 
     src = pkgs.fetchurl {
       url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-      sha256 = "00i90cbd6lkq3wssp8z2b0l2q8ahajxlrzdrqcf2jnjdhv2xms4a";
+      sha256 = "1270s5y7bgcml452lngq4fqn3a1mx15gfgmgcczjiiv0fxir446b";
     };
 
     phases = [ "installPhase" ];

From ecf5caf457331ca777f498a94dea34e9befac028 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 02:12:01 +0200
Subject: [PATCH 2189/2266] firmwareLinuxNonfree: simplify source fetching

The iwlwifi repo has been merged into linux-firmware.
---
 .../firmware-linux-nonfree/default.nix        | 49 ++-----------------
 1 file changed, 5 insertions(+), 44 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index dc2a5278fdc..206787ecb8b 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,51 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2018-03-20-${src.iwlRev}";
+  version = "2018-03-20";
 
-  # The src runCommand automates the process of building a merged repository of both
-  #
-  # https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-  # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
-  #
-  # This gives us up to date iwlwifi firmware as well as
-  # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
-  # so iwlwifi cards will fail to load on newly released kernels.
-  #
-  # To update, go to the above repositories and look for latest tags / commits, then
-  # update version to the more recent commit date
-
-  src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
-    shallowSince = "2017-10-01";
-    baseRev = "44476f2465dac9c22bce90da66e86b2b56ba34f0";
-    iwlRev = "iwlwifi-fw-2018-03-02";
-
-    # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
-    # randomly mutate the hash to break out of fixed hash, when updating
-    outputHash = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma";
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-
-    # Doing the download on a remote machine just duplicates network
-    # traffic, so don't do that.
-    preferLocalBuild = true;
-
-    nativeBuildInputs = [ cacert git gnupg ];
-  } ''
-    git init src && (
-      cd src
-      git config user.email "build-daemon@nixos.org"
-      git config user.name "Nixos Build Daemon $name"
-      git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-      git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
-      git fetch --shallow-since=$shallowSince base
-      git fetch --shallow-since=$shallowSince iwl
-      git checkout -b work $baseRev
-      git merge $iwlRev)
-    rm -rf src/.git
-    cp -a src $out
-  '';
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+    sha256 = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma";
+  };
 
   preInstall = ''
     mkdir -p $out

From deecb4c1aab780047d79978c636eeb879dd68630 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 28 Mar 2018 08:25:23 +0800
Subject: [PATCH 2190/2266] terraform: Wrap PATH of propagatedBuildInputs
 (#37861)

Plugins (namely terraform-provider-libvirt) may have a run time
dependency on external binaries.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8b3e83ea86f..00b753a61a8 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -44,6 +44,9 @@ let
         let
           actualPlugins = plugins terraform.plugins;
 
+          # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
+          wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins)));
+
           passthru = {
             withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
 
@@ -64,7 +67,8 @@ let
               buildCommand = ''
                 mkdir -p $out/bin/
                 makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
-                  --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin"
+                  --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \
+                  --prefix PATH : "${lib.makeBinPath wrapperInputs}"
               '';
 
               inherit passthru;

From ebcf2d349a497a936fecaf18a7a9c1c42cc5f83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Mar 2018 10:58:56 +0000
Subject: [PATCH 2191/2266] terraform-provider-libvirt: init at 0.3

---
 .../terraform-provider-libvirt/default.nix    | 47 +++++++++++++++++++
 .../terraform-provider-libvirt/deps.nix       | 12 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix

diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
new file mode 100644
index 00000000000..34a3be55f30
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }:
+
+# USAGE:
+# install the following package globally or in nix-shell:
+#
+#   (terraform.withPlugins (old: [terraform-provider-libvirt]))
+#
+# configuration.nix:
+#
+#   virtualisation.libvirtd.enable = true;
+#
+# terraform-provider-libvirt does not manage pools at the moment:
+#
+#   $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images
+#   $ virsh --connect "qemu:///system" pool-start default
+#
+# pick an example from (i.e ubuntu):
+# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
+
+buildGoPackage rec {
+  name = "terraform-provider-libvirt-${version}";
+  version = "0.3";
+
+  goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
+
+  src = fetchFromGitHub {
+    owner = "dmacvicar";
+    repo = "terraform-provider-libvirt";
+    rev = "v${version}";
+    sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna";
+  };
+
+  buildInputs = [ libvirt pkgconfig makeWrapper ];
+
+  goDeps = ./deps.nix;
+
+  propagatedBuildInputs = [ cdrtools ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dmacvicar/terraform-provider-libvirt;
+    description = "Terraform provider for libvirt";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
+
diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix
new file mode 100644
index 00000000000..fdf394073ab
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0";
+      sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..823030ece9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20744,6 +20744,8 @@ with pkgs;
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};
 
+  terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};
+
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
 
   terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix {

From a8375e40561e027939cd6892ee71e9d6da0b388b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 27 Mar 2018 16:33:37 +0200
Subject: [PATCH 2192/2266] caddy: 0.10.11 -> 0.10.12

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

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index ad8aeadeff0..d89e59d662e 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.11";
+  version = "0.10.12";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6";
+    sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88";
   };
 
   buildFlagsArray = ''

From e6f4614e8582e0ea11995a6756b7f25abbc391cc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 01:02:40 +0200
Subject: [PATCH 2193/2266] lib/modules: fix typo

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

diff --git a/lib/modules.nix b/lib/modules.nix
index 654c4c588de..acd07f732bd 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -660,7 +660,7 @@ rec {
   doRename = { from, to, visible, warn, use }:
     let
       toOf = attrByPath to
-        (abort "Renaming error: option `${showOption to}' does not exists.");
+        (abort "Renaming error: option `${showOption to}' does not exist.");
     in
       { config, options, ... }:
       { options = setAttrByPath from (mkOption {

From 70c6f6572dda0f2516bad812857ef814ec710a12 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 02:30:50 +0200
Subject: [PATCH 2194/2266] nixos/version: fix nixops pre 1.6 compatibility

We should be able to deploy a NixOS 18.03 system with the current nixops
stable release. Some options were renamed, so instead of
`mkRenamedOptionModule` we introduce them as read-only interal options
that won't be rendered in the manual.

Only the options that are needed to make nixops evaluations succeed were
added.

This commit should probably be reverted after or before the 18.09 release,
depending on the nixops 1.6 release.

The user will not get the warning that these have been renamed but
this change is mentioned in the release notes.

Fixes #34253.
---
 nixos/modules/misc/version.nix | 15 +++++++++++++++
 nixos/modules/rename.nix       |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index b8f0a223c91..7519d917698 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -16,6 +16,21 @@ in
 
   options.system = {
 
+    # XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations
+    # XXX: Remove after nixops has been bumped to a compatible version
+    nixosVersion = mkOption {
+      readOnly = true;
+      internal = true;
+      type = types.str;
+      default = config.system.nixos.version;
+    };
+    nixosVersionSuffix = mkOption {
+      readOnly = true;
+      internal = true;
+      type = types.str;
+      default = config.system.nixos.versionSuffix;
+    };
+
     nixos.version = mkOption {
       internal = true;
       type = types.str;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b0ca274b939..28863434375 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -196,9 +196,9 @@ with lib;
     (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
 
     # misc/version.nix
-    (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
+    #(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
     (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
-    (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
+    #(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
     (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
     (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
     (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])

From f7342a362507e2680496be23dee736c59c31d104 Mon Sep 17 00:00:00 2001
From: Garrett Berg <googberg@gmail.com>
Date: Tue, 27 Mar 2018 19:07:19 -0600
Subject: [PATCH 2195/2266] docs: extend rust docs (#35587)

- Add example for setting up nix-shell, improve rust docs
- Rust docs: add gcc rust dependencies and fix carnix commands
- Fix a typo with the carnix command.
---
 doc/languages-frameworks/rust.section.md | 86 +++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index f0498eac5b1..b77c41e9b22 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -16,6 +16,12 @@ cargo
 into the `environment.systemPackages` or bring them into
 scope with `nix-shell -p rustc cargo`.
 
+> If you are using NixOS and you want to use rust without a nix expression you
+> probably want to add the following in your `configuration.nix` to build
+> crates with C dependencies.
+>
+>     environment.systemPackages = [binutils gcc gnumake openssl pkgconfig]
+
 For daily builds (beta and nightly) use either rustup from
 nixpkgs or use the [Rust nightlies
 overlay](#using-the-rust-nightlies-overlay).
@@ -76,7 +82,7 @@ an example for a minimal `hello` crate:
      Compiling hello v0.1.0 (file:///tmp/hello)
       Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
     $ carnix -o hello.nix --src ./. Cargo.lock --standalone
-    $ nix-build hello.nix
+    $ nix-build hello.nix -A hello_0_1_0
 
 Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
 
@@ -276,6 +282,84 @@ features, we would write:
 
 Where `diesel.nix` is the file generated by Carnix, as explained above.
 
+
+## Setting Up `nix-shell`
+Oftentimes you want to develop code from within `nix-shell`. Unfortunately
+`buildRustCrate` does not support common `nix-shell` operations directly
+(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945))
+so we will use `stdenv.mkDerivation` instead.
+
+Using the example `hello` project above, we want to do the following:
+- Have access to `cargo` and `rustc`
+- Have the `openssl` library available to a crate through it's _normal_
+  compilation mechanism (`pkg-config`).
+
+A typical `shell.nix` might look like:
+
+```
+with import <nixpkgs> {};
+
+stdenv.mkDerivation {
+  name = "rust-env";
+  buildInputs = [
+    rustc cargo
+
+    # Example Additional Dependencies
+    pkgconfig openssl
+  ];
+
+  # Set Environment Variables
+  RUST_BACKTRACE = 1;
+}
+```
+
+You should now be able to run the following:
+```
+$ nix-shell --pure
+$ cargo build
+$ cargo test
+```
+
+### Controlling Rust Version Inside `nix-shell`
+To control your rust version (i.e. use nightly) from within `shell.nix` (or
+other nix expressions) you can use the following `shell.nix`
+
+```
+# Latest Nightly
+with import <nixpkgs> {};
+let src = fetchFromGitHub {
+      owner = "mozilla";
+      repo = "nixpkgs-mozilla";
+      # commit from: 2018-03-27
+      rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe";
+      sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw";
+   };
+in
+with import "${src.out}/rust-overlay.nix" pkgs pkgs;
+stdenv.mkDerivation {
+  name = "rust-env";
+  buildInputs = [
+    # Note: to use use stable, just replace `nightly` with `stable`
+    latest.rustChannels.nightly.rust
+
+    # Add some extra dependencies from `pkgs`
+    pkgconfig openssl
+  ];
+
+  # Set Environment Variables
+  RUST_BACKTRACE = 1;
+}
+```
+
+Now run:
+```
+$ rustc --version
+rustc 1.26.0-nightly (188e693b3 2018-03-26)
+```
+
+To see that you are using nightly.
+
+
 ## Using the Rust nightlies overlay
 
 Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.

From d390ee74e3258a719c7d26dab80c107e7a7e72df Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 27 Mar 2018 21:24:27 -0400
Subject: [PATCH 2196/2266] Added bionic dynamic linker

---
 pkgs/build-support/bintools-wrapper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index ae910b76c70..5c0436b73dd 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -53,6 +53,7 @@ let
   dynamicLinker =
     /**/ if libc == null then null
     else if targetPlatform.libc == "musl"             then "${libc_lib}/lib/ld-musl-*"
+    else if targetPlatform.libc == "bionic"           then "/system/bin/linker"
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".

From 169468c40681b551ac906dfe68db338c56661c2e Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 28 Mar 2018 01:14:23 +0200
Subject: [PATCH 2197/2266] apache-httpd: fix typo in config servedFiles

---
 .../services/web-servers/apache-httpd/per-server-options.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 1d53ce65900..4bbd041b6e0 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -118,7 +118,7 @@ with lib;
     default = [];
     example = [
       { urlPath = "/foo/bar.png";
-        files = "/home/eelco/some-file.png";
+        file = "/home/eelco/some-file.png";
       }
     ];
     description = ''

From 28c00f8f3b4b1f619a7c534767a5ef515ac42ee5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 06:53:07 +0200
Subject: [PATCH 2198/2266] monero: 0.11.1.0 -> 0.12.0.0

---
 .../altcoins/monero/build-wallet-rpc.patch    | 78 -------------------
 pkgs/applications/altcoins/monero/default.nix | 21 +++--
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 10 insertions(+), 90 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/monero/build-wallet-rpc.patch

diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
deleted file mode 100644
index 5436332db80..00000000000
--- a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
-index 63908005..f6656d5c 100644
---- a/src/wallet/CMakeLists.txt
-+++ b/src/wallet/CMakeLists.txt
-@@ -86,43 +86,40 @@ target_link_libraries(wallet
-     ${EXTRA_LIBRARIES})
- add_dependencies(wallet version)
- 
--if (NOT BUILD_GUI_DEPS)
--  set(wallet_rpc_sources
--    wallet_rpc_server.cpp)
-+set(wallet_rpc_sources
-+  wallet_rpc_server.cpp)
- 
--  set(wallet_rpc_headers)
-+set(wallet_rpc_headers)
- 
--  set(wallet_rpc_private_headers
--    wallet_rpc_server.h)
-+set(wallet_rpc_private_headers
-+  wallet_rpc_server.h)
- 
--  monero_private_headers(wallet_rpc_server
--    ${wallet_rpc_private_headers})
--  monero_add_executable(wallet_rpc_server
--    ${wallet_rpc_sources}
--    ${wallet_rpc_headers}
--    ${wallet_rpc_private_headers})
--
--  target_link_libraries(wallet_rpc_server
--    PRIVATE
--      wallet
--      epee
--      rpc
--      cryptonote_core
--      cncrypto
--      common
--      ${Boost_CHRONO_LIBRARY}
--      ${Boost_PROGRAM_OPTIONS_LIBRARY}
--      ${Boost_FILESYSTEM_LIBRARY}
--      ${Boost_THREAD_LIBRARY}
--      ${CMAKE_THREAD_LIBS_INIT}
--      ${EXTRA_LIBRARIES})
--  add_dependencies(wallet_rpc_server version)
--  set_property(TARGET wallet_rpc_server
--    PROPERTY
--      OUTPUT_NAME "monero-wallet-rpc")
--  install(TARGETS wallet_rpc_server DESTINATION bin)
--endif()
-+monero_private_headers(wallet_rpc_server
-+  ${wallet_rpc_private_headers})
-+monero_add_executable(wallet_rpc_server
-+  ${wallet_rpc_sources}
-+  ${wallet_rpc_headers}
-+  ${wallet_rpc_private_headers})
- 
-+target_link_libraries(wallet_rpc_server
-+  PRIVATE
-+    wallet
-+    epee
-+    rpc
-+    cryptonote_core
-+    cncrypto
-+    common
-+    ${Boost_CHRONO_LIBRARY}
-+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-+    ${Boost_FILESYSTEM_LIBRARY}
-+    ${Boost_THREAD_LIBRARY}
-+    ${CMAKE_THREAD_LIBS_INIT}
-+    ${EXTRA_LIBRARIES})
-+add_dependencies(wallet_rpc_server version)
-+set_property(TARGET wallet_rpc_server
-+  PROPERTY
-+    OUTPUT_NAME "monero-wallet-rpc")
-+install(TARGETS wallet_rpc_server DESTINATION bin)
- 
- # build and install libwallet_merged only if we building for GUI
- if (BUILD_GUI_DEPS)
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 57a058bada6..48932afaa0e 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,34 +1,31 @@
-{ stdenv, fetchpatch, fetchFromGitHub, cmake
-, boost, miniupnpc, openssl, pkgconfig, unbound
-, IOKit
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, git
+, boost, miniupnpc, openssl, unbound, cppzmq, zeromq, pcsclite
+, readline, IOKit
 }:
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.11.1.0";
+  version = "0.12.0.0";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero";
     rev    = "v${version}";
-    sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
+    sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig git ];
 
-  buildInputs = [ boost miniupnpc openssl unbound ]
+  buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline ]
     ++ stdenv.lib.optional stdenv.isDarwin IOKit;
 
-  patches = [
-    ./build-wallet-rpc.patch # fixed in next release
-  ];
-
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBUILD_GUI_DEPS=ON"
+    "-DReadline_ROOT_DIR=${readline.dev}"
   ];
 
-  doCheck = false;
+  hardeningDisable = [ "fortify" ];
 
   installPhase = ''
     make install
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adb421eda1c..c9802730195 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16690,6 +16690,7 @@ with pkgs;
 
   monero = callPackage ../applications/altcoins/monero {
     inherit (darwin.apple_sdk.frameworks) IOKit;
+    boost = boost15x;
   };
 
   monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };

From d12daee695fb53b7d8a719b4c518465d621ae946 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 06:54:22 +0200
Subject: [PATCH 2199/2266] xmr-stak: 2.2.0 -> 2.3.0

---
 pkgs/applications/misc/xmr-stak/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index c985f601447..98b3af52d6e 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -2,18 +2,18 @@
 , opencl-headers, ocl-icd, hwloc, cudatoolkit
 , devDonationLevel ? "0.0"
 , cudaSupport ? false
-, openclSupport ? false
+, openclSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
-    rev = "v${version}";
-    sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn";
+    rev = "${version}";
+    sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 5d86c50057173cb8bf82012e535ea991d9bb3f6b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 06:59:30 +0200
Subject: [PATCH 2200/2266] xmrig: init at 2.5.2

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

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
new file mode 100644
index 00000000000..42d9e448991
--- /dev/null
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd
+, donateLevel ? 0
+}:
+
+stdenv.mkDerivation rec {
+  name = "xmrig-${version}";
+  version = "2.5.2";
+
+  src = fetchFromGitHub {
+    owner = "xmrig";
+    repo = "xmrig";
+    rev = "v${version}";
+    sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libuv libmicrohttpd ];
+
+  postPatch = ''
+    substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};"
+  '';
+
+  installPhase = ''
+    install -vD xmrig $out/bin/xmrig
+  '';
+
+  meta = with lib; {
+    description = "Monero (XMR) CPU miner";
+    homepage = "https://github.com/xmrig/xmrig";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9802730195..137066a11db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16699,6 +16699,8 @@ with pkgs;
     hwloc = hwloc-nox;
   };
 
+  xmrig = callPackage ../applications/misc/xmrig { };
+
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
   monkeysphere = callPackage ../tools/security/monkeysphere { };

From b92a9e150465f176acad2e41e62f71df1f2e3a57 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Mar 2018 22:09:13 -0700
Subject: [PATCH 2201/2266] tachyon: 0.98.9 -> 0.99b2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/tachyon/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/xpwz7yb6jqisimg2rw0xn5zh8n8i89fb-tachyon-0.99b2/bin/tachyon help` got 0 exit code
- directory tree listing: https://gist.github.com/755515ff78d7dad0ef3e73cb3333c2d4
---
 pkgs/development/libraries/tachyon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index b1649da6459..e4a24279c9b 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "tachyon-${version}";
-  version = "0.98.9";
+  version = "0.99b2";
   src = fetchurl {
     url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz";
-    sha256 = "1ms0xr4ibrzz291ibm265lyjrdjrmhfrx0a70hwykhsdxn6jk8y6";
+    sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
   };
   buildInputs = [];
   preBuild = "cd unix";

From 14e24db9dba463cc6c6a37d5fe3914dfe10b983a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Mar 2018 22:34:26 -0700
Subject: [PATCH 2202/2266] telepathy-gabble: 0.18.3 -> 0.18.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/telepathy-gabble/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.18.4 with grep in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- found 0.18.4 in filename of file in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- directory tree listing: https://gist.github.com/92190024cdfe17a3e79730f988d904f6
---
 .../instant-messengers/telepathy/gabble/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 40de405e0d2..2d880bef753 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -2,11 +2,11 @@
 , sqlite, libsoup, libnice, gnutls}:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.18.3";
+  name = "telepathy-gabble-0.18.4";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
+    sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
   };
 
   nativeBuildInputs = [ pkgconfig libxslt ];

From 43c6a3f23a3475736af39119c3189bf44fb3c8fd Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 00:39:11 -0700
Subject: [PATCH 2203/2266] php: 7.2.3 -> 7.2.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar help` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phpdbg -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phpdbg --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -h` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --help` and found version 7.2.4
- found 7.2.4 with grep in /nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4
- directory tree listing: https://gist.github.com/3c197892ad9174dae3d07c1dd61b418c
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index e87d4e89a46..edbb26a3bdd 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -353,7 +353,7 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.3";
-    sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa";
+    version = "7.2.4";
+    sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i";
   };
 }

From d12cab3bb185ebe62b366fe36aca50ec085dbdee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Mar 2018 09:24:22 +0100
Subject: [PATCH 2204/2266] buildRustCrate: remove ancient test guards

Let's leave x"" to the 1990s, where they belong
---
 pkgs/build-support/rust/build-rust-crate.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 75563e34c38..b07a09d6355 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -19,7 +19,7 @@ let makeDeps = dependencies:
       echo_build_heading() {
        start=""
        end=""
-       if [[ x"${colors}" = x"always" ]]; then
+       if [[ "${colors}" == "always" ]]; then
          start="$(printf '\033[0;1;32m')" #set bold, and set green.
          end="$(printf '\033[0m')" #returns to "normal"
        fi
@@ -34,7 +34,7 @@ let makeDeps = dependencies:
       noisily() {
         start=""
         end=""
-        if [[ x"${colors}" = x"always" ]]; then
+        if [[ "${colors}" == "always" ]]; then
           start="$(printf '\033[0;1;32m')" #set bold, and set green.
           end="$(printf '\033[0m')" #returns to "normal"
         fi
@@ -194,7 +194,7 @@ let makeDeps = dependencies:
       bold=""
       green=""
       boldgreen=""
-      if [[ "${colors}" = "always" ]]; then
+      if [[ "${colors}" == "always" ]]; then
         norm="$(printf '\033[0m')" #returns to "normal"
         bold="$(printf '\033[0;1m')" #set bold
         green="$(printf '\033[0;32m')" #set green

From 93a77eee1aa472a9a85a0546fc24681177716f5b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 28 Mar 2018 13:04:55 +0200
Subject: [PATCH 2205/2266] nixops: update to 1.6

(cherry picked from commit 2a28e657421be06a0f2b1189344f454e12d0e2f7)
---
 pkgs/tools/package-management/nixops/default.nix | 4 ++--
 pkgs/tools/package-management/nixops/generic.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index daecb8746ea..ec82115087b 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5.2";
+  version = "1.6";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb";
+    sha256 = "0f8ql1a9maf9swl8q054b1haxqckdn78p2xgpwl7paxc98l67i7x";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index d9c9661d41a..f392e0f50ed 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -25,6 +25,7 @@ python2Packages.buildPythonApplication {
       pysqlite
       datadog
       digital-ocean
+      libvirt
     ];
 
   doCheck = false;

From a668ca4aace155f30c90337924780ecb2a3cbbc6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 07:14:40 -0700
Subject: [PATCH 2206/2266] dovecot: 2.3.0.1 -> 2.3.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/dovecot/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/c20ip7wyymd39l7zisx38ky3bxp1sybv-dovecot-2.3.1/bin/dovecot --help` got 0 exit code
- ran `/nix/store/c20ip7wyymd39l7zisx38ky3bxp1sybv-dovecot-2.3.1/bin/dovecot --version` and found version 2.3.1
- found 2.3.1 with grep in /nix/store/c20ip7wyymd39l7zisx38ky3bxp1sybv-dovecot-2.3.1
- directory tree listing: https://gist.github.com/6d90467ee7649d7efc0a48eeacfc42c8
---
 pkgs/servers/mail/dovecot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 0060a59d807..c9065d04161 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.0.1";
+  name = "dovecot-2.3.1";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb";
+    sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8";
   };
 
   preConfigure = ''

From 96d4f13fc52e4827b71808dc669baf0ad91dbaaa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 17:41:03 +0200
Subject: [PATCH 2207/2266] dovecot_pigeonhole: 0.5.0.1 -> 0.5.1

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

diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 92b404d0f65..af9ff3b257b 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.5.0.1";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan";
+    sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73";
   };
 
   buildInputs = [ dovecot openssl ];

From 6a15c8d6f7b339a542b0f8f25c12a2d6d1969715 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 19:16:41 +0200
Subject: [PATCH 2208/2266] nixos/dovecot: set group in config

The dovecot bump to 2.3.1 caused the dovecot service to fail to start
because it would try to chgrp sockets to dovecot whereas our default
dovecot group is called dovecot2.
---
 nixos/modules/services/mail/dovecot.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index b42c73b8666..543e732127a 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -30,6 +30,7 @@ let
 
     ''
       default_internal_user = ${cfg.user}
+      default_internal_group = ${cfg.group}
       ${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"}
       ${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"}
 

From 025881c23649b1c99930081ec9dc6b9fcd04afb4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 19:44:30 +0200
Subject: [PATCH 2209/2266] treewide: remove placeholder usage

Temporary compatibility fix, continuation of https://github.com/NixOS/nixpkgs/pull/37860
---
 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 3 +++
 pkgs/development/libraries/pipewire/default.nix              | 2 +-
 pkgs/os-specific/linux/selinux-sandbox/default.nix           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 8abb51b56e7..7a01d73ebf4 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
   ];
 
+  postPatch = ''
+    cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
+  '';
 
   preFixup = ''
     for f in $(find $out/libexec/ -type f -executable); do
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 2c677ad7474..7e7314c936d 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
     "-Denable_gstreamer=true"
   ];
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
 
   FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
 
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
index 71d2ee6e80a..431f5e9ef51 100644
--- a/pkgs/os-specific/linux/selinux-sandbox/default.nix
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace "-m 4755" "-m 755"
     substituteInPlace sandboxX.sh \
       --replace "#!/bin/sh" "#!${bash}/bin/sh" \
-      --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
+      --replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \
       --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
       --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
       --replace "secon" "${policycoreutils}/bin/secon"

From 30f8c93ad4d7f6e0c785a945b80cef2e8556e7ec Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:06:26 +0200
Subject: [PATCH 2210/2266] =?UTF-8?q?shotwell:=200.28.0=20=E2=86=92=200.28?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 5a24a364587..c214fa58bc9 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "shotwell";
-  version = "0.28.0";
+  version = "0.28.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg";
+    sha256 = "1ywikm5kdsr7q8hklh146x28rzvqkqfjs8kdpw7zcc15ri0dkzya";
   };
 
   nativeBuildInputs = [

From 1449a479789c967c469536d747dd2814a713e0ed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:06:51 +0200
Subject: [PATCH 2211/2266] =?UTF-8?q?orca:=203.27.91=20=E2=86=92=203.28.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 9bc9218305c..109c0afa12d 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -10,7 +10,7 @@
 with lib;
 let
   pname = "orca";
-  version = "3.27.91";
+  version = "3.28.0";
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
@@ -18,7 +18,7 @@ in buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg";
+    sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2";
   };
 
   patches = [

From 78190d2e8789d0f06b63a48b7594fe7e0b8c5b2e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:08:42 +0200
Subject: [PATCH 2212/2266] evince: add comic support

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

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index c60087cf47b..59a7c6806ef 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, intltool, libxml2
 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook
+, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
 , librsvg, gobjectIntrospection, yelp-tools
 , recentListSize ? null # 5 is not enough, allow passing a different number
 , supportXPS ? false    # Open XML Paper Specification via libgxps
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib gtk3 pango atk gdk_pixbuf libxml2
     gnome3.gsettings-desktop-schemas
-    poppler ghostscriptX djvulibre libspectre
+    poppler ghostscriptX djvulibre libspectre libarchive
     libsecret librsvg gnome3.adwaita-icon-theme
   ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
 

From 6d1c022390e875b7738e49165c885ff41a7265a8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:09:22 +0200
Subject: [PATCH 2213/2266] =?UTF-8?q?gnome3.gnome-keyring:=203.28.0.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 20ff00ff218..740748631ee 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-${version}";
-  version = "3.28.0.1";
+  version = "3.28.0.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i";
+    sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8";
   };
 
   passthru = {

From 5d4f6024e887a34d8f0a4a66c841ae7ca4e81418 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:10:05 +0200
Subject: [PATCH 2214/2266] =?UTF-8?q?gnome3.gnome-themes-extra:=203.27.92?=
 =?UTF-8?q?=20=E2=86=92=203.28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index dd11da3b11e..0503d3baa6c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "gnome-themes-extra";
-  version = "3.27.92";
+  version = "3.28";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm";
+    sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw";
   };
 
   passthru = {

From d70b9e458a8e560e86bb3883be0041391f782c4f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:10:55 +0200
Subject: [PATCH 2215/2266] =?UTF-8?q?gnome3.libgweather:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 7c513e9398a..fbae8fbcfbd 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "libgweather";
-  version = "3.28.0";
+  version = "3.28.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr";
+    sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];

From 9ccc72674961f4aaf780c2be44b37174cc3ec7a0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:12:13 +0200
Subject: [PATCH 2216/2266] =?UTF-8?q?gnome3.libgnome-games-support:=201.4.?=
 =?UTF-8?q?0=20=E2=86=92=201.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 5712d612e9a..d777ec0baae 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "libgnome-games-support";
-  version = "1.4.0";
+  version = "1.4.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x";
+    sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;

From 6e8a13f7e5c0fb4d1791eb0f44fa013cb39a1035 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:26:36 +0200
Subject: [PATCH 2217/2266] =?UTF-8?q?gnome3.gpaste:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index b24b51a0c33..361b1ac97f6 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.28.0";
+  version = "3.28.1";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir";
+    sha256 = "19rdi2syshrk32hqnjh63fm0wargw546j5wlsnsg1axml0x1xww9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];

From 5caa22fe0a908ede1889d32fa773b9aef675a56e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 17 Mar 2018 20:34:10 +0100
Subject: [PATCH 2218/2266] Revert restrictive validation behavior for DM/WM
 defaults in the X module

The original idea behind this change (described in ticket #11064) was to
improve the assertions to avoid that users of the X server accidentally
forget to configure a DM or WM.

However this caused several issues with setups that require X, but no DM
or WM. The keymap testcases became instable as well as now disabling DMs
needs to be done explicitly.
(see https://github.com/NixOS/nixpkgs/pull/31268#issuecomment-347080036)

In the end the idea behind the change and #11064 was obviously a
mistake, so reverting it completely for now should be fine.
---
 nixos/doc/manual/release-notes/rl-1803.xml         |  9 ---------
 .../services/x11/desktop-managers/default.nix      |  6 +++---
 .../services/x11/window-managers/default.nix       |  4 +---
 nixos/modules/services/x11/xserver.nix             | 14 --------------
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 60c17c60413..67e04220681 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -418,15 +418,6 @@ following incompatible changes:</para>
       have been added to set up static routing.
     </para>
   </listitem>
-  <listitem>
-    <para>
-      The option <option>services.xserver.desktopManager.default</option> is now
-      <literal>none</literal> by default. An assertion failure is thrown if WM's
-      and DM's default are <literal>none</literal>.
-      To explicitly run a plain X session without and DM or WM, the newly
-      introduced option <option>services.xserver.plainX</option> must be set to true.
-    </para>
-  </listitem>
   <listitem>
     <para>
       The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default.
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 4622c7b760f..f435e85f6b8 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -87,11 +87,11 @@ in
 
       default = mkOption {
         type = types.str;
-        default = "none";
-        example = "plasma5";
+        default = "";
+        example = "none";
         description = "Default desktop manager loaded if none have been chosen.";
         apply = defaultDM:
-          if defaultDM == "none" && cfg.session.list != [] then
+          if defaultDM == "" && cfg.session.list != [] then
             (head cfg.session.list).name
           else if any (w: w.name == defaultDM) cfg.session.list then
             defaultDM
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index bc420831ad8..e617e55a7a5 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -62,9 +62,7 @@ in
         example = "wmii";
         description = "Default window manager loaded if none have been chosen.";
         apply = defaultWM:
-          if defaultWM == "none" && cfg.session != []  then
-            (head cfg.session).name
-          else if any (w: w.name == defaultWM) cfg.session then
+          if any (w: w.name == defaultWM) cfg.session then
             defaultWM
           else
             throw "Default window manager (${defaultWM}) not found.";
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index f96d3c5afba..e7918cf9d31 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -161,15 +161,6 @@ in
         '';
       };
 
-      plainX = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether the X11 session can be plain (without DM/WM) and
-          the Xsession script will be used as fallback or not.
-        '';
-      };
-
       autorun = mkOption {
         type = types.bool;
         default = true;
@@ -561,11 +552,6 @@ in
                 + "${toString (length primaryHeads)} heads set to primary: "
                 + concatMapStringsSep ", " (x: x.output) primaryHeads;
       })
-      { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX;
-        message = "Either the desktop manager or the window manager shouldn't be `none`! "
-                + "To explicitly allow this, you can also set `services.xserver.plainX` to `true`. "
-                + "The `default` value looks for enabled WMs/DMs and select the first one.";
-      }
     ];
 
     environment.etc =

From 70e8face4c210d372d2b8085a00a70a5ce5c8c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 25 Mar 2018 07:57:11 +0200
Subject: [PATCH 2219/2266] makeDBusConf: Look for .conf files in
 share/dbus-1/system.d/ too

Some packages install their dbus config files to `share/dbus-1/system.d` instead
of `etc/dbus-1/system.d`, so look in both places.
---
 pkgs/development/libraries/dbus/make-system-conf.xsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl
index 3d8b823437d..dd644b4bce7 100644
--- a/pkgs/development/libraries/dbus/make-system-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-system-conf.xsl
@@ -27,6 +27,7 @@
       <xsl:for-each select="str:tokenize($serviceDirectories)">
         <servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
         <includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
+        <includedir><xsl:value-of select="." />/share/dbus-1/system.d</includedir>
       </xsl:for-each>
     </busconfig>
   </xsl:template>

From f4b9da7c6a0f623e2e7175dbdecf5dc61da97639 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Mon, 26 Mar 2018 14:33:44 +0300
Subject: [PATCH 2220/2266] skypeforlinux: 8.17.0.2 -> 8.18.0.6

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

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 8cd9eb84b83..fc8a601f1be 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -6,7 +6,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.17.0.2";
+  version = "8.18.0.6";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -57,7 +57,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp";
+        sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";

From d33a26b370d4c17809b5e2a01426addd7125c4d0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 28 Mar 2018 20:55:39 +0200
Subject: [PATCH 2221/2266] python-celery: fix darwin build

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 44613dd4e5b..7f3fb46d1e1 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect,
   pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
-}: 
+}:
+
 buildPythonPackage rec {
   pname = "celery";
   version = "4.1.0";
@@ -11,11 +12,11 @@ buildPythonPackage rec {
   };
 
   # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
-  preCheck = ''
+  preCheck = stdenv.lib.optionalString stdenv.isLinux ''
     export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
       LD_PRELOAD=${libredirect}/lib/libredirect.so
   '';
-  postCheck = ''
+  postCheck = stdenv.lib.optionalString stdenv.isLinux ''
     unset NIX_REDIRECTS LD_PRELOAD
   '';
 

From 0aec67c7d11c397c086b978662579ed1b0af1225 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 09:36:39 -0700
Subject: [PATCH 2222/2266] babeltrace: 1.5.4 -> 1.5.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/babeltrace/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5/bin/babeltrace -h` got 0 exit code
- ran `/nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5/bin/babeltrace --help` got 0 exit code
- ran `/nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5/bin/babeltrace -h` and found version 1.5.5
- ran `/nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5/bin/babeltrace --help` and found version 1.5.5
- ran `/nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5/bin/babeltrace-log -h` got 0 exit code
- ran `/nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5/bin/babeltrace-log -h` and found version 1.5.5
- found 1.5.5 with grep in /nix/store/yhd43sy0rj5fr0gwh298l959b7bmcsh8-babeltrace-1.5.5
- directory tree listing: https://gist.github.com/d849a2026946a7542bc3e2e6a586d713
---
 pkgs/development/tools/misc/babeltrace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index d4a8d483e2e..48cf4b31a17 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
 
 stdenv.mkDerivation rec {
-  name = "babeltrace-1.5.4";
+  name = "babeltrace-1.5.5";
 
   src = fetchurl {
     url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
-    sha256 = "1h8zi7afilbfx4jvdlhhgysj6x01w3799mdk4mdcgax04fch6hwn";
+    sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 50e8d2ad8d5e1fdabd1f36f35ec87554be5a6a51 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Mar 2018 16:54:36 -0400
Subject: [PATCH 2223/2266] linux: 4.4.124 -> 4.4.125

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 766eef83ddf..e71110385f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.124";
+  version = "4.4.125";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0a91phmdpa82s3mqnyw2an3j4v18cksvy1akdyxf5w2byq51qd2r";
+    sha256 = "0rrq9hwpsz0xjl10rf2c3brlkxq074cq3cr1gqp98na6zazl9xrx";
   };
 } // (args.argsOverride or {}))

From 97c840eeeba6cb7ce14c99b5ce8007e0cc6f8fba Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Mar 2018 16:54:50 -0400
Subject: [PATCH 2224/2266] linux: 4.9.90 -> 4.9.91

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 4832c79d02f..47617410b1b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.90";
+  version = "4.9.91";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0mbl0d6z8yx7bn5m804kv17bh64pd0w0nc8lls4pw335jx7hkc0v";
+    sha256 = "0clqndkj24a9752bc8x7cwdrdl38yarpvwx2yqkc98czxi9agjk0";
   };
 } // (args.argsOverride or {}))

From 6baf64f8f17020a8a7e346d56831f03e3371db39 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Mar 2018 16:55:06 -0400
Subject: [PATCH 2225/2266] linux: 4.14.30 -> 4.14.31

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index faf15156458..c3eb05b1ad3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.30";
+  version = "4.14.31";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ib6zqn1psffgffmvqmh9x3wdh15yd8z0gwwkamvgwa8xcpv0nvw";
+    sha256 = "0h30z1dlrr9zdxvqlk5lq5m9db3k6n9ci39mlsjkd5kx4ia8lnyd";
   };
 } // (args.argsOverride or {}))

From e6ec9444448026135ac24e7834d12bcefe5ce13f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Mar 2018 16:55:23 -0400
Subject: [PATCH 2226/2266] linux: 4.15.13 -> 4.15.14

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index f88ddadca8f..36c1e3f7ac3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.13";
+  version = "4.15.14";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1iam2adh6ghzv0lgh60c03pzrhv4axxw6k78xh209v889xdfjbhx";
+    sha256 = "188nnzcclccka37rnx792b4p41smv9sll9h4glzfg4vwz7y54x2a";
   };
 } // (args.argsOverride or {}))

From decfd44b196796b8f80aa436f1a836d45f20d2f1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Mar 2018 16:55:38 -0400
Subject: [PATCH 2227/2266] linux-copperhead: 4.15.13.a -> 4.15.14.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 680c5d8d64f..67cb7baf2d7 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.13";
+  version = "4.15.14";
   revision = "a";
-  sha256 = "0zmamaf600jja3m2i41rysxq0rqixiz1vvd1nf5bd8piqkd8dbvf";
+  sha256 = "1y5w02gr108098p26l6gq8igrk435ljlqiazxwha6lgajk1rgpv2";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 0a9d7f0809fdf1e0deee703beeb6d758ec3553a5 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Tue, 27 Mar 2018 00:25:53 +0100
Subject: [PATCH 2228/2266] zerotier module: add option to join networks and
 open port

---
 .../services/networking/zerotierone.nix       | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 86e0204ec2f..cd1617b8e2b 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -7,6 +7,16 @@ let
 in
 {
   options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
+
+  options.services.zerotierone.joinNetworks = mkOption {
+    default = [];
+    example = [ "a8a2c3c10c1a68de" ];
+    type = types.listOf types.str;
+    description = ''
+      List of ZeroTier Network IDs to join on startup
+    '';
+  };
+
   options.services.zerotierone.package = mkOption {
     default = pkgs.zerotierone;
     defaultText = "pkgs.zerotierone";
@@ -22,12 +32,13 @@ in
       path = [ cfg.package ];
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      preStart =
-        ''
-        mkdir -p /var/lib/zerotier-one
+      preStart = ''
+        mkdir -p /var/lib/zerotier-one/networks.d
         chmod 700 /var/lib/zerotier-one
         chown -R root:root /var/lib/zerotier-one
-        '';
+      '' + (concatMapStrings (netId: ''
+        touch "/var/lib/zerotier-one/networks.d/${netId}.conf"
+      '') cfg.joinNetworks);
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/zerotier-one";
         Restart = "always";
@@ -38,6 +49,9 @@ in
     # ZeroTier does not issue DHCP leases, but some strangers might...
     networking.dhcpcd.denyInterfaces = [ "zt0" ];
 
+    # ZeroTier receives UDP transmissions on port 9993 by default
+    networking.firewall.allowedUDPPorts = [ 9993 ];
+
     environment.systemPackages = [ cfg.package ];
   };
 }

From 4d5f7ce09f59862a636ef7aaaac7958ce2f12936 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 28 Mar 2018 23:10:10 +0200
Subject: [PATCH 2229/2266] radeontop: 2016-10-28 -> 2018-03-25

---
 pkgs/os-specific/linux/radeontop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index c87bec3a526..504d2595785 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "radeontop-${version}";
-  version = "2016-10-28";
+  version = "2018-03-25";
 
   src = fetchFromGitHub {
-    sha256 = "0y4rl8pm7p22s1ipyb75mlsk9qb6j4rd6nlqb3digmimnyxda1q3";
-    rev = "v1.0";
+    sha256 = "0s41xy9nrzxmimkdg23fr86rqcfiw6iqh99zpph0j990l8yzmv9b";
+    rev = "v1.1";
     repo = "radeontop";
     owner = "clbr";
   };

From 9acdfbfd7280f7ae45411e2f3c005269dc053e78 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 16:01:57 +0200
Subject: [PATCH 2230/2266] =?UTF-8?q?gsmartcontrol:=200.8.7=20=E2=86=92=20?=
 =?UTF-8?q?1.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://github.com/NixOS/nixpkgs/issues/37444
---
 pkgs/tools/misc/gsmartcontrol/default.nix     | 26 ++++++---
 pkgs/tools/misc/gsmartcontrol/fix-paths.patch | 58 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/tools/misc/gsmartcontrol/fix-paths.patch

diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index d4322f051d0..f7cdf5ca608 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -1,18 +1,28 @@
-{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }:
+{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
 
 stdenv.mkDerivation rec {
-  version="0.8.7";
+  version="1.1.3";
   name = "gsmartcontrol-${version}";
 
   src = fetchurl {
-    url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
-    sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh";
+    url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
+    sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ smartmontools gtkmm2 libglademm pcre ];
+  patches = [
+    ./fix-paths.patch
+  ];
 
-  #installTargets = "install datainstall";
+  nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ];
+  buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}"
+    )
+  '';
 
   meta = {
     description = "Hard disk drive health inspection tool";
@@ -25,7 +35,7 @@ stdenv.mkDerivation rec {
       It allows you to inspect the drive's SMART data to determine its health,
       as well as run various tests on it.
     '';
-    homepage = http://gsmartcontrol.sourceforge.net/;
+    homepage = https://gsmartcontrol.sourceforge.io/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [qknight];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
new file mode 100644
index 00000000000..905b63bee0c
--- /dev/null
+++ b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
@@ -0,0 +1,58 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -475,6 +475,7 @@
+ 
+ 
+ AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \
++	data/org.gsmartcontrol.policy \
+ 	data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \
+ 	debian.dist/changelog \
+ 	src/gsc_winres.rc src/gsmartcontrol.exe.manifest \
+diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
+--- a/data/gsmartcontrol-root.in
++++ b/data/gsmartcontrol-root.in
+@@ -8,7 +8,7 @@
+ # Run gsmartcontrol with root, asking for root password first.
+ # export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c").
+ 
+-EXEC_BIN="@prefix@/sbin/gsmartcontrol";
++EXEC_BIN="@prefix@/bin/gsmartcontrol";
+ prog_name="gsmartcontrol"
+ 
+ 
+@@ -118,7 +118,7 @@
+ # Add @prefix@/sbin as well (freebsd seems to require it).
+ # Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin,
+ # so add it first as well.
+-EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin";
++EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin";
+ export PATH="$EXTRA_PATHS:$PATH"
+ 
+ 
+diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in
+rename from data/org.gsmartcontrol.policy
+rename to data/org.gsmartcontrol.policy.in
+--- a/data/org.gsmartcontrol.policy
++++ b/data/org.gsmartcontrol.policy.in
+@@ -12,7 +12,7 @@
+       <allow_inactive>auth_admin</allow_inactive>
+       <allow_active>auth_admin</allow_active>
+     </defaults>
+-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gsmartcontrol</annotate>
++    <annotate key="org.freedesktop.policykit.exec.path">@prefix@/bin/gsmartcontrol</annotate>
+     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+   </action>
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,7 +24,7 @@
+ # endif
+ 
+ 
+-sbin_PROGRAMS = gsmartcontrol
++bin_PROGRAMS = gsmartcontrol
+ 
+ gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \
+ 	$(top_builddir)/src/libdebug/libdebug.a \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef4e1aafd77..33a9b2bf23b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2694,9 +2694,7 @@ with pkgs;
 
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 
-  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
-    inherit (gnome2) libglademm;
-  };
+  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
 
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome2) libsoup;

From 88e83b0712a5d21c07ba0e9c18f8356e96d6e426 Mon Sep 17 00:00:00 2001
From: Felipe Espinoza <fdns02@gmail.com>
Date: Thu, 22 Mar 2018 20:26:36 -0300
Subject: [PATCH 2231/2266] cddl: init at 0.8.5

---
 pkgs/development/tools/cddl/Gemfile      |  2 +
 pkgs/development/tools/cddl/Gemfile.lock | 28 ++++++++++
 pkgs/development/tools/cddl/default.nix  | 17 ++++++
 pkgs/development/tools/cddl/gemset.nix   | 69 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 5 files changed, 118 insertions(+)
 create mode 100644 pkgs/development/tools/cddl/Gemfile
 create mode 100644 pkgs/development/tools/cddl/Gemfile.lock
 create mode 100644 pkgs/development/tools/cddl/default.nix
 create mode 100644 pkgs/development/tools/cddl/gemset.nix

diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/development/tools/cddl/Gemfile
new file mode 100644
index 00000000000..2ba729084f1
--- /dev/null
+++ b/pkgs/development/tools/cddl/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'cddl'
diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock
new file mode 100644
index 00000000000..65701dd45bf
--- /dev/null
+++ b/pkgs/development/tools/cddl/Gemfile.lock
@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abnc (0.1.0)
+    cbor-diag (0.5.2)
+      json
+      treetop (~> 1)
+    cddl (0.8.5)
+      abnc
+      cbor-diag
+      colorize
+      json
+      regexp-examples
+    colorize (0.8.1)
+    json (2.1.0)
+    polyglot (0.3.5)
+    regexp-examples (1.4.2)
+    treetop (1.6.10)
+      polyglot (~> 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cddl
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix
new file mode 100644
index 00000000000..37ad593d796
--- /dev/null
+++ b/pkgs/development/tools/cddl/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerApp, ruby }:
+
+bundlerApp {
+  pname = "cddl";
+
+  inherit ruby;
+  gemdir = ./.;
+  exes = [ "cddl" ];
+
+  meta = with lib; {
+    description = "A parser, generator, and validator for CDDL";
+    homepage    = https://rubygems.org/gems/cddl;
+    license     = with licenses; mit;
+    maintainers = with maintainers; [ fdns ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix
new file mode 100644
index 00000000000..92aa4199505
--- /dev/null
+++ b/pkgs/development/tools/cddl/gemset.nix
@@ -0,0 +1,69 @@
+{
+  abnc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  cbor-diag = {
+    dependencies = ["json" "treetop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
+  cddl = {
+    dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pg91wrby0qgrdnf089ddy5yy2jalxd3bb9dljj16cpwv4gjx047";
+      type = "gem";
+    };
+    version = "0.8.5";
+  };
+  colorize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  regexp-examples = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "104f0j0h2x5ijly7kyaj7zz0md65r2c03cpbi5cngm0hs2sr1qkz";
+      type = "gem";
+    };
+    version = "1.4.2";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      type = "gem";
+    };
+    version = "1.6.10";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7f11de15d9..a1f9e3bdb1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -979,6 +979,8 @@ with pkgs;
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
+  cddl = callPackage ../development/tools/cddl { };
+
   cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
 
   ckbcomp = callPackage ../tools/X11/ckbcomp { };

From 5bebf6be9cf2ac1863365d6eb294d82e3546acc4 Mon Sep 17 00:00:00 2001
From: Felipe Espinoza <fdns02@gmail.com>
Date: Thu, 22 Mar 2018 20:34:00 -0300
Subject: [PATCH 2232/2266] cbor-diag: init at 0.5.2

---
 pkgs/development/tools/cbor-diag/Gemfile      |  2 ++
 pkgs/development/tools/cbor-diag/Gemfile.lock | 19 ++++++++++
 pkgs/development/tools/cbor-diag/default.nix  | 30 ++++++++++++++++
 pkgs/development/tools/cbor-diag/gemset.nix   | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 89 insertions(+)
 create mode 100644 pkgs/development/tools/cbor-diag/Gemfile
 create mode 100644 pkgs/development/tools/cbor-diag/Gemfile.lock
 create mode 100644 pkgs/development/tools/cbor-diag/default.nix
 create mode 100644 pkgs/development/tools/cbor-diag/gemset.nix

diff --git a/pkgs/development/tools/cbor-diag/Gemfile b/pkgs/development/tools/cbor-diag/Gemfile
new file mode 100644
index 00000000000..798e507460e
--- /dev/null
+++ b/pkgs/development/tools/cbor-diag/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'cbor-diag'
diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock
new file mode 100644
index 00000000000..0d129765aa4
--- /dev/null
+++ b/pkgs/development/tools/cbor-diag/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    cbor-diag (0.5.2)
+      json
+      treetop (~> 1)
+    json (2.1.0)
+    polyglot (0.3.5)
+    treetop (1.6.10)
+      polyglot (~> 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cbor-diag
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/development/tools/cbor-diag/default.nix
new file mode 100644
index 00000000000..049d9f38c0c
--- /dev/null
+++ b/pkgs/development/tools/cbor-diag/default.nix
@@ -0,0 +1,30 @@
+{ lib, bundlerApp, ruby }:
+
+bundlerApp {
+  pname = "cbor-diag";
+
+  inherit ruby;
+  gemdir = ./.;
+
+  exes = [
+    "cbor2diag.rb"
+    "cbor2json.rb"
+    "cbor2pretty.rb"
+    "cbor2yaml.rb"
+    "diag2cbor.rb"
+    "diag2pretty.rb"
+    "json2cbor.rb"
+    "json2pretty.rb"
+    "pretty2cbor.rb"
+    "pretty2diag.rb"
+    "yaml2cbor.rb"
+  ];
+
+  meta = with lib; {
+    description = "CBOR diagnostic utilities";
+    homepage    = https://github.com/cabo/cbor-diag;
+    license     = with licenses; asl20;
+    maintainers = with maintainers; [ fdns ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix
new file mode 100644
index 00000000000..2de0e9a647a
--- /dev/null
+++ b/pkgs/development/tools/cbor-diag/gemset.nix
@@ -0,0 +1,36 @@
+{
+  cbor-diag = {
+    dependencies = ["json" "treetop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      type = "gem";
+    };
+    version = "1.6.10";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1f9e3bdb1a..4d38c648166 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -977,6 +977,8 @@ with pkgs;
 
   image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { };
 
+  cbor-diag = callPackage ../development/tools/cbor-diag { };
+
   ccnet = callPackage ../tools/networking/ccnet { };
 
   cddl = callPackage ../development/tools/cddl { };

From f784c6be188dc0c74e892df6dee7baefb7436da2 Mon Sep 17 00:00:00 2001
From: Felipe Espinoza <fdns02@gmail.com>
Date: Thu, 22 Mar 2018 20:48:53 -0300
Subject: [PATCH 2233/2266] compactor: init at 0.11.0

---
 .../networking/compactor/default.nix          | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/networking/compactor/default.nix

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
new file mode 100644
index 00000000000..749b94f7b7e
--- /dev/null
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -0,0 +1,52 @@
+{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
+
+stdenv.mkDerivation rec {
+  name = "compactor-${version}";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "dns-stats";
+    repo = "compactor";
+    rev = "${version}";
+    sha256 = "1zn6w99xqq5igaz0n89429i78a5pj4nnfn1mm5yv1yfbn1lm0y3l";
+  };
+
+  # cbor-diag, cddl and wireshark-cli are only used for tests.
+  nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ];
+  buildInputs = [
+    boost
+    libpcap
+    openssl
+    libtins
+    lzma
+  ];
+
+  patchPhase = ''
+    patchShebangs test-scripts/
+  '';
+
+  preConfigure = ''
+    sh autogen.sh
+    substituteInPlace configure \
+      --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+  CXXFLAGS = "-std=c++11";
+  configureFlags = [
+    "--with-boost-libdir=${boost.out}/lib"
+    "--with-boost=${boost.dev}"
+  ];
+
+  doCheck = true;
+  preCheck = ''
+    substituteInPlace test-scripts/check-live-pcap.sh \
+      --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tools to capture DNS traffic and record it in C-DNS files";
+    homepage    = http://dns-stats.org/;
+    license     = [ licenses.boost licenses.mpl20 licenses.openssl ];
+    maintainers = with maintainers; [ fdns ];
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d38c648166..3513b266bb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1009,6 +1009,8 @@ with pkgs;
 
   colpack = callPackage ../applications/science/math/colpack { };
 
+  compactor = callPackage ../applications/networking/compactor { };
+
   consul = callPackage ../servers/consul { };
 
   consul-ui = callPackage ../servers/consul/ui.nix { };

From 690fcc97ef69f6f6692c4be0a6085038a6369d3c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 14:45:57 -0700
Subject: [PATCH 2234/2266] nixos/monit: restart if config changes

---
 nixos/modules/services/monitoring/monit.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index 71f50cc0f19..d48e5c550ab 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -26,16 +26,10 @@ in
 
     environment.systemPackages = [ pkgs.monit ];
 
-    environment.etc = [
-      {
-        source = pkgs.writeTextFile {
-          name = "monitrc";
-          text = config.services.monit.config;
-        };
-        target = "monitrc";
-        mode = "0400";
-      }
-    ];
+    environment.etc."monitrc" = {
+      text = config.services.monit.config;
+      mode = "0400";
+    };
 
     systemd.services.monit = {
       description = "Pro-active monitoring utility for unix systems";
@@ -48,6 +42,8 @@ in
         KillMode = "process";
         Restart = "always";
       };
+      restartTriggers = [ config.environment.etc."monitrc".source ];
     };
+
   };
 }

From 6b8a6faf621b41eff3552a247d2ec1b58952c190 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 28 Mar 2018 21:12:32 +0100
Subject: [PATCH 2235/2266] linuxPackages.v4l2loopback: 0.9.1 -> 0.11.0

---
 pkgs/os-specific/linux/v4l2loopback/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 920c8c0bdee..3db2814a087 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, kernel, kmod }:
+{ stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.9.1";
+  version = "0.11.0";
 
-  src = fetchurl {
-    url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
-    sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568";
+  src = fetchFromGitHub {
+    owner = "umlaeute";
+    repo = "v4l2loopback";
+    rev = "v${version}";
+    sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az";
   };
 
   hardeningDisable = [ "format" "pic" ];

From 1365d6ad9c0c06b984fb6c1d7e1b18864022d2af Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 28 Mar 2018 21:33:07 +0100
Subject: [PATCH 2236/2266] linuxPackages.phc-intel: 0.4.0-rev24 -> 0.4.0-rev25

---
 pkgs/os-specific/linux/phc-intel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 81db8a9f26d..cc6ac64d58a 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -6,14 +6,14 @@ assert stdenv.lib.versionAtLeast kernel.version "4.10";
 
 let
   release = "0.4.0";
-  revbump = "rev24"; # don't forget to change forum download id...
+  revbump = "rev25"; # don't forget to change forum download id...
 in stdenv.mkDerivation rec {
   name = "linux-phc-intel-${version}-${kernel.version}";
   version = "${release}-${revbump}";
 
   src = fetchurl {
-    sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz";
-    url = "http://www.linux-phc.org/forum/download/file.php?id=178";
+    sha256 = "1w91hpphd8i0br7g5qra26jdydqar45zqwq6jq8yyz6l0vb10zlz";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=194";
     name = "phc-intel-pack-${revbump}.tar.bz2";
   };
 

From 38dceb2cb83706488a05240131179c3320e50a81 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 28 Mar 2018 21:52:33 +0200
Subject: [PATCH 2237/2266] getdns: 1.3.0 -> 1.4.1

---
 pkgs/development/libraries/getdns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 382bdb17247..779534460df 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   pname = "getdns";
   name = "${pname}-${version}";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchurl {
-    url = "https://getdnsapi.net/releases/${pname}-1-3-0/${pname}-${version}.tar.gz";
-    sha256 = "920fa2e07c72fd0e5854db1820fa777108009fc5cb702f9aa5155ef58b12adb1";
+    url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz";
+    sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4";
   };
 
   nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];

From 93561ed0bf650d1c043204a39e008f7c6f319bcc Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 28 Mar 2018 17:42:40 +0200
Subject: [PATCH 2238/2266] grafana: 5.0.3 -> 5.0.4

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 61ff67ed993..d2a0d046389 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.3";
+  version = "5.0.4";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0508dvkanrfrvdnddjsaz8qm3qbgavznia5hqr8zx3qvq4789hj2";
+    sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "0dzb93vx72sm6iri6c96k3a15zn8mp26pd2r78m6k3nhg8rsrqmm";
+    sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 22810755746eb111bc7251a1a831f595ae018690 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 09:35:32 -0700
Subject: [PATCH 2239/2266] mate.caja: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/caja/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/caja -h` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/caja --help` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/caja-connect-server -h` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/caja-connect-server --help` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/.caja-wrapped -h` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/.caja-wrapped --help` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/.caja-connect-server-wrapped -h` got 0 exit code
- ran `/nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1/bin/.caja-connect-server-wrapped --help` got 0 exit code
- found 1.20.1 with grep in /nix/store/ldcsqk6apjpigv38q8h6ns6ibyi8ch3j-caja-1.20.1
- directory tree listing: https://gist.github.com/fca0531e6f5ba7a3ba6f73c2e58c2eed
---
 pkgs/desktops/mate/caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 070808504d1..bf0583189bc 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "05shyqqapqbz4w0gbhx0i3kj6xg7rcj80hkaq7wf5pyj91wmkxqg";
+    sha256 = "1qqqq3fi1aqjqg36y3v73z4d0bqkx7d5f79i6h9lxyh3s0876v9c";
   };
 
   nativeBuildInputs = [

From b60eddf9890758dbae101abc7e8671133203f33d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 08:06:40 -0700
Subject: [PATCH 2240/2266] convmv: 2.04 -> 2.05

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/convmv/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.05 with grep in /nix/store/m6nrjfc07fmfrb5bgqa47r4rqg3m33bm-convmv-2.05
- directory tree listing: https://gist.github.com/f979cfc98f20cef8a081e913a83cca1f
---
 pkgs/tools/misc/convmv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index e6ff7e99353..253e6a50b36 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "convmv-2.04";
+  name = "convmv-2.05";
 
   src = fetchurl {
     url = "http://www.j3e.de/linux/convmv/${name}.tar.gz";
-    sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy";
+    sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk";
   };
 
   preBuild=''

From 2b5c95ff376b699362150f78ec329d47e1fce282 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 07:48:21 -0700
Subject: [PATCH 2241/2266] facter: 3.10.0 -> 3.11.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/facter/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0/bin/facter -h` got 0 exit code
- ran `/nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0/bin/facter --help` got 0 exit code
- ran `/nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0/bin/facter help` got 0 exit code
- ran `/nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0/bin/facter -v` and found version 3.11.0
- ran `/nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0/bin/facter --version` and found version 3.11.0
- found 3.11.0 with grep in /nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0
- found 3.11.0 in filename of file in /nix/store/azfbahp02g1xs110kvk4j281biimil8d-facter-3.11.0
- directory tree listing: https://gist.github.com/f7f2e9775c3cd7188e8466f33d703e81
---
 pkgs/tools/system/facter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 9ff5f58f558..42d34c9a823 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.10.0";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
-    sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792";
+    sha256 = "15cqn09ng23k6a70xvxbpjjqlxw46838k7qr9216lcvxwl2banih";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";

From f91893ea80bed0df9d1bd01128bf4231ffc1b526 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 07:05:34 -0700
Subject: [PATCH 2242/2266] fatrace: 0.12 -> 0.13

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/fatrace/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/6qkvyq8dkw4g27id4gz509wixsvz5786-fatrace-0.13/bin/fatrace -h` got 0 exit code
- ran `/nix/store/6qkvyq8dkw4g27id4gz509wixsvz5786-fatrace-0.13/bin/fatrace --help` got 0 exit code
- directory tree listing: https://gist.github.com/621ef8c6e91074c88839f359832f776e
---
 pkgs/os-specific/linux/fatrace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index fd955676775..6f6418edc3e 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchurl {
     url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "0szn86rbbvmjcw192vjhhgc3v99s5lm2kg93gk1yzm6ay831grsh";
+    sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
   };
 
   buildInputs = [ python3 which ];

From 74ea88b263d92dab3cff36398ad990bf5dba24f4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 05:41:18 -0700
Subject: [PATCH 2243/2266] jbake: 2.5.1 -> 2.6.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/jbake/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake -h` got 0 exit code
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake --help` got 0 exit code
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake help` got 0 exit code
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake version` and found version 2.6.0
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake -h` and found version 2.6.0
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake --help` and found version 2.6.0
- ran `/nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0/bin/jbake help` and found version 2.6.0
- found 2.6.0 with grep in /nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0
- found 2.6.0 in filename of file in /nix/store/mn3b11ybbp508yngrds39czbycjhacf6-jbake-2.6.0
- directory tree listing: https://gist.github.com/1cd96e2ec3fd1a83c4b62c8a7213936c
---
 pkgs/development/tools/jbake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 045ade6e0ed..70b8e7f2663 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.1";
+  version = "2.6.0";
   name = "jbake-${version}";
 
   src = fetchzip {
     url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
-    sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912";
+    sha256 = "1k71rz82fwyi51xhyghg8laz794xyz06d5apmxa9psy7yz184ylk";
   };
 
   buildInputs = [ jre ];

From 7893cb22dc09d9a35919188382f0c45b43abbe07 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 05:27:49 -0700
Subject: [PATCH 2244/2266] mate.libmatekbd: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/libmatekbd/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/03zsljdh5dy4xidfi0hr9irs23z5lvj4-libmatekbd-1.20.1
- directory tree listing: https://gist.github.com/16b4b6e371f933ba6a7c385070a069c0
---
 pkgs/desktops/mate/libmatekbd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index 209edf1f363..fb7a8308ee5 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libmatekbd-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1n2zphb3g6ai54nfr0r9s06vn3bmm361xpjga88hmq947fvbpx19";
+    sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 8925cb523862f0cca5d94f2908fed18c0368f1b8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 04:41:46 -0700
Subject: [PATCH 2245/2266] mate.mate-desktop: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-desktop/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/1pkc0ykfrmr39ah5av4bb1nzyb5vx0vg-mate-desktop-1.20.1/bin/mate-about -h` got 0 exit code
- ran `/nix/store/1pkc0ykfrmr39ah5av4bb1nzyb5vx0vg-mate-desktop-1.20.1/bin/mate-about --help` got 0 exit code
- ran `/nix/store/1pkc0ykfrmr39ah5av4bb1nzyb5vx0vg-mate-desktop-1.20.1/bin/.mate-about-wrapped -h` got 0 exit code
- ran `/nix/store/1pkc0ykfrmr39ah5av4bb1nzyb5vx0vg-mate-desktop-1.20.1/bin/.mate-about-wrapped --help` got 0 exit code
- found 1.20.1 with grep in /nix/store/1pkc0ykfrmr39ah5av4bb1nzyb5vx0vg-mate-desktop-1.20.1
- directory tree listing: https://gist.github.com/d509aa61ab7b795e96d46f3e0e3d3e38
---
 pkgs/desktops/mate/mate-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 56c0ae4632c..f84b6b25420 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-desktop-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0y5172sbj6f4dvimf4pmz74b9cfidbpmnwwb9f6vlc6fa0kp5l1n";
+    sha256 = "0jxhhf9w6mz8ha6ymgj2alzmiydylg4ngqslkjxx37vvpvms2dyx";
   };
 
   nativeBuildInputs = [

From e221c01521249396b69536c20ce14ef759b4a1bb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 03:50:19 -0700
Subject: [PATCH 2246/2266] mate.mate-applets: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-applets/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/yivfww8swkvh2y5sf83brw5wbvklz26r-mate-applets-1.20.1
- directory tree listing: https://gist.github.com/ff5a1f8bc5fd9849a34c7e1d1bbc0c87
---
 pkgs/desktops/mate/mate-applets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 0be643c9718..b9f9e0ece35 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-applets-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1jmhswfcbawp9ax5p5h2dj8pyajadjdyxa0ac7ldvh7viv8qy52s";
+    sha256 = "1a119g49sr7jrd8i32bw7sn2qlsg3sdiwqdb2v36bm2999j261wc";
   };
 
   nativeBuildInputs = [

From 2a258e6cef19ab352d8a9d6df9344a4fcd7eafca Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 03:20:28 -0700
Subject: [PATCH 2247/2266] mate.marco: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/marco/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1/bin/marco -h` got 0 exit code
- ran `/nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1/bin/marco --help` got 0 exit code
- ran `/nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1/bin/marco --version` and found version 1.20.1
- ran `/nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1/bin/.marco-wrapped -h` got 0 exit code
- ran `/nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1/bin/.marco-wrapped --help` got 0 exit code
- ran `/nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1/bin/.marco-wrapped --version` and found version 1.20.1
- found 1.20.1 with grep in /nix/store/ayqx1pzkcj6igi9xs9k370wwrwnyqgfy-marco-1.20.1
- directory tree listing: https://gist.github.com/10191e76177426ba4d6e8b8f8e9bfdb9
---
 pkgs/desktops/mate/marco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index e5a544ae33e..42c74aa1173 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marco-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "07asf8i15ih6ajkp5yapk720qyssi2cinxwg2z5q5j9m6mxax6lr";
+    sha256 = "1qnx47aibvl00qaf1jik457cwncxb71pf5pd1m3gdg7ky61ljkm4";
   };
 
   nativeBuildInputs = [

From 2c24070e5a1f08a54d90924c114dbcb6d09f6312 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 03:04:45 -0700
Subject: [PATCH 2248/2266] mate.mate-calc: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-calc/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/n3d10s2lcxwlq38y4ffdgbnnx9kid3a1-mate-calc-1.20.1
- directory tree listing: https://gist.github.com/dd5057aba9569a13321ad8a61f05bea6
---
 pkgs/desktops/mate/mate-calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index efe8adae678..5f968633d93 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-calc-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "03cma6b00chd4026pbnh5i0ckpl8b1l7i1ppvcmbfbx0s3vpbc73";
+    sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87";
   };
 
   nativeBuildInputs = [

From e2f5524dc46a833e8685164764f9357121a18edc Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 02:53:50 -0700
Subject: [PATCH 2249/2266] mate.mate-panel: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-panel/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/mate-desktop-item-edit -h` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/mate-desktop-item-edit --help` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/mate-panel-test-applets -h` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/mate-panel-test-applets --help` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/.mate-desktop-item-edit-wrapped -h` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/.mate-desktop-item-edit-wrapped --help` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/.mate-panel-test-applets-wrapped -h` got 0 exit code
- ran `/nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1/bin/.mate-panel-test-applets-wrapped --help` got 0 exit code
- found 1.20.1 with grep in /nix/store/k3l12ksm4cczvxiaj9g5j76ri43vi8xi-mate-panel-1.20.1
- directory tree listing: https://gist.github.com/5498a5168ebb3f4e2c6cd2cf3279ba16
---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index 0adcb58758c..df1c15bddd3 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0cz1pfwvsmrjcd0wa83cid9yjcygla6rhigyr7f75d75kiknlcm7";
+    sha256 = "1vmvn93apvq6r9m823zyrncbxgsjr4nmigw9k4s4n05z8zd8wy8k";
   };
 
   nativeBuildInputs = [

From f1c4a9cd3cc5f196b421c99ca503b33d86eb1f8d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 04:19:15 -0700
Subject: [PATCH 2250/2266] mate.mate-power-manager: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-power-manager/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-manager -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-manager --help` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-manager --version` and found version 1.20.1
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-preferences -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-preferences --help` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-statistics -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-statistics --help` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-manager-wrapped -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-manager-wrapped --help` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-manager-wrapped --version` and found version 1.20.1
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-preferences-wrapped -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-preferences-wrapped --help` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-statistics-wrapped -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/.mate-power-statistics-wrapped --help` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-backlight-helper -h` got 0 exit code
- ran `/nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1/bin/mate-power-backlight-helper --help` got 0 exit code
- found 1.20.1 with grep in /nix/store/0qj1rkdjfc3yazdk2xa46147sg5rhzd4-mate-power-manager-1.20.1
- directory tree listing: https://gist.github.com/a6a1ffa6917fe4c0aa8b463061551af2
---
 pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index ddde6acf0e0..c056b1f62fb 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-power-manager-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "038c2q5kqvqmkp1i93p4pp9x8p6a9i7lyn3nv522mq06qsbynbww";
+    sha256 = "1s46jvjcrai6xb2k0dy7i121b9ihfl5h3y5809fg9fzrbvw6bafn";
   };
 
   buildInputs = [

From c448399b3a2a1bccd5013d007368223fc27cf2af Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 04:03:02 -0700
Subject: [PATCH 2251/2266] mate.mate-settings-daemon: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-settings-daemon/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/n8ns53r2lfxa944hp7a8k9ylrwl18mp0-mate-settings-daemon-1.20.1
- directory tree listing: https://gist.github.com/de97ad2597f0b680b23b448f8353527b
---
 pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index b97b5294d39..490500fca69 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-settings-daemon-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0p4fr2sgkjcjsrmkdy579xmk20dl0sa6az40rzvm6fb2w6693sf5";
+    sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq";
   };
 
   nativeBuildInputs = [

From 2bef08e8d90881f0c6c897ac574e55ba9984b9cb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 02:36:33 -0700
Subject: [PATCH 2252/2266] mate.mate-control-center: 1.20.0 -> 1.20.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/mate-control-center/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-appearance-properties -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-appearance-properties --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-default-applications-properties -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-default-applications-properties --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-keyboard-properties -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-keyboard-properties --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-mouse-properties -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-mouse-properties --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-thumbnail-font -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-thumbnail-font --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-font-viewer -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-font-viewer --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-control-center -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/mate-control-center --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-appearance-properties-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-appearance-properties-wrapped --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-default-applications-properties-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-default-applications-properties-wrapped --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-keyboard-properties-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-keyboard-properties-wrapped --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-mouse-properties-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-mouse-properties-wrapped --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-thumbnail-font-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-thumbnail-font-wrapped --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-font-viewer-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-font-viewer-wrapped --help` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-control-center-wrapped -h` got 0 exit code
- ran `/nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2/bin/.mate-control-center-wrapped --help` got 0 exit code
- found 1.20.2 with grep in /nix/store/0m22i16f18nmpqwna76x1bazaqsbn7sb-mate-control-center-1.20.2
- directory tree listing: https://gist.github.com/6185ae89e86df301c5213f917605137b
---
 pkgs/desktops/mate/mate-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index fdee351aeed..6bde7d7a017 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
-  version = "1.20.0";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0qq3ln40w7lxa7qvbvbsgdq1c5ybzqw3bw2x4z6y6brl4c77sbh7";
+    sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl";
   };
 
   nativeBuildInputs = [

From d49f2ff0de5384a2b0d46ac6e72c485ef016a4d4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 00:59:37 -0700
Subject: [PATCH 2253/2266] mate.pluma: 1.20.0 -> 1.20.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/pluma/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/pluma -h` got 0 exit code
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/pluma --help` got 0 exit code
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/pluma -V` and found version 1.20.1
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/pluma --version` and found version 1.20.1
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/.pluma-wrapped -h` got 0 exit code
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/.pluma-wrapped --help` got 0 exit code
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/.pluma-wrapped -V` and found version 1.20.1
- ran `/nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1/bin/.pluma-wrapped --version` and found version 1.20.1
- found 1.20.1 with grep in /nix/store/9037vgfwy4wdwna1s424vxy5j8mg2jhv-pluma-1.20.1
- directory tree listing: https://gist.github.com/acdcb2b6c22dc6400f8945338623543f
---
 pkgs/desktops/mate/pluma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index d951c9f9bbd..bbff7d24697 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pluma-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0w2x270n11rfa321cdlycfhcgncwxqpikjyl3lwmn4vkx8nhgq5f";
+    sha256 = "09arzypdz6q1zpxd1qqnsn1ykvhmzlf7nylkz2vpwlvnnd3x8ip3";
   };
 
   nativeBuildInputs = [

From 0e6ee9d2d814ca9dc0b48e6c15fa77dce19038ee Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 01:19:35 -0700
Subject: [PATCH 2254/2266] peek: 1.2.2 -> 1.3.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/peek/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/peek -h` got 0 exit code
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/peek --help` got 0 exit code
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/peek -v` and found version 1.3.0
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/peek --version` and found version 1.3.0
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/.peek-wrapped -h` got 0 exit code
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/.peek-wrapped --help` got 0 exit code
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/.peek-wrapped -v` and found version 1.3.0
- ran `/nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0/bin/.peek-wrapped --version` and found version 1.3.0
- found 1.3.0 with grep in /nix/store/m8j6kly45y6clj5pjfza04jfmaklxwwy-peek-1.3.0
- directory tree listing: https://gist.github.com/551f0552b9f1c003d36fd0e56c41a3cc
---
 pkgs/applications/video/peek/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 9858edf8238..6a84154818b 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "peek-${version}";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "phw";
     repo = "peek";
     rev = version;
-    sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh";
+    sha256 = "0yizf55rzkm88bfjzwr8yyhm33yqp1mbih2ifwhvnjd1911db0x9";
   };
 
   nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];

From 4e645a2781bfc40ca72221781b62a20f148bc8c0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Mar 2018 04:57:20 +0200
Subject: [PATCH 2255/2266] android-studio: 3.0.1.0 -> 3.1.0.16

---
 pkgs/applications/editors/android-studio/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index fa929d714b7..701f8aa2be4 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -21,9 +21,9 @@ in rec {
   stable = mkStudio {
     pname = "android-studio";
     #pname = "android-studio-stable"; # TODO: Rename and provide symlink
-    version = "3.0.1.0"; # "Android Studio 3.0.1"
-    build = "171.4443003";
-    sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
+    version = "3.1.0.16"; # "Android Studio 3.1"
+    build = "173.4670197";
+    sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy";
 
     meta = with stdenv.lib; {
       description = "The Official IDE for Android (stable channel)";
@@ -41,9 +41,9 @@ in rec {
   beta = mkStudio {
     pname = "android-studio-preview";
     #pname = "android-studio-beta"; # TODO: Rename and provide symlink
-    version = "3.1.0.15"; # "Android Studio 3.1 RC 3"
-    build = "173.4658569";
-    sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq";
+    version = "3.1.0.16"; # "Android Studio 3.1"
+    build = "173.4670197";
+    sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (beta channel)";

From 0879138cb7362498821aea8132518c121b959554 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 29 Mar 2018 00:28:05 -0400
Subject: [PATCH 2256/2266] GHC: Don't use --profiling-detail on GHC < 8.0.2

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 76c18cc486e..52d596da701 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -138,7 +138,7 @@ let
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
     (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
-    (optionalString (enableExecutableProfiling || enableLibraryProfiling) "--profiling-detail=${profilingDetail}")
+    (optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}")
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
     (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage"))

From b5390649c551a9cd2895dc2d7554de79325ea25c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 29 Mar 2018 01:21:24 -0500
Subject: [PATCH 2257/2266] mysql: remove broken link

macOS will not have the .so link

Fixes #36570
---
 pkgs/servers/sql/mysql/5.7.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index b6b1dc7b127..15e8569fd09 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -60,7 +60,7 @@ self = stdenv.mkDerivation rec {
     install -vD $out/lib/*.a -t $static/lib
     rm -r $out/mysql-test
     rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a
-    ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so
+    ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
   '';
 
   passthru = {

From e54342d47eec9b76afb77c09781ce6baac7d0f4f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Mar 2018 10:25:32 +0200
Subject: [PATCH 2258/2266] abiword: clean up

---
 pkgs/applications/office/abiword/default.nix | 21 +++++++++-----------
 pkgs/top-level/all-packages.nix              |  1 -
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index ea503b8df9b..8dd127715ae 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
+{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
 , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt, goffice, makeWrapper, iconTheme
+, boost, libxslt, goffice, wrapGAppsHook, iconTheme
 }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.0.2";
 
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
+    url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
     sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
   };
 
@@ -22,19 +22,16 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs =
-    [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
-      libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
-    ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
-  postFixup = ''
-    wrapProgram "$out/bin/abiword" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
+  buildInputs = [
+    gtk3 librsvg bzip2 fribidi libpng popt
+    libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
+  ];
 
   meta = with stdenv.lib; {
     description = "Word processing program, similar to Microsoft Word";
-    homepage = http://www.abisource.com/;
+    homepage = https://www.abisource.com/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ylwghst ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43c81fb1be7..60e5bc59188 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14648,7 +14648,6 @@ with pkgs;
   };
 
   abiword = callPackage ../applications/office/abiword {
-    inherit (gnome2) libglade libgnomecanvas;
     iconTheme = gnome3.defaultIconTheme;
   };
 

From c7a51a7499e7aaad1ab03c13cef5c4b0348b09ab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Mar 2018 11:09:26 +0200
Subject: [PATCH 2259/2266] gnome3.gnome-music: fix ugly codecs

---
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 47ea6768a04..982cd9283ff 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
     gdk_pixbuf gnome3.defaultIconTheme python3
     grilo grilo-plugins libnotify
     gnome3.gsettings-desktop-schemas tracker
-    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
   ];
   propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ];
 

From 1a4f962c0d9679028fd0813347eef24db6e68b1f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Mar 2018 11:28:29 +0200
Subject: [PATCH 2260/2266] dfeet: add updateScript

---
 pkgs/development/tools/misc/d-feet/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index b20f63e2625..ae8f17c213a 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -2,14 +2,14 @@
 , python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }:
 
 let
-  version = "${major}.13";
-  major = "0.3";
+  pname = "d-feet";
+  version = "0.3.13";
 in python3Packages.buildPythonApplication rec {
-  name = "d-feet-${version}";
+  name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
+    url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll";
   };
 
@@ -18,6 +18,14 @@ in python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "dfeet";
+      versionPolicy = "none";
+    };
+  };
+
   meta = {
     description = "D-Feet is an easy to use D-Bus debugger";
 
@@ -26,7 +34,7 @@ in python3Packages.buildPythonApplication rec {
       and invoke methods on those interfaces.
     '';
 
-    homepage = https://wiki.gnome.org/action/show/Apps/DFeet;
+    homepage = https://wiki.gnome.org/Apps/DFeet;
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ ktosiek ];

From 8152db99d75e690b96e091b1b1a50f7325a30981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 27 Mar 2018 12:29:29 +0200
Subject: [PATCH 2261/2266] hplip: Adds missing depdency `sip`

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

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index ed29ee1575c..b18ae7762df 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -70,6 +70,7 @@ pythonPackages.buildPythonApplication {
     pygobject2
     reportlab
     usbutils
+    sip
   ] ++ stdenv.lib.optionals withQt5 [
     pyqt5
   ];

From 919d68e6871cb489000d347b4872ad78faa14179 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 29 Mar 2018 16:18:14 +0200
Subject: [PATCH 2262/2266] skopeo: 1.28 -> 1.29

Also add myself in the maintainer list.
---
 pkgs/development/tools/skopeo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index de0d7fc54de..ea0b09241e5 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.28";
+  version = "0.1.29";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "projectatomic";
     repo = "skopeo";
-    sha256 = "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0";
+    sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
@@ -36,7 +36,7 @@ buildGoPackage rec {
   meta = {
     description = "A command line utility for various operations on container images and image repositories";
     homepage = https://github.com/projectatomic/skopeo;
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
+    maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ];
     license = stdenv.lib.licenses.asl20;
   };
 }

From 219ba583b269b1adc8f2bf57604f9204acb2cf56 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 26 Mar 2018 17:26:20 +0200
Subject: [PATCH 2263/2266] lib/generators: improve toPretty

* properly escape strings
* remove one check for booleans
* improve error message
---
 lib/generators.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/generators.nix b/lib/generators.nix
index 73017f2c679..64399ddd50a 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -98,6 +98,7 @@ rec {
     */
   toYAML = {}@args: toJSON args;
 
+
   /* Pretty print a value, akin to `builtins.trace`.
     * Should probably be a builtin as well.
     */
@@ -108,8 +109,9 @@ rec {
     allowPrettyValues ? false
   }@args: v: with builtins;
     if      isInt      v then toString v
-    else if isBool     v then (if v == true then "true" else "false")
-    else if isString   v then "\"" + v + "\""
+    else if isString   v then ''"${libStr.escape [''"''] v}"''
+    else if true  ==   v then "true"
+    else if false ==   v then "false"
     else if null ==    v then "null"
     else if isFunction v then
       let fna = lib.functionArgs v;
@@ -132,6 +134,6 @@ rec {
               (name: value:
                 "${toPretty args name} = ${toPretty args value};") v)
         + " }"
-    else abort "toPretty: should never happen (v = ${v})";
+    else abort "generators.toPretty: should never happen (v = ${v})";
 
 }

From a7e45fdd8eddca06c2c5db013fe8f9dc4475e1b5 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 26 Mar 2018 17:28:17 +0200
Subject: [PATCH 2264/2266] lib/generators: improve documentation a bit

---
 lib/generators.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/generators.nix b/lib/generators.nix
index 64399ddd50a..6adf0c2afbc 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -4,6 +4,12 @@
  * They all follow a similar interface:
  * generator { config-attrs } data
  *
+ * `config-attrs` are “holes” in the generators
+ * with sensible default implementations that
+ * can be overwritten. The default implementations
+ * are mostly generators themselves, called with
+ * their respective default values; they can be reused.
+ *
  * Tests can be found in ./tests.nix
  * Documentation in the manual, #sec-generators
  */
@@ -20,6 +26,8 @@ in
 
 rec {
 
+  ## -- HELPER FUNCTIONS & DEFAULTS --
+
   /* Generate a line of key k and value v, separated by
    * character sep. If sep appears in k, it is escaped.
    * Helper for synaxes with different separators.
@@ -35,6 +43,9 @@ rec {
     "${libStr.escape [sep] k}${sep}${mkValueString v}";
 
 
+  ## -- FILE FORMAT GENERATORS --
+
+
   /* Generate a key-value-style config file from an attrset.
    *
    * mkKeyValue is the same as in toINI.

From fa71407f3656b0bf65d40e94a20513d56bcf3c61 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 26 Mar 2018 17:31:05 +0200
Subject: [PATCH 2265/2266] lib/generators: introduce a sane default for
 `mkValueString`

So far, `mkValueString` defaulted to `toString`,
which is a bad match for most configuration file formats,
especially because how booleans are formatted.
This also improves error messages for unsupported types.

Add a test to codify the formatting.
---
 lib/generators.nix | 26 +++++++++++++++++++++++++-
 lib/tests/misc.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/lib/generators.nix b/lib/generators.nix
index 6adf0c2afbc..d1a8f6bf8dc 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -28,6 +28,30 @@ rec {
 
   ## -- HELPER FUNCTIONS & DEFAULTS --
 
+  /* Convert a value to a sensible default string representation.
+   * The builtin `toString` function has some strange defaults,
+   * suitable for bash scripts but not much else.
+   */
+  mkValueStringDefault = {}: v: with builtins;
+    let err = t: v: abort
+          ("generators.mkValueStringDefault: " +
+           "${t} not supported: ${toPretty {} v}");
+    in   if isInt      v then toString v
+    # we default to not quoting strings
+    else if isString   v then v
+    # isString returns "1", which is not a good default
+    else if true  ==   v then "true"
+    # here it returns to "", which is even less of a good default
+    else if false ==   v then "false"
+    else if null  ==   v then "null"
+    # if you have lists you probably want to replace this
+    else if isList     v then err "lists" v
+    # same as for lists, might want to replace
+    else if isAttrs    v then err "attrsets" v
+    else if isFunction v then err "functions" v
+    else err "this value is" (toString v);
+
+
   /* Generate a line of key k and value v, separated by
    * character sep. If sep appears in k, it is escaped.
    * Helper for synaxes with different separators.
@@ -38,7 +62,7 @@ rec {
    * > "f\:oo:bar"
    */
   mkKeyValueDefault = {
-    mkValueString ? toString
+    mkValueString ? mkValueStringDefault {}
   }: sep: k: v:
     "${libStr.escape [sep] k}${sep}${mkValueString v}";
 
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index e10aea48e48..5f19dd63f2d 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -207,6 +207,29 @@ runTests {
     expected = ''f\:oo:bar'';
   };
 
+  testMkValueString = {
+    expr = let
+      vals = {
+        int = 42;
+        string = ''fo"o'';
+        bool = true;
+        bool2 = false;
+        null = null;
+        # float = 42.23; # floats are strange
+      };
+      in mapAttrs
+        (const (generators.mkValueStringDefault {}))
+        vals;
+    expected = {
+      int = "42";
+      string = ''fo"o'';
+      bool = "true";
+      bool2 = "false";
+      null = "null";
+      # float = "42.23" true false [ "bar" ] ]'';
+    };
+  };
+
   testToKeyValue = {
     expr = generators.toKeyValue {} {
       key = "value";
@@ -249,6 +272,8 @@ runTests {
       "section 1" = {
         attribute1 = 5;
         x = "Me-se JarJar Binx";
+        # booleans are converted verbatim by default
+        boolean = false;
       };
       "foo[]" = {
         "he\\h=he" = "this is okay";
@@ -260,6 +285,7 @@ runTests {
 
       [section 1]
       attribute1=5
+      boolean=false
       x=Me-se JarJar Binx
     '';
   };

From e01d485ce41f45dfc060ad1a6ec48c115fbdc1b6 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 26 Mar 2018 17:31:51 +0200
Subject: [PATCH 2266/2266] lib/generators: add an example of overriding
 defaults

An example of overriding the `toINI` generator is added,
hopefully clarifying the expressiveness of generators.
---
 doc/functions.xml | 61 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 52bdf13eba9..f790512e7db 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -221,16 +221,69 @@
 
   <para>
     All generators follow a similar call interface: <code>generatorName
-    configFunctions data</code>, where <literal>configFunctions</literal> is a
-    set of user-defined functions that format variable parts of the content.
+    configFunctions data</code>, where <literal>configFunctions</literal> is
+    an attrset of user-defined functions that format nested parts of the
+    content.
     They each have common defaults, so often they do not need to be set
     manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
-    ] name)</code> from the <literal>INI</literal> generator. It gets the name
-    of a section and returns a sanitized name. The default
+    ] name)</code> from the <literal>INI</literal> generator. It receives the
+    name of a section and sanitizes it. The default
     <literal>mkSectionName</literal> escapes <literal>[</literal> and
     <literal>]</literal> with a backslash.
   </para>
 
+  <para>
+    Generators can be fine-tuned to produce exactly the file format required
+    by your application/service. One example is an INI-file format which uses
+    <literal>: </literal> as separator, the strings
+    <literal>"yes"</literal>/<literal>"no"</literal> as boolean values
+    and requires all string values to be quoted:
+  </para>
+
+<programlisting>
+with lib;
+let
+  customToINI = generators.toINI {
+    # specifies how to format a key/value pair
+    mkKeyValue = generators.mkKeyValueDefault {
+      # specifies the generated string for a subset of nix values
+      mkValueString = v:
+             if v == true then ''"yes"''
+        else if v == false then ''"no"''
+        else if isString v then ''"${v}"''
+        # and delegats all other values to the default generator
+        else generators.mkValueStringDefault {} v;
+    } ":";
+  };
+
+# the INI file can now be given as plain old nix values
+in customToINI {
+  main = {
+    pushinfo = true;
+    autopush = false;
+    host = "localhost";
+    port = 42;
+  };
+  mergetool = {
+    merge = "diff3";
+  };
+}
+</programlisting>
+
+  <para>This will produce the following INI file as nix string:</para>
+
+<programlisting>
+[main]
+autopush:"no"
+host:"localhost"
+port:42
+pushinfo:"yes"
+str\:ange:"very::strange"
+
+[mergetool]
+merge:"diff3"
+</programlisting>
+
   <note><para>Nix store paths can be converted to strings by enclosing a
   derivation attribute like so: <code>"${drv}"</code>.</para></note>